AstrBot 3.5.6__py3-none-any.whl → 4.7.0__py3-none-any.whl

astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py

@@ -1,33 +1,42 @@
-import time
 import asyncio
+import itertools
 import logging
+import time
 import uuid
-import itertools
-from typing import Awaitable, Any
+from collections.abc import Awaitable
+from typing import Any
+
 from aiocqhttp import CQHttp, Event
+from aiocqhttp.exceptions import ActionFailed
+
+from astrbot.api import logger
+from astrbot.api.event import MessageChain
+from astrbot.api.message_components import *
 from astrbot.api.platform import (
-    Platform,
     AstrBotMessage,
     MessageMember,
     MessageType,
+    Platform,
     PlatformMetadata,
 )
-from astrbot.api.event import MessageChain
-from .aiocqhttp_message_event import *  # noqa: F403
-from astrbot.api.message_components import *  # noqa: F403
-from astrbot.api import logger
-from .aiocqhttp_message_event import AiocqhttpMessageEvent
 from astrbot.core.platform.astr_message_event import MessageSesion
+
 from ...register import register_platform_adapter
-from aiocqhttp.exceptions import ActionFailed
+from .aiocqhttp_message_event import *
+from .aiocqhttp_message_event import AiocqhttpMessageEvent
 
 
 @register_platform_adapter(
-    "aiocqhttp", "适用于 OneBot V11 标准的消息平台适配器，支持反向 WebSockets。"
+    "aiocqhttp",
+    "适用于 OneBot V11 标准的消息平台适配器，支持反向 WebSockets。",
+    support_streaming_message=False,
 )
 class AiocqhttpAdapter(Platform):
     def __init__(
-        self, platform_config: dict, platform_settings: dict, event_queue: asyncio.Queue
+        self,
+        platform_config: dict,
+        platform_settings: dict,
+        event_queue: asyncio.Queue,
     ) -> None:
         super().__init__(event_queue)
 
@@ -41,6 +50,7 @@ class AiocqhttpAdapter(Platform):
             name="aiocqhttp",
             description="适用于 OneBot 标准的消息平台适配器，支持反向 WebSockets。",
             id=self.config.get("id"),
+            support_streaming_message=False,
         )
 
         self.bot = CQHttp(
@@ -48,7 +58,7 @@ class AiocqhttpAdapter(Platform):
             import_name="aiocqhttp",
             api_timeout_sec=180,
             access_token=platform_config.get(
-                "ws_reverse_token"
+                "ws_reverse_token",
             ),  # 以防旧版本配置不存在
         )
 
@@ -81,28 +91,32 @@ class AiocqhttpAdapter(Platform):
             logger.info("aiocqhttp(OneBot v11) 适配器已连接。")
 
     async def send_by_session(
-        self, session: MessageSesion, message_chain: MessageChain
+        self,
+        session: MessageSesion,
+        message_chain: MessageChain,
     ):
-        ret = await AiocqhttpMessageEvent._parse_onebot_json(message_chain)
-        match session.message_type.value:
-            case MessageType.GROUP_MESSAGE.value:
-                if "_" in session.session_id:
-                    # 独立会话
-                    _, group_id = session.session_id.split("_")
-                    await self.bot.send_group_msg(group_id=group_id, message=ret)
-                else:
-                    await self.bot.send_group_msg(
-                        group_id=session.session_id, message=ret
-                    )
-            case MessageType.FRIEND_MESSAGE.value:
-                await self.bot.send_private_msg(user_id=session.session_id, message=ret)
+        is_group = session.message_type == MessageType.GROUP_MESSAGE
+        if is_group:
+            session_id = session.session_id.split("_")[-1]
+        else:
+            session_id = session.session_id
+        await AiocqhttpMessageEvent.send_message(
+            bot=self.bot,
+            message_chain=message_chain,
+            event=None,  # 这里不需要 event，因为是通过 session 发送的
+            is_group=is_group,
+            session_id=session_id,
+        )
         await super().send_by_session(session, message_chain)
 
-    async def convert_message(self, event: Event) -> AstrBotMessage:
+    async def convert_message(self, event: Event) -> AstrBotMessage | None:
         logger.debug(f"[aiocqhttp] RawMessage {event}")
 
         if event["post_type"] == "message":
             abm = await self._convert_handle_message_event(event)
+            if abm.sender.user_id == "2854196310":
+                # 屏蔽 QQ 管家的消息
+                return None
         elif event["post_type"] == "notice":
             abm = await self._convert_handle_notice_event(event)
         elif event["post_type"] == "request":
