fastgenerateapi 1.2.1__tar.gz → 1.2.3__tar.gz

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.2.1
+Version: 1.2.3
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com
@@ -94,14 +94,14 @@ uvicorn.run(app)
 - get_one_include, get_one_exclude
   - 与include同时生效，无include自动包含数据库模型搜友字段
   - 可添加跨表字段，自动生成校验和文档
-  - 其他字段: ("test", Optioanl[str], FieldInfo(..., description="文档描述"))
+  - 其他字段: ("test", Optional[str], FieldInfo(..., description="文档描述"))
 - get_all_include, get_all_exclude
 - create_include, create_exclude
 - update_include, update_exclude
 
 #### 指定模型
 ```python
-from core.crud.api_view import APIView
+from fastgenerateapi import APIView
 
 class XxxView(APIView):
     model_class = XxxModel
@@ -110,7 +110,7 @@ class XxxView(APIView):
 #### 查询/创建/修改字段限制及校验示例
 - 如果有唯一字段或者联合唯一字段自动校验是否为唯一值
 ```python
-from core.crud.api_view import APIView
+from fastgenerateapi import APIView
 
 class XxxView(APIView):
     list_schema = HeathInfoList
@@ -126,11 +126,12 @@ class XxxView(APIView):
 ```python
 class XxxView(APIView):
 
-    def view_路由(self):
+    def view_get_user_list(self):
         """
-        文档注释
+        文档Summary注释
+        生成 get方法，路由为 前缀/user_list
         """
-        return xxx
+        return self.success(data={"list": []})
 ```
 
 

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/README.md

@@ -76,14 +76,14 @@ uvicorn.run(app)
 - get_one_include, get_one_exclude
   - 与include同时生效，无include自动包含数据库模型搜友字段
   - 可添加跨表字段，自动生成校验和文档
-  - 其他字段: ("test", Optioanl[str], FieldInfo(..., description="文档描述"))
+  - 其他字段: ("test", Optional[str], FieldInfo(..., description="文档描述"))
 - get_all_include, get_all_exclude
 - create_include, create_exclude
 - update_include, update_exclude
 
 #### 指定模型
 ```python
-from core.crud.api_view import APIView
+from fastgenerateapi import APIView
 
 class XxxView(APIView):
     model_class = XxxModel
@@ -92,7 +92,7 @@ class XxxView(APIView):
 #### 查询/创建/修改字段限制及校验示例
 - 如果有唯一字段或者联合唯一字段自动校验是否为唯一值
 ```python
-from core.crud.api_view import APIView
+from fastgenerateapi import APIView
 
 class XxxView(APIView):
     list_schema = HeathInfoList
@@ -108,11 +108,12 @@ class XxxView(APIView):
 ```python
 class XxxView(APIView):
 
-    def view_路由(self):
+    def view_get_user_list(self):
         """
-        文档注释
+        文档Summary注释
+        生成 get方法，路由为 前缀/user_list
         """
-        return xxx
+        return self.success(data={"list": []})
 ```
 
 

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi/api_view/create_view.py

@@ -1,6 +1,8 @@
 import inspect
 from typing import Optional, Type, Union, Any
 
+from pydantic import BaseModel as PydanticBaseModel
+
 from fastapi import Depends
 from fastapi.security import OAuth2PasswordBearer
 from fastapi.types import DecoratedCallable
@@ -48,14 +50,7 @@ class CreateView(BaseView, SaveMixin):
         await self.check_unique_field(data_dict, model_class=self.model_class)
         await model.save()
 
