satori-python-client 0.17.0__tar.gz → 0.17.2__tar.gz

{satori_python_client-0.17.0 → satori_python_client-0.17.2}/.mina/client.toml

@@ -1,5 +1,8 @@
 includes = ["src/satori/client"]
-raw-dependencies = ["satori-python-core >= 0.17.0"]
+raw-dependencies = [
+    "satori-python-core >= 0.17.0",
+    "graia-amnesia >= 0.11.0",
+]
 
 [project]
 name = "satori-python-client"
@@ -10,7 +13,6 @@ authors = [
 dependencies = [
     "aiohttp",
     "launart",
-    "graia-amnesia",
 ]
 description = "Satori Protocol SDK for python, specify client part"
 license = {text = "MIT"}

{satori_python_client-0.17.0 → satori_python_client-0.17.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-client
-Version: 0.17.0
+Version: 0.17.2
 Summary: Satori Protocol SDK for python, specify client part
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -19,8 +19,8 @@ Project-URL: Repository, https://github.com/RF-Tar-Railt/satori-python
 Requires-Python: <4.0,>=3.10
 Requires-Dist: aiohttp>=3.9.3
 Requires-Dist: launart>=0.8.2
-Requires-Dist: graia-amnesia[uvicorn]<0.12.0,>=0.11.0
 Requires-Dist: satori-python-core>=0.17.0
+Requires-Dist: graia-amnesia>=0.11.0
 Description-Content-Type: text/markdown
 
 # satori-python

{satori_python_client-0.17.0 → satori_python_client-0.17.2}/pyproject.toml

@@ -7,8 +7,8 @@ authors = [
 dependencies = [
     "aiohttp>=3.9.3",
     "launart>=0.8.2",
-    "graia-amnesia[uvicorn]<0.12.0,>=0.11.0",
     "satori-python-core >= 0.17.0",
+    "graia-amnesia >= 0.11.0",
 ]
 description = "Satori Protocol SDK for python, specify client part"
 readme = "README.md"
@@ -24,7 +24,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.17.0"
+version = "0.17.2"
 
 [project.license]
 text = "MIT"

{satori_python_client-0.17.0 → satori_python_client-0.17.2}/src/satori/client/__init__.py

@@ -213,7 +213,7 @@ class App(Service):
             if not login.user:
                 logger.warning(f"Received login-added event without user info: {login}")
                 return
-            login_sn = f"{login.user.id}@{id(conn)}"
+            login_sn = f"{login.user.id}@{id(conn):x}"
             account = Account(
                 login,
                 conn.config,
@@ -232,7 +232,7 @@ class App(Service):
             if not login.user:
                 logger.warning(f"Received login-updated event without user info: {login}")
                 return
-            login_sn = f"{login.user.id}@{id(conn)}"
+            login_sn = f"{login.user.id}@{id(conn):x}"
             if login_sn not in self.accounts:
                 if login.status == LoginStatus.ONLINE:
                     account = Account(
@@ -266,13 +266,13 @@ class App(Service):
             if not login.user:
                 logger.warning(f"Received login-removed event without user info: {login}")
                 return
-            login_sn = f"{login.user.id}@{id(conn)}"
+            login_sn = f"{login.user.id}@{id(conn):x}"
             if login_sn not in self.accounts:
                 logger.warning(f"Received event for unknown account: {event}")
                 return
             account = self.accounts[login_sn]
         else:
-            login_sn = f"{event.login.user.id}@{id(conn)}"
+            login_sn = f"{event.login.user.id}@{id(conn):x}"
             if login_sn not in self.accounts:
                 logger.warning(f"Received event for unknown account: {event}")
                 return

{satori_python_client-0.17.0 → satori_python_client-0.17.2}/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_client-0.17.0 → satori_python_client-0.17.2}/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_client-0.17.0 → satori_python_client-0.17.2}/src/satori/client/network/webhook.py

@@ -23,7 +23,7 @@ class WebhookNetwork(BaseNetwork[WebhookInfo]):
 
     @property
     def id(self):
-        return f"satori/network/webhook/{self.config.identity}#{id(self)}"
+        return f"satori/net/wh/{self.config.identity}#{id(self):x}"
 
     async def handle_request(self, req: web.Request):
         header = req.headers
@@ -105,7 +105,7 @@ class WebhookNetwork(BaseNetwork[WebhookInfo]):
             for login in meta.logins:
                 if not login.user:
                     continue
-                login_sn = f"{login.user.id}@{id(self)}"
+                login_sn = f"{login.user.id}@{id(self):x}"
                 account = Account(login, self.config, meta.proxy_urls, self.app.default_api_cls)
                 logger.info(f"account registered: {account}")
                 (account.connected.set() if login.status == LoginStatus.ONLINE else account.connected.clear())
@@ -117,7 +117,7 @@ class WebhookNetwork(BaseNetwork[WebhookInfo]):
             logger.info(f"{self.id} Webhook server exiting...")
             self.close_signal.set()
             for v in list(self.app.accounts.values()):
-                if (identity := f"{v.self_id}@{id(self)}") in self.accounts:
+                if (identity := f"{v.self_id}@{id(self):x}") in self.accounts:
                     v.connected.clear()
                     await self.app.account_update(v, LoginStatus.OFFLINE)
                     del self.app.accounts[identity]

{satori_python_client-0.17.0 → satori_python_client-0.17.2}/src/satori/client/network/websocket.py

@@ -23,7 +23,7 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
 
     @property
     def id(self):
-        return f"satori/network/ws/{self.config.identity}#{id(self)}"
+        return f"satori/net/ws/{self.config.identity}#{id(self):x}"
 
     connection: aiohttp.ClientWebSocketResponse | None = None
 
@@ -107,7 +107,7 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
         for login in ready.logins:
             if not login.user:
                 continue
-            login_sn = f"{login.user.id}@{id(self)}"
+            login_sn = f"{login.user.id}@{id(self):x}"
             if login_sn in self.app.accounts:
                 account = self.app.accounts[login_sn]
                 self.accounts[login_sn] = account
@@ -162,7 +162,7 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
                         self.close_signal.set()
                         self.connection = None
                         for v in list(self.app.accounts.values()):
-                            if (identity := f"{v.self_id}@{id(self)}") in self.accounts:
+                            if (identity := f"{v.self_id}@{id(self):x}") in self.accounts:
                                 v.connected.clear()
                                 await self.app.account_update(v, LoginStatus.OFFLINE)
                                 del self.app.accounts[identity]
@@ -170,7 +170,7 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
                         return
                     if close_task in done:
                         receiver_task.cancel()
-                        logger.warning(f"{self} Connection closed by server, will reconnect in 5 seconds...")
+                        logger.warning(f"{self.id} Connection closed by server, will reconnect in 5 seconds...")
                         for k in self.accounts.keys():
                             logger.debug(f"Unregistering satori account {k}...")
                             account = self.app.accounts[k]
@@ -178,12 +178,12 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
                             await self.app.account_update(account, LoginStatus.RECONNECT)
                         self.accounts.clear()
                         await asyncio.sleep(5)
-                        logger.info(f"{self} Reconnecting...")
+                        logger.info(f"{self.id} Reconnecting...")
                         continue
             except Exception as e:
-                logger.error(f"{self} Error while connecting: {e}")
+                logger.error(f"{self.id} Error while connecting: {e}")
                 await asyncio.sleep(5)
-                logger.info(f"{self} Reconnecting...")
+                logger.info(f"{self.id} Reconnecting...")
 
     async def launch(self, manager: Launart):
         async with self.stage("preparing"):