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

{satori_python_adapter_milky-0.4.2 → satori_python_adapter_milky-0.5.1}/.mina/adapter_milky.toml

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-milky
-Version: 0.4.2
+Version: 0.5.1
 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<1.4.0,>=1.3.3
+Requires-Dist: satori-python-server<1.4.0,>=1.3.7
 Description-Content-Type: text/markdown
 
 # satori-python

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

@@ -1,11 +1,11 @@
 [project]
 name = "satori-python-adapter-milky"
-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.3",
+    "satori-python-server<1.4.0,>= 1.3.7",
 ]
 description = "Satori Protocol SDK for python, adapter for Milky"
 readme = "README.md"

{satori_python_adapter_milky-0.4.2 → satori_python_adapter_milky-0.5.1}/src/satori/adapters/milky/__init__.py

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

{satori_python_adapter_milky-0.4.2 → satori_python_adapter_milky-0.5.1}/src/satori/adapters/milky/base.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
 from abc import ABC
+from dataclasses import dataclass, field
 from datetime import datetime
+from typing_extensions import TypeVar
 
 import aiohttp
 from launart.status import Phase
@@ -23,26 +25,42 @@ from .utils import decode_login_user
 DEFAULT_FEATURES = ["guild.plain", "reaction"]
 
 
-class MilkyBaseAdapter(BaseAdapter, ABC):
+@dataclass
+class MilkyBaseConfig:
+    endpoint: str
+    """连接 Milky 协议端的路径"""
+    token: str | None = None
+    """Milky 协议的访问令牌, 默认为空"""
+    token_in_query: bool = False
+    """是否将 token 放在查询参数中, 默认为 False"""
+    headers: dict[str, str] = field(default_factory=dict)
+    """连接时使用的自定义请求头, 默认为空字典"""
+    fetch_forward_message: bool = False
+    """是否在事件中获取转发消息, 默认为 False"""
+
+
+TMilkyBaseConfig = TypeVar("TMilkyBaseConfig", bound=MilkyBaseConfig, default=MilkyBaseConfig)
+
+
+class MilkyBaseAdapter(BaseAdapter[TMilkyBaseConfig], ABC):
     """Base adapter for Milky protocol with common functionality."""
 
     session: aiohttp.ClientSession | None
 
     def __init__(
         self,
-        endpoint: str | URL,
-        *,
-        token: str | None = None,
-        headers: dict[str, str] | None = None,
+        config: TMilkyBaseConfig,
     ):
         super().__init__()
-        self.base_url = URL(str(endpoint))
+        self.config = config
+        self.base_url = URL(self.config.endpoint)
         base_path = self.base_url.path.rstrip("/")
         self.api_base = self.base_url.with_path(f"{base_path}/api")
-        self.token = token
-        self.headers = headers.copy() if headers else {}
+        self.token = config.token
+        self.headers = config.headers.copy()
         self.session = None
         self.logins: dict[str, Login] = {}
+        self.fetch_forward_message = config.fetch_forward_message
         self.features: list[str] = list(DEFAULT_FEATURES)
         apply(self, lambda _: self, self._get_login)
 
@@ -110,18 +128,22 @@ class MilkyBaseAdapter(BaseAdapter, ABC):
             return
         login = self.logins[self_id]
         handler = event_handlers.get(event_type)
+        event = None
         if handler:
-            event = await handler(login, self, payload)
-        else:
+            try:
+                event = await handler(login, self, payload)
+            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.fromtimestamp(payload.get("time", datetime.now().timestamp())),
                 login,
             )
-        if event:
-            event._type = event_type
-            event._data = payload.get("data", {})
-            await self.server.post(event)
+        event._type = event_type
+        event._data = payload.get("data", {})
+        await self.server.post(event)
 
     async def refresh_login(self):
         try:
@@ -151,4 +173,4 @@ class MilkyBaseAdapter(BaseAdapter, ABC):
         return self.logins[self_id]
 
 
-__all__ = ["MilkyBaseAdapter", "DEFAULT_FEATURES"]
+__all__ = ["MilkyBaseAdapter", "DEFAULT_FEATURES", "MilkyBaseConfig"]

{satori_python_adapter_milky-0.4.2 → satori_python_adapter_milky-0.5.1}/src/satori/adapters/milky/events/base.py

@@ -34,5 +34,5 @@ async def bot_offline(login, net, raw):
             user=login.user,
             features=login.features.copy(),
         ),
-        message=MessageObject("", raw["data"]["reason"])
+        message=MessageObject("", raw["data"]["reason"]),
     )

{satori_python_adapter_milky-0.4.2 → satori_python_adapter_milky-0.5.1}/src/satori/adapters/milky/main.py

@@ -5,11 +5,10 @@ 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
+from .base import MilkyBaseAdapter, MilkyBaseConfig
 
 
 class MilkyWebsocketAdapter(MilkyBaseAdapter):
@@ -18,18 +17,14 @@ class MilkyWebsocketAdapter(MilkyBaseAdapter):
 
     def __init__(
         self,
-        endpoint: str | URL,
-        *,
-        token: str | None = None,
-        token_in_query: bool = False,
-        headers: dict[str, str] | None = None,
+        config: MilkyBaseConfig,
     ):
-        super().__init__(endpoint, token=token, headers=headers)
+        super().__init__(config)
         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)
+        if config.token_in_query and self.token:
+            self.event_url = self.event_url.update_query(access_token=self.token)
         self.connection = None
         self.close_signal = asyncio.Event()
 

{satori_python_adapter_milky-0.4.2 → satori_python_adapter_milky-0.5.1}/src/satori/adapters/milky/message.py

@@ -6,6 +6,8 @@ from dataclasses import dataclass, field
 from datetime import datetime
 from typing import Any, Literal
 
+from loguru import logger
+
 from satori.element import Custom, E, Element
 from satori.model import Channel, ChannelType, Login, MessageObject, User
 from satori.parser import Element as RawElement
@@ -138,7 +140,10 @@ class MilkyMessageEncoder:
                 if match := _BASE64_RE.match(uri):
                     uri = f"base64://{uri[len(match.group(0)) :]}"
                 self.segments.append(
-                    {"type": "image", "data": {"uri": uri, "sub_type": attrs.get("sub_type", "normal")}}
+                    {
+                        "type": "image",
+                        "data": {"uri": uri, "sub_type": attrs.get("sub_type", attrs.get("subTyoe", "normal"))},
+                    }
                 )
             case "audio":
                 uri = attrs.get("src") or attrs.get("url")
@@ -169,7 +174,9 @@ class MilkyMessageEncoder:
                 await self._send_file(attrs)
             case "milky:light_app":
                 await self.flush()
-                self.segments.append({"type": "light_app", "data": {"json_payload": attrs["json_payload"]}})
+                self.segments.append(
+                    {"type": "light_app", "data": {"json_payload": attrs.get("json_payload", attrs["jsonPayload"])}}
+                )
             case "author":
                 self.stack[0].author.update(attrs)
             case "quote":
@@ -196,7 +203,7 @@ class MilkyMessageEncoder:
                     if "id" in attrs:
                         payload["id"] = int(attrs["id"])
                     if "user_id" in attrs:
-                        payload["id"] = int(attrs["user_id"])
+                        payload["id"] = int(attrs.get("user_id", attrs["userId"]))
                     if "time" in attrs:
                         payload["time"] = int(attrs["time"])
                     self.stack[0].author.update(payload)
