fastgenerateapi 1.1.7__tar.gz → 1.1.8__tar.gz

{fastgenerateapi-1.1.7 → fastgenerateapi-1.1.8}/PKG-INFO

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

{fastgenerateapi-1.1.7 → fastgenerateapi-1.1.8}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.1.7 → fastgenerateapi-1.1.8}/fastgenerateapi/api_view/base_view.py

@@ -78,9 +78,11 @@ 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 = await self.queryset.filter(pk=pk).prefetch_related(
-            *self.prefetch_related_fields.keys()).first()
+    async def get_object(self, pk, is_with_prefetch):
+        queryset = self.queryset.filter(id=pk)
+        if is_with_prefetch:
+            queryset = queryset.prefetch_related(*self.prefetch_related_fields.keys())
+        model = await queryset.first()
         if model:
             return model
         else:

{fastgenerateapi-1.1.7 → fastgenerateapi-1.1.8}/fastgenerateapi/api_view/get_one_view.py

@@ -22,6 +22,7 @@ class GetOneView(BaseView, GetMixin):
 
     get_one_route: Union[bool, DEPENDENCIES] = True
     get_one_schema: Optional[Type[BaseModel]] = None
+    is_with_prefetch: Optional[bool] = False
     """
     get_one_route: 获取详情路由开关，可以放依赖函数列表
     get_one_schema: 返回序列化
@@ -31,12 +32,13 @@ class GetOneView(BaseView, GetMixin):
                 - 优选模型层get_one_include和get_one_exclude(同时存在交集)
                 - 合并模型层include和exclude(同时存在交集)
                 - 模型层所有字段
+    is_with_prefetch: 是否带有列表的prefetch_related_fields
     """
 
     async def get_one(self, pk: str, *args, **kwargs):
-        model = await self.get_object(pk)
-
-        await self.setattr_model(model, prefetch_related_fields=self.prefetch_related_fields, *args, **kwargs)
+        model = await self.get_object(pk, self.is_with_prefetch)
+        if self.is_with_prefetch:
+            await self.setattr_model(model, prefetch_related_fields=self.prefetch_related_fields, *args, **kwargs)
 
         # await self.setattr_model_rpc(self.rpc_class, model, self.rpc_param)
         model = await self.set_get_model(model)

{fastgenerateapi-1.1.7 → fastgenerateapi-1.1.8}/fastgenerateapi/api_view/mixin/response_mixin.py

@@ -22,7 +22,7 @@ class ResponseMixin:
             msg: str = "请求成功",
             status_code: int = 200,
             code: Optional[int] = None,
-            data: Union[BaseModel, dict, str, None] = None,
+            data: Any = None,
             background: Optional[BackgroundTask] = None,
             *args,
             **kwargs
@@ -37,7 +37,7 @@ class ResponseMixin:
             "success": True,
             "code": code,
             settings.app_settings.MESSAGE_RESPONSE_FIELD: msg,
-            "data": json_compatible_data
+            settings.app_settings.DATA_RESPONSE_FIELD: json_compatible_data
         })
         kwargs.update(resp.dict())
         return JSONResponse(kwargs, status_code=status_code, background=background)
@@ -48,7 +48,7 @@ class ResponseMixin:
             status_code: int = 200,
             code: Optional[int] = None,
             # success: bool = False,
-            data: Union[BaseModel, dict, str, None] = None,
+            data: Any = None,
             background: Optional[BackgroundTask] = None,
             headers: Optional[Dict[str, Any]] = None,
             *args,
@@ -65,7 +65,7 @@ class ResponseMixin:
             "success": False,
             "code": code,
             settings.app_settings.MESSAGE_RESPONSE_FIELD: msg,
