satori-python 1.3.5__py3-none-any.whl → 1.3.7__py3-none-any.whl

satori/__init__.py

@@ -45,7 +45,7 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "1.3.5"
+__version__ = "1.3.7"
 
 
 MessageReceipt = MessageObject

satori/client/__init__.py

@@ -31,10 +31,7 @@ from .protocol import ApiProtocol as ApiProtocol
 TConfig = TypeVar("TConfig", bound=Config)
 TE = TypeVar("TE", bound=Event, contravariant=True)
 
-MAPPING: dict[type[Config], type[BaseNetwork]] = {
-    WebhookInfo: WebhookNetwork,
-    WebsocketsInfo: WsNetwork,
-}
+MAPPING: dict[type[Config], type[BaseNetwork]] = {WebhookInfo: WebhookNetwork, WebsocketsInfo: WsNetwork}  # noqa
 
 _app: App | None = None
 

satori/client/config.py

@@ -1,4 +1,4 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 from yarl import URL
 
@@ -25,8 +25,8 @@ class WebsocketsInfo(Config):
     token: str | None = None
     secure: bool = False
     timeout: float | None = None
-    identity: str = None  # type: ignore
-    api_base: URL = None  # type: ignore
+    identity: str = field(init=False, default=None)  # type: ignore
+    api_base: URL = field(init=False, default=None)  # type: ignore
 
     def __post_init__(self):
         if self.path and not self.path.startswith("/"):

satori/element.py

@@ -129,7 +129,7 @@ class Element:
         args = {**self._attrs}
         elem = f"{self.__class__.__name__}(" + ", ".join(f"{k}={v!r}" for k, v in args.items())
         if self._children:
-            elem += ", { " + ", ".join(repr(i) for i in self._children) + " }"
+            elem += ", [" + ", ".join(repr(i) for i in self._children) + "]"
         return elem + ")"
 
     def __call__(self, *content: "str | Element"):
@@ -257,7 +257,6 @@ class Link(Element):
 class Resource(Element):
     src: str
     title: str | None = None
-    extra: InitVar[dict[str, Any] | None] = None
     cache: bool | None = None
     timeout: int | None = None
 
@@ -271,14 +270,15 @@ class Resource(Element):
         raw: bytes | BytesIO | None = None,
         mime: str | None = None,
         name: str | None = None,
+        width: int | None = None,
+        height: int | None = None,
         duration: float | None = None,
         poster: str | None = None,
-        extra: dict[str, Any] | None = None,
         cache: bool | None = None,
         timeout: int | None = None,
         **kwargs,
     ) -> Self:
-        data: dict[str, Any] = {"extra": extra, **kwargs}
+        data: dict[str, Any] = {**kwargs}
         if url is not None:
             data |= {"src": url}
         elif path:
@@ -296,6 +296,10 @@ class Resource(Element):
             raise ValueError(f"{cls} need at least one of url, path and raw")
         if name is not None:
             data["title"] = name
+        if width is not None and cls in (Image, Video):
+            data["width"] = width
+        if height is not None and cls in (Image, Video):
+            data["height"] = height
         if duration is not None and cls is Audio:
             data["duration"] = duration
         if poster is not None and cls in (Video, Audio, File):
@@ -304,11 +308,7 @@ class Resource(Element):
             data["cache"] = cache
         if timeout is not None:
             data["timeout"] = timeout
-        return cls(**data)
-
-    def __post_init__(self, extra: dict[str, Any] | None = None):
-        if extra:
-            self._attrs.update(extra)
+        return cls.unpack(data)
 
 
 @dataclass(repr=False)
@@ -582,7 +582,7 @@ class Custom(Element):
         attrs: dict[str, Any] | None = None,
         children: Sequence[str | Element] | None = None,
     ):
-        self.type = type
+        self._type = type
         if not hasattr(self, "_attrs"):
             self._attrs = attrs or {}
         else:
@@ -595,7 +595,21 @@ class Custom(Element):
     @property
     @override
     def tag(self) -> str:
-        return self.type
+        return self._type
+
+    def __repr__(self) -> str:
+        if not self._attrs:
+            self._attrs = {k: v for k, v in self.__dict__.items() if not k.startswith("_")}
+        args = {**self._attrs}
+        elem = (
+            f"{self.__class__.__name__}({self._type!r}"
+            + ", {"
+            + ", ".join(f"{k!r}: {v!r}" for k, v in args.items())
+            + "}"
+        )
+        if self._children:
+            elem += ", [" + ", ".join(repr(i) for i in self._children) + "]"
+        return elem + ")"
 
 
 @dataclass(repr=False)

