satori-python 0.13.2__tar.gz → 0.13.3__tar.gz

{satori_python-0.13.2 → satori_python-0.13.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 0.13.2
+Version: 0.13.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>

{satori_python-0.13.2 → satori_python-0.13.3}/pyproject.toml

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

{satori_python-0.13.2 → satori_python-0.13.3}/src/satori/__init__.py

@@ -43,4 +43,4 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "0.13.2"
+__version__ = "0.13.3"

{satori_python-0.13.2 → satori_python-0.13.3}/src/satori/client/account.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import asyncio
 from dataclasses import dataclass
-from typing import TypeVar
+from typing import Generic, TypeVar
 
 from yarl import URL
 
@@ -11,6 +11,7 @@ from satori.model import Login
 from .protocol import ApiProtocol
 
 TP = TypeVar("TP", bound="ApiProtocol")
+TP1 = TypeVar("TP1", bound="ApiProtocol")
 
 
 @dataclass
@@ -29,14 +30,14 @@ class ApiInfo:
         return URL(f"http://{self.host}:{self.port}{self.path}") / "v1"
 
 
-class Account:
+class Account(Generic[TP]):
     def __init__(
         self,
         platform: str,
         self_id: str,
         self_info: Login,
         config: ApiInfo,
-        protocol_cls: type[ApiProtocol] = ApiProtocol,
+        protocol_cls: type[TP] = ApiProtocol,
     ):
         self.platform = platform
         self.self_id = self_id
@@ -45,14 +46,16 @@ class Account:
         self.protocol = protocol_cls(self)  # type: ignore
         self.connected = asyncio.Event()
 
-    def custom(self, config: ApiInfo | None = None, protocol_cls: type[TP] = ApiProtocol, **kwargs) -> TP:
+    def custom(
+        self, config: ApiInfo | None = None, protocol_cls: type[TP1] = ApiProtocol, **kwargs
+    ) -> "Account[TP1]":
         return Account(
             self.platform,
             self.self_id,
             self.self_info,
-            config or ApiInfo(**kwargs),
+            config or (ApiInfo(**kwargs) if kwargs else self.config),
             protocol_cls,  # type: ignore
-        ).protocol
+        )
 
     @property
     def identity(self):

{satori_python-0.13.2 → satori_python-0.13.3}/src/satori/client/account.pyi

@@ -1,5 +1,5 @@
 import asyncio
-from typing import Any, Iterable, Protocol, TypeVar, overload
+from typing import Any, Generic, Iterable, Protocol, TypeVar, overload
 
 from yarl import URL
 
@@ -23,6 +23,7 @@ from satori.model import (
 from .protocol import ApiProtocol
 
 TP = TypeVar("TP", bound="ApiProtocol")
+TP1 = TypeVar("TP1", bound="ApiProtocol")
 
 class Api(Protocol):
     token: str | None = None
@@ -35,12 +36,12 @@ class ApiInfo(Api):
         self, host: str = "localhost", port: int = 5140, path: str = "", token: str | None = None
     ): ...
 
-class Account:
+class Account(Generic[TP]):
     platform: str
     self_id: str
     self_info: Login
     config: Api
-    protocol: ApiProtocol
+    protocol: TP
     connected: asyncio.Event
 
     def __init__(
@@ -49,16 +50,18 @@ class Account:
         self_id: str,
         self_info: Login,
         config: Api,
-        protocol_cls: type[ApiProtocol] = ApiProtocol,
+        protocol_cls: type[TP] = ApiProtocol,
     ): ...
     @property
     def identity(self) -> str: ...
     @overload
-    def custom(self, config: Api, protocol_cls: type[TP] = ApiProtocol) -> TP: ...
+    def custom(self, config: Api, protocol_cls: type[TP1] = ApiProtocol) -> Account[TP1]: ...
+    @overload
+    def custom(self, *, protocol_cls: type[TP1]) -> Account[TP1]: ...
     @overload
     def custom(
-        self, *, protocol_cls: type[TP] = ApiProtocol, host: str, port: int, token: str | None = None
-    ) -> TP: ...
+        self, *, protocol_cls: type[TP1] = ApiProtocol, host: str, port: int, token: str | None = None
+    ) -> Account[TP1]: ...
     async def send(self, event: Event, message: str | Iterable[str | Element]) -> list[MessageObject]:
         """发送消息。返回一个 `MessageObject` 对象构成的数组。
 

{satori_python-0.13.2 → satori_python-0.13.3}/src/satori/client/network/webhook.py

@@ -61,7 +61,7 @@ class WebhookNetwork(BaseNetwork[WebhookInfo]):
         op = data["op"]
         if op != Opcode.EVENT:
             return web.Response(status=202)
-        logger.debug(f"Received payload: {data}")
+        logger.trace(f"Received payload: {data}")
         self.post_event(data["body"])
         return web.Response()
 

{satori_python-0.13.2 → satori_python-0.13.3}/src/satori/client/network/websocket.py

@@ -37,6 +37,7 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
                 return
             elif msg.type == aiohttp.WSMsgType.TEXT:
                 data: dict = json.loads(cast(str, msg.data))
+                logger.trace(f"Received payload: {data}")
                 if data["op"] == Opcode.EVENT:
                     self.post_event(data["body"])
                 elif data["op"] > 4:

{satori_python-0.13.2 → satori_python-0.13.3}/src/satori/parser.py

@@ -97,8 +97,11 @@ class Element:
             self.attrs["is"] = type
         else:
             self.type = type
-        if self.tag() == "text" and "content" in self.attrs:
-            self.attrs["text"] = self.attrs.pop("content")
+        if self.tag() == "text":
+            if "content" in self.attrs:
+                self.attrs["text"] = self.attrs.pop("content")
+            elif not self.attrs:
+                self.attrs["text"] = ""
 
     def tag(self):
         if self.type == "component":

{satori_python-0.13.2 → satori_python-0.13.3}/src/satori/server/__init__.py

@@ -75,6 +75,7 @@ class Server(Service, RouterMixin):
     routers: list[Router]
     _adapters: list[Adapter]
     connections: list[WebsocketConnection]
+    session: aiohttp.ClientSession
 
     def __init__(
         self,
@@ -96,7 +97,6 @@ class Server(Service, RouterMixin):
         self.routers = []
         self.routes = {}
         self.webhooks = webhooks or []
-        self.session = aiohttp.ClientSession()
         self._tempdir = TemporaryDirectory()
         self.proxy_url_mapping = {}
         super().__init__()
@@ -253,6 +253,7 @@ class Server(Service, RouterMixin):
         return res
 
     async def launch(self, manager: Launart):
+        self.session = aiohttp.ClientSession()
         for _adapter in self._adapters:
             manager.add_component(_adapter)