fastgenerateapi 1.2.6__tar.gz → 1.2.7__tar.gz

{fastgenerateapi-1.2.6 → fastgenerateapi-1.2.7}/PKG-INFO

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

{fastgenerateapi-1.2.6 → fastgenerateapi-1.2.7}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.2.6 → fastgenerateapi-1.2.7}/fastgenerateapi/schemas_factory/create_schema_factory.py

@@ -17,6 +17,12 @@ def create_schema_factory(
         extra_include: Union[list, tuple, set] = None,
         exclude: Union[list, tuple, set] = None,
         frozen_exclude: Union[list, tuple, set] = ("created_at", "updated_at", "modified_at"),
+        pydantic_meta_include: Union[list, tuple, set] = None,
+        pydantic_meta_exclude: Optional[bool] = True,
+        pydantic_meta_save_include: Optional[bool] = True,
+        pydantic_meta_save_exclude: Optional[bool] = True,
+        pydantic_meta_create_include: Optional[bool] = True,
+        pydantic_meta_create_exclude: Optional[bool] = True,
         name: Optional[str] = None
 ) -> Type[T]:
     """
@@ -65,34 +71,40 @@ def create_schema_factory(
 
     include_fields = set()
     exclude_fields = set()
-    if hasattr(model_class, "PydanticMeta"):
-        if hasattr(model_class.PydanticMeta, "include"):
-            include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.include)
-            all_fields_info.update(include_fields_dict)
-            include_fields.update(include_fields_dict.keys())
-        else:
-            include_fields.update(all_fields_info.keys())
-        if hasattr(model_class.PydanticMeta, "exclude"):
-            exclude_fields.update(model_class.PydanticMeta.exclude)
-        if hasattr(model_class.PydanticMeta, "save_include"):
-            save_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.save_include)
-            all_fields_info.update(save_include_fields_dict)
-            include_fields.update(save_include_fields_dict.keys())
-        if hasattr(model_class.PydanticMeta, "create_include"):
-            create_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.create_include)
-            all_fields_info.update(create_include_fields_dict)
-            include_fields.update(create_include_fields_dict.keys())
-        if hasattr(model_class.PydanticMeta, "save_exclude"):
-            exclude_fields.update(model_class.PydanticMeta.save_exclude)
-        if hasattr(model_class.PydanticMeta, "create_exclude"):
-            exclude_fields.update(model_class.PydanticMeta.create_exclude)
-    else:
-        include_fields.update(all_fields_info.keys())
-
     if include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, include)
         all_fields_info.update(include_fields_dict)
         include_fields.update(include_fields_dict.keys())
+    else:
+        if hasattr(model_class, "PydanticMeta"):
+            if pydantic_meta_include:
+                include_fields_dict = get_dict_from_pydanticmeta(model_class, pydantic_meta_include)
+                all_fields_info.update(include_fields_dict)
+                include_fields.update(include_fields_dict.keys())
+            else:
+                if hasattr(model_class.PydanticMeta, "include"):
+                    include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.include)
+                    all_fields_info.update(include_fields_dict)
+                    include_fields.update(include_fields_dict.keys())
+                else:
+                    include_fields.update(all_fields_info.keys())
+            if pydantic_meta_exclude and hasattr(model_class.PydanticMeta, "exclude"):
+                exclude_fields.update(model_class.PydanticMeta.exclude)
+            if pydantic_meta_save_include and hasattr(model_class.PydanticMeta, "save_include"):
+                save_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.save_include)
+                all_fields_info.update(save_include_fields_dict)
+                include_fields.update(save_include_fields_dict.keys())
+            if pydantic_meta_create_include and hasattr(model_class.PydanticMeta, "create_include"):
+                create_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.create_include)
+                all_fields_info.update(create_include_fields_dict)
+                include_fields.update(create_include_fields_dict.keys())
+            if pydantic_meta_save_exclude and  hasattr(model_class.PydanticMeta, "save_exclude"):
+                exclude_fields.update(model_class.PydanticMeta.save_exclude)
+            if pydantic_meta_create_exclude and hasattr(model_class.PydanticMeta, "create_exclude"):
+                exclude_fields.update(model_class.PydanticMeta.create_exclude)
+        else:
+            include_fields.update(all_fields_info.keys())
+
     if extra_include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, extra_include)
         all_fields_info.update(include_fields_dict)

{fastgenerateapi-1.2.6 → fastgenerateapi-1.2.7}/fastgenerateapi/schemas_factory/get_all_schema_factory.py

@@ -23,10 +23,22 @@ def get_all_schema_factory(
         include: Union[list, tuple, set] = None,
         extra_include: Union[list, tuple, set] = None,
         exclude: Union[list, tuple, set] = None,
+        pydantic_meta_include: Union[list, tuple, set] = None,
+        pydantic_meta_exclude: Optional[bool] = True,
+        pydantic_meta_get_include: Optional[bool] = True,
+        pydantic_meta_get_exclude: Optional[bool] = True,
+        pydantic_meta_get_all_include: Optional[bool] = True,
+        pydantic_meta_get_all_exclude: Optional[bool] = True,
         name: Optional[str] = None,
 ) -> Optional[Type[T]]:
     """
     Is used to create a GetAllSchema
