fix: enhance file naming logic in File component and update prompt handling in InternalAgentSubStage

powered by MoonshotAI

astrbot/cli/__init__.py

@@ -1 +1 @@
-__version__ = "4.7.4"
+__version__ = "4.7.3"

astrbot/core/config/default.py

@@ -4,7 +4,7 @@ import os
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.7.4"
+VERSION = "4.7.3"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 # 默认配置
@@ -2422,36 +2422,36 @@ CONFIG_METADATA_3 = {
                     "provider_settings.enable": True,
                 },
             },
-            # "file_extract": {
-            #     "description": "文档解析能力 [beta]",
-            #     "type": "object",
-            #     "items": {
-            #         "provider_settings.file_extract.enable": {
-            #             "description": "启用文档解析能力",
-            #             "type": "bool",
-            #         },
-            #         "provider_settings.file_extract.provider": {
-            #             "description": "文档解析提供商",
-            #             "type": "string",
-            #             "options": ["moonshotai"],
-            #             "condition": {
-            #                 "provider_settings.file_extract.enable": True,
-            #             },
-            #         },
-            #         "provider_settings.file_extract.moonshotai_api_key": {
-            #             "description": "Moonshot AI API Key",
-            #             "type": "string",
-            #             "condition": {
-            #                 "provider_settings.file_extract.provider": "moonshotai",
-            #                 "provider_settings.file_extract.enable": True,
-            #             },
-            #         },
-            #     },
-            #     "condition": {
-            #         "provider_settings.agent_runner_type": "local",
-            #         "provider_settings.enable": True,
-            #     },
-            # },
+            "file_extract": {
+                "description": "文档解析能力",
+                "type": "object",
+                "items": {
+                    "provider_settings.file_extract.enable": {
+                        "description": "启用文档解析能力",
+                        "type": "bool",
+                    },
+                    "provider_settings.file_extract.provider": {
+                        "description": "文档解析提供商",
+                        "type": "string",
+                        "options": ["moonshotai"],
+                        "condition": {
+                            "provider_settings.file_extract.enable": True,
+                        },
+                    },
+                    "provider_settings.file_extract.moonshotai_api_key": {
+                        "description": "Moonshot AI API Key",
+                        "type": "string",
+                        "condition": {
+                            "provider_settings.file_extract.provider": "moonshotai",
+                            "provider_settings.file_extract.enable": True,
+                        },
+                    },
+                },
+                "condition": {
+                    "provider_settings.agent_runner_type": "local",
+                    "provider_settings.enable": True,
+                },
+            },
             "others": {
                 "description": "其他配置",
                 "type": "object",

astrbot/core/provider/provider.py

@@ -45,13 +45,13 @@ class AbstractProvider(abc.ABC):
         )
         return meta
 
-    async def test(self):
+    async def test(self) -> bool:
         """test the provider is a
 
-        raises:
-            Exception: if the provider is not available
+        Returns:
+            bool: the provider is available
         """
-        ...
+        return True
 
 
 class Provider(AbstractProvider):
@@ -175,11 +175,15 @@ class Provider(AbstractProvider):
 
         return dicts
 
-    async def test(self, timeout: float = 45.0):
-        await asyncio.wait_for(
-            self.text_chat(prompt="REPLY `PONG` ONLY"),
-            timeout=timeout,
-        )
+    async def test(self, timeout: float = 45.0) -> bool:
+        try:
+            response = await asyncio.wait_for(
+                self.text_chat(prompt="REPLY `PONG` ONLY"),
+                timeout=timeout,
+            )
+            return response is not None
+        except Exception:
+            return False
 
 
 class STTProvider(AbstractProvider):
@@ -193,13 +197,19 @@ class STTProvider(AbstractProvider):
         """获取音频的文本"""
         raise NotImplementedError
 
-    async def test(self):
-        sample_audio_path = os.path.join(
-            get_astrbot_path(),
-            "samples",
-            "stt_health_check.wav",
-        )
-        await self.get_text(sample_audio_path)
+    async def test(self) -> bool:
+        try:
+            sample_audio_path = os.path.join(
+                get_astrbot_path(),
+                "samples",
+                "stt_health_check.wav",
+            )
+            if not os.path.exists(sample_audio_path):
+                return False
+            text_result = await self.get_text(sample_audio_path)
+            return isinstance(text_result, str) and bool(text_result)
+        except Exception:
+            return False
 
 
 class TTSProvider(AbstractProvider):
