satori-python-adapter-milky 0.1.2__tar.gz → 0.3.0__tar.gz

{satori_python_adapter_milky-0.1.2 → satori_python_adapter_milky-0.3.0}/.mina/adapter_milky.toml

@@ -1,9 +1,9 @@
 includes = ["src/satori/adapters/milky"]
-raw-dependencies = ["satori-python-server >= 0.17.6"]
+raw-dependencies = ["satori-python-server<1.4.0,>= 1.3.0"]
 
 [project]
 name = "satori-python-adapter-milky"
-version = "0.1.2"
+version = "0.3.0"
 authors = [
   {name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com"}
 ]

{satori_python_adapter_milky-0.1.2 → satori_python_adapter_milky-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-milky
-Version: 0.1.2
+Version: 0.3.0
 Summary: Satori Protocol SDK for python, adapter for Milky
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -17,7 +17,7 @@ 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>=0.17.6
+Requires-Dist: satori-python-server<1.4.0,>=1.3.0
 Description-Content-Type: text/markdown
 
 # satori-python
@@ -27,17 +27,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`）
 
@@ -69,12 +70,13 @@ pip install satori-python-server
 
 ### 官方适配器
 
-| 适配器        | 安装                                           | 路径                                                                 |
-|------------|----------------------------------------------|--------------------------------------------------------------------|
-| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                             |
-| 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          |
+| 适配器        | 安装                                           | 路径                                                                                   |
+|------------|----------------------------------------------|--------------------------------------------------------------------------------------|
+| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                                               |
+| 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, satori.adapters.milky.sse |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.qq.main, satori.adapters.qq.websocket                                |
 
 ### 社区适配器
 

{satori_python_adapter_milky-0.1.2 → satori_python_adapter_milky-0.3.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`）
 
@@ -47,12 +48,13 @@ pip install satori-python-server
 
 ### 官方适配器
 
-| 适配器        | 安装                                           | 路径                                                                 |
-|------------|----------------------------------------------|--------------------------------------------------------------------|
-| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                             |
-| 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          |
+| 适配器        | 安装                                           | 路径                                                                                   |
+|------------|----------------------------------------------|--------------------------------------------------------------------------------------|
+| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                                               |
+| 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, satori.adapters.milky.sse |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.qq.main, satori.adapters.qq.websocket                                |
 
 ### 社区适配器
 

{satori_python_adapter_milky-0.1.2 → satori_python_adapter_milky-0.3.0}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "satori-python-adapter-milky"
-version = "0.1.2"
+version = "0.3.0"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]
 dependencies = [
-    "satori-python-server >= 0.17.6",
+    "satori-python-server<1.4.0,>= 1.3.0",
 ]
 description = "Satori Protocol SDK for python, adapter for Milky"
 readme = "README.md"

satori_python_adapter_milky-0.3.0/src/satori/adapters/milky/__init__.py

@@ -0,0 +1,5 @@
+from .main import MilkyWebsocketAdapter as MilkyWebsocketAdapter
+from .sse import MilkySSEAdapter as MilkySSEAdapter
+from .webhook import MilkyWebhookAdapter as MilkyWebhookAdapter
+
+__all__ = ["MilkyWebsocketAdapter", "MilkySSEAdapter", "MilkyWebhookAdapter"]

{satori_python_adapter_milky-0.1.2 → satori_python_adapter_milky-0.3.0}/src/satori/adapters/milky/api.py

@@ -17,6 +17,7 @@ from satori.server.route import (
     GuildMemberGetParam,
     GuildMemberKickParam,
     GuildMemberMuteParam,
+    GuildMemberRoleParam,
     GuildXXXListParam,
     MessageListParam,
     MessageOpParam,
@@ -24,11 +25,12 @@ from satori.server.route import (
     ReactionCreateParam,
     ReactionDeleteParam,
     UserChannelCreateParam,
-    UserGetParam,
+    UserOpParam,
 )
 
 from .message import MilkyMessageEncoder, decode_message
 from .utils import (
+    ROLE_MAPPING,
     MilkyNetwork,
     decode_friend,
     decode_group_channel,
@@ -219,12 +221,42 @@ def apply(
         )
         return
 
+    @adapter.route(Api.GUILD_MEMBER_ROLE_SET)
+    async def guild_member_role_set(request: Request[GuildMemberRoleParam]):
+        net = net_getter(request.self_id)
+        await net.call_api(
+            "set_group_member_admin ",
+            {
+                "group_id": int(request.params["guild_id"]),
+                "user_id": int(request.params["user_id"]),
+                "is_set": request.params["role_id"] == "admin",
+            },
+        )
+        return
+
+    @adapter.route(Api.GUILD_MEMBER_ROLE_UNSET)
+    async def guild_member_role_unset(request: Request[GuildMemberRoleParam]):
+        net = net_getter(request.self_id)
+        await net.call_api(
+            "set_group_member_admin ",
+            {
+                "group_id": int(request.params["guild_id"]),
+                "user_id": int(request.params["user_id"]),
+                "is_set": request.params["role_id"] != "admin",
+            },
+        )
+        return
+
+    @adapter.route(Api.GUILD_ROLE_LIST)
+    async def guild_role_list(request: Request[GuildXXXListParam]):
+        return PageResult(list(ROLE_MAPPING.values()))
+
     @adapter.route(Api.GUILD_MEMBER_APPROVE)
     async def guild_member_approve(request: Request[ApproveParam]):
         net = net_getter(request.self_id)
         message_id = request.params["message_id"]
         notification_seq, notification_type, group_id, is_filtered = message_id.split("|")
-        params = {
+        params: dict = {
             "notification_seq": int(notification_seq),
             "notification_type": notification_type,
             "group_id": int(group_id),
@@ -259,7 +291,7 @@ def apply(
             {
                 "group_id": peer_id,
                 "message_seq": int(request.params["message_id"]),
-                "reaction": request.params["emoji"],
+                "reaction": request.params["emoji_id"],
                 "is_add": True,
             },
         )
@@ -276,14 +308,14 @@ def apply(
             {
                 "group_id": peer_id,
                 "message_seq": int(request.params["message_id"]),
-                "reaction": request.params["emoji"],
+                "reaction": request.params["emoji_id"],
                 "is_add": False,
             },
         )
         return
 
     @adapter.route(Api.USER_GET)
-    async def user_get(request: Request[UserGetParam]):
+    async def user_get(request: Request[UserOpParam]):
         net = net_getter(request.self_id)
         user_id = request.params["user_id"]
         profile = await net.call_api("get_user_profile", {"user_id": int(user_id)})
@@ -291,6 +323,13 @@ def apply(
             raise RuntimeError("Failed to get user profile")
         return decode_user_profile(profile, user_id)
 
+    @adapter.route(Api.FRIEND_DELETE)
+    async def friend_delete(request: Request[UserOpParam]):
+        net = net_getter(request.self_id)
+        user_id = request.params["user_id"]
+        await net.call_api("delete_friend", {"user_id": int(user_id)})
+        return
+
     @adapter.route(Api.FRIEND_LIST)
     async def friend_list(request: Request[FriendListParam]):
         net = net_getter(request.self_id)
@@ -302,7 +341,7 @@ def apply(
     async def friend_approve(request: Request[ApproveParam]):
         net = net_getter(request.self_id)
         initiator_uid, is_filtered = request.params["message_id"].split("|")
-        payload = {"initiator_uid": initiator_uid, "is_filtered": bool(int(is_filtered))}
+        payload: dict = {"initiator_uid": initiator_uid, "is_filtered": bool(int(is_filtered))}
         if request.params["approve"]:
             await net.call_api("accept_friend_request", payload)
         else:

satori_python_adapter_milky-0.1.2/src/satori/adapters/milky/webhook.py → satori_python_adapter_milky-0.3.0/src/satori/adapters/milky/base.py

@@ -1,14 +1,12 @@
 from __future__ import annotations
 
+from abc import ABC
 from datetime import datetime
 
 import aiohttp
-from launart import Launart
 from launart.status import Phase
 from loguru import logger
-from starlette.requests import Request as StarletteRequest
 from starlette.responses import JSONResponse, Response
-from starlette.routing import Route
 from yarl import URL
 
 from satori import EventType
@@ -20,20 +18,13 @@ from satori.utils import decode, encode
 
 from .api import apply
 from .events import event_handlers
-from .utils import MilkyNetwork, decode_login_user
+from .utils import decode_login_user
 
 DEFAULT_FEATURES = ["guild.plain", "reaction"]
 
 
-class _MilkyNetwork:
-    def __init__(self, adapter: MilkyWebhookAdapter):  # type: ignore[name-defined]
-        self.adapter = adapter
-
-    async def call_api(self, action: str, params: dict | None = None):
-        return await self.adapter.call_api(action, params or {})
-
-
-class MilkyWebhookAdapter(BaseAdapter):
+class MilkyBaseAdapter(BaseAdapter, ABC):
+    """Base adapter for Milky protocol with common functionality."""
 
     session: aiohttp.ClientSession | None
 
@@ -43,8 +34,6 @@ class MilkyWebhookAdapter(BaseAdapter):
         *,
         token: str | None = None,
         headers: dict[str, str] | None = None,
-        path: str = "/milky",
-        self_token: str | None = None,
     ):
         super().__init__()
         self.base_url = URL(str(endpoint))
@@ -54,11 +43,8 @@ class MilkyWebhookAdapter(BaseAdapter):
         self.headers = headers.copy() if headers else {}
         self.session = None
         self.logins: dict[str, Login] = {}
-        self.networks: dict[str, MilkyNetwork] = {}
-        self.features = list(DEFAULT_FEATURES)
-        self.webhook_token = self_token if self_token is not None else token
-        self.webhook_paths = self._normalize_webhook_paths(path)
-        apply(self, self._get_network, self._get_login)
+        self.features: list[str] = list(DEFAULT_FEATURES)
+        apply(self, lambda _: self, self._get_login)
 
     def get_platform(self) -> str:
         return "milky"
@@ -80,19 +66,6 @@ class MilkyWebhookAdapter(BaseAdapter):
     def stages(self) -> set[Phase]:
         return {"preparing", "blocking", "cleanup"}
 
-    async def launch(self, manager: Launart):
-        async with self.stage("preparing"):
-            self.session = aiohttp.ClientSession()
-
-        async with self.stage("blocking"):
-            await manager.status.wait_for_sigexit()
-
-        async with self.stage("cleanup"):
-            if self.session:
-                await self.session.close()
-            self.session = None
-            await self._handle_disconnect()
-
     def proxy_urls(self) -> list[str]:
         return []
 
@@ -125,9 +98,6 @@ class MilkyWebhookAdapter(BaseAdapter):
             raise ActionFailed(f"{data.get('retcode')}: {data.get('message')}", data)
         return data.get("data")
 
-    def get_routes(self) -> list[Route]:
-        return [Route(path, self.webhook_endpoint, methods=["POST"]) for path in self.webhook_paths]
-
     async def handle_event(self, payload: dict):
         event_type = payload.get("event_type")
         self_id = str(payload.get("self_id"))
@@ -140,22 +110,17 @@ class MilkyWebhookAdapter(BaseAdapter):
             return
         login = self.logins[self_id]
         handler = event_handlers.get(event_type)
-        network = self.networks.get(self_id)
-        if not network:
-            network = _MilkyNetwork(self)
-            self.networks[self_id] = network
         if handler:
-            event = await handler(login, network, payload)
+            event = await handler(login, self, payload)
         else:
-            body = payload.get("data", {})
             event = Event(
                 EventType.INTERNAL,
                 datetime.fromtimestamp(payload.get("time", datetime.now().timestamp())),
                 login,
-                _type=event_type,
-                _data=body,
             )
         if event:
+            event._type = event_type
+            event._data = payload.get("data", {})
             await self.server.post(event)
 
     async def refresh_login(self):
@@ -171,7 +136,6 @@ class MilkyWebhookAdapter(BaseAdapter):
         self_id = login.id
         previous = self.logins.get(self_id)
         self.logins[self_id] = login
-        self.networks[self_id] = _MilkyNetwork(self)
         event_type = EventType.LOGIN_ADDED if previous is None else EventType.LOGIN_UPDATED
         await self.server.post(Event(event_type, datetime.now(), login))
 
@@ -180,53 +144,9 @@ class MilkyWebhookAdapter(BaseAdapter):
             login.status = LoginStatus.OFFLINE
             await self.server.post(Event(EventType.LOGIN_REMOVED, datetime.now(), login))
             self.logins.pop(self_id, None)
-            self.networks.pop(self_id, None)
-
-    def _normalize_webhook_paths(self, webhook_path: str) -> tuple[str, ...]:
-        path = webhook_path or "/"
-        normalized = path if path.startswith("/") else f"/{path}"
-        paths: set[str] = {normalized}
-        stripped = normalized.rstrip("/")
-        if stripped and stripped != normalized:
-            paths.add(stripped)
-        return tuple(sorted(paths))
-
-    def _get_network(self, self_id: str) -> MilkyNetwork:
-        network = self.networks.get(self_id)
-        if not network:
-            network = _MilkyNetwork(self)
-            self.networks[self_id] = network
-        return network
 
     def _get_login(self, self_id: str) -> Login:
         return self.logins[self_id]
 
-    async def webhook_endpoint(self, request: StarletteRequest) -> Response:
-        if self.webhook_token:
-            auth_header = request.headers.get("Authorization")
-            provided = None
-            if auth_header:
-                if auth_header.lower().startswith("bearer "):
-                    provided = auth_header[7:]
-                else:
-                    provided = auth_header
-            if provided is None:
-                provided = request.query_params.get("access_token")
-            if provided != self.webhook_token:
-                return JSONResponse({"error": "unauthorized"}, status_code=401)
-        try:
-            payload = await request.json()
-        except Exception as e:  # pragma: no cover - defensive
-            logger.error(f"Failed to parse milky webhook payload: {e}")
-            return JSONResponse({"error": "invalid json"}, status_code=400)
-        if not isinstance(payload, dict):
-            return JSONResponse({"error": "invalid payload"}, status_code=400)
-        try:
-            await self.handle_event(payload)
-        except Exception as e:  # pragma: no cover - defensive
-            logger.exception("Error while processing milky webhook event", exc_info=e)
-            return JSONResponse({"error": "internal error"}, status_code=500)
-        return Response(status_code=204)
-
 
-__all__ = ["MilkyWebhookAdapter"]
+__all__ = ["MilkyBaseAdapter", "DEFAULT_FEATURES"]

{satori_python_adapter_milky-0.1.2 → satori_python_adapter_milky-0.3.0}/src/satori/adapters/milky/events/message.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from datetime import datetime
 
 from satori import EventType
-from satori.model import Channel, ChannelType, Event, Guild, MessageObject, User
+from satori.model import Channel, ChannelType, EmojiObject, Event, Guild, MessageObject, User
 
 from ..message import decode_message
 from ..utils import group_avatar, user_avatar
@@ -61,9 +61,9 @@ async def group_message_reaction(login, net, raw):
     guild = Guild(guild_id, avatar=group_avatar(guild_id))
     channel = Channel(guild_id, ChannelType.TEXT)
     user = User(str(data["user_id"]), avatar=user_avatar(data["user_id"]))
-    face_id = data["face_id"]
+    emoji_id = data["face_id"]
     message = MessageObject(
-        str(data["message_seq"]), f"<milky:face id='{face_id}'>", channel=channel, guild=guild, user=user
+        str(data["message_seq"]), f"<emoji id='{emoji_id}'>", channel=channel, guild=guild, user=user
     )
     if data["is_add"]:
         event_type = EventType.REACTION_ADDED
@@ -77,4 +77,5 @@ async def group_message_reaction(login, net, raw):
         guild=guild,
         user=user,
         message=message,
+        emoji=EmojiObject(emoji_id),
     )

satori_python_adapter_milky-0.3.0/src/satori/adapters/milky/main.py

@@ -0,0 +1,105 @@
+from __future__ import annotations
+
+import asyncio
+
+import aiohttp
+from launart import Launart, any_completed
+from loguru import logger
+from yarl import URL
+
+from satori.utils import decode
+
+from .base import MilkyBaseAdapter
+
+
+class MilkyWebsocketAdapter(MilkyBaseAdapter):
+
+    connection: aiohttp.ClientWebSocketResponse | None
+
+    def __init__(
+        self,
+        endpoint: str | URL,
+        *,
+        token: str | None = None,
+        token_in_query: bool = False,
+        headers: dict[str, str] | None = None,
+    ):
+        super().__init__(endpoint, token=token, headers=headers)
+        base_path = self.base_url.path.rstrip("/")
+        ws_scheme = "wss" if self.base_url.scheme == "https" else "ws"
+        self.event_url = self.base_url.with_scheme(ws_scheme).with_path(f"{base_path}/event")
+        if token_in_query and token:
+            self.event_url = self.event_url.update_query(access_token=token)
+        self.connection = None
+        self.close_signal = asyncio.Event()
+
+    async def launch(self, manager: Launart):
+        async with self.stage("preparing"):
+            self.session = aiohttp.ClientSession()
+
+        async with self.stage("blocking"):
+            await self.connection_daemon(manager, self.session)
+
+        async with self.stage("cleanup"):
+            if self.connection and not self.connection.closed:
+                await self.connection.close()
+            if self.session:
+                await self.session.close()
+            self.connection = None
+            self.session = None
+            await self._handle_disconnect()
+
+    async def connection_daemon(self, manager: Launart, session: aiohttp.ClientSession):
+        while not manager.status.exiting:
+            headers = self.headers.copy()
+            if self.token:
+                headers.setdefault("Authorization", f"Bearer {self.token}")
+            try:
+                self.connection = await session.ws_connect(self.event_url, headers=headers)
+            except Exception as e:
+                logger.error(f"Milky adapter websocket connect failed: {e}")
+                await asyncio.sleep(5)
+                continue
+            logger.info("Milky adapter websocket connected")
+            self.close_signal.clear()
+            await self.refresh_login()
+            receiver_task = asyncio.create_task(self.message_handle())
+            close_task = asyncio.create_task(self.close_signal.wait())
+            sigexit_task = asyncio.create_task(manager.status.wait_for_sigexit())
+
+            done, pending = await any_completed(receiver_task, close_task, sigexit_task)
+            for task in pending:
+                task.cancel()
+            await asyncio.gather(*pending, return_exceptions=True)
+            if sigexit_task in done:
+                break
+            logger.warning("Milky adapter websocket closed, retrying in 5 seconds")
+            await self._handle_disconnect()
+            await asyncio.sleep(5)
+        await self._handle_disconnect()
+
+    async def message_handle(self):
+        assert self.connection is not None
+        async for msg in self.connection:
+            if msg.type in (aiohttp.WSMsgType.CLOSE, aiohttp.WSMsgType.ERROR, aiohttp.WSMsgType.CLOSED):
+                self.close_signal.set()
+                break
+            if msg.type != aiohttp.WSMsgType.TEXT:
+                continue
+            try:
+                data = decode(msg.data)
+            except Exception as e:  # pragma: no cover - defensive
+                logger.error(f"Failed to decode milky event: {e}")
+                continue
+            if not isinstance(data, dict):
+                continue
+            await self.handle_event(data)
+
+    async def _handle_disconnect(self):
+        await super()._handle_disconnect()
+        if self.connection and not self.connection.closed:
+            await self.connection.close()
+        self.close_signal.set()
+
+
+__all__ = ["MilkyWebsocketAdapter"]