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

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

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

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

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

{satori_python-0.17.0 → satori_python-0.17.1}/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-0.17.0 → satori_python-0.17.1}/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-0.17.0 → satori_python-0.17.1}/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"):

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

@@ -264,7 +264,7 @@ class Server(Service, RouterMixin):
             {"op": Opcode.READY, "body": {"logins": [lo.dump() for lo in logins], "proxy_urls": proxy_urls}}
         )
         self.connections.append(connection)
-        logger.debug(f"New connection: {id(connection)}")
+        logger.debug(f"New connection: {id(connection):x}")
         heartbeat_task = asyncio.create_task(connection.heartbeat())
         close_task = asyncio.create_task(connection.close_signal.wait())
         try:
@@ -281,7 +281,7 @@ class Server(Service, RouterMixin):
             await any_completed(heartbeat_task, close_task)
         finally:
             await connection.connection_closed()
-            logger.debug(f"Connection closed: {id(connection)}")
+            logger.debug(f"Connection closed: {id(connection):x}")
             heartbeat_task.cancel()
             close_task.cancel()
             self.connections.remove(connection)

{satori_python-0.17.0 → satori_python-0.17.1}/src/satori/server/connection.py

@@ -29,7 +29,7 @@ class WebsocketConnection:
                     continue
                 await self.connection.send_text(encode({"op": Opcode.PONG}))
             except asyncio.TimeoutError:
-                logger.warning(f"Connection {id(self)} heartbeat timeout, closing connection.")
+                logger.warning(f"Connection {id(self):x} heartbeat timeout, closing connection.")
                 await self.connection.close()
                 await self.connection_closed()
                 break