fastgenerateapi 0.0.23__tar.gz → 0.0.26__tar.gz

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/PKG-INFO

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

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/fastgenerateapi/__init__.py

@@ -12,6 +12,7 @@ from fastgenerateapi.api_view.api_view import APIView, CreateView, GetOneView, G
     SwitchView
 from fastgenerateapi.api_view.get_tree_view import GetTreeView
 from fastgenerateapi.api_view.delete_tree_view import DeleteTreeView
+from fastgenerateapi.api_view.delete_filter_view import DeleteFilterView
 from fastgenerateapi.api_view.base_view import BaseView
 
 # 多对多关联 >> 查和改

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/fastgenerateapi/__version__.py

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

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/fastgenerateapi/api_view/base_view.py

@@ -1,3 +1,4 @@
+import time
 import uuid
 from copy import copy
 from typing import Optional, Type, List, Union, Sequence, Dict
@@ -9,7 +10,6 @@ from tortoise.queryset import QuerySet
 from pydantic import create_model, BaseModel
 from starlette.requests import Request
 from tortoise import Model
-from tortoise.expressions import Q
 
 from fastgenerateapi.api_view.mixin.base_mixin import BaseMixin
 from fastgenerateapi.api_view.mixin.dbmodel_mixin import DBModelMixin
@@ -55,25 +55,28 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
     def queryset(self) -> QuerySet:
         if not self.model_class:
             return self.error(msg="model_class not allow None")
-        if type(settings.app_settings.ACTIVE_DEFAULT_VALUE) == str:
-            queryset = self.model_class.filter(
-                eval(f"Q({settings.app_settings.WHETHER_DELETE_FIELD}={settings.app_settings.ACTIVE_DEFAULT_VALUE})"))
-        else:
-            queryset = self.model_class.filter(
-                eval(f"Q({settings.app_settings.WHETHER_DELETE_FIELD}={settings.app_settings.ACTIVE_DEFAULT_VALUE})"))
+
+        return self.get_active_queryset(self.model_class)
+
+    def get_active_queryset(self, 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
+        delete_filter_field = settings.app_settings.WHETHER_DELETE_FIELD
+        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
+        })
+
         return queryset
 
     @property
     def relation_queryset(self) -> QuerySet:
         if not self.relation_model_class:
             return self.error(msg="relation_model_class not allow None")
