fastgenerateapi 0.0.25__tar.gz → 0.0.27__tar.gz

{fastgenerateapi-0.0.25 → fastgenerateapi-0.0.27}/PKG-INFO

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

{fastgenerateapi-0.0.25 → fastgenerateapi-0.0.27}/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.25 → fastgenerateapi-0.0.27}/fastgenerateapi/__version__.py

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

fastgenerateapi-0.0.27/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.25 → fastgenerateapi-0.0.27}/fastgenerateapi/api_view/delete_view.py

@@ -28,19 +28,21 @@ class DeleteView(BaseView):
         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)
         return
 
+    # 弃用思路：唯一字段加时间戳
+    # 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)
+
     async def get_del_queryset(self, request_data, *args, **kwargs):
         queryset = self.queryset.filter(id__in=request_data.id_list)
         return queryset

{fastgenerateapi-0.0.25 → fastgenerateapi-0.0.27}/fastgenerateapi/api_view/get_all_view.py

@@ -130,6 +130,9 @@ class GetAllView(BaseView, GetMixin):
             settings.app_settings.LIST_RESPONSE_FIELD: data_list,
         })
 
+    def get_page_list(self, page_result: BaseModel):
+        return getattr(page_result, settings.app_settings.LIST_RESPONSE_FIELD, [])
+
     def _get_all_decorator(self, *args: Any, **kwargs: Any) -> DecoratedCallable:
         @get_all_cache_decorator(cache(expire=settings.app_settings.CACHE_GET_ALL_SECONDS, coder=JsonCoder, key_builder=generate_key_builder))
         async def route(

{fastgenerateapi-0.0.25 → fastgenerateapi-0.0.27}/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.25 → fastgenerateapi-0.0.27}/fastgenerateapi/api_view/mixin/dbmodel_mixin.py

@@ -84,9 +84,12 @@ class DBModelMixin:
             return []
 
     @staticmethod
-    def _get_foreign_key_fields(model_class: Type[Model] = None) -> List[str]:
+    def _get_foreign_key_fields(model_class: Type[Model] = None, is_with_id: bool = True) -> List[str]:
         try:
-            return list(model_class._meta.fk_fields)
+            fields = list(model_class._meta.fk_fields)
+            if is_with_id:
+                fields = [field + "_id" for field in fields]
+            return fields
         except:
             return []
 

{fastgenerateapi-0.0.25 → fastgenerateapi-0.0.27}/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.25 → fastgenerateapi-0.0.27}/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.25 → fastgenerateapi-0.0.27}/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.27/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.25 → fastgenerateapi-0.0.27}/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.25 → fastgenerateapi-0.0.27}/fastgenerateapi/example/views.py

@@ -1,11 +1,12 @@
 from fastapi import Depends
 from fastapi_cache.decorator import cache
+from starlette.websockets import WebSocket
 
-from fastgenerateapi import APIView, DeleteTreeView, GetTreeView
+from fastgenerateapi import APIView, DeleteTreeView, GetTreeView, WebsocketView, Consumer
 from fastgenerateapi.deps import paginator_deps
-from middlewares.jwt_middleware.schemas import UserObject
-from modules.example.models import StaffInfo, CompanyInfo
-from modules.example.schemas import CompanyInfoRead, CompanyInfoCreate, 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):
@@ -63,9 +64,32 @@ class StaffView(APIView):
 #     table_name = "staffinfo"
 
 
-
-
-
+class ChatView(WebsocketView):
+    """
+    客户端与服务端场链接测试
+    """
+    # redis_conn = default_redis
+    tags = ["ws测试"]
+
+    async def ws_wschat_pk(self, websocket: WebSocket, pk: str):
+        """
+        测试
+        """
+        await websocket.accept()
+        while True:
+            try:
+                data = await websocket.receive_json()
+                await websocket.send_text(f"接受到的消息是: {data}")
+            except Exception:
+                print(1)
+
+
+class ChatGroupView(Consumer):
+    """
+    群聊测试
+    """
+    # redis_conn = default_redis
+    ...
 
 
 

{fastgenerateapi-0.0.25 → fastgenerateapi-0.0.27}/fastgenerateapi/my_fields/enum_field.py

