satori-python-client 0.17.7__tar.gz → 0.18.0__tar.gz

{satori_python_client-0.17.7 → satori_python_client-0.18.0}/.mina/client.toml

@@ -1,6 +1,6 @@
 includes = ["src/satori/client"]
 raw-dependencies = [
-    "satori-python-core >= 0.17.0",
+    "satori-python-core >= 0.18.0",
     "graia-amnesia >= 0.11.0",
 ]
 

{satori_python_client-0.17.7 → satori_python_client-0.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-client
-Version: 0.17.7
+Version: 0.18.0
 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,7 +19,7 @@ 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: satori-python-core>=0.17.0
+Requires-Dist: satori-python-core>=0.18.0
 Requires-Dist: graia-amnesia>=0.11.0
 Description-Content-Type: text/markdown
 
@@ -30,17 +30,18 @@ Description-Content-Type: text/markdown
 [![PyPI](https://img.shields.io/pypi/v/satori-python)](https://pypi.org/project/satori-python)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/satori-python)](https://www.python.org/)
 
-基于 [Satori](https://satori.js.org/zh-CN/) 协议的 Python 开发工具包
+基于 [Satori](https://satori.chat/zh-CN/) 协议的 Python 开发工具包
 
 ## 协议介绍
 
-[Satori Protocol](https://satori.js.org/zh-CN/)
+[Satori Protocol](https://satori.chat/zh-CN/)
 
 ### 协议端
 
 目前提供了 `satori` 协议实现的有：
 
 - [Chronocat](https://chronocat.vercel.app)
+- [LLBot](https://www.llonebot.com/guide/introduction)
 - [nekobox](https://github.com/wyapx/nekobox)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
@@ -78,6 +79,7 @@ pip install satori-python-server
 | OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
 | Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
 | Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.milky.main, satori.adapters.milky.websocket        |
 
 ### 社区适配器
 

{satori_python_client-0.17.7 → satori_python_client-0.18.0}/README.md

@@ -5,17 +5,18 @@
 [![PyPI](https://img.shields.io/pypi/v/satori-python)](https://pypi.org/project/satori-python)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/satori-python)](https://www.python.org/)
 
-基于 [Satori](https://satori.js.org/zh-CN/) 协议的 Python 开发工具包
+基于 [Satori](https://satori.chat/zh-CN/) 协议的 Python 开发工具包
 
 ## 协议介绍
 
-[Satori Protocol](https://satori.js.org/zh-CN/)
+[Satori Protocol](https://satori.chat/zh-CN/)
 
 ### 协议端
 
 目前提供了 `satori` 协议实现的有：
 
 - [Chronocat](https://chronocat.vercel.app)
+- [LLBot](https://www.llonebot.com/guide/introduction)
 - [nekobox](https://github.com/wyapx/nekobox)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
@@ -53,6 +54,7 @@ pip install satori-python-server
 | OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
 | Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
 | Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.milky.main, satori.adapters.milky.websocket        |
 
 ### 社区适配器
 

{satori_python_client-0.17.7 → satori_python_client-0.18.0}/pyproject.toml

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

{satori_python_client-0.17.7 → satori_python_client-0.18.0}/src/satori/client/__init__.py

@@ -102,7 +102,9 @@ class App(Service):
         self.event_callbacks.append(callback)
 
     @overload
-    def register_on(self, event_type: Literal[EventType.FRIEND_REQUEST]) -> Callable[
+    def register_on(
+        self, event_type: Literal[EventType.FRIEND_ADDED, EventType.FRIEND_REMOVED, EventType.FRIEND_REQUEST]
+    ) -> Callable[
         [Callable[[Account, events.UserEvent], Awaitable[Any]]],
         Callable[[Account, events.UserEvent], Awaitable[Any]],
     ]: ...
@@ -118,6 +120,15 @@ class App(Service):
         Callable[[Account, events.GuildEvent], Awaitable[Any]],
     ]: ...
 
+    @overload
+    def register_on(
+        self,
+        event_type: Literal[EventType.CHANNEL_ADDED, EventType.CHANNEL_REMOVED, EventType.CHANNEL_UPDATED],
+    ) -> Callable[
+        [Callable[[Account, events.ChannelEvent], Awaitable[Any]]],
+        Callable[[Account, events.ChannelEvent], Awaitable[Any]],
+    ]: ...
+
     @overload
     def register_on(
         self,
@@ -204,7 +215,12 @@ class App(Service):
 
     async def account_update(self, account: Account, state: LoginStatus):
         if self.lifecycle_callbacks:
-            await asyncio.gather(*(callback(account, state) for callback in self.lifecycle_callbacks))
+            task = asyncio.gather(*(callback(account, state) for callback in self.lifecycle_callbacks))
+            try:
+                await task
+            except Exception:
+                traceback.print_exc()
+                task.cancel()
 
     async def post(self, event: Event, conn: BaseNetwork):
         if event.type == EventType.LOGIN_ADDED:
@@ -214,7 +230,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):x}"
+            login_sn = f"{login.platform}_{login.user.id}@{id(conn):x}"
             account = Account(
                 login,
                 conn.config,
@@ -233,7 +249,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):x}"
+            login_sn = f"{login.platform}_{login.user.id}@{id(conn):x}"
             if login_sn not in self.accounts:
                 if login.status == LoginStatus.ONLINE:
                     account = Account(
@@ -267,13 +283,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):x}"
+            login_sn = f"{login.platform}_{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):x}"
+            login_sn = f"{event.login.platform}_{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.7 → satori_python_client-0.18.0}/src/satori/client/account.py

@@ -72,7 +72,10 @@ class Account(Generic[TP]):
         for proxy_url in self.proxy_urls:
             if url.startswith(proxy_url):
                 return self.config.api_base / "proxy" / url.lstrip("/")
-        return URL(url)
+        ans = URL(url)
+        if not ans.scheme:
+            ans = URL(f"http://{url}")
+        return ans
 
     def __repr__(self):
         return f"<Account {self.self_id} ({self.platform})>"

{satori_python_client-0.17.7 → satori_python_client-0.18.0}/src/satori/client/account.pyi

@@ -15,7 +15,6 @@ from satori.model import (
     Login,
     Member,
     MessageObject,
-    MessageReceipt,
     Meta,
     Order,
     PageDequeResult,
@@ -80,7 +79,7 @@ class Account(Generic[TP]):
             - 链接开头出现在 self_info.proxy_urls 中的某一项
         """
 
-    async def send(self, event: Event, message: str | Iterable[str | Element]) -> list[MessageReceipt]:
+    async def send(self, event: Event, message: str | Iterable[str | Element]) -> list[MessageObject]:
         """发送消息。返回一个 `MessageObject` 对象构成的数组。
 
         Args:
@@ -95,26 +94,28 @@ class Account(Generic[TP]):
         """
 
     async def send_message(
-        self, channel: str | Channel, message: str | Iterable[str | Element]
-    ) -> list[MessageReceipt]:
+        self, channel: str | Channel, message: str | Iterable[str | Element], referrer: dict[str, Any] | None = None
+    ) -> list[MessageObject]:
         """发送消息。返回一个 `MessageObject` 对象构成的数组。
 
         Args:
             channel (str | Channel): 要发送的频道 ID
             message (str | Iterable[str | Element]): 要发送的消息
+            referrer (dict[str, Any] | None, optional): 消息来源信息，默认为 None
 
         Returns:
             list[MessageObject]: `MessageObject` 对象构成的数组
         """
 
     async def send_private_message(
-        self, user: str | User, message: str | Iterable[str | Element]
-    ) -> list[MessageReceipt]:
+        self, user: str | User, message: str | Iterable[str | Element], referrer: dict[str, Any] | None = None
+    ) -> list[MessageObject]:
         """发送私聊消息。返回一个 `MessageObject` 对象构成的数组。
 
         Args:
             user (str | User): 要发送的用户 ID
             message (str | Iterable[str | Element]): 要发送的消息
+            referrer (dict[str, Any] | None, optional): 消息来源信息，默认为 None
 
         Returns:
             list[MessageObject]: `MessageObject` 对象构成的数组
@@ -134,12 +135,15 @@ class Account(Generic[TP]):
             None: 该方法无返回值
         """
 
-    async def message_create(self, channel_id: str, content: str) -> list[MessageReceipt]:
+    async def message_create(
+        self, channel_id: str, content: str, referrer: dict[str, Any] | None = None
+    ) -> list[MessageObject]:
         """发送消息。返回一个 `MessageObject` 对象构成的数组。
 
         Args:
             channel_id (str): 频道 ID
             content (str): 消息内容
+            referrer (dict[str, Any] | None, optional): 消息来源信息，默认为 None
 
         Returns:
             list[MessageObject]: `MessageObject` 对象构成的数组
@@ -583,7 +587,7 @@ class Account(Generic[TP]):
         """
     upload = upload_create
 
-    async def download(self, url: str):
+    async def download(self, url: str) -> bytes:
         """访问内部链接。"""
 
     async def request_internal(self, url: str, method: str = "GET", **kwargs) -> dict:

satori_python_client-0.18.0/src/satori/client/network/util.py

@@ -0,0 +1,44 @@
+from typing import Literal, overload
+
+from aiohttp import ClientResponse
+
+from satori.exception import (
+    BadRequestException,
+    ForbiddenException,
+    MethodNotAllowedException,
+    NotFoundException,
+    ServerException,
+    UnauthorizedException,
+)
+from satori.utils import decode
+
+
+@overload
+async def validate_response(resp: ClientResponse) -> dict: ...
+
+
+@overload
+async def validate_response(resp: ClientResponse, noreturn: Literal[True]) -> None: ...
+
+
+async def validate_response(resp: ClientResponse, noreturn=False):
+    match resp.status:
+        case x if 200 <= x < 300:
+            if noreturn:
+                return
+            content = await resp.text()
+            return decode(content) if content else {}
+        case 400:
+            raise BadRequestException(await resp.text())
+        case 401:
+            raise UnauthorizedException(await resp.text())
+        case 403:
+            raise ForbiddenException(await resp.text())
+        case 404:
+            raise NotFoundException(await resp.text())
+        case 405:
+            raise MethodNotAllowedException(await resp.text())
+        case x if x >= 500:
+            raise ServerException(await resp.text())
+        case _:
+            resp.raise_for_status()

{satori_python_client-0.17.7 → satori_python_client-0.18.0}/src/satori/client/network/webhook.py

@@ -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):x}"
+                login_sn = f"{login.platform}_{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):x}") in self.accounts:
+                if (identity := f"{v.platform}_{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.7 → satori_python_client-0.18.0}/src/satori/client/network/websocket.py

@@ -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):x}"
+            login_sn = f"{login.platform}_{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):x}") in self.accounts:
+                            if (identity := f"{v.platform}_{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.7 → satori_python_client-0.18.0}/src/satori/client/protocol.py

@@ -20,7 +20,6 @@ from satori.model import (
     LoginPartial,
     Member,
     MessageObject,
-    MessageReceipt,
     Meta,
     Order,
     PageDequeResult,
@@ -45,7 +44,7 @@ class ApiProtocol:
             self.session = ClientSession()
         self.timeout = ClientTimeout(self.account.config.timeout or 300)
 
-    async def download(self, url: str):
+    async def download(self, url: str) -> bytes:
         """访问资源链接。"""
         endpoint = self.account.ensure_url(url)
         aio = Launart.current().get_component(AiohttpClientService)
@@ -99,54 +98,58 @@ class ApiProtocol:
         ) as resp:
             return await validate_response(resp)
 
-    async def send(self, event: Event, message: str | Iterable[str | Element]) -> list[MessageReceipt]:
-        """发送消息。返回一个 `MessageReceipt` 对象构成的数组。
+    async def send(self, event: Event, message: str | Iterable[str | Element]) -> list[MessageObject]:
+        """发送消息。返回一个 `MessageObject` 对象构成的数组。
 
         Args:
             event (Event): 当前事件(上下文)
             message (str | Iterable[str | Element]): 要发送的消息
 
         Returns:
-            list[MessageReceipt]: `MessageReceipt` 对象构成的数组
+            list[MessageObject]: `MessageObject` 对象构成的数组
 
         Raises:
             RuntimeError: 传入的事件缺少 `channel` 对象
         """
         if not event.channel:
             raise RuntimeError("Event cannot be replied to!")
-        return await self.send_message(event.channel.id, message)
+        return await self.send_message(event.channel.id, message, event.referrer)
 
     async def send_message(
-        self, channel: str | Channel, message: str | Iterable[str | Element]
-    ) -> list[MessageReceipt]:
-        """发送消息。返回一个 `MessageReceipt` 对象构成的数组。
+        self, channel: str | Channel, message: str | Iterable[str | Element], referrer: dict[str, Any] | None = None
+    ) -> list[MessageObject]:
+        """发送消息。返回一个 `MessageObject` 对象构成的数组。
 
         Args:
             channel (str | Channel): 要发送的频道 ID
             message (str | Iterable[str | Element]): 要发送的消息
+            referrer (dict[str, Any] | None): 消息来源信息，默认为 None
 
         Returns:
-            list[MessageReceipt]: `MessageReceipt` 对象构成的数组
+            list[MessageObject]: `MessageObject` 对象构成的数组
         """
         channel_id = channel.id if isinstance(channel, Channel) else channel
         msg = message if isinstance(message, str) else "".join(str(i) for i in message)
-        return await self.message_create(channel_id=channel_id, content=msg)
+        return await self.message_create(channel_id=channel_id, content=msg, referrer=referrer)
 
     async def send_private_message(
-        self, user: str | User, message: str | Iterable[str | Element]
-    ) -> list[MessageReceipt]:
-        """发送私聊消息。返回一个 `MessageReceipt` 对象构成的数组。
+        self, user: str | User, message: str | Iterable[str | Element], referrer: dict[str, Any] | None = None
+    ) -> list[MessageObject]:
+        """发送私聊消息。返回一个 `MessageObject` 对象构成的数组。
 
         Args:
             user (str | User): 要发送的用户 ID
             message (str | Iterable[str | Element]): 要发送的消息
+            referrer (dict[str, Any] | None): 消息来源信息，默认为 None
 
         Returns:
-            list[MessageReceipt]: `MessageReceipt` 对象构成的数组
+            list[MessageObject]: `MessageObject` 对象构成的数组
         """
         user_id = user.id if isinstance(user, User) else user
         channel = await self.user_channel_create(user_id=user_id)
-        return await self.message_create(channel_id=channel.id, content="".join(str(i) for i in message))
+        return await self.message_create(
+            channel_id=channel.id, content="".join(str(i) for i in message), referrer=referrer
+        )
 
     async def update_message(
         self, channel: str | Channel, message_id: str, message: str | Iterable[str | Element]
@@ -169,22 +172,25 @@ class ApiProtocol:
             content=msg,
         )
 
-    async def message_create(self, channel_id: str, content: str) -> list[MessageReceipt]:
-        """发送消息。返回一个 `MessageReceipt` 对象构成的数组。
+    async def message_create(
+        self, channel_id: str, content: str, referrer: dict[str, Any] | None = None
+    ) -> list[MessageObject]:
+        """发送消息。返回一个 `MessageObject` 对象构成的数组。
 
         Args:
             channel_id (str): 频道 ID
             content (str): 消息内容
+            referrer (dict[str, Any] | None): 消息来源信息，默认为 None
 
         Returns:
-            list[MessageReceipt]: `MessageReceipt` 对象构成的数组
+            list[MessageObject]: `MessageObject` 对象构成的数组
         """
         res = await self.call_api(
             Api.MESSAGE_CREATE,
-            {"channel_id": channel_id, "content": content},
+            {"channel_id": channel_id, "content": content, "referrer": referrer},
         )
         res = cast("list[dict]", res)
-        return [MessageReceipt.parse(i) for i in res]
+        return [MessageObject.parse(i) for i in res]
 
     async def message_get(self, channel_id: str, message_id: str) -> MessageObject:
         """获取特定消息。返回一个 `MessageObject` 对象。
@@ -793,7 +799,8 @@ class ApiProtocol:
         Returns:
             list[Login]: `Login` 对象构成的数组
         """
-        return (await self.meta_get()).logins
+        res = await self.call_api("admin/login.list")
+        return [LoginPartial.parse(i) for i in res]
 
     async def webhook_create(self, url: str, token: str | None = None):
         """创建 Webhook。"""

satori_python_client-0.17.7/src/satori/client/network/util.py

@@ -1,42 +0,0 @@
-from typing import Literal, overload
-
-from aiohttp import ClientResponse
-
-from satori.exception import (
-    BadRequestException,
-    ForbiddenException,
-    MethodNotAllowedException,
-    NotFoundException,
-    ServerException,
-    UnauthorizedException,
-)
-from satori.utils import decode
-
-
-@overload
-async def validate_response(resp: ClientResponse) -> dict: ...
-
-
-@overload
-async def validate_response(resp: ClientResponse, noreturn: Literal[True]) -> None: ...
-
-
-async def validate_response(resp: ClientResponse, noreturn=False):
-    if 200 <= resp.status < 300:
-        if noreturn:
-            return
-        return decode(content) if (content := await resp.text()) else {}
-    elif resp.status == 400:
-        raise BadRequestException(await resp.text())
-    elif resp.status == 401:
-        raise UnauthorizedException(await resp.text())
-    elif resp.status == 403:
-        raise ForbiddenException(await resp.text())
-    elif resp.status == 404:
-        raise NotFoundException(await resp.text())
-    elif resp.status == 405:
-        raise MethodNotAllowedException(await resp.text())
-    elif resp.status >= 500:
-        raise ServerException(await resp.text())
-    else:
-        resp.raise_for_status()