-        if type(settings.app_settings.ACTIVE_DEFAULT_VALUE) == str:
-            queryset = self.relation_model_class.filter(
-                eval(f"Q({settings.app_settings.WHETHER_DELETE_FIELD}='{settings.app_settings.ACTIVE_DEFAULT_VALUE}')"))
-        else:
-            queryset = self.relation_model_class.filter(
-                eval(f"Q({settings.app_settings.WHETHER_DELETE_FIELD}={settings.app_settings.ACTIVE_DEFAULT_VALUE})"))
-        return queryset
+        return self.get_active_queryset(self.relation_model_class)
 
     async def get_object(self, pk):
         model = await self.queryset.filter(pk=pk).prefetch_related(
@@ -83,6 +86,18 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
         else:
             raise NOT_FOUND
 
+    def _delete_value(self):
+        result = False
+        if settings.app_settings.DELETE_FIELD_TYPE == "time":
+            result = int(time.time() * 1000)
+        return result
+
+    async def delete_queryset(self, queryset: QuerySet):
+
+        await queryset.update(**{
+            settings.app_settings.WHETHER_DELETE_FIELD: self._delete_value()
+        })
+
     @staticmethod
     async def setattr_model(model: Model, prefetch_related_fields, *args, **kwargs) -> Model:
         for key, value_list in prefetch_related_fields.items():

fastgenerateapi-0.0.26/fastgenerateapi/api_view/delete_filter_view.py

@@ -0,0 +1,67 @@
+from typing import Optional, Type, Any, Union
+
+from fastapi import Query, Depends
+from fastapi.types import DecoratedCallable
+from starlette.requests import Request
+from starlette.responses import JSONResponse
+from tortoise.transactions import atomic
+
+from fastgenerateapi.api_view.base_view import BaseView
+from fastgenerateapi.data_type.data_type import CALLABLE, DEPENDENCIES
+from fastgenerateapi.deps import filter_params_deps
+from fastgenerateapi.schemas_factory import response_factory
+from fastgenerateapi.settings.register_settings import settings
+
+
+class DeleteFilterView(BaseView):
+
+    delete_filter_route: Union[bool, DEPENDENCIES] = True
+    """
+    必须继承 GetAllView 才能使用
+    与 GetAllView 同步的筛选条件
+    """
+
+    @atomic()
+    async def destroy_filter(self, search: str, filters: dict, *args, **kwargs):
+        queryset = await self.get_queryset(search=search, filters=filters, *args, **kwargs)
+
+        await self.delete_queryset(queryset)
+
+        return
+
+    def _delete_filter_decorator(self, *args: Any, **kwargs: Any) -> DecoratedCallable:
+        async def route(
+                request: Request,
+                search: str = Query(default="", description="搜索"),
+                filters: dict = Depends(filter_params_deps(model_class=self.model_class, fields=self.filter_fields)),
+        ) -> JSONResponse:
+            await self.destroy_filter(
+                search=search,
+                filters=filters,
+                request=request,
+                *args, **kwargs
+            )
+            return self.success(msg="删除成功")
+        return route
+
+    def _handler_destroy_filter_settings(self):
+        if self.delete_filter_route:
+            return
+        if not hasattr(self, "get_one_response_schema"):
+            self.get_one_response_schema = response_factory(None, name="GetOne")
+        doc = self.destroy_filter.__doc__
+        summary = doc.strip().split("\n")[0] if doc else "Delete Filter"
+        path = f"/{settings.app_settings.ROUTER_FILTER_DELETE_SUFFIX_FIELD}" if settings.app_settings.ROUTER_WHETHER_ADD_SUFFIX else ""
+        self._add_api_route(
+            path=path,
+            endpoint=self._delete_filter_decorator(),
+            methods=["DELETE"],
+            response_model=Optional[self.get_one_response_schema],
+            summary=summary,
+            dependencies=self.delete_filter_route,
+        )
+
+
+
+
+

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/fastgenerateapi/api_view/delete_tree_view.py

@@ -38,17 +38,19 @@ class DeleteTreeView(BaseView):
 
         request_data.id_list = delete_id_list
         queryset = await self.get_del_tree_queryset(request_data=request_data, *args, **kwargs)
-        if unique_fields := self._get_unique_fields(self.model_class):
-            for model in await queryset:
-                model.is_active = False
-                for field in unique_fields:
-                    try:
-                        setattr(model, field, getattr(model, field) + f"__{int(time.time() * 1000)}")
-                    except Exception as e:
-                        setattr(model, field, getattr(model, field) + f"__{int(time.time() * 1000)}")
-                await model.save()
-        else:
-            await queryset.update(is_active=False)
+        await self.delete_queryset(queryset)
+
+        # if unique_fields := self._get_unique_fields(self.model_class):
+        #     for model in await queryset:
+        #         model.is_active = False
+        #         for field in unique_fields:
+        #             try:
+        #                 setattr(model, field, getattr(model, field) + f"__{int(time.time() * 1000)}")
+        #             except Exception as e:
+        #                 setattr(model, field, getattr(model, field) + f"__{int(time.time() * 1000)}")
+        #         await model.save()
+        # else:
+        #     await queryset.update(is_active=False)
         return
 
     async def get_del_tree_queryset(self, request_data, *args, **kwargs):

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/fastgenerateapi/api_view/delete_view.py

@@ -26,18 +26,19 @@ class DeleteView(BaseView):
     @atomic()
     async def destroy(self, request_data, *args, **kwargs):
         queryset = await self.get_del_queryset(request_data=request_data, *args, **kwargs)
+        await self.delete_queryset(queryset)
 
-        if unique_fields := self._get_unique_fields(self.model_class):
-            for model in await queryset:
-                model.is_active = False
-                for field in unique_fields:
-                    try:
-                        setattr(model, field, getattr(model, field) + f"__{int(time.time() * 1000)}")
-                    except Exception as e:
-                        setattr(model, field, getattr(model, field) + f"__{int(time.time() * 1000)}")
-                await model.save()
-        else:
-            await queryset.update(is_active=False)
+        # if unique_fields := self._get_unique_fields(self.model_class):
+        #     for model in await queryset:
+        #         model.is_active = False
+        #         for field in unique_fields:
+        #             try:
+        #                 setattr(model, field, getattr(model, field) + f"__{int(time.time() * 1000)}")
+        #             except Exception as e:
+        #                 setattr(model, field, getattr(model, field) + f"__{int(time.time() * 1000)}")
+        #         await model.save()
+        # else:
+        #     await queryset.update(is_active=False)
         return
 
     async def get_del_queryset(self, request_data, *args, **kwargs):

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/fastgenerateapi/api_view/get_tree_view.py

@@ -101,7 +101,8 @@ class GetTreeView(BaseView):
         if node_id:
             queryset = self.queryset.filter(pk=node_id).prefetch_related(settings.app_settings.DEFAULT_TREE_PARENT_FIELD)
             queryset = await self.get_tree_queryset(queryset, search, filters)
-            if not (top_node := await queryset.first()):
+            top_node = await queryset.first()
+            if not top_node:
                 raise NOT_FOUND
             top_nodes = [top_node]
         else:

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/fastgenerateapi/api_view/mixin/base_mixin.py

@@ -64,7 +64,7 @@ class BaseMixin(Generic[T], APIRouter, ABC):
                     "update_route", "update_relation_route", "delete_route", "delete_tree_route", "switch_route_fields",
                     "websocket_route"]
         return ["get_one", "get_all", "get_tree", "create", "update", "update_relation", "destroy", "destroy_tree",
-                "switch"]
+                "destroy_filter", "switch"]
 
     @classmethod
     def _get_cls_api_func(cls):

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/fastgenerateapi/api_view/mixin/dbmodel_mixin.py