@@ -116,7 +130,7 @@ class AiocqhttpAdapter(Platform):
         abm.self_id = str(event.self_id)
         abm.sender = MessageMember(user_id=str(event.user_id), nickname=event.user_id)
         abm.type = MessageType.OTHER_MESSAGE
-        if "group_id" in event and event["group_id"]:
+        if event.get("group_id"):
             abm.type = MessageType.GROUP_MESSAGE
             abm.group_id = str(event.group_id)
         else:
@@ -142,7 +156,7 @@ class AiocqhttpAdapter(Platform):
         abm.self_id = str(event.self_id)
         abm.sender = MessageMember(user_id=str(event.user_id), nickname=event.user_id)
         abm.type = MessageType.OTHER_MESSAGE
-        if "group_id" in event and event["group_id"]:
+        if event.get("group_id"):
             abm.group_id = str(event.group_id)
             abm.type = MessageType.GROUP_MESSAGE
         else:
@@ -165,14 +179,14 @@ class AiocqhttpAdapter(Platform):
 
         if "sub_type" in event:
             if event["sub_type"] == "poke" and "target_id" in event:
-                abm.message.append(
-                    Poke(qq=str(event["target_id"]), type="poke")
-                )  # noqa: F405
+                abm.message.append(Poke(qq=str(event["target_id"]), type="poke"))
 
         return abm
 
     async def _convert_handle_message_event(
-        self, event: Event, get_reply=True
+        self,
+        event: Event,
+        get_reply=True,
     ) -> AstrBotMessage:
         """OneBot V11 消息类事件
 
@@ -182,11 +196,13 @@ class AiocqhttpAdapter(Platform):
         abm = AstrBotMessage()
         abm.self_id = str(event.self_id)
         abm.sender = MessageMember(
-            str(event.sender["user_id"]), event.sender["nickname"]
+            str(event.sender["user_id"]),
+            event.sender.get("card") or event.sender.get("nickname", "N/A"),
         )
         if event["message_type"] == "group":
             abm.type = MessageType.GROUP_MESSAGE
             abm.group_id = str(event.group_id)
+            abm.group.group_name = event.get("group_name", "N/A")
         elif event["message_type"] == "private":
             abm.type = MessageType.FRIEND_MESSAGE
         if self.unique_session and abm.type == MessageType.GROUP_MESSAGE:
@@ -205,21 +221,24 @@ class AiocqhttpAdapter(Platform):
 
         message_str = ""
         if not isinstance(event.message, list):
-            err = f"aiocqhttp: 无法识别的消息类型: {str(event.message)}，此条消息将被忽略。如果您在使用 go-cqhttp，请将其配置文件中的 message.post-format 更改为 array。"
+            err = f"aiocqhttp: 无法识别的消息类型: {event.message!s}，此条消息将被忽略。如果您在使用 go-cqhttp，请将其配置文件中的 message.post-format 更改为 array。"
             logger.critical(err)
             try:
-                self.bot.send(event, err)
+                await self.bot.send(event, err)
             except BaseException as e:
                 logger.error(f"回复消息失败: {e}")
-            return
+            return None
 
         # 按消息段类型类型适配
         for t, m_group in itertools.groupby(event.message, key=lambda x: x["type"]):
             a = None
             if t == "text":
-                # 合并相邻文本段
-                message_str = "".join(m["data"]["text"] for m in m_group).strip()
-                a = ComponentTypes[t](text=message_str)  # noqa: F405
+                current_text = "".join(m["data"]["text"] for m in m_group).strip()
+                if not current_text:
+                    # 如果文本段为空，则跳过
+                    continue
+                message_str += current_text
+                a = ComponentTypes[t](text=current_text)
                 abm.message.append(a)
 
             elif t == "file":
@@ -259,7 +278,7 @@ class AiocqhttpAdapter(Platform):
             elif t == "reply":
                 for m in m_group:
                     if not get_reply:
-                        a = ComponentTypes[t](**m["data"])  # noqa: F405
+                        a = ComponentTypes[t](**m["data"])
                         abm.message.append(a)
                     else:
                         try:
@@ -267,8 +286,17 @@ class AiocqhttpAdapter(Platform):
                                 action="get_msg",
                                 message_id=int(m["data"]["id"]),
                             )
+                            # 添加必要的 post_type 字段，防止 Event.from_payload 报错
+                            reply_event_data["post_type"] = "message"
+                            new_event = Event.from_payload(reply_event_data)
+                            if not new_event:
+                                logger.error(
+                                    f"无法从回复消息数据构造 Event 对象: {reply_event_data}",
+                                )
+                                continue
                             abm_reply = await self._convert_handle_message_event(
-                                Event.from_payload(reply_event_data), get_reply=False
+                                new_event,
+                                get_reply=False,
                             )
 
                             reply_seg = Reply(
@@ -285,11 +313,63 @@ class AiocqhttpAdapter(Platform):
                             abm.message.append(reply_seg)
                         except BaseException as e:
                             logger.error(f"获取引用消息失败: {e}。")
-                            a = ComponentTypes[t](**m["data"])  # noqa: F405
+                            a = ComponentTypes[t](**m["data"])
                             abm.message.append(a)
+            elif t == "at":
+                first_at_self_processed = False
+                # Accumulate @ mention text for efficient concatenation
+                at_parts = []
+
+                for m in m_group:
+                    try:
+                        if m["data"]["qq"] == "all":
+                            abm.message.append(At(qq="all", name="全体成员"))
+                            continue
+
+                        at_info = await self.bot.call_action(
+                            action="get_group_member_info",
+                            group_id=event.group_id,
+                            user_id=int(m["data"]["qq"]),
+                            no_cache=False,
+                        )
+                        if at_info:
+                            nickname = at_info.get("card", "")
+                            if nickname == "":
+                                at_info = await self.bot.call_action(
+                                    action="get_stranger_info",
+                                    user_id=int(m["data"]["qq"]),
+                                    no_cache=False,
+                                )
+                                nickname = at_info.get("nick", "") or at_info.get(
+                                    "nickname",
+                                    "",
+                                )
+                            is_at_self = str(m["data"]["qq"]) in {abm.self_id, "all"}
+
+                            abm.message.append(
+                                At(
+                                    qq=m["data"]["qq"],
+                                    name=nickname,
+                                ),
+                            )
+
+                            if is_at_self and not first_at_self_processed:
+                                # 第一个@是机器人，不添加到message_str
+                                first_at_self_processed = True
+                            else:
+                                # 非第一个@机器人或@其他用户，添加到message_str
+                                at_parts.append(f" @{nickname}({m['data']['qq']}) ")
+                        else:
+                            abm.message.append(At(qq=str(m["data"]["qq"]), name=""))
+                    except ActionFailed as e:
+                        logger.error(f"获取 @ 用户信息失败: {e}，此消息段将被忽略。")
+                    except BaseException as e:
+                        logger.error(f"获取 @ 用户信息失败: {e}，此消息段将被忽略。")
+
+                message_str += "".join(at_parts)
             else:
                 for m in m_group:
-                    a = ComponentTypes[t](**m["data"])  # noqa: F405
+                    a = ComponentTypes[t](**m["data"])
                     abm.message.append(a)
 
         abm.timestamp = int(time.time())
@@ -301,7 +381,7 @@ class AiocqhttpAdapter(Platform):
     def run(self) -> Awaitable[Any]:
         if not self.host or not self.port:
             logger.warning(
-                "aiocqhttp: 未配置 ws_reverse_host 或 ws_reverse_port，将使用默认值：http://0.0.0.0:6199"
+                "aiocqhttp: 未配置 ws_reverse_host 或 ws_reverse_port，将使用默认值：http://0.0.0.0:6199",
             )
             self.host = "0.0.0.0"
             self.port = 6199

astrbot/core/platform/sources/dingtalk/dingtalk_adapter.py

@@ -1,25 +1,29 @@
 import asyncio
+import os
+import threading
 import uuid
+
 import aiohttp
 import dingtalk_stream
-import threading
+from dingtalk_stream import AckMessage
 
+from astrbot import logger
+from astrbot.api.event import MessageChain
+from astrbot.api.message_components import At, Image, Plain
 from astrbot.api.platform import (
-    Platform,
     AstrBotMessage,
     MessageMember,
     MessageType,
+    Platform,
     PlatformMetadata,
 )
-from astrbot.api.event import MessageChain
-from astrbot.api.message_components import Image, Plain, At
 from astrbot.core.platform.astr_message_event import MessageSesion
-from .dingtalk_event import DingtalkMessageEvent
-from ...register import register_platform_adapter
-from astrbot import logger
-from dingtalk_stream import AckMessage
+from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 from astrbot.core.utils.io import download_file
 
+from ...register import register_platform_adapter
+from .dingtalk_event import DingtalkMessageEvent
+
 
 class MyEventHandler(dingtalk_stream.EventHandler):
     async def process(self, event: dingtalk_stream.EventMessage):
@@ -33,10 +37,15 @@ class MyEventHandler(dingtalk_stream.EventHandler):
         return AckMessage.STATUS_OK, "OK"
 
 
-@register_platform_adapter("dingtalk", "钉钉机器人官方 API 适配器")
+@register_platform_adapter(
+    "dingtalk", "钉钉机器人官方 API 适配器", support_streaming_message=False
+)
 class DingtalkPlatformAdapter(Platform):
     def __init__(
-        self, platform_config: dict, platform_settings: dict, event_queue: asyncio.Queue
+        self,
+        platform_config: dict,
+        platform_settings: dict,
+        event_queue: asyncio.Queue,
     ) -> None:
         super().__init__(event_queue)
 
@@ -62,12 +71,23 @@ class DingtalkPlatformAdapter(Platform):
         client = dingtalk_stream.DingTalkStreamClient(credential, logger=logger)
         client.register_all_event_handler(MyEventHandler())
         client.register_callback_handler(
-            dingtalk_stream.ChatbotMessage.TOPIC, self.client
+            dingtalk_stream.ChatbotMessage.TOPIC,
+            self.client,
         )
         self.client_ = client  # 用于 websockets 的 client
 
+    def _id_to_sid(self, dingtalk_id: str | None) -> str | None:
+        if not dingtalk_id:
+            return dingtalk_id
+        prefix = "$:LWCP_v1:$"
+        if dingtalk_id.startswith(prefix):
+            return dingtalk_id[len(prefix) :]
+        return dingtalk_id
+
     async def send_by_session(
-        self, session: MessageSesion, message_chain: MessageChain
+        self,
+        session: MessageSesion,
+        message_chain: MessageChain,
     ):
         raise NotImplementedError("钉钉机器人适配器不支持 send_by_session")
 
@@ -76,10 +96,12 @@ class DingtalkPlatformAdapter(Platform):
             name="dingtalk",
             description="钉钉机器人官方 API 适配器",
             id=self.config.get("id"),
+            support_streaming_message=False,
         )
 
     async def convert_msg(
-        self, message: dingtalk_stream.ChatbotMessage
+        self,
+        message: dingtalk_stream.ChatbotMessage,
     ) -> AstrBotMessage:
         abm = AstrBotMessage()
         abm.message = []
@@ -91,15 +113,19 @@ class DingtalkPlatformAdapter(Platform):
             else MessageType.FRIEND_MESSAGE
         )
         abm.sender = MessageMember(
-            user_id=message.sender_id, nickname=message.sender_nick
+            user_id=self._id_to_sid(message.sender_id),
+            nickname=message.sender_nick,
         )
-        abm.self_id = message.chatbot_user_id
+        abm.self_id = self._id_to_sid(message.chatbot_user_id)
         abm.message_id = message.message_id
         abm.raw_message = message
 
         if abm.type == MessageType.GROUP_MESSAGE:
-            if message.is_in_at_list:
-                abm.message.append(At(qq=abm.self_id))
+            # 处理所有被 @ 的用户（包括机器人自己，因 at_users 已包含）
+            if message.at_users:
+                for user in message.at_users:
+                    if id := self._id_to_sid(user.dingtalk_id):
+                        abm.message.append(At(qq=id))
             abm.group_id = message.conversation_id
             if self.unique_session:
                 abm.session_id = abm.sender.user_id
@@ -134,7 +160,10 @@ class DingtalkPlatformAdapter(Platform):
         return abm  # 别忘了返回转换后的消息对象
 
     async def download_ding_file(
-        self, download_code: str, robot_code: str, ext: str
+        self,
+        download_code: str,
+        robot_code: str,
+        ext: str,
     ) -> str:
         """下载钉钉文件
 