satori/server/__init__.py

@@ -7,13 +7,13 @@ import re
 import secrets
 import signal
 import threading
+import traceback
 import urllib.parse
 from collections.abc import Awaitable, Callable, Iterable
 from contextlib import suppress
 from itertools import chain
 from pathlib import Path
 from tempfile import TemporaryDirectory
-from traceback import print_exc
 from typing import Any, TypeVar
 
 import aiohttp
@@ -103,10 +103,10 @@ async def _request_handler(action: str, request: StarletteRequest, func: RouteCa
         return Response(status_code=504, content="Request timeout")
     except ActionFailed as ae:
         logger.warning(ae)
-        return Response(status_code=ae.CODE, content=str(ae))
+        return Response(status_code=ae.CODE, content=repr(ae))
     except Exception as e:
         logger.error(e)
-        return Response(status_code=500, content=str(e))
+        return Response(status_code=500, content=repr(e))
     if isinstance(res, ModelBase):
         return JSONResponse(content=res.dump())
     if res and isinstance(res, list) and isinstance(res[0], ModelBase):
@@ -239,16 +239,22 @@ class Server(Service, RouterMixin):
         event.sn = self._sequence
         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, RuntimeError):
-                break
-            except Exception as e:
-                print_exc()
-                logger.error(e)
+        connections = [conn for conn in self.connections if conn.alive]
+        payload = {"op": Opcode.EVENT, "body": event.dump()}
+        ws_tasks = [conn.send(payload) for conn in connections]
+        if ws_tasks:
+            results = await asyncio.gather(*ws_tasks, return_exceptions=True)
+            for conn, result in zip(connections, results):
+                if not result:
+                    continue
+                if isinstance(result, (WebSocketDisconnect, RuntimeError)):
+                    logger.warning(f"Connection {id(conn):x} closed: {result}")
+                else:
+                    traceback.print_exception(type(result), result, result.__traceback__)
+                    logger.error(result)
+                await conn.connection_closed()
+                if conn in self.connections:
+                    self.connections.remove(conn)
         for hook in self.webhooks:
             try:
                 async with self.session.post(
@@ -263,7 +269,7 @@ class Server(Service, RouterMixin):
                 ) as resp:
                     resp.raise_for_status()
             except Exception as e:
-                print_exc()
+                traceback.print_exception(type(e), e, e.__traceback__)
                 logger.error(e)
 
     async def websocket_server_handler(self, ws: WebSocket):

satori/server/adapter.py

@@ -1,5 +1,5 @@
 from abc import abstractmethod
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, Generic, TypeVar, Union
 
 from launart import Service
 from starlette.responses import Response
@@ -16,10 +16,12 @@ if TYPE_CHECKING:
 
 
 LoginType = Union[Login, LoginPartial]  # noqa: UP007
+T = TypeVar("T")
 
 
-class Adapter(Service, RouterMixin):
+class Adapter(Service, RouterMixin, Generic[T]):
     server: "Server"
+    config: T
 
     @abstractmethod
     def get_platform(self) -> str:

{satori_python-1.3.5.dist-info → satori_python-1.3.7.dist-info}/METADATA

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

{satori_python-1.3.5.dist-info → satori_python-1.3.7.dist-info}/RECORD

@@ -1,9 +1,9 @@
-satori/__init__.py,sha256=A3joKPbJO_1wuVS1FhBVUG6NqypAwgpxRWhAUV56L9w,1888
+satori/__init__.py,sha256=9-XGaPuZ5S-JE-Ew5MKGzQLQ2TzrPSLog__4k7td8CY,1888
 satori/_vendor/fleep.py,sha256=_zKP7iY3mMQr0rC5KbgkbkMorT3KVLeIsWPLIUa0Y34,16347
-satori/client/__init__.py,sha256=1HLiYmYZoScymOzTuOVZht99eREXMUT09F8PZzvAMPA,14484
+satori/client/__init__.py,sha256=KZB5Ta5KzxdfCO8Ey5AuG7l4dzI0KnkqlaBVuyrfEMA,14481
 satori/client/account.py,sha256=HP7BJWkN69SB9ldNIjHxWlXcrmB-IPnTnYqm3lBMvl8,2742
 satori/client/account.pyi,sha256=ha632NYjlQDU65cjmYiP3eoPJnb82tMXuApLlUBwUKE,18744
