fastgenerateapi 1.1.24__tar.gz → 1.1.26__tar.gz

{fastgenerateapi-1.1.24 → fastgenerateapi-1.1.26}/PKG-INFO

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

{fastgenerateapi-1.1.24 → fastgenerateapi-1.1.26}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.1.24 → fastgenerateapi-1.1.26}/fastgenerateapi/api_view/base_view.py

@@ -227,7 +227,7 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
         return result
 
     def gen_get_one_response_schema(self):
-        if not hasattr(self, "get_one_schema"):
+        if not hasattr(self, "get_one_schema") or not self.get_one_schema:
             get_one_schema_include = []
             if hasattr(self, "is_with_prefetch") and self.is_with_prefetch and self.prefetch_related_fields:
                 for key, value in self.prefetch_related_fields.items():
@@ -247,8 +247,7 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
         :return:
         """
         self.gen_get_one_response_schema()
-        if not hasattr(self, "get_one_response_schema"):
-            self.get_one_response_schema_factory = response_factory(self.get_one_schema, name="GetOne")
+        self.get_one_response_schema_factory = response_factory(self.get_one_schema, name="GetOne")
 
         return self.get_one_response_schema_factory
 

{fastgenerateapi-1.1.24 → fastgenerateapi-1.1.26}/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.24 → fastgenerateapi-1.1.26}/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.24 → fastgenerateapi-1.1.26}/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.24 → fastgenerateapi-1.1.26}/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 = {}
@@ -136,7 +140,7 @@ class SettingsModel(BaseModel):
         ...
 
 
-settings = SettingsModel()
+settings = SettingsModel.get_global_settings()
 
 
 if __name__ == '__main__':

{fastgenerateapi-1.1.24 → fastgenerateapi-1.1.26}/fastgenerateapi.egg-info/PKG-INFO

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