satori-python 0.17.1__tar.gz → 0.17.3__tar.gz

{satori_python-0.17.1 → satori_python-0.17.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 0.17.1
+Version: 0.17.3
 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>
@@ -84,6 +84,7 @@ pip install satori-python-server
 | Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                             |
 | OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
 | Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
+| Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
 
 ### 社区适配器
 

{satori_python-0.17.1 → satori_python-0.17.3}/README.md

@@ -52,6 +52,7 @@ pip install satori-python-server
 | Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                             |
 | OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
 | Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
+| Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
 
 ### 社区适配器
 

{satori_python-0.17.1 → satori_python-0.17.3}/pyproject.toml

@@ -29,7 +29,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.17.1"
+version = "0.17.3"
 
 [project.license]
 text = "MIT"
@@ -75,7 +75,7 @@ excludes = [
 composite = [
     "isort ./src/ ./example/",
     "black ./src/ ./example/",
-    "ruff check ./src/ ./example/",
+    "ruff check",
 ]
 
 [tool.pdm.version]
@@ -99,7 +99,9 @@ extra_standard_library = [
 line-length = 120
 target-version = "py310"
 exclude = [
-    "exam.py",
+    "exam_qps.py",
+    "exam1.py",
+    "exam2.py",
 ]
 
 [tool.ruff.lint]
@@ -117,7 +119,7 @@ ignore = [
     "F403",
     "F405",
     "C901",
-    "UP038",
+    "T201",
 ]
 
 [tool.pyright]

{satori_python-0.17.1 → satori_python-0.17.3}/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.1"
+__version__ = "0.17.3"

{satori_python-0.17.1 → satori_python-0.17.3}/src/satori/client/account.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import asyncio
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing_extensions import Generic, TypeVar  # noqa: UP035
 
 from yarl import URL
@@ -10,8 +10,8 @@ from satori.model import Login
 
 from .protocol import ApiProtocol
 
-TP = TypeVar("TP", bound="ApiProtocol", default=ApiProtocol)
-TP1 = TypeVar("TP1", bound="ApiProtocol", default=ApiProtocol)
+TP = TypeVar("TP", bound="ApiProtocol", default=ApiProtocol, covariant=True)
+TP1 = TypeVar("TP1", bound="ApiProtocol", default=ApiProtocol, covariant=True)
 
 
 @dataclass
@@ -21,6 +21,7 @@ class ApiInfo:
     path: str = ""
     token: str | None = None
     timeout: float | None = None
+    api_base: URL = field(init=False)
 
     def __post_init__(self):
         if self.path and not self.path.startswith("/"):

{satori_python-0.17.1 → satori_python-0.17.3}/src/satori/client/account.pyi

@@ -26,8 +26,8 @@ from satori.model import (
 
 from .protocol import ApiProtocol
 
-TP = TypeVar("TP", bound="ApiProtocol", default=ApiProtocol)
-TP1 = TypeVar("TP1", bound="ApiProtocol", default=ApiProtocol)
+TP = TypeVar("TP", bound="ApiProtocol", default=ApiProtocol, covariant=True)
+TP1 = TypeVar("TP1", bound="ApiProtocol", default=ApiProtocol, covariant=True)
 
 class Api(Protocol):
     token: str | None = None
@@ -42,7 +42,8 @@ class ApiInfo(Api):
         path: str = "",
         token: str | None = None,
         timeout: float | None = None,
-    ): ...
+    ):
+        self.api_base: URL = ...
 
 class Account(Generic[TP]):
     adapter: str

{satori_python-0.17.1 → satori_python-0.17.3}/src/satori/parser.py

@@ -306,7 +306,7 @@ def parse_tokens(tokens: list[str | Token], context: dict | None = None) -> list
             while mat := attr_pat.search(token.extra):
                 key = mat.group(1)
                 groupdict = mat.groupdict()
-                v2 = groupdict.get("value2", groupdict.get("value1"))
+                v2 = groupdict.get("value2") or groupdict.get("value1")
                 curly = groupdict.get("curly")
                 if curly and context is not None:
                     attrs[key] = interpolate(curly, context)

{satori_python-0.17.1 → satori_python-0.17.3}/src/satori/server/__init__.py

@@ -60,6 +60,16 @@ _T_ws_endpoint = TypeVar("_T_ws_endpoint", bound=Callable[[WebSocket], Awaitable
 StarletteResponse = Response
 
 
+async def _json(self: StarletteRequest) -> Any:
+    if not hasattr(self, "_json"):
+        body = await self.body()
+        self._json = decode(body)
+    return self._json
+
+
+StarletteRequest.json = _json
+
+
 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:
@@ -78,7 +88,7 @@ async def _request_handler(action: str, request: StarletteRequest, func: RouteCa
             Request(
                 request,
                 action,
-                decode(await request.body()),
+                await request.json(),
                 platform=platform,
                 self_id=self_id,
             )
@@ -407,7 +417,7 @@ class Server(Service, RouterMixin):
         return JSONResponse(content=Meta(logins, proxy_urls).dump())
 
     async def webhook_create_handler(self, request: StarletteRequest):
-        body = decode(await request.body())
+        body = await request.json()
         url = body["url"]
         token = body.get("token")
         self.webhooks.append(WebhookEndpoint(url, token))
@@ -427,7 +437,7 @@ class Server(Service, RouterMixin):
         return Response()
 
     async def webhook_delete_handler(self, request: StarletteRequest):
-        body = decode(await request.body())
+        body = await request.json()
         url = body["url"]
         for endpoint in self.webhooks:
             if endpoint.url == url: