satori-python-server 0.11.5__tar.gz → 0.12.0__tar.gz

{satori_python_server-0.11.5 → satori_python_server-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-server
-Version: 0.11.5
+Version: 0.12.0
 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>

{satori_python_server-0.11.5 → satori_python_server-0.12.0}/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.11.5"
+version = "0.12.0"
 
 [project.license]
 text = "MIT"

{satori_python_server-0.11.5 → satori_python_server-0.12.0}/src/satori/server/__init__.py

@@ -6,7 +6,7 @@ import signal
 import threading
 from contextlib import suppress
 from traceback import print_exc
-from typing import Any, Callable, Iterable, Literal, cast, overload
+from typing import Any, Callable, Iterable, cast
 
 import aiohttp
 from creart import it
@@ -24,15 +24,17 @@ from satori.config import WebhookInfo
 from satori.const import Api
 from satori.model import Event, ModelBase, Opcode
 
-from . import route
 from .adapter import Adapter as Adapter
 from .conection import WebsocketConnection
-from .model import Provider
+from .model import Provider as Provider
 from .model import Request as Request
-from .model import Router
+from .model import Router as Router
+from .route import INTERAL
+from .route import RouteCall as RouteCall
+from .route import RouterMixin as RouterMixin
 
 
-class Server(Service):
+class Server(Service, RouterMixin):
     id = "satori-python.server"
     required: set[str] = {"asgi.service/uvicorn"}
     stages: set[str] = {"preparing", "blocking", "cleanup"}
@@ -78,172 +80,19 @@ class Server(Service):
         else:
             raise TypeError(f"Unknown config type: {item}")
 
-    @overload
-    def route(
-        self, path: Literal[Api.MESSAGE_CREATE]
-    ) -> Callable[[route.MESSAGE_CREATE], route.MESSAGE_CREATE]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.MESSAGE_UPDATE]
-    ) -> Callable[[route.MESSAGE_UPDATE], route.MESSAGE_UPDATE]: ...
-
-    @overload
-    def route(self, path: Literal[Api.MESSAGE_GET]) -> Callable[[route.MESSAGE_GET], route.MESSAGE_GET]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.MESSAGE_DELETE]
-    ) -> Callable[[route.MESSAGE_DELETE], route.MESSAGE_DELETE]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.MESSAGE_LIST]
-    ) -> Callable[[route.MESSAGE_LIST], route.MESSAGE_LIST]: ...
-
-    @overload
-    def route(self, path: Literal[Api.CHANNEL_GET]) -> Callable[[route.CHANNEL_GET], route.CHANNEL_GET]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.CHANNEL_LIST]
-    ) -> Callable[[route.CHANNEL_LIST], route.CHANNEL_LIST]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.CHANNEL_CREATE]
-    ) -> Callable[[route.CHANNEL_CREATE], route.CHANNEL_CREATE]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.CHANNEL_UPDATE]
-    ) -> Callable[[route.CHANNEL_UPDATE], route.CHANNEL_UPDATE]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.CHANNEL_DELETE]
-    ) -> Callable[[route.CHANNEL_DELETE], route.CHANNEL_DELETE]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.CHANNEL_MUTE]
-    ) -> Callable[[route.CHANNEL_MUTE], route.CHANNEL_MUTE]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.USER_CHANNEL_CREATE]
-    ) -> Callable[[route.ROUTE_USER_CHANNEL_CREATE], route.ROUTE_USER_CHANNEL_CREATE]: ...
-
-    @overload
-    def route(self, path: Literal[Api.GUILD_GET]) -> Callable[[route.GUILD_GET], route.GUILD_GET]: ...
-
-    @overload
-    def route(self, path: Literal[Api.GUILD_LIST]) -> Callable[[route.GUILD_LIST], route.GUILD_LIST]: ...
-
-    @overload
-    def route(self, path: Literal[Api.GUILD_APPROVE]) -> Callable[[route.APPROVE], route.APPROVE]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.GUILD_MEMBER_LIST]
-    ) -> Callable[[route.GUILD_MEMBER_LIST], route.GUILD_MEMBER_LIST]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.GUILD_MEMBER_GET]
-    ) -> Callable[[route.GUILD_MEMBER_GET], route.GUILD_MEMBER_GET]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.GUILD_MEMBER_KICK]
-    ) -> Callable[[route.GUILD_MEMBER_KICK], route.GUILD_MEMBER_KICK]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.GUILD_MEMBER_MUTE]
-    ) -> Callable[[route.GUILD_MEMBER_MUTE], route.GUILD_MEMBER_MUTE]: ...
-
-    @overload
-    def route(self, path: Literal[Api.GUILD_MEMBER_APPROVE]) -> Callable[[route.APPROVE], route.APPROVE]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.GUILD_MEMBER_ROLE_SET]
-    ) -> Callable[[route.GUILD_MEMBER_ROLE_SET], route.GUILD_MEMBER_ROLE_SET]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.GUILD_MEMBER_ROLE_UNSET]
-    ) -> Callable[[route.GUILD_MEMBER_ROLE_UNSET], route.GUILD_MEMBER_ROLE_UNSET]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.GUILD_ROLE_LIST]
-    ) -> Callable[[route.GUILD_ROLE_LIST], route.GUILD_ROLE_LIST]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.GUILD_ROLE_CREATE]
-    ) -> Callable[[route.GUILD_ROLE_CREATE], route.GUILD_ROLE_CREATE]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.GUILD_ROLE_UPDATE]
-    ) -> Callable[[route.GUILD_ROLE_UPDATE], route.GUILD_ROLE_UPDATE]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.GUILD_ROLE_DELETE]
-    ) -> Callable[[route.GUILD_ROLE_DELETE], route.GUILD_ROLE_DELETE]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.REACTION_CREATE]
-    ) -> Callable[[route.REACTION_CREATE], route.REACTION_CREATE]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.REACTION_DELETE]
-    ) -> Callable[[route.REACTION_DELETE], route.REACTION_DELETE]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.REACTION_CLEAR]
-    ) -> Callable[[route.REACTION_CLEAR], route.REACTION_CLEAR]: ...
-
-    @overload
-    def route(
-        self, path: Literal[Api.REACTION_LIST]
-    ) -> Callable[[route.REACTION_LIST], route.REACTION_LIST]: ...
-
-    @overload
-    def route(self, path: Literal[Api.LOGIN_GET]) -> Callable[[route.LOGIN_GET], route.LOGIN_GET]: ...
-
-    @overload
-    def route(self, path: Literal[Api.USER_GET]) -> Callable[[route.USER_GET], route.USER_GET]: ...
-
-    @overload
-    def route(self, path: Literal[Api.FRIEND_LIST]) -> Callable[[route.FRIEND_LIST], route.FRIEND_LIST]: ...
-
-    @overload
-    def route(self, path: Literal[Api.FRIEND_APPROVE]) -> Callable[[route.APPROVE], route.APPROVE]: ...
-
-    @overload
-    def route(self, path: str) -> Callable[[route.INTERAL], route.INTERAL]: ...
-
-    def route(self, path: str | Api) -> Callable[[route.Router], route.Router]:
+    def _route(self, path: str | Api) -> Callable[[RouteCall], RouteCall]:
         """注册一个路由
 
         Args:
             path (str | Api): 路由路径；若 path 不属于 Api，则会被认为是内部接口
         """
 
