fastgenerateapi 1.2.14__tar.gz → 1.2.16__tar.gz

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

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

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

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

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

@@ -1,10 +1,11 @@
 import time
 import uuid
 from copy import copy
-from typing import Optional, Type, List, Union, Sequence, Dict
+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
@@ -98,8 +99,10 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
 
     @staticmethod
     async def setattr_model(model: Model, prefetch_related_fields, *args, **kwargs) -> Model:
+        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]
@@ -113,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
@@ -229,6 +232,25 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
             result[key] = val[0]
         return result
 
+    def _get_extra_related_schema(self):
+        """
+        prefetch_related_fields 转换为 extra_include 的参数
+        :return:
+        """
+        schema_include = []
+        for key, value in self.prefetch_related_fields.items():
+            if not value:
+                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
+                    if type(val) in [list, tuple, set]:
+                        val_str = val[0]
+                    schema_include.append(key + "__" + val_str)
+        return schema_include
+
     def get_response_schema(self):
         """
         如果response_schema不存在，则生成
@@ -237,13 +259,7 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
         if not self.response_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)
+                get_one_schema_include = self._get_extra_related_schema()
             self.response_schema = get_one_schema_factory(self.model_class, extra_include=get_one_schema_include)
 
         return self.response_schema

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

@@ -7,6 +7,7 @@ from fastapi.types import DecoratedCallable
 from fastapi_cache import JsonCoder
 from fastapi_cache.decorator import cache
 from pydantic import BaseModel
+from starlette._utils import is_async_callable
 from starlette.requests import Request
 from starlette.responses import JSONResponse
 from tortoise import Model
@@ -87,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，展示数据处理
@@ -98,15 +105,17 @@ class GetAllView(BaseView, GetMixin):
             queryset: QuerySet,
             schema: Type[BaseModel] = None,
             paginator: Optional[PagePydantic] = PagePydantic(),
-            prefetch_related_fields: Optional[dict] = None,
+            model_handler: Optional[Callable] = None,
+            model_handler_list: Optional[List[Callable]] = None,
             *args, **kwargs,
     ):
         """
         通用分页函数，获取对应的数据，和分页统计
         :param queryset:
-        :param paginator:
         :param schema:
-        :param prefetch_related_fields:
+        :param paginator:
+        :param model_handler:
+        :param model_handler_list:
         :param args:
         :param kwargs:
         :return:
@@ -119,20 +128,33 @@ 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, prefetch_related_fields=prefetch_related_fields, *args, **kwargs)
-            model = await self.set_get_model(model, *args, **kwargs)
-            model = await self.set_get_all_model(model, *args, **kwargs)
-
+            await self.setattr_model(model,*args, **kwargs)
+            if model_handler_list:
+                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 = i_model_handler(model, paginator=paginator,*args, **kwargs)
             if schema:
                 data_list.append(schema.model_validate(model))
             else:
+                model = await self.set_get_model(model, paginator=paginator,*args, **kwargs)
+                model = await self.set_get_all_model(model, paginator=paginator, *args, **kwargs)
                 data_list.append(self.get_all_schema.model_validate(model))
 
         return data_list, count
 
-    def get_page_schema(self, data_list, count = None, schema: Type[BaseModel] = None, paginator: Optional[PagePydantic] = None, *args, **kwargs):
+    def get_page_schema_func(self, data_list, count = None, schema: Type[BaseModel] = None, paginator: Optional[PagePydantic] = None, *args, **kwargs):
         """
         返回列表结果
         :param data_list:
@@ -169,7 +191,7 @@ class GetAllView(BaseView, GetMixin):
         :return:
         """
         data_list, count = await self.get_queryset_data(queryset=queryset,*args, **kwargs)
-        res = self.get_page_schema(data_list, count, *args, **kwargs)
+        res = self.get_page_schema_func(data_list, count, *args, **kwargs)
         return res
 
     def _get_all_decorator(self, *args: Any, **kwargs: Any) -> DecoratedCallable:
@@ -212,20 +234,14 @@ class GetAllView(BaseView, GetMixin):
         if not self.get_all_schema:
             get_all_schema_include = []
             if 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_all_schema_include.append(key + "__" + val_str)
+                get_all_schema_include = self._get_extra_related_schema()
             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_all_page_schema = get_page_schema_factory(self.get_all_schema)
         self.get_all_list_schema = get_list_schema_factory(self.get_all_schema)
-        self.get_all_response_schema_factory = response_factory(self.get_page_schema, name="GetPage")
+        self.get_all_response_schema_factory = response_factory(self.get_all_page_schema, name="GetPage")
         if not self.get_all_summary:
             doc = self.get_all.__doc__
             self.get_all_summary = doc.strip().split("\n")[0] if doc else "Get All"

{fastgenerateapi-1.2.14 → fastgenerateapi-1.2.16}/fastgenerateapi/api_view/mixin/utils/xlsx_util.py

@@ -21,7 +21,6 @@ from fastgenerateapi import BaseModel, BaseView
 from fastgenerateapi.api_view.mixin.dbmodel_mixin import DBModelMixin
 from fastgenerateapi.api_view.mixin.response_mixin import ResponseMixin
 from fastgenerateapi.api_view.mixin.tool_mixin import ToolMixin
-from fastgenerateapi.schemas_factory.create_schema_factory import create_schema_factory
 
 
 class XlsxUtil:

{fastgenerateapi-1.2.14 → 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.14 → fastgenerateapi-1.2.16}/fastgenerateapi/settings/app_settings.py

@@ -8,8 +8,9 @@ from fastgenerateapi.pydantic_utils.base_settings import BaseSettings
 
 class AppSettings(BaseSettings):
     # #######################################  请求参数相关  ###############################################
-    # 字段配置 驼峰格式：fastgenerateapi.alias_to_camel
-    # 下划线：pydantic.alias_generators.to_snake
+    # 字段配置
+    # 【驼峰格式】 推荐<fastgenerateapi.alias_to_camel> 可选<pydantic.alias_generators.to_snake><会忽略双下划线转单下划线配置>
+    # 【下划线】<pydantic.alias_generators.to_snake>
     ALIAS_GENERATOR: Optional[str] = Field(default=None, description="序列化参数命名方法路径")
     # 分页对应字段以及配置默认值
     WHETHER_PAGE_FIELD: Optional[str] = Field(default="no_page", description="判断是否分页字段")

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

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