fastgenerateapi 1.1.21__tar.gz → 1.1.23__tar.gz

{fastgenerateapi-1.1.21 → fastgenerateapi-1.1.23}/PKG-INFO

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

{fastgenerateapi-1.1.21 → fastgenerateapi-1.1.23}/fastgenerateapi/__version__.py

@@ -8,7 +8,7 @@
 #                                                  d8888P
 
 
-VERSION = (1, 1, 21)
+VERSION = (1, 1, 23)
 
 __version__ = '.'.join(map(str, VERSION))
 

{fastgenerateapi-1.1.21 → fastgenerateapi-1.1.23}/fastgenerateapi/api_view/base_view.py

@@ -161,7 +161,7 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
             model_class: Type[Model],       # 数据库模型
             model: Union[Model, None] = None
     ):
-        check_unique_fields = cls._get_unique_fields(model_class) + cls._get_foreign_key_fields(model_class)
+        check_unique_fields = cls._get_unique_fields(model_class)
         check_unique_together_fields = cls._get_unique_together_fields(model_class)
         for unique_field in check_unique_fields:
             if hasattr(request_data, unique_field):

{fastgenerateapi-1.1.21 → fastgenerateapi-1.1.23}/fastgenerateapi/settings/__init__.py

@@ -4,4 +4,5 @@ from .db_settings import *
 from .file_settings import *
 from .jwt_settings import *
 from .sms_settings import *
+from .etcd_settings import *
 

{fastgenerateapi-1.1.21 → fastgenerateapi-1.1.23}/fastgenerateapi/settings/all_settings.py

@@ -76,7 +76,6 @@ class SettingsModel(BaseModel):
     def get_global_settings(
             cls,
             path: Union[Path, str, None] = '.env',
-            etcd_settings: Optional[EtcdSettings] = None,
     ):
         """
         get global settings and set into cache
@@ -92,22 +91,25 @@ class SettingsModel(BaseModel):
                 if isinstance(v, FieldInfo):
                     setting_dict[k] = v.annotation(_env_file=str(path))
         elif str(path).__contains__('.yaml'):
-            data_dict = None
+            data_dict = {}
             if os.path.isfile(path):
                 with open(path, 'r', encoding='utf-8') as file:
-                    data_dict = yaml.safe_load(file)
-            else:
-                if not etcd_settings:
-                    etcd_settings = EtcdSettings()
-                if etcd_settings.ETCD_SETTING_KEY:
-                    res, metadata = etcd_settings.client.get(etcd_settings.ETCD_SETTING_KEY)
-                    data_dict = yaml.safe_load(res)
+                    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)
+                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:
-                        annotation_dict = {k_i.removeprefix(v.annotation.Config.env_prefix): v_i for k_i, v_i in data_dict.get(v.annotation.__name__, {}).items()}
+                        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)

{fastgenerateapi-1.1.21 → fastgenerateapi-1.1.23}/fastgenerateapi/settings/db_settings.py

@@ -11,7 +11,7 @@ class DBSettings(BaseSettings):
 
     DB_TYPE: Optional[str] = Field(default='mysql', description="数据库类型")
     DB_HOST: Optional[str] = Field(default='127.0.0.1', description="数据库域名")
-    DB_PORT: Optional[str] = Field(default='3306', description="数据库端口")
+    DB_PORT: Optional[int] = Field(default='3306', description="数据库端口")
     DB_DATABASE: Optional[str] = Field(default='admin', description="数据库名")
     DB_USERNAME: Optional[str] = Field(default='root', description="数据库用户名")
     DB_PASSWORD: Optional[str] = Field(default='', description="数据库密码")

{fastgenerateapi-1.1.21 → fastgenerateapi-1.1.23}/fastgenerateapi.egg-info/PKG-INFO

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