satori-python-server 0.15.0rc2__tar.gz → 0.15.2__tar.gz

{satori_python_server-0.15.0rc2 → satori_python_server-0.15.2}/.mina/server.toml

@@ -1,5 +1,5 @@
 includes = ["src/satori/server"]
-raw-dependencies = ["satori-python-core >= 0.11.4"]
+raw-dependencies = ["satori-python-core >= 0.15.0"]
 
 [project]
 name = "satori-python-server"

{satori_python_server-0.15.0rc2 → satori_python_server-0.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-server
-Version: 0.15.0rc2
+Version: 0.15.2
 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>
@@ -23,7 +23,7 @@ Requires-Dist: graia-amnesia>=0.9.0
 Requires-Dist: starlette[python-multipart]>=0.37.2
 Requires-Dist: uvicorn[standard]>=0.28.0
 Requires-Dist: python-multipart>=0.0.9
-Requires-Dist: satori-python-core>=0.11.4
+Requires-Dist: satori-python-core>=0.15.0
 Description-Content-Type: text/markdown
 
 # satori-python
@@ -44,6 +44,7 @@ Description-Content-Type: text/markdown
 目前提供了 `satori` 协议实现的有：
 
 - [Chronocat](https://chronocat.vercel.app)
+- [nekobox](https://github.com/wyapx/nekobox)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
 ### 使用该 SDK 的框架

{satori_python_server-0.15.0rc2 → satori_python_server-0.15.2}/README.md

@@ -16,6 +16,7 @@
 目前提供了 `satori` 协议实现的有：
 
 - [Chronocat](https://chronocat.vercel.app)
+- [nekobox](https://github.com/wyapx/nekobox)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
 ### 使用该 SDK 的框架

{satori_python_server-0.15.0rc2 → satori_python_server-0.15.2}/pyproject.toml

@@ -11,7 +11,7 @@ dependencies = [
     "starlette[python-multipart]>=0.37.2",
     "uvicorn[standard]>=0.28.0",
     "python-multipart>=0.0.9",
-    "satori-python-core >= 0.11.4",
+    "satori-python-core >= 0.15.0",
 ]
 description = "Satori Protocol SDK for python, specify server part"
 readme = "README.md"
@@ -27,7 +27,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.15.0rc2"
+version = "0.15.2"
 
 [project.license]
 text = "MIT"
@@ -59,6 +59,9 @@ includes = [
     "src/satori/server",
     ".mina/server.toml",
 ]
+excludes = [
+    "src/satori/adapters/*",
+]
 
 [tool.pdm.scripts.format]
 composite = [

{satori_python_server-0.15.0rc2 → satori_python_server-0.15.2}/src/satori/server/__init__.py

@@ -9,6 +9,7 @@ import threading
 import urllib.parse
 from collections.abc import Iterable
 from contextlib import suppress
+from itertools import chain
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from traceback import print_exc
@@ -43,7 +44,9 @@ from .route import RouterMixin as RouterMixin
 from .utils import Deque
 
 
-async def _request_handler(method: str, request: StarletteRequest, func: RouteCall):
+async def _request_handler(
+    method: str, request: StarletteRequest, func: RouteCall, platform: str, self_id: str
+):
     if method == Api.UPLOAD_CREATE.value:
         async with request.form() as form:
             res = await func(
@@ -51,16 +54,24 @@ async def _request_handler(method: str, request: StarletteRequest, func: RouteCa
                     cast(dict, request.headers.mutablecopy()),
                     method,
                     form,
+                    platform=platform,
+                    self_id=self_id,
                 )
             )
             return JSONResponse(content=res)
-    res = await func(
-        Request(
-            cast(dict, request.headers.mutablecopy()),
-            method,
-            await request.json(),
+    try:
+        res = await func(
+            Request(
+                cast(dict, request.headers.mutablecopy()),
+                method,
+                await request.json(),
+                platform=platform,
+                self_id=self_id,
+            )
         )
-    )
+    except Exception as e:
+        logger.error(e)
+        return Response(status_code=500, content=str(e))
     if isinstance(res, ModelBase):
         return JSONResponse(content=res.dump())
     if res and isinstance(res, list) and isinstance(res[0], ModelBase):
@@ -86,6 +97,7 @@ class Server(Service, RouterMixin):
         port: int = 5140,
         path: str = "",
         version: str = "v1",
+        token: str | None = None,
         webhooks: list[WebhookInfo] | None = None,
         stream_threshold: int = 16 * 1024 * 1024,
         stream_chunk_size: int = 64 * 1024,
@@ -98,6 +110,7 @@ class Server(Service, RouterMixin):
         if self.path and not self.path.startswith("/"):
             self.path = f"/{self.path}"
         self.url_base = f"http://{host}:{port}{self.path}/{version}"
+        self.token = token
         self._adapters = []
         self.providers = []
         self.routers = []
@@ -167,9 +180,9 @@ class Server(Service, RouterMixin):
         body = identity["body"]
         token = identity["body"].get("token")
         logins = []
+        if token != self.token:
+            return await ws.close(code=3000, reason="Unauthorized")
         for provider in self.providers:
-            if not provider.authenticate(token):
-                return await ws.close(code=3000, reason="Unauthorized")
             _logins = await provider.get_logins()
             for _login in _logins:
                 _login.proxy_urls.extend(provider.proxy_urls())
@@ -220,13 +233,13 @@ class Server(Service, RouterMixin):
                 continue
             if not _router.ensure(platform, self_id):
                 continue
-            return await _request_handler(method, request, _router.routes[method])
+            return await _request_handler(method, request, _router.routes[method], platform, self_id)
         if method in self.routes:
-            return await _request_handler(method, request, self.routes[method])
+            return await _request_handler(method, request, self.routes[method], platform, self_id)
         for _router in self.routers:
             if method not in _router.routes:
                 continue
-            return await _request_handler(method, request, _router.routes[method])
+            return await _request_handler(method, request, _router.routes[method], platform, self_id)
         return Response(status_code=404, content=method)
 
     async def proxy_url_handler(self, request: StarletteRequest):
@@ -322,6 +335,7 @@ class Server(Service, RouterMixin):
             asgi_service = manager.get_component(UvicornASGIService)
             app = Starlette(
                 routes=[
+                    *chain.from_iterable(ada.get_routes() for ada in self._adapters),
                     WebSocketRoute(f"{self.path}/{self.version}/events", self.websocket_server_handler),
                     Route(
                         f"{self.path}/{self.version}/admin/login.list",

{satori_python_server-0.15.0rc2 → satori_python_server-0.15.2}/src/satori/server/adapter.py

@@ -1,8 +1,9 @@
 from abc import abstractmethod
 from collections.abc import AsyncIterator
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from launart import Service
+from starlette.routing import BaseRoute
 
 from ..model import Event, LoginType
 from .route import RouterMixin
@@ -24,9 +25,6 @@ class Adapter(Service, RouterMixin):
     @abstractmethod
     def ensure(self, platform: str, self_id: str) -> bool: ...
 
-    @abstractmethod
-    def authenticate(self, token: Optional[str]) -> bool: ...
-
     @staticmethod
     def proxy_urls() -> list[str]:
         return []
@@ -51,3 +49,7 @@ class Adapter(Service, RouterMixin):
 
     def ensure_server(self, server: "Server"):
         self.server = server
+
+    def get_routes(self) -> list[BaseRoute]:
+        """return extra routes that will mount to the server root"""
+        return []

{satori_python_server-0.15.0rc2 → satori_python_server-0.15.2}/src/satori/server/model.py

@@ -18,14 +18,14 @@ class Request(Generic[TP]):
     headers: dict[str, Any]
     action: str
     params: TP
+    platform: str
+    self_id: str
 
 
 @runtime_checkable
 class Provider(Protocol):
     def publisher(self) -> AsyncIterator[Event]: ...
 
-    def authenticate(self, token: Optional[str]) -> bool: ...
-
     async def get_logins(self) -> Union[list[Login], list[LoginPreview], list[LoginType]]: ...
 
     @staticmethod