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

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

@@ -1,17 +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
-from astrbot.core.utils.io import file_to_base64, download_image_by_url
-from astrbot.api.event import AstrMessageEvent, MessageChain
-from astrbot.api.platform import AstrBotMessage, PlatformMetadata
-from astrbot.api.message_components import Plain, Image
 from botpy import Client
 from botpy.http import Route
-from astrbot.api import logger
 from botpy.types import message
-import random
+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):
@@ -28,16 +37,15 @@ class QQOfficialMessageEvent(AstrMessageEvent):
         self.send_buffer = None
 
     async def send(self, message: MessageChain):
-        if not self.send_buffer:
-            self.send_buffer = message
-        else:
-            self.send_buffer.chain.extend(message.chain)
+        self.send_buffer = message
+        await self._post_send()
 
     async def send_streaming(self, generator, use_fallback: bool = False):
         """流式输出仅支持消息列表私聊"""
         stream_payload = {"state": 1, "id": None, "index": 0, "reset": False}
         last_edit_time = 0  # 上次编辑消息的时间
         throttle_interval = 1  # 编辑消息的间隔时间 (秒)
+        ret = None
         try:
             async for chain in generator:
                 source = self.message_obj.raw_message
@@ -68,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(
@@ -87,10 +95,16 @@ class QQOfficialMessageEvent(AstrMessageEvent):
             plain_text,
             image_base64,
             image_path,
+            record_file_path,
         ) = await QQOfficialMessageEvent._parse_to_qqofficial(self.send_buffer)
 
-        if not plain_text and not image_base64 and not image_path:
-            return
+        if (
+            not plain_text
+            and not image_base64
+            and not image_path
+            and not record_file_path
+        ):
+            return None
 
         payload = {
             "content": plain_text,
@@ -100,21 +114,44 @@ class QQOfficialMessageEvent(AstrMessageEvent):
         if not isinstance(source, (botpy.message.Message, botpy.message.DirectMessage)):
             payload["msg_seq"] = random.randint(1, 10000)
 
+        ret = None
+
         match type(source):
             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,
                     )
                     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,
                     )
                     payload["media"] = media
                     payload["msg_type"] = 7
@@ -126,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:
@@ -147,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,
@@ -158,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",
@@ -167,21 +209,73 @@ 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,
+    ) -> Media | None:
+        """上传媒体文件"""
+        # 构建基础payload
+        payload = {"file_type": file_type, "srv_send_msg": srv_send_msg}
+
+        # 处理文件数据
+        if os.path.exists(file_source):
+            # 读取本地文件
+            async with aiofiles.open(file_source, "rb") as f:
+                file_content = await f.read()
+                # use base64 encode
+                payload["file_data"] = base64.b64encode(file_content).decode("utf-8")
+        else:
+            # 使用URL
+            payload["url"] = file_source
+
+        # 添加接收者信息和确定路由
+        if "openid" in kwargs:
+            payload["openid"] = kwargs["openid"]
+            route = Route("POST", "/v2/users/{openid}/files", openid=kwargs["openid"])
+        elif "group_openid" in kwargs:
+            payload["group_openid"] = kwargs["group_openid"]
+            route = Route(
+                "POST",
+                "/v2/groups/{group_openid}/files",
+                group_openid=kwargs["group_openid"],
+            )
+        else:
+            return None
+
+        try:
+            # 使用底层HTTP请求
+            result = await self.bot.api._http.request(route, json=payload)
+
+            if result:
+                return Media(
+                    file_uuid=result.get("file_uuid"),
+                    file_info=result.get("file_info"),
+                    ttl=result.get("ttl", 0),
+                    file_id=result.get("id", ""),
+                )
+        except Exception as e:
+            logger.error(f"上传请求错误: {e}")
+
+        return None
+
     async def post_c2c_message(
         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)
@@ -193,6 +287,7 @@ class QQOfficialMessageEvent(AstrMessageEvent):
         plain_text = ""
         image_base64 = None  # only one img supported
         image_file_path = None
+        record_file_path = None
         for i in message.chain:
             if isinstance(i, Plain):
                 plain_text += i.text
@@ -208,6 +303,27 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                 else:
                     image_base64 = file_to_base64(i.file)
                 image_base64 = image_base64.removeprefix("base64://")