-        def wrapper(func: route.INTERAL):
+        def wrapper(func: INTERAL):
             async def handler(request: StarletteRequest):
                 res = await func(
                     Request(
                         cast(dict, request.headers.mutablecopy()),
-                        path if isinstance(path, str) else path.value,
+                        f"internal/{path}" if isinstance(path, str) else path.value,
                         await request.json(),
                     )
                 )
@@ -309,34 +158,33 @@ class Server(Service):
         finally:
             self.connections.remove(connection)
 
+    async def admin_login_list_handler(self, request: StarletteRequest):
+        logins = []
+        for provider in self.providers:
+            logins.extend(await provider.get_logins())
+        return JSONResponse(content=[lo.dump() for lo in logins])
+
     async def http_server_handler(self, request: StarletteRequest):
         if not self.routers:
-            return Response(status_code=404)
+            return Response(status_code=404, content=request.path_params["method"])
         for _router in self.routers:
             if _router.validate_headers(cast(dict, request.headers.mutablecopy())):
                 method = request.path_params["method"]
-                if method.startswith("internal/"):
-                    res = await _router.call_internal_api(
-                        Request(
-                            cast(dict, request.headers.mutablecopy()),
-                            method[len("internal/") :],
-                            await request.json(),
-                        )
-                    )
-                else:
-                    res = await _router.call_api(
-                        Request(
-                            cast(dict, request.headers.mutablecopy()),
-                            method,
-                            await request.json(),
-                        )
+                if method not in _router.routes:
+                    return Response(status_code=404, content=method)
+                res = await _router.routes[method](
+                    Request(
+                        cast(dict, request.headers.mutablecopy()),
+                        method,
+                        await request.json(),
                     )
+                )
                 if isinstance(res, ModelBase):
                     return JSONResponse(content=res.dump())
                 if res and isinstance(res, list) and isinstance(res[0], ModelBase):
                     return JSONResponse(content=[_.dump() for _ in res])
                 return res if isinstance(res, Response) else JSONResponse(content=res)
-        return Response(status_code=401)
+        return Response(status_code=401, content=request.path_params["method"])
 
     async def launch(self, manager: Launart):
         for _adapter in self._adapters:
@@ -347,6 +195,11 @@ class Server(Service):
             app = Starlette(
                 routes=[
                     WebSocketRoute(f"{self.path}/{self.version}/events", self.websocket_server_handler),
+                    Route(
+                        f"{self.path}/{self.version}/admin/login.list",
+                        self.admin_login_list_handler,
+                        methods=["POST"],
+                    ),
                     *self.routes,
                     Route(
                         f"{self.path}/{self.version}/{{method:path}}",

satori_python_server-0.12.0/src/satori/server/adapter.py

@@ -0,0 +1,45 @@
+from abc import abstractmethod
+from typing import Any, AsyncIterator, Callable, Dict, List, Union
+
+from launart import Service
+
+from ..const import Api
+from ..model import Event, Login
+from .route import RouteCall, RouterMixin
+
+
+class Adapter(Service, RouterMixin):
+    routes: Dict[str, RouteCall[Any, Any]]
+
+    @abstractmethod
+    def get_platform(self) -> str: ...
+
+    @abstractmethod
+    def publisher(self) -> AsyncIterator[Event]: ...
+
+    @abstractmethod
+    def validate_headers(self, headers: Dict[str, Any]) -> bool: ...
+
+    @abstractmethod
+    def authenticate(self, token: str) -> bool: ...
+
+    @abstractmethod
+    async def get_logins(self) -> List[Login]: ...
+
+    def _route(self, path: Union[str, Api]) -> Callable[[RouteCall], RouteCall]:
+        def wrapper(func: RouteCall):
+            if isinstance(path, Api):
+                self.routes[path.value] = func
+            else:
+                self.routes[f"internal/{path}"] = func
+            return func
+
+        return wrapper
+
+    def __init__(self):
+        super().__init__()
+        self.routes = {}
+
+    @property
+    def id(self):
+        return f"satori-python.adapter.{self.get_platform()}#{id(self)}"

{satori_python_server-0.11.5 → satori_python_server-0.12.0}/src/satori/server/model.py

@@ -1,11 +1,14 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, AsyncIterator, Generic, Protocol, TypeVar, Union, runtime_checkable
+from typing import TYPE_CHECKING, Any, AsyncIterator, Generic, Protocol, TypeVar, Union, runtime_checkable
 
 from satori.const import Api
 from satori.model import Event, 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")
@@ -29,8 +32,6 @@ class Provider(Protocol):
 
 @runtime_checkable
 class Router(Protocol):
-    def validate_headers(self, headers: dict[str, Any]) -> bool: ...
+    routes: dict[str, RouteCall[Any, Any]]
 
-    async def call_api(self, request: Request[Any]) -> Any: ...
-
-    async def call_internal_api(self, request: Request[Any]) -> Any: ...
+    def validate_headers(self, headers: dict[str, Any]) -> bool: ...

satori_python_server-0.12.0/src/satori/server/route.py

@@ -0,0 +1,396 @@
+from abc import ABCMeta, abstractmethod
+from typing import Any, Awaitable, Callable, Dict, List, Literal, Protocol, TypeVar, Union, overload
+from typing_extensions import NotRequired, TypeAlias, TypedDict
+
+from satori.model import (
+    Channel,
+    Direction,
+    Guild,
+    Login,
+    Member,
+    MessageObject,
+    ModelBase,
+    Order,
+    PageDequeResult,
+    PageResult,
+    Role,
+    User,
+)
+
+from .. import Api
+from .model import Request
+
+T = TypeVar("T")
+R = TypeVar("R", covariant=True)
+
+
+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]
+]
+
+
+class MessageParam(TypedDict):
+    channel_id: str
+    content: str
+
+
+MESSAGE_CREATE: TypeAlias = RouteCall[MessageParam, Union[List[MessageObject], List[Dict[str, Any]]]]
+MESSAGE_GET: TypeAlias = RouteCall[MessageParam, Union[MessageObject, Dict[str, Any]]]
+MESSAGE_DELETE: TypeAlias = RouteCall[MessageParam, None]
+
+
+class MessageUpdateParam(TypedDict):
+    channel_id: str
+    message_id: str
+    content: str
+
+
+MESSAGE_UPDATE: TypeAlias = RouteCall[MessageUpdateParam, None]
+
+
+class MessageListParam(TypedDict):
+    channel_id: str
+    next: NotRequired[str]
+    direction: NotRequired[Direction]
+    limit: NotRequired[int]
+    order: NotRequired[Order]
+
+
+MESSAGE_LIST: TypeAlias = RouteCall[MessageListParam, Union[PageDequeResult[MessageObject], Dict[str, Any]]]
+
+
+class ChannelParam(TypedDict):
+    channel_id: str
+
+
+CHANNEL_GET: TypeAlias = RouteCall[ChannelParam, Union[Channel, Dict[str, Any]]]
+CHANNEL_DELETE: TypeAlias = RouteCall[ChannelParam, None]
+
+
+class ChannelListParam(TypedDict):
+    guild_id: str
+    next: NotRequired[str]
+
+
+CHANNEL_LIST: TypeAlias = RouteCall[ChannelListParam, Union[PageResult[Channel], Dict[str, Any]]]
+
+
+class ChanneCreateParam(TypedDict):
+    guild_id: str
+    data: dict
+
+
+CHANNEL_CREATE: TypeAlias = RouteCall[ChanneCreateParam, Union[Channel, Dict[str, Any]]]
+
+
+class ChanneUpdateParam(TypedDict):
+    channel_id: str
+    data: dict
+
+
+CHANNEL_UPDATE: TypeAlias = RouteCall[ChanneUpdateParam, None]
+
+
+class ChannelMuteParam(TypedDict):
+    channel_id: str
+    duration: float
+
+
+CHANNEL_MUTE: TypeAlias = RouteCall[ChannelMuteParam, None]
+
+
+class UserChannelCreateParam(TypedDict):
+    user_id: str
+    guild_id: NotRequired[str]
+
+
+ROUTE_USER_CHANNEL_CREATE: TypeAlias = RouteCall[UserChannelCreateParam, Union[Channel, Dict[str, Any]]]
+
+
+class GuildGetParam(TypedDict):
+    guild_id: str
+
+
+GUILD_GET: TypeAlias = RouteCall[GuildGetParam, Union[Guild, Dict[str, Any]]]
+
+
+class GuildListParam(TypedDict):
+    next: NotRequired[str]
+
+
+GUILD_LIST: TypeAlias = RouteCall[GuildListParam, Union[PageResult[Guild], Dict[str, Any]]]
+
+
+class GuildMemberGetParam(TypedDict):
+    guild_id: str
+    user_id: str
+
+
+GUILD_MEMBER_GET: TypeAlias = RouteCall[GuildMemberGetParam, Union[Member, Dict[str, Any]]]
+
+
+class GuildXXXListParam(TypedDict):
+    guild_id: str
+    next: NotRequired[str]
+
+
+GUILD_MEMBER_LIST: TypeAlias = RouteCall[GuildXXXListParam, Union[PageResult[Member], Dict[str, Any]]]
+
+
+class GuildMemberKickParam(TypedDict):
+    guild_id: str
+    user_id: str
+    permanent: NotRequired[bool]
+
+
+GUILD_MEMBER_KICK: TypeAlias = RouteCall[GuildMemberKickParam, None]
+
+
+class GuildMemberMuteParam(TypedDict):
+    guild_id: str
+    user_id: str
+    duration: float
+
+
+GUILD_MEMBER_MUTE: TypeAlias = RouteCall[GuildMemberMuteParam, None]
+
+
+class GuildMemberRoleParam(TypedDict):
+    guild_id: str
+    user_id: str
+    role_id: str
+
+
+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]]]
+
+
+class GuildRoleCreateParam(TypedDict):
+    guild: str
+    role: dict
+
+
+GUILD_ROLE_CREATE: TypeAlias = RouteCall[GuildRoleCreateParam, Union[Role, Dict[str, Any]]]
+
+
+class GuildRoleUpdateParam(TypedDict):
+    guild: str
+    role_id: str
+    role: dict
+
+
+GUILD_ROLE_UPDATE: TypeAlias = RouteCall[GuildRoleUpdateParam, None]
+
+
+class GuildRoleDeleteParam(TypedDict):
+    guild: str
+    role_id: str
+
+
+GUILD_ROLE_DELETE: TypeAlias = RouteCall[GuildRoleDeleteParam, None]
+
+
+class ReactionCreateParam(TypedDict):
+    channel_id: str
+    message_id: str
+    emoji: str
+
+
+REACTION_CREATE: TypeAlias = RouteCall[ReactionCreateParam, None]
+
+
+class ReactionDeleteParam(TypedDict):
+    channel_id: str
+    message_id: str
+    emoji: str
+    user_id: NotRequired[str]
+
+
+REACTION_DELETE: TypeAlias = RouteCall[ReactionDeleteParam, None]
+
+
+class ReactionClearParam(TypedDict):
+    channel_id: str
+    message_id: str
+    emoji: NotRequired[str]
+
+
+REACTION_CLEAR: TypeAlias = RouteCall[ReactionClearParam, None]
+
+
+class ReactionListParam(TypedDict):
+    channel_id: str
+    message_id: str
+    emoji: str
+    next: NotRequired[str]
+
+
+REACTION_LIST: TypeAlias = RouteCall[ReactionListParam, Union[PageResult[User], Dict[str, Any]]]
+LOGIN_GET: TypeAlias = RouteCall[Any, Union[Login, Dict[str, Any]]]
+
+
+class UserGetParam(TypedDict):
+    user_id: str
+
+
+USER_GET: TypeAlias = RouteCall[UserGetParam, Union[User, Dict[str, Any]]]
+
+
+class FriendListParam(TypedDict):
+    next: NotRequired[str]
+
+
+FRIEND_LIST: TypeAlias = RouteCall[FriendListParam, Union[PageResult[User], Dict[str, Any]]]
+
+
+class ApproveParam(TypedDict):
+    message_id: str
+    approve: bool
+    comment: str
+
+
+APPROVE: TypeAlias = RouteCall[ApproveParam, None]
+
+
+class RouterMixin(metaclass=ABCMeta):
+    @overload
+    def route(self, path: Literal[Api.MESSAGE_CREATE]) -> Callable[[MESSAGE_CREATE], MESSAGE_CREATE]: ...
+
+    @overload
+    def route(self, path: Literal[Api.MESSAGE_UPDATE]) -> Callable[[MESSAGE_UPDATE], MESSAGE_UPDATE]: ...
+
+    @overload
+    def route(self, path: Literal[Api.MESSAGE_GET]) -> Callable[[MESSAGE_GET], MESSAGE_GET]: ...
+
+    @overload
+    def route(self, path: Literal[Api.MESSAGE_DELETE]) -> Callable[[MESSAGE_DELETE], MESSAGE_DELETE]: ...
+
+    @overload
+    def route(self, path: Literal[Api.MESSAGE_LIST]) -> Callable[[MESSAGE_LIST], MESSAGE_LIST]: ...
+
+    @overload
+    def route(self, path: Literal[Api.CHANNEL_GET]) -> Callable[[CHANNEL_GET], CHANNEL_GET]: ...
+
+    @overload
+    def route(self, path: Literal[Api.CHANNEL_LIST]) -> Callable[[CHANNEL_LIST], CHANNEL_LIST]: ...
+
+    @overload
+    def route(self, path: Literal[Api.CHANNEL_CREATE]) -> Callable[[CHANNEL_CREATE], CHANNEL_CREATE]: ...
+
+    @overload
+    def route(self, path: Literal[Api.CHANNEL_UPDATE]) -> Callable[[CHANNEL_UPDATE], CHANNEL_UPDATE]: ...
+
+    @overload
+    def route(self, path: Literal[Api.CHANNEL_DELETE]) -> Callable[[CHANNEL_DELETE], CHANNEL_DELETE]: ...
+
+    @overload
+    def route(self, path: Literal[Api.CHANNEL_MUTE]) -> Callable[[CHANNEL_MUTE], CHANNEL_MUTE]: ...
+
+    @overload
+    def route(
+        self, path: Literal[Api.USER_CHANNEL_CREATE]
+    ) -> Callable[[ROUTE_USER_CHANNEL_CREATE], ROUTE_USER_CHANNEL_CREATE]: ...
+
+    @overload
+    def route(self, path: Literal[Api.GUILD_GET]) -> Callable[[GUILD_GET], GUILD_GET]: ...
+
+    @overload
+    def route(self, path: Literal[Api.GUILD_LIST]) -> Callable[[GUILD_LIST], GUILD_LIST]: ...
+
+    @overload
+    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]: ...
+
+    @overload
+    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]: ...
+
+    @overload
+    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]: ...
+
+    @overload
+    def route(
+        self, path: Literal[Api.GUILD_MEMBER_ROLE_SET]
+    ) -> Callable[[GUILD_MEMBER_ROLE_SET], GUILD_MEMBER_ROLE_SET]: ...
+
+    @overload
+    def route(
+        self, path: Literal[Api.GUILD_MEMBER_ROLE_UNSET]
+    ) -> Callable[[GUILD_MEMBER_ROLE_UNSET], GUILD_MEMBER_ROLE_UNSET]: ...
+
+    @overload
+    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]: ...
+
+    @overload
+    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]: ...
+
+    @overload
+    def route(self, path: Literal[Api.REACTION_CREATE]) -> Callable[[REACTION_CREATE], REACTION_CREATE]: ...
+
+    @overload
+    def route(self, path: Literal[Api.REACTION_DELETE]) -> Callable[[REACTION_DELETE], REACTION_DELETE]: ...
+
+    @overload
+    def route(self, path: Literal[Api.REACTION_CLEAR]) -> Callable[[REACTION_CLEAR], REACTION_CLEAR]: ...
+
+    @overload
+    def route(self, path: Literal[Api.REACTION_LIST]) -> Callable[[REACTION_LIST], REACTION_LIST]: ...
+
+    @overload
+    def route(self, path: Literal[Api.LOGIN_GET]) -> Callable[[LOGIN_GET], LOGIN_GET]: ...
+
+    @overload
+    def route(self, path: Literal[Api.USER_GET]) -> Callable[[USER_GET], USER_GET]: ...
+
+    @overload
+    def route(self, path: Literal[Api.FRIEND_LIST]) -> Callable[[FRIEND_LIST], FRIEND_LIST]: ...
+
+    @overload
+    def route(self, path: Literal[Api.FRIEND_APPROVE]) -> Callable[[APPROVE], APPROVE]: ...
+
+    @overload
+    def route(self, path: str) -> Callable[[INTERAL], INTERAL]: ...
+
+    def route(self, path: Union[str, Api]) -> Callable[[RouteCall], RouteCall]:
+        """注册一个路由
+
+        Args:
+            path (str | Api): 路由路径；若 path 不属于 Api，则会被认为是内部接口
+        """
+        return self._route(path)
+
+    @abstractmethod
+    def _route(self, path: Union[str, Api]) -> Callable[[RouteCall], RouteCall]: ...

