修改FASTAPI_SETTINGS_MODULE环境变量获取方式。

Author: Chise1

README.md

@@ -106,7 +106,6 @@ fast-tmp createsuperuser
 初始化项目之后，fast-tmp包里面有如下功能：
 
 1. 全局settings管理
-2. crud生成器
 
 ### 全局settings管理
 

fast_tmp/conf/__init__.py

@@ -27,6 +27,9 @@ class Settings(BaseSettings):
     MEDIA_PATH = "media"
     LOCAL_FILE: bool = False  # 是否使用本地amis静态文件
 
+    class Config:
+        env_file = ".env"
+
     @validator("ACCESS_TOKEN_EXPIRE_MINUTES", pre=True, allow_reuse=True)
     def set_token_out(cls, v: Any) -> int:
         if isinstance(v, str):
@@ -57,26 +60,6 @@ def assemble_cors_origins(cls, v: Union[str, List[str]]) -> Union[List[str], str
     def __init__(self):
         super(Settings, self).__init__()
         workdir = os.getcwd()  # 把工作路径加入到代码执行里面
-        if not self.FASTAPI_SETTINGS_MODULE:
-            import toml  # type:ignore
-
-            pyproject_path = os.path.join(workdir, "pyproject.toml")
-            if os.path.exists(pyproject_path):
-                with open(pyproject_path, "r") as f:
-                    doc = toml.load(f)
-                    if doc.get("tool") and doc["tool"].get("aerich"):
-                        self.FASTAPI_SETTINGS_MODULE = doc["tool"]["aerich"]["tortoise_orm"]
-                    elif doc.get("tool") and doc["tool"].get("fast-tmp"):
-                        self.FASTAPI_SETTINGS_MODULE = doc["tool"]["fast-tmp"]["tortoise_orm"]
-                    else:
-                        logger.warning("envirment FASTAPI_SETTINGS_MODULE is null")
-                # 去除后缀 只导入模块
-                if self.FASTAPI_SETTINGS_MODULE.endswith(".TORTOISE_ORM"):
-                    self.FASTAPI_SETTINGS_MODULE = self.FASTAPI_SETTINGS_MODULE.replace(
-                        ".TORTOISE_ORM", ""
-                    )
-            else:
-                logger.warning("envirment FASTAPI_SETTINGS_MODULE is null")
         try:
             for path in sys.path:
                 if path == workdir:
@@ -85,7 +68,7 @@ def __init__(self):
                 sys.path.append(workdir)
             mod = importlib.import_module(self.FASTAPI_SETTINGS_MODULE)
         except Exception as e:
-            raise ImportError(f"导入settings报错:{e}")
+            raise ImportError(f"load settings error:{e}")
 
         for setting in dir(mod):
             if setting.isupper():
@@ -104,7 +87,7 @@ def _init_model(self):
 
             warnings.warn("TORTOISE_ORM为空")
         else:
-            init_model(self)  # fixme 如果提示 has no models,请检查是否在执行导入settings之前先导入了fast_tmp.model
+            init_model(self)
 
 
 settings = Settings()

fast_tmp_cli/tpl/project/src/.env

@@ -0,0 +1 @@
+FASTAPI_SETTINGS_MODULE={{cookiecutter.project_slug}}.settings

…ect/{{cookiecutter.project_slug}}/app.py fast_tmp_cli/tpl/project/src/app.pyfast_tmp_cli/tpl/project/{{cookiecutter.project_slug}}/app.py renamed to fast_tmp_cli/tpl/project/src/app.py fast_tmp_cli/tpl/project/{{cookiecutter.project_slug}}/app.py renamed to fast_tmp_cli/tpl/project/src/app.py

@@ -1,7 +1,3 @@
-import os
-
-os.environ.setdefault("FASTAPI_SETTINGS_MODULE", "{{cookiecutter.project_slug}}.settings")# 请勿在此配置前面加 import
-
 from tortoise.contrib.fastapi import register_tortoise
 from fast_tmp.conf import settings
 from fast_tmp.admin.register import register_static_service
@@ -11,11 +7,11 @@
 app = create_app()
 app.title = "{{cookiecutter.project_slug}}"
 
-register_tortoise(app, config=settings.TORTOISE_ORM, generate_schemas=True)
+register_tortoise(app, config=settings.TORTOISE_ORM)
 if settings.DEBUG:
     register_static_service(app)
 
 if __name__ == "__main__":
     import uvicorn  # type:ignore
 
-    uvicorn.run(app, debug=True, port=8000, lifespan="on")
+    uvicorn.run(app, port=8000, lifespan="on")