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

fastgenerateapi/__version__.py

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

fastgenerateapi/settings/all_settings.py

@@ -106,8 +106,13 @@ class SettingsModel(BaseModel):
                 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/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.dist-info → fastgenerateapi-1.1.22.dist-info}/METADATA

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

{fastgenerateapi-1.1.21.dist-info → fastgenerateapi-1.1.22.dist-info}/RECORD

@@ -1,5 +1,5 @@
 fastgenerateapi/__init__.py,sha256=eh2qtp7FbjrgaRX5b3H3UWpasFdNHbVFqLUhpqVbaTU,1287
-fastgenerateapi/__version__.py,sha256=0xRZ1CfqeRcMqpMktZAkQScpQ6OE77bWp9qqmkahXwg,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
@@ -83,9 +83,9 @@ fastgenerateapi/schemas_factory/response_factory.py,sha256=C-E3lqIdfIJCIZhvmSaAi
 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=n6ZGy9R99ln330mshMqav6XRTAfDR1SP5eV8LshI6OQ,169
-fastgenerateapi/settings/all_settings.py,sha256=bPUrQSZkwtREMfwcTb656u8tcXQn_rHqNhU5HqoQa1w,5375
+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/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
@@ -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.21.dist-info/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
-fastgenerateapi-1.1.21.dist-info/METADATA,sha256=VOKh5AZkjuZodjO2trRXxsLP2RM5J9vk7CEgi42ScMg,6025
-fastgenerateapi-1.1.21.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-fastgenerateapi-1.1.21.dist-info/top_level.txt,sha256=CW2SlpYjTRdacF-5ufnPMtwpYcR0XYn_bDxa2ZrrTBI,23
-fastgenerateapi-1.1.21.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,,