@@ -373,13 +380,13 @@ async def _decode_segments(net: MilkyNetwork, payload: dict, segments: Sequence[
             case "face":
                 result.append(E.emoji(str(data.get("face_id"))))
             case "image":
-                result.append(E.image(_resource_url(data)))
+                result.append(E.image(await _resource_url(net, data)))
             case "record":
-                result.append(E.audio(_resource_url(data)))
+                result.append(E.audio(await _resource_url(net, data)))
             case "video":
-                result.append(E.video(_resource_url(data)))
+                result.append(E.video(await _resource_url(net, data)))
             case "file":
-                result.append(E.file(_resource_url(data)))
+                result.append(E.file(await _resource_url(net, data)))
             case "reply":
                 seq = data.get("message_seq")
                 if seq is not None:
@@ -389,7 +396,18 @@ async def _decode_segments(net: MilkyNetwork, payload: dict, segments: Sequence[
             case "forward":
                 forward_id = data.get("forward_id")
                 if forward_id is not None:
-                    messages = (await net.call_api("get_forwarded_messages", {"forward_id": forward_id}))["messages"]
+                    if not net.fetch_forward_message:
+                        result.append(E.message(forward_id, content=[], forward=True))
+                        continue
+                    try:
+                        messages = (await net.call_api("get_forwarded_messages", {"forward_id": forward_id}))[
+                            "messages"
+                        ]
+                    except Exception as e:
+                        logger.error(
+                            f"Failed to fetch forwarded messages for forward_id {forward_id}: {payload}", exc_info=e
+                        )
+                        messages = []
                     forward_elements = []
                     for msg in messages:
                         sender_name = msg.get("sender_name")
@@ -405,7 +423,10 @@ async def _decode_segments(net: MilkyNetwork, payload: dict, segments: Sequence[
                                         "message_seq": msg["message_seq"],
                                     },
                                 )
-                            except Exception:
+                            except Exception as e:
+                                logger.error(
+                                    f"Failed to fetch message {msg['message_seq']} for forward: {payload}", exc_info=e
+                                )
                                 pass
                         if response:
                             origin = await decode_message(net, response["message"])
@@ -417,14 +438,16 @@ async def _decode_segments(net: MilkyNetwork, payload: dict, segments: Sequence[
                                     )
                                 )
                             content.extend(origin.message)
-
                         else:
                             content = await _decode_segments(net, payload, msg.get("segments", []))
                             content.insert(0, E.author(str(msg.get("sender_id")), sender_name, avatar))
                         forward_elements.append(E.message(str(msg.get("message_seq")), content=content))
                     result.append(E.message(forward_id, content=forward_elements, forward=True))
             case _:
-                result.append(Custom(f"milky:{seg_type}", data))
+                elem = Custom(f"milky:{seg_type}", data)
+                if seg_type == "market_face" and "url" in data:
+                    elem.children.append(E.image(data["url"]))
+                result.append(elem)
     return result
 
 
@@ -446,7 +469,8 @@ async def _decode_reply(net: MilkyNetwork, payload: dict, data: dict, message_se
                 "message_seq": message_seq,
             },
         )
-    except Exception:
+    except Exception as e:
+        logger.error(f"Failed to fetch message {message_seq} for reply: {payload}", exc_info=e)
         return None
     if not response or "message" not in response:
         return None
@@ -458,5 +482,13 @@ async def _decode_reply(net: MilkyNetwork, payload: dict, data: dict, message_se
     return E.quote(str(message_seq), content=content)
 
 
-def _resource_url(data: dict) -> str:
-    return data.get("temp_url") or data.get("url") or data.get("uri") or ""
+async def _resource_url(net: MilkyNetwork, data: dict) -> str:
+    if "uri" in data:
+        return data["uri"]
+    if "url" in data:
+        return data["url"]
+    if "temp_url" in data:
+        return data["temp_url"]
+    if "resource_id" in data:
+        return (await net.call_api("get_resource_temp_url", {"resource_id": data["resource_id"]}))["url"]
+    return ""

{satori_python_adapter_milky-0.4.2 → satori_python_adapter_milky-0.5.1}/src/satori/adapters/milky/sse.py

@@ -5,28 +5,23 @@ 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
+from .base import MilkyBaseAdapter, MilkyBaseConfig
 
 
 class MilkySSEAdapter(MilkyBaseAdapter):
 
     def __init__(
         self,
-        endpoint: str | URL,
-        *,
-        token: str | None = None,
-        token_in_query: bool = False,
-        headers: dict[str, str] | None = None,
+        config: MilkyBaseConfig,
     ):
-        super().__init__(endpoint, token=token, headers=headers)
+        super().__init__(config)
         base_path = self.base_url.path.rstrip("/")
         self.event_url = self.base_url.with_path(f"{base_path}/event")
-        if token_in_query and token:
-            self.event_url = self.event_url.update_query(access_token=token)
+        if config.token_in_query and self.token:
+            self.event_url = self.event_url.update_query(access_token=self.token)
         self.close_signal = asyncio.Event()
 
     async def launch(self, manager: Launart):

{satori_python_adapter_milky-0.4.2 → satori_python_adapter_milky-0.5.1}/src/satori/adapters/milky/utils.py

@@ -10,6 +10,8 @@ GROUP_AVATAR_URL = "https://p.qlogo.cn/gh/{group}/{group}/640"
 
 
 class MilkyNetwork(Protocol):
+    fetch_forward_message: bool
+
     async def call_api(self, action: str, params: dict | None = None) -> dict: ...
 
 

{satori_python_adapter_milky-0.4.2 → satori_python_adapter_milky-0.5.1}/src/satori/adapters/milky/webhook.py

@@ -1,30 +1,34 @@
 from __future__ import annotations
 
+from dataclasses import dataclass
+
 import aiohttp
 from launart import Launart
 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 .base import MilkyBaseAdapter
+from .base import MilkyBaseAdapter, MilkyBaseConfig
+
+
+@dataclass
+class MilkyWebhookConfig(MilkyBaseConfig):
+    path: str = "/milky"
+    """Webhook 适配器于 Server 的路径, 默认为 /milky"""
+    self_token: str | None = None
+    """Webhook 适配器的自定义访问令牌, 默认为 None, 若未设置则使用 Milky 协议的 token"""
 
 
-class MilkyWebhookAdapter(MilkyBaseAdapter):
+class MilkyWebhookAdapter(MilkyBaseAdapter[MilkyWebhookConfig]):
 
     def __init__(
         self,
-        endpoint: str | URL,
-        *,
-        token: str | None = None,
-        headers: dict[str, str] | None = None,
-        path: str = "/milky",
-        self_token: str | None = None,
+        config: MilkyWebhookConfig,
     ):
-        super().__init__(endpoint, token=token, headers=headers)
-        self.webhook_token = self_token if self_token is not None else token
-        self.webhook_paths = self._normalize_webhook_paths(path)
+        super().__init__(config)
+        self.webhook_token = config.self_token if config.self_token is not None else config.token
+        self.webhook_paths = self._normalize_webhook_paths(config.path)
 
     async def launch(self, manager: Launart):
         async with self.stage("preparing"):
@@ -79,4 +83,4 @@ class MilkyWebhookAdapter(MilkyBaseAdapter):
         return Response(status_code=204)
 
 
-__all__ = ["MilkyWebhookAdapter"]
+__all__ = ["MilkyWebhookAdapter", "MilkyWebhookConfig"]