fastgenerateapi 1.1.14__tar.gz → 1.1.15__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.1.14
+Version: 1.1.15
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com
@@ -25,7 +25,7 @@ License-File: LICENSE
 
 #### 版本说明
 [pydantic-v2]
-稳定版本：v1.1.13+
+稳定版本：v1.1.15+
 建议python版本：3.9+
 推荐fastapi版本：0.103.2+
 推荐pydantic版本：2.11.5+

{fastgenerateapi-1.1.14 → fastgenerateapi-1.1.15}/README.md

@@ -7,7 +7,7 @@
 
 #### 版本说明
 [pydantic-v2]
-稳定版本：v1.1.13+
+稳定版本：v1.1.15+
 建议python版本：3.9+
 推荐fastapi版本：0.103.2+
 推荐pydantic版本：2.11.5+

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

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

{fastgenerateapi-1.1.14 → fastgenerateapi-1.1.15}/fastgenerateapi/api_view/base_view.py

@@ -58,11 +58,10 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
 
         return self.get_active_queryset(self.model_class)
 
-    def get_active_queryset(self, model_class: Union[Type[Model], QuerySet, None] = None) -> QuerySet:
+    @staticmethod
+    def get_active_queryset(model_class: Union[Type[Model], QuerySet, None] = None) -> QuerySet:
         if not model_class:
-            if not self.model_class:
-                return self.error(msg="model_class not allow None")
-            model_class = self.model_class
+            raise ResponseMixin.error(f"model_class not allow None")
         delete_filter_dict = {settings.app_settings.WHETHER_DELETE_FIELD: True}
         if settings.app_settings.DELETE_FIELD_TYPE == "time":
             delete_filter_dict = {settings.app_settings.WHETHER_DELETE_FIELD: 0}
@@ -76,26 +75,26 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
             return self.error(msg="relation_model_class not allow None")
         return self.get_active_queryset(self.relation_model_class)
 
-    async def get_object(self, pk, model_class=None, is_with_prefetch=False):
-        if model_class:
-            queryset = self.get_active_queryset(model_class).filter(id=pk)
-        else:
-            queryset = self.queryset.filter(id=pk)
+    @classmethod
+    async def get_object(cls, pk, model_class, is_with_prefetch=False):
+        queryset = cls.get_active_queryset(model_class).filter(id=pk)
         if is_with_prefetch:
-            queryset = queryset.prefetch_related(*self.prefetch_related_fields.keys())
+            queryset = queryset.prefetch_related(*cls.prefetch_related_fields.keys())
         model = await queryset.first()
         if model:
             return model
         else:
             raise NOT_FOUND
 
-    def _delete_value(self):
+    @staticmethod
+    def _delete_value():
         result = False
         if settings.app_settings.DELETE_FIELD_TYPE == "time":
             result = int(time.time() * 1000)
         return result
 
-    async def delete_queryset(self, queryset: QuerySet):
+    @staticmethod
+    async def delete_queryset(queryset: QuerySet):
         """
         考虑到不一定会集成已有的模型，删除根据是否存在字段来判断
         :param queryset:
@@ -103,7 +102,7 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
         """
         if settings.app_settings.WHETHER_DELETE_FIELD in queryset.fields:
             await queryset.update(**{
-                settings.app_settings.WHETHER_DELETE_FIELD: self._delete_value()
+                settings.app_settings.WHETHER_DELETE_FIELD: BaseView._delete_value()
             })
         else:
             await queryset.delete()
@@ -155,20 +154,21 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
         )
         return schema.model_validate(model_dict)
 
+    @classmethod
     async def check_unique_field(
-            self,
+            cls,
             request_data: Union[BaseModel, Model],  # 创建或修改的参数数据
             model_class: Type[Model],       # 数据库模型
             model: Union[Model, None] = None
     ):
-        check_unique_fields = self._get_unique_fields(model_class) + self._get_foreign_key_fields(model_class)
-        check_unique_together_fields = self._get_unique_together_fields(model_class)
+        check_unique_fields = cls._get_unique_fields(model_class) + cls._get_foreign_key_fields(model_class)
+        check_unique_together_fields = cls._get_unique_together_fields(model_class)
         for unique_field in check_unique_fields:
             if hasattr(request_data, unique_field):
                 if model and getattr(request_data, unique_field) == getattr(model, unique_field):
                     continue
                 if await model_class.filter(**{unique_field: getattr(request_data, unique_field)}).first():
-                    self.fail(msg=f"{self.get_field_description(model_class, unique_field)}已存在相同值：{getattr(request_data, unique_field)}")
+                    return cls.error(msg=f"{cls.get_field_description(model_class, unique_field)}已存在相同值：{getattr(request_data, unique_field)}")
         for unique_together_fields in check_unique_together_fields:
             filter_fields = {}
             is_equal = True
@@ -193,8 +193,8 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
             if await model_class.filter(**filter_fields).first():
                 if settings.app_settings.WHETHER_DELETE_FIELD in description_fields:
                     description_fields.remove(settings.app_settings.WHETHER_DELETE_FIELD)
-                return self.error(
-                    msg=f"{self.get_field_description(model_class, description_fields)}已存在相同值：{[filter_fields.get(field) for field in description_fields]}"
+                return cls.error(
+                    msg=f"{cls.get_field_description(model_class, description_fields)}已存在相同值：{[filter_fields.get(field) for field in description_fields]}"
                 )
 
     # @staticmethod

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

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

{fastgenerateapi-1.1.14 → fastgenerateapi-1.1.15}/fastgenerateapi/api_view/mixin/base_mixin.py

@@ -52,7 +52,8 @@ class BaseMixin(Generic[T], APIRouter, ABC):
         #     if hasattr(self, "_handler_sql_get_all_settings"):
         #         getattr(self, "_handler_sql_get_all_settings")()
 
-    def get_base_filter(self, fields: list, schema: Optional[PYDANTIC_SCHEMA] = None) -> list:
+    @staticmethod
+    def get_base_filter(fields: list, schema: Optional[PYDANTIC_SCHEMA] = None) -> list:
         bast_filter_list = []
         if fields:
             bast_filter_list += [BaseFilter(field) if not isinstance(field, BaseFilter) else field for field in fields]

{fastgenerateapi-1.1.14 → fastgenerateapi-1.1.15}/fastgenerateapi/api_view/update_view.py

@@ -29,7 +29,7 @@ class UpdateView(BaseView, SaveMixin):
 
     @atomic()
     async def update(self, pk: str, request_data, *args, **kwargs):
-        model = await self.get_object(pk)
+        model = await self.get_object(pk, self.model_class)
 
         request_data = await self.set_update_fields(request_data=request_data, *args, **kwargs)
 

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

@@ -11,6 +11,8 @@ from fastgenerateapi.settings.all_settings import settings
 def get_field_info(value, description="", default_field_type=None) -> (Type, FieldInfo):
     if value.pk:
         return str, FieldInfo()
+
+    required = False
     if value.field_type is None:
         if default_field_type:
             field_type = Optional[default_field_type]
@@ -21,8 +23,9 @@ def get_field_info(value, description="", default_field_type=None) -> (Type, Fie
             field_type = Optional[value.field_type]
         else:
             field_type = value.field_type
-    field_info_dict = {}
-    if hasattr(value, "default") and not hasattr(value.default, '__call__'):
+            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)
     if hasattr(value, "description"):
         field_info_dict.setdefault("description", description + (value.description or ""))

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.1.14
+Version: 1.1.15
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com
@@ -25,7 +25,7 @@ License-File: LICENSE
 
 #### 版本说明
 [pydantic-v2]
-稳定版本：v1.1.13+
+稳定版本：v1.1.15+
 建议python版本：3.9+
 推荐fastapi版本：0.103.2+
 推荐pydantic版本：2.11.5+