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

astrbot/core/platform/sources/misskey/misskey_event.py

@@ -1,19 +1,20 @@
 import asyncio
 import re
-from typing import AsyncGenerator
+from collections.abc import AsyncGenerator
+
 from astrbot.api import logger
 from astrbot.api.event import AstrMessageEvent, MessageChain
-from astrbot.api.platform import PlatformMetadata, AstrBotMessage
 from astrbot.api.message_components import Plain
+from astrbot.api.platform import AstrBotMessage, PlatformMetadata
 
 from .misskey_utils import (
-    serialize_message_chain,
-    resolve_visibility_from_raw_message,
-    is_valid_user_session_id,
-    is_valid_room_session_id,
     add_at_mention_if_needed,
-    extract_user_id_from_session_id,
     extract_room_id_from_session_id,
+    extract_user_id_from_session_id,
+    is_valid_room_session_id,
+    is_valid_user_session_id,
+    resolve_visibility_from_raw_message,
+    serialize_message_chain,
 )
 
 
@@ -43,7 +44,7 @@ class MisskeyPlatformEvent(AstrMessageEvent):
         """发送消息，使用适配器的完整上传和发送逻辑"""
         try:
             logger.debug(
-                f"[MisskeyEvent] send 方法被调用，消息链包含 {len(message.chain)} 个组件"
+                f"[MisskeyEvent] send 方法被调用，消息链包含 {len(message.chain)} 个组件",
             )
 
             # 使用适配器的 send_by_session 方法，它包含文件上传逻辑
@@ -65,7 +66,7 @@ class MisskeyPlatformEvent(AstrMessageEvent):
             )
 
             logger.debug(
-                f"[MisskeyEvent] 检查适配器方法: hasattr(self.client, 'send_by_session') = {hasattr(self.client, 'send_by_session')}"
+                f"[MisskeyEvent] 检查适配器方法: hasattr(self.client, 'send_by_session') = {hasattr(self.client, 'send_by_session')}",
             )
 
             # 调用适配器的 send_by_session 方法
@@ -88,25 +89,27 @@ class MisskeyPlatformEvent(AstrMessageEvent):
                     user_info = {
                         "username": user_data.get("username", ""),
                         "nickname": user_data.get(
-                            "name", user_data.get("username", "")
+                            "name",
+                            user_data.get("username", ""),
                         ),
                     }
                     content = add_at_mention_if_needed(content, user_info, has_at)
 
                 # 根据会话类型选择发送方式
                 if hasattr(self.client, "send_message") and is_valid_user_session_id(
-                    self.session_id
+                    self.session_id,
                 ):
                     user_id = extract_user_id_from_session_id(self.session_id)
                     await self.client.send_message(user_id, content)
                 elif hasattr(
-                    self.client, "send_room_message"
+                    self.client,
+                    "send_room_message",
                 ) and is_valid_room_session_id(self.session_id):
                     room_id = extract_room_id_from_session_id(self.session_id)
                     await self.client.send_room_message(room_id, content)
                 elif original_message_id and hasattr(self.client, "create_note"):
                     visibility, visible_user_ids = resolve_visibility_from_raw_message(
-                        raw_message
+                        raw_message,
                     )
                     await self.client.create_note(
                         content,
@@ -124,7 +127,9 @@ class MisskeyPlatformEvent(AstrMessageEvent):
             logger.error(f"[MisskeyEvent] 发送失败: {e}")
 
     async def send_streaming(
-        self, generator: AsyncGenerator[MessageChain, None], use_fallback: bool = False
+        self,
+        generator: AsyncGenerator[MessageChain, None],
+        use_fallback: bool = False,
     ):
         if not use_fallback:
             buffer = None
@@ -134,7 +139,7 @@ class MisskeyPlatformEvent(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/misskey/misskey_utils.py

@@ -1,6 +1,7 @@
 """Misskey 平台适配器通用工具函数"""
 
-from typing import Dict, Any, List, Tuple, Optional, Union
+from typing import Any
+
 import astrbot.api.message_components as Comp
 from astrbot.api.platform import AstrBotMessage, MessageMember, MessageType
 
@@ -9,7 +10,7 @@ class FileIDExtractor:
     """从 API 响应中提取文件 ID 的帮助类（无状态）。"""
 
     @staticmethod
-    def extract_file_id(result: Any) -> Optional[str]:
+    def extract_file_id(result: Any) -> str | None:
         if not isinstance(result, dict):
             return None
 
@@ -34,8 +35,10 @@ class MessagePayloadBuilder:
 
     @staticmethod
     def build_chat_payload(
-        user_id: str, text: Optional[str], file_id: Optional[str] = None
-    ) -> Dict[str, Any]:
+        user_id: str,
+        text: str | None,
+        file_id: str | None = None,
+    ) -> dict[str, Any]:
         payload = {"toUserId": user_id}
         if text:
             payload["text"] = text
@@ -45,8 +48,10 @@ class MessagePayloadBuilder:
 
     @staticmethod
     def build_room_payload(
-        room_id: str, text: Optional[str], file_id: Optional[str] = None
-    ) -> Dict[str, Any]:
+        room_id: str,
+        text: str | None,
+        file_id: str | None = None,
+    ) -> dict[str, Any]:
         payload = {"toRoomId": room_id}
         if text:
             payload["text"] = text
