fastgenerateapi 1.2.35__tar.gz → 1.2.37__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fastgenerateapi
-Version: 1.2.35
+Version: 1.2.37
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com
@@ -14,6 +14,15 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.7.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 
 

{fastgenerateapi-1.2.35 → 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.35 → fastgenerateapi-1.2.37}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.2.35 → 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.35 → 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.35 → fastgenerateapi-1.2.37}/fastgenerateapi/api_view/mixin/response_mixin.py

@@ -70,7 +70,7 @@ class ResponseMixin:
         return JSONResponse(
             kwargs,
             status_code=status_code,
-            headers=headers or {"Access-Control-Allow-Origin": '*'},
+            headers=headers,
             background=background
         )
 
@@ -86,7 +86,7 @@ class ResponseMixin:
         raise HTTPException(
             status_code=status_code,
             detail=msg,
-            headers=headers or {"Access-Control-Allow-Origin": '*'},
+            headers=headers,
         )
 
     @staticmethod

{fastgenerateapi-1.2.35 → fastgenerateapi-1.2.37}/fastgenerateapi/file_tool/xlsx_util.py

@@ -126,8 +126,16 @@ class XlsxImporterImpl(XlsxImporterInterface):
         self.kwargs = kwargs
         # 初始化时预计算常量，避免循环内重复计算
         self.required_field_dict = {field: True for field in  self.required_fields} if self.required_fields else {}
-        self.field_title_dict = {self.fields[i]: self.xlsx_headers[i] for i in range(len(self.fields))}
-        self.fields_length = len(self.fields) if self.fields else 0
+        # self.field_title_dict = {self.fields[i]: self.xlsx_headers[i] for i in range(len(self.fields))} if self.fields else {}
+        # self.fields_length = len(self.fields) if self.fields else 0
+
+    @property
+    def field_title_dict(self):
+        return {self.fields[i]: self.xlsx_headers[i] for i in range(len(self.fields))} if self.fields else {}
+
+    @property
+    def fields_length(self):
+        return len(self.fields) if self.fields else 0
 
     # ------------------------------ 钩子函数 ------------------------------------
     async def handle_data(self, rows: List[Dict[str, str]]):

{fastgenerateapi-1.2.35 → fastgenerateapi-1.2.37}/fastgenerateapi/my_fields/enum_field.py

@@ -57,7 +57,7 @@ class IntEnumField(IntEnumFieldInstance):
             if isinstance(value, IntEnumClass):
                 value = value.value
             value = int(value)  # pylint: disable=E1102
-            if value > len(self.enum_list) or 0 > value:
+            if value < self.start_num or value > len(self.enum_list) + self.start_num - 1:
                 raise HTTPException(detail=f"枚举值：{value} 校验失败。【{self.description}】", status_code=422)
         self.validate(value)
         return value

{fastgenerateapi-1.2.35 → 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.35 → fastgenerateapi-1.2.37}/fastgenerateapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fastgenerateapi
-Version: 1.2.35
+Version: 1.2.37
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com
@@ -14,6 +14,15 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.7.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary