AstrBot 4.5.0__py3-none-any.whl → 4.5.2__py3-none-any.whl

astrbot/core/platform/register.py

@@ -1,19 +1,19 @@
-from typing import List, Dict, Type
-from .platform_metadata import PlatformMetadata
 from astrbot.core import logger
 
-platform_registry: List[PlatformMetadata] = []
+from .platform_metadata import PlatformMetadata
+
+platform_registry: list[PlatformMetadata] = []
 """维护了通过装饰器注册的平台适配器"""
-platform_cls_map: Dict[str, Type] = {}
+platform_cls_map: dict[str, type] = {}
 """维护了平台适配器名称和适配器类的映射"""
 
 
 def register_platform_adapter(
     adapter_name: str,
     desc: str,
-    default_config_tmpl: dict = None,
-    adapter_display_name: str = None,
-    logo_path: str = None,
+    default_config_tmpl: dict | None = None,
+    adapter_display_name: str | None = None,
+    logo_path: str | None = None,
 ):
     """用于注册平台适配器的带参装饰器。
 
@@ -24,7 +24,7 @@ def register_platform_adapter(
     def decorator(cls):
         if adapter_name in platform_cls_map:
             raise ValueError(
-                f"平台适配器 {adapter_name} 已经注册过了，可能发生了适配器命名冲突。"
+                f"平台适配器 {adapter_name} 已经注册过了，可能发生了适配器命名冲突。",
             )
 
         # 添加必备选项

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

@@ -1,24 +1,31 @@
 import asyncio
 import re
-from typing import AsyncGenerator, Dict, List
+from collections.abc import AsyncGenerator
+
 from aiocqhttp import CQHttp, Event
+
 from astrbot.api.event import AstrMessageEvent, MessageChain
 from astrbot.api.message_components import (
+    BaseMessageComponent,
+    File,
     Image,
     Node,
     Nodes,
     Plain,
     Record,
     Video,
-    File,
-    BaseMessageComponent,
 )
 from astrbot.api.platform import Group, MessageMember
 
 
 class AiocqhttpMessageEvent(AstrMessageEvent):
     def __init__(
-        self, message_str, message_obj, platform_meta, session_id, bot: CQHttp
+        self,
+        message_str,
+        message_obj,
+        platform_meta,
+        session_id,
+        bot: CQHttp,
     ):
         super().__init__(message_str, message_obj, platform_meta, session_id)
         self.bot = bot
@@ -35,16 +42,15 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
                     "file": f"base64://{bs64}",
                 },
             }
-        elif isinstance(segment, File):
+        if isinstance(segment, File):
             # For File segments, we need to handle the file differently
             d = await segment.to_dict()
             return d
-        elif isinstance(segment, Video):
+        if isinstance(segment, Video):
             d = await segment.to_dict()
             return d
-        else:
-            # For other segments, we simply convert them to a dict by calling toDict
-            return segment.toDict()
+        # For other segments, we simply convert them to a dict by calling toDict
+        return segment.toDict()
 
     @staticmethod
     async def _parse_onebot_json(message_chain: MessageChain):
@@ -78,7 +84,7 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
             await bot.send(event=event, message=messages)
         else:
             raise ValueError(
-                f"无法发送消息：缺少有效的数字 session_id({session_id}) 或 event({event})"
+                f"无法发送消息：缺少有效的数字 session_id({session_id}) 或 event({event})",
             )
 
     @classmethod
@@ -88,7 +94,7 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
         message_chain: MessageChain,
         event: Event | None = None,
         is_group: bool = False,
-        session_id: str = None,
+        session_id: str | None = None,
     ):
         """发送消息至 QQ 协议端（aiocqhttp）。
 
@@ -98,8 +104,8 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
             event (Event | None, optional): aiocqhttp 事件对象.
             is_group (bool, optional): 是否为群消息.
             session_id (str | None, optional): 会话 ID（群号或 QQ 号
-        """
 
+        """
         # 转发消息、文件消息不能和普通消息混在一起发送
         send_one_by_one = any(
             isinstance(seg, (Node, Nodes, File)) for seg in message_chain.chain
@@ -152,7 +158,9 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
         await super().send(message)
 
     async def send_streaming(
-        self, generator: AsyncGenerator, use_fallback: bool = False
+        self,
+        generator: AsyncGenerator,
+        use_fallback: bool = False,
     ):
         if not use_fallback:
             buffer = None
@@ -162,7 +170,7 @@ class AiocqhttpMessageEvent(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)
@@ -198,7 +206,7 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
             group_id=group_id,
         )
 
-        members: List[Dict] = await self.bot.call_action(
+        members: list[dict] = await self.bot.call_action(
             "get_group_member_list",
             group_id=group_id,
         )

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

@@ -1,33 +1,41 @@
-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。",
 )
 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)
 
@@ -48,7 +56,7 @@ class AiocqhttpAdapter(Platform):
             import_name="aiocqhttp",
             api_timeout_sec=180,
             access_token=platform_config.get(
-                "ws_reverse_token"
+                "ws_reverse_token",
             ),  # 以防旧版本配置不存在
         )
 
@@ -81,7 +89,9 @@ 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,
     ):
         is_group = session.message_type == MessageType.GROUP_MESSAGE
         if is_group:
@@ -97,14 +107,14 @@ class AiocqhttpAdapter(Platform):
         )
         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
+                return None
         elif event["post_type"] == "notice":
             abm = await self._convert_handle_notice_event(event)
         elif event["post_type"] == "request":
@@ -118,7 +128,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:
@@ -144,7 +154,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:
@@ -167,12 +177,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 消息类事件
 
