fastgenerateapi 1.1.19__tar.gz → 1.1.22__tar.gz

{fastgenerateapi-1.1.19 → fastgenerateapi-1.1.22}/PKG-INFO

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

{fastgenerateapi-1.1.19 → fastgenerateapi-1.1.22}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.1.19 → fastgenerateapi-1.1.22}/fastgenerateapi/api_view/get_all_view.py

@@ -174,7 +174,10 @@ class GetAllView(BaseView, GetMixin):
             for key, value in self.prefetch_related_fields.items():
                 if value and type(value) in [list, tuple, set]:
                     for val in value:
-                        get_all_schema_include.append(key + "__" + val)
+                        val_str = val
+                        if type(val) in [list, tuple, set]:
+                            val_str = val[0]
+                        get_all_schema_include.append(key + "__" + val_str)
         self.get_all_schema = self.get_all_schema or get_all_schema_factory(
             self.model_class, include=get_all_schema_include
         ) or self.get_one_schema if hasattr(self, "get_one_schema") else get_one_schema_factory(self.model_class)

{fastgenerateapi-1.1.19 → fastgenerateapi-1.1.22}/fastgenerateapi/api_view/get_one_view.py

@@ -71,7 +71,10 @@ class GetOneView(BaseView, GetMixin):
             for key, value in self.prefetch_related_fields.items():
                 if value and type(value) in [list, tuple, set]:
                     for val in value:
-                        get_one_schema_include.append(key + "__" + val)
+                        val_str = val
+                        if type(val) in [list, tuple, set]:
+                            val_str = val[0]
+                        get_one_schema_include.append(key + "__" + val_str)
         self.get_one_schema = self.schema or self.get_one_schema or get_one_schema_factory(
             model_class=self.model_class,
             include=get_one_schema_include,

{fastgenerateapi-1.1.19 → fastgenerateapi-1.1.22}/fastgenerateapi/settings/__init__.py

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

{fastgenerateapi-1.1.19 → fastgenerateapi-1.1.22}/fastgenerateapi/settings/all_settings.py

@@ -66,9 +66,7 @@ class SettingsModel(BaseModel):
                             content += f"  # {v.description}\n"
                     content += "\n"
         if etcd_settings and etcd_settings.ETCD_SETTING_KEY:
-            import etcd3
-            etcd = etcd3.client(**etcd_settings.model_dump(exclude_unset=True))
-            etcd.put(etcd_settings.ETCD_SETTING_KEY, content)
+            etcd_settings.client.put(etcd_settings.ETCD_SETTING_KEY, content)
         else:
             with open(file=path, mode='w', encoding='utf-8') as f:
                 f.writelines(content)
@@ -94,19 +92,30 @@ class SettingsModel(BaseModel):
                 if isinstance(v, FieldInfo):
                     setting_dict[k] = v.annotation(_env_file=str(path))
         elif str(path).__contains__('.yaml'):
+            data_dict = None
             if os.path.isfile(path):
                 with open(path, 'r', encoding='utf-8') as file:
                     data_dict = yaml.safe_load(file)
-            elif etcd_settings and etcd_settings.ETCD_SETTING_KEY:
-                import etcd3
-                etcd = etcd3.client(**etcd_settings.model_dump(exclude_unset=True))
-                res, metadata = etcd.get(etcd_settings.ETCD_SETTING_KEY)
-                data_dict = yaml.safe_load(res)
             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)
+            if not data_dict:
                 raise ValidationException(errors="配置错误")
             for k, v in setting_models.items():
                 if isinstance(v, FieldInfo):
-                    setting_dict[k] = v.annotation(**data_dict.get(v.annotation.__name__, {}))
+                    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)
         global settings
@@ -115,6 +124,14 @@ class SettingsModel(BaseModel):
         settings.redis_settings = setting_data.redis_settings
         return setting_data
 
+    def watch(self):
+        """
+        监听文件或这etcd变化，待完善
+        借用 etcd.watch(target)
+        :return:
+        """
+        ...
+
 
 settings = SettingsModel()
 

{fastgenerateapi-1.1.19 → fastgenerateapi-1.1.22}/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.19 → fastgenerateapi-1.1.22}/fastgenerateapi/settings/etcd_settings.py

@@ -23,9 +23,17 @@ class EtcdSettings(BaseSettings):
         env_prefix="",
         env_file=".env",
         case_sensitive=True,
-        extra='ignore'
+        extra='ignore',
+        frozen=True,
     )
 
+    @property
+    def client(self):
+        import etcd3
+        etcd_dict = self.model_dump(exclude_unset=True, by_alias=True, exclude={"ETCD_SETTING_KEY", })
+        etcd = etcd3.client(**{key.removeprefix("ETCD_").lower(): value for key, value in etcd_dict.items()})
+
+        return etcd
 
 
 

{fastgenerateapi-1.1.19 → fastgenerateapi-1.1.22}/fastgenerateapi.egg-info/PKG-INFO

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