@@ -152,21 +181,24 @@ class DingtalkPlatformAdapter(Platform):
             "downloadCode": download_code,
             "robotCode": robot_code,
         }
-        f_path = f"data/dingtalk_file_{uuid.uuid4()}.{ext}"
-        async with aiohttp.ClientSession() as session:
-            async with session.post(
+        temp_dir = os.path.join(get_astrbot_data_path(), "temp")
+        f_path = os.path.join(temp_dir, f"dingtalk_file_{uuid.uuid4()}.{ext}")
+        async with (
+            aiohttp.ClientSession() as session,
+            session.post(
                 "https://api.dingtalk.com/v1.0/robot/messageFiles/download",
                 headers=headers,
                 json=payload,
-            ) as resp:
-                if resp.status != 200:
-                    logger.error(
-                        f"下载钉钉文件失败: {resp.status}, {await resp.text()}"
-                    )
-                    return None
-                resp_data = await resp.json()
-                download_url = resp_data["data"]["downloadUrl"]
-                await download_file(download_url, f_path)
+            ) as resp,
+        ):
+            if resp.status != 200:
+                logger.error(
+                    f"下载钉钉文件失败: {resp.status}, {await resp.text()}",
+                )
+                return None
+            resp_data = await resp.json()
+            download_url = resp_data["data"]["downloadUrl"]
+            await download_file(download_url, f_path)
         return f_path
 
     async def get_access_token(self) -> str:
