chore: bump version to 4.12.4

* fix: markdown keyerror or unbound error in aiocqhttp adapter

* fix: improve exception handling and logging in aiocqhttp adapter

astrbot/builtin_stars/builtin_commands/commands/__init__.py

@@ -11,7 +11,6 @@ from .provider import ProviderCommands
 from .setunset import SetUnsetCommands
 from .sid import SIDCommand
 from .t2i import T2ICommand
-from .tool import ToolCommands
 from .tts import TTSCommand
 
 __all__ = [
@@ -27,5 +26,4 @@ __all__ = [
     "SetUnsetCommands",
     "T2ICommand",
     "TTSCommand",
-    "ToolCommands",
 ]

astrbot/builtin_stars/builtin_commands/commands/tool.py

@@ -1,31 +0,0 @@
-from astrbot.api import star
-from astrbot.api.event import AstrMessageEvent, MessageEventResult
-
-
-class ToolCommands:
-    def __init__(self, context: star.Context):
-        self.context = context
-
-    async def tool_ls(self, event: AstrMessageEvent):
-        """查看函数工具列表"""
-        event.set_result(
-            MessageEventResult().message("tool 指令在 AstrBot v4.0.0 已经被移除。"),
-        )
-
-    async def tool_on(self, event: AstrMessageEvent, tool_name: str = ""):
-        """启用一个函数工具"""
-        event.set_result(
-            MessageEventResult().message("tool 指令在 AstrBot v4.0.0 已经被移除。"),
-        )
-
-    async def tool_off(self, event: AstrMessageEvent, tool_name: str = ""):
-        """停用一个函数工具"""
-        event.set_result(
-            MessageEventResult().message("tool 指令在 AstrBot v4.0.0 已经被移除。"),
-        )
-
-    async def tool_all_off(self, event: AstrMessageEvent):
-        """停用所有函数工具"""
-        event.set_result(
-            MessageEventResult().message("tool 指令在 AstrBot v4.0.0 已经被移除。"),
-        )

astrbot/builtin_stars/builtin_commands/main.py

@@ -13,7 +13,6 @@ from .commands import (
     SetUnsetCommands,
     SIDCommand,
     T2ICommand,
-    ToolCommands,
     TTSCommand,
 )
 
@@ -24,7 +23,6 @@ class Main(star.Star):
 
         self.help_c = HelpCommand(self.context)
         self.llm_c = LLMCommands(self.context)
-        self.tool_c = ToolCommands(self.context)
         self.plugin_c = PluginCommands(self.context)
         self.admin_c = AdminCommands(self.context)
         self.conversation_c = ConversationCommands(self.context)
@@ -47,30 +45,6 @@ class Main(star.Star):
         """开启/关闭 LLM"""
         await self.llm_c.llm(event)
 
-    @filter.command_group("tool")
-    def tool(self):
-        """函数工具管理"""
-
-    @tool.command("ls")
-    async def tool_ls(self, event: AstrMessageEvent):
-        """查看函数工具列表"""
-        await self.tool_c.tool_ls(event)
-
-    @tool.command("on")
-    async def tool_on(self, event: AstrMessageEvent, tool_name: str):
-        """启用一个函数工具"""
-        await self.tool_c.tool_on(event, tool_name)
-
-    @tool.command("off")
-    async def tool_off(self, event: AstrMessageEvent, tool_name: str):
-        """停用一个函数工具"""
-        await self.tool_c.tool_off(event, tool_name)
-
-    @tool.command("off_all")
-    async def tool_all_off(self, event: AstrMessageEvent):
-        """停用所有函数工具"""
-        await self.tool_c.tool_all_off(event)
-
     @filter.command_group("plugin")
     def plugin(self):
         """插件管理"""

astrbot/cli/__init__.py

@@ -1 +1 @@
-__version__ = "4.12.3"
+__version__ = "4.12.4"

astrbot/core/astr_agent_hooks.py

@@ -56,8 +56,10 @@ class MainAgentHooks(BaseAgentRunHooks[AstrAgentContext]):
         )
 
         # special handle web_search_tavily
