fastgenerateapi 1.1.25__py2.py3-none-any.whl → 1.1.27__py2.py3-none-any.whl

fastgenerateapi/__version__.py

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

fastgenerateapi/schemas_factory/common_function.py

@@ -18,12 +18,16 @@ def get_field_info(value, description="", default_field_type=None) -> (Type, Fie
             value.field_type = default_field_type
         else:
             value.field_type = str
+    field_info_dict = {}
     if hasattr(value, "null") and value.null:
         field_type = Optional[value.field_type]
+        field_info_dict["default"] = None
     else:
         field_type = value.field_type
         required = True
-    field_info_dict = {"required": required}
+    field_info_dict["required"] = required
+    # if not required and hasattr(value, "default") and not hasattr(value.default, '__call__'):
+    #     field_info_dict.setdefault("default", value.default)
     if not required and hasattr(value, "default") and not hasattr(value.default, '__call__'):
         field_info_dict.setdefault("default", value.default)
     if hasattr(value, "description"):

fastgenerateapi/schemas_factory/common_schema_factory.py

@@ -26,7 +26,7 @@ def common_schema_factory(
     include_fields = set()
     exclude_fields = set()
     if exclude_readonly:
-        exclude_fields.update(["id", "is_active", "deleted_at", "created_at", "modified_at", "updated_at"])
+        exclude_fields.update(["id", "created_at", "modified_at", "updated_at"])
     if hasattr(model_class, "PydanticMeta"):
         if hasattr(model_class.PydanticMeta, "include"):
             include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.include)

fastgenerateapi/schemas_factory/create_schema_factory.py

@@ -15,7 +15,8 @@ def create_schema_factory(
         model_class: Type[Model],
         include: Union[list, tuple, set] = None,
         extra_include: Union[list, tuple, set] = None,
-        exclude: Union[list, tuple, set] = ("created_at", "updated_at", "modified_at"),
+        exclude: Union[list, tuple, set] = None,
+        frozen_exclude: Union[list, tuple, set] = ("created_at", "updated_at", "modified_at"),
         name: Optional[str] = None
 ) -> Type[T]:
     """
@@ -58,7 +59,9 @@ def create_schema_factory(
         all_fields_info.update(include_fields_dict)
         include_fields.update(include_fields_dict.keys())
     if exclude:
-        exclude_fields.update(exclude)
+        exclude_fields.update(set(exclude))
+    if frozen_exclude:
+        exclude_fields.update(set(frozen_exclude))
 
     all_fields = include_fields.difference(exclude_fields)
     try:

fastgenerateapi/schemas_factory/update_schema_factory.py

@@ -15,7 +15,8 @@ def update_schema_factory(
         model_class: Type[Model],
         include: Union[list, tuple, set] = None,
         extra_include: Union[list, tuple, set] = None,
-        exclude: Union[list, tuple, set] = ("created_at", "updated_at", "modified_at"),
+        exclude: Union[list, tuple, set] = None,
+        frozen_exclude: Union[list, tuple, set] = ("created_at", "updated_at", "modified_at"),
         name: Optional[str] = None
 ) -> Type[T]:
     """
@@ -58,7 +59,9 @@ def update_schema_factory(
         all_fields_info.update(include_fields_dict)
         include_fields.update(include_fields_dict.keys())
     if exclude:
-        exclude_fields.update(exclude)
+        exclude_fields.update(set(exclude))
+    if frozen_exclude:
+        exclude_fields.update(set(frozen_exclude))
 
     all_fields = include_fields.difference(exclude_fields)
     try:

fastgenerateapi/settings/all_settings.py

@@ -85,10 +85,14 @@ class SettingsModel(BaseModel):
         :return:
         """
         is_yaml = False
-        if path and str(path).__contains__('.yaml'):
-            is_yaml = True
+        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"
 
         setting_models = cls.model_fields.copy()
         setting_dict = {}
@@ -121,10 +125,7 @@ class SettingsModel(BaseModel):
                     setting_dict[k] = v.annotation(**annotation_dict)
 
         setting_data = cls(**setting_dict)
-        global settings
-        settings.app_settings = setting_data.app_settings
-        settings.system_settings = setting_data.system_settings
-        settings.redis_settings = setting_data.redis_settings
+
         return setting_data
 
     def watch(self):
@@ -136,7 +137,7 @@ class SettingsModel(BaseModel):
         ...
 
 
-settings = SettingsModel()
+settings = SettingsModel.get_global_settings()
 
 
 if __name__ == '__main__':

{fastgenerateapi-1.1.25.dist-info → fastgenerateapi-1.1.27.dist-info}/METADATA

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

{fastgenerateapi-1.1.25.dist-info → fastgenerateapi-1.1.27.dist-info}/RECORD

@@ -1,5 +1,5 @@
 fastgenerateapi/__init__.py,sha256=eh2qtp7FbjrgaRX5b3H3UWpasFdNHbVFqLUhpqVbaTU,1287
-fastgenerateapi/__version__.py,sha256=tP-SI9FJ5U3gRsZCPk5M1SPJbgdtN00luV5I6eTbE_k,497
+fastgenerateapi/__version__.py,sha256=-98csuEDZfM9KAiiI26BstAu4QLsSN_vGKp5UCBYeFk,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=0Ll7gDdORhtY2SU2mC_CxprZb0S_co07VMZd1SchqyA,11251
@@ -71,9 +71,9 @@ fastgenerateapi/pydantic_utils/base_model.py,sha256=kHFcx48UbpMgLfKdNT351p74PZCd
 fastgenerateapi/pydantic_utils/base_settings.py,sha256=JydmNHS_vl3ys7yiXwkZuRZ-4tIgf0a_kfft7WNf4kY,533
 fastgenerateapi/pydantic_utils/json_encoders.py,sha256=EdQfpADCB5Ims3EWtTxhGZj4ypTm7EMmmnjS9-IzPWI,2946
 fastgenerateapi/schemas_factory/__init__.py,sha256=X9U96fiyRfCY0u6SzaCYG62RdpEGFX7yOZh_cJl6R2E,472
-fastgenerateapi/schemas_factory/common_function.py,sha256=ECTCFEVuMg2uQMuFGq66XhcIPZWeXLNba2PUXC4FGvA,5589
-fastgenerateapi/schemas_factory/common_schema_factory.py,sha256=ac_tYOcBqpnGVSkx4NCAZz3Hd1PHmwSocBRld5Jxro4,2904
-fastgenerateapi/schemas_factory/create_schema_factory.py,sha256=rkah8geyfMkfqA6IhHDxq-lFomn8DA3bca1AtFcrLpQ,3733
+fastgenerateapi/schemas_factory/common_function.py,sha256=K0jOZ6wGgSGVkdwoPt9dM6xwnluIFyzj2oSceg64MHU,5817
+fastgenerateapi/schemas_factory/common_schema_factory.py,sha256=zJuJcVsz9qexduSsYEssgtRVaCPcEzQdVHDU88Yb_1g,2877
+fastgenerateapi/schemas_factory/create_schema_factory.py,sha256=LBKcs_LcW6cvXlcPyKapxBypr6A5fvnGJJxk1-zfeQw,3871
 fastgenerateapi/schemas_factory/filter_schema_factory.py,sha256=T4Kpv8G9VAOOZKnRDh2oD3tE_xhsjw2FtEmncJa_MYM,1531
 fastgenerateapi/schemas_factory/get_all_schema_factory.py,sha256=yGjcLh0IMYLRxnCSvkVIbRjv40f5214FO9Kn6tfVoII,5442
 fastgenerateapi/schemas_factory/get_one_schema_factory.py,sha256=cgKoCOSK-4Lky8xUoZHIMAZmVSyWOW5-DmxaM6RAQEY,3431
@@ -81,9 +81,9 @@ fastgenerateapi/schemas_factory/get_relation_schema_factory.py,sha256=VvzWaxAwOn
 fastgenerateapi/schemas_factory/get_tree_schema_factory.py,sha256=v0DAf7kwB-17rHbkzVscLkm6Jh53qa2cieQ7awH78pw,7259
 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/schemas_factory/update_schema_factory.py,sha256=WZRciMnIfI3wCEQ9K4034yjM43qUM7rbZdDwUHN8E4A,3867
 fastgenerateapi/settings/__init__.py,sha256=AOvd7RM_jdrtw7jazw_IoGV5tPOXw2t0OOG1rZU36XI,199
-fastgenerateapi/settings/all_settings.py,sha256=TQo4w7ws2xJWg5A43L9f4aMLLQ_XjqswrSj6_2Ys4-8,5747
+fastgenerateapi/settings/all_settings.py,sha256=ivzELwGouM8RLZ6HXKQs7Z2Y_RHBmQroQJ6AWflmK74,5655
 fastgenerateapi/settings/app_settings.py,sha256=kq0O4FZMveiLdzwRkkH1E1byccoNGlLyz7G4fNTZm6w,7357
 fastgenerateapi/settings/db_settings.py,sha256=uVUbhUQxhbMkwhU5UDG8eE4nf_Blg8bPxLCIEDSMTO4,1570
 fastgenerateapi/settings/etcd_settings.py,sha256=agPHJmIp_w_3iWCKKLIWSdp22cbJtc6kBSoa8fB5IXM,1526
@@ -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.25.dist-info/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
-fastgenerateapi-1.1.25.dist-info/METADATA,sha256=kfv7BSqouiXL4bM0D2wxbfbnrB6ga0eVnZSnX3iCZLU,6025
-fastgenerateapi-1.1.25.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-fastgenerateapi-1.1.25.dist-info/top_level.txt,sha256=CW2SlpYjTRdacF-5ufnPMtwpYcR0XYn_bDxa2ZrrTBI,23
-fastgenerateapi-1.1.25.dist-info/RECORD,,
+fastgenerateapi-1.1.27.dist-info/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
+fastgenerateapi-1.1.27.dist-info/METADATA,sha256=xFvSYlvEY8LLify-jacKExdfQptRTor8dbc8-EgNsBM,6025
+fastgenerateapi-1.1.27.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+fastgenerateapi-1.1.27.dist-info/top_level.txt,sha256=CW2SlpYjTRdacF-5ufnPMtwpYcR0XYn_bDxa2ZrrTBI,23
+fastgenerateapi-1.1.27.dist-info/RECORD,,