fastgenerateapi 1.1.15__tar.gz → 1.1.17__tar.gz

{fastgenerateapi-1.1.15 → fastgenerateapi-1.1.17}/PKG-INFO

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

{fastgenerateapi-1.1.15 → fastgenerateapi-1.1.17}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.1.15 → fastgenerateapi-1.1.17}/fastgenerateapi/api_view/get_all_view.py

@@ -33,6 +33,7 @@ class GetAllView(BaseView, GetMixin):
     filter_schema: Optional[Type[PYDANTIC_SCHEMA]] = None
     filter_fields: Union[None, list] = None
     order_by_fields: Union[None, list] = None
+    auto_add_id_order: bool = True
     """
     get_all_route: 获取详情路由开关，可以放依赖函数列表
     get_all_schema: 返回序列化
@@ -45,6 +46,7 @@ class GetAllView(BaseView, GetMixin):
     filter_fields: 筛选对应字段
         example： name__contains or (create_at__gt, datetime) or (create_at__gt, datetime, create_time)
     order_by_fields: 排序对应字段
+    auto_add_id_order: 是否自动在 order_by_fields 后面追加id排序
     """
 
     async def get_all(self, search: Optional[str], filters: dict, *args, **kwargs) -> Union[BaseModel, dict, None]:
@@ -60,10 +62,11 @@ class GetAllView(BaseView, GetMixin):
         queryset = await self.filter_queryset(queryset, filters, *args, **kwargs)
         queryset = self.filter_controller.query(queryset=queryset, values=filters)
         queryset = queryset.prefetch_related(*self.prefetch_related_fields.keys())
+        if self.auto_add_id_order:
+            self.order_by_fields = self.order_by_fields or []
+            self.order_by_fields.append("id")
         if self.order_by_fields:
-            queryset = queryset.order_by(*self.order_by_fields, "id")
-        else:
-            queryset = queryset.order_by("id")
+            queryset = queryset.order_by(*self.order_by_fields)
 
         return queryset
 
@@ -166,9 +169,15 @@ class GetAllView(BaseView, GetMixin):
             return
         self.search_controller = SearchController(self.get_base_filter(self.search_fields))
         self.filter_controller = FilterController(self.get_base_filter(self.filter_fields, self.filter_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:
+                        get_all_schema_include.append(key + "__" + val)
         self.get_all_schema = self.get_all_schema or get_all_schema_factory(
-            self.model_class) or self.get_one_schema if hasattr(self, "get_one_schema") else get_one_schema_factory(
-            self.model_class)
+            self.model_class, include=get_all_schema_include
+        ) or self.get_one_schema if hasattr(self, "get_one_schema") else get_one_schema_factory(self.model_class)
         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 = response_factory(self.get_page_schema, name="GetPage")

{fastgenerateapi-1.1.15 → fastgenerateapi-1.1.17}/fastgenerateapi/api_view/get_one_view.py

@@ -66,7 +66,16 @@ class GetOneView(BaseView, GetMixin):
     def _handler_get_one_settings(self):
         if not self.get_one_route:
             return
-        self.get_one_schema = self.schema or self.get_one_schema or 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:
+                        get_one_schema_include.append(key + "__" + val)
+        self.get_one_schema = self.schema or self.get_one_schema or get_one_schema_factory(
+            model_class=self.model_class,
+            include=get_one_schema_include,
+        )
         self.get_one_response_schema = response_factory(self.get_one_schema, name="GetOne")
         doc = self.get_one.__doc__
         summary = doc.strip().split("\n")[0] if self.get_one.__doc__ else "Get One"

{fastgenerateapi-1.1.15 → fastgenerateapi-1.1.17}/fastgenerateapi/schemas_factory/common_function.py

@@ -15,15 +15,14 @@ def get_field_info(value, description="", default_field_type=None) -> (Type, Fie
     required = False
     if value.field_type is None:
         if default_field_type:
-            field_type = Optional[default_field_type]
+            value.field_type = default_field_type
         else:
-            field_type = Optional[str]
+            value.field_type = str
+    if hasattr(value, "null") and value.null:
+        field_type = Optional[value.field_type]
     else:
-        if hasattr(value, "null") and value.null:
-            field_type = Optional[value.field_type]
-        else:
-            field_type = value.field_type
-            required = True
+        field_type = value.field_type
+        required = True
     field_info_dict = {"required": required}
     if not required and hasattr(value, "default") and not hasattr(value.default, '__call__'):
         field_info_dict.setdefault("default", value.default)

{fastgenerateapi-1.1.15 → fastgenerateapi-1.1.17}/fastgenerateapi/schemas_factory/get_all_schema_factory.py

@@ -16,14 +16,14 @@ def get_all_schema_factory(
         include: Union[list, tuple, set] = None,
         extra_include: Union[list, tuple, set] = None,
         exclude: Union[list, tuple, set] = None,
-        name: Optional[str] = None
+        name: Optional[str] = None,
 ) -> Optional[Type[T]]:
     """
     Is used to create a GetAllSchema
     """
     if not hasattr(model_class, "PydanticMeta"):
         return None
-    if not hasattr(model_class.PydanticMeta, "get_all_include") and not hasattr(model_class.PydanticMeta, "get_all_exclude"):
+    if not include and not extra_include and not exclude and not hasattr(model_class.PydanticMeta, "get_all_include") and not hasattr(model_class.PydanticMeta, "get_all_exclude"):
         return None
 
     all_fields_info = get_dict_from_model_fields(model_class)

{fastgenerateapi-1.1.15 → fastgenerateapi-1.1.17}/fastgenerateapi.egg-info/PKG-INFO

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