-        if settings.app_settings.WHETHER_CREATE_RESPONSE_DATA:
-            if self.is_with_prefetch:
-                model = await self.get_object(model.id, self.model_class, self.is_with_prefetch)
-                await self.setattr_model(model, prefetch_related_fields=self.prefetch_related_fields)
-
-            return self.create_response_schema.model_validate(model)
-
-        return
+        return model
 
     async def set_create_fields(self, request_data, *args, **kwargs) -> dict:
         """
@@ -94,7 +89,17 @@ class CreateView(BaseView, SaveMixin):
                 *args,
                 **kwargs
             )
-            return self.success(data=data)
+            if isinstance(data, JSONResponse):
+                return data
+            if isinstance(data, PydanticBaseModel):
+                return self.success(data=data)
+            if settings.app_settings.WHETHER_CREATE_RESPONSE_DATA:
+                if self.is_with_prefetch:
+                    data = await self.get_object(data.id, self.model_class, self.is_with_prefetch)
+                    await self.setattr_model(data, prefetch_related_fields=self.prefetch_related_fields)
+
+                return self.success(data=self.create_response_schema.model_validate(data))
+            return self.success()
         return route
 
     def _handler_create_settings(self):
@@ -109,6 +114,7 @@ class CreateView(BaseView, SaveMixin):
             self.create_response_schema_factory = response_factory(self.create_response_schema, name="Create")
         else:
             self.create_response_schema_factory = self.gen_get_one_response_schema_factory()
+            self.create_response_schema = self.get_one_schema
 
         doc = self.create.__doc__
         summary = doc.strip().split("\n")[0] if doc else f"Create"
@@ -124,9 +130,3 @@ class CreateView(BaseView, SaveMixin):
 
 
 
-
-
-
-
-
-

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi/api_view/delete_filter_view.py

@@ -56,13 +56,12 @@ class DeleteFilterView(BaseView):
         if self.delete_filter_route:
             return
 
+        self.delete_filter_response_schema_factory = None
         func_type = inspect.signature(self.destroy_filter).return_annotation
         if func_type != inspect._empty and func_type is not None:
             self.delete_filter_response_schema = func_type
         if self.delete_filter_response_schema:
             self.delete_filter_response_schema_factory = response_factory(self.delete_filter_response_schema, name="DeleteFilter")
-        else:
-            self.delete_filter_response_schema_factory = self.gen_get_one_response_schema_factory()
 
         doc = self.destroy_filter.__doc__
         summary = doc.strip().split("\n")[0] if doc else "Delete Filter"
@@ -71,7 +70,7 @@ class DeleteFilterView(BaseView):
             path=path,
             endpoint=self._delete_filter_decorator(),
             methods=["DELETE"],
-            response_model=Optional[self.delete_filter_response_schema_factory],
+            response_model=self.delete_filter_response_schema_factory,
             summary=summary,
             dependencies=self.delete_filter_route,
         )

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi/api_view/delete_tree_view.py

@@ -81,13 +81,12 @@ class DeleteTreeView(BaseView):
         if self.delete_tree_route:
             return
 
+        self.delete_tree_response_schema_factory = None
         func_type = inspect.signature(self.destroy_tree).return_annotation
         if func_type != inspect._empty and func_type is not None:
             self.delete_tree_response_schema = func_type
         if self.delete_tree_response_schema:
             self.delete_tree_response_schema_factory = response_factory(self.delete_tree_response_schema, name="DeleteTree")
-        else:
-            self.delete_tree_response_schema_factory = self.gen_get_one_response_schema_factory()
 
         doc = self.destroy_tree.__doc__
         summary = doc.strip().split("\n")[0] if doc else "Delete Tree"
@@ -96,7 +95,7 @@ class DeleteTreeView(BaseView):
             path=path,
             endpoint=self._delete_tree_decorator(),
             methods=["DELETE"],
-            response_model=Optional[self.delete_tree_response_schema_factory],
+            response_model=self.delete_tree_response_schema_factory,
             summary=summary,
             dependencies=self.delete_tree_route,
         )

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi/api_view/delete_view.py

@@ -71,13 +71,12 @@ class DeleteView(BaseView):
         if not self.delete_route:
             return
 
+        self.delete_response_schema_factory = None
         func_type = inspect.signature(self.destroy).return_annotation
         if func_type != inspect._empty and func_type is not None:
             self.delete_response_schema = func_type
         if self.delete_response_schema:
             self.delete_response_schema_factory = response_factory(self.delete_response_schema, name="Delete")
-        else:
-            self.delete_response_schema_factory = self.gen_get_one_response_schema_factory()
 
         doc = self.destroy.__doc__
         summary = doc.strip().split("\n")[0] if doc else "Delete All"
@@ -86,7 +85,7 @@ class DeleteView(BaseView):
             path=path,
             endpoint=self._delete_decorator(),
             methods=["DELETE"],
-            response_model=Optional[self.delete_response_schema_factory],
+            response_model=self.delete_response_schema_factory,
             summary=summary,
             dependencies=self.delete_route,
         )

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi/api_view/get_relation_view.py

@@ -56,7 +56,7 @@ class GetRelationView(BaseView):
 
     async def get_relation(self, pk: str, search: str, filters: dict, relation_filters: dict, *args, **kwargs):
         relation_queryset = await self.get_relation_queryset(filters=relation_filters, *args, **kwargs)
-        id_list = relation_queryset.filter(eval(f"Q({self.path_id_name}='{pk}')")).values_list(self.relation_id_name, flat=True)
+        id_list = relation_queryset.filter(Q(**{self.path_id_name: pk})).values_list(self.relation_id_name, flat=True)
 
         queryset = await self.get_queryset(search=search, filters=filters, *args, **kwargs)
 

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi/api_view/get_tree_view.py

@@ -109,7 +109,7 @@ class GetTreeView(BaseView):
             top_nodes = [top_node]
         else:
             queryset = self.queryset.filter(
-                eval(f"Q({settings.app_settings.DEFAULT_TREE_PARENT_FIELD + '_id'}={None})")
+                Q(**{settings.app_settings.DEFAULT_TREE_PARENT_FIELD + '_id__isnull': True})
             ).prefetch_related(settings.app_settings.DEFAULT_TREE_PARENT_FIELD)
 
             queryset = await self.get_tree_queryset(queryset, search, filters)
@@ -133,9 +133,9 @@ class GetTreeView(BaseView):
         return queryset
 
     async def get_tree_recursion(self, node, search: str, filters: dict,):
-        data = self.get_tree_schema.from_orm(node)
+        data = self.get_tree_schema.model_validate(node)
         pk = getattr(data, self._get_pk_field(self.model_class))
-        children_queryset = self.queryset.filter(eval(f"Q({settings.app_settings.DEFAULT_TREE_PARENT_FIELD + '_id'}={pk})"))
+        children_queryset = self.queryset.filter(Q(**{settings.app_settings.DEFAULT_TREE_PARENT_FIELD + '_id': pk}))
         children_queryset = await self.get_tree_queryset(children_queryset, search, filters)
         children_objs = await children_queryset
         if not children_objs:

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi/api_view/mixin/save_mixin.py

@@ -5,7 +5,7 @@ from fastgenerateapi.pydantic_utils.base_model import BaseModel
 
 class SaveMixin:
 
-    async def set_save_fields(self, data_dict: dict, *args, **kwargs) -> dict:
+    async def set_save_fields(self, data_dict: dict, request_data, *args, **kwargs) -> dict:
         """
         添加属性: data_dict['user_id'] = current_user.id
         kwargs 包含 request_data

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi/api_view/update_relation_view.py