@@ -51,6 +51,8 @@ class IntEnumField(IntEnumFieldInstance):
         Converts from the Python type to the DB type.
         """
         if value is not None:
+            if isinstance(value, IntEnumClass):
+                value = value.value
             value = int(value)  # pylint: disable=E1102
             if value > len(self.enum_list) or 0 > value:
                 raise HTTPException(detail=f"枚举值：{value} 校验失败。【{self.description}】", status_code=422)
@@ -125,6 +127,9 @@ class IntEnumClass:
     def __str__(self):
         return f"{self.value}"
 
+    def __int__(self):
+        return self.value
+
     @property
     def name(self):
         try:

{fastgenerateapi-0.0.25 → fastgenerateapi-0.0.27}/fastgenerateapi/my_fields/pk_field.py

@@ -29,10 +29,8 @@ class PrimaryKeyField(Field[str], str):
     allows_generated = True
 
     def __init__(self, **kwargs: Any) -> None:
-        kwargs["generated"] = False
-        kwargs["unique"] = True
-        kwargs["description"] = "主键"
-        kwargs["default"] = worker.get_id
+        kwargs.setdefault("description", "主键")
+        kwargs.setdefault("default", worker.get_id)
         super().__init__(pk=True, **kwargs)
 
     def to_db_value(self, value: Any, instance: "Union[Type[Model], Model]") -> Any:

{fastgenerateapi-0.0.25 → fastgenerateapi-0.0.27}/fastgenerateapi/pydantic_utils/base_model.py

@@ -10,12 +10,14 @@ class BaseModel(PydanticBaseModel):
         json_encoders = JSON_ENCODERS
         extra = Extra.ignore
         orm_mode = True
+        from_attributes = True
 
 
 class Config(BaseConfig):
     json_encoders = JSON_ENCODERS
     extra = Extra.ignore
-    orm_mode = True
+    orm_mode = True   # v1 版本
+    from_attributes = True  # v2 版本
 
 
 class QueryConfig(BaseConfig):

{fastgenerateapi-0.0.25 → fastgenerateapi-0.0.27}/fastgenerateapi/schemas_factory/update_schema_factory.py

@@ -43,7 +43,7 @@ def update_schema_factory(
             all_fields_info.update(update_include_fields_dict)
             include_fields.update(update_include_fields_dict.keys())
         if hasattr(model_class.PydanticMeta, "save_exclude"):
-            exclude_fields.update(model_class.PydanticMeta.update_exclude)
+            exclude_fields.update(model_class.PydanticMeta.save_exclude)
         if hasattr(model_class.PydanticMeta, "update_exclude"):
             exclude_fields.update(model_class.PydanticMeta.update_exclude)
     else:

{fastgenerateapi-0.0.25 → fastgenerateapi-0.0.27}/fastgenerateapi/settings/settings.py

@@ -35,6 +35,7 @@ class AppSettings(BaseSettings):
     ROUTER_UPDATE_SUFFIX_FIELD: Optional[str] = Field(default='update', description="修改路由后缀字段")
     ROUTER_DELETE_SUFFIX_FIELD: Optional[str] = Field(default='delete', description="删除路由后缀字段")
     ROUTER_RECURSION_DELETE_SUFFIX_FIELD: Optional[str] = Field(default='delete_tree', description="递归删除路由后缀字段")
+    ROUTER_FILTER_DELETE_SUFFIX_FIELD: Optional[str] = Field(default='delete_filter', description="递归删除路由后缀字段")
 
     # 函数转换路由时，默认添加字段，（遵循restful规范时，get路由处理方案）
     RESTFUL_GET_ROUTER_ADD_PREFIX: Optional[str] = Field(default='', description="函数转换路由时：前缀添加字段")

{fastgenerateapi-0.0.25 → fastgenerateapi-0.0.27}/fastgenerateapi.egg-info/PKG-INFO

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

{fastgenerateapi-0.0.25 → fastgenerateapi-0.0.27}/fastgenerateapi.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ fastgenerateapi/api_view/__init__.py
 fastgenerateapi/api_view/api_view.py
 fastgenerateapi/api_view/base_view.py
 fastgenerateapi/api_view/create_view.py
+fastgenerateapi/api_view/delete_filter_view.py
 fastgenerateapi/api_view/delete_tree_view.py
 fastgenerateapi/api_view/delete_view.py
 fastgenerateapi/api_view/get_all_view.py

fastgenerateapi-0.0.25/fastgenerateapi/example/routers.py

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