satori-python 0.15.1__tar.gz → 0.15.2__tar.gz

{satori_python-0.15.1 → satori_python-0.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 0.15.1
+Version: 0.15.2
 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.15.1 → satori_python-0.15.2}/pyproject.toml

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

{satori_python-0.15.1 → satori_python-0.15.2}/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.15.1"
+__version__ = "0.15.2"

{satori_python-0.15.1 → satori_python-0.15.2}/src/satori/client/__init__.py

@@ -23,6 +23,7 @@ from .account import ApiInfo as ApiInfo
 from .network.base import BaseNetwork as BaseNetwork
 from .network.webhook import WebhookNetwork
 from .network.websocket import WsNetwork
+from .protocol import ApiProtocol as ApiProtocol
 
 TConfig = TypeVar("TConfig", bound=Config)
 TE = TypeVar("TE", bound=Event, contravariant=True)
@@ -47,7 +48,7 @@ class App(Service):
     def register_config(cls, tc: type[TConfig], tn: type[BaseNetwork[TConfig]]):
         MAPPING[tc] = tn
 
-    def __init__(self, *configs: Config):
+    def __init__(self, *configs: Config, default_api_cls: type[ApiProtocol] = ApiProtocol):
         self.accounts = {}
         self.connections = []
         self.event_callbacks = []
@@ -55,6 +56,7 @@ class App(Service):
         super().__init__()
         for config in configs:
             self.apply(config)
+        self.default_api_cls = default_api_cls
 
     def apply(self, config: Config):
         try:
@@ -195,6 +197,7 @@ class App(Service):
                     event.self_id_,
                     event.login,
                     conn.config,
+                    self.default_api_cls,
                 )
                 logger.info(f"account added: {account}")
                 (
@@ -215,6 +218,7 @@ class App(Service):
                         event.self_id_,
                         event.login,
                         conn.config,
+                        self.default_api_cls,
                     )
                     logger.info(f"account added: {account}")
                     account.connected.set()

{satori_python-0.15.1 → satori_python-0.15.2}/src/satori/client/account.py

@@ -79,4 +79,6 @@ class Account(Generic[TP]):
         return f"<Account {self.self_id} ({self.platform})>"
 
     def __getattr__(self, item):
-        return getattr(self.protocol, item)
+        if hasattr(self.protocol, item):
+            return getattr(self.protocol, item)
+        raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{item}'")

{satori_python-0.15.1 → satori_python-0.15.2}/src/satori/client/network/webhook.py

@@ -59,7 +59,7 @@ class WebhookNetwork(BaseNetwork[WebhookInfo]):
                 (i for i in logins if i.id == self_id and i.platform == platform),
                 Login(LoginStatus.CONNECT, self_id=self_id, platform=platform),
             )
-            account = Account(platform, self_id, login, self.config)
+            account = Account(platform, self_id, login, self.config, self.app.default_api_cls)
             logger.info(f"account registered: {account}")
             account.connected.set()
             self.app.accounts[identity] = account

{satori_python-0.15.1 → satori_python-0.15.2}/src/satori/client/network/websocket.py

@@ -101,7 +101,7 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
                     account.connected.clear()
                 account.config = self.config
             else:
-                account = Account(platform, self_id, obj, self.config)
+                account = Account(platform, self_id, obj, self.config, self.app.default_api_cls)
                 logger.info(f"account registered: {account}")
                 (
                     account.connected.set()

{satori_python-0.15.1 → satori_python-0.15.2}/src/satori/model.py

@@ -260,6 +260,10 @@ class MessageObject(ModelBase):
     def message(self) -> list[Element]:
         return transform(parse(self.content))
 
+    @message.setter
+    def message(self, value: list[Element]):
+        self.content = "".join(str(i) for i in value)
+
     @classmethod
     def parse(cls, raw: dict):
         if "elements" in raw and "content" not in raw:
@@ -310,6 +314,10 @@ class MessageReceipt(ModelBase):
     def message(self) -> Optional[list[Element]]:
         return transform(parse(self.content)) if self.content else None
 
+    @message.setter
+    def message(self, value: Optional[list[Element]]):
+        self.content = "".join(str(i) for i in value) if value else None
+
     @classmethod
     def parse(cls, raw: dict):
         if "elements" in raw and "content" not in raw: