fastgenerateapi 1.2.15__tar.gz → 1.2.16__tar.gz

{fastgenerateapi-1.2.15 → fastgenerateapi-1.2.16}/PKG-INFO

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

{fastgenerateapi-1.2.15 → fastgenerateapi-1.2.16}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.2.15 → fastgenerateapi-1.2.16}/fastgenerateapi/api_view/base_view.py

@@ -5,6 +5,7 @@ from typing import Optional, Type, List, Union, Sequence, Dict, Any
 from urllib.parse import parse_qs
 
 from fastapi import params
+from pydantic._internal._model_construction import ModelMetaclass
 from tortoise.queryset import QuerySet
 
 from pydantic import create_model, BaseModel
@@ -101,7 +102,7 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
         if not prefetch_related_fields:
             return model
         for key, value_list in prefetch_related_fields.items():
-            if value_list is None:
+            if value_list is None or isinstance(value_list, ModelMetaclass):
                 continue
             if isinstance(value_list, str):
                 value_list = [value_list]
@@ -115,9 +116,9 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
                     key = key.replace("__", "_")
                 for value in value_list:
                     if type(value) == str:
-                        setattr(model, key + "_" + value, getattr(attr_model, value, None) if attr_model else None)
+                        setattr(model, key + "_" + value, getattr(attr_model, value, None))
                     elif type(value) == tuple and len(value) == 2:
-                        setattr(model, value[1], getattr(attr_model, value[0], None) if attr_model else None)
+                        setattr(model, value[1], getattr(attr_model, value[0], None))
         return model
 
     @staticmethod
@@ -239,7 +240,9 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
         schema_include = []
         for key, value in self.prefetch_related_fields.items():
             if not value:
-                schema_include.append([key, Optional[Any]])
+                continue
+            if isinstance(value, ModelMetaclass):
+                schema_include.append((key, Optional[value]))
             elif type(value) in [list, tuple, set]:
                 for val in value:
                     val_str = val

{fastgenerateapi-1.2.15 → fastgenerateapi-1.2.16}/fastgenerateapi/api_view/get_all_view.py

@@ -88,6 +88,12 @@ class GetAllView(BaseView, GetMixin):
         """
         return queryset
 
+    async def set_get_all_model_list(self, model_list: List[Model], *args, **kwargs) -> List[Model]:
+        """
+        对于查询的model，展示数据处理
+        """
+        return model_list
+
     async def set_get_all_model(self, model: Model, *args, **kwargs) -> Model:
         """
         对于查询的model，展示数据处理
@@ -99,6 +105,7 @@ class GetAllView(BaseView, GetMixin):
             queryset: QuerySet,
             schema: Type[BaseModel] = None,
             paginator: Optional[PagePydantic] = PagePydantic(),
+            model_handler: Optional[Callable] = None,
             model_handler_list: Optional[List[Callable]] = None,
             *args, **kwargs,
     ):
@@ -107,6 +114,7 @@ class GetAllView(BaseView, GetMixin):
         :param queryset:
         :param schema:
         :param paginator:
+        :param model_handler:
         :param model_handler_list:
         :param args:
         :param kwargs:
@@ -120,15 +128,23 @@ class GetAllView(BaseView, GetMixin):
             queryset = queryset.offset(cast(int, (paginator.page - 1) * paginator.page_size))
             model_list = await queryset.limit(paginator.page_size)
 
+        if model_handler:
+            if is_async_callable(model_handler):
+                model_list = await model_handler(model_list, paginator=paginator, *args, **kwargs)
+            else:
+                model_list = model_handler(model_list, paginator=paginator, *args, **kwargs)
+        if not schema:
+            model_list = await self.set_get_all_model_list(model_list, paginator=paginator, *args, **kwargs)
+
         data_list = []
         for model in model_list:
             await self.setattr_model(model,*args, **kwargs)
             if model_handler_list:
-                for model_handler in model_handler_list:
-                    if is_async_callable(model_handler):
-                        model = await model_handler(model, paginator=paginator,*args, **kwargs)
+                for i_model_handler in model_handler_list:
+                    if is_async_callable(i_model_handler):
+                        model = await i_model_handler(model, paginator=paginator,*args, **kwargs)
                     else:
-                        model = model_handler(model, paginator=paginator,*args, **kwargs)
+                        model = i_model_handler(model, paginator=paginator,*args, **kwargs)
             if schema:
                 data_list.append(schema.model_validate(model))
             else:

{fastgenerateapi-1.2.15 → fastgenerateapi-1.2.16}/fastgenerateapi/schemas_factory/common_function.py

@@ -103,7 +103,7 @@ def get_dict_from_pydanticmeta(model_class: Type[Model], data: Union[list, tuple
             if settings.app_settings.SCHEMAS_UNDERLINE_WHETHER_DOUBLE_TO_SINGLE:
                 key_field = key_field.replace("__", "_")
             fields_info.setdefault(key_field, (field_type, field_info))
-        elif isinstance(field, tuple):
+        elif isinstance(field, (tuple, list)):
             key_field = field[0]
             field_type, field_info = get_field_info_from_model_class(model_class, field[0])
             if len(field) == 2:

{fastgenerateapi-1.2.15 → fastgenerateapi-1.2.16}/fastgenerateapi.egg-info/PKG-INFO

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