@@ -35,7 +35,7 @@ class UpdateRelationView(BaseView, SaveMixin):
 
     @atomic()
     async def update_relation(self, pk: str, request_data, *args, **kwargs):
-        active_id_list = set(await self.queryset.filter(eval(f"Q({self.path_id_name}='{pk}')")).values_list(
+        active_id_list = set(await self.queryset.filter(Q(**{self.path_id_name: pk})).values_list(
             self._get_pk_field(model_class=self.model_class), flat=True
         ))
         add_id_list = set(request_data.id_list) - active_id_list
@@ -75,10 +75,12 @@ class UpdateRelationView(BaseView, SaveMixin):
         if not self.update_relation_route:
             return
 
+        self.update_relation_response_schema_factory = None
         func_type = inspect.signature(self.create).return_annotation
         if func_type != inspect._empty and func_type is not None:
             self.update_relation_response_schema = func_type
-        self.update_relation_response_schema_factory = response_factory(self.update_relation_response_schema, name="UpdateRelation")
+        if self.update_relation_response_schema:
+            self.update_relation_response_schema_factory = response_factory(self.update_relation_response_schema, name="UpdateRelation")
 
         doc = self.update_relation.__doc__
         summary = doc.strip().split("\n")[0] if doc else f"Update {self.model_class.__name__.title()}"

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi/api_view/update_view.py

@@ -1,6 +1,8 @@
 import inspect
 from typing import Optional, Type, Union, Any
 
+from pydantic import BaseModel as PydanticBaseModel
+
 from fastapi import Depends
 from fastapi.security import OAuth2PasswordBearer
 from fastapi.types import DecoratedCallable
@@ -32,23 +34,16 @@ class UpdateView(BaseView, SaveMixin):
     @atomic()
     async def update(self, pk: str, request_data, *args, **kwargs):
         model = await self.get_object(pk, self.model_class, self.is_with_prefetch)
-        data_dict = await self.set_update_fields(request_data=request_data, *args, **kwargs)
-        data_dict = await self.set_save_fields(data_dict, request_data=request_data, *args, **kwargs)
+        data_dict = await self.set_update_fields(model=model, request_data=request_data, *args, **kwargs)
+        data_dict = await self.set_save_fields(data_dict, model=model, request_data=request_data, *args, **kwargs)
 
         await self.check_unique_field(data_dict, model_class=self.model_class, model=model)
         model = await self.set_update_model(model, data_dict, request_data=request_data, *args, **kwargs)
         await model.save()
 
-        if settings.app_settings.WHETHER_UPDATE_RESPONSE_DATA:
-            if self.is_with_prefetch:
-                await self.setattr_model(model, prefetch_related_fields=self.prefetch_related_fields, *args, **kwargs)
-
-            return self.update_response_schema.from_orm(model)
-
-        return
+        return model
 
-    @staticmethod
-    async def set_update_fields(request_data, *args, **kwargs):
+    async def set_update_fields(self, model, request_data, *args, **kwargs) -> dict:
         """
         修改属性:
             data_dict = request_data.dict(exclude_unset=True)
@@ -86,7 +81,18 @@ class UpdateView(BaseView, SaveMixin):
                 token=token,
                 *args, **kwargs
             )
-            return self.success(data=data)
+            if isinstance(data, JSONResponse):
+                return data
+            if isinstance(data, PydanticBaseModel):
+                return self.success(data=data)
+            if settings.app_settings.WHETHER_UPDATE_RESPONSE_DATA:
+                if self.is_with_prefetch:
+                    await self.setattr_model(data, prefetch_related_fields=self.prefetch_related_fields, *args,
+                                             **kwargs)
+
+                return self.success(data=self.update_response_schema.model_validate(data))
+
+            return self.success()
         return route
 
     def _handler_update_settings(self):
@@ -101,6 +107,7 @@ class UpdateView(BaseView, SaveMixin):
             self.update_response_schema_factory = response_factory(self.update_response_schema, name="Update")
         else:
             self.update_response_schema_factory = self.gen_get_one_response_schema_factory()
+            self.update_response_schema = self.get_one_schema
 
         doc = self.update.__doc__
         summary = doc.strip().split("\n")[0] if doc else f"Update"

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi/controller/filter_controller.py

@@ -89,11 +89,15 @@ class BaseFilter:
         :param value:
         :return:
         """
+        q_dict = {}
         if isinstance(value, (str, datetime, date, time)):
             if hasattr(value, "upper") and value.upper() in ["NONE", "NULL", "NIL"]:
-                return eval(f"Q({self.model_field}={None})")
-            return eval(f"Q({self.model_field}='{value}')")
-        return eval(f"Q({self.model_field}={value})")
+                q_dict[self.model_field] = None
+            else:
+                q_dict[self.model_field] = str(value)
+        else:
+            q_dict[self.model_field] = value
+        return Q(**q_dict)
 
     def query(self, queryset: QuerySet, value: Union[str, list, bool]) -> QuerySet:
         """

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi/schemas_factory/common_function.py

@@ -1,6 +1,6 @@
 from typing import Type, Optional, Union
 
-from pydantic import validator, field_validator
+from pydantic import field_validator
 from pydantic.fields import FieldInfo
 from tortoise import Model
 
@@ -144,7 +144,10 @@ def get_validate_dict_from_fields(fields_info: dict) -> dict:
     for filed, field_tuple in fields_info.items():
         if field_tuple[0] == str:
             method_name = "check_%s" % filed
-            validator_method = validator(filed, pre=True, allow_reuse=True)(remove_blank_strings)
+            # v1
+            # validator_method = validator(filed, pre=True, allow_reuse=True)(remove_blank_strings)
+            # v2
+            validator_method = field_validator(filed, mode='before')(remove_blank_strings)
             validator_dict[method_name] = validator_method
     return validator_dict
 

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi/settings/all_settings.py

@@ -108,6 +108,8 @@ class SettingsModel(BaseModel):
             etcd_settings = EtcdSettings(**data_dict.get("EtcdSettings", {}))
             if etcd_settings.ETCD_SETTING_KEY:
                 res, metadata = etcd_settings.client.get(etcd_settings.ETCD_SETTING_KEY)
+                if not res:
+                    raise ValidationException("未读取到Etcd的配置文件")
                 data_dict.update(yaml.safe_load(res))
             if not data_dict:
                 raise ValidationException(errors="配置错误")

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi/settings/app_settings.py

@@ -8,7 +8,8 @@ from fastgenerateapi.pydantic_utils.base_settings import BaseSettings
 
 class AppSettings(BaseSettings):
     # 字段配置 驼峰格式：新版本(pydantic.alias_generators:to_camel)、老版本(pydantic.utils.to_lower_camel)
-    ALIAS_GENERATOR: Optional[str] = Field(default="pydantic.alias_generators.to_snake", description="序列化参数命名方法路径")
+    # 下划线：pydantic.alias_generators.to_snake
+    ALIAS_GENERATOR: Optional[str] = Field(default="pydantic.alias_generators.to_camel", description="序列化参数命名方法路径")
 
     # 分页对应字段以及配置默认值
     CURRENT_PAGE_FIELD: Optional[str] = Field(default="page", description="当前页字段")

{fastgenerateapi-1.2.1 → fastgenerateapi-1.2.3}/fastgenerateapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.2.1
+Version: 1.2.3
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com
@@ -94,14 +94,14 @@ uvicorn.run(app)
 - get_one_include, get_one_exclude
   - 与include同时生效，无include自动包含数据库模型搜友字段
   - 可添加跨表字段，自动生成校验和文档
-  - 其他字段: ("test", Optioanl[str], FieldInfo(..., description="文档描述"))
+  - 其他字段: ("test", Optional[str], FieldInfo(..., description="文档描述"))
 - get_all_include, get_all_exclude
 - create_include, create_exclude
 - update_include, update_exclude
 
 #### 指定模型
 ```python
-from core.crud.api_view import APIView
+from fastgenerateapi import APIView
 
 class XxxView(APIView):
     model_class = XxxModel
@@ -110,7 +110,7 @@ class XxxView(APIView):
 #### 查询/创建/修改字段限制及校验示例
 - 如果有唯一字段或者联合唯一字段自动校验是否为唯一值
 ```python
-from core.crud.api_view import APIView
+from fastgenerateapi import APIView
 
 class XxxView(APIView):
     list_schema = HeathInfoList
@@ -126,11 +126,12 @@ class XxxView(APIView):
 ```python
 class XxxView(APIView):
 
-    def view_路由(self):
+    def view_get_user_list(self):
         """
-        文档注释
+        文档Summary注释
+        生成 get方法，路由为 前缀/user_list
         """
-        return xxx
+        return self.success(data={"list": []})
 ```