fastgenerateapi 1.1.8__py2.py3-none-any.whl → 1.1.9__py2.py3-none-any.whl

fastgenerateapi/__version__.py

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

fastgenerateapi/api_view/base_view.py

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

fastgenerateapi/api_view/create_view.py

@@ -1,5 +1,7 @@
 from typing import Optional, Type, Union, Any
 
+from fastapi import Depends
+from fastapi.security import OAuth2PasswordBearer
 from fastapi.types import DecoratedCallable
 from pydantic import BaseModel
 from starlette.requests import Request
@@ -73,10 +75,12 @@ class CreateView(BaseView, SaveMixin):
         async def route(
                 request_data: self.create_schema,  # type: ignore
                 request: Request,
+                token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
             data = await self.create(
                 request_data=request_data,
                 request=request,
+                token=token,
                 *args,
                 **kwargs
             )

fastgenerateapi/api_view/delete_filter_view.py

@@ -1,6 +1,7 @@
 from typing import Optional, Type, Any, Union
 
 from fastapi import Query, Depends
+from fastapi.security import OAuth2PasswordBearer
 from fastapi.types import DecoratedCallable
 from starlette.requests import Request
 from starlette.responses import JSONResponse
@@ -9,7 +10,7 @@ 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.schemas_factory import response_factory, get_one_schema_factory
 from fastgenerateapi.settings.all_settings import settings
 
 
@@ -34,11 +35,13 @@ class DeleteFilterView(BaseView):
                 request: Request,
                 search: str = Query(default="", description="搜索"),
                 filters: dict = Depends(filter_params_deps(model_class=self.model_class, fields=self.filter_fields)),
+                token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
             await self.destroy_filter(
                 search=search,
                 filters=filters,
                 request=request,
+                token=token,
                 *args, **kwargs
             )
             return self.success(msg="删除成功")
@@ -47,8 +50,10 @@ class DeleteFilterView(BaseView):
     def _handler_destroy_filter_settings(self):
         if self.delete_filter_route:
             return
+        if not hasattr(self, "get_one_schema"):
+            self.get_one_schema = get_one_schema_factory(model_class=self.model_class)
         if not hasattr(self, "get_one_response_schema"):
-            self.get_one_response_schema = response_factory(None, name="GetOne")
+            self.get_one_response_schema = response_factory(self.get_one_schema, 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 ""

fastgenerateapi/api_view/delete_tree_view.py

@@ -1,6 +1,8 @@
 import time
 from typing import Optional, Type, Any, Union
 
+from fastapi import Depends
+from fastapi.security import OAuth2PasswordBearer
 from fastapi.types import DecoratedCallable
 from pydantic import BaseModel
 from starlette.requests import Request
@@ -10,7 +12,7 @@ from tortoise.transactions import atomic
 from fastgenerateapi.api_view.base_view import BaseView
 from fastgenerateapi.data_type.data_type import CALLABLE, DEPENDENCIES
 from fastgenerateapi.pydantic_utils.base_model import IdList
-from fastgenerateapi.schemas_factory import response_factory
+from fastgenerateapi.schemas_factory import response_factory, get_one_schema_factory
 from fastgenerateapi.settings.all_settings import settings
 
 
@@ -61,10 +63,12 @@ class DeleteTreeView(BaseView):
         async def route(
                 request_data: self.delete_tree_schema,  # type: ignore
                 request: Request,
+                token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
             await self.destroy_tree(
                 request_data=request_data,
                 request=request,
+                token=token,
                 *args, **kwargs
             )
             return self.success(msg="删除成功")
@@ -73,8 +77,10 @@ class DeleteTreeView(BaseView):
     def _handler_delete_tree_settings(self):
         if self.delete_tree_route:
             return
+        if not hasattr(self, "get_one_schema"):
+            self.get_one_schema = get_one_schema_factory(model_class=self.model_class)
         if not hasattr(self, "get_one_response_schema"):
-            self.get_one_response_schema = response_factory(None, name="GetOne")
+            self.get_one_response_schema = response_factory(self.get_one_schema, name="GetOne")
         doc = self.destroy_tree.__doc__
         summary = doc.strip().split("\n")[0] if doc else "Delete Tree"
         path = f"/{settings.app_settings.ROUTER_RECURSION_DELETE_SUFFIX_FIELD}" if settings.app_settings.ROUTER_WHETHER_ADD_SUFFIX else ""

fastgenerateapi/api_view/delete_view.py

@@ -1,6 +1,8 @@
 import time
 from typing import Optional, Type, Any, Union
 
+from fastapi import Depends
+from fastapi.security import OAuth2PasswordBearer
 from fastapi.types import DecoratedCallable
 from pydantic import BaseModel
 from starlette.requests import Request
@@ -10,7 +12,7 @@ from tortoise.transactions import atomic
 from fastgenerateapi.api_view.base_view import BaseView
 from fastgenerateapi.data_type.data_type import CALLABLE, DEPENDENCIES
 from fastgenerateapi.pydantic_utils.base_model import IdList
-from fastgenerateapi.schemas_factory import response_factory
+from fastgenerateapi.schemas_factory import response_factory, get_one_schema_factory
 from fastgenerateapi.settings.all_settings import settings
 
 
@@ -51,10 +53,12 @@ class DeleteView(BaseView):
         async def route(
                 request_data: self.delete_schema,  # type: ignore
                 request: Request,
+                token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
             await self.destroy(
                 request_data=request_data,
                 request=request,
+                token=token,
                 *args, **kwargs
             )
             return self.success(msg="删除成功")
@@ -63,8 +67,10 @@ class DeleteView(BaseView):
     def _handler_delete_settings(self):
         if not self.delete_route:
             return
+        if not hasattr(self, "get_one_schema"):
+            self.get_one_schema = get_one_schema_factory(model_class=self.model_class)
         if not hasattr(self, "get_one_response_schema"):
-            self.get_one_response_schema = response_factory(None, name="GetOne")
+            self.get_one_response_schema = response_factory(self.get_one_schema, name="GetOne")
         doc = self.destroy.__doc__
         summary = doc.strip().split("\n")[0] if doc else "Delete All"
         path = f"/{settings.app_settings.ROUTER_DELETE_SUFFIX_FIELD}" if settings.app_settings.ROUTER_WHETHER_ADD_SUFFIX else ""

fastgenerateapi/api_view/get_all_view.py

@@ -1,6 +1,7 @@
 from typing import Union, Optional, Type, cast, List, Any, Callable, Coroutine
 
 from fastapi import Depends, Query
+from fastapi.security import OAuth2PasswordBearer
 from fastapi.types import DecoratedCallable
 from fastapi_cache import JsonCoder
 from fastapi_cache.decorator import cache
@@ -56,7 +57,7 @@ class GetAllView(BaseView, GetMixin):
         处理search搜索；处理筛选字段；处理外键预加载；处理排序
         """
         queryset = self.search_controller.query(queryset=self.queryset, value=search)
-        queryset = await self.filter_queryset(queryset, filters)
+        queryset = await self.filter_queryset(queryset, filters, *args, **kwargs)
         queryset = self.filter_controller.query(queryset=queryset, values=filters)
         queryset = queryset.prefetch_related(*self.prefetch_related_fields.keys())
         if self.order_by_fields:
@@ -66,7 +67,7 @@ class GetAllView(BaseView, GetMixin):
 
         return queryset
 
-    async def filter_queryset(self, queryset: QuerySet, filters: dict) -> QuerySet:
+    async def filter_queryset(self, queryset: QuerySet, filters: dict, *args, **kwargs) -> QuerySet:
         """
         处理filters
             example： value = filters.pop(value, None)   queryset = queryset.filter(field=value+string)
@@ -84,6 +85,7 @@ class GetAllView(BaseView, GetMixin):
             queryset: QuerySet,
             paginator=None,
             schema: Type[BaseModel] = None,
+            name: str = "",  # 当使用fields时，需要输入名称用于自动生成schema
             fields: List[Union[str, tuple]] = None,
             *args, **kwargs
     ):
@@ -117,10 +119,10 @@ class GetAllView(BaseView, GetMixin):
         if paginator is None or getattr(paginator, settings.app_settings.DETERMINE_WHETHER_PAGE_FIELD) == \
                 settings.app_settings.DETERMINE_PAGE_BOOL_VALUE:
             if schema or fields:
-                return get_list_schema_factory()(**{settings.app_settings.LIST_RESPONSE_FIELD: data_list})
+                return get_list_schema_factory(schema, name)(**{settings.app_settings.LIST_RESPONSE_FIELD: data_list})
             return self.get_list_schema(**{settings.app_settings.LIST_RESPONSE_FIELD: data_list})
         if schema or fields:
-            return get_page_schema_factory()(**{
+            return get_page_schema_factory(schema, name)(**{
                 settings.app_settings.CURRENT_PAGE_FIELD: current_num,
                 settings.app_settings.PAGE_SIZE_FIELD: page_size,
                 settings.app_settings.TOTAL_SIZE_FIELD: count,
@@ -144,12 +146,14 @@ class GetAllView(BaseView, GetMixin):
                 paginator=Depends(paginator_deps()),
                 search: Optional[str] = Depends(search_params_deps(self.search_fields)),
                 filters: dict = Depends(filter_params_deps(model_class=self.model_class, fields=self.filter_fields, schema=self.filter_schema)),
+                token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
             data = await self.get_all(
                 paginator=paginator,
                 search=search,
                 filters=filters,
                 request=request,
+                token=token,
                 *args,
                 **kwargs
             )

fastgenerateapi/api_view/get_one_view.py

@@ -1,5 +1,7 @@
 from typing import Any, Union, Optional, Type
 
+from fastapi import Depends
+from fastapi.security import OAuth2PasswordBearer
 from fastapi.types import DecoratedCallable
 from fastapi_cache import JsonCoder
 from fastapi_cache.decorator import cache
@@ -36,7 +38,7 @@ class GetOneView(BaseView, GetMixin):
     """
 
     async def get_one(self, pk: str, *args, **kwargs):
-        model = await self.get_object(pk, self.is_with_prefetch)
+        model = await self.get_object(pk, is_with_prefetch=self.is_with_prefetch)
         if self.is_with_prefetch:
             await self.setattr_model(model, prefetch_related_fields=self.prefetch_related_fields, *args, **kwargs)
 
@@ -50,10 +52,12 @@ class GetOneView(BaseView, GetMixin):
         async def route(
                 pk: str,
                 request: Request,
+                token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
             data = await self.get_one(
                 pk=pk,
                 request=request,
+                token=token,
                 *args, **kwargs
             )
             return self.success(data=data)

fastgenerateapi/api_view/get_relation_view.py

@@ -1,6 +1,7 @@
 from typing import Union, Optional, Type, cast, List, Any
 
 from fastapi import Depends, Query
+from fastapi.security import OAuth2PasswordBearer
 from fastapi.types import DecoratedCallable
 from pydantic import BaseModel
 from starlette.requests import Request
@@ -160,6 +161,7 @@ class GetRelationView(BaseView):
                 filters: dict = Depends(filter_params_deps(model_class=self.model_class, fields=self.filter_fields)),
                 relation_filters: dict = Depends(
                     filter_params_deps(model_class=self.relation_model_class, fields=self.relation_filter_fields)),
+                token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
             data = await self.get_relation(
                 pk=pk,
@@ -168,6 +170,7 @@ class GetRelationView(BaseView):
                 filters=filters,
                 relation_filters=relation_filters,
                 request=request,
+                token=token,
                 *args,
                 **kwargs
             )

fastgenerateapi/api_view/get_tree_view.py

@@ -1,6 +1,7 @@
 from typing import Union, Optional, Type, cast, List, Any, Callable, Coroutine
 
 from fastapi import Depends, Query
+from fastapi.security import OAuth2PasswordBearer
 from fastapi.types import DecoratedCallable
 from fastapi_cache import JsonCoder
 from fastapi_cache.decorator import cache
@@ -157,12 +158,14 @@ class GetTreeView(BaseView):
                 search: str = Query(default="", description="搜索"),
                 node_id: Optional[str] = Depends(tree_params_deps()),
                 filters: dict = Depends(filter_params_deps(model_class=self.model_class, fields=self.filter_fields)),
+                token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
             data = await self.get_tree(
                 search=search,
                 node_id=node_id,
                 filters=filters,
                 request=request,
+                token=token,
                 *args,
                 **kwargs
             )

fastgenerateapi/api_view/mixin/base_mixin.py

@@ -162,4 +162,4 @@ class BaseMixin(Generic[T], APIRouter, ABC):
                     route.path == f"{self.prefix}{path}"  # type: ignore
                     and route.methods == methods_  # type: ignore
             ):
-                self.routes.remove(route)
+                self.routes.remove(route) # type: ignore

fastgenerateapi/api_view/switch_view.py

@@ -1,5 +1,7 @@
-from typing import List, Any
+from typing import List, Any, Optional
 
+from fastapi import Depends
+from fastapi.security import OAuth2PasswordBearer
 from fastapi.types import DecoratedCallable
 from starlette.requests import Request
 from starlette.responses import JSONResponse
@@ -45,8 +47,12 @@ class SwitchView(BaseView):
         return self.get_one_schema.from_orm(model)
 
     def _switch_decorator(self, filed, *args: Any, **kwargs: Any) -> DecoratedCallable:
-        async def route(pk: str, request: Request) -> JSONResponse:
-            data = await self.switch(pk=pk, request=request, filed=filed, *args, **kwargs)
+        async def route(
+                pk: str,
+                request: Request,
+                token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
+        ) -> JSONResponse:
+            data = await self.switch(pk=pk, request=request, filed=filed, token=token, *args, **kwargs)
             return self.success(data=data)
         return route
 

fastgenerateapi/api_view/update_relation_view.py

@@ -1,5 +1,7 @@
 from typing import Optional, Type, Union, Any
 
+from fastapi import Depends
+from fastapi.security import OAuth2PasswordBearer
 from fastapi.types import DecoratedCallable
 from pydantic import BaseModel
 from starlette.requests import Request
@@ -55,11 +57,13 @@ class UpdateRelationView(BaseView, SaveMixin):
                 pk: str,
                 request_data: self.update_relation_schema,  # type: ignore
                 request: Request,
+                token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
             await self.update_relation(
                 pk=pk,
                 request_data=request_data,
                 request=request,
+                token=token,
                 *args, **kwargs
             )
             return self.success()

fastgenerateapi/api_view/update_view.py

@@ -1,5 +1,7 @@
 from typing import Optional, Type, Union, Any
 
+from fastapi import Depends
+from fastapi.security import OAuth2PasswordBearer
 from fastapi.types import DecoratedCallable
 from starlette.requests import Request
 from starlette.responses import JSONResponse
@@ -63,11 +65,13 @@ class UpdateView(BaseView, SaveMixin):
                 pk: str,
                 request_data: self.update_schema,  # type: ignore
                 request: Request,
+                token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
             data = await self.update(
                 pk=pk,
                 request_data=request_data,
                 request=request,
+                token=token,
                 *args, **kwargs
             )
             return self.success(data=data)

fastgenerateapi/channel/connection_manager.py

@@ -0,0 +1,30 @@
+from typing import Dict
+
+from starlette.websockets import WebSocket
+
+
+class ConnectionManager:
+    active_connections: Dict[str, WebSocket] = {}
+    active_group_connections: Dict[str, Dict[str, WebSocket]] = {}
+
+    @classmethod
+    def add_connection(cls, user_id: str, websocket: WebSocket):
+        cls.active_connections[user_id] = websocket
+
+    @classmethod
+    def del_connection(cls, user_id: str):
+        if user_id in cls.active_connections:
+            del cls.active_connections[user_id]
+
+    @classmethod
+    def add_group_connection(cls, group_id: str, user_id: str, connection: WebSocket):
+        cls.active_group_connections.setdefault(group_id, {})[user_id] = connection
+
+    @classmethod
+    def del_group_connection(cls, group_id: str, user_id: str):
+        if group_id in cls.active_group_connections:
+            user_dict = cls.active_group_connections[group_id]
+            if user_id in user_dict:
+                del user_dict[user_id]
+                if not user_dict:
+                    del cls.active_group_connections[group_id]

fastgenerateapi/channel/consumer.py

@@ -1,17 +1,15 @@
-import _ctypes
 from typing import List, Union
 
-import aioredis
+# from _ctypes import PyObj_FromPtr
 from starlette.endpoints import WebSocketEndpoint
 
+from fastgenerateapi.channel.connection_manager import ConnectionManager
+
 
 class Consumer(WebSocketEndpoint):
     """
     群聊
-    redis_conn:  must
-    使用 aioredis
     """
-    redis_conn: aioredis.Redis
     encoding = "json"
     group_id = None
     user_id = None
@@ -22,9 +20,13 @@ class Consumer(WebSocketEndpoint):
 
         # 用户输入名称
         self.group_id = websocket.path_params.get("group_id")
-        self.user_id = websocket.query_params.get("user_id")
+        self.user_id = await self.get_user_id(websocket)
         await self.group_add(websocket, self.group_id, self.user_id)
-        await self.group_send(self.group_id, {"msg": f"{self.user_id}-加入了聊天室"})
+        # await self.group_send(self.group_id, {"msg": f"{self.user_id}-加入了聊天室"})
+
+    @staticmethod
+    async def get_user_id(websocket):
+        return websocket.query_params.get("user_id")
 
     # 收消息后自动转发
     async def on_receive(self, websocket, data):
@@ -34,18 +36,27 @@ class Consumer(WebSocketEndpoint):
     # 断开 删除
     async def on_disconnect(self, websocket, close_code):
         if self.group_id and self.user_id:
-            await self.redis_conn.hdel(self.group_id, self.user_id)
+            await ConnectionManager.del_group_connection(self.group_id, self.user_id)
         pass
 
+    async def check_args(self, group_id, user_id):
+        """
+        用于检查数据是否有效
+        :param group_id:
+        :param user_id:
+        :return:
+        """
+        return True
+
     # 添加组
     async def group_add(self, websocket, group_id, user_key):
-        if not self.redis_conn:
-            await self.error(websocket, code=500, msg="redis未设置")
         if not group_id:
             await self.error(websocket, code=422, msg="未获取到组信息")
         if not user_key:
             await self.error(websocket, code=422, msg="未获取到用户信息")
-        await self.redis_conn.hset(group_id, user_key, id(websocket))
+        if not await self.check_args(group_id, user_key):
+            await self.error(websocket, code=422, msg="无连接权限")
+        await ConnectionManager.add_group_connection(group_id, user_key, websocket)
 
     # 群发消息
     @classmethod
@@ -59,17 +70,11 @@ class Consumer(WebSocketEndpoint):
         :param exclude: 默认True排除自己；[int] 时可选排除其他人
         :return:
         """
-        # 先循环 告诉之前的用户有新用户加入了
-        result = await cls.redis_conn.hgetall(group_id)
+        result = ConnectionManager.active_group_connections.get(group_id, {})
         if type(exclude) == bool:
             exclude = [user_id] if user_id and exclude else []
-        for key, value in result.items():
-            if int(value) in exclude:
-                continue
-            try:
-                websocket = _ctypes.PyObj_FromPtr(int(value))
-            except Exception:
-                await cls.redis_conn.hdel(group_id, key)
+        for user_id, websocket in result.items():
+            if user_id in exclude:
                 continue
             await websocket.send_json({
                 "code": code,

fastgenerateapi/channel/websocket_view.py

@@ -1,8 +1,9 @@
 from typing import Union
 
-import aioredis
+from starlette.websockets import WebSocket
 
 from fastgenerateapi.api_view.base_view import BaseView
+from fastgenerateapi.channel.connection_manager import ConnectionManager
 from fastgenerateapi.controller.ws_controller import WsController
 from fastgenerateapi.data_type.data_type import DEPENDENCIES
 
@@ -12,7 +13,6 @@ class WebsocketView(BaseView):
     客户端与服务器之间通信
     """
     websocket_route: Union[bool, DEPENDENCIES] = True
-    redis_conn: aioredis.Redis
 
     def _handler_websocket_settings(self):
         self.ws_summary = WsController(self, self._get_cls_ws_func())
@@ -23,3 +23,61 @@ class WebsocketView(BaseView):
                 dependencies=ws_router.dependencies,
             )
 
+    @classmethod
+    async def accept(cls, user_id:str, websocket: WebSocket):
+        await websocket.accept()
+        ConnectionManager.add_connection(user_id=user_id, websocket=websocket)
+
+        return websocket
+
+    @classmethod
+    async def send(cls, user_id, data, code=200):
+        """
+        群发送消息
+        :param user_id: 用户id
+        :param data: 发送的数据
+        :param code: 状态码
+        :return:
+        """
+        if not user_id or not data:
+            return False
+
+        websocket = ConnectionManager.active_connections.get(user_id)
+        if not websocket:
+            return False
+        await websocket.send_json({
+            "code": code,
+            "from": user_id,
+            # "message": "请求成功",
+            "data": data
+        })
+
+        return True
+
+    @classmethod
+    async def group_send(cls, user_id_list, data, code=200):
+        """
+        群发送消息
+        :param user_id_list: 用户id列表
+        :param data: 发送的数据
+        :param code: 状态码
+        :return:
+        """
+        if not user_id_list or not data:
+            return [], user_id_list
+        success_user_id_list = []
+        fail_user_id_list = []
+        for user_id in user_id_list:
+            websocket = ConnectionManager.active_connections.get(user_id)
+            if not websocket:
+                fail_user_id_list.append(user_id)
+                continue
+            await websocket.send_json({
+                "code": code,
+                "from": user_id,
+                # "message": "请求成功",
+                "data": data
+            })
+            success_user_id_list.append(user_id)
+
+        return success_user_id_list, fail_user_id_list

fastgenerateapi/my_fields/enum_field.py

@@ -1,4 +1,4 @@
-from enum import IntEnum
+from enum import IntEnum, Enum
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -36,7 +36,8 @@ class IntEnumField(IntEnumFieldInstance):
 
     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)
+        self.description = kwargs.get("description", "") + " >> " + self.get_description(enum_list, start_num)
+        kwargs["description"] = self.description
         super().__init__(enum_type=self.create_enum(enum_list, start_num=start_num), **kwargs)
 
     @property
@@ -66,15 +67,16 @@ class IntEnumField(IntEnumFieldInstance):
         if value is not None:
             value = int(value)  # pylint: disable=E1102
         self.validate(value)
-        return IntEnumClass(value, self.enum_list)
+        return value
 
-    def get_description(self, enum_list):
+    @staticmethod
+    def get_description(enum_list, start_num=0):
         description = ""
-        for index, val in enumerate(enum_list, 1):
+        for index, val in enumerate(enum_list, start_num):
             description += f"{index}:{val};"
         return description
 
-    def create_enum(self, enum_list, start_num=0):
+    def create_enum(self, enum_list, start_num=0) -> Type[IntEnum]:
         # 创建枚举类的成员字典，确保值是唯一的
 
         members = {self.number_to_words(name): name for name, _ in enumerate(enum_list, start_num)}

fastgenerateapi/schemas_factory/filter_schema_factory.py

@@ -32,7 +32,11 @@ def filter_schema_factory(model_class: Type[Model], fields: list[str, tuple[str,
                 ))
         })
 
-    filter_params_model: Type[BaseModel] = create_model("CommonFilterParams", **model_fields, __config__=model_config)
+    filter_params_model: Type[BaseModel] = create_model(
+        model_class.__name__+"CommonFilterParams",
+        **model_fields,
+        __config__=model_config
+    )
 
     return filter_params_model
 

fastgenerateapi/schemas_factory/get_all_schema_factory.py

@@ -81,22 +81,22 @@ def get_all_schema_factory(
     return schema
 
 
-def get_list_schema_factory(schema_cls: Type[T] = None) -> Type[T]:
+def get_list_schema_factory(schema_cls: Type[T] = None, name: str = "") -> Type[T]:
     if schema_cls:
         fields = {
             settings.app_settings.LIST_RESPONSE_FIELD: (Optional[List[schema_cls]], FieldInfo(default=[], description="数据返回")),
         }
-        name = schema_cls.__name__ + "GetListSchema"
+        name = schema_cls.__name__ + name + "GetListSchema"
     else:
         fields = {
             settings.app_settings.LIST_RESPONSE_FIELD: (Optional[List], FieldInfo(default=[], description="数据返回")),
         }
-        name = "GetListSchema" + str(time.time())
+        name = name + "GetListSchema"
     schema: Type[T] = create_model(name, **fields, __config__=model_config)
     return schema
 
 
-def get_page_schema_factory(schema_cls: Type[T] = None) -> Type[T]:
+def get_page_schema_factory(schema_cls: Type[T] = None, name: str = "") -> Type[T]:
     fields = {
         settings.app_settings.CURRENT_PAGE_FIELD: (Optional[int], FieldInfo(default=1, description="当前页")),
         settings.app_settings.PAGE_SIZE_FIELD: (Optional[int], FieldInfo(default=settings.app_settings.DEFAULT_PAGE_SIZE, description="每页数量")),
@@ -104,10 +104,10 @@ def get_page_schema_factory(schema_cls: Type[T] = None) -> Type[T]:
     }
     if schema_cls:
         fields.update({settings.app_settings.LIST_RESPONSE_FIELD: (Optional[List[schema_cls]], FieldInfo(default=[], description="数据返回"))})
-        name = schema_cls.__name__ + "GetPageSchema"
+        name = schema_cls.__name__ + name + "GetPageSchema"
     else:
         fields.update({settings.app_settings.LIST_RESPONSE_FIELD: (Optional[List], FieldInfo(default=[], description="数据返回"))})
-        name = "GetPageSchema" + str(time.time())
+        name = name + "GetPageSchema"
     schema: Type[T] = create_model(name, **fields, __config__=model_config)
     return schema
 

fastgenerateapi/schemas_factory/response_factory.py

@@ -33,9 +33,9 @@ def response_factory(schema_cls: Union[Type[T], BaseModel, None] = None, name: s
         )
 
     try:
-        name = schema_cls.__name__ + name + "Response" + str(time.time())
+        name = schema_cls.__name__ + name + "Response"
     except:
-        name = "CommonResponse"
+        name = name + "CommonResponse"
     schema: Type[T] = create_model(name, **fields, __config__=model_config)
 
     return schema

fastgenerateapi/settings/app_settings.py

@@ -1,6 +1,8 @@
 from typing import Optional
 
 from pydantic import Field
+from pydantic_settings import SettingsConfigDict
+
 from fastgenerateapi.pydantic_utils.base_settings import BaseSettings
 
 
@@ -79,11 +81,18 @@ class AppSettings(BaseSettings):
     FILTER_UNDERLINE_WHETHER_DOUBLE_TO_SINGLE: Optional[bool] = Field(default=True, description="筛选是否双下划线转单下划线")
     SCHEMAS_UNDERLINE_WHETHER_DOUBLE_TO_SINGLE: Optional[bool] = Field(default=True, description="序列化字段是否双下划线转单下划线")
 
-    class Config:
-        env_prefix = "APP_"
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    model_config = SettingsConfigDict(
+        env_prefix="APP_",
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+    # class Config:
+    #     env_prefix = "APP_"
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'
 
 
 

fastgenerateapi/settings/db_settings.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class DBSettings(BaseSettings):
@@ -9,22 +9,29 @@ class DBSettings(BaseSettings):
         Database Settings
     """
 
-    TYPE: Optional[str] = Field(default='mysql', description="数据库类型")
-    HOST: Optional[str] = Field(default='127.0.0.1', description="数据库域名")
-    PORT: Optional[str] = Field(default='3306', description="数据库端口")
-    DATABASE: Optional[str] = Field(default='admin', description="数据库名")
-    USERNAME: Optional[str] = Field(default='root', description="数据库用户名")
-    PASSWORD: Optional[str] = Field(default='', description="数据库密码")
+    DB_TYPE: Optional[str] = Field(default='mysql', description="数据库类型")
+    DB_HOST: Optional[str] = Field(default='127.0.0.1', description="数据库域名")
+    DB_PORT: Optional[str] = Field(default='3306', description="数据库端口")
+    DB_DATABASE: Optional[str] = Field(default='admin', description="数据库名")
+    DB_USERNAME: Optional[str] = Field(default='root', description="数据库用户名")
+    DB_PASSWORD: Optional[str] = Field(default='', description="数据库密码")
 
     @property
     def dsn(self):
-        return f"{self.TYPE.lower()}://{self.USERNAME}:{self.PASSWORD}@{self.HOST}:{self.PORT}/{self.DATABASE}"
+        return f"{self.DB_TYPE.lower()}://{self.DB_USERNAME}:{self.DB_PASSWORD}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_DATABASE}"
 
-    class Config:
-        env_prefix = 'DB_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    model_config = SettingsConfigDict(
+        env_prefix="",
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+    # class Config:
+    #     env_prefix = ''
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'
 
 
 class PostgresqlSettings(DBSettings):
@@ -33,36 +40,20 @@ class PostgresqlSettings(DBSettings):
     """
     TYPE: Optional[str] = Field(default='postgres', description="数据库类型")
 
-    class Config:
-        env_prefix = 'Postgresql_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
-
 
 class MySQLSettings(DBSettings):
     """
         MySQL Settings
     """
-
-    class Config:
-        env_prefix = 'MYSQL_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    ...
 
 
 class LocalSettings(DBSettings):
     """
-        MySQL Settings
+        Local Settings
     """
     TYPE: str = Field(..., description="数据库类型")
 
-    class Config:
-        env_prefix = 'LOCAL_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
 
 
 

fastgenerateapi/settings/file_settings.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class FileServerSettings(BaseSettings):
@@ -12,11 +12,18 @@ class FileServerSettings(BaseSettings):
     FILE_URL: Optional[str] = Field(default='/static/', description="文件路径前缀", title="file url prefix")
     FILE_ROOT: Optional[str] = Field(default='static', description="文件储存路径", title="file storage path")
 
-    class Config:
-        env_prefix = 'FileServer_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    model_config = SettingsConfigDict(
+        env_prefix="FILESERVER_",
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+    # class Config:
+    #     env_prefix = 'FILESERVER_'
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'
 
 
 

fastgenerateapi/settings/jwt_settings.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class JWTSettings(BaseSettings):
@@ -13,11 +13,18 @@ class JWTSettings(BaseSettings):
     ACCESS_TOKEN_EXPIRE_MINUTES: Optional[int] = Field(default=30, description="过期时间 (分钟)", title="JWT Access Token")
     REFRESH_TOKEN_EXPIRE_MINUTES: Optional[int] = Field(default=60, description="过期时间（分钟）", title="JWT Refresh Token")
 
-    class Config:
-        env_prefix = 'JWT_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    model_config = SettingsConfigDict(
+        env_prefix="JWT_",
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+    # class Config:
+    #     env_prefix = 'JWT_'
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'
 
 
 

fastgenerateapi/settings/otlp_settings.py

@@ -15,14 +15,14 @@ from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 
 from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class OpenTelemetrySettings(BaseSettings):
     """
     跟踪和指标配置
     """
-    ENDPOINT: Optional[str] = Field(default=None, description="访问接口", example="http://127.0.0.1")
+    ENDPOINT: Optional[str] = Field(default=None, description="访问接口", examples=["http://127.0.0.1"])
     AUTHORIZATION: Optional[str] = Field(default=None, description="认证字符串")
 
     def setup_open_telemetry(self, app: FastAPI, service_name: str):
@@ -62,8 +62,15 @@ class OpenTelemetrySettings(BaseSettings):
             TortoiseORMInstrumentor().instrument(tracer_provider=tracer_provider)
             HTTPXClientInstrumentor().instrument(tracer_provider=tracer_provider)
 
-    class Config:
-        env_prefix = 'OTLP_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    model_config = SettingsConfigDict(
+        env_prefix="OTLP_",
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+    # class Config:
+    #     env_prefix = 'OTLP_'
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'

fastgenerateapi/settings/redis_settings.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class RedisSettings(BaseSettings):
@@ -9,8 +9,15 @@ class RedisSettings(BaseSettings):
     PORT: Optional[int] = Field(default=6379, description="映射端口")
     PASSWORD: Optional[str] = Field(default="", description="密码")
 
-    class Config:
-        env_prefix = 'REDIS_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    model_config = SettingsConfigDict(
+        env_prefix="REDIS_",
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+    # class Config:
+    #     env_prefix = 'REDIS_'
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'

fastgenerateapi/settings/sms_settings.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class SmsSettings(BaseSettings):
@@ -15,11 +15,18 @@ class SmsSettings(BaseSettings):
     CHECK_CODE_RESEND_TIME: Optional[int] = Field(default=1, description="验证码重新发送时间", title="check code resend time (minute)")
     DEFAULT_CODE: Optional[int] = Field(default="654123", description="默认验证码", title="sms default code")
 
-    class Config:
-        env_prefix = 'Sms_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    model_config = SettingsConfigDict(
+        env_prefix="SMS_",
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+    # class Config:
+    #     env_prefix = 'SMS_'
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'
 
 
 

fastgenerateapi/settings/system_settings.py

@@ -22,9 +22,15 @@ class SystemSettings(BaseSettings):
     DATACENTER_ID: Optional[int] = Field(default='1', description="机器ID")
 
     class Config:
-        env_prefix = ''
+        env_prefix = 'SYSTEM_'
         env_file = "./.env"
         case_sensitive = True
-        extra = 'allow'
+        extra = 'ignore'
+
+    # class Config:
+    #     env_prefix = 'SYSTEM_'
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'
 
 

fastgenerateapi/utils/snowflake.py

@@ -125,7 +125,7 @@ class IdWorker(object):
 
         new_id = ((timestamp - TWEPOCH) << TIMESTAMP_LEFT_SHIFT) | (self.datacenter_id << DATACENTER_ID_SHIFT) | \
                  (self.worker_id << WOKER_ID_SHIFT) | self.sequence
-        return new_id
+        return str(new_id)
 
     def _til_next_millis(self, last_timestamp):
         """

{fastgenerateapi-1.1.8.dist-info → fastgenerateapi-1.1.9.dist-info}/METADATA

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

{fastgenerateapi-1.1.8.dist-info → fastgenerateapi-1.1.9.dist-info}/RECORD

@@ -1,22 +1,22 @@
 fastgenerateapi/__init__.py,sha256=eh2qtp7FbjrgaRX5b3H3UWpasFdNHbVFqLUhpqVbaTU,1287
-fastgenerateapi/__version__.py,sha256=5TuAIUmKHEiY-E9rL3nClZhktmSp7FPyQig25FgIz1A,496
+fastgenerateapi/__version__.py,sha256=sI8rW3wVqSh9IB7senA2sM8kxpevmXiyJUcRPE0EWQk,496
 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=gSvDW_uUu4a8FKg9rQlKH60m_W04VtpsqPFc4nnyMAk,9666
-fastgenerateapi/api_view/create_view.py,sha256=1w32kuCHMNSHrjC_6jaONi5IZg--oVrjpQdAOCqEH9s,4404
-fastgenerateapi/api_view/delete_filter_view.py,sha256=Tms1h-VYV2yeCkQLlW8cAEJO4zr3NhrNEgpIjiWGNpw,2474
-fastgenerateapi/api_view/delete_tree_view.py,sha256=-fve4SlZE8XTY9es1JiTH8bD5uxiIndpP4d4MNu0aBs,3690
-fastgenerateapi/api_view/delete_view.py,sha256=9tXuGfY_aS3kH8Fi1ylsoOv709PS4Dz8E7FVgXxN8Xc,3104
-fastgenerateapi/api_view/get_all_view.py,sha256=Bnnx0yZ125g4VWLj_wbDl3Aq9dGAb6hiZpe6C52rqbY,8834
-fastgenerateapi/api_view/get_one_view.py,sha256=yKBw7BQOhCyyaTExszF17liHNT1S4lXo0SevJco-fh8,3528
-fastgenerateapi/api_view/get_relation_view.py,sha256=ybBi-wGLE97k9jwyxYOdYKD6qHSoQ2ZZVTHRLBNDcPE,9578
-fastgenerateapi/api_view/get_tree_view.py,sha256=l3y1FF-ybbjWTSC33CYc9xlo1qLiWNUg2XGc1uiCXnk,9124
+fastgenerateapi/api_view/base_view.py,sha256=s8f6zdoRqPRmo6o2FqHZG2MKcn1gc8JELix8VetVo3k,9810
+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
+fastgenerateapi/api_view/delete_view.py,sha256=FvaltPR1ttLfUvBoRoSHP-dGb79LRZlEMSEbYzE_W1E,3497
+fastgenerateapi/api_view/get_all_view.py,sha256=mxX7H9DZR7FMqtSz80qj5GJ5Rg_8a8z5R3gwkZnBqmI,9176
+fastgenerateapi/api_view/get_one_view.py,sha256=jw_H2z4rmRYgNfvBHSBgjnBNe1hpE6-A1EWRQR6bFD0,3762
+fastgenerateapi/api_view/get_relation_view.py,sha256=mhPXoEos_2GQQSk3xlD2t_WYAiYuy1vRFR4jnBnbeSg,9766
+fastgenerateapi/api_view/get_tree_view.py,sha256=8BQomoOU954bXrqGzeFrKS8ydHL9VPxQfwvhV59rQxg,9312
 fastgenerateapi/api_view/sql_get_view.py,sha256=wxYI0JuH8Gw99LfMMwA4rQ_a_tBrKYxYhA7MNGQOx3A,6691
-fastgenerateapi/api_view/switch_view.py,sha256=UpmZVUKfG9latwaq3FGXnp1P3iD5WJhKw0tVsN84gaM,3061
-fastgenerateapi/api_view/update_relation_view.py,sha256=_IQDhzz1h4UNAWsgLwfOuxzHu_TnDJJ4zVtXpc18SGQ,3545
-fastgenerateapi/api_view/update_view.py,sha256=Hj9e9ZnUzHBMzKdQ_5kxbtwVPhYLMc_hzt6HjM-Oy54,3889
+fastgenerateapi/api_view/switch_view.py,sha256=M_GSgnziz1vhrvNSwT_8I2oRy4zJnnFHh9HzUJBuy68,3317
+fastgenerateapi/api_view/update_relation_view.py,sha256=Z77KgRE85Nkz3Y513l10CVQLcR0phhfIBCyI7LpV-hY,3762
+fastgenerateapi/api_view/update_view.py,sha256=Y9cZwgQIl88-Gz6IhyufCB8cdVRMZ6NwhGUTUtDV5VA,4106
 fastgenerateapi/api_view/mixin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastgenerateapi/api_view/mixin/base_mixin.py,sha256=Aq12fTnL_Un3pPYFOE9Vo38j-mpePz9PJsLm0Rv2hu8,6862
+fastgenerateapi/api_view/mixin/base_mixin.py,sha256=qho7YCd4C1FtzTjsCU7Ax5uRx5-ryLwPEG0i_1IcTvI,6877
 fastgenerateapi/api_view/mixin/dbmodel_mixin.py,sha256=T09Ydqr9Mt75CW6imxyNa8FsZ3wHaVS8WRmViGBmDSc,4757
 fastgenerateapi/api_view/mixin/get_mixin.py,sha256=cpyTHaKFNsAhbtnLkz057rGcaKJXipNS-m9ftITsz1I,266
 fastgenerateapi/api_view/mixin/response_mixin.py,sha256=cTKmrPAxjG-28Ls94-YWCl-YgvGB_0VLdYyR6t_RIhA,4404
@@ -32,8 +32,9 @@ fastgenerateapi/cache/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 fastgenerateapi/cache/cache_decorator.py,sha256=u6dfanX2GMkjsJANgT8qXuEgw1fSPXFsmpL05b0PI44,579
 fastgenerateapi/cache/key_builder.py,sha256=6Vudd19EGg1IUGT5ftPDqLUNCCqXzmQNV69zBfjGf9A,503
 fastgenerateapi/channel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastgenerateapi/channel/consumer.py,sha256=qaxv2M750EFxuWSnu-T74D-mBBL_pIn7zbA-3GUoOso,3069
-fastgenerateapi/channel/websocket_view.py,sha256=3oGppnu1HTQbK-HquGFT04AKj1T7lDkW0lmMQYeh5yI,795
+fastgenerateapi/channel/connection_manager.py,sha256=BrsS0TMfgMBu3AQEb2RJwgfEUW27-e3bdZC0lM3qCls,1092
+fastgenerateapi/channel/consumer.py,sha256=1AZFAoeUZHZYZYJbN9s4pzI4xTG8uD0FbiSvmwjRGD8,3221
+fastgenerateapi/channel/websocket_view.py,sha256=lG9rYMO_FTdULi--oEdqCtdguR5ZM8Uzrk6f3z-86zo,2656
 fastgenerateapi/controller/__init__.py,sha256=eM5a3k_G0bf-k_WcwfcBbI-M3kLFJIITBWX85lVyClE,316
 fastgenerateapi/controller/filter_controller.py,sha256=PX-2oOo7WGZWePjm318RCbIlLIdeYwHKG-u1onpjB24,5030
 fastgenerateapi/controller/router_controller.py,sha256=HnvQgFXv2EPmzeiEPjcCyy6pZL2e7s5hB9TW1fRtZvM,5364
@@ -60,7 +61,7 @@ fastgenerateapi/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 fastgenerateapi/model/base_model.py,sha256=0eeIOHvkR4ZBpcs9mh-zlgMglJ8IGX9x7-lxdq8RPfI,1776
 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=QwOz7d3DGUA9kAzyA8VVPKSdYRdxo-YQLXl4BmIJwAE,7898
+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
@@ -73,24 +74,24 @@ fastgenerateapi/schemas_factory/__init__.py,sha256=X9U96fiyRfCY0u6SzaCYG62RdpEGF
 fastgenerateapi/schemas_factory/common_function.py,sha256=kwEQeGIA9rw4NHUVuXl9iZ2ijlHGwZVv08p5Gy3Mfcc,5224
 fastgenerateapi/schemas_factory/common_schema_factory.py,sha256=ac_tYOcBqpnGVSkx4NCAZz3Hd1PHmwSocBRld5Jxro4,2904
 fastgenerateapi/schemas_factory/create_schema_factory.py,sha256=rkah8geyfMkfqA6IhHDxq-lFomn8DA3bca1AtFcrLpQ,3733
-fastgenerateapi/schemas_factory/filter_schema_factory.py,sha256=iXGC7tpr_CpgqieeSzpzEtVN5f0a3WUPkJEgm2JKSjY,1341
-fastgenerateapi/schemas_factory/get_all_schema_factory.py,sha256=oNF7eATZvA58Uu_F2NcpCOUcKJwBN0xHjAF_GNS_0dM,5155
+fastgenerateapi/schemas_factory/filter_schema_factory.py,sha256=emCfhL99Y7wi8-f3FgIZXJgG1iMd9u2ItmxA6E7m8DI,1396
+fastgenerateapi/schemas_factory/get_all_schema_factory.py,sha256=gM2pYAGxNiqy3cmwW5lYcZHucilhI1aqCVRj2nt0EWw,5177
 fastgenerateapi/schemas_factory/get_one_schema_factory.py,sha256=cgKoCOSK-4Lky8xUoZHIMAZmVSyWOW5-DmxaM6RAQEY,3431
 fastgenerateapi/schemas_factory/get_relation_schema_factory.py,sha256=VvzWaxAwOnMdtaUYxmWw1tOw3KP0KBwmR6J3UAld2x0,3111
 fastgenerateapi/schemas_factory/get_tree_schema_factory.py,sha256=v0DAf7kwB-17rHbkzVscLkm6Jh53qa2cieQ7awH78pw,7259
-fastgenerateapi/schemas_factory/response_factory.py,sha256=exsy_7Flz3yzMpYUDoQ7rUijwzWE6wEZiWcrkdP1mRE,1667
+fastgenerateapi/schemas_factory/response_factory.py,sha256=C-E3lqIdfIJCIZhvmSaAiNJpYVOs6AGVyl90B5KRo4M,1655
 fastgenerateapi/schemas_factory/sql_get_all_schema_factory.py,sha256=dhgMvXZIq4av7puIMiQOTuVqNOuBoMvBZVd98GWJTRg,1810
 fastgenerateapi/schemas_factory/update_schema_factory.py,sha256=E-86vF98Ed92Q2VFqtS35xqxr_c34du9ok42JBfnj1g,3729
 fastgenerateapi/settings/__init__.py,sha256=dlyJb7BNh8Svau-UOrV4pxfoSYnNTA6eE41fu43vlT8,173
 fastgenerateapi/settings/all_settings.py,sha256=riAFFyOVRszZ3DZUVcudHgCgYrICnusuuFcth9zfeDM,3889
-fastgenerateapi/settings/app_settings.py,sha256=kyIecmhfoKPkQ7cOH_Tsdj3u74WbD-0ZlO5Xta7PXgk,7075
-fastgenerateapi/settings/db_settings.py,sha256=aat1wSnjjofej0Cq-VI5WSt5ewmUgoDXncZwp0iM4nA,1783
-fastgenerateapi/settings/file_settings.py,sha256=M7VVT81DpG8iindZbZIvDVulo_DZW9iL95mWFTr7kpA,704
-fastgenerateapi/settings/jwt_settings.py,sha256=CVjpT1nikYUzUlFKNOpNjpHXtWAQqFrX8zdEeqvqK5I,784
-fastgenerateapi/settings/otlp_settings.py,sha256=28nKA0rFSOc1LiqFA22NNuH-zG0uOe1Q12e0R2J0_n0,2970
-fastgenerateapi/settings/redis_settings.py,sha256=88pc5y7m47DuFik8n2Lt1xTe-PInZaLvKwYdw8SKerQ,511
-fastgenerateapi/settings/sms_settings.py,sha256=qJP9v9fENs9fOoHh8-NCliusYrkOAzBny4t3XDHVuLM,998
-fastgenerateapi/settings/system_settings.py,sha256=sH7mEaFUHWVKX2YmArhijYmxzG82W4HSRKxZIp2oqIw,1146
+fastgenerateapi/settings/app_settings.py,sha256=FgRVIrWUmfvfDohP2pP4JO7nFevUPEG3MNuUyfjM9BA,7294
+fastgenerateapi/settings/db_settings.py,sha256=ClmQg00bpn-EWnrdKjjJ5_emPoa1eEDf0oBoNGp7g3M,1594
+fastgenerateapi/settings/file_settings.py,sha256=Vtzp_LV4tBYQDwNOJfY3QyoQGvDEv_KZ3N_HR9md1-o,898
+fastgenerateapi/settings/jwt_settings.py,sha256=mRtzLZz1bntrl6UXAnIq6xilEEN8NS8oJSv62CGXOEs,971
+fastgenerateapi/settings/otlp_settings.py,sha256=4haWpSdJBeor-rq_rBOgQl6oYRv9eppdwm1yWGt6GyE,3161
+fastgenerateapi/settings/redis_settings.py,sha256=6T-KqCj2Jva7SarDCExZZbdvr54u6n08mEJ0gQhlUoc,700
+fastgenerateapi/settings/sms_settings.py,sha256=NUsryRgr4Li5JXXcDMV5sfgzApX0GGyfJWAmCa_OV-U,1185
+fastgenerateapi/settings/system_settings.py,sha256=3AGyhdBkkTJzfOeC6gHKweQ3aLsQ0GE63T5y7sLHQgo,1302
 fastgenerateapi/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastgenerateapi/utils/aes.py,sha256=2ewx-qc7wAN68iExyNM97F8dB1sXhfGYVpNWFYR_a1k,3569
 fastgenerateapi/utils/auto_discover.py,sha256=1R5weLj1moWbRiUXQA0dKJvsaJw4wwE-YM57bUVrGgU,2316
@@ -98,12 +99,12 @@ fastgenerateapi/utils/exception.py,sha256=dnBmVpHLUS_PZ2cwIvpAJ3ncswZnn31L98gNmC
 fastgenerateapi/utils/file_utils.py,sha256=m9PrWLQ6mpT2XJyDxJtNzV3HnhQubqGb3awswSb-miM,2389
 fastgenerateapi/utils/pwd_utils.py,sha256=Ub_CANZNX9Thv4I3U8f7op2pT_cqjxC3viqYxtZFYeA,1448
 fastgenerateapi/utils/ramdom_utils.py,sha256=dOZyj9y1Ry8qMhAQKcVCnNtA9r5SNnR1iqGW656IH_o,984
-fastgenerateapi/utils/snowflake.py,sha256=AXQWvKNdqj5eWcs8_SBRd5GMOQa_QnFD37qVGOcqWzk,4638
+fastgenerateapi/utils/snowflake.py,sha256=GiFVkE10sPiqJ094sMfrPsaV7Y9Y3c1djrSfgs06uIk,4643
 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.8.dist-info/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
-fastgenerateapi-1.1.8.dist-info/METADATA,sha256=8PiQST2S5-BDV0NUUAr2yFzf_qJbLwQoX1mqkXion0Q,5960
-fastgenerateapi-1.1.8.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-fastgenerateapi-1.1.8.dist-info/top_level.txt,sha256=CW2SlpYjTRdacF-5ufnPMtwpYcR0XYn_bDxa2ZrrTBI,23
-fastgenerateapi-1.1.8.dist-info/RECORD,,
+fastgenerateapi-1.1.9.dist-info/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
+fastgenerateapi-1.1.9.dist-info/METADATA,sha256=dfLtlXB1ICGWrrJIb2aHRbe0j0yOYHbjZcajqSbpWxU,5960
+fastgenerateapi-1.1.9.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+fastgenerateapi-1.1.9.dist-info/top_level.txt,sha256=CW2SlpYjTRdacF-5ufnPMtwpYcR0XYn_bDxa2ZrrTBI,23
+fastgenerateapi-1.1.9.dist-info/RECORD,,