-            "data": json_compatible_data
+            settings.app_settings.DATA_RESPONSE_FIELD: json_compatible_data
         })
         kwargs.update(resp.dict())
         return JSONResponse(

{fastgenerateapi-1.1.7 → fastgenerateapi-1.1.8}/fastgenerateapi/example/models.py

@@ -13,7 +13,7 @@ class StaffInfo(Model):
     """
         员工信息
     """
-    delete_at: Optional[datetime.datetime] = my_fields.SoftDeleteField()
+    deleted_at: Optional[datetime.datetime] = my_fields.SoftDeleteField()
     created_at: Optional[datetime.datetime] = fields.DatetimeField(null=True, auto_now_add=True, description="创建时间")
     category: Optional[IntEnumClass] = my_fields.IntEnumField(enum_list=["总经理", '主管', '员工'], description="职位分类")
     name: Optional[str] = fields.CharField(description="名字", max_length=255)
@@ -31,7 +31,7 @@ class StaffInfo(Model):
 
     class PydanticMeta:
         # 以下内容仅用于演示，存在重复和多余写法
-        exclude = ["delete_at", "created_at"]
+        exclude = ["deleted_at", "created_at"]
         get_include = ["category_name", "name"]
         get_all_include = ["company__name"]
         get_one_include = [("test", Optional[str], FieldInfo(default="", description="测试字段")), ]
@@ -42,7 +42,7 @@ class CompanyInfo(Model):
     """
         公司信息
     """
-    delete_at: Optional[datetime.datetime] = my_fields.SoftDeleteField()
+    deleted_at: Optional[datetime.datetime] = my_fields.SoftDeleteField()
     name: str = fields.CharField(description="岗位名称", max_length=255)
     boss_name: str = fields.CharField(description="老板名字", max_length=255)
     parent: fields.ForeignKeyNullableRelation["CompanyInfo"] = fields.ForeignKeyField(
@@ -53,7 +53,7 @@ class CompanyInfo(Model):
         description='父级')
 
     class PydanticMeta:
-        exclude = ["delete_at"]
+        exclude = ["deleted_at"]
 
 
 

{fastgenerateapi-1.1.7 → fastgenerateapi-1.1.8}/fastgenerateapi/model/base_model.py

@@ -45,12 +45,21 @@ class BaseActiveMixin(models.Model):
     class Meta:
         abstract = True
 
-
 class TortoiseOrmAbstractModel(PrimaryKeyMixin, TimestampMixin, BaseDeleteMixin):
     ...
 
     class PydanticMeta:
-        exclude = ["delete_at"]
+        exclude = ["deleted_at"]
+
+    class Meta:
+        abstract = True
+
+
+class TortoiseOrmAbstractBaseModel(PrimaryKeyMixin, TimestampMixin, BaseActiveMixin):
+    ...
+
+    class PydanticMeta:
+        exclude = ["is_active"]
 
     class Meta:
         abstract = True

{fastgenerateapi-1.1.7 → fastgenerateapi-1.1.8}/fastgenerateapi/my_fields/enum_field.py

@@ -23,7 +23,8 @@ if TYPE_CHECKING:  # pragma: nocoverage
 
 class IntEnumField(IntEnumFieldInstance):
     """
-    传入参数数组，默认生成枚举类，数字从 1 开始
+    传入参数数组，默认生成枚举类，数字从 0 开始
+    可以通过 start_num=1 设置从1开始
     例如：
         enum_list = ["A", "B"]
     相当于枚举
@@ -33,10 +34,10 @@ class IntEnumField(IntEnumFieldInstance):
     通过方法 get_name 获取对应的值， "A"
     """
 
-    def __init__(self, enum_list: List[any], **kwargs: Any) -> None:
+    def __init__(self, enum_list: List[any], start_num=0, **kwargs: Any) -> None:
         self.enum_list = enum_list
         self.description = kwargs.get("description", "") + " >> " + self.get_description(enum_list)
-        super().__init__(enum_type=self.create_enum(enum_list), **kwargs)
+        super().__init__(enum_type=self.create_enum(enum_list, start_num=start_num), **kwargs)
 
     @property
     def constraints(self) -> dict:
@@ -73,10 +74,10 @@ class IntEnumField(IntEnumFieldInstance):
             description += f"{index}:{val};"
         return description
 
-    def create_enum(self, enum_list):
+    def create_enum(self, enum_list, start_num=0):
         # 创建枚举类的成员字典，确保值是唯一的
 
-        members = {self.number_to_words(name): name for name, _ in enumerate(enum_list, 0)}
+        members = {self.number_to_words(name): name for name, _ in enumerate(enum_list, start_num)}
 
         # 使用Enum的元类EnumMeta来动态创建枚举类
         enum_class = IntEnum("CategoryEnum", members)

{fastgenerateapi-1.1.7 → fastgenerateapi-1.1.8}/fastgenerateapi/schemas_factory/response_factory.py

@@ -29,7 +29,7 @@ def response_factory(schema_cls: Union[Type[T], BaseModel, None] = None, name: s
     else:
         fields.setdefault(
             settings.app_settings.DATA_RESPONSE_FIELD,
-            (Union[dict, str, None], FieldInfo(default={}, description="数据内容"))
+            (Union[dict, list, str, None], FieldInfo(default={}, description="数据内容"))
         )
 
     try:

{fastgenerateapi-1.1.7 → fastgenerateapi-1.1.8}/fastgenerateapi/utils/auto_discover.py

@@ -55,7 +55,7 @@ def discover_routes(
 
 
 if __name__ == '__main__':
-    # print(discover_models("../../modules"))
-    print(get_path_list("../../modules", "router"))
+    print(discover_models("../../apps"))
+    # print(get_path_list("../../apps", "router"))
 
 

{fastgenerateapi-1.1.7 → fastgenerateapi-1.1.8}/fastgenerateapi.egg-info/PKG-INFO

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