+            elif isinstance(i, Record):
+                if i.file:
+                    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",
+                    )
+                    try:
+                        duration = await wav_to_tencent_silk(
+                            record_wav_path,
+                            record_tecent_silk_path,
+                        )
+                        if duration > 0:
+                            record_file_path = record_tecent_silk_path
+                        else:
+                            record_file_path = None
+                            logger.error("转换音频格式时出错：音频时长不大于0")
+                    except Exception as e:
+                        logger.error(f"处理语音时出错: {e}")
+                        record_file_path = None
             else:
                 logger.debug(f"qq_official 忽略 {i.type}")
-        return plain_text, image_base64, image_file_path
+        return plain_text, image_base64, image_file_path, record_file_path

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

@@ -1,30 +1,31 @@
 from __future__ import annotations
 
-import botpy
+import asyncio
 import logging
+import os
 import time
-import asyncio
+
+import botpy
 import botpy.message
 import botpy.types
 import botpy.types.message
-import os
-
 from botpy import Client
+
+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 import logger
-from astrbot.api.event import MessageChain
-from typing import Union, List
-from astrbot.api.message_components import Image, Plain, At
+from astrbot.core.message.components import BaseMessageComponent
 from astrbot.core.platform.astr_message_event import MessageSesion
-from .qqofficial_message_event import QQOfficialMessageEvent
+
 from ...register import register_platform_adapter
-from astrbot.core.message.components import BaseMessageComponent
+from .qqofficial_message_event import QQOfficialMessageEvent
 
 # remove logger handler
 for handler in logging.root.handlers[:]:
@@ -33,13 +34,14 @@ for handler in logging.root.handlers[:]:
 
 # QQ 机器人官方框架
 class botClient(Client):
-    def set_platform(self, platform: "QQOfficialPlatformAdapter"):
+    def set_platform(self, platform: QQOfficialPlatformAdapter):
         self.platform = platform
 
     # 收到群消息
     async def on_group_at_message_create(self, message: botpy.message.GroupMessage):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.GROUP_MESSAGE
+            message,
+            MessageType.GROUP_MESSAGE,
         )
         abm.session_id = (
             abm.sender.user_id if self.platform.unique_session else message.group_openid
@@ -49,7 +51,8 @@ class botClient(Client):
     # 收到频道消息
     async def on_at_message_create(self, message: botpy.message.Message):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.GROUP_MESSAGE
+            message,
+            MessageType.GROUP_MESSAGE,
         )
         abm.session_id = (
             abm.sender.user_id if self.platform.unique_session else message.channel_id
@@ -59,7 +62,8 @@ class botClient(Client):
     # 收到私聊消息
     async def on_direct_message_create(self, message: botpy.message.DirectMessage):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.FRIEND_MESSAGE
+            message,
+            MessageType.FRIEND_MESSAGE,
         )
         abm.session_id = abm.sender.user_id
         self._commit(abm)
@@ -67,7 +71,8 @@ class botClient(Client):
     # 收到 C2C 消息
     async def on_c2c_message_create(self, message: botpy.message.C2CMessage):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.FRIEND_MESSAGE
+            message,
+            MessageType.FRIEND_MESSAGE,
         )
         abm.session_id = abm.sender.user_id
         self._commit(abm)
@@ -80,14 +85,17 @@ class botClient(Client):
                 self.platform.meta(),
                 abm.session_id,
                 self.platform.client,
-            )
+            ),
         )
 
 
 @register_platform_adapter("qq_official", "QQ 机器人官方 API 适配器")
 class QQOfficialPlatformAdapter(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)
 