-satori/client/config.py,sha256=iHBazxFDDE_-Qeyra2DVxZvQRCYqEoDrrzEVJjig93Q,1858
+satori/client/config.py,sha256=50y9RXHHUJ2noNEiREsri_MOM_6Waozvx6x2JOcOFd8,1919
 satori/client/network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 satori/client/network/base.py,sha256=0ajEhclVpVch-HMWLknoicexNe_keWW0dbLtboAtdtE,817
 satori/client/network/util.py,sha256=WfVTjmYxj4EjrbR8r3zm7RJZjxmGQwC7yjZtXQT6SWE,1246
@@ -11,21 +11,21 @@ satori/client/network/webhook.py,sha256=N1zcJGx-Ijwtc0dIsPWzdnJSLi0ydQTengHBxtbb
 satori/client/network/websocket.py,sha256=oZtiFLywP_Rw-_I-hl32nShCTTQ1XKlv0BhWJj53x9Y,8476
 satori/client/protocol.py,sha256=hXrtgh-ypiF1W-dTl5I4LBWg8P2VTNKYQWFq8aRCeeo,28577
 satori/const.py,sha256=6TQAIlgNq7fHLiadxGUU-mzkffOcpRrEvq5yrWYMuGc,2738
-satori/element.py,sha256=Yo92PcQUk2vUHomk0zDVXB5wZavnKQCNcgHlPtMWAno,20831
+satori/element.py,sha256=7a1azqihsYBNe7BHGvN-MQH4jOsTj47Ei9h5qwDVu9M,21355
 satori/event.py,sha256=yC6rKaa7JbeOZ4Un1rX-Isvm3EcR7e782nxYf1j6JdM,1060
 satori/exception.py,sha256=edKeuLRZAQxyCdw1_XCgOtv5tIHkfHw0Die9B818_HM,545
 satori/model.py,sha256=L8Wlk4zGlnR5kM4rAsaXvPufxdwmUsshkFY9PLGj8tY,17614
 satori/parser.py,sha256=EyKitj39OewGhZuNIvrd8nWJiL5EJAVy7mtcv8Zk6v0,14658
 satori/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-satori/server/__init__.py,sha256=qvbPHSbIiOQGJV_D3yfEKupqOqMKwzrLixkjy3AMgqs,23820
-satori/server/adapter.py,sha256=-eIkj1TvZ5LJ6jrRoobvea_MlrqksY3HiZ8sDYY3wP8,1600
+satori/server/__init__.py,sha256=SumWaENrpRiZL7hLZpk8zcOJ-wvphHPMJjKwyhVzhDQ,24338
+satori/server/adapter.py,sha256=sxP6XPcRmRSxxkXhnczXghLASYpMKgDYAebsGft_ud4,1661
 satori/server/connection.py,sha256=28sDNT9QmTJknCRQAMB1jzxcRiG3Tw_TO0AFlCMNr5g,1439
 satori/server/formdata.py,sha256=lHLTatf6117eC4U7FX77PjGvchEPiZGmVWnpe9tceh4,437
 satori/server/model.py,sha256=zzjNa3iBFkd8crZIVTrEisPaB0g8JsxV4fA2rRU0maw,1105
 satori/server/route.py,sha256=kpelAX0kYQbJncp5biWi8pWRcEIez9m9sJN8NF3sjn4,10654
 satori/server/utils.py,sha256=hMNqLzbzcwyLJO-sGncO5kuviiW5Y6k34fj4AS2iVWQ,910
 satori/utils.py,sha256=N8HEw-DOXxOBwFHmmXgqPdMh6AXjiGR0ZGa1zBPH6EI,822
-satori_python-1.3.5.dist-info/METADATA,sha256=Qfsx-7KwVQ6mFAgJkwUklMRVmaoqo8WGCIlJCILLX4w,5511
-satori_python-1.3.5.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
-satori_python-1.3.5.dist-info/licenses/LICENSE,sha256=2EDswKd1M1648judap8BEEwp3Jz6IpfFP2wYVdU0Y2o,1069
-satori_python-1.3.5.dist-info/RECORD,,
+satori_python-1.3.7.dist-info/METADATA,sha256=DraUqSrYvoBkX-l8wAmLmr04Nh1Oz6CSVcK-ngCnzE4,5511
+satori_python-1.3.7.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
+satori_python-1.3.7.dist-info/licenses/LICENSE,sha256=2EDswKd1M1648judap8BEEwp3Jz6IpfFP2wYVdU0Y2o,1069
+satori_python-1.3.7.dist-info/RECORD,,