satori-python-server 0.16.7__tar.gz → 0.17.1__tar.gz

{satori_python_server-0.16.7 → satori_python_server-0.17.1}/.mina/server.toml

@@ -1,5 +1,5 @@
 includes = ["src/satori/server"]
-raw-dependencies = ["satori-python-core >= 0.16.3"]
+raw-dependencies = ["satori-python-core >= 0.17.0"]
 
 [project]
 name = "satori-python-server"
@@ -10,15 +10,15 @@ authors = [
 dependencies = [
     "aiohttp",
     "launart",
-    "graia-amnesia",
-    "starlette",
-    "uvicorn[standard]",
+    "graia-amnesia[uvicorn]",
+    "starlette[python-multipart]",
+    "websockets",
     "python-multipart",
 ]
 description = "Satori Protocol SDK for python, specify server part"
 license = {text = "MIT"}
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10,<4.0"
 classifiers = [
     "Typing :: Typed",
     "Development Status :: 4 - Beta",

{satori_python_server-0.16.7 → satori_python_server-0.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-server
-Version: 0.16.7
+Version: 0.17.1
 Summary: Satori Protocol SDK for python, specify server part
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -16,14 +16,14 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 Project-URL: Homepage, https://github.com/RF-Tar-Railt/satori-python
 Project-URL: Repository, https://github.com/RF-Tar-Railt/satori-python
-Requires-Python: >=3.9
+Requires-Python: <4.0,>=3.10
 Requires-Dist: aiohttp>=3.9.3
 Requires-Dist: launart>=0.8.2
-Requires-Dist: graia-amnesia>=0.9.0
+Requires-Dist: graia-amnesia[uvicorn]<0.12.0,>=0.11.0
 Requires-Dist: starlette[python-multipart]>=0.37.2
-Requires-Dist: uvicorn[standard]>=0.28.0
+Requires-Dist: websockets>=15.0.1
 Requires-Dist: python-multipart>=0.0.9
-Requires-Dist: satori-python-core>=0.16.3
+Requires-Dist: satori-python-core>=0.17.0
 Description-Content-Type: text/markdown
 
 # satori-python

{satori_python_server-0.16.7 → satori_python_server-0.17.1}/pyproject.toml

@@ -7,15 +7,15 @@ authors = [
 dependencies = [
     "aiohttp>=3.9.3",
     "launart>=0.8.2",
-    "graia-amnesia>=0.9.0",
+    "graia-amnesia[uvicorn]<0.12.0,>=0.11.0",
     "starlette[python-multipart]>=0.37.2",
-    "uvicorn[standard]>=0.28.0",
+    "websockets>=15.0.1",
     "python-multipart>=0.0.9",
-    "satori-python-core >= 0.16.3",
+    "satori-python-core >= 0.17.0",
 ]
 description = "Satori Protocol SDK for python, specify server part"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10,<4.0"
 classifiers = [
     "Typing :: Typed",
     "Development Status :: 4 - Beta",
@@ -27,7 +27,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.16.7"
+version = "0.17.1"
 
 [project.license]
 text = "MIT"
@@ -43,7 +43,7 @@ requires = [
 ]
 build-backend = "mina.backend"
 
-[tool.pdm.dev-dependencies]
+[dependency-groups]
 dev = [
     "isort>=5.13.2",
     "black>=24.4.0",
@@ -53,6 +53,7 @@ dev = [
     "mina-build<0.6,>=0.5.1",
     "pdm-mina>=0.3.2",
     "nonechat<0.7.0,>=0.6.0",
+    "uvicorn[standard]>=0.35.0",
 ]
 
 [tool.pdm.build]
@@ -76,21 +77,21 @@ source = "file"
 path = "src/satori/__init__.py"
 
 [tool.black]
-line-length = 110
+line-length = 120
 include = "\\.pyi?$"
 extend-exclude = ""
 
 [tool.isort]
 profile = "black"
-line_length = 110
+line_length = 120
 skip_gitignore = true
 extra_standard_library = [
     "typing_extensions",
 ]
 
 [tool.ruff]
-line-length = 110
-target-version = "py39"
+line-length = 120
+target-version = "py310"
 exclude = [
     "exam.py",
 ]
@@ -110,12 +111,12 @@ ignore = [
     "F403",
     "F405",
     "C901",
-    "UP037",
+    "UP038",
 ]
 
 [tool.pyright]
 pythonPlatform = "All"
-pythonVersion = "3.9"
+pythonVersion = "3.10"
 typeCheckingMode = "basic"
 reportShadowedImports = false
 disableBytesTypePromotions = true

{satori_python_server-0.16.7 → satori_python_server-0.17.1}/src/satori/server/__init__.py

@@ -8,18 +8,20 @@ import secrets
 import signal
 import threading
 import urllib.parse
-from collections.abc import Awaitable, Iterable
+from collections.abc import Awaitable, Callable, Iterable
 from contextlib import suppress
 from itertools import chain
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from traceback import print_exc
-from typing import Any, Callable, TypeVar
+from typing import Any, TypeVar
 
 import aiohttp
+from aiohttp import ClientTimeout
 from creart import it
 from graia.amnesia.builtins.aiohttp import AiohttpClientService
-from graia.amnesia.builtins.asgi import UvicornASGIService, asgitypes
+from graia.amnesia.builtins.asgi import asgitypes
+from graia.amnesia.builtins.asgi.uvicorn import UvicornASGIService, UvicornOptions
 from launart import Launart, Service, any_completed
 from loguru import logger
 from starlette.applications import Starlette
@@ -39,6 +41,7 @@ from yarl import URL
 
 from satori.const import Api
 from satori.model import Event, Meta, ModelBase, Opcode
+from satori.utils import decode
 
 from .. import EventType
 from .adapter import Adapter as Adapter
@@ -57,9 +60,7 @@ _T_ws_endpoint = TypeVar("_T_ws_endpoint", bound=Callable[[WebSocket], Awaitable
 StarletteResponse = Response
 
 
-async def _request_handler(
-    action: str, request: StarletteRequest, func: RouteCall, platform: str, self_id: str
-):
+async def _request_handler(action: str, request: StarletteRequest, func: RouteCall, platform: str, self_id: str):
     if action == Api.UPLOAD_CREATE.value:
         async with request.form() as form:
             res = await func(
@@ -77,7 +78,7 @@ async def _request_handler(
             Request(
                 request,
                 action,
-                await request.json(),
+                decode(await request.body()),
                 platform=platform,
                 self_id=self_id,
             )
@@ -115,6 +116,8 @@ class Server(Service, RouterMixin):
         version: str = "v1",
         token: str | None = None,
         webhooks: list[WebhookEndpoint] | None = None,
+        uvicorn_options: UvicornOptions | None = None,
+        *,
         stream_threshold: int = 16 * 1024 * 1024,
         stream_chunk_size: int = 64 * 1024,
     ):
@@ -123,8 +126,11 @@ class Server(Service, RouterMixin):
         self.port = port
         self.version = version
         self.path = path
+        self.uvicorn_options = uvicorn_options
         if self.path and not self.path.startswith("/"):
             self.path = f"/{self.path}"
+        if (self.host == "0.0.0.0" or self.host == "::") and not token:
+            raise ValueError("Token is required when the server is exposed to the public network")
         self.token = token
         self._adapters = []
         self.providers = []
@@ -138,6 +144,7 @@ class Server(Service, RouterMixin):
         self.stream_chunk_size = stream_chunk_size
         self.resources: dict[str, Path] = {}
         self.app = Starlette()
+        self.asgi_service = UvicornASGIService(self.host, self.port, options=self.uvicorn_options)
         super().__init__()
 
     def replace_app(self, app: ASGIApp | asgitypes.ASGI3Application):
@@ -161,9 +168,7 @@ class Server(Service, RouterMixin):
         """
 
         def wrapper(endpoint: _T_endpoint, /) -> _T_endpoint:
-            self.app.add_route(
-                path, endpoint, methods=methods, name=name, include_in_schema=include_in_schema
-            )
+            self.app.add_route(path, endpoint, methods=methods, name=name, include_in_schema=include_in_schema)
             return endpoint
 
         return wrapper
@@ -206,7 +211,7 @@ class Server(Service, RouterMixin):
         """在指定路径挂载静态文件"""
         self.resources[route_path] = file
 
-    async def event_callback(self, event: Event):
+    async def post(self, event: Event):
         event.sn = self._sequence
         self._event_cache.append(event)
         self._sequence += 1
@@ -230,6 +235,7 @@ class Server(Service, RouterMixin):
                         "Satori-OpCode": str(Opcode.EVENT.value),
                     },
                     json=event.dump(),
+                    timeout=ClientTimeout(hook.timeout or 300),
                 ) as resp:
                     resp.raise_for_status()
             except Exception as e:
@@ -239,7 +245,7 @@ class Server(Service, RouterMixin):
     async def websocket_server_handler(self, ws: WebSocket):
         await ws.accept()
         connection = WebsocketConnection(ws)
-        identity = await ws.receive_json()
+        identity = decode(await ws.receive_text())
         if not isinstance(identity, dict) or identity.get("op") != Opcode.IDENTIFY:
             return await ws.close(code=3000, reason="Unauthorized")
         body = identity["body"]
@@ -258,7 +264,7 @@ class Server(Service, RouterMixin):
             {"op": Opcode.READY, "body": {"logins": [lo.dump() for lo in logins], "proxy_urls": proxy_urls}}
         )
         self.connections.append(connection)
-        logger.debug(f"New connection: {id(connection)}")
+        logger.debug(f"New connection: {id(connection):x}")
         heartbeat_task = asyncio.create_task(connection.heartbeat())
         close_task = asyncio.create_task(connection.close_signal.wait())
         try:
@@ -275,7 +281,7 @@ class Server(Service, RouterMixin):
             await any_completed(heartbeat_task, close_task)
         finally:
             await connection.connection_closed()
-            logger.debug(f"Connection closed: {id(connection)}")
+            logger.debug(f"Connection closed: {id(connection):x}")
             heartbeat_task.cancel()
             close_task.cancel()
             self.connections.remove(connection)
@@ -311,8 +317,7 @@ class Server(Service, RouterMixin):
             resp = await self.fetch_proxy(url, request)
             # if content size > stream_limit, use streaming response
             if (
-                isinstance(resp, (PlainTextResponse, HTMLResponse, JSONResponse))
-                or resp.__class__ is Response
+                isinstance(resp, (PlainTextResponse, HTMLResponse, JSONResponse)) or resp.__class__ is Response
             ) and len(resp.body) > self.stream_threshold:
 
                 async def iter_content(body: bytes):
@@ -402,7 +407,7 @@ class Server(Service, RouterMixin):
         return JSONResponse(content=Meta(logins, proxy_urls).dump())
 
     async def webhook_create_handler(self, request: StarletteRequest):
-        body = await request.json()
+        body = decode(await request.body())
         url = body["url"]
         token = body.get("token")
         self.webhooks.append(WebhookEndpoint(url, token))
@@ -422,7 +427,7 @@ class Server(Service, RouterMixin):
         return Response()
 
     async def webhook_delete_handler(self, request: StarletteRequest):
-        body = await request.json()
+        body = decode(await request.body())
         url = body["url"]
         for endpoint in self.webhooks:
             if endpoint.url == url:
@@ -438,7 +443,6 @@ class Server(Service, RouterMixin):
             self.routes[Api.UPLOAD_CREATE.value] = self._default_upload_create_handler
 
         async with self.stage("preparing"):
-            asgi_service = manager.get_component(UvicornASGIService)
             self.app.routes.extend(
                 [
                     *chain.from_iterable(ada.get_routes() for ada in self._adapters),
@@ -472,11 +476,13 @@ class Server(Service, RouterMixin):
             )
             for path, file in self.resources.items():
                 self.app.mount(path, StaticFiles(directory=file.parent, html=file.suffix == ".html"))
-            asgi_service.middleware.mounts[""] = self.app  # type: ignore
+            self.asgi_service.middleware.mounts[""] = self.app  # type: ignore
 
         async def event_task(_provider: Provider):
-            async for event in _provider.publisher():
-                await self.event_callback(event)
+            async for event in _provider.publisher():  # type: ignore
+                await self.post(event)
+
+        event_tasks = [event_task(_provider) for _provider in self.providers if hasattr(_provider, "publisher")]
 
         async with self.stage("blocking"):
             proxy_urls = []
@@ -491,17 +497,18 @@ class Server(Service, RouterMixin):
                         "Satori-OpCode": str(Opcode.META.value),
                     },
                     json={"proxy_urls": proxy_urls},
+                    timeout=ClientTimeout(hook.timeout or 300),
                 ) as resp:
                     resp.raise_for_status()
             await any_completed(
                 manager.status.wait_for_sigexit(),
-                *(event_task(provider) for provider in self.providers),
+                *event_tasks,
                 *(_adapter.status.wait_for("blocking-completed") for _adapter in self._adapters),
             )
 
         async with self.stage("cleanup"):
             with suppress(KeyError):
-                del asgi_service.middleware.mounts[""]
+                del self.asgi_service.middleware.mounts[""]
             await self.session.close()
             self._tempdir.cleanup()
 
@@ -514,7 +521,7 @@ class Server(Service, RouterMixin):
     ):
         if manager is None:
             manager = it(Launart)
-        manager.add_component(UvicornASGIService(self.host, self.port))
+        manager.add_component(self.asgi_service)
         manager.add_component(self)
         with suppress(ValueError):
             manager.add_component(AiohttpClientService())
@@ -527,7 +534,10 @@ class Server(Service, RouterMixin):
     ):
         if manager is None:
             manager = it(Launart)
+        manager.add_component(self.asgi_service)
         manager.add_component(self)
+        with suppress(ValueError):
+            manager.add_component(AiohttpClientService())
         handled_signals: dict[signal.Signals, Any] = {}
         launch_task = asyncio.create_task(manager.launch(), name="amnesia-launch")
         signal_handler = functools.partial(manager._on_sys_signal, main_task=launch_task)

{satori_python_server-0.16.7 → satori_python_server-0.17.1}/src/satori/server/adapter.py

@@ -1,12 +1,11 @@
 from abc import abstractmethod
-from collections.abc import AsyncIterator
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING, Union
 
 from launart import Service
 from starlette.responses import Response
 from starlette.routing import BaseRoute
 
-from satori.model import Event, Login, LoginPartial
+from satori.model import Login, LoginPartial
 
 from .model import Request
 from .route import RouterMixin
@@ -16,7 +15,7 @@ if TYPE_CHECKING:
     from . import Server
 
 
-LoginType = Union[Login, LoginPartial]
+LoginType = Union[Login, LoginPartial]  # noqa: UP007
 
 
 class Adapter(Service, RouterMixin):
@@ -25,9 +24,6 @@ class Adapter(Service, RouterMixin):
     @abstractmethod
     def get_platform(self) -> str: ...
 
-    @abstractmethod
-    def publisher(self) -> AsyncIterator[Event]: ...
-
     @abstractmethod
     def ensure(self, platform: str, self_id: str) -> bool: ...
 
@@ -38,7 +34,7 @@ class Adapter(Service, RouterMixin):
     @abstractmethod
     async def handle_internal(self, request: Request, path: str) -> Response: ...
 
-    async def handle_proxied(self, prefix: str, url: str) -> Optional[Response]:
+    async def handle_proxied(self, prefix: str, url: str) -> Response | None:
         async with self.server.session.get(url, ssl=ctx) as resp:
             return Response(await resp.read())
 

{satori_python_server-0.16.7 → satori_python_server-0.17.1}/src/satori/server/connection.py

@@ -6,6 +6,7 @@ from loguru import logger
 from starlette.websockets import WebSocket, WebSocketDisconnect
 
 from satori.model import Opcode
+from satori.utils import decode, encode
 
 
 class WebsocketConnection:
@@ -22,12 +23,13 @@ class WebsocketConnection:
     async def heartbeat(self):
         while True:
             try:
-                msg = await asyncio.wait_for(self.connection.receive_json(), timeout=12)
+                msg = await asyncio.wait_for(self.connection.receive_text(), timeout=12)
+                msg = decode(msg)
                 if not isinstance(msg, dict) or msg.get("op") != Opcode.PING:
                     continue
-                await self.connection.send_json({"op": Opcode.PONG})
+                await self.connection.send_text(encode({"op": Opcode.PONG}))
             except asyncio.TimeoutError:
-                logger.warning(f"Connection {id(self)} heartbeat timeout, closing connection.")
+                logger.warning(f"Connection {id(self):x} heartbeat timeout, closing connection.")
                 await self.connection.close()
                 await self.connection_closed()
                 break
@@ -41,4 +43,4 @@ class WebsocketConnection:
         return
 
     async def send(self, payload: dict) -> None:
-        return await self.connection.send_json(payload)
+        return await self.connection.send_text(encode(payload))

{satori_python_server-0.16.7 → satori_python_server-0.17.1}/src/satori/server/model.py

@@ -1,17 +1,15 @@
-from collections.abc import AsyncIterator
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Generic, Optional, Protocol, TypeVar, Union, runtime_checkable
+from typing import TYPE_CHECKING, Any, Generic, Protocol, TypeVar, runtime_checkable
 
 from starlette.requests import Request as StarletteRequest
 from starlette.responses import Response
 
 from satori.const import Api
-from satori.model import Event, Login
+from satori.model import Login
 
 if TYPE_CHECKING:
     from .route import RouteCall
 
-JsonType = Union[list, dict, str, int, bool, float, None]
 TA = TypeVar("TA", str, Api)
 TP = TypeVar("TP")
 
@@ -27,8 +25,6 @@ class Request(Generic[TP]):
 
 @runtime_checkable
 class Provider(Protocol):
-    def publisher(self) -> AsyncIterator[Event]: ...
-
     async def get_logins(self) -> list[Login]: ...
 
     @staticmethod
@@ -38,7 +34,7 @@ class Provider(Protocol):
 
     async def handle_internal(self, request: Request, path: str) -> Response: ...
 
-    async def handle_proxied(self, prefix: str, url: str) -> Optional[Response]: ...
+    async def handle_proxied(self, prefix: str, url: str) -> Response | None: ...
 
 
 @runtime_checkable
@@ -49,4 +45,5 @@ class Router(Protocol):
 @dataclass
 class WebhookEndpoint:
     url: str
-    token: Optional[str] = None
+    token: str | None = None
+    timeout: float | None = None

{satori_python_server-0.16.7 → satori_python_server-0.17.1}/src/satori/server/route.py

@@ -1,6 +1,6 @@
-from collections.abc import Awaitable
-from typing import Any, Callable, Literal, Protocol, TypeVar, Union, overload
-from typing_extensions import NotRequired, TypeAlias, TypedDict
+from collections.abc import Awaitable, Callable
+from typing import Any, Literal, Protocol, TypeAlias, TypeVar, overload
+from typing_extensions import NotRequired, TypedDict
 
 from starlette.datastructures import FormData
 
@@ -30,9 +30,7 @@ class RouteCall(Protocol[T, R]):
     def __call__(self, request: Request[T]) -> Awaitable[R]: ...
 
 
-INTERAL: TypeAlias = RouteCall[
-    Any, Union[ModelBase, list[ModelBase], dict[str, Any], list[dict[str, Any]], None]
-]
+INTERAL: TypeAlias = RouteCall[Any, ModelBase | list[ModelBase] | dict[str, Any] | list[dict[str, Any]] | None]
 
 
 class MessageParam(TypedDict):
@@ -40,7 +38,7 @@ class MessageParam(TypedDict):
     content: str
 
 
-MESSAGE_CREATE: TypeAlias = RouteCall[MessageParam, Union[list[MessageObject], list[dict[str, Any]]]]
+MESSAGE_CREATE: TypeAlias = RouteCall[MessageParam, list[MessageObject] | list[dict[str, Any]]]
 
 
 class MessageOpParam(TypedDict):
@@ -48,7 +46,7 @@ class MessageOpParam(TypedDict):
     message_id: str
 
 
-MESSAGE_GET: TypeAlias = RouteCall[MessageOpParam, Union[MessageObject, dict[str, Any]]]
+MESSAGE_GET: TypeAlias = RouteCall[MessageOpParam, MessageObject | dict[str, Any]]
 MESSAGE_DELETE: TypeAlias = RouteCall[MessageOpParam, None]
 
 
@@ -69,14 +67,14 @@ class MessageListParam(TypedDict):
     order: NotRequired[Order]
 
 
-MESSAGE_LIST: TypeAlias = RouteCall[MessageListParam, Union[PageDequeResult[MessageObject], dict[str, Any]]]
+MESSAGE_LIST: TypeAlias = RouteCall[MessageListParam, PageDequeResult[MessageObject] | dict[str, Any]]
 
 
 class ChannelParam(TypedDict):
     channel_id: str
 
 
-CHANNEL_GET: TypeAlias = RouteCall[ChannelParam, Union[Channel, dict[str, Any]]]
+CHANNEL_GET: TypeAlias = RouteCall[ChannelParam, Channel | dict[str, Any]]
 CHANNEL_DELETE: TypeAlias = RouteCall[ChannelParam, None]
 
 
@@ -85,7 +83,7 @@ class ChannelListParam(TypedDict):
     next: NotRequired[str]
 
 
-CHANNEL_LIST: TypeAlias = RouteCall[ChannelListParam, Union[PageResult[Channel], dict[str, Any]]]
+CHANNEL_LIST: TypeAlias = RouteCall[ChannelListParam, PageResult[Channel] | dict[str, Any]]
 
 
 class ChannelCreateParam(TypedDict):
@@ -93,7 +91,7 @@ class ChannelCreateParam(TypedDict):
     data: dict
 
 
-CHANNEL_CREATE: TypeAlias = RouteCall[ChannelCreateParam, Union[Channel, dict[str, Any]]]
+CHANNEL_CREATE: TypeAlias = RouteCall[ChannelCreateParam, Channel | dict[str, Any]]
 
 
 class ChannelUpdateParam(TypedDict):
@@ -117,21 +115,21 @@ class UserChannelCreateParam(TypedDict):
     guild_id: NotRequired[str]
 
 
-ROUTE_USER_CHANNEL_CREATE: TypeAlias = RouteCall[UserChannelCreateParam, Union[Channel, dict[str, Any]]]
+ROUTE_USER_CHANNEL_CREATE: TypeAlias = RouteCall[UserChannelCreateParam, Channel | dict[str, Any]]
 
 
 class GuildGetParam(TypedDict):
     guild_id: str
 
 
-GUILD_GET: TypeAlias = RouteCall[GuildGetParam, Union[Guild, dict[str, Any]]]
+GUILD_GET: TypeAlias = RouteCall[GuildGetParam, Guild | dict[str, Any]]
 
 
 class GuildListParam(TypedDict):
     next: NotRequired[str]
 
 
-GUILD_LIST: TypeAlias = RouteCall[GuildListParam, Union[PageResult[Guild], dict[str, Any]]]
+GUILD_LIST: TypeAlias = RouteCall[GuildListParam, PageResult[Guild] | dict[str, Any]]
 
 
 class GuildMemberGetParam(TypedDict):
@@ -139,7 +137,7 @@ class GuildMemberGetParam(TypedDict):
     user_id: str
 
 
-GUILD_MEMBER_GET: TypeAlias = RouteCall[GuildMemberGetParam, Union[Member, dict[str, Any]]]
+GUILD_MEMBER_GET: TypeAlias = RouteCall[GuildMemberGetParam, Member | dict[str, Any]]
 
 
 class GuildXXXListParam(TypedDict):
@@ -147,7 +145,7 @@ class GuildXXXListParam(TypedDict):
     next: NotRequired[str]
 
 
-GUILD_MEMBER_LIST: TypeAlias = RouteCall[GuildXXXListParam, Union[PageResult[Member], dict[str, Any]]]
+GUILD_MEMBER_LIST: TypeAlias = RouteCall[GuildXXXListParam, PageResult[Member] | dict[str, Any]]
 
 
 class GuildMemberKickParam(TypedDict):
@@ -177,7 +175,7 @@ class GuildMemberRoleParam(TypedDict):
 GUILD_MEMBER_ROLE_SET: TypeAlias = RouteCall[GuildMemberRoleParam, None]
 GUILD_MEMBER_ROLE_UNSET: TypeAlias = RouteCall[GuildMemberRoleParam, None]
 
-GUILD_ROLE_LIST: TypeAlias = RouteCall[GuildXXXListParam, Union[PageResult[Role], dict[str, Any]]]
+GUILD_ROLE_LIST: TypeAlias = RouteCall[GuildXXXListParam, PageResult[Role] | dict[str, Any]]
 
 
 class GuildRoleCreateParam(TypedDict):
@@ -185,7 +183,7 @@ class GuildRoleCreateParam(TypedDict):
     role: dict
 
 
-GUILD_ROLE_CREATE: TypeAlias = RouteCall[GuildRoleCreateParam, Union[Role, dict[str, Any]]]
+GUILD_ROLE_CREATE: TypeAlias = RouteCall[GuildRoleCreateParam, Role | dict[str, Any]]
 
 
 class GuildRoleUpdateParam(TypedDict):
@@ -240,22 +238,22 @@ class ReactionListParam(TypedDict):
     next: NotRequired[str]
 
 
-REACTION_LIST: TypeAlias = RouteCall[ReactionListParam, Union[PageResult[User], dict[str, Any]]]
-LOGIN_GET: TypeAlias = RouteCall[Any, Union[Login, dict[str, Any]]]
+REACTION_LIST: TypeAlias = RouteCall[ReactionListParam, PageResult[User] | dict[str, Any]]
+LOGIN_GET: TypeAlias = RouteCall[Any, Login | dict[str, Any]]
 
 
 class UserGetParam(TypedDict):
     user_id: str
 
 
-USER_GET: TypeAlias = RouteCall[UserGetParam, Union[User, dict[str, Any]]]
+USER_GET: TypeAlias = RouteCall[UserGetParam, User | dict[str, Any]]
 
 
 class FriendListParam(TypedDict):
     next: NotRequired[str]
 
 
-FRIEND_LIST: TypeAlias = RouteCall[FriendListParam, Union[PageResult[User], dict[str, Any]]]
+FRIEND_LIST: TypeAlias = RouteCall[FriendListParam, PageResult[User] | dict[str, Any]]
 
 
 class ApproveParam(TypedDict):
@@ -321,24 +319,16 @@ class RouterMixin:
     def route(self, path: Literal[Api.GUILD_APPROVE]) -> Callable[[APPROVE], APPROVE]: ...
 
     @overload
-    def route(
-        self, path: Literal[Api.GUILD_MEMBER_LIST]
-    ) -> Callable[[GUILD_MEMBER_LIST], GUILD_MEMBER_LIST]: ...
+    def route(self, path: Literal[Api.GUILD_MEMBER_LIST]) -> Callable[[GUILD_MEMBER_LIST], GUILD_MEMBER_LIST]: ...
 
     @overload
-    def route(
-        self, path: Literal[Api.GUILD_MEMBER_GET]
-    ) -> Callable[[GUILD_MEMBER_GET], GUILD_MEMBER_GET]: ...
+    def route(self, path: Literal[Api.GUILD_MEMBER_GET]) -> Callable[[GUILD_MEMBER_GET], GUILD_MEMBER_GET]: ...
 
     @overload
-    def route(
-        self, path: Literal[Api.GUILD_MEMBER_KICK]
-    ) -> Callable[[GUILD_MEMBER_KICK], GUILD_MEMBER_KICK]: ...
+    def route(self, path: Literal[Api.GUILD_MEMBER_KICK]) -> Callable[[GUILD_MEMBER_KICK], GUILD_MEMBER_KICK]: ...
 
     @overload
-    def route(
-        self, path: Literal[Api.GUILD_MEMBER_MUTE]
-    ) -> Callable[[GUILD_MEMBER_MUTE], GUILD_MEMBER_MUTE]: ...
+    def route(self, path: Literal[Api.GUILD_MEMBER_MUTE]) -> Callable[[GUILD_MEMBER_MUTE], GUILD_MEMBER_MUTE]: ...
 
     @overload
     def route(self, path: Literal[Api.GUILD_MEMBER_APPROVE]) -> Callable[[APPROVE], APPROVE]: ...
@@ -357,19 +347,13 @@ class RouterMixin:
     def route(self, path: Literal[Api.GUILD_ROLE_LIST]) -> Callable[[GUILD_ROLE_LIST], GUILD_ROLE_LIST]: ...
 
     @overload
-    def route(
-        self, path: Literal[Api.GUILD_ROLE_CREATE]
-    ) -> Callable[[GUILD_ROLE_CREATE], GUILD_ROLE_CREATE]: ...
+    def route(self, path: Literal[Api.GUILD_ROLE_CREATE]) -> Callable[[GUILD_ROLE_CREATE], GUILD_ROLE_CREATE]: ...
 
     @overload
-    def route(
-        self, path: Literal[Api.GUILD_ROLE_UPDATE]
-    ) -> Callable[[GUILD_ROLE_UPDATE], GUILD_ROLE_UPDATE]: ...
+    def route(self, path: Literal[Api.GUILD_ROLE_UPDATE]) -> Callable[[GUILD_ROLE_UPDATE], GUILD_ROLE_UPDATE]: ...
 
     @overload
-    def route(
-        self, path: Literal[Api.GUILD_ROLE_DELETE]
-    ) -> Callable[[GUILD_ROLE_DELETE], GUILD_ROLE_DELETE]: ...
+    def route(self, path: Literal[Api.GUILD_ROLE_DELETE]) -> Callable[[GUILD_ROLE_DELETE], GUILD_ROLE_DELETE]: ...
 
     @overload
     def route(self, path: Literal[Api.REACTION_CREATE]) -> Callable[[REACTION_CREATE], REACTION_CREATE]: ...
@@ -401,7 +385,7 @@ class RouterMixin:
     @overload
     def route(self, path: str) -> Callable[[INTERAL], INTERAL]: ...
 
-    def route(self, path: Union[str, Api]) -> Callable[[RouteCall], RouteCall]:
+    def route(self, path: str | Api) -> Callable[[RouteCall], RouteCall]:
         """注册一个 Satori 路由
 
         Args:

{satori_python_server-0.16.7 → satori_python_server-0.17.1}/src/satori/server/utils.py

@@ -33,6 +33,9 @@ if __name__ == "__main__":
     d.append(0)
     d.append(1)
     d.append(2)
+    print(d.after(0))  # noqa: T201
     d.append(3)
     d.append(4)
     d.append(5)
+    print(d.data)  # noqa: T201
+    print(d.after(2))  # noqa: T201