@@ -19,10 +19,12 @@ class DBModelMixin:
 
         if type(fields) == str:
             try:
-                if field_info := model_class._meta.fields_map.get(fields):
-                    return field_info.description
-                elif fields.endswith("_id") and (field_info := model_class._meta.fields_map.get(fields.strip("_id"))):
+                field_info = model_class._meta.fields_map.get(fields)
+                field_info_fk = model_class._meta.fields_map.get(fields.rstrip("_id"))
+                if field_info:
                     return field_info.description
+                elif fields.endswith("_id") and field_info_fk:
+                    return field_info_fk.description
                 elif "__" in fields:
                     field_list = fields.split("__", maxsplit=1)
                     description = ""

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/fastgenerateapi/channel/consumer.py

@@ -6,6 +6,11 @@ from starlette.endpoints import WebSocketEndpoint
 
 
 class Consumer(WebSocketEndpoint):
+    """
+    群聊
+    redis_conn:  must
+    使用 aioredis
+    """
     redis_conn: aioredis.Redis
     encoding = "json"
     group_id = None

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/fastgenerateapi/channel/websocket_view.py

@@ -8,6 +8,9 @@ from fastgenerateapi.data_type.data_type import DEPENDENCIES
 
 
 class WebsocketView(BaseView):
+    """
+    客户端与服务器之间通信
+    """
     websocket_route: Union[bool, DEPENDENCIES] = True
     redis_conn: aioredis.Redis
 

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/fastgenerateapi/controller/ws_controller.py

@@ -27,16 +27,18 @@ class WsController:
     def __init__(self, router_class, func_name_list):
         self.ws_router_data = []
         for func_name in func_name_list:
-            route_info_list = func_name.replace("__", "/").split("_")
+            route_info_list = func_name.split("__")
+            if route_info_list[-1] in ["pk", "id"]:
+                route_info_list[-1] = "{" + route_info_list[-1] + "}"
+            route_name = "/".join(route_info_list)
+            route_info_list = route_name.split("_")
+            # method = route_info_list[0]  # ws
             middle_list = route_info_list[1:]