@@ -181,7 +213,7 @@ class DingtalkPlatformAdapter(Platform):
             ) as resp:
                 if resp.status != 200:
                     logger.error(
-                        f"获取钉钉机器人 access_token 失败: {resp.status}, {await resp.text()}"
+                        f"获取钉钉机器人 access_token 失败: {resp.status}, {await resp.text()}",
                     )
                     return None
                 return (await resp.json())["data"]["accessToken"]

astrbot/core/platform/sources/dingtalk/dingtalk_event.py

@@ -1,8 +1,10 @@
 import asyncio
+
 import dingtalk_stream
+
 import astrbot.api.message_components as Comp
-from astrbot.api.event import AstrMessageEvent, MessageChain
 from astrbot import logger
+from astrbot.api.event import AstrMessageEvent, MessageChain
 
 
 class DingtalkMessageEvent(AstrMessageEvent):
@@ -18,7 +20,9 @@ class DingtalkMessageEvent(AstrMessageEvent):
         self.client = client
 
     async def send_with_client(
-        self, client: dingtalk_stream.ChatbotHandler, message: MessageChain
+        self,
+        client: dingtalk_stream.ChatbotHandler,
+        message: MessageChain,
     ):
         for segment in message.chain:
             if isinstance(segment, Comp.Plain):
