satori-python 0.17.5__tar.gz → 0.17.7__tar.gz

{satori_python-0.17.5 → satori_python-0.17.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 0.17.5
+Version: 0.17.7
 Summary: Satori Protocol SDK for python
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -22,10 +22,10 @@ Requires-Dist: loguru>=0.7.2
 Requires-Dist: launart>=0.8.2
 Requires-Dist: typing-extensions>=4.7.0
 Requires-Dist: graia-amnesia[uvicorn]<0.12.0,>=0.11.0
-Requires-Dist: starlette[python-multipart]>=0.37.2
 Requires-Dist: yarl>=1.9.4
 Requires-Dist: python-multipart>=0.0.9
 Requires-Dist: websockets>=15.0.1
+Requires-Dist: starlette>=0.40.0
 Requires-Dist: msgspec>=0.19.0; extra == "msgspec"
 Provides-Extra: msgspec
 Description-Content-Type: text/markdown

{satori_python-0.17.5 → satori_python-0.17.7}/pyproject.toml

@@ -11,10 +11,10 @@ dependencies = [
     "launart>=0.8.2",
     "typing-extensions>=4.7.0",
     "graia-amnesia[uvicorn]<0.12.0,>=0.11.0",
-    "starlette[python-multipart]>=0.37.2",
     "yarl>=1.9.4",
     "python-multipart>=0.0.9",
     "websockets>=15.0.1",
+    "starlette>=0.40.0",
 ]
 requires-python = ">=3.10,<4.0"
 readme = "README.md"
@@ -29,7 +29,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.17.5"
+version = "0.17.7"
 
 [project.license]
 text = "MIT"
@@ -60,7 +60,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",
+    "uvicorn[standard]>=0.37.0",
 ]
 
 [tool.pdm.build]

{satori_python-0.17.5 → satori_python-0.17.7}/src/satori/__init__.py

@@ -42,4 +42,4 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "0.17.5"
+__version__ = "0.17.7"

{satori_python-0.17.5 → satori_python-0.17.7}/src/satori/client/__init__.py

@@ -4,6 +4,7 @@ import asyncio
 import functools
 import signal
 import threading
+import traceback
 from collections.abc import Awaitable, Callable, Iterable
 from functools import wraps
 from typing import TYPE_CHECKING, Any, Literal, TypeVar, overload
@@ -279,7 +280,12 @@ class App(Service):
             account = self.accounts[login_sn]
 
         if self.event_callbacks:
-            await asyncio.gather(*(callback(account, event) for callback in self.event_callbacks))
+            task = asyncio.gather(*(callback(account, event) for callback in self.event_callbacks))
+            try:
+                await task
+            except Exception:
+                traceback.print_exc()
+                task.cancel()
 
         if event.type == EventType.LOGIN_REMOVED:
             logger.info(f"account removed: {account}")

{satori_python-0.17.5 → satori_python-0.17.7}/src/satori/element.py

@@ -217,7 +217,7 @@ class Resource(Element):
         if url is not None:
             data |= {"src": url}
         elif path:
-            data |= {"src": Path(path).as_uri()}
+            data |= {"src": Path(path).resolve().as_uri()}
         elif raw:
             bd = raw.getvalue() if isinstance(raw, BytesIO) else raw
             if mime is None:

{satori_python-0.17.5 → satori_python-0.17.7}/src/satori/server/__init__.py

@@ -39,11 +39,10 @@ from starlette.types import ASGIApp
 from starlette.websockets import WebSocket, WebSocketDisconnect
 from yarl import URL
 
-from satori.const import Api
+from satori.const import Api, EventType
 from satori.model import Event, Meta, ModelBase, Opcode
 from satori.utils import decode
 
-from .. import EventType
 from .adapter import Adapter as Adapter
 from .connection import WebsocketConnection
 from .formdata import parse_content_disposition as parse_content_disposition
@@ -84,11 +83,15 @@ async def _request_handler(action: str, request: StarletteRequest, func: RouteCa
             )
             return JSONResponse(content=res)
     try:
+        if request.method == "GET":
+            params = dict(request.query_params)
+        else:
+            params = await request.json()
         res = await func(
             Request(
                 request,
                 action,
-                await request.json(),
+                params,
                 platform=platform,
                 self_id=self_id,
             )
@@ -329,7 +332,9 @@ class Server(Service, RouterMixin):
             else:
                 continue
             return await _request_handler(action, request, func, platform, self_id)
-        return Response(status_code=404, content=action)
+        return Response(
+            status_code=404, content=f"Action {action!r} is not supported in current platform {platform!r}."
+        )
 
     async def proxy_url_handler(self, request: StarletteRequest):
         url = request.path_params["internal_url"]
@@ -340,7 +345,7 @@ class Server(Service, RouterMixin):
                 isinstance(resp, (PlainTextResponse, HTMLResponse, JSONResponse)) or resp.__class__ is Response
             ) and len(resp.body) > self.stream_threshold:
 
-                async def iter_content(body: bytes):
+                async def iter_content(body: bytes | memoryview[int]):
                     for i in range(0, len(body), self.stream_chunk_size):
                         yield body[i : i + self.stream_chunk_size]