fastgenerateapi 1.1.19__py2.py3-none-any.whl → 1.1.22__py2.py3-none-any.whl

fastgenerateapi/__version__.py

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

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/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/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/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/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/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.dist-info → fastgenerateapi-1.1.22.dist-info}/METADATA

@@ -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.dist-info → fastgenerateapi-1.1.22.dist-info}/RECORD

@@ -1,5 +1,5 @@
 fastgenerateapi/__init__.py,sha256=eh2qtp7FbjrgaRX5b3H3UWpasFdNHbVFqLUhpqVbaTU,1287
-fastgenerateapi/__version__.py,sha256=knlKMzCfw9ErnDn0y4qMhdDXeUN1ZBOqpcDlImD8LrU,497
+fastgenerateapi/__version__.py,sha256=shfuqz22SiTQwU5_GhrMLxwaEq4RmoPKMAcWsxvOny4,497
 fastgenerateapi/api_view/__init__.py,sha256=zkaTX5JxsNfjF-dFeEbHfUB58vhPMjm6Iiqx9HgJOrY,14
 fastgenerateapi/api_view/api_view.py,sha256=mfD8GB-hnyI2XO3tkSOlEa2FfBLdq0_Wqvp8gFrXFKU,1160
 fastgenerateapi/api_view/base_view.py,sha256=AUWMd2Ys5mVwifN5iOs7BjpBqCF_ktv23oEp7sHR1g0,9984
@@ -7,8 +7,8 @@ fastgenerateapi/api_view/create_view.py,sha256=NvJ0ocD2UMHcdipA4W7MYamxAw8sYeXAc
 fastgenerateapi/api_view/delete_filter_view.py,sha256=ZP9pmRNeCTu_Go4ErfnDPnkPMShEh_Ql18iNCfMNJ3s,2838
 fastgenerateapi/api_view/delete_tree_view.py,sha256=oqkWQNlA7TNZHHRTJJwxidOHxOgmvUpcnu81cT3oTA0,4083
 fastgenerateapi/api_view/delete_view.py,sha256=FvaltPR1ttLfUvBoRoSHP-dGb79LRZlEMSEbYzE_W1E,3497
-fastgenerateapi/api_view/get_all_view.py,sha256=KnbjEZZ6FxxoVDbIqkgL4DoVmzqVjelmeLOZCcg-FOI,9721
-fastgenerateapi/api_view/get_one_view.py,sha256=N54M5F_vtjDlB7XlnPNhIbzEJ-KHyN5q4_jnIGkZ5eo,4201
+fastgenerateapi/api_view/get_all_view.py,sha256=Wg8NxFU61BuJz2kicaTXcPSUR1oJZ8lrWIVvFCdV-5k,9871
+fastgenerateapi/api_view/get_one_view.py,sha256=gCzkoJsBMxdD-bUwNtJvv2I2c5tpUtE2B_MY2BkjRqY,4351
 fastgenerateapi/api_view/get_relation_view.py,sha256=coVqhD29WW7SzdAeqM5LFtNzMulzzJyELT2En-56CF4,9780
 fastgenerateapi/api_view/get_tree_view.py,sha256=8BQomoOU954bXrqGzeFrKS8ydHL9VPxQfwvhV59rQxg,9312
 fastgenerateapi/api_view/sql_get_view.py,sha256=wxYI0JuH8Gw99LfMMwA4rQ_a_tBrKYxYhA7MNGQOx3A,6691
@@ -82,11 +82,11 @@ fastgenerateapi/schemas_factory/get_tree_schema_factory.py,sha256=v0DAf7kwB-17rH
 fastgenerateapi/schemas_factory/response_factory.py,sha256=C-E3lqIdfIJCIZhvmSaAiNJpYVOs6AGVyl90B5KRo4M,1655
 fastgenerateapi/schemas_factory/sql_get_all_schema_factory.py,sha256=dhgMvXZIq4av7puIMiQOTuVqNOuBoMvBZVd98GWJTRg,1810
 fastgenerateapi/schemas_factory/update_schema_factory.py,sha256=E-86vF98Ed92Q2VFqtS35xqxr_c34du9ok42JBfnj1g,3729
