fastgenerateapi 1.2.3__tar.gz → 1.2.4__tar.gz

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.2.3
+Version: 1.2.4
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.4}/fastgenerateapi/__version__.py

@@ -8,7 +8,7 @@
 #                                                  d8888P
 
 
-VERSION = (1, 2, 3)
+VERSION = (1, 2, 4)
 
 __version__ = '.'.join(map(str, VERSION))
 

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.4}/fastgenerateapi/settings/all_settings.py

@@ -79,52 +79,51 @@ class SettingsModel(BaseModel):
     ):
         """
         get global settings and set into cache
-        :param path:
-            None时，自动检测本地文件，优先级 application.yaml，.env
-            推荐参数 .env / application.yaml / etcd.yaml
+        :param path: 指定本地文件，指定的文件不能用于修改 SettingsModel、EtcdSettings 的属性
+
+        Etcd配置优先级：
+            application.yaml > path指定文件 > .env
+        其他属性优先级：
+            Etcd配置文件 > application.yaml > path指定文件 > .env
+            除了.env，其他都是yaml格式
         :return:
         """
-        is_yaml = False
+        data_dict = {}
         if path:
-            if str(path).__contains__('.yaml'):
-                is_yaml = True
-        elif os.path.isfile("application.yaml"):
-            path = "application.yaml"
-            is_yaml = True
-        else:
-            path = ".env"
+            if not os.path.isfile(path):
+                raise ValidationException(f"指定哦欸之文件【{path}】不存在")
+            if str(path).endswith('.yaml'):
+                with open(path, 'r', encoding='utf-8') as file:
+                    data_dict.update(yaml.safe_load(file) or {})
+            else:
+                raise ValidationException("不支持指定非yaml格式")
+        if os.path.isfile("application.yaml"):
+            with open("application.yaml", 'r', encoding='utf-8') as file:
+                data_dict.update(yaml.safe_load(file) or {})
+
+        etcd_settings = EtcdSettings(**data_dict.get("EtcdSettings", {}))
+        if etcd_settings.ETCD_SETTING_KEY:
+            res, metadata = etcd_settings.client.get(etcd_settings.ETCD_SETTING_KEY)
+            if not res:
+                raise ValidationException("未读取到Etcd的配置文件")
+            data_dict.update(yaml.safe_load(res))
 
-        setting_models = cls.model_fields.copy()
         setting_dict = {}
-        if not is_yaml:
-            for k, v in setting_models.items():
-                if isinstance(v, FieldInfo):
-                    setting_dict[k] = v.annotation(_env_file=str(path))
-        else:
-            data_dict = {}
-            if os.path.isfile(path):
-                with open(path, 'r', encoding='utf-8') as file:
-                    data_dict = yaml.safe_load(file) or {}
-            etcd_settings = EtcdSettings(**data_dict.get("EtcdSettings", {}))
-            if etcd_settings.ETCD_SETTING_KEY:
-                res, metadata = etcd_settings.client.get(etcd_settings.ETCD_SETTING_KEY)
-                if not res:
-                    raise ValidationException("未读取到Etcd的配置文件")
-                data_dict.update(yaml.safe_load(res))
-            if not data_dict:
-                raise ValidationException(errors="配置错误")
-            for k, v in setting_models.items():
-                if isinstance(v, FieldInfo):
-                    env_prefix = None
-                    if hasattr(v.annotation, "Config") and v.annotation.Config.env_prefix:
-                        env_prefix = v.annotation.Config.env_prefix
-                    if not env_prefix and hasattr(v.annotation, "model_config"):
-                        env_prefix = v.annotation.model_config.get("env_prefix")
-                    if env_prefix:
-                        annotation_dict = {k_i.removeprefix(env_prefix): v_i for k_i, v_i in data_dict.get(v.annotation.__name__, {}).items()}
-                    else:
-                        annotation_dict = data_dict.get(v.annotation.__name__, {})
-                    setting_dict[k] = v.annotation(**annotation_dict)
+        setting_models = cls.model_fields.copy()
+        for k, v in setting_models.items():
+            if isinstance(v, FieldInfo):
+                env_prefix = None
+                if hasattr(v.annotation, "Config") and v.annotation.Config.env_prefix:
+                    env_prefix = v.annotation.Config.env_prefix
+                if not env_prefix and hasattr(v.annotation, "model_config"):
+                    env_prefix = v.annotation.model_config.get("env_prefix")
+                if env_prefix:
+                    annotation_dict = {
+                        k_i.removeprefix(env_prefix): v_i for k_i, v_i in data_dict.get(v.annotation.__name__, {}).items()
+                    }
+                else:
+                    annotation_dict = data_dict.get(v.annotation.__name__, {})
+                setting_dict[k] = v.annotation(**annotation_dict)
 
         setting_data = cls(**setting_dict)
 

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.4}/fastgenerateapi/settings/app_settings.py

@@ -9,7 +9,7 @@ from fastgenerateapi.pydantic_utils.base_settings import BaseSettings
 class AppSettings(BaseSettings):
     # 字段配置 驼峰格式：新版本(pydantic.alias_generators:to_camel)、老版本(pydantic.utils.to_lower_camel)
     # 下划线：pydantic.alias_generators.to_snake
-    ALIAS_GENERATOR: Optional[str] = Field(default="pydantic.alias_generators.to_camel", description="序列化参数命名方法路径")
+    ALIAS_GENERATOR: Optional[str] = Field(default="pydantic.alias_generators.to_snake", description="序列化参数命名方法路径")
 
     # 分页对应字段以及配置默认值
     CURRENT_PAGE_FIELD: Optional[str] = Field(default="page", description="当前页字段")

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.4}/fastgenerateapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.2.3
+Version: 1.2.4
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com