@@ -56,9 +61,11 @@ class MessagePayloadBuilder:
 
     @staticmethod
     def build_note_payload(
-        text: Optional[str], file_ids: Optional[List[str]] = None, **kwargs
-    ) -> Dict[str, Any]:
-        payload: Dict[str, Any] = {}
+        text: str | None,
+        file_ids: list[str] | None = None,
+        **kwargs,
+    ) -> dict[str, Any]:
+        payload: dict[str, Any] = {}
         if text:
             payload["text"] = text
         if file_ids:
@@ -67,7 +74,7 @@ class MessagePayloadBuilder:
         return payload
 
 
-def serialize_message_chain(chain: List[Any]) -> Tuple[str, bool]:
+def serialize_message_chain(chain: list[Any]) -> tuple[str, bool]:
     """将消息链序列化为文本字符串"""
     text_parts = []
     has_at = False
@@ -76,27 +83,25 @@ def serialize_message_chain(chain: List[Any]) -> Tuple[str, bool]:
         nonlocal has_at
         if isinstance(component, Comp.Plain):
             return component.text
-        elif isinstance(component, Comp.File):
+        if isinstance(component, Comp.File):
             # 为文件组件返回占位符，但适配器仍会处理原组件
             return "[文件]"
-        elif isinstance(component, Comp.Image):
+        if isinstance(component, Comp.Image):
             # 为图片组件返回占位符，但适配器仍会处理原组件
             return "[图片]"
-        elif isinstance(component, Comp.At):
+        if isinstance(component, Comp.At):
             has_at = True
             # 优先使用name字段（用户名），如果没有则使用qq字段
             # 这样可以避免在Misskey中生成 @<user_id> 这样的无效提及
             if hasattr(component, "name") and component.name:
                 return f"@{component.name}"
-            else:
-                return f"@{component.qq}"
-        elif hasattr(component, "text"):
+            return f"@{component.qq}"
+        if hasattr(component, "text"):
             text = getattr(component, "text", "")
             if "@" in text:
                 has_at = True
             return text
-        else:
-            return str(component)
+        return str(component)
 
     for component in chain:
         if isinstance(component, Comp.Node) and component.content:
