fastgenerateapi 1.1.25__tar.gz → 1.1.27__tar.gz

{fastgenerateapi-1.1.25 → fastgenerateapi-1.1.27}/PKG-INFO

@@ -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 → fastgenerateapi-1.1.27}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.1.25 → fastgenerateapi-1.1.27}/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-1.1.25 → fastgenerateapi-1.1.27}/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-1.1.25 → fastgenerateapi-1.1.27}/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-1.1.25 → fastgenerateapi-1.1.27}/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-1.1.25 → fastgenerateapi-1.1.27}/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 → fastgenerateapi-1.1.27}/fastgenerateapi.egg-info/PKG-INFO

@@ -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