@@ -107,7 +115,8 @@ class QQOfficialPlatformAdapter(Platform):
             )
         else:
             self.intents = botpy.Intents(
-                public_guild_messages=True, direct_message=guild_dm
+                public_guild_messages=True,
+                direct_message=guild_dm,
             )
         self.client = botClient(
             intents=self.intents,
@@ -120,7 +129,9 @@ class QQOfficialPlatformAdapter(Platform):
         self.test_mode = os.environ.get("TEST_MODE", "off") == "on"
 
     async def send_by_session(
-        self, session: MessageSesion, message_chain: MessageChain
+        self,
+        session: MessageSesion,
+        message_chain: MessageChain,
     ):
         raise NotImplementedError("QQ 机器人官方 API 适配器不支持 send_by_session")
 
@@ -133,7 +144,7 @@ class QQOfficialPlatformAdapter(Platform):
 
     @staticmethod
     def _parse_from_qqofficial(
-        message: Union[botpy.message.Message, botpy.message.GroupMessage],
+        message: botpy.message.Message | botpy.message.GroupMessage,
         message_type: MessageType,
     ):
         abm = AstrBotMessage()
@@ -142,10 +153,11 @@ class QQOfficialPlatformAdapter(Platform):
         abm.raw_message = message
         abm.message_id = message.id
         abm.tag = "qq_official"
-        msg: List[BaseMessageComponent] = []
+        msg: list[BaseMessageComponent] = []
 
         if isinstance(message, botpy.message.GroupMessage) or isinstance(
-            message, botpy.message.C2CMessage
+            message,
+            botpy.message.C2CMessage,
         ):
             if isinstance(message, botpy.message.GroupMessage):
                 abm.sender = MessageMember(message.author.member_openid, "")
@@ -167,7 +179,8 @@ class QQOfficialPlatformAdapter(Platform):
             abm.message = msg
 
         elif isinstance(message, botpy.message.Message) or isinstance(
-            message, botpy.message.DirectMessage
+            message,
+            botpy.message.DirectMessage,
         ):
             try:
                 abm.self_id = str(message.mentions[0].id)
@@ -175,7 +188,8 @@ class QQOfficialPlatformAdapter(Platform):
                 abm.self_id = ""
 
             plain_content = message.content.replace(
-                "<@!" + str(abm.self_id) + ">", ""
+                "<@!" + str(abm.self_id) + ">",
+                "",
             ).strip()
 
             if message.attachments:
@@ -189,7 +203,8 @@ class QQOfficialPlatformAdapter(Platform):
             abm.message = msg
             abm.message_str = plain_content
             abm.sender = MessageMember(
-                str(message.author.id), str(message.author.username)
+                str(message.author.id),
+                str(message.author.username),
             )
             msg.append(At(qq="qq_official"))
             msg.append(Plain(plain_content))

astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_adapter.py

@@ -1,19 +1,21 @@
-import botpy
-import logging
 import asyncio
+import logging
+
+import botpy
 import botpy.message
 import botpy.types
 import botpy.types.message
-
 from botpy import Client
-from astrbot.api.platform import Platform, AstrBotMessage, MessageType, PlatformMetadata
+
+from astrbot import logger
 from astrbot.api.event import MessageChain
+from astrbot.api.platform import AstrBotMessage, MessageType, Platform, PlatformMetadata
 from astrbot.core.platform.astr_message_event import MessageSesion
-from .qo_webhook_event import QQOfficialWebhookMessageEvent
+
 from ...register import register_platform_adapter
-from .qo_webhook_server import QQOfficialWebhook
 from ..qqofficial.qqofficial_platform_adapter import QQOfficialPlatformAdapter
-from astrbot import logger
+from .qo_webhook_event import QQOfficialWebhookMessageEvent
+from .qo_webhook_server import QQOfficialWebhook
 
 # remove logger handler
 for handler in logging.root.handlers[:]:
@@ -28,7 +30,8 @@ class botClient(Client):
     # 收到群消息
     async def on_group_at_message_create(self, message: botpy.message.GroupMessage):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.GROUP_MESSAGE
+            message,
+            MessageType.GROUP_MESSAGE,
         )
         abm.session_id = (
             abm.sender.user_id if self.platform.unique_session else message.group_openid
@@ -38,7 +41,8 @@ class botClient(Client):
     # 收到频道消息
     async def on_at_message_create(self, message: botpy.message.Message):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.GROUP_MESSAGE
+            message,
+            MessageType.GROUP_MESSAGE,
         )
         abm.session_id = (
             abm.sender.user_id if self.platform.unique_session else message.channel_id
@@ -48,7 +52,8 @@ class botClient(Client):
     # 收到私聊消息
     async def on_direct_message_create(self, message: botpy.message.DirectMessage):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.FRIEND_MESSAGE
+            message,
+            MessageType.FRIEND_MESSAGE,
         )
         abm.session_id = abm.sender.user_id
         self._commit(abm)
@@ -56,7 +61,8 @@ class botClient(Client):
     # 收到 C2C 消息
     async def on_c2c_message_create(self, message: botpy.message.C2CMessage):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.FRIEND_MESSAGE
+            message,
+            MessageType.FRIEND_MESSAGE,
         )
         abm.session_id = abm.sender.user_id
         self._commit(abm)