+    参数：
+    include：会覆盖所有的值
+    extra_include：会在原有的值上添加新值
+    exclude：排除值
+    pydantic_meta_include: 替换 PydanticMeta 下 include 的属性
+
     固定排除 逻辑删除字段
     会默认添加模型下 PydanticMeta 设置的相关属性
     - include: 增改详情列表通用，指定包含字段，不指定默认包含所有字段
@@ -74,39 +86,42 @@ def get_all_schema_factory(
 
     include_fields = set()
     exclude_fields = set()
-    if hasattr(model_class, "PydanticMeta"):
-        if hasattr(model_class.PydanticMeta, "include"):
-            include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.include)
-            all_fields_info.update(include_fields_dict)
-            include_fields.update(include_fields_dict.keys())
-        else:
-            include_fields.update(all_fields_info.keys())
-        if hasattr(model_class.PydanticMeta, "exclude"):
-            exclude_fields.update(model_class.PydanticMeta.exclude)
-
-        if hasattr(model_class.PydanticMeta, "get_include"):
-            get_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.get_include)
-            all_fields_info.update(get_include_fields_dict)
-            include_fields.update(get_include_fields_dict.keys())
-        if hasattr(model_class.PydanticMeta, "get_exclude"):
-            exclude_fields.update(model_class.PydanticMeta.get_exclude)
-
-        # get_all_include
-        if hasattr(model_class.PydanticMeta, "get_all_include"):
-            get_all_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.get_all_include)
-            all_fields_info.update(get_all_include_fields_dict)
-            include_fields.update(get_all_include_fields_dict.keys())
-        # get_all_exclude
-        if hasattr(model_class.PydanticMeta, "get_all_exclude"):
-            exclude_fields.update(model_class.PydanticMeta.get_all_exclude)
-    else:
-        include_fields.update(all_fields_info.keys())
-
-    # 参数处理
     if include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, include)
         all_fields_info.update(include_fields_dict)
         include_fields.update(include_fields_dict.keys())
+    else:
+        if hasattr(model_class, "PydanticMeta"):
+            if pydantic_meta_include:
+                include_fields_dict = get_dict_from_pydanticmeta(model_class, pydantic_meta_include)
+                all_fields_info.update(include_fields_dict)
+                include_fields.update(include_fields_dict.keys())
+            else:
+                if hasattr(model_class.PydanticMeta, "include"):
+                    include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.include)
+                    all_fields_info.update(include_fields_dict)
+                    include_fields.update(include_fields_dict.keys())
+                else:
+                    include_fields.update(all_fields_info.keys())
+            if pydantic_meta_exclude and hasattr(model_class.PydanticMeta, "exclude"):
+                exclude_fields.update(model_class.PydanticMeta.exclude)
+
+            if pydantic_meta_get_include and hasattr(model_class.PydanticMeta, "get_include"):
+                get_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.get_include)
+                all_fields_info.update(get_include_fields_dict)
+                include_fields.update(get_include_fields_dict.keys())
+            if pydantic_meta_get_exclude and hasattr(model_class.PydanticMeta, "get_exclude"):
+                exclude_fields.update(model_class.PydanticMeta.get_exclude)
+
+            if pydantic_meta_get_all_include and hasattr(model_class.PydanticMeta, "get_all_include"):
+                get_all_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.get_all_include)
+                all_fields_info.update(get_all_include_fields_dict)
+                include_fields.update(get_all_include_fields_dict.keys())
+            if pydantic_meta_get_all_exclude and hasattr(model_class.PydanticMeta, "get_all_exclude"):
+                exclude_fields.update(model_class.PydanticMeta.get_all_exclude)
+        else:
+            include_fields.update(all_fields_info.keys())
+
     if extra_include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, extra_include)
         all_fields_info.update(include_fields_dict)