@@ -113,12 +118,12 @@ def serialize_message_chain(chain: List[Any]) -> Tuple[str, bool]:
 
 
 def resolve_message_visibility(
-    user_id: Optional[str] = None,
-    user_cache: Optional[Dict[str, Any]] = None,
-    self_id: Optional[str] = None,
-    raw_message: Optional[Dict[str, Any]] = None,
+    user_id: str | None = None,
+    user_cache: dict[str, Any] | None = None,
+    self_id: str | None = None,
+    raw_message: dict[str, Any] | None = None,
     default_visibility: str = "public",
-) -> Tuple[str, Optional[List[str]]]:
+) -> tuple[str, list[str] | None]:
     """解析 Misskey 消息的可见性设置
 
     可以从 user_cache 或 raw_message 中解析，支持两种调用方式：
@@ -169,13 +174,14 @@ def resolve_message_visibility(
 
 # 保留旧函数名作为向后兼容的别名
 def resolve_visibility_from_raw_message(
-    raw_message: Dict[str, Any], self_id: Optional[str] = None
-) -> Tuple[str, Optional[List[str]]]:
+    raw_message: dict[str, Any],
+    self_id: str | None = None,
+) -> tuple[str, list[str] | None]:
     """从原始消息数据中解析可见性设置（已弃用，使用 resolve_message_visibility 替代）"""
     return resolve_message_visibility(raw_message=raw_message, self_id=self_id)
 
 
-def is_valid_user_session_id(session_id: Union[str, Any]) -> bool:
+def is_valid_user_session_id(session_id: str | Any) -> bool:
     """检查 session_id 是否是有效的聊天用户 session_id (仅限chat%前缀)"""
     if not isinstance(session_id, str) or "%" not in session_id:
         return False
@@ -189,7 +195,7 @@ def is_valid_user_session_id(session_id: Union[str, Any]) -> bool:
     )
 
 
-def is_valid_room_session_id(session_id: Union[str, Any]) -> bool:
+def is_valid_room_session_id(session_id: str | Any) -> bool:
     """检查 session_id 是否是有效的房间 session_id (仅限room%前缀)"""
     if not isinstance(session_id, str) or "%" not in session_id:
         return False
@@ -203,7 +209,7 @@ def is_valid_room_session_id(session_id: Union[str, Any]) -> bool:
     )
 
 
-def is_valid_chat_session_id(session_id: Union[str, Any]) -> bool:
+def is_valid_chat_session_id(session_id: str | Any) -> bool:
     """检查 session_id 是否是有效的聊天 session_id (仅限chat%前缀)"""
     if not isinstance(session_id, str) or "%" not in session_id:
         return False
@@ -236,7 +242,9 @@ def extract_room_id_from_session_id(session_id: str) -> str:
 
 
 def add_at_mention_if_needed(
-    text: str, user_info: Optional[Dict[str, Any]], has_at: bool = False
+    text: str,
+    user_info: dict[str, Any] | None,
+    has_at: bool = False,
 ) -> str:
     """如果需要且没有@用户，则添加@用户
 