-fastgenerateapi/settings/__init__.py,sha256=dtmXBz-s2BXpaDa8bZN4aHyJHZOJpTelSWC2STa6yJ0,201
-fastgenerateapi/settings/all_settings.py,sha256=X-qzZ3bkZhgILDk4l6y7fQkT83D4ZBwbaa5HCezIdZI,4913
+fastgenerateapi/settings/__init__.py,sha256=n6ZGy9R99ln330mshMqav6XRTAfDR1SP5eV8LshI6OQ,169
+fastgenerateapi/settings/all_settings.py,sha256=Ae3BfCJaG64lCf5fiDJYcGTJN2ylIBDIjBvOZS2wXSo,5663
 fastgenerateapi/settings/app_settings.py,sha256=kq0O4FZMveiLdzwRkkH1E1byccoNGlLyz7G4fNTZm6w,7357
-fastgenerateapi/settings/db_settings.py,sha256=duTgLjMHO6MTDfEZ2tkAGiSXrTKuHSLBJW00l5_rv7g,1570
-fastgenerateapi/settings/etcd_settings.py,sha256=z93EoutIrrbc0ZMae-6lA2Vik1z3D_hO9OXtjtfRV5I,1205
+fastgenerateapi/settings/db_settings.py,sha256=uVUbhUQxhbMkwhU5UDG8eE4nf_Blg8bPxLCIEDSMTO4,1570
+fastgenerateapi/settings/etcd_settings.py,sha256=agPHJmIp_w_3iWCKKLIWSdp22cbJtc6kBSoa8fB5IXM,1526
 fastgenerateapi/settings/file_settings.py,sha256=8Ra5H0nxRp1r_Ib_RGbNO0rUFaxqYMjuJT9A4fHE3Oo,857
 fastgenerateapi/settings/jwt_settings.py,sha256=mRtzLZz1bntrl6UXAnIq6xilEEN8NS8oJSv62CGXOEs,971
 fastgenerateapi/settings/otlp_settings.py,sha256=4haWpSdJBeor-rq_rBOgQl6oYRv9eppdwm1yWGt6GyE,3161
@@ -104,8 +104,8 @@ fastgenerateapi/utils/snowflake.py,sha256=GiFVkE10sPiqJ094sMfrPsaV7Y9Y3c1djrSfgs
 fastgenerateapi/utils/str_util.py,sha256=c-jUlCFw-Dz4W1W9Jc1TqGZw3JXu-qN5ovnE6fjc9j0,3445
 fastgenerateapi/utils/swagger_to_js.py,sha256=pPPTag6TYtxdbKMHD3m8lJvc8Gv9HC97CGHt4esU1-E,530
 script/__init__.py,sha256=26UWatnbm6ZIwQMuu9NNzQ0IW1ACO4Oe9caModuTpWM,4
-fastgenerateapi-1.1.19.dist-info/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
-fastgenerateapi-1.1.19.dist-info/METADATA,sha256=TqA0bM4wJ0_Md9V-ryYeJTlhSl4_rYQhfPulmnpKpWw,6025
-fastgenerateapi-1.1.19.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-fastgenerateapi-1.1.19.dist-info/top_level.txt,sha256=CW2SlpYjTRdacF-5ufnPMtwpYcR0XYn_bDxa2ZrrTBI,23
-fastgenerateapi-1.1.19.dist-info/RECORD,,
+fastgenerateapi-1.1.22.dist-info/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
+fastgenerateapi-1.1.22.dist-info/METADATA,sha256=akTyebWekFxkmarVcDnSHoxsFh0Rpk0jnKf7-83uBOM,6025
+fastgenerateapi-1.1.22.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+fastgenerateapi-1.1.22.dist-info/top_level.txt,sha256=CW2SlpYjTRdacF-5ufnPMtwpYcR0XYn_bDxa2ZrrTBI,23
+fastgenerateapi-1.1.22.dist-info/RECORD,,