{fastgenerateapi-1.2.6 → fastgenerateapi-1.2.7}/fastgenerateapi/schemas_factory/get_one_schema_factory.py

@@ -16,10 +16,22 @@ def get_one_schema_factory(
         include: Union[list, tuple, set] = None,
         extra_include: Union[list, tuple, set] = None,
         exclude: Union[list, tuple, set] = None,
+        pydantic_meta_include: Union[list, tuple, set] = None,
+        pydantic_meta_exclude: Optional[bool] = True,
+        pydantic_meta_get_include: Optional[bool] = True,
+        pydantic_meta_get_exclude: Optional[bool] = True,
+        pydantic_meta_get_one_include: Optional[bool] = True,
+        pydantic_meta_get_one_exclude: Optional[bool] = True,
         name: Optional[str] = None
 ) -> Type[T]:
     """
     Is used to create a GetOneSchema
+    参数：
+    include：会覆盖所有的值
+    extra_include：会在原有的值上添加新值
+    exclude：排除新值
+    pydantic_meta_include: 替换 PydanticMeta 下 include 的属性
+
     固定排除 逻辑删除字段
     会默认添加模型下 PydanticMeta 设置的相关属性
     - include: 增改详情列表通用，指定包含字段，不指定默认包含所有字段
@@ -64,36 +76,42 @@ def get_one_schema_factory(
 
     include_fields = set()
     exclude_fields = set()
-    if hasattr(model_class, "PydanticMeta"):
-        if hasattr(model_class.PydanticMeta, "include"):
-            include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.include)
-            all_fields_info.update(include_fields_dict)
-            include_fields.update(include_fields_dict.keys())
-        else:
-            include_fields.update(all_fields_info.keys())
-        if hasattr(model_class.PydanticMeta, "exclude"):
-            exclude_fields.update(model_class.PydanticMeta.exclude)
-
-        if hasattr(model_class.PydanticMeta, "get_include"):
-            get_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.get_include)
-            all_fields_info.update(get_include_fields_dict)
-            include_fields.update(get_include_fields_dict.keys())
-        if hasattr(model_class.PydanticMeta, "get_exclude"):
-            exclude_fields.update(model_class.PydanticMeta.get_exclude)
-
-        if hasattr(model_class.PydanticMeta, "get_one_include"):
-            get_one_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.get_one_include)
-            all_fields_info.update(get_one_include_fields_dict)
-            include_fields.update(get_one_include_fields_dict.keys())
-        if hasattr(model_class.PydanticMeta, "get_one_exclude"):
-            exclude_fields.update(model_class.PydanticMeta.get_one_exclude)
-    else:
-        include_fields.update(all_fields_info.keys())
-
     if include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, include)
         all_fields_info.update(include_fields_dict)
         include_fields.update(include_fields_dict.keys())
+    else:
+        if hasattr(model_class, "PydanticMeta"):
+            if pydantic_meta_include:
+                include_fields_dict = get_dict_from_pydanticmeta(model_class, pydantic_meta_include)
+                all_fields_info.update(include_fields_dict)
+                include_fields.update(include_fields_dict.keys())
+            else:
+                if hasattr(model_class.PydanticMeta, "include"):
+                    include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.include)
+                    all_fields_info.update(include_fields_dict)
+                    include_fields.update(include_fields_dict.keys())
+                else:
+                    include_fields.update(all_fields_info.keys())
+            if pydantic_meta_exclude and hasattr(model_class.PydanticMeta, "exclude"):
+                exclude_fields.update(model_class.PydanticMeta.exclude)
+
+            if pydantic_meta_get_include and hasattr(model_class.PydanticMeta, "get_include"):
+                get_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.get_include)
+                all_fields_info.update(get_include_fields_dict)
+                include_fields.update(get_include_fields_dict.keys())
+            if pydantic_meta_get_exclude and hasattr(model_class.PydanticMeta, "get_exclude"):
+                exclude_fields.update(model_class.PydanticMeta.get_exclude)
+
+            if pydantic_meta_get_one_include and hasattr(model_class.PydanticMeta, "get_one_include"):
+                get_one_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.get_one_include)
+                all_fields_info.update(get_one_include_fields_dict)
+                include_fields.update(get_one_include_fields_dict.keys())
+            if pydantic_meta_get_one_exclude and hasattr(model_class.PydanticMeta, "get_one_exclude"):
+                exclude_fields.update(model_class.PydanticMeta.get_one_exclude)
+        else:
+            include_fields.update(all_fields_info.keys())
+
     if extra_include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, extra_include)
         all_fields_info.update(include_fields_dict)

{fastgenerateapi-1.2.6 → fastgenerateapi-1.2.7}/fastgenerateapi/schemas_factory/update_schema_factory.py

@@ -17,6 +17,12 @@ def update_schema_factory(
         extra_include: Union[list, tuple, set] = None,
         exclude: Union[list, tuple, set] = None,
         frozen_exclude: Union[list, tuple, set] = ("created_at", "updated_at", "modified_at"),
+        pydantic_meta_include: Union[list, tuple, set] = None,
+        pydantic_meta_exclude: Optional[bool] = True,
+        pydantic_meta_save_include: Optional[bool] = True,
+        pydantic_meta_save_exclude: Optional[bool] = True,
+        pydantic_meta_update_include: Optional[bool] = True,
+        pydantic_meta_update_exclude: Optional[bool] = True,
         name: Optional[str] = None
 ) -> Type[T]:
     """