-            pk_field = ""
-            if route_info_list[-1] == "pk":
-                pk_field = "/{pk}"
-                middle_list = middle_list[:-1]
             if settings.app_settings.ROUTER_WHETHER_UNDERLINE_TO_STRIKE:
                 path = "-".join(middle_list)
             else:
                 path = "_".join(middle_list)
-            path += pk_field
 
             self.ws_router_data.append(WsRouter(router_class, path, func_name))
+
+

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/fastgenerateapi/example/models.py

@@ -4,15 +4,20 @@ from typing import Optional
 from pydantic.fields import FieldInfo
 from tortoise import Model, fields
 
+from common.model.base_model import TortoiseOrmAbstractModel
+from fastgenerateapi import my_fields
+from fastgenerateapi.my_fields.enum_field import IntEnumClass
+
 
 class StaffInfo(Model):
     """
         员工信息
     """
-    is_active: bool = fields.BooleanField(default=True, description="是否有效")
+    delete_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)
     age: Optional[int] = fields.IntField(description="年龄", default=None, null=True)
-    created_at: Optional[datetime.datetime] = fields.DatetimeField(null=True, auto_now_add=True, description="创建时间")
     company: fields.ForeignKeyNullableRelation["CompanyInfo"] = fields.ForeignKeyField(
         'models.CompanyInfo', related_name="staff", on_delete=fields.SET_NULL, default=None, null=True)
 
@@ -20,23 +25,24 @@ class StaffInfo(Model):
     def test(self):
         return "test"
 
+    @property
+    def category_name(self):
+        return self.category.name
+
     class PydanticMeta:
+        # 以下内容仅用于演示，存在重复和多余写法
         exclude = ["created_at"]
-        get_one_include = [
-            "name",
-            "company__name",
-            ("test", Optional[str], FieldInfo(default="", description="测试字段")),
-        ]
-        # get_all_include = []
-        # create_include = []
-        # update_include = []
+        get_include = ["category_name", "name"]
+        get_all_include = ["company__name"]
+        get_one_include = [("test", Optional[str], FieldInfo(default="", description="测试字段")), ]
+        save_exclude = ["category_name", "test"]
 
 
 class CompanyInfo(Model):
     """
         公司信息
     """
