fastgenerateapi 1.1.11__tar.gz → 1.1.13__tar.gz

{fastgenerateapi-1.1.11 → fastgenerateapi-1.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.1.11
+Version: 1.1.13
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com
@@ -24,10 +24,10 @@ License-File: LICENSE
 [Github](https://github.com/ShiLiangAPI)
 
 #### 版本说明
-最新版本：v1.1.7
+最新版本：v1.1.7+
 建议python版本：3.9+
-推荐fastapi版本：0.103.2
-推荐pydantic版本：2.11.5
+推荐fastapi版本：0.103.2+
+推荐pydantic版本：2.11.5+
 
 稳定版本：v0.0.21
 建议python版本：3.9+

{fastgenerateapi-1.1.11 → fastgenerateapi-1.1.13}/README.md

@@ -6,10 +6,10 @@
 [Github](https://github.com/ShiLiangAPI)
 
 #### 版本说明
-最新版本：v1.1.7
+最新版本：v1.1.7+
 建议python版本：3.9+
-推荐fastapi版本：0.103.2
-推荐pydantic版本：2.11.5
+推荐fastapi版本：0.103.2+
+推荐pydantic版本：2.11.5+
 
 稳定版本：v0.0.21
 建议python版本：3.9+

{fastgenerateapi-1.1.11 → fastgenerateapi-1.1.13}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.1.11 → fastgenerateapi-1.1.13}/fastgenerateapi/api_view/base_view.py

@@ -63,12 +63,10 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
             if not self.model_class:
                 return self.error(msg="model_class not allow None")
             model_class = self.model_class
-        delete_filter_field = settings.app_settings.WHETHER_DELETE_FIELD
+        delete_filter_dict = {settings.app_settings.WHETHER_DELETE_FIELD: True}
         if settings.app_settings.DELETE_FIELD_TYPE == "time":
-            delete_filter_field = f"{settings.app_settings.WHETHER_DELETE_FIELD}__isnull"
-        queryset = model_class.filter(**{
-            delete_filter_field: True
-        })
+            delete_filter_dict = {settings.app_settings.WHETHER_DELETE_FIELD: 0}
+        queryset = model_class.filter(**delete_filter_dict)
 
         return queryset
 
@@ -123,6 +121,8 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
                 attr_model = getattr(attr_model, attr_key, None)
 
             if attr_model:
+                if settings.app_settings.SCHEMAS_UNDERLINE_WHETHER_DOUBLE_TO_SINGLE:
+                    key = key.replace("__", "_")
                 for value in value_list:
                     if type(value) == str:
                         setattr(model, key + "_" + value, getattr(attr_model, value, None) if attr_model else None)
@@ -168,7 +168,7 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
                 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(message=f"{self.get_field_description(model_class, unique_field)}已存在相同值：{getattr(request_data, unique_field)}")
+                    self.fail(msg=f"{self.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
@@ -191,8 +191,10 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
                 continue
 
             if await model_class.filter(**filter_fields).first():
-                self.fail(
-                    message=f"{self.get_field_description(model_class, description_fields)}已存在相同值：{[filter_fields.get(field) for field in description_fields]}"
+                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]}"
                 )
 
     # @staticmethod

{fastgenerateapi-1.1.11 → fastgenerateapi-1.1.13}/fastgenerateapi/fastapi_utils/param_utils.py

@@ -27,8 +27,6 @@ def get_param_sub_dependant(
         query_param_field = depends.dependency.model_fields.get(query_param.name)
         if query_param_field:
             query_param.field_info.description = query_param_field.description or query_param_field.title or ""
-        else:
-            query_param.field_info.description = query_param_field.description or query_param_field.title or ""
     return dependant
 
 

{fastgenerateapi-1.1.11 → fastgenerateapi-1.1.13}/fastgenerateapi/model/base_model.py

@@ -33,6 +33,8 @@ class BaseDeleteMixin(models.Model):
 
     class Meta:
         abstract = True
+        # 常用于联合索引
+        # unique_together = (("field_xxx", "deleted_at"),)
 
 
 class BaseActiveMixin(models.Model):

{fastgenerateapi-1.1.11 → fastgenerateapi-1.1.13}/fastgenerateapi/my_fields/soft_delete_field.py

@@ -27,8 +27,8 @@ class SoftDeleteField(BigIntField):
 
     def __init__(self, **kwargs: Any) -> None:
         kwargs.setdefault("index", True)
-        kwargs.setdefault("null", True)
-        kwargs.setdefault("default", None)
+        kwargs.setdefault("null", False)
+        kwargs.setdefault("default", 0)
         kwargs.setdefault("description", "软删除")
         super().__init__(**kwargs)
 

{fastgenerateapi-1.1.11 → fastgenerateapi-1.1.13}/fastgenerateapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.1.11
+Version: 1.1.13
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com
@@ -24,10 +24,10 @@ License-File: LICENSE
 [Github](https://github.com/ShiLiangAPI)
 
 #### 版本说明
-最新版本：v1.1.7
+最新版本：v1.1.7+
 建议python版本：3.9+
-推荐fastapi版本：0.103.2
-推荐pydantic版本：2.11.5
+推荐fastapi版本：0.103.2+
+推荐pydantic版本：2.11.5+
 
 稳定版本：v0.0.21
 建议python版本：3.9+