@@ -65,34 +71,38 @@ def update_schema_factory(
 
     include_fields = set()
     exclude_fields = set()
-    if hasattr(model_class, "PydanticMeta"):
-        if hasattr(model_class.PydanticMeta, "include"):
-            include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.include)
-            all_fields_info.update(include_fields_dict)
-            include_fields.update(include_fields_dict.keys())
-        else:
-            include_fields.update(all_fields_info.keys())
-        if hasattr(model_class.PydanticMeta, "exclude"):
-            exclude_fields.update(model_class.PydanticMeta.exclude)
-        if hasattr(model_class.PydanticMeta, "save_include"):
-            save_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.save_include)
-            all_fields_info.update(save_include_fields_dict)
-            include_fields.update(save_include_fields_dict.keys())
-        if hasattr(model_class.PydanticMeta, "update_include"):
-            update_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.update_include)
-            all_fields_info.update(update_include_fields_dict)
-            include_fields.update(update_include_fields_dict.keys())
-        if hasattr(model_class.PydanticMeta, "save_exclude"):
-            exclude_fields.update(model_class.PydanticMeta.save_exclude)
-        if hasattr(model_class.PydanticMeta, "update_exclude"):
-            exclude_fields.update(model_class.PydanticMeta.update_exclude)
-    else:
-        include_fields.update(all_fields_info.keys())
-
     if include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, include)
         all_fields_info.update(include_fields_dict)
         include_fields.update(include_fields_dict.keys())
+    else:
+        if hasattr(model_class, "PydanticMeta"):
+            if pydantic_meta_include:
+                include_fields_dict = get_dict_from_pydanticmeta(model_class, pydantic_meta_include)
+                all_fields_info.update(include_fields_dict)
+                include_fields.update(include_fields_dict.keys())
+            else:
+                if hasattr(model_class.PydanticMeta, "include"):
+                    include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.include)
+                    all_fields_info.update(include_fields_dict)
+                    include_fields.update(include_fields_dict.keys())
+                else:
+                    include_fields.update(all_fields_info.keys())
+            if pydantic_meta_exclude and hasattr(model_class.PydanticMeta, "exclude"):
+                exclude_fields.update(model_class.PydanticMeta.exclude)
+            if pydantic_meta_save_include and hasattr(model_class.PydanticMeta, "save_include"):
+                save_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.save_include)
+                all_fields_info.update(save_include_fields_dict)
+                include_fields.update(save_include_fields_dict.keys())
+            if pydantic_meta_update_include and hasattr(model_class.PydanticMeta, "update_include"):
+                update_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.update_include)
+                all_fields_info.update(update_include_fields_dict)
+                include_fields.update(update_include_fields_dict.keys())
+            if pydantic_meta_save_exclude and hasattr(model_class.PydanticMeta, "save_exclude"):
+                exclude_fields.update(model_class.PydanticMeta.save_exclude)
+            if pydantic_meta_update_exclude and hasattr(model_class.PydanticMeta, "update_exclude"):
+                exclude_fields.update(model_class.PydanticMeta.update_exclude)
+
     if extra_include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, extra_include)
         all_fields_info.update(include_fields_dict)

{fastgenerateapi-1.2.6 → fastgenerateapi-1.2.7}/fastgenerateapi.egg-info/PKG-INFO

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