satori-python-server 0.16.2__tar.gz → 0.16.4__tar.gz

{satori_python_server-0.16.2 → satori_python_server-0.16.4}/.mina/server.toml

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

{satori_python_server-0.16.2 → satori_python_server-0.16.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-server
-Version: 0.16.2
+Version: 0.16.4
 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.16.1
+Requires-Dist: satori-python-core>=0.16.3
 Description-Content-Type: text/markdown
 
 # satori-python
@@ -73,6 +73,13 @@ pip install satori-python-client
 pip install satori-python-server
 ```
 
+### 官方适配器
+
+| 适配器        | 安装                                           |
+|------------|----------------------------------------------|
+| Satori     | `pip install satori-python-adapter-satori`   |
+| OneBot V11 | `pip install satori-python-adapter-onebot11` |
+
 ## 使用
 
 客户端：

{satori_python_server-0.16.2 → satori_python_server-0.16.4}/README.md

@@ -45,6 +45,13 @@ pip install satori-python-client
 pip install satori-python-server
 ```
 
+### 官方适配器
+
+| 适配器        | 安装                                           |
+|------------|----------------------------------------------|
+| Satori     | `pip install satori-python-adapter-satori`   |
+| OneBot V11 | `pip install satori-python-adapter-onebot11` |
+
 ## 使用
 
 客户端：

{satori_python_server-0.16.2 → satori_python_server-0.16.4}/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.16.1",
+    "satori-python-core >= 0.16.3",
 ]
 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.16.2"
+version = "0.16.4"
 
 [project.license]
 text = "MIT"

{satori_python_server-0.16.2 → satori_python_server-0.16.4}/src/satori/server/__init__.py

@@ -18,6 +18,7 @@ from typing import Any
 
 import aiohttp
 from creart import it
+from graia.amnesia.builtins.aiohttp import AiohttpClientService
 from graia.amnesia.builtins.asgi import UvicornASGIService
 from launart import Launart, Service, any_completed
 from loguru import logger
@@ -115,13 +116,12 @@ class Server(Service, RouterMixin):
         stream_chunk_size: int = 64 * 1024,
     ):
         self.connections = []
-        manager = it(Launart)
-        manager.add_component(UvicornASGIService(host, port))
+        self.host = host
+        self.port = port
         self.version = version
         self.path = path
         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 = []
@@ -136,6 +136,10 @@ class Server(Service, RouterMixin):
         self.resources: dict[str, Path] = {}
         super().__init__()
 
+    @property
+    def url_base(self):
+        return f"http://{self.host}:{self.port}{self.path}/{self.version}"
+
     def apply(self, item: Provider | Router | Adapter):
         if isinstance(item, Adapter):
             item.ensure_server(self)
@@ -157,9 +161,11 @@ class Server(Service, RouterMixin):
         self._event_cache.append(event)
         self._sequence += 1
         for connection in self.connections:
+            if not connection.alive:
+                continue
             try:
                 await connection.send({"op": Opcode.EVENT, "body": event.dump()})
-            except WebSocketDisconnect:
+            except (WebSocketDisconnect, RuntimeError):
                 break
             except Exception as e:
                 print_exc()
@@ -287,13 +293,14 @@ class Server(Service, RouterMixin):
                     file = Path(self._tempdir.name) / path[5:]
                     if file.exists():
                         return FileResponse(file)
-                    raise FileNotFoundError(f"{path[5:]} not found")
                 assert request is not None
                 for provider in self.providers:
                     if provider.ensure(platform, self_id):
                         return await provider.handle_internal(
                             Request(request, "internal", {}, platform=platform, self_id=self_id), path
                         )
+                if path.startswith("_tmp"):
+                    raise FileNotFoundError(f"File not found: {path[5:]}")
                 raise NotImplementedError(f"Login with {platform}:{self_id} not found")
             raise TypeError(f"Invalid internal url: {url}")
 
@@ -457,7 +464,10 @@ class Server(Service, RouterMixin):
     ):
         if manager is None:
             manager = it(Launart)
+        manager.add_component(UvicornASGIService(self.host, self.port))
         manager.add_component(self)
+        with suppress(ValueError):
+            manager.add_component(AiohttpClientService())
         manager.launch_blocking(loop=loop, stop_signal=stop_signal)
 
     async def run_async(

{satori_python_server-0.16.2 → satori_python_server-0.16.4}/src/satori/server/adapter.py

@@ -1,12 +1,13 @@
 from abc import abstractmethod
 from collections.abc import AsyncIterator
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING, Optional, Union
 
 from launart import Service
 from starlette.responses import Response
 from starlette.routing import BaseRoute
 
-from ..model import Event, Login
+from satori.model import Event, Login, LoginPartial
+
 from .model import Request
 from .route import RouterMixin
 from .utils import ctx
@@ -15,6 +16,9 @@ if TYPE_CHECKING:
     from . import Server
 
 
+LoginType = Union[Login, LoginPartial]
+
+
 class Adapter(Service, RouterMixin):
     server: "Server"
 
@@ -39,7 +43,7 @@ class Adapter(Service, RouterMixin):
             return Response(await resp.read())
 
     @abstractmethod
-    async def get_logins(self) -> list[Login]: ...
+    async def get_logins(self) -> list[LoginType]: ...
 
     def __init__(self):
         super().__init__()

{satori_python_server-0.16.2 → satori_python_server-0.16.4}/src/satori/server/route.py

@@ -88,20 +88,20 @@ class ChannelListParam(TypedDict):
 CHANNEL_LIST: TypeAlias = RouteCall[ChannelListParam, Union[PageResult[Channel], dict[str, Any]]]
 
 
-class ChanneCreateParam(TypedDict):
+class ChannelCreateParam(TypedDict):
     guild_id: str
     data: dict
 
 
-CHANNEL_CREATE: TypeAlias = RouteCall[ChanneCreateParam, Union[Channel, dict[str, Any]]]
+CHANNEL_CREATE: TypeAlias = RouteCall[ChannelCreateParam, Union[Channel, dict[str, Any]]]
 
 
-class ChanneUpdateParam(TypedDict):
+class ChannelUpdateParam(TypedDict):
     channel_id: str
     data: dict
 
 
-CHANNEL_UPDATE: TypeAlias = RouteCall[ChanneUpdateParam, None]
+CHANNEL_UPDATE: TypeAlias = RouteCall[ChannelUpdateParam, None]
 
 
 class ChannelMuteParam(TypedDict):
@@ -261,7 +261,7 @@ FRIEND_LIST: TypeAlias = RouteCall[FriendListParam, Union[PageResult[User], dict
 class ApproveParam(TypedDict):
     message_id: str
     approve: bool
-    comment: str
+    comment: NotRequired[str]
 
 
 APPROVE: TypeAlias = RouteCall[ApproveParam, None]