@@ -258,7 +266,7 @@ def add_at_mention_if_needed(
     return text
 
 
-def create_file_component(file_info: Dict[str, Any]) -> Tuple[Any, str]:
+def create_file_component(file_info: dict[str, Any]) -> tuple[Any, str]:
     """创建文件组件和描述文本"""
     file_url = file_info.get("url", "")
     file_name = file_info.get("name", "未知文件")
@@ -266,16 +274,17 @@ def create_file_component(file_info: Dict[str, Any]) -> Tuple[Any, str]:
 
     if file_type.startswith("image/"):
         return Comp.Image(url=file_url, file=file_name), f"图片[{file_name}]"
-    elif file_type.startswith("audio/"):
+    if file_type.startswith("audio/"):
         return Comp.Record(url=file_url, file=file_name), f"音频[{file_name}]"
-    elif file_type.startswith("video/"):
+    if file_type.startswith("video/"):
         return Comp.Video(url=file_url, file=file_name), f"视频[{file_name}]"
-    else:
-        return Comp.File(name=file_name, url=file_url), f"文件[{file_name}]"
+    return Comp.File(name=file_name, url=file_url), f"文件[{file_name}]"
 
 
 def process_files(
-    message: AstrBotMessage, files: list, include_text_parts: bool = True
+    message: AstrBotMessage,
+    files: list,
+    include_text_parts: bool = True,
 ) -> list:
     """处理文件列表，添加到消息组件中并返回文本描述"""
     file_parts = []
@@ -287,7 +296,7 @@ def process_files(
     return file_parts
 
 
-def format_poll(poll: Dict[str, Any]) -> str:
+def format_poll(poll: dict[str, Any]) -> str:
     """将 Misskey 的 poll 对象格式化为可读字符串。"""
     if not poll or not isinstance(poll, dict):
         return ""
@@ -304,8 +313,9 @@ def format_poll(poll: Dict[str, Any]) -> str:
 
 
 def extract_sender_info(
-    raw_data: Dict[str, Any], is_chat: bool = False
-) -> Dict[str, Any]:
+    raw_data: dict[str, Any],
+    is_chat: bool = False,
+) -> dict[str, Any]:
     """提取发送者信息"""
     if is_chat:
         sender = raw_data.get("fromUser", {})
@@ -323,11 +333,11 @@ def extract_sender_info(
 
 
 def create_base_message(
-    raw_data: Dict[str, Any],
-    sender_info: Dict[str, Any],
+    raw_data: dict[str, Any],
+    sender_info: dict[str, Any],
     client_self_id: str,
     is_chat: bool = False,
-    room_id: Optional[str] = None,
+    room_id: str | None = None,
     unique_session: bool = False,
 ) -> AstrBotMessage:
     """创建基础消息对象"""
@@ -366,8 +376,11 @@ def create_base_message(
 
 
 def process_at_mention(
-    message: AstrBotMessage, raw_text: str, bot_username: str, client_self_id: str
-) -> Tuple[List[str], str]:
+    message: AstrBotMessage,
+    raw_text: str,
+    bot_username: str,
+    client_self_id: str,
+) -> tuple[list[str], str]:
     """处理@提及逻辑，返回消息部分列表和处理后的文本"""
     message_parts = []
 
@@ -382,16 +395,15 @@ def process_at_mention(
             message.message.append(Comp.Plain(remaining_text))
             message_parts.append(remaining_text)
         return message_parts, remaining_text
-    else:
-        message.message.append(Comp.Plain(raw_text))
-        message_parts.append(raw_text)
-        return message_parts, raw_text
+    message.message.append(Comp.Plain(raw_text))
+    message_parts.append(raw_text)
+    return message_parts, raw_text
 
 
 def cache_user_info(
-    user_cache: Dict[str, Any],
-    sender_info: Dict[str, Any],
-    raw_data: Dict[str, Any],
+    user_cache: dict[str, Any],
+    sender_info: dict[str, Any],
+    raw_data: dict[str, Any],
     client_self_id: str,
     is_chat: bool = False,
 ):
@@ -417,7 +429,9 @@ def cache_user_info(
 
 
 def cache_room_info(
-    user_cache: Dict[str, Any], raw_data: Dict[str, Any], client_self_id: str
+    user_cache: dict[str, Any],
+    raw_data: dict[str, Any],
+    client_self_id: str,
 ):
     """缓存房间信息"""
     room_data = raw_data.get("toRoom")
@@ -437,7 +451,7 @@ def cache_room_info(
 
 async def resolve_component_url_or_path(
     comp: Any,
-) -> Tuple[Optional[str], Optional[str]]:
+) -> tuple[str | None, str | None]:
     """尝试从组件解析可上传的远程 URL 或本地路径。
 
     返回 (url_candidate, local_path)。两者可能都为 None。
@@ -468,8 +482,7 @@ async def resolve_component_url_or_path(
                     if value.startswith("http"):
                         url_candidate = value
                         break
-                    else:
-                        local_path = value
+                    local_path = value
             except Exception:
                 continue
 
@@ -491,9 +504,8 @@ async def resolve_component_url_or_path(
                         if value.startswith("http"):
                             url_candidate = value
                             break
-                        else:
-                            local_path = value
-                            break
+                        local_path = value
+                        break
                 except Exception:
                     continue
 
@@ -503,7 +515,7 @@ async def resolve_component_url_or_path(
     return url_candidate, local_path
 
 
-def summarize_component_for_log(comp: Any) -> Dict[str, Any]:
+def summarize_component_for_log(comp: Any) -> dict[str, Any]:
     """生成适合日志的组件属性字典（尽量不抛异常）。"""
     attrs = {}
     for a in ("file", "url", "path", "src", "source", "name"):
@@ -519,15 +531,15 @@ def summarize_component_for_log(comp: Any) -> Dict[str, Any]:
 async def upload_local_with_retries(
     api: Any,
     local_path: str,
-    preferred_name: Optional[str],
-    folder_id: Optional[str],
-) -> Optional[str]:
+    preferred_name: str | None,
+    folder_id: str | None,
+) -> str | None:
     """尝试本地上传，返回 file id 或 None。如果文件类型不允许则直接失败。"""
     try:
         res = await api.upload_file(local_path, preferred_name, folder_id)
         if isinstance(res, dict):
             fid = res.get("id") or (res.get("raw") or {}).get("createdFile", {}).get(
-                "id"
+                "id",
             )
             if fid:
                 return str(fid)

astrbot/core/platform/sources/qqofficial/qqofficial_message_event.py

@@ -1,25 +1,26 @@
+import asyncio
+import base64
+import os
+import random
+import uuid
+
+import aiofiles
 import botpy
 import botpy.message
 import botpy.types
 import botpy.types.message
-import asyncio
-import base64
-import aiofiles
-from astrbot.core.utils.io import file_to_base64, download_image_by_url
-from astrbot.core.utils.tencent_record_helper import wav_to_tencent_silk
-from astrbot.core.utils.astrbot_path import get_astrbot_data_path
-from astrbot.api.event import AstrMessageEvent, MessageChain
-from astrbot.api.platform import AstrBotMessage, PlatformMetadata
-from astrbot.api.message_components import Plain, Image, Record
 from botpy import Client
 from botpy.http import Route
-from astrbot.api import logger
-from botpy.types.message import Media
 from botpy.types import message
-from typing import Optional
-import random
-import uuid
-import os
+from botpy.types.message import Media
+
+from astrbot.api import logger
+from astrbot.api.event import AstrMessageEvent, MessageChain
+from astrbot.api.message_components import Image, Plain, Record
+from astrbot.api.platform import AstrBotMessage, PlatformMetadata
+from astrbot.core.utils.astrbot_path import get_astrbot_data_path
+from astrbot.core.utils.io import download_image_by_url, file_to_base64
+from astrbot.core.utils.tencent_record_helper import wav_to_tencent_silk
 
 
 class QQOfficialMessageEvent(AstrMessageEvent):
@@ -75,9 +76,9 @@ class QQOfficialMessageEvent(AstrMessageEvent):
 
         return await super().send_streaming(generator, use_fallback)
 
-    async def _post_send(self, stream: dict = None):
+    async def _post_send(self, stream: dict | None = None):
         if not self.send_buffer:
-            return
+            return None
 
         source = self.message_obj.raw_message
         assert isinstance(
@@ -103,7 +104,7 @@ class QQOfficialMessageEvent(AstrMessageEvent):
             and not image_path
             and not record_file_path
         ):
-            return
+            return None
 
         payload = {
             "content": plain_text,
@@ -119,29 +120,38 @@ class QQOfficialMessageEvent(AstrMessageEvent):
             case botpy.message.GroupMessage:
                 if image_base64:
                     media = await self.upload_group_and_c2c_image(
-                        image_base64, 1, group_openid=source.group_openid
+                        image_base64,
+                        1,
+                        group_openid=source.group_openid,
                     )
                     payload["media"] = media
                     payload["msg_type"] = 7
                 if record_file_path:  # group record msg
                     media = await self.upload_group_and_c2c_record(
-                        record_file_path, 3, group_openid=source.group_openid
+                        record_file_path,
+                        3,
+                        group_openid=source.group_openid,
                     )
                     payload["media"] = media
                     payload["msg_type"] = 7
                 ret = await self.bot.api.post_group_message(
-                    group_openid=source.group_openid, **payload
+                    group_openid=source.group_openid,
+                    **payload,
                 )
             case botpy.message.C2CMessage:
                 if image_base64:
                     media = await self.upload_group_and_c2c_image(
-                        image_base64, 1, openid=source.author.user_openid
+                        image_base64,
+                        1,
+                        openid=source.author.user_openid,
                     )
                     payload["media"] = media
                     payload["msg_type"] = 7
                 if record_file_path:  # c2c record
                     media = await self.upload_group_and_c2c_record(
-                        record_file_path, 3, openid=source.author.user_openid
+                        record_file_path,
+                        3,
+                        openid=source.author.user_openid,
                     )
                     payload["media"] = media
                     payload["msg_type"] = 7
@@ -153,14 +163,16 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                     )
                 else:
                     ret = await self.post_c2c_message(
-                        openid=source.author.user_openid, **payload
+                        openid=source.author.user_openid,
+                        **payload,
                     )
                 logger.debug(f"Message sent to C2C: {ret}")
             case botpy.message.Message:
                 if image_path:
                     payload["file_image"] = image_path
                 ret = await self.bot.api.post_message(
-                    channel_id=source.channel_id, **payload
+                    channel_id=source.channel_id,
+                    **payload,
                 )
             case botpy.message.DirectMessage:
                 if image_path:
@@ -174,7 +186,10 @@ class QQOfficialMessageEvent(AstrMessageEvent):
         return ret
 
     async def upload_group_and_c2c_image(
-        self, image_base64: str, file_type: int, **kwargs
+        self,
+        image_base64: str,
+        file_type: int,
+        **kwargs,
     ) -> botpy.types.message.Media:
         payload = {
             "file_data": image_base64,
@@ -185,7 +200,7 @@ class QQOfficialMessageEvent(AstrMessageEvent):
             payload["openid"] = kwargs["openid"]
             route = Route("POST", "/v2/users/{openid}/files", openid=kwargs["openid"])
             return await self.bot.api._http.request(route, json=payload)
-        elif "group_openid" in kwargs:
+        if "group_openid" in kwargs:
             payload["group_openid"] = kwargs["group_openid"]
             route = Route(
                 "POST",
@@ -195,11 +210,13 @@ class QQOfficialMessageEvent(AstrMessageEvent):
             return await self.bot.api._http.request(route, json=payload)
 
     async def upload_group_and_c2c_record(
-        self, file_source: str, file_type: int, srv_send_msg: bool = False, **kwargs
-    ) -> Optional[Media]:
-        """
-        上传媒体文件
-        """
+        self,
+        file_source: str,
+        file_type: int,
+        srv_send_msg: bool = False,
+        **kwargs,
+    ) -> Media | None:
+        """上传媒体文件"""
         # 构建基础payload
         payload = {"file_type": file_type, "srv_send_msg": srv_send_msg}
 
@@ -248,17 +265,17 @@ class QQOfficialMessageEvent(AstrMessageEvent):
         self,
         openid: str,
         msg_type: int = 0,
-        content: str = None,
-        embed: message.Embed = None,
-        ark: message.Ark = None,
-        message_reference: message.Reference = None,
-        media: message.Media = None,
-        msg_id: str = None,
+        content: str | None = None,
+        embed: message.Embed | None = None,
+        ark: message.Ark | None = None,
+        message_reference: message.Reference | None = None,
+        media: message.Media | None = None,
+        msg_id: str | None = None,
         msg_seq: str = 1,
-        event_id: str = None,
-        markdown: message.MarkdownPayload = None,
-        keyboard: message.Keyboard = None,
-        stream: dict = None,
+        event_id: str | None = None,
+        markdown: message.MarkdownPayload | None = None,
+        keyboard: message.Keyboard | None = None,
+        stream: dict | None = None,
     ) -> message.Message:
         payload = locals()
         payload.pop("self", None)
@@ -291,11 +308,13 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                     record_wav_path = await i.convert_to_file_path()  # wav 路径
                     temp_dir = os.path.join(get_astrbot_data_path(), "temp")
                     record_tecent_silk_path = os.path.join(
-                        temp_dir, f"{uuid.uuid4()}.silk"
+                        temp_dir,
+                        f"{uuid.uuid4()}.silk",
                     )
                     try:
                         duration = await wav_to_tencent_silk(
-                            record_wav_path, record_tecent_silk_path
+                            record_wav_path,
+                            record_tecent_silk_path,
                         )
                         if duration > 0:
                             record_file_path = record_tecent_silk_path