satori-python-adapter-onebot11 0.4.2__tar.gz → 0.5.1__tar.gz

{satori_python_adapter_onebot11-0.4.2 → satori_python_adapter_onebot11-0.5.1}/.mina/adapter_onebot11.toml

@@ -1,9 +1,9 @@
 includes = ["src/satori/adapters/onebot11"]
-raw-dependencies = ["satori-python-server<1.4.0,>= 1.3.0"]
+raw-dependencies = ["satori-python-server<1.4.0,>= 1.3.7"]
 
 [project]
 name = "satori-python-adapter-onebot11"
-version = "0.4.2"
+version = "0.5.1"
 authors = [
   {name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com"}
 ]
@@ -16,11 +16,11 @@ classifiers = [
     "Typing :: Typed",
     "Development Status :: 4 - Beta",
     "License :: OSI Approved :: MIT License",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Operating System :: OS Independent",
 ]
 

{satori_python_adapter_onebot11-0.4.2 → satori_python_adapter_onebot11-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-onebot11
-Version: 0.4.2
+Version: 0.5.1
 Summary: Satori Protocol SDK for python, adapter for OneBot 11
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -8,16 +8,16 @@ License: MIT
 Classifier: Typing :: Typed
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
 Project-URL: Homepage, https://github.com/RF-Tar-Railt/satori-python
 Project-URL: Repository, https://github.com/RF-Tar-Railt/satori-python
 Requires-Python: <4.0,>=3.10
-Requires-Dist: satori-python-server<1.4.0,>=1.3.0
+Requires-Dist: satori-python-server<1.4.0,>=1.3.7
 Description-Content-Type: text/markdown
 
 # satori-python
@@ -27,11 +27,11 @@ 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.chat/zh-CN/) 协议的 Python 开发工具包
+基于 [Satori](https://satori.chat/zh-CN/protocol) 协议的 Python 开发工具包
 
 ## 协议介绍
 
-[Satori Protocol](https://satori.chat/zh-CN/)
+[Satori Protocol](https://satori.chat/zh-CN/protocol)
 
 ### 协议端
 
@@ -77,6 +77,7 @@ pip install satori-python-server
 | 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, satori.adapters.milky.sse |
 | QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.qq.main, satori.adapters.qq.websocket                                |
+| WxClaw     | `pip install satori-python-adapter-wxclaw`   | satori.adapters.wxclaw                                                               |
 
 ### 社区适配器
 

{satori_python_adapter_onebot11-0.4.2 → satori_python_adapter_onebot11-0.5.1}/README.md

@@ -5,11 +5,11 @@
 [![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.chat/zh-CN/) 协议的 Python 开发工具包
+基于 [Satori](https://satori.chat/zh-CN/protocol) 协议的 Python 开发工具包
 
 ## 协议介绍
 
-[Satori Protocol](https://satori.chat/zh-CN/)
+[Satori Protocol](https://satori.chat/zh-CN/protocol)
 
 ### 协议端
 
@@ -55,6 +55,7 @@ pip install satori-python-server
 | 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, satori.adapters.milky.sse |
 | QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.qq.main, satori.adapters.qq.websocket                                |
+| WxClaw     | `pip install satori-python-adapter-wxclaw`   | satori.adapters.wxclaw                                                               |
 
 ### 社区适配器
 

{satori_python_adapter_onebot11-0.4.2 → satori_python_adapter_onebot11-0.5.1}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "satori-python-adapter-onebot11"
-version = "0.4.2"
+version = "0.5.1"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]
 dependencies = [
-    "satori-python-server<1.4.0,>= 1.3.0",
+    "satori-python-server<1.4.0,>= 1.3.7",
 ]
 description = "Satori Protocol SDK for python, adapter for OneBot 11"
 readme = "README.md"
@@ -14,11 +14,11 @@ classifiers = [
     "Typing :: Typed",
     "Development Status :: 4 - Beta",
     "License :: OSI Approved :: MIT License",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Operating System :: OS Independent",
 ]
 
@@ -38,15 +38,14 @@ build-backend = "mina.backend"
 
 [dependency-groups]
 dev = [
-    "isort>=5.13.2",
-    "black>=24.4.0",
-    "ruff>=0.4.1",
+    "black>=26.3.0",
+    "ruff>=0.15.1",
     "pre-commit>=3.7.0",
-    "fix-future-annotations>=0.5.0",
     "mina-build<0.6,>=0.5.1",
     "pdm-mina>=0.3.2",
     "nonechat<0.7.0,>=0.6.0",
     "uvicorn[standard]>=0.37.0",
+    "pydantic>=2.13.1",
 ]
 
 [tool.pdm.build]
@@ -60,7 +59,7 @@ excludes = [
 
 [tool.pdm.scripts.format]
 composite = [
-    "isort ./src/ ./example/",
+    "ruff check --select I --fix ./src/ ./example/",
     "black ./src/ ./example/",
     "ruff check",
 ]
@@ -74,14 +73,6 @@ line-length = 120
 include = "\\.pyi?$"
 extend-exclude = ""
 
-[tool.isort]
-profile = "black"
-line_length = 120
-skip_gitignore = true
-extra_standard_library = [
-    "typing_extensions",
-]
-
 [tool.ruff]
 line-length = 120
 target-version = "py310"
@@ -91,6 +82,7 @@ exclude = [
     "exam2.py",
     "src/satori/_vendor/*",
 ]
+respect-gitignore = true
 
 [tool.ruff.lint]
 select = [
@@ -110,6 +102,12 @@ ignore = [
     "T201",
 ]
 
+[tool.ruff.lint.isort]
+extra-standard-library = [
+    "typing_extensions",
+]
+force-sort-within-sections = false
+
 [tool.pyright]
 pythonPlatform = "All"
 pythonVersion = "3.10"

{satori_python_adapter_onebot11-0.4.2 → satori_python_adapter_onebot11-0.5.1}/src/satori/adapters/onebot11/__init__.py

@@ -1,2 +1,4 @@
 from .forward import OneBot11ForwardAdapter as OneBot11ForwardAdapter
+from .forward import OneBot11ForwardConfig as OneBot11ForwardConfig
 from .reverse import OneBot11ReverseAdapter as OneBot11ReverseAdapter
+from .reverse import OneBot11ReverseConfig as OneBot11ReverseConfig

{satori_python_adapter_onebot11-0.4.2 → satori_python_adapter_onebot11-0.5.1}/src/satori/adapters/onebot11/forward.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import asyncio
 from contextlib import suppress
+from dataclasses import dataclass
 from datetime import datetime
 from typing import cast
 
@@ -25,21 +26,30 @@ from .events.base import events
 from .utils import USER_AVATAR_URL, onebot11_event_type
 
 
-class OneBot11ForwardAdapter(BaseAdapter):
+@dataclass
+class OneBot11ForwardConfig:
+    endpoint: str
+    """连接 OneBot V11协议端的路径"""
+    access_token: str | None = None
+    """OneBot V11协议的访问令牌, 默认为空"""
+    timeout: float = 60
+    """连接超时时间, 默认为 60 秒"""
+
+
+class OneBot11ForwardAdapter(BaseAdapter[OneBot11ForwardConfig]):
 
     session: ClientSession
     connection: ClientWebSocketResponse | None
 
     def __init__(
         self,
-        endpoint: str | URL,
-        access_token: str | None = None,
-        timeout: float = 60,
+        config: OneBot11ForwardConfig,
     ):
         super().__init__()
-        self.endpoint = URL(endpoint)
-        self.timeout = timeout
-        self.access_token = access_token
+        self.config = config
+        self.endpoint = URL(config.endpoint)
+        self.timeout = config.timeout
+        self.access_token = config.access_token
         self.close_signal = asyncio.Event()
         self.response_waiters: dict[str, asyncio.Future] = {}
         self.logins: dict[str, Login] = {}
@@ -64,74 +74,73 @@ class OneBot11ForwardAdapter(BaseAdapter):
         return {"preparing", "blocking", "cleanup"}
 
     async def message_handle(self):
+        async def _login_add():
+            self_info = await self.call_api("get_login_info")
+            login = Login(
+                sn=0,
+                status=LoginStatus.ONLINE,
+                adapter="onebot",
+                platform="qq-client",
+                user=User(
+                    self_id,
+                    (self_info or {})["nickname"],
+                    avatar=USER_AVATAR_URL.format(uin=self_id),
+                ),
+                features=["guild.plain"],
+            )
+            self.logins[self_id] = login
+            await self.server.post(Event(EventType.LOGIN_ADDED, datetime.now(), login))
+
         async for connection, data in self.message_receive():
             if echo := data.get("echo"):
                 if future := self.response_waiters.get(echo):
                     future.set_result(data)
                 continue
 
-            async def event_parse_task(data: dict):
-                event_type = onebot11_event_type(data)
-                if event_type == "meta_event.lifecycle.connect":
-                    self_id = str(data["self_id"])
-                    if self_id not in self.logins:
-                        self_info = await self.call_api("get_login_info")
-                        login = Login(
-                            0,
-                            LoginStatus.ONLINE,
-                            "onebot",
-                            platform="onebot",
-                            user=User(
-                                self_id,
-                                (self_info or {})["nickname"],
-                                avatar=USER_AVATAR_URL.format(uin=self_id),
-                            ),
-                            features=["guild.plain"],
-                        )
-                        self.logins[self_id] = login
-                        await self.server.post(Event(EventType.LOGIN_ADDED, datetime.now(), login))
-                elif event_type == "meta_event.lifecycle.enable":
-                    logger.warning(f"received lifecycle.enable event that is only supported in http adapter: {data}")
-                    return
-                elif event_type == "meta_event.lifecycle.disable":
-                    logger.warning(f"received lifecycle.disable event that is only supported in http adapter: {data}")
+            event_type = onebot11_event_type(data)
+            if event_type == "meta_event.lifecycle.connect":
+                self_id = str(data["self_id"])
+                if self_id not in self.logins:
+                    asyncio.create_task(_login_add())
+            elif event_type == "meta_event.lifecycle.enable":
+                logger.warning(f"received lifecycle.enable event that is only supported in http adapter: {data}")
+                return
+            elif event_type == "meta_event.lifecycle.disable":
+                logger.warning(f"received lifecycle.disable event that is only supported in http adapter: {data}")
+                return
+            elif event_type == "meta_event.heartbeat":
+                self_id = str(data["self_id"])
+                if self_id not in self.logins:
+                    asyncio.create_task(_login_add())
+                logger.trace(f"received heartbeat from {self_id}")
+            else:
+                self_id = str(data["self_id"])
+                if self_id not in self.logins:
+                    logger.warning(f"received event from unknown self_id: {data}")
                     return
-                elif event_type == "meta_event.heartbeat":
-                    self_id = str(data["self_id"])
-                    if self_id not in self.logins:
-                        self_info = await self.call_api("get_login_info")
-                        login = Login(
-                            0,
-                            LoginStatus.ONLINE,
-                            "onebot",
-                            platform="onebot",
-                            user=User(
-                                self_id,
-                                (self_info or {})["nickname"],
-                                avatar=USER_AVATAR_URL.format(uin=self_id),
-                            ),
-                            features=["guild.plain"],
-                        )
-                        self.logins[self_id] = login
-                        await self.server.post(Event(EventType.LOGIN_ADDED, datetime.now(), login))
-                    logger.trace(f"received heartbeat from {self_id}")
-                else:
-                    self_id = str(data["self_id"])
-                    if self_id not in self.logins:
-                        logger.warning(f"received event from unknown self_id: {data}")
-                        return
-                    login = self.logins[self_id]
-                    handler = events.get(event_type)
-                    if not handler:
-                        event = Event(EventType.INTERNAL, datetime.now(), login)
-                    else:
-                        event = await handler(login, self, data)
-                    if event:
-                        event._type = event_type
-                        event._data = data
-                        await self.server.post(event)
-
-            asyncio.create_task(event_parse_task(data))
+                login = self.logins[self_id]
+                handler = events.get(event_type)
+
+                async def _event_parse(
+                    _login=login,
+                    _handler=handler,
+                    _data=data,
+                    _event_type=event_type,
+                ):
+                    event = None
+                    if _handler:
+                        try:
+                            event = await _handler(_login, self, _data)
+                        except Exception as e:
+                            logger.exception(f"failed to handle event {event_type}: {e!r}")
+                            event = None
+                    if not event:
+                        event = Event(EventType.INTERNAL, datetime.now(), _login)
+                    event._type = _event_type
+                    event._data = _data
+                    await self.server.post(event)
+
+                asyncio.create_task(_event_parse())
 
     async def message_receive(self):
         if self.connection is None:

{satori_python_adapter_onebot11-0.4.2 → satori_python_adapter_onebot11-0.5.1}/src/satori/adapters/onebot11/message.py

@@ -85,7 +85,7 @@ class OneBot11MessageEncoder:
                 },
             )
         if resp:
-            self.results.append(MessageObject(resp["message_id"], ""))
+            self.results.append(MessageObject(str(resp["message_id"]), ""))
 
     async def flush(self):
         if not self.children:
@@ -111,15 +111,15 @@ class OneBot11MessageEncoder:
 
         slot = self.stack[0]
         type_, author = slot.type, slot.author
-        if not self.children and "message_id" not in author:
+        if not self.children and "messageId" not in author:
             return
         if type_ == "forward":
-            if "message_id" in author:
+            if "messageId" in author:
                 self.stack[1].children.append(
                     {
                         "type": "node",
                         "data": {
-                            "id": author["message_id"],
+                            "id": author["messageId"],
                         },
                     }
                 )
@@ -159,7 +159,7 @@ class OneBot11MessageEncoder:
                 },
             )
         if resp:
-            self.results.append(MessageObject(resp["message_id"], ""))
+            self.results.append(MessageObject(str(resp["message_id"]), ""))
         self.children = []
 
     async def _send_file(self, attrs: dict[str, Any]):
@@ -286,7 +286,7 @@ class OneBot11MessageEncoder:
                     self.stack.pop(0)
                     await self.send_forward()
                 elif "id" in attrs:
-                    self.stack[0].author["message_id"] = str(attrs["id"])
+                    self.stack[0].author["messageId"] = str(attrs["id"])
                 else:
                     payload = {}
                     if "name" in attrs:
@@ -299,6 +299,8 @@ class OneBot11MessageEncoder:
                         payload["id"] = int(attrs["id"])
                     if "user_id" in attrs:
                         payload["id"] = int(attrs["user_id"])
+                    if "userId" in attrs:
+                        payload["id"] = int(attrs["userId"])
                     if "time" in attrs:
                         payload["time"] = int(attrs["time"])
                     self.stack[0].author.update(payload)

{satori_python_adapter_onebot11-0.4.2 → satori_python_adapter_onebot11-0.5.1}/src/satori/adapters/onebot11/reverse.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+from dataclasses import dataclass
 from datetime import datetime
 
 from launart import Launart, any_completed
@@ -44,74 +45,73 @@ class _Connection:
         self.close_signal.set()
 
     async def message_handle(self):
+        async def _login_add():
+            self_info = await self.call_api("get_login_info")
+            login = Login(
+                sn=0,
+                status=LoginStatus.ONLINE,
+                adapter="onebot",
+                platform="qq-client",
+                user=User(
+                    self_id,
+                    (self_info or {})["nickname"],
+                    avatar=USER_AVATAR_URL.format(uin=self_id),
+                ),
+                features=["guild.plain"],
+            )
+            self.adapter.logins[self_id] = login
+            await self.adapter.server.post(Event(EventType.LOGIN_ADDED, datetime.now(), login))
+
         async for connection, data in self.message_receive():
             if echo := data.get("echo"):
                 if future := self.response_waiters.get(echo):
                     future.set_result(data)
                 continue
 
-            async def event_parse_task(data: dict):
-                event_type = onebot11_event_type(data)
-                if event_type == "meta_event.lifecycle.connect":
-                    self_id = str(data["self_id"])
-                    if self_id not in self.adapter.logins:
-                        self_info = await self.call_api("get_login_info")
-                        login = Login(
-                            0,
-                            LoginStatus.ONLINE,
-                            "onebot",
-                            platform="onebot",
-                            user=User(
-                                self_id,
-                                (self_info or {})["nickname"],
-                                avatar=USER_AVATAR_URL.format(uin=self_id),
-                            ),
-                            features=["guild.plain"],
-                        )
-                        self.adapter.logins[self_id] = login
-                        await self.adapter.server.post(Event(EventType.LOGIN_ADDED, datetime.now(), login))
-                elif event_type == "meta_event.lifecycle.enable":
-                    logger.warning(f"received lifecycle.enable event that is only supported in http adapter: {data}")
-                    return
-                elif event_type == "meta_event.lifecycle.disable":
-                    logger.warning(f"received lifecycle.disable event that is only supported in http adapter: {data}")
+            event_type = onebot11_event_type(data)
+            if event_type == "meta_event.lifecycle.connect":
+                self_id = str(data["self_id"])
+                if self_id not in self.adapter.logins:
+                    asyncio.create_task(_login_add())
+            elif event_type == "meta_event.lifecycle.enable":
+                logger.warning(f"received lifecycle.enable event that is only supported in http adapter: {data}")
+                return
+            elif event_type == "meta_event.lifecycle.disable":
+                logger.warning(f"received lifecycle.disable event that is only supported in http adapter: {data}")
+                return
+            elif event_type == "meta_event.heartbeat":
+                self_id = str(data["self_id"])
+                if self_id not in self.adapter.logins:
+                    asyncio.create_task(_login_add())
+                logger.trace(f"received heartbeat from {self_id}")
+            else:
+                self_id = str(data["self_id"])
+                if self_id not in self.adapter.logins:
+                    logger.warning(f"received event from unknown self_id: {data}")
                     return
-                elif event_type == "meta_event.heartbeat":
-                    self_id = str(data["self_id"])
-                    if self_id not in self.adapter.logins:
-                        self_info = await self.call_api("get_login_info")
-                        login = Login(
-                            0,
-                            LoginStatus.ONLINE,
-                            "onebot",
-                            platform="onebot",
-                            user=User(
-                                self_id,
-                                (self_info or {})["nickname"],
-                                avatar=USER_AVATAR_URL.format(uin=self_id),
-                            ),
-                            features=["guild.plain"],
-                        )
-                        self.adapter.logins[self_id] = login
-                        await self.adapter.server.post(Event(EventType.LOGIN_ADDED, datetime.now(), login))
-                    logger.trace(f"received heartbeat from {self_id}")
-                else:
-                    self_id = str(data["self_id"])
-                    if self_id not in self.adapter.logins:
-                        logger.warning(f"received event from unknown self_id: {data}")
-                        return
-                    login = self.adapter.logins[self_id]
-                    handler = events.get(event_type)
-                    if not handler:
-                        event = Event(EventType.INTERNAL, datetime.now(), login)
-                    else:
-                        event = await handler(login, self, data)
-                    if event:
-                        event._type = event_type
-                        event._data = data
-                        await self.adapter.server.post(event)
-
-            asyncio.create_task(event_parse_task(data))
+                login = self.adapter.logins[self_id]
+                handler = events.get(event_type)
+
+                async def _event_parse(
+                    _login=login,
+                    _handler=handler,
+                    _data=data,
+                    _event_type=event_type,
+                ):
+                    event = None
+                    if _handler:
+                        try:
+                            event = await _handler(_login, self, _data)
+                        except Exception as e:
+                            logger.exception(f"failed to handle event {_event_type}: {e!r}")
+                            event = None
+                    if not event:
+                        event = Event(EventType.INTERNAL, datetime.now(), _login)
+                    event._type = _event_type
+                    event._data = _data
+                    await self.adapter.server.post(event)
+
+                asyncio.create_task(_event_parse())
 
     async def call_api(self, action: str, params: dict | None = None) -> dict:
         if not self.ws:
@@ -133,22 +133,33 @@ class _Connection:
         return result.get("data", {})
 
 
-class OneBot11ReverseAdapter(BaseAdapter):
+@dataclass
+class OneBot11ReverseConfig:
+    prefix: str = "/"
+    """反向适配器于 Server 的路径前缀, 默认为 /"""
+    path: str = "onebot/v11"
+    """反向适配器于 Server 的路径, 默认为 onebot/v11"""
+    endpoint: str = "ws"
+    """反向适配器于 Server 的路径端点, 默认为 ws (完整路径即为 /onebot/v11/ws)"""
+    access_token: str | None = None
+    """反向适配器的访问令牌, 默认为空"""
+    timeout: int = 60
+    """发送请求的超时时间，默认为 60 秒"""
+
+
+class OneBot11ReverseAdapter(BaseAdapter[OneBot11ReverseConfig]):
 
     def __init__(
         self,
-        prefix: str = "/",
-        path: str = "onebot/v11",
-        endpoint: str = "ws",
-        access_token: str | None = None,
-        timeout: int = 60,
+        config: OneBot11ReverseConfig,
     ):
         super().__init__()
-        self.endpoint = URL(prefix) / path / endpoint
-        self.access_token = access_token
+        self.config = config
+        self.endpoint = URL(config.prefix) / config.path / config.endpoint
+        self.access_token = config.access_token
         self.logins: dict[str, Login] = {}
         self.connections: dict[str, _Connection] = {}
-        self.timeout = timeout
+        self.timeout = config.timeout
 
         apply(self, lambda _: self.connections[_], lambda _: self.logins[_])