satori_python_server-0.11.5/src/satori/server/adapter.py

@@ -1,34 +0,0 @@
-from abc import abstractmethod
-from typing import Any, AsyncIterator, Dict, List
-
-from launart import Service
-
-from ..model import Event, Login
-from .model import Request
-
-
-class Adapter(Service):
-    @abstractmethod
-    def get_platform(self) -> str: ...
-
-    @abstractmethod
-    def publisher(self) -> AsyncIterator[Event]: ...
-
-    @abstractmethod
-    def validate_headers(self, headers: Dict[str, Any]) -> bool: ...
-
-    @abstractmethod
-    def authenticate(self, token: str) -> bool: ...
-
-    @abstractmethod
-    async def get_logins(self) -> List[Login]: ...
-
-    @abstractmethod
-    async def call_api(self, request: Request[Any]) -> Any: ...
-
-    @abstractmethod
-    async def call_internal_api(self, request: Request[Any]) -> Any: ...
-
-    @property
-    def id(self):
-        return f"satori-python.adapter.{self.get_platform()}#{id(self)}"

satori_python_server-0.11.5/src/satori/server/route.py

@@ -1,240 +0,0 @@
-from typing import Any, Awaitable, Dict, List, Protocol, TypeVar, Union
-from typing_extensions import NotRequired, TypeAlias, TypedDict
-
-from satori.model import Channel, Guild, Login, Member, MessageObject, ModelBase, PageResult, Role, User
-
-from .model import Request
-
-T = TypeVar("T")
-R = TypeVar("R", covariant=True)
-
-
-class Router(Protocol[T, R]):
-    def __call__(self, request: Request[T]) -> Awaitable[R]: ...
-
-
-INTERAL: TypeAlias = Router[
-    Any, Union[ModelBase, List[ModelBase], Dict[str, Any], List[Dict[str, Any]], None]
-]
-
-
-class MessageParam(TypedDict):
-    channel_id: str
-    content: str
-
-
-MESSAGE_CREATE: TypeAlias = Router[MessageParam, Union[List[MessageObject], List[Dict[str, Any]]]]
-MESSAGE_GET: TypeAlias = Router[MessageParam, Union[MessageObject, Dict[str, Any]]]
-MESSAGE_DELETE: TypeAlias = Router[MessageParam, None]
-
-
-class MessageUpdateParam(TypedDict):
-    channel_id: str
-    message_id: str
-    content: str
-
-
-MESSAGE_UPDATE: TypeAlias = Router[MessageUpdateParam, None]
-
-
-class MessageListParam(TypedDict):
-    channel_id: str
-    next: NotRequired[str]
-
-
-MESSAGE_LIST: TypeAlias = Router[MessageListParam, Union[PageResult[MessageObject], Dict[str, Any]]]
-
-
-class ChannelParam(TypedDict):
-    channel_id: str
-
-
-CHANNEL_GET: TypeAlias = Router[ChannelParam, Union[Channel, Dict[str, Any]]]
-CHANNEL_DELETE: TypeAlias = Router[ChannelParam, None]
-
-
-class ChannelListParam(TypedDict):
-    guild_id: str
-    next: NotRequired[str]
-
-
-CHANNEL_LIST: TypeAlias = Router[ChannelListParam, Union[PageResult[Channel], Dict[str, Any]]]
-
-
-class ChanneCreateParam(TypedDict):
-    guild_id: str
-    data: dict
-
-
-CHANNEL_CREATE: TypeAlias = Router[ChanneCreateParam, Union[Channel, Dict[str, Any]]]
-
-
-class ChanneUpdateParam(TypedDict):
-    channel_id: str
-    data: dict
-
-
-CHANNEL_UPDATE: TypeAlias = Router[ChanneUpdateParam, None]
-
-
-class ChannelMuteParam(TypedDict):
-    channel_id: str
-    duration: float
-
-
-CHANNEL_MUTE: TypeAlias = Router[ChannelMuteParam, None]
-
-
-class UserChannelCreateParam(TypedDict):
-    user_id: str
-    guild_id: NotRequired[str]
-
-
-ROUTE_USER_CHANNEL_CREATE: TypeAlias = Router[UserChannelCreateParam, Union[Channel, Dict[str, Any]]]
-
-
-class GuildGetParam(TypedDict):
-    guild_id: str
-
-
-GUILD_GET: TypeAlias = Router[GuildGetParam, Union[Guild, Dict[str, Any]]]
-
-
-class GuildListParam(TypedDict):
-    next: NotRequired[str]
-
-
-GUILD_LIST: TypeAlias = Router[GuildListParam, Union[PageResult[Guild], Dict[str, Any]]]
-
-
-class GuildMemberGetParam(TypedDict):
-    guild_id: str
-    user_id: str
-
-
-GUILD_MEMBER_GET: TypeAlias = Router[GuildMemberGetParam, Union[Member, Dict[str, Any]]]
-
-
-class GuildXXXListParam(TypedDict):
-    guild_id: str
-    next: NotRequired[str]
-
-
-GUILD_MEMBER_LIST: TypeAlias = Router[GuildXXXListParam, Union[PageResult[Member], Dict[str, Any]]]
-
-
-class GuildMemberKickParam(TypedDict):
-    guild_id: str
-    user_id: str
-    permanent: NotRequired[bool]
-
-
-GUILD_MEMBER_KICK: TypeAlias = Router[GuildMemberKickParam, None]
-
-
-class GuildMemberMuteParam(TypedDict):
-    guild_id: str
-    user_id: str
-    duration: float
-
-
-GUILD_MEMBER_MUTE: TypeAlias = Router[GuildMemberMuteParam, None]
-
-
-class GuildMemberRoleParam(TypedDict):
-    guild_id: str
-    user_id: str
-    role_id: str
-
-
-GUILD_MEMBER_ROLE_SET: TypeAlias = Router[GuildMemberRoleParam, None]
-GUILD_MEMBER_ROLE_UNSET: TypeAlias = Router[GuildMemberRoleParam, None]
-
-GUILD_ROLE_LIST: TypeAlias = Router[GuildXXXListParam, Union[PageResult[Role], Dict[str, Any]]]
-
-
-class GuildRoleCreateParam(TypedDict):
-    guild: str
-    role: dict
-
-
-GUILD_ROLE_CREATE: TypeAlias = Router[GuildRoleCreateParam, Union[Role, Dict[str, Any]]]
-
-
-class GuildRoleUpdateParam(TypedDict):
-    guild: str
-    role_id: str
-    role: dict
-
-
-GUILD_ROLE_UPDATE: TypeAlias = Router[GuildRoleUpdateParam, None]
-
-
-class GuildRoleDeleteParam(TypedDict):
-    guild: str
-    role_id: str
-
-
-GUILD_ROLE_DELETE: TypeAlias = Router[GuildRoleDeleteParam, None]
-
-
-class ReactionCreateParam(TypedDict):
-    channel_id: str
-    message_id: str
-    emoji: str
-
-
-REACTION_CREATE: TypeAlias = Router[ReactionCreateParam, None]
-
-
-class ReactionDeleteParam(TypedDict):
-    channel_id: str
-    message_id: str
-    emoji: str
-    user_id: NotRequired[str]
-
-
-REACTION_DELETE: TypeAlias = Router[ReactionDeleteParam, None]
-
-
-class ReactionClearParam(TypedDict):
-    channel_id: str
-    message_id: str
-    emoji: NotRequired[str]
-
-
-REACTION_CLEAR: TypeAlias = Router[ReactionClearParam, None]
-
-
-class ReactionListParam(TypedDict):
-    channel_id: str
-    message_id: str
-    emoji: str
-    next: NotRequired[str]
-
-
-REACTION_LIST: TypeAlias = Router[ReactionListParam, Union[PageResult[User], Dict[str, Any]]]
-LOGIN_GET: TypeAlias = Router[Any, Union[Login, Dict[str, Any]]]
-
-
-class UserGetParam(TypedDict):
-    user_id: str
-
-
-USER_GET: TypeAlias = Router[UserGetParam, Union[User, Dict[str, Any]]]
-
-
-class FriendListParam(TypedDict):
-    next: NotRequired[str]
-
-
-FRIEND_LIST: TypeAlias = Router[FriendListParam, Union[PageResult[User], Dict[str, Any]]]
-
-
-class ApproveParam(TypedDict):
-    message_id: str
-    approve: bool
-    comment: str
-
-
-APPROVE: TypeAlias = Router[ApproveParam, None]