-    is_active: bool = fields.BooleanField(default=True, description="是否有效")
+    delete_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(
@@ -48,3 +54,5 @@ class CompanyInfo(Model):
 
 
 
+
+

fastgenerateapi-0.0.26/fastgenerateapi/example/routers.py

@@ -0,0 +1,15 @@
+from fastapi import APIRouter
+from starlette.routing import WebSocketRoute
+
+from fastgenerateapi.example.views import ChatView, ChatGroupView
+from fastgenerateapi.example.views import StaffView, CompanyView
+
+router = APIRouter()
+
+router.include_router(StaffView())
+router.include_router(CompanyView())
+
+router.include_router(ChatView())
+router.routes.append(WebSocketRoute("/group", ChatGroupView, name="群聊测试"))
+
+

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/fastgenerateapi/example/schemas.py

@@ -6,7 +6,7 @@ from tortoise.contrib.pydantic import pydantic_model_creator
 from fastgenerateapi.pydantic_utils.base_model import BaseModel
 from fastgenerateapi.schemas_factory import get_all_schema_factory
 from fastgenerateapi.schemas_factory.common_schema_factory import common_schema_factory
-from modules.example.models import CompanyInfo, StaffInfo
+from fastgenerateapi.example.models import CompanyInfo, StaffInfo
 
 
 # 方式一：解决了方式二存在的问题

{fastgenerateapi-0.0.23 → fastgenerateapi-0.0.26}/fastgenerateapi/example/views.py

@@ -1,11 +1,12 @@
 from fastapi import Depends
+from fastapi_cache.decorator import cache
 from starlette.websockets import WebSocket
-from tortoise import Tortoise
 
-from fastgenerateapi import APIView, DeleteTreeView, GetTreeView, AsyncWebsocketConsumer, WebsocketView
+from fastgenerateapi import APIView, DeleteTreeView, GetTreeView, WebsocketView, Consumer
 from fastgenerateapi.deps import paginator_deps
-from modules.example.models import StaffInfo, CompanyInfo
-from modules.example.schemas import CompanyInfoRead, CompanyInfoCreate, TestSchema, ListTestSchema, StaffReadSchema
+# from middlewares.jwt_middleware.schemas import UserObject
+from fastgenerateapi.example.models import StaffInfo, CompanyInfo
+from fastgenerateapi.example.schemas import CompanyInfoRead, CompanyInfoCreate, ListTestSchema, StaffReadSchema
 
 
 class CompanyView(APIView, DeleteTreeView, GetTreeView):
@@ -13,7 +14,8 @@ class CompanyView(APIView, DeleteTreeView, GetTreeView):
     # schema = CompanyInfoRead
     # create_schema = CompanyInfoCreate
 
-    async def view_get_list(self, paginator=Depends(paginator_deps())):
+    @cache()
+    async def view_get_list(self, paginator=Depends(paginator_deps())) -> ListTestSchema:
 
         return await self.pagination_data(queryset=self.queryset, fields=["id", "name"], paginator=paginator)
 
@@ -24,13 +26,22 @@ class StaffView(APIView):
         self.model_class = StaffInfo
         self.order_by_fields = ["-created_at"]
         self.prefetch_related_fields = {"company": ["name"]}
-        self.router_args = {
-            # "view_get_staff_list": ListTestSchema
-            "view_get_staff_list": TestSchema
-        }
+        # self.router_args = {
+        #     # "view_get_staff_list": ListTestSchema
+        #     "view_get_staff_list": TestSchema
+        # }
         self.get_all_schema = StaffReadSchema
+        # self.dependencies = [Depends(ADG.authenticate_user_deps), ]
         super().__init__()
 
+    # async def get_one(self, pk: str, *args, **kwargs) -> Union[BaseModel, dict, None]:
+    #     print(datetime.datetime.now())
+    #     data = await super().get_one(pk=pk, *args, **kwargs)
+    #     result = create_staff.delay()
+    #     print(result.id)
+    #     print(datetime.datetime.now())
+    #     return data
+
     # async def view_get_staff_list(self, name: Optional[str] = None):
     #     conn = Tortoise.get_connection("default")
     #     # conn = Tortoise.get_connection("local")
@@ -39,8 +50,24 @@ class StaffView(APIView):
     #     print(val)
     #     return self.success(data={"data_list": val})
 
+    @cache()
+    async def view_get_staff_list(
+            self,
+            paginator=Depends(paginator_deps()),
+            # current_user: UserObject = Depends(ADG.authenticate_user_deps),
+    ) -> ListTestSchema:
+        data = await self.pagination_data(queryset=self.queryset, fields=["id", "name"], paginator=paginator)
+        return self.success(data=data)
+
+
+# class StaffView(SQLGetAllView):
+#     table_name = "staffinfo"
+
 
 class ChatView(WebsocketView):
+    """
+    客户端与服务端场链接测试
+    """
     # redis_conn = default_redis
     tags = ["ws测试"]
 
@@ -57,6 +84,15 @@ class ChatView(WebsocketView):
                 print(1)
 
 
-class Consumer(AsyncWebsocketConsumer):
+class ChatGroupView(Consumer):
+    """
+    群聊测试
+    """
     # redis_conn = default_redis
     ...
+
+
+
+
+
+

fastgenerateapi-0.0.26/fastgenerateapi/my_fields/__init__.py

@@ -0,0 +1,4 @@
+from fastgenerateapi.my_fields.pk_field import PrimaryKeyField
+from fastgenerateapi.my_fields.enum_field import IntEnumField
+from fastgenerateapi.my_fields.soft_delete_field import SoftDeleteField
+