use pdm

Author: 2412322029

.dockerignore

@@ -9,3 +9,4 @@ test
 static
 uploads
 !./uploads/default.jpg
+build

.gitignore

@@ -41,4 +41,6 @@ static/openapi.json
 
 data
 nginx/log
-packages
+packages.pdm-python
+.pdm-python
+build

Dockerfile

@@ -2,10 +2,12 @@ FROM python:3.10-buster
 
 WORKDIR /code
 
-COPY ./requirements.txt /code/requirements.txt
-
-RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
+# install PDM
+RUN pip install -U pip setuptools wheel
+RUN pip install pdm
 
 COPY ./ /code/
 
+RUN mkdir __pypackages__ && pdm install --prod --no-lock --no-editable
+
 CMD python app.py

README.md

@@ -50,8 +50,8 @@ docker部署nginx,mysql,python3.10,nginx反向代理/api路径(api都以/api开
 ├─api //fastapi子路由，数据校验模型
 ├─sql //数据库连接，crud代码，orm模型
 ├─config //读取配置文件，环境变量
+|   ├─config.yaml //主要是mysql信息，fasapi配置
 ├─app.py //fastapi主文件
-├─config.yaml //主要是mysql信息，fasapi配置
 ├─...如其名
 
 ```
@@ -60,35 +60,34 @@ docker部署nginx,mysql,python3.10,nginx反向代理/api路径(api都以/api开
 
 ## 后端
 
-1. python>3.10 pip安装依赖 
+1. 安装pdm
 
-2. 最好使用虚拟环境
 ```bash
-pip install -r requirements.txt
+pip install --user pdm
 ```
 
-导出
+2. 创建虚拟环境
 
 ```bash
-pip download -d packages/ -r requirements.txt
+pdm venv create 3.11
 ```
 
- 离线安装导入
+ 3. 安装依赖库
 
 ```bash
-pip install --no-index --find-links=packages -r requirements.txt
+pdm install --prod --no-lock --no-editable
 ```
 
-
-
-2. 配置
+3. 配置
 
 修改`config.yaml`
 > 修改数据库用户名密码，创建数据库,数据库名填入dbname
-> 
-> 修改默认用户名密码
+>
+> 修改默认用户名密码，
+>
+> 环境变量的mysql 数据库信息优先级更高
 
-3. 启动
+4. 启动
 
 ```bash
 python app.py

app.py

@@ -54,8 +54,7 @@ async def custom_http_exception_handler(request: Request, exc):
 async def shutdown():
     await engine.dispose()
 
-
-if __name__ == '__main__':
+def main():
     uvicorn.run(app='app:app',
                 host=Config["uvicorn"]["host"],
                 port=Config["uvicorn"]["port"],
@@ -64,3 +63,7 @@ async def shutdown():
                 headers=[("server", "fastapi")],
                 proxy_headers=False
                 )
+
+if __name__ == '__main__':
+    main()
+

config.yaml config/config.yaml

@@ -15,9 +15,16 @@
 from api.password import hash_password, verify_password
 from sql.dbModels import User, Base
 
-ppath = os.path.dirname(__file__).replace('config', '')
-with open(os.path.join(ppath, 'config.yaml'), 'r', encoding='utf8') as f:
-    Config = yaml.safe_load(f)
+ppath = os.path.dirname(__file__)
+Config = None
+try:
+    with open(os.path.join(ppath, 'config.yaml'), 'r', encoding='utf8') as f:
+        Config = yaml.safe_load(f)
+except FileNotFoundError as e:
+    print(e)
+    p = input('input config.yaml path:')
+    with open(p, 'r', encoding='utf8') as f:
+        Config = yaml.safe_load(f)
 
 if 'MYSQL_HOST' in os.environ:
     print("use env mysql config")
@@ -30,11 +37,17 @@
 class sync_session:
     d = Config["databases"]
     _engine = create_engine(f'mysql+pymysql://{d["username"]}:{d["password"]}@{d["host"]}:{d["port"]}')
-    _conn = _engine.connect()
-    _conn.execute(text(f'CREATE DATABASE IF NOT EXISTS {d["dbname"]};'))
-    _conn.close()
-    _engine.dispose()
-
+    try: 
+        print(f'尝试连接mysql {d["host"]}:{d["port"]}')
+        _conn = _engine.connect()
+        print(f'execute CREATE DATABASE IF NOT EXISTS {d["dbname"]}')
+        _conn.execute(text(f'CREATE DATABASE IF NOT EXISTS {d["dbname"]};'))
+        _conn.close()
+        _engine.dispose()
+    except Exception as e:
+        print('数据库连接失败\n',e)
+        sys.exit()
+    print(f'mysql连接成功')
     engine = create_engine(
         f'mysql+pymysql://{d["username"]}:{d["password"]}@{d["host"]}:{d["port"]}/{d["dbname"]}',
         echo=False,