@@ -207,13 +219,13 @@ 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"]):
@@ -224,7 +236,7 @@ class AiocqhttpAdapter(Platform):
                     # 如果文本段为空，则跳过
                     continue
                 message_str += current_text
-                a = ComponentTypes[t](text=current_text)  # noqa: F405
+                a = ComponentTypes[t](text=current_text)
                 abm.message.append(a)
 
             elif t == "file":
@@ -264,7 +276,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:
@@ -277,11 +289,12 @@ class AiocqhttpAdapter(Platform):
                             new_event = Event.from_payload(reply_event_data)
                             if not new_event:
                                 logger.error(
-                                    f"无法从回复消息数据构造 Event 对象: {reply_event_data}"
+                                    f"无法从回复消息数据构造 Event 对象: {reply_event_data}",
                                 )
                                 continue
                             abm_reply = await self._convert_handle_message_event(
-                                new_event, get_reply=False
+                                new_event,
+                                get_reply=False,
                             )
 
                             reply_seg = Reply(
@@ -298,10 +311,12 @@ 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:
@@ -324,7 +339,8 @@ class AiocqhttpAdapter(Platform):
                                     no_cache=False,
                                 )
                                 nickname = at_info.get("nick", "") or at_info.get(
-                                    "nickname", ""
+                                    "nickname",
+                                    "",
                                 )
                             is_at_self = str(m["data"]["qq"]) in {abm.self_id, "all"}
 
@@ -332,7 +348,7 @@ class AiocqhttpAdapter(Platform):
                                 At(
                                     qq=m["data"]["qq"],
                                     name=nickname,
-                                )
+                                ),
                             )
 
                             if is_at_self and not first_at_self_processed:
@@ -340,16 +356,18 @@ class AiocqhttpAdapter(Platform):
                                 first_at_self_processed = True
                             else:
                                 # 非第一个@机器人或@其他用户，添加到message_str
-                                message_str += f" @{nickname}({m['data']['qq']}) "
+                                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())
@@ -361,7 +379,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,26 +1,28 @@
 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.io import download_file
 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):
@@ -38,7 +40,10 @@ class MyEventHandler(dingtalk_stream.EventHandler):
 @register_platform_adapter("dingtalk", "钉钉机器人官方 API 适配器")
 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)
 
@@ -64,12 +69,15 @@ 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
 
     async def send_by_session(
-        self, session: MessageSesion, message_chain: MessageChain
+        self,
+        session: MessageSesion,
+        message_chain: MessageChain,
     ):
         raise NotImplementedError("钉钉机器人适配器不支持 send_by_session")
 
@@ -81,7 +89,8 @@ class DingtalkPlatformAdapter(Platform):
         )
 
     async def convert_msg(
-        self, message: dingtalk_stream.ChatbotMessage
+        self,
+        message: dingtalk_stream.ChatbotMessage,
     ) -> AstrBotMessage:
         abm = AstrBotMessage()
         abm.message = []
@@ -93,15 +102,19 @@ class DingtalkPlatformAdapter(Platform):
             else MessageType.FRIEND_MESSAGE
         )
         abm.sender = MessageMember(
-            user_id=message.sender_id, nickname=message.sender_nick
+            user_id=message.sender_id,
+            nickname=message.sender_nick,
         )
         abm.self_id = 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 user.dingtalk_id:
+                        abm.message.append(At(qq=user.dingtalk_id))
             abm.group_id = message.conversation_id
             if self.unique_session:
                 abm.session_id = abm.sender.user_id
@@ -136,7 +149,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:
         """下载钉钉文件
 
@@ -156,20 +172,22 @@ class DingtalkPlatformAdapter(Platform):
         }
         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:
-            async with session.post(
+        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:
@@ -184,7 +202,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):
@@ -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)

astrbot/core/platform/sources/discord/client.py

@@ -1,6 +1,8 @@
+import sys
+
 import discord
+
 from astrbot import logger
-import sys
 
 if sys.version_info >= (3, 12):
     from typing import override
@@ -12,7 +14,7 @@ else:
 class DiscordBotClient(discord.Bot):
     """Discord客户端封装"""
 
-    def __init__(self, token: str, proxy: str = None):
+    def __init__(self, token: str, proxy: str | None = None):
         self.token = token
         self.proxy = proxy
 
@@ -41,7 +43,8 @@ class DiscordBotClient(discord.Bot):
                 await self.on_ready_once_callback()
             except Exception as e:
                 logger.error(
-                    f"[Discord] on_ready_once_callback 执行失败: {e}", exc_info=True
+                    f"[Discord] on_ready_once_callback 执行失败: {e}",
+                    exc_info=True,
                 )
 
     def _create_message_data(self, message: discord.Message) -> dict:
@@ -84,7 +87,7 @@ class DiscordBotClient(discord.Bot):
             return
 
         logger.debug(
-            f"[Discord] 收到原始消息 from {message.author.name}: {message.content}"
+            f"[Discord] 收到原始消息 from {message.author.name}: {message.content}",
         )
 
         if self.on_message_received:
@@ -103,12 +106,12 @@ class DiscordBotClient(discord.Bot):
             command_name = interaction_data.get("name", "")
             if options := interaction_data.get("options", []):
                 params = " ".join(
-                    [f"{opt['name']}:{opt.get('value', '')}" for opt in options]
+                    [f"{opt['name']}:{opt.get('value', '')}" for opt in options],
                 )
                 return f"/{command_name} {params}"
             return f"/{command_name}"
 
-        elif interaction_type == discord.InteractionType.component:
+        if interaction_type == discord.InteractionType.component:
             custom_id = interaction_data.get("custom_id", "")
             component_type = interaction_data.get("component_type", "")
             return f"component:{custom_id}:{component_type}"