@@ -64,15 +70,22 @@ class botClient(Client):
     def _commit(self, abm: AstrBotMessage):
         self.platform.commit_event(
             QQOfficialWebhookMessageEvent(
-                abm.message_str, abm, self.platform.meta(), abm.session_id, self
-            )
+                abm.message_str,
+                abm,
+                self.platform.meta(),
+                abm.session_id,
+                self,
+            ),
         )
 
 
 @register_platform_adapter("qq_official_webhook", "QQ 机器人官方 API 适配器(Webhook)")
 class QQOfficialWebhookPlatformAdapter(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)
 
@@ -83,7 +96,9 @@ class QQOfficialWebhookPlatformAdapter(Platform):
         self.unique_session = platform_settings["unique_session"]
 
         intents = botpy.Intents(
-            public_messages=True, public_guild_messages=True, direct_message=True
+            public_messages=True,
+            public_guild_messages=True,
+            direct_message=True,
         )
         self.client = botClient(
             intents=intents,  # 已经无用
@@ -93,7 +108,9 @@ class QQOfficialWebhookPlatformAdapter(Platform):
         self.client.set_platform(self)
 
     async def send_by_session(
-        self, session: MessageSesion, message_chain: MessageChain
+        self,
+        session: MessageSesion,
+        message_chain: MessageChain,
     ):
         raise NotImplementedError("QQ 机器人官方 API 适配器不支持 send_by_session")
 
@@ -106,7 +123,9 @@ class QQOfficialWebhookPlatformAdapter(Platform):
 
     async def run(self):
         self.webhook_helper = QQOfficialWebhook(
-            self.config, self._event_queue, self.client
+            self.config,
+            self._event_queue,
+            self.client,
         )
         await self.webhook_helper.initialize()
         await self.webhook_helper.start_polling()

astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_event.py

@@ -1,5 +1,7 @@
-from astrbot.api.platform import AstrBotMessage, PlatformMetadata
 from botpy import Client
+
+from astrbot.api.platform import AstrBotMessage, PlatformMetadata
+
 from ..qqofficial.qqofficial_message_event import QQOfficialMessageEvent
 
 

astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_server.py

@@ -1,10 +1,12 @@
-import quart
-import logging
 import asyncio
-from botpy import BotAPI, BotHttp, Client, Token, BotWebSocket, ConnectionSession
-from astrbot.api import logger
+import logging
+
+import quart
+from botpy import BotAPI, BotHttp, BotWebSocket, Client, ConnectionSession, Token
 from cryptography.hazmat.primitives.asymmetric import ed25519
 
+from astrbot.api import logger
+
 # remove logger handler
 for handler in logging.root.handlers[:]:
     logging.root.removeHandler(handler)
@@ -15,18 +17,21 @@ class QQOfficialWebhook:
         self.appid = config["appid"]
         self.secret = config["secret"]
         self.port = config.get("port", 6196)
+        self.is_sandbox = config.get("is_sandbox", False)
         self.callback_server_host = config.get("callback_server_host", "0.0.0.0")
 
         if isinstance(self.port, str):
             self.port = int(self.port)
 
-        self.http: BotHttp = BotHttp(timeout=300)
+        self.http: BotHttp = BotHttp(timeout=300, is_sandbox=self.is_sandbox)
         self.api: BotAPI = BotAPI(http=self.http)
         self.token = Token(self.appid, self.secret)
 
         self.server = quart.Quart(__name__)
         self.server.add_url_rule(
-            "/astrbot-qo-webhook/callback", view_func=self.callback, methods=["POST"]
+            "/astrbot-qo-webhook/callback",
+            view_func=self.callback,
+            methods=["POST"],
         )
         self.client = botpy_client
         self.event_queue = event_queue
@@ -61,7 +66,8 @@ class QQOfficialWebhook:
         seed = await self.repeat_seed(self.secret)
         private_key = ed25519.Ed25519PrivateKey.from_private_bytes(seed)
         msg = validation_payload.get("event_ts", "") + validation_payload.get(
-            "plain_token", ""
+            "plain_token",
+            "",
         )
         # sign
         signature = private_key.sign(msg.encode()).hex()
@@ -98,7 +104,7 @@ class QQOfficialWebhook:
 
     async def start_polling(self):
         logger.info(
-            f"将在 {self.callback_server_host}:{self.port} 端口启动 QQ 官方机器人 webhook 适配器。"
+            f"将在 {self.callback_server_host}:{self.port} 端口启动 QQ 官方机器人 webhook 适配器。",
         )
         await self.server.run_task(
             host=self.callback_server_host,