@@ -26,36 +30,36 @@ class DingtalkMessageEvent(AstrMessageEvent):
                 await asyncio.get_event_loop().run_in_executor(
                     None,
                     client.reply_markdown,
-                    "AstrBot",
+                    segment.text,
                     segment.text,
                     self.message_obj.raw_message,
                 )
             elif isinstance(segment, Comp.Image):
                 markdown_str = ""
-                if segment.file and segment.file.startswith("file:///"):
-                    logger.warning(
-                        "dingtalk only support url image, not: " + segment.file
-                    )
-                    continue
-                elif segment.file and segment.file.startswith("http"):
-                    markdown_str += f"![image]({segment.file})\n\n"
-                elif segment.file and segment.file.startswith("base64://"):
-                    logger.warning("dingtalk only support url image, not base64")
-                    continue
-                else:
-                    logger.warning(
-                        "dingtalk only support url image, not: " + segment.file
+
+                try:
+                    if not segment.file:
+                        logger.warning("钉钉图片 segment 缺少 file 字段，跳过")
+                        continue
+                    if segment.file.startswith(("http://", "https://")):
+                        image_url = segment.file
+                    else:
+                        image_url = await segment.register_to_file_service()
+
+                    markdown_str = f"![image]({image_url})\n\n"
+
+                    ret = await asyncio.get_event_loop().run_in_executor(
+                        None,
+                        client.reply_markdown,
+                        "😄",
+                        markdown_str,
+                        self.message_obj.raw_message,
                     )
-                    continue
+                    logger.debug(f"send image: {ret}")
 
-                ret = await asyncio.get_event_loop().run_in_executor(
-                    None,
-                    client.reply_markdown,
-                    "😄",
-                    markdown_str,
-                    self.message_obj.raw_message,
-                )
-                logger.debug(f"send image: {ret}")
+                except Exception as e:
+                    logger.warning(f"钉钉图片处理失败: {e}, 跳过图片发送")
+                    continue
 
     async def send(self, message: MessageChain):
         await self.send_with_client(self.client, message)
@@ -69,7 +73,7 @@ class DingtalkMessageEvent(AstrMessageEvent):
             else:
                 buffer.chain.extend(chain.chain)
         if not buffer:
-            return
+            return None
         buffer.squash_plain()
         await self.send(buffer)
         return await super().send_streaming(generator, use_fallback)