fastgenerateapi 0.0.26__tar.gz → 0.0.27__tar.gz

{fastgenerateapi-0.0.26 → fastgenerateapi-0.0.27}/PKG-INFO

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

{fastgenerateapi-0.0.26 → fastgenerateapi-0.0.27}/fastgenerateapi/__version__.py

@@ -8,7 +8,7 @@
 #                                                  d8888P
 
 
-VERSION = (0, 0, 26)
+VERSION = (0, 0, 27)
 
 __version__ = '.'.join(map(str, VERSION))
 

{fastgenerateapi-0.0.26 → fastgenerateapi-0.0.27}/fastgenerateapi/api_view/delete_view.py

@@ -28,19 +28,21 @@ class DeleteView(BaseView):
         queryset = await self.get_del_queryset(request_data=request_data, *args, **kwargs)
         await self.delete_queryset(queryset)
 
-        # if unique_fields := self._get_unique_fields(self.model_class):
-        #     for model in await queryset:
-        #         model.is_active = False
-        #         for field in unique_fields:
-        #             try:
-        #                 setattr(model, field, getattr(model, field) + f"__{int(time.time() * 1000)}")
-        #             except Exception as e:
-        #                 setattr(model, field, getattr(model, field) + f"__{int(time.time() * 1000)}")
-        #         await model.save()
-        # else:
-        #     await queryset.update(is_active=False)
         return
 
+    # 弃用思路：唯一字段加时间戳
+    # if unique_fields := self._get_unique_fields(self.model_class):
+    #     for model in await queryset:
+    #         model.is_active = False
+    #         for field in unique_fields:
+    #             try:
+    #                 setattr(model, field, getattr(model, field) + f"__{int(time.time() * 1000)}")
+    #             except Exception as e:
+    #                 setattr(model, field, getattr(model, field) + f"__{int(time.time() * 1000)}")
+    #         await model.save()
+    # else:
+    #     await queryset.update(is_active=False)
+
     async def get_del_queryset(self, request_data, *args, **kwargs):
         queryset = self.queryset.filter(id__in=request_data.id_list)
         return queryset

{fastgenerateapi-0.0.26 → fastgenerateapi-0.0.27}/fastgenerateapi/api_view/get_all_view.py

@@ -130,6 +130,9 @@ class GetAllView(BaseView, GetMixin):
             settings.app_settings.LIST_RESPONSE_FIELD: data_list,
         })
 
+    def get_page_list(self, page_result: BaseModel):
+        return getattr(page_result, settings.app_settings.LIST_RESPONSE_FIELD, [])
+
     def _get_all_decorator(self, *args: Any, **kwargs: Any) -> DecoratedCallable:
         @get_all_cache_decorator(cache(expire=settings.app_settings.CACHE_GET_ALL_SECONDS, coder=JsonCoder, key_builder=generate_key_builder))
         async def route(

{fastgenerateapi-0.0.26 → fastgenerateapi-0.0.27}/fastgenerateapi/api_view/mixin/dbmodel_mixin.py

@@ -84,9 +84,12 @@ class DBModelMixin:
             return []
 
     @staticmethod
-    def _get_foreign_key_fields(model_class: Type[Model] = None) -> List[str]:
+    def _get_foreign_key_fields(model_class: Type[Model] = None, is_with_id: bool = True) -> List[str]:
         try:
-            return list(model_class._meta.fk_fields)
+            fields = list(model_class._meta.fk_fields)
+            if is_with_id:
+                fields = [field + "_id" for field in fields]
+            return fields
         except:
             return []
 

{fastgenerateapi-0.0.26 → fastgenerateapi-0.0.27}/fastgenerateapi/my_fields/enum_field.py

@@ -51,6 +51,8 @@ class IntEnumField(IntEnumFieldInstance):
         Converts from the Python type to the DB type.
         """
         if value is not None:
+            if isinstance(value, IntEnumClass):
+                value = value.value
             value = int(value)  # pylint: disable=E1102
             if value > len(self.enum_list) or 0 > value:
                 raise HTTPException(detail=f"枚举值：{value} 校验失败。【{self.description}】", status_code=422)
@@ -125,6 +127,9 @@ class IntEnumClass:
     def __str__(self):
         return f"{self.value}"
 
+    def __int__(self):
+        return self.value
+
     @property
     def name(self):
         try:

{fastgenerateapi-0.0.26 → fastgenerateapi-0.0.27}/fastgenerateapi/my_fields/pk_field.py

@@ -29,10 +29,8 @@ class PrimaryKeyField(Field[str], str):
     allows_generated = True
 
     def __init__(self, **kwargs: Any) -> None:
-        kwargs["generated"] = False
-        kwargs["unique"] = True
-        kwargs["description"] = "主键"
-        kwargs["default"] = worker.get_id
+        kwargs.setdefault("description", "主键")
+        kwargs.setdefault("default", worker.get_id)
         super().__init__(pk=True, **kwargs)
 
     def to_db_value(self, value: Any, instance: "Union[Type[Model], Model]") -> Any:

{fastgenerateapi-0.0.26 → fastgenerateapi-0.0.27}/fastgenerateapi/schemas_factory/update_schema_factory.py

@@ -43,7 +43,7 @@ def update_schema_factory(
             all_fields_info.update(update_include_fields_dict)
             include_fields.update(update_include_fields_dict.keys())
         if hasattr(model_class.PydanticMeta, "save_exclude"):
-            exclude_fields.update(model_class.PydanticMeta.update_exclude)
+            exclude_fields.update(model_class.PydanticMeta.save_exclude)
         if hasattr(model_class.PydanticMeta, "update_exclude"):
             exclude_fields.update(model_class.PydanticMeta.update_exclude)
     else:

{fastgenerateapi-0.0.26 → fastgenerateapi-0.0.27}/fastgenerateapi.egg-info/PKG-INFO

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