fix: repair dev test baseline after master sync

Author: LIghtJUNction

astrbot/core/agent/runners/coze/coze_agent_runner.py

@@ -17,6 +17,7 @@
     ProviderRequest,
 )
 from astrbot.core.provider.provider import Provider
+from astrbot.core.utils.media_utils import MediaResolver, describe_media_ref
 
 from .coze_api_client import CozeAPIClient
 
@@ -354,8 +355,11 @@ async def _download_and_upload_image(
                 return file_id
 
         try:
-            image_data = await self.api_client.download_image(image_url)
-            file_id = await self.api_client.upload_file(image_data)
+            image_bytes = await MediaResolver(
+                image_url,
+                media_type="image",
+            ).to_bytes()
+            file_id = await self.api_client.upload_file(image_bytes)
 
             if session_id:
                 self.file_id_cache[session_id][cache_key] = file_id
@@ -364,7 +368,9 @@ async def _download_and_upload_image(
             return file_id
 
         except Exception as e:
-            logger.error(f"处理图片失败 {image_url}: {e!s}")
+            logger.error(
+                f"处理图片失败 {describe_media_ref(image_url)}: {e!s}",
+            )
             raise Exception(f"处理图片失败: {e!s}") from e
 
     @override

astrbot/core/agent/runners/dify/dify_agent_runner.py

@@ -1,4 +1,3 @@
-import base64
 import os
 from typing import Any, override
 
@@ -18,6 +17,7 @@
 from astrbot.core.provider.provider import Provider
 from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
 from astrbot.core.utils.io import download_file
+from astrbot.core.utils.media_utils import MediaResolver
 
 
 class DifyAgentRunner(BaseAgentRunner[TContext]):
@@ -111,6 +111,40 @@ async def step_until_done(self, max_step: int):
             async for resp in self.step():
                 yield resp
 
+    async def _upload_image_for_dify(
+        self,
+        image_url: str,
+        session_id: str,
+    ) -> dict[str, str] | None:
+        image_data = await MediaResolver(
+            image_url,
+            media_type="image",
+        ).to_base64_data(strict=True)
+        if image_data is None:
+            logger.warning("Dify 图片预处理结果为空,将忽略｡")
+            return None
+
+        image_extension = image_data.mime_type.split("/", 1)[-1] or "png"
+        if image_extension == "jpeg":
+            image_extension = "jpg"
+
+        file_response = await self.api_client.file_upload(
+            file_data=image_data.to_bytes(),
+            user=session_id,
+            mime_type=image_data.mime_type,
+            file_name=f"image.{image_extension}",
+        )
+        logger.debug(f"Dify 上传图片响应:{file_response}")
+        if "id" not in file_response:
+            logger.warning(f"上传图片后得到未知的 Dify 响应:{file_response},图片将忽略｡")
+            return None
+
+        return {
+            "type": "image",
+            "transfer_method": "local_file",
+            "upload_file_id": file_response["id"],
+        }
+
     async def _execute_dify_request(self):
         """执行 Dify 请求的核心逻辑"""
         prompt = self.req.prompt or ""
@@ -129,31 +163,16 @@ async def _execute_dify_request(self):
         # 处理图片上传
         files_payload = []
         for image_url in image_urls:
-            # image_url is a base64 string
             try:
-                image_data = base64.b64decode(image_url)
-                file_response = await self.api_client.file_upload(
-                    file_data=image_data,
-                    user=session_id,
-                    mime_type="image/png",
-                    file_name="image.png",
-                )
-                logger.debug(f"Dify 上传图片响应:{file_response}")
-                if "id" not in file_response:
-                    logger.warning(
-                        f"上传图片后得到未知的 Dify 响应:{file_response},图片将忽略｡",
-                    )
-                    continue
-                files_payload.append(
-                    {
-                        "type": "image",
-                        "transfer_method": "local_file",
-                        "upload_file_id": file_response["id"],
-                    },
+                image_payload = await self._upload_image_for_dify(
+                    image_url,
+                    session_id,
                 )
             except Exception as e:
                 logger.warning(f"上传图片失败:{e}")
                 continue
+            if image_payload:
+                files_payload.append(image_payload)
 
         # 获得会话变量
         payload_vars = self.variables.copy()

astrbot/core/pipeline/content_safety_check/stage.py

@@ -25,14 +25,15 @@ async def initialize(self, ctx: PipelineContext) -> None:
     async def process(
         self,
         event: AstrMessageEvent,
+        check_text: str | None = None,
     ) -> AsyncGenerator[None, None]:
-        async for item in self.process_text(event, event.get_message_str()):
+        async for item in self.process_text(event, check_text):
             yield item
 
     async def process_text(
         self,
         event: AstrMessageEvent,
-        check_text: str,
+        check_text: str | None,
     ) -> AsyncGenerator[None, None]:
         """检查内容安全"""
         if check_text is None:

astrbot/core/pipeline/preprocess_stage/stage.py

@@ -1,13 +1,21 @@
 import asyncio
 import random
 import traceback
+from pathlib import Path
 
 from astrbot.core import logger
 from astrbot.core.message.components import Image, Plain, Record, Reply
 from astrbot.core.pipeline.context import PipelineContext
 from astrbot.core.pipeline.stage import Stage, register_stage
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
-from astrbot.core.utils.media_utils import ensure_wav
+from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
+from astrbot.core.utils.media_utils import (
+    describe_media_ref,
+    ensure_jpeg,
+    ensure_wav,
+    file_uri_to_path,
+    is_file_uri,
+)
 
 
 @register_stage
@@ -20,6 +28,17 @@ async def initialize(self, ctx: PipelineContext) -> None:
         self.stt_settings: dict = self.config.get("provider_stt_settings", {})
         self.platform_settings: dict = self.config.get("platform_settings", {})
 
+    @staticmethod
+    def _track_temp_media(event: AstrMessageEvent, media_path: str) -> None:
+        """Track files owned by this event when they live under AstrBot temp."""
+        try:
+            path = Path(media_path).resolve()
+            temp_dir = Path(get_astrbot_temp_path()).resolve()
+            path.relative_to(temp_dir)
+        except (OSError, ValueError):
+            return
+        event.track_temporary_local_file(str(path))
+
     async def process(
         self,
         event: AstrMessageEvent,
@@ -59,7 +78,11 @@ async def process(
                         from_ = from_.removesuffix("/")
                         to_ = to_.removesuffix("/")
 
-                        url = component.url.removeprefix("file://")
+                        url = (
+                            file_uri_to_path(component.url)
+                            if is_file_uri(component.url)
+                            else component.url
+                        )
                         if url.startswith(from_):
                             component.url = url.replace(from_, to_, 1)
                             logger.debug(f"Path mapping: {url} -> {component.url}")
@@ -71,14 +94,31 @@ async def process(
             if isinstance(component, Record):
                 try:
                     original_path = await component.convert_to_file_path()
+                    self._track_temp_media(event, original_path)
                     record_path = await ensure_wav(original_path)
-                    if record_path != original_path:
-                        event.track_temporary_local_file(record_path)
+                    self._track_temp_media(event, record_path)
                     component.file = record_path
                     component.path = record_path
                     message_chain[idx] = component
                 except Exception as e:
                     logger.warning(f"Voice processing failed: {e}")
+            elif isinstance(component, Image):
+                try:
+                    original_path = await component.convert_to_file_path()
+                    self._track_temp_media(event, original_path)
+                    image_path = await ensure_jpeg(original_path)
+                    self._track_temp_media(event, image_path)
+                    component.file = image_path
+                    component.path = image_path
+                    component.url = image_path
+                    message_chain[idx] = component
+                except Exception as e:
+                    media_ref = component.url or component.file
+                    logger.warning(
+                        "Image processing failed for %s: %s",
+                        describe_media_ref(media_ref),
+                        e,
+                    )
 
         # Also process Record components inside Reply chains (wav conversion)
         for component in event.get_messages():
@@ -87,16 +127,33 @@ async def process(
                     if isinstance(reply_comp, Record):
                         try:
                             original_path = await reply_comp.convert_to_file_path()
+                            self._track_temp_media(event, original_path)
                             record_path = await ensure_wav(original_path)
-                            if record_path != original_path:
-                                event.track_temporary_local_file(record_path)
+                            self._track_temp_media(event, record_path)
                             reply_comp.file = record_path
                             reply_comp.path = record_path
                             component.chain[idx] = reply_comp
                         except Exception as e:
                             logger.warning(
                                 f"Voice processing in reply chain failed: {e}"
                             )
+                    elif isinstance(reply_comp, Image):
+                        try:
+                            original_path = await reply_comp.convert_to_file_path()
+                            self._track_temp_media(event, original_path)
+                            image_path = await ensure_jpeg(original_path)
+                            self._track_temp_media(event, image_path)
+                            reply_comp.file = image_path
+                            reply_comp.path = image_path
+                            reply_comp.url = image_path
+                            component.chain[idx] = reply_comp
+                        except Exception as e:
+                            media_ref = reply_comp.url or reply_comp.file
+                            logger.warning(
+                                "Image processing in reply chain failed for %s: %s",
+                                describe_media_ref(media_ref),
+                                e,
+                            )
 
         # STT
         if self.stt_settings.get("enable", False):

astrbot/core/platform/astr_message_event.py

@@ -293,14 +293,12 @@ async def send_streaming(
         )
         self._has_send_oper = True
 
-    @abc.abstractmethod
     async def send_typing(self) -> None:
         """发送输入中状态。
 
         默认实现为空，由具体平台按需重写。
         """
 
-    @abc.abstractmethod
     async def stop_typing(self) -> None:
         """停止输入中状态。
 
@@ -507,11 +505,14 @@ async def react(self, emoji: str) -> None:
         """
         await self.send(MessageChain([Plain(emoji)]))
 
-    @abc.abstractmethod
     async def get_group(self, group_id: str | None = None, **kwargs) -> Group | None:
         """获取一个群聊的数据, 如果不填写 group_id: 如果是私聊消息，返回 None。如果是群聊消息，返回当前群聊的数据。
 
         适配情况:
 
         - aiocqhttp(OneBotv11)
         """
+        group = self.message_obj.group
+        if group is None or (group_id is not None and group_id != group.group_id):
+            return None
+        return group

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

@@ -9,7 +9,7 @@
 
 from astrbot import logger
 from astrbot.api.event import MessageChain
-from astrbot.api.message_components import At, File, Image, Plain
+from astrbot.api.message_components import At, File, Image, Plain, Record
 from astrbot.api.platform import (
     AstrBotMessage,
     MessageMember,
@@ -26,6 +26,7 @@
     StarHandlerMetadata,
     star_handlers_registry,
 )
+from astrbot.core.utils.media_utils import MediaResolver
 
 from .client import DiscordBotClient
 from .discord_platform_event import DiscordPlatformEvent
@@ -256,6 +257,12 @@ def _convert_message_to_abm(self, data: dict) -> AstrBotMessage:
                     message_chain.append(
                         Image(file=attachment.url, filename=attachment.filename),
                     )
+                elif attachment.content_type and attachment.content_type.startswith(
+                    "audio/",
+                ):
+                    message_chain.append(
+                        Record(file=attachment.url, url=attachment.url),
+                    )
                 else:
                     message_chain.append(
                         File(name=attachment.filename, url=attachment.url),
@@ -270,7 +277,20 @@ def _convert_message_to_abm(self, data: dict) -> AstrBotMessage:
     async def convert_message(self, data: dict) -> AstrBotMessage:
         """将平台消息转换成 AstrBotMessage"""
         # 由于 on_interaction 已被禁用,我们只处理普通消息
-        return self._convert_message_to_abm(data)
+        abm = self._convert_message_to_abm(data)
+        for component in abm.message:
+            if isinstance(component, Record):
+                audio_ref = component.url or component.file
+                if audio_ref:
+                    path_wav = await MediaResolver(
+                        audio_ref,
+                        media_type="audio",
+                        default_suffix=".wav",
+                    ).to_path(target_format="wav")
+                    component.file = path_wav
+                    component.url = path_wav
+                    component.path = path_wav
+        return abm
 
     async def handle_msg(self, message: AstrBotMessage, followup_webhook=None) -> None:
         """处理消息"""
@@ -433,7 +453,7 @@ async def _collect_and_register_commands(self) -> None:
         except HTTPException as exc:
             if getattr(exc, "code", None) == 30034:
                 logger.warning(
-                    "[Discord] 跳过指令同步:已达到 Discord 每日 application command create 限额｡",
+                    "[Discord] 跳过指令同步:已达到 Discord 每日 application command create 限额(code=30034)｡",
                 )
                 return
             raise