fastgenerateapi 1.2.36__tar.gz → 1.2.37__tar.gz

{fastgenerateapi-1.2.36 → fastgenerateapi-1.2.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastgenerateapi
-Version: 1.2.36
+Version: 1.2.37
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com

{fastgenerateapi-1.2.36 → fastgenerateapi-1.2.37}/fastgenerateapi/__init__.py

@@ -26,7 +26,7 @@ from fastgenerateapi.channel.consumer import Consumer
 
 # 模型相关类
 from fastgenerateapi.pydantic_utils.base_model import (
-    model_config, BaseModel, PagePydantic, EmptyPydantic, SearchPydantic, IdList, IdResp)
+    model_config, BaseModel, PagePydantic, EmptyPydantic, SearchPydantic, IdList, Ids, IdResp)
 
 # 类型提示
 from fastgenerateapi.data_type.tortoise_type import T_Model

{fastgenerateapi-1.2.36 → fastgenerateapi-1.2.37}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.2.36 → fastgenerateapi-1.2.37}/fastgenerateapi/api_view/base_view.py

@@ -67,10 +67,10 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
         return self.get_active_queryset(self.relation_model_class)
 
     @classmethod
-    async def get_object(cls, pk, model_class: Type[T_Model], is_with_prefetch=False) -> T_Model:
+    async def get_object(cls, pk, model_class: Type[T_Model], prefetch_related_fields: Optional[List[str]]=None) -> T_Model:
         queryset = cls.get_active_queryset(model_class).filter(id=pk)
-        if is_with_prefetch:
-            queryset = queryset.prefetch_related(*cls.prefetch_related_fields.keys())
+        if prefetch_related_fields:
+            queryset = queryset.prefetch_related(*prefetch_related_fields)
         model = await queryset.first()
         if model:
             return model

{fastgenerateapi-1.2.36 → fastgenerateapi-1.2.37}/fastgenerateapi/api_view/get_one_view.py

@@ -40,7 +40,11 @@ class GetOneView(BaseView, GetMixin):
     """
 
     async def get_one(self, pk: str, *args, **kwargs):
-        model = await self.get_object(pk, self.model_class, is_with_prefetch=self.is_with_prefetch)
+        prefetch_related_fields = None
+        if self.is_with_prefetch and self.prefetch_related_fields:
+            prefetch_related_fields = self.prefetch_related_fields.keys()
+
+        model = await self.get_object(pk, self.model_class, prefetch_related_fields=prefetch_related_fields)
         if self.is_with_prefetch:
             await self.setattr_model(model, prefetch_related_fields=self.prefetch_related_fields, *args, **kwargs)
 

{fastgenerateapi-1.2.36 → fastgenerateapi-1.2.37}/fastgenerateapi/pydantic_utils/base_model.py

@@ -110,6 +110,10 @@ class IdList(BaseModel):
     id_list: List[str] = Field([], description="id数组")
 
 
+class Ids(BaseModel):
+    ids: Optional[str] = Field(default=None, description="多个id，用,分割")
+
+
 class IdResp(BaseModel):
     id: str = Field(..., description="主键")
 

{fastgenerateapi-1.2.36 → fastgenerateapi-1.2.37}/fastgenerateapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastgenerateapi
-Version: 1.2.36
+Version: 1.2.37
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com