+        platform_name = run_context.context.event.get_platform_name()
         if (
-            tool.name == "web_search_tavily"
+            platform_name == "webchat"
+            and tool.name == "web_search_tavily"
             and len(run_context.messages) > 0
             and tool_result
             and len(tool_result.content)

astrbot/core/config/default.py

@@ -5,7 +5,7 @@ from typing import Any, TypedDict
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.12.3"
+VERSION = "4.12.4"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 WEBHOOK_SUPPORTED_PLATFORMS = [
@@ -1191,7 +1191,11 @@ CONFIG_METADATA_2 = {
                         "type": "genie_tts",
                         "provider_type": "text_to_speech",
                         "enable": False,
-                        "character_name": "mika",
+                        "genie_character_name": "mika",
+                        "genie_onnx_model_dir": "CharacterModels/v2ProPlus/mika/tts_models",
+                        "genie_language": "Japanese",
+                        "genie_refer_audio_path": "",
+                        "genie_refer_text": "",
                         "timeout": 20,
                     },
                     "Edge TTS": {
@@ -1410,6 +1414,16 @@ CONFIG_METADATA_2 = {
                     },
                 },
                 "items": {
+                    "genie_onnx_model_dir": {
+                        "description": "ONNX Model Directory",
+                        "type": "string",
+                        "hint": "The directory path containing the ONNX model files",
+                    },
+                    "genie_language": {
+                        "description": "Language",
+                        "type": "string",
+                        "options": ["Japanese", "English", "Chinese"],
+                    },
                     "provider_source_id": {
                         "invisible": True,
                         "type": "string",

astrbot/core/pipeline/process_stage/method/agent_sub_stages/internal.py

@@ -116,8 +116,12 @@ class InternalAgentSubStage(Stage):
             if not provider:
                 logger.error(f"未找到指定的提供商: {sel_provider}。")
             return provider
-
-        return _ctx.get_using_provider(umo=event.unified_msg_origin)
+        try:
+            prov = _ctx.get_using_provider(umo=event.unified_msg_origin)
+        except ValueError as e:
+            logger.error(f"Error occurred while selecting provider: {e}")
+            return None
+        return prov
 
     async def _get_session_conv(self, event: AstrMessageEvent) -> Conversation:
         umo = event.unified_msg_origin
@@ -496,6 +500,7 @@ class InternalAgentSubStage(Stage):
         try:
             provider = self._select_provider(event)
             if provider is None:
+                logger.info("未找到任何对话模型（提供商），跳过 LLM 请求处理。")
                 return
             if not isinstance(provider, Provider):
                 logger.error(

astrbot/core/pipeline/process_stage/utils.py

@@ -41,6 +41,7 @@ TOOL_CALL_PROMPT = (
     "You MUST NOT return an empty response, especially after invoking a tool."
     "Before calling any tool, provide a brief explanatory message to the user stating the purpose of the tool call."
     "After the tool call is completed, you must briefly summarize the results returned by the tool for the user."
+    "Keep the role-play and style consistent throughout the conversation."
 )
 
 CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT = (

astrbot/core/pipeline/waking_check/stage.py

@@ -165,7 +165,6 @@ class WakingCheckStage(Stage):
                 and handler.handler_module_path
                 == "astrbot.builtin_stars.builtin_commands.main"
             ):
-                logger.debug("skipping builtin command")
                 continue
 
             # filter 需满足 AND 逻辑关系

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

@@ -62,27 +62,44 @@ class AiocqhttpAdapter(Platform):
 
         @self.bot.on_request()
         async def request(event: Event):
-            abm = await self.convert_message(event)
-            if abm:
+            try:
+                abm = await self.convert_message(event)
+                if not abm:
+                    return
                 await self.handle_msg(abm)
+            except Exception as e:
+                logger.exception(f"Handle request message failed: {e}")
+                return
 
         @self.bot.on_notice()
         async def notice(event: Event):
-            abm = await self.convert_message(event)
-            if abm:
-                await self.handle_msg(abm)
+            try:
+                abm = await self.convert_message(event)
+                if abm:
+                    await self.handle_msg(abm)
+            except Exception as e:
+                logger.exception(f"Handle notice message failed: {e}")
+                return
 
         @self.bot.on_message("group")
         async def group(event: Event):
-            abm = await self.convert_message(event)
-            if abm:
-                await self.handle_msg(abm)
+            try:
+                abm = await self.convert_message(event)
+                if abm:
+                    await self.handle_msg(abm)
+            except Exception as e:
+                logger.exception(f"Handle group message failed: {e}")
+                return
 
         @self.bot.on_message("private")
         async def private(event: Event):
-            abm = await self.convert_message(event)
-            if abm:
-                await self.handle_msg(abm)
+            try:
+                abm = await self.convert_message(event)
+                if abm:
+                    await self.handle_msg(abm)
+            except Exception as e:
+                logger.exception(f"Handle private message failed: {e}")
+                return
 
         @self.bot.on_websocket_connection
         def on_websocket_connection(_):
@@ -372,9 +389,10 @@ class AiocqhttpAdapter(Platform):
 
                 message_str += "".join(at_parts)
             elif t == "markdown":
-                text = m["data"].get("markdown") or m["data"].get("content", "")
-                abm.message.append(Plain(text=text))
-                message_str += text
+                for m in m_group:
+                    text = m["data"].get("markdown") or m["data"].get("content", "")
+                    abm.message.append(Plain(text=text))
+                    message_str += text
             else:
                 for m in m_group:
                     try:

astrbot/core/provider/sources/genie_tts.py

@@ -29,10 +29,24 @@ class GenieTTSProvider(TTSProvider):
         if not genie:
             raise ImportError("Please install genie_tts first.")
 
-        self.character_name = provider_config.get("character_name", "mika")
+        self.character_name = provider_config.get("genie_character_name", "mika")
+        language = provider_config.get("genie_language", "Japanese")
+        model_dir = provider_config.get("genie_onnx_model_dir", "")
+        refer_audio_path = provider_config.get("genie_refer_audio_path", "")
+        refer_text = provider_config.get("genie_refer_text", "")
 
         try:
-            genie.load_predefined_character(self.character_name)
+            genie.load_character(
+                character_name=self.character_name,
+                language=language,
+                onnx_model_dir=model_dir,
+            )
+            genie.set_reference_audio(
+                character_name=self.character_name,
+                audio_path=refer_audio_path,
+                audio_text=refer_text,
+                language=language,
+            )
         except Exception as e:
             raise RuntimeError(f"Failed to load character {self.character_name}: {e}")
 

astrbot/core/star/context.py

@@ -328,28 +328,29 @@ class Context:
         """获取所有用于 Embedding 任务的 Provider。"""
         return self.provider_manager.embedding_provider_insts
 
-    def get_using_provider(self, umo: str | None = None) -> Provider:
+    def get_using_provider(self, umo: str | None = None) -> Provider | None:
         """获取当前使用的用于文本生成任务的 LLM Provider(Chat_Completion 类型)。
 
         Args:
             umo: unified_message_origin 值，如果传入并且用户启用了提供商会话隔离，
-                 则使用该会话偏好的提供商。
+                 则使用该会话偏好的对话模型（提供商）。
 
         Returns:
-            当前使用的文本生成提供者。
+            当前使用的对话模型（提供商），如果未设置则返回 None。
 
         Raises:
-            ValueError: 返回的提供者不是 Provider 类型。
-
-        Note:
-            通过 /provider 指令可以切换提供者。
+            ValueError: 该会话来源配置的的对话模型（提供商）的类型不正确。
         """
         prov = self.provider_manager.get_using_provider(
             provider_type=ProviderType.CHAT_COMPLETION,
             umo=umo,
         )
+        if prov is None:
+            return None
         if not isinstance(prov, Provider):
-            raise ValueError("返回的 Provider 不是 Provider 类型")
+            raise ValueError(
+                f"该会话来源的对话模型（提供商）的类型不正确: {type(prov)}"
+            )
         return prov
 
     def get_using_tts_provider(self, umo: str | None = None) -> TTSProvider | None:

changelogs/v4.12.4.md

@@ -0,0 +1,21 @@
+## 更新内容
+
+### 新功能
+- 为 ChatUI 添加文件拖拽上传功能 ([#4583](https://github.com/AstrBotDevs/AstrBot/issues/4583))
+- 实现人格文件夹以进行高级人格管理 ([#4443](https://github.com/AstrBotDevs/AstrBot/issues/4443))
+- 添加人格文件夹管理以支持层级组织 (db)
+- 支持 Genie TTS
+
+### 修复
+- 增强提供商选择错误处理和日志记录，避免出现 `Provider 不是 Provider 类型` 的错误 ([#4654](https://github.com/AstrBotDevs/AstrBot/issues/4654))
+- aiocqhttp 适配器中的 Markdown KeyError 或 UnboundLocalError 问题 ([#4656](https://github.com/AstrBotDevs/AstrBot/issues/4656))
+- 确保 providers 中的 embedding 维度作为整数返回 ([#4547](https://github.com/AstrBotDevs/AstrBot/issues/4547))
+- 钉钉流式响应问题 ([#4590](https://github.com/AstrBotDevs/AstrBot/issues/4590))
+- 提供商选择按钮被长模型名称遮挡的问题 ([#4631](https://github.com/AstrBotDevs/AstrBot/issues/4631))
+- 更新 `web_search_tavily` 处理，避免在非 ChatUI 平台出现信息引用 ([#4633](https://github.com/AstrBotDevs/AstrBot/issues/4633))
+
+### 性能优化
+- T2I 模板编辑器预览 ([#4574](https://github.com/AstrBotDevs/AstrBot/issues/4574))
+
+### 杂项
+- 移除已弃用的 `tool` 命令

dashboard/src/components/shared/ProviderSelector.vue

@@ -3,7 +3,7 @@
     <span v-if="!modelValue" style="color: rgb(var(--v-theme-primaryText));">
       {{ tm('providerSelector.notSelected') }}
     </span>
-    <span v-else>
+    <span v-else class="provider-name-text">
       {{ modelValue }}
     </span>
     <v-btn size="small" color="primary" variant="tonal" @click="openDialog">
@@ -228,6 +228,14 @@ function closeProviderDrawer() {
 </script>
 
 <style scoped>
+.provider-name-text {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: calc(100% - 80px);
+  display: inline-block;
+}
+
 .v-list-item {
   transition: all 0.2s ease;
 }

pyproject.toml

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