@@ -213,8 +223,12 @@ class TTSProvider(AbstractProvider):
         """获取文本的音频，返回音频文件路径"""
         raise NotImplementedError
 
-    async def test(self):
-        await self.get_audio("hi")
+    async def test(self) -> bool:
+        try:
+            audio_result = await self.get_audio("hi")
+            return isinstance(audio_result, str) and bool(audio_result)
+        except Exception:
+            return False
 
 
 class EmbeddingProvider(AbstractProvider):
@@ -238,8 +252,14 @@ class EmbeddingProvider(AbstractProvider):
         """获取向量的维度"""
         ...
 
-    async def test(self):
-        await self.get_embedding("astrbot")
+    async def test(self) -> bool:
+        try:
+            embedding_result = await self.get_embedding("health_check")
+            return isinstance(embedding_result, list) and (
+                not embedding_result or isinstance(embedding_result[0], float)
+            )
+        except Exception:
+            return False
 
     async def get_embeddings_batch(
         self,
@@ -325,7 +345,9 @@ class RerankProvider(AbstractProvider):
         """获取查询和文档的重排序分数"""
         ...
 
-    async def test(self):
-        result = await self.rerank("Apple", documents=["apple", "banana"])
-        if not result:
-            raise Exception("Rerank provider test failed, no results returned")
+    async def test(self) -> bool:
+        try:
+            await self.rerank("Apple", documents=["apple", "banana"])
+            return True
+        except Exception:
+            return False

astrbot/dashboard/routes/config.py

@@ -354,11 +354,17 @@ class ConfigRoute(Route):
         )
 
         try:
-            await provider.test()
-            status_info["status"] = "available"
-            logger.info(
-                f"Provider {status_info['name']} (ID: {status_info['id']}) is available.",
-            )
+            result = await provider.test()
+            if result:
+                status_info["status"] = "available"
+                logger.info(
+                    f"Provider {status_info['name']} (ID: {status_info['id']}) is available.",
+                )
+            else:
+                status_info["error"] = "Provider test returned False."
+                logger.warning(
+                    f"Provider {status_info['name']} (ID: {status_info['id']}) test returned False.",
+                )
         except Exception as e:
             error_message = str(e)
             status_info["error"] = error_message

changelogs/v4.7.4.md

@@ -1,7 +0,0 @@
-## What's Changed
-
-1. 修复：assistant message 中 tool_call 存在但 content 不存在时，导致验证错误的问题 ([#3862](https://github.com/AstrBotDevs/AstrBot/issues/3862))
-2. 修复：fix: aiocqhttp 适配器 NapCat 文件名获取为空 ([#3853](https://github.com/AstrBotDevs/AstrBot/issues/3853))
-3. 新增：升级所有插件按钮
-4. 新增：/provider 指令支持同时测试提供商可用性
-5. 优化：主动回复的 prompt

packages/astrbot/commands/provider.py

@@ -34,11 +34,25 @@ class ProviderCommands:
         provider_capability_type = meta.provider_type
 
         try:
-            await provider.test()
-            return True, None, None
-        except Exception as e:
+            result = await provider.test()
+            if result:
+                return True, None, None
             err_code = "TEST_FAILED"
-            err_reason = str(e)
+            err_reason = "Provider test returned False"
+            self._log_reachability_failure(
+                provider, provider_capability_type, err_code, err_reason
+            )
+            return False, err_code, err_reason
+        except Exception as exc:
+            err_code = (
+                getattr(exc, "status_code", None)
+                or getattr(exc, "code", None)
+                or getattr(exc, "error_code", None)
+            )
+            err_reason = str(exc)
+            if not err_code:
+                err_code = exc.__class__.__name__
+
             self._log_reachability_failure(
                 provider, provider_capability_type, err_code, err_reason
             )

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "AstrBot"
-version = "4.7.4"
+version = "4.7.3"
 description = "Easy-to-use multi-platform LLM chatbot and development framework"
 readme = "README.md"
 requires-python = ">=3.10"