fastgenerateapi 1.2.10__tar.gz → 1.2.11__tar.gz

{fastgenerateapi-1.2.10 → fastgenerateapi-1.2.11}/PKG-INFO

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

{fastgenerateapi-1.2.10 → fastgenerateapi-1.2.11}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.2.10 → fastgenerateapi-1.2.11}/fastgenerateapi/api_view/base_view.py

@@ -220,7 +220,16 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
         :return:
         """
         if not self.response_schema:
-            self.response_schema = get_one_schema_factory(model_class=self.model_class)
+            get_one_schema_include = []
+            if self.is_with_prefetch and self.prefetch_related_fields:
+                for key, value in self.prefetch_related_fields.items():
+                    if value and type(value) in [list, tuple, set]:
+                        for val in value:
+                            val_str = val
+                            if type(val) in [list, tuple, set]:
+                                val_str = val[0]
+                            get_one_schema_include.append(key + "__" + val_str)
+            self.response_schema = get_one_schema_factory(self.model_class, extra_include=get_one_schema_include)
 
         return self.response_schema
 

{fastgenerateapi-1.2.10 → fastgenerateapi-1.2.11}/fastgenerateapi/api_view/get_all_view.py

@@ -152,9 +152,10 @@ class GetAllView(BaseView, GetMixin):
                                        key_builder=generate_key_builder))
         async def route(
                 request: Request,
-                paginator = Depends(paginator_deps()),
+                paginator=Depends(paginator_deps()),
                 search: Optional[str] = Depends(search_params_deps(self.search_fields)),
-                filters: dict = Depends(filter_params_deps(model_class=self.model_class, fields=self.filter_fields, schema=self.filter_schema)),
+                filters: dict = Depends(filter_params_deps(model_class=self.model_class, fields=self.filter_fields,
+                                                           schema=self.filter_schema)),
                 extra_filters: dict = Depends(extra_filter_params_deps(schema=self.extra_filter_schema)),
                 token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
@@ -193,7 +194,10 @@ class GetAllView(BaseView, GetMixin):
                             if type(val) in [list, tuple, set]:
                                 val_str = val[0]
                             get_all_schema_include.append(key + "__" + val_str)
-            self.get_all_schema = get_all_schema_factory(self.model_class, extra_include=get_all_schema_include)
+            if hasattr_get_all_schema(self.model_class) or get_all_schema_include:
+                self.get_all_schema = get_all_schema_factory(self.model_class, extra_include=get_all_schema_include)
+            else:
+                self.get_all_schema = self.get_response_schema()
         self.get_page_schema = get_page_schema_factory(self.get_all_schema)
         self.get_list_schema = get_list_schema_factory(self.get_all_schema)
         self.get_all_response_schema_factory = response_factory(self.get_page_schema, name="GetPage")

{fastgenerateapi-1.2.10 → fastgenerateapi-1.2.11}/fastgenerateapi/api_view/get_one_view.py

@@ -75,19 +75,8 @@ class GetOneView(BaseView, GetMixin):
         if func_type != inspect._empty and func_type is not None:
             self.get_one_schema = func_type
         if not self.get_one_schema:
-            get_one_schema_include = []
-            if self.is_with_prefetch and self.prefetch_related_fields:
-                for key, value in self.prefetch_related_fields.items():
-                    if value and type(value) in [list, tuple, set]:
-                        for val in value:
-                            val_str = val
-                            if type(val) in [list, tuple, set]:
-                                val_str = val[0]
-                            get_one_schema_include.append(key + "__" + val_str)
-            self.get_one_schema = get_one_schema_factory(
-                model_class=self.model_class,
-                extra_include=get_one_schema_include
-            )
+            self.get_one_schema = self.get_response_schema()
+
         self.get_one_response_schema_factory = response_factory(self.get_one_schema, name="GetOne")
         if not self.get_one_summary:
             doc = self.get_one.__doc__

{fastgenerateapi-1.2.10 → fastgenerateapi-1.2.11}/fastgenerateapi/schemas_factory/common_function.py

@@ -77,11 +77,16 @@ def get_field_info_from_model_class(model_class: Type[Model], field: str, descri
             return Optional[str], FieldInfo(default=None, description=f"{field}")
         return get_field_info(value, description=description)
 
-    field_info = model_class._meta.fields_map.get(field.split("__", maxsplit=1)[0])
+    split_left_field = field.split("__", maxsplit=1)[0]
+    field_info = model_class._meta.fields_map.get(split_left_field)
     if field_info:
         description += field_info.description or ""
+    elif split_left_field.endswith("_id"):
+        field_info = model_class._meta.fields_map.get(split_left_field.removesuffix("_id"))
+        if field_info:
+            description += field_info.description or ""
 
-    model_class = DBModelMixin._get_foreign_key_relation_class(model_class, field.split("__", maxsplit=1)[0])
+    model_class = DBModelMixin._get_foreign_key_relation_class(model_class, split_left_field)
 
     return get_field_info_from_model_class(model_class, field.split("__", maxsplit=1)[1], description)
 
@@ -103,7 +108,7 @@ def get_dict_from_pydanticmeta(model_class: Type[Model], data: Union[list, tuple
             if len(field) == 2:
                 if isinstance(field[1], str):
                     key_field = field[1]
-                if isinstance(field[2], FieldInfo):
+                elif isinstance(field[1], FieldInfo):
                     field_info = field[1]
                 else:
                     field_type = field[1]

{fastgenerateapi-1.2.10 → fastgenerateapi-1.2.11}/fastgenerateapi/schemas_factory/common_schema_factory.py

@@ -31,18 +31,18 @@ def common_schema_factory(
         exclude_fields.update(["id", "created_at", "modified_at", "updated_at"])
     if include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, include)
-        all_fields_info.update(include_fields_dict)
+        all_fields_info = {**include_fields_dict, **all_fields_info}
         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)
+                all_fields_info = {**include_fields_dict, **all_fields_info}
                 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)
+                    all_fields_info = {**include_fields_dict, **all_fields_info}
                     include_fields.update(include_fields_dict.keys())
                 else:
                     include_fields.update(all_fields_info.keys())
@@ -53,7 +53,7 @@ def common_schema_factory(
 
     if extra_include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, extra_include)
-        all_fields_info.update(include_fields_dict)
+        all_fields_info = {**include_fields_dict, **all_fields_info}
         include_fields.update(include_fields_dict.keys())
     if exclude:
         exclude_fields.update(exclude)

{fastgenerateapi-1.2.10 → fastgenerateapi-1.2.11}/fastgenerateapi/schemas_factory/get_all_schema_factory.py

@@ -91,7 +91,7 @@ def get_all_schema_factory(
     text_to_list_fields = set()
     if include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, include)
-        all_fields_info.update(include_fields_dict)
+        all_fields_info = {**include_fields_dict, **all_fields_info}
         include_fields.update(include_fields_dict.keys())
     else:
         if hasattr(model_class, "PydanticMeta"):
@@ -131,29 +131,29 @@ def get_all_schema_factory(
         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)
-        include_fields.update(include_fields_dict.keys())
-    if exclude:
-        exclude_fields.update(exclude)
-
-    all_fields = include_fields.difference(exclude_fields)
-    if settings.app_settings.GET_EXCLUDE_ACTIVE_VALUE:
-        try:
-            all_fields.remove(settings.app_settings.WHETHER_DELETE_FIELD)
-        except Exception:
-            ...
-
-    schema_name = name if name else model_class.__name__ + "GetAllSchema"
-    text_to_list_validators_dict = get_model_validate_text_to_list(text_to_list_fields)
-    schema: Type[T] = create_model(
-        schema_name,
-        **{field: all_fields_info[field] for field in all_fields},
-        __config__=model_config,
-        __validators__={**text_to_list_validators_dict},
-    )
-    return schema
+        if extra_include:
+            include_fields_dict = get_dict_from_pydanticmeta(model_class, extra_include)
+            all_fields_info.update(include_fields_dict)
+            include_fields.update(include_fields_dict.keys())
+        if exclude:
+            exclude_fields.update(exclude)
+
+        all_fields = include_fields.difference(exclude_fields)
+        if settings.app_settings.GET_EXCLUDE_ACTIVE_VALUE:
+            try:
+                all_fields.remove(settings.app_settings.WHETHER_DELETE_FIELD)
+            except Exception:
+                ...
+
+        schema_name = name if name else model_class.__name__ + "GetAllSchema"
+        text_to_list_validators_dict = get_model_validate_text_to_list(text_to_list_fields)
+        schema: Type[T] = create_model(
+            schema_name,
+            **{field: all_fields_info[field] for field in all_fields},
+            __config__=model_config,
+            __validators__={**text_to_list_validators_dict},
+        )
+        return schema
 
 
 def get_list_schema_factory(schema_cls: Type[T] = None, response_field: Optional[str] = None, name: str = "") -> Type[T]:

{fastgenerateapi-1.2.10 → fastgenerateapi-1.2.11}/fastgenerateapi/schemas_factory/get_one_schema_factory.py

@@ -12,6 +12,13 @@ from fastgenerateapi.pydantic_utils.base_model import model_config
 from fastgenerateapi.schemas_factory.common_function import get_dict_from_model_fields, get_dict_from_pydanticmeta, \
     get_model_validate_text_to_list
 
+def hasattr_get_one_schema(model_class: Type[Model],):
+    if not hasattr(model_class, "PydanticMeta"):
+        return False
+    if hasattr(model_class.PydanticMeta, "get_one_include") or hasattr(model_class.PydanticMeta, "get_one_exclude"):
+        return True
+    return False
+
 
 def get_one_schema_factory(
         model_class: Type[Model],
@@ -82,7 +89,7 @@ def get_one_schema_factory(
     text_to_list_fields = set()
     if include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, include)
-        all_fields_info.update(include_fields_dict)
+        all_fields_info = {**include_fields_dict, **all_fields_info}
         include_fields.update(include_fields_dict.keys())
     else:
         if hasattr(model_class, "PydanticMeta"):
@@ -122,30 +129,30 @@ def get_one_schema_factory(
         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)
-        include_fields.update(include_fields_dict.keys())
-    if exclude:
-        exclude_fields.update(exclude)
-
-    all_fields = include_fields.difference(exclude_fields)
-
-    if settings.app_settings.GET_EXCLUDE_ACTIVE_VALUE:
-        try:
-            all_fields.remove(settings.app_settings.WHETHER_DELETE_FIELD)
-        except Exception:
-            ...
-
-    schema_name = name if name else model_class.__name__ + "GetOneSchema"
-    text_to_list_validators_dict = get_model_validate_text_to_list(text_to_list_fields)
-    schema: Type[T] = create_model(
-        schema_name,
-        **{field: all_fields_info[field] for field in all_fields},
-        __config__=model_config,
-        __validators__={**text_to_list_validators_dict},
-    )
-    return schema
+        if extra_include:
+            include_fields_dict = get_dict_from_pydanticmeta(model_class, extra_include)
+            all_fields_info.update(include_fields_dict)
+            include_fields.update(include_fields_dict.keys())
+        if exclude:
+            exclude_fields.update(exclude)
+
+        all_fields = include_fields.difference(exclude_fields)
+
+        if settings.app_settings.GET_EXCLUDE_ACTIVE_VALUE:
+            try:
+                all_fields.remove(settings.app_settings.WHETHER_DELETE_FIELD)
+            except Exception:
+                ...
+
+        schema_name = name if name else model_class.__name__ + "GetOneSchema"
+        text_to_list_validators_dict = get_model_validate_text_to_list(text_to_list_fields)
+        schema: Type[T] = create_model(
+            schema_name,
+            **{field: all_fields_info[field] for field in all_fields},
+            __config__=model_config,
+            __validators__={**text_to_list_validators_dict},
+        )
+        return schema
 
 
 

{fastgenerateapi-1.2.10 → fastgenerateapi-1.2.11}/fastgenerateapi/schemas_factory/get_relation_schema_factory.py

@@ -65,31 +65,31 @@ def get_relation_schema_factory(
         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)
-        include_fields.update(include_fields_dict.keys())
-    if exclude:
-        exclude_fields.update(exclude)
-
-    all_fields = include_fields.difference(exclude_fields)
-
-    if settings.app_settings.GET_EXCLUDE_ACTIVE_VALUE:
-        try:
-            all_fields.remove(settings.app_settings.WHETHER_DELETE_FIELD)
-        except Exception:
-            ...
-
-    schema_name = name if name else model_class.__name__ + "GetRelationSchema"
-    text_to_list_validators_dict = get_model_validate_text_to_list(text_to_list_fields)
-    schema: Type[T] = create_model(
-        schema_name,
-        **{field: all_fields_info[field] for field in all_fields},
-        __config__=model_config,
-        __validators__={**text_to_list_validators_dict},
-    )
-
-    return schema
+        if extra_include:
+            include_fields_dict = get_dict_from_pydanticmeta(model_class, extra_include)
+            all_fields_info.update(include_fields_dict)
+            include_fields.update(include_fields_dict.keys())
+        if exclude:
+            exclude_fields.update(exclude)
+
+        all_fields = include_fields.difference(exclude_fields)
+
+        if settings.app_settings.GET_EXCLUDE_ACTIVE_VALUE:
+            try:
+                all_fields.remove(settings.app_settings.WHETHER_DELETE_FIELD)
+            except Exception:
+                ...
+
+        schema_name = name if name else model_class.__name__ + "GetRelationSchema"
+        text_to_list_validators_dict = get_model_validate_text_to_list(text_to_list_fields)
+        schema: Type[T] = create_model(
+            schema_name,
+            **{field: all_fields_info[field] for field in all_fields},
+            __config__=model_config,
+            __validators__={**text_to_list_validators_dict},
+        )
+
+        return schema
 
 
 

{fastgenerateapi-1.2.10 → fastgenerateapi-1.2.11}/fastgenerateapi/schemas_factory/get_tree_schema_factory.py

@@ -107,82 +107,5 @@ def get_tree_schema_factory(
     return schema
 
 
-# def get_tree_schema_factory(
-#         model_class: Type[Model],
-#         include: Union[list, tuple, set] = None,
-#         extra_include: Union[list, tuple, set] = None,
-#         exclude: Union[list, tuple, set] = None,
-# ) -> Optional[Type[T]]:
-#     """
-#     Is used to create a GetTreeSchema
-#     """
-#     def get_tree_schema(schema_cls: Optional[Type[T]] = None):
-#         all_fields_info: dict = get_dict_from_model_fields(model_class)
-#
-#         include_fields = set()
-#         exclude_fields = set()
-#         if hasattr(model_class, "PydanticMeta"):
-#             if hasattr(model_class.PydanticMeta, "get_tree_include"):
-#                 get_tree_include_fields_dict = get_dict_from_pydanticmeta(model_class, model_class.PydanticMeta.get_tree_include)
-#                 all_fields_info.update(get_tree_include_fields_dict)
-#                 include_fields.update(get_tree_include_fields_dict.keys())
-#             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, "get_tree_exclude"):
-#                 exclude_fields.update(model_class.PydanticMeta.get_tree_exclude)
-#             if hasattr(model_class.PydanticMeta, "exclude"):
-#                 exclude_fields.update(model_class.PydanticMeta.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())
-#         if extra_include:
-#             include_fields_dict = get_dict_from_pydanticmeta(model_class, extra_include)
-#             all_fields_info.update(include_fields_dict)
-#             include_fields.update(include_fields_dict.keys())
-#         if exclude:
-#             exclude_fields.update(exclude)
-#
-#         all_fields = include_fields.difference(exclude_fields)
-#
-#         if schema_cls:
-#             all_fields_info.setdefault(
-#                 settings.app_settings.DEFAULT_TREE_CHILDREN_FIELD,
-#                 (Optional[List[Type[schema_cls]]], FieldInfo(default=None, description="子级目录"))
-#             )
-#         else:
-#             all_fields_info.setdefault(
-#                 settings.app_settings.DEFAULT_TREE_CHILDREN_FIELD,
-#                 (Optional[list], FieldInfo(default=None, description="子级目录"))
-#             )
-#         all_fields.add(settings.app_settings.DEFAULT_TREE_CHILDREN_FIELD)
-#         if settings.app_settings.GET_EXCLUDE_ACTIVE_VALUE:
-#             try:
-#                 all_fields.remove(settings.app_settings.WHETHER_DELETE_FIELD)
-#             except Exception:
-#                 ...
-#
-#         name = model_class.__name__ + "GetTreeSchema"
-#         schema: Type[T] = create_model(
-#             __model_name=name, **{field: all_fields_info[field] for field in all_fields}, __config__=Config)
-#
-#         return schema
-#
-#     tree_schema = get_tree_schema()
-#     return get_tree_schema(tree_schema)
-
-
-
-
-
-
-
 
 

{fastgenerateapi-1.2.10 → fastgenerateapi-1.2.11}/fastgenerateapi.egg-info/PKG-INFO

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