fastgenerateapi 1.1.11__py2.py3-none-any.whl → 1.1.13__py2.py3-none-any.whl

fastgenerateapi/__version__.py

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

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/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/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/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.dist-info → fastgenerateapi-1.1.13.dist-info}/METADATA

@@ -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.dist-info → fastgenerateapi-1.1.13.dist-info}/RECORD

@@ -1,8 +1,8 @@
 fastgenerateapi/__init__.py,sha256=eh2qtp7FbjrgaRX5b3H3UWpasFdNHbVFqLUhpqVbaTU,1287
-fastgenerateapi/__version__.py,sha256=-n7dhyb2qQZHtAwcRPpSC9Z4U1Vo6n0LrAe9Qiooq-I,497
+fastgenerateapi/__version__.py,sha256=O1vSHwP1CokGmyIQTNR-1AryP35eS8hykDRa8WI-wcs,497
 fastgenerateapi/api_view/__init__.py,sha256=zkaTX5JxsNfjF-dFeEbHfUB58vhPMjm6Iiqx9HgJOrY,14
 fastgenerateapi/api_view/api_view.py,sha256=mfD8GB-hnyI2XO3tkSOlEa2FfBLdq0_Wqvp8gFrXFKU,1160
-fastgenerateapi/api_view/base_view.py,sha256=s8f6zdoRqPRmo6o2FqHZG2MKcn1gc8JELix8VetVo3k,9810
+fastgenerateapi/api_view/base_view.py,sha256=cgdX1VYVjDYWXunBtHbglc5YW7J9Nuda4fLM0b_X4F4,10088
 fastgenerateapi/api_view/create_view.py,sha256=NvJ0ocD2UMHcdipA4W7MYamxAw8sYeXAc176VAdkLek,4621
 fastgenerateapi/api_view/delete_filter_view.py,sha256=ZP9pmRNeCTu_Go4ErfnDPnkPMShEh_Ql18iNCfMNJ3s,2838
 fastgenerateapi/api_view/delete_tree_view.py,sha256=oqkWQNlA7TNZHHRTJJwxidOHxOgmvUpcnu81cT3oTA0,4083
@@ -55,16 +55,16 @@ fastgenerateapi/example/schemas.py,sha256=8UjQxy0lAvQ-nY2-PPNcsmzfg5TZJe0bVyhuIo
 fastgenerateapi/example/views.py,sha256=eYy5jgcc-IVwKREMA3U4RNDku27Nn9NJU_Flwbp3R-4,3258
 fastgenerateapi/fastapi_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastgenerateapi/fastapi_utils/all.py,sha256=QO-VcNGKFbpP7OfAl9EUtZYIjSvqSrHoyFjrQGfm8hc,79
-fastgenerateapi/fastapi_utils/param_utils.py,sha256=Y2ktF8_ul9mg3V8elMTpz_Pp_iio0wqoQ7Yg_IGaGto,1219
+fastgenerateapi/fastapi_utils/param_utils.py,sha256=ja_3VRJyWQrOfxlbVrUHZtqDw18MfJ3iRs43IEfoOFY,1091
 fastgenerateapi/fastapi_utils/response_utils.py,sha256=dqQHIeAe6N1zA5diUfDdGBQkyzZ82b-8GrgWzqrkw18,15922
 fastgenerateapi/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastgenerateapi/model/base_model.py,sha256=0eeIOHvkR4ZBpcs9mh-zlgMglJ8IGX9x7-lxdq8RPfI,1776
+fastgenerateapi/model/base_model.py,sha256=EdPxjm0Nfpaj6-GzYISOvwWuexZzlqHAm2JD-3h6x4E,1869
 fastgenerateapi/my_fields/__init__.py,sha256=StbTm3_2IBZ8U5kEWxtNyZ3I-Qs-pCFd5vtAZTq52wA,202
 fastgenerateapi/my_fields/aes_field.py,sha256=r4_Jhuq5lgwmITWjUYcFrv5uBR57GPGCVMgy3yNDvp4,4518
 fastgenerateapi/my_fields/enum_field.py,sha256=5aRaJ1caiNxAzD_sNlRqGxS-knX9iUHd3pk5hCAXBAo,7986
 fastgenerateapi/my_fields/pk_field.py,sha256=0rZIylE98xyW9QNlInr-HN843sxChwpoO4wRumWNKw4,1317
 fastgenerateapi/my_fields/pwd_field.py,sha256=eUnarxEyHgpOzTBmsl0KxsI8lR7FzUDjxyFCKTqJDBU,2191
-fastgenerateapi/my_fields/soft_delete_field.py,sha256=0Vf_BWewF71M27pAXkaUM82EyMe_pf3KDnW2aZmToEQ,1452
+fastgenerateapi/my_fields/soft_delete_field.py,sha256=taB05-gif79EAfrueqSfFb-xOep5uZ25vfdc4D4aAqM,1450
 fastgenerateapi/my_fields/validator.py,sha256=0mPsV4tOIw1YYuBCN7YJPYCWstIsCsy9K3b38ih1_JY,1981
 fastgenerateapi/pydantic_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastgenerateapi/pydantic_utils/base_model.py,sha256=uZejyLi1KL1uNC9TlOVXVPGrxG0DWXedZVtvDYu3LlU,2239
@@ -103,8 +103,8 @@ fastgenerateapi/utils/snowflake.py,sha256=GiFVkE10sPiqJ094sMfrPsaV7Y9Y3c1djrSfgs
 fastgenerateapi/utils/str_util.py,sha256=c-jUlCFw-Dz4W1W9Jc1TqGZw3JXu-qN5ovnE6fjc9j0,3445
 fastgenerateapi/utils/swagger_to_js.py,sha256=pPPTag6TYtxdbKMHD3m8lJvc8Gv9HC97CGHt4esU1-E,530
 script/__init__.py,sha256=26UWatnbm6ZIwQMuu9NNzQ0IW1ACO4Oe9caModuTpWM,4
-fastgenerateapi-1.1.11.dist-info/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
-fastgenerateapi-1.1.11.dist-info/METADATA,sha256=jFaw2DlNnKiSf98Co48jlHrprvW8sKQjehfXfStj3to,5961
-fastgenerateapi-1.1.11.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-fastgenerateapi-1.1.11.dist-info/top_level.txt,sha256=CW2SlpYjTRdacF-5ufnPMtwpYcR0XYn_bDxa2ZrrTBI,23
-fastgenerateapi-1.1.11.dist-info/RECORD,,
+fastgenerateapi-1.1.13.dist-info/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
+fastgenerateapi-1.1.13.dist-info/METADATA,sha256=219VndvGuoJ8InOYf6nMR_Brk2tLAD8hioW0GWrKN14,5964
+fastgenerateapi-1.1.13.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+fastgenerateapi-1.1.13.dist-info/top_level.txt,sha256=CW2SlpYjTRdacF-5ufnPMtwpYcR0XYn_bDxa2ZrrTBI,23
+fastgenerateapi-1.1.13.dist-info/RECORD,,