AstrBot 4.6.1__py3-none-any.whl → 4.7.1__py3-none-any.whl

astrbot/core/config/default.py

@@ -4,7 +4,7 @@ import os
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.6.1"
+VERSION = "4.7.1"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 # 默认配置
@@ -68,6 +68,10 @@ DEFAULT_CONFIG = {
         "dequeue_context_length": 1,
         "streaming_response": False,
         "show_tool_use_status": False,
+        "agent_runner_type": "local",
+        "dify_agent_runner_provider_id": "",
+        "coze_agent_runner_provider_id": "",
+        "dashscope_agent_runner_provider_id": "",
         "unsupported_streaming_strategy": "realtime_segmenting",
         "max_agent_step": 30,
         "tool_call_timeout": 60,
@@ -141,7 +145,16 @@ DEFAULT_CONFIG = {
 }
 
 
-# 配置项的中文描述、值类型
+"""
+AstrBot v3 时代的配置元数据，目前仅承担以下功能：
+
+1. 保存配置时，配置项的类型验证
+2. WebUI 展示提供商和平台适配器模版
+
+WebUI 的配置文件在 `CONFIG_METADATA_3` 中。
+
+未来将会逐步淘汰此配置元数据。
+"""
 CONFIG_METADATA_2 = {
     "platform_group": {
         "metadata": {
@@ -634,7 +647,7 @@ CONFIG_METADATA_2 = {
                             },
                             "words_count_threshold": {
                                 "type": "int",
-                                "hint": "超过这个字数的消息不会被分段回复。默认为 150",
+                                "hint": "分段回复的字数上限。只有字数小于此值的消息才会被分段，超过此值的长消息将直接发送（不分段）。默认为 150",
                             },
                             "regex": {
                                 "type": "string",
@@ -1011,7 +1024,7 @@ CONFIG_METADATA_2 = {
                         "id": "dify_app_default",
                         "provider": "dify",
                         "type": "dify",
-                        "provider_type": "chat_completion",
+                        "provider_type": "agent_runner",
                         "enable": True,
                         "dify_api_type": "chat",
                         "dify_api_key": "",
@@ -1025,20 +1038,20 @@ CONFIG_METADATA_2 = {
                     "Coze": {
                         "id": "coze",
                         "provider": "coze",
-                        "provider_type": "chat_completion",
+                        "provider_type": "agent_runner",
                         "type": "coze",
                         "enable": True,
                         "coze_api_key": "",
                         "bot_id": "",
                         "coze_api_base": "https://api.coze.cn",
                         "timeout": 60,
-                        "auto_save_history": True,
+                        # "auto_save_history": True,
                     },
                     "阿里云百炼应用": {
                         "id": "dashscope",
                         "provider": "dashscope",
                         "type": "dashscope",
-                        "provider_type": "chat_completion",
+                        "provider_type": "agent_runner",
                         "enable": True,
                         "dashscope_app_type": "agent",
                         "dashscope_api_key": "",
@@ -1087,7 +1100,7 @@ CONFIG_METADATA_2 = {
                         "api_base": "",
                         "model": "whisper-1",
                     },
-                    "Whisper(本地加载)": {
+                    "Whisper(Local)": {
                         "hint": "启用前请 pip 安装 openai-whisper 库（N卡用户大约下载 2GB，主要是 torch 和 cuda，CPU 用户大约下载 1 GB），并且安装 ffmpeg。否则将无法正常转文字。",
                         "provider": "openai",
                         "type": "openai_whisper_selfhost",
@@ -1096,7 +1109,7 @@ CONFIG_METADATA_2 = {
                         "id": "whisper_selfhost",
                         "model": "tiny",
                     },
-                    "SenseVoice(本地加载)": {
+                    "SenseVoice(Local)": {
                         "hint": "启用前请 pip 安装 funasr、funasr_onnx、torchaudio、torch、modelscope、jieba 库（默认使用CPU，大约下载 1 GB），并且安装 ffmpeg。否则将无法正常转文字。",
                         "type": "sensevoice_stt_selfhost",
                         "provider": "sensevoice",
@@ -1131,7 +1144,7 @@ CONFIG_METADATA_2 = {
                         "pitch": "+0Hz",
                         "timeout": 20,
                     },
-                    "GSV TTS(本地加载)": {
+                    "GSV TTS(Local)": {
                         "id": "gsv_tts",
                         "enable": False,
                         "provider": "gpt_sovits",
@@ -1907,7 +1920,6 @@ CONFIG_METADATA_2 = {
                     "enable": {
                         "description": "启用",
                         "type": "bool",
-                        "hint": "是否启用。",
                     },
                     "key": {
                         "description": "API Key",
@@ -2037,12 +2049,22 @@ CONFIG_METADATA_2 = {
                     "unsupported_streaming_strategy": {
                         "type": "string",
                     },
+                    "agent_runner_type": {
+                        "type": "string",
+                    },
+                    "dify_agent_runner_provider_id": {
+                        "type": "string",
+                    },
+                    "coze_agent_runner_provider_id": {
+                        "type": "string",
+                    },
+                    "dashscope_agent_runner_provider_id": {
+                        "type": "string",
+                    },
                     "max_agent_step": {
-                        "description": "工具调用轮数上限",
                         "type": "int",
                     },
                     "tool_call_timeout": {
-                        "description": "工具调用超时时间（秒）",
                         "type": "int",
                     },
                 },
@@ -2176,34 +2198,87 @@ CONFIG_METADATA_2 = {
 }
 
 
+"""
+v4.7.0 之后，name, description, hint 等字段已经实现 i18n 国际化。国际化资源文件位于：
+
+- dashboard/src/i18n/locales/en-US/features/config-metadata.json
+- dashboard/src/i18n/locales/zh-CN/features/config-metadata.json
+
+如果在此文件中添加了新的配置字段，请务必同步更新上述两个国际化资源文件。
+"""
 CONFIG_METADATA_3 = {
     "ai_group": {
         "name": "AI 配置",
         "metadata": {
-            "ai": {
-                "description": "模型",
+            "agent_runner": {
+                "description": "Agent 执行方式",
+                "hint": "选择 AI 对话的执行器，默认为 AstrBot 内置 Agent 执行器，可使用 AstrBot 内的知识库、人格、工具调用功能。如果不打算接入 Dify 或 Coze 等第三方 Agent 执行器，不需要修改此节。",
                 "type": "object",
                 "items": {
                     "provider_settings.enable": {
-                        "description": "启用大语言模型聊天",
+                        "description": "启用",
                         "type": "bool",
+                        "hint": "AI 对话总开关",
+                    },
+                    "provider_settings.agent_runner_type": {
+                        "description": "执行器",
+                        "type": "string",
+                        "options": ["local", "dify", "coze", "dashscope"],
+                        "labels": ["内置 Agent", "Dify", "Coze", "阿里云百炼应用"],
+                        "condition": {
+                            "provider_settings.enable": True,
+                        },
+                    },
+                    "provider_settings.coze_agent_runner_provider_id": {
+                        "description": "Coze Agent 执行器提供商 ID",
+                        "type": "string",
+                        "_special": "select_agent_runner_provider:coze",
+                        "condition": {
+                            "provider_settings.agent_runner_type": "coze",
+                            "provider_settings.enable": True,
+                        },
+                    },
+                    "provider_settings.dify_agent_runner_provider_id": {
+                        "description": "Dify Agent 执行器提供商 ID",
+                        "type": "string",
+                        "_special": "select_agent_runner_provider:dify",
+                        "condition": {
+                            "provider_settings.agent_runner_type": "dify",
+                            "provider_settings.enable": True,
+                        },
+                    },
+                    "provider_settings.dashscope_agent_runner_provider_id": {
+                        "description": "阿里云百炼应用 Agent 执行器提供商 ID",
+                        "type": "string",
+                        "_special": "select_agent_runner_provider:dashscope",
+                        "condition": {
+                            "provider_settings.agent_runner_type": "dashscope",
+                            "provider_settings.enable": True,
+                        },
                     },
+                },
+            },
+            "ai": {
+                "description": "模型",
+                "hint": "当使用非内置 Agent 执行器时，默认聊天模型和默认图片转述模型可能会无效，但某些插件会依赖此配置项来调用 AI 能力。",
+                "type": "object",
+                "items": {
                     "provider_settings.default_provider_id": {
                         "description": "默认聊天模型",
                         "type": "string",
                         "_special": "select_provider",
-                        "hint": "留空时使用第一个模型。",
+                        "hint": "留空时使用第一个模型",
                     },
                     "provider_settings.default_image_caption_provider_id": {
                         "description": "默认图片转述模型",
                         "type": "string",
                         "_special": "select_provider",
-                        "hint": "留空代表不使用。可用于不支持视觉模态的聊天模型。",
+                        "hint": "留空代表不使用，可用于非多模态模型",
                     },
                     "provider_stt_settings.enable": {
                         "description": "启用语音转文本",
                         "type": "bool",
-                        "hint": "STT 总开关。",
+                        "hint": "STT 总开关",
                     },
                     "provider_stt_settings.provider_id": {
                         "description": "默认语音转文本模型",
@@ -2217,12 +2292,11 @@ CONFIG_METADATA_3 = {
                     "provider_tts_settings.enable": {
                         "description": "启用文本转语音",
                         "type": "bool",
-                        "hint": "TTS 总开关。当关闭时，会话启用 TTS 也不会生效。",
+                        "hint": "TTS 总开关",
                     },
                     "provider_tts_settings.provider_id": {
                         "description": "默认文本转语音模型",
                         "type": "string",
-                        "hint": "用户也可使用 /provider 单独选择会话的 TTS 模型。",
                         "_special": "select_provider_tts",
                         "condition": {
                             "provider_tts_settings.enable": True,
@@ -2233,6 +2307,9 @@ CONFIG_METADATA_3 = {
                         "type": "text",
                     },
                 },
+                "condition": {
+                    "provider_settings.enable": True,
+                },
             },
             "persona": {
                 "description": "人格",
@@ -2244,6 +2321,10 @@ CONFIG_METADATA_3 = {
                         "_special": "select_persona",
                     },
                 },
+                "condition": {
+                    "provider_settings.agent_runner_type": "local",
+                    "provider_settings.enable": True,
+                },
             },
             "knowledgebase": {
                 "description": "知识库",
@@ -2272,6 +2353,10 @@ CONFIG_METADATA_3 = {
                         "hint": "启用后，知识库检索将作为 LLM Tool，由模型自主决定何时调用知识库进行查询。需要模型支持函数调用能力。",
                     },
                 },
+                "condition": {
+                    "provider_settings.agent_runner_type": "local",
+                    "provider_settings.enable": True,
+                },
             },
             "websearch": {
                 "description": "网页搜索",
@@ -2308,6 +2393,10 @@ CONFIG_METADATA_3 = {
                         "type": "bool",
                     },
                 },
+                "condition": {
+                    "provider_settings.agent_runner_type": "local",
+                    "provider_settings.enable": True,
+                },
             },
             "others": {
                 "description": "其他配置",
@@ -2316,34 +2405,51 @@ CONFIG_METADATA_3 = {
                     "provider_settings.display_reasoning_text": {
                         "description": "显示思考内容",
                         "type": "bool",
+                        "condition": {
+                            "provider_settings.agent_runner_type": "local",
+                        },
                     },
                     "provider_settings.identifier": {
                         "description": "用户识别",
                         "type": "bool",
+                        "hint": "启用后，会在提示词前包含用户 ID 信息。",
                     },
                     "provider_settings.group_name_display": {
                         "description": "显示群名称",
                         "type": "bool",
-                        "hint": "启用后，在支持的平台(aiocqhttp)上会在 prompt 中包含群名称信息。",
+                        "hint": "启用后，在支持的平台(OneBot v11)上会在提示词前包含群名称信息。",
                     },
                     "provider_settings.datetime_system_prompt": {
                         "description": "现实世界时间感知",
                         "type": "bool",
+                        "hint": "启用后，会在系统提示词中附带当前时间信息。",
+                        "condition": {
+                            "provider_settings.agent_runner_type": "local",
+                        },
                     },
                     "provider_settings.show_tool_use_status": {
                         "description": "输出函数调用状态",
                         "type": "bool",
+                        "condition": {
+                            "provider_settings.agent_runner_type": "local",
+                        },
                     },
                     "provider_settings.max_agent_step": {
                         "description": "工具调用轮数上限",
                         "type": "int",
+                        "condition": {
+                            "provider_settings.agent_runner_type": "local",
+                        },
                     },
                     "provider_settings.tool_call_timeout": {
                         "description": "工具调用超时时间（秒）",
                         "type": "int",
+                        "condition": {
+                            "provider_settings.agent_runner_type": "local",
+                        },
                     },
                     "provider_settings.streaming_response": {
-                        "description": "流式回复",
+                        "description": "流式输出",
                         "type": "bool",
                     },
                     "provider_settings.unsupported_streaming_strategy": {
@@ -2359,17 +2465,23 @@ CONFIG_METADATA_3 = {
                     "provider_settings.max_context_length": {
                         "description": "最多携带对话轮数",
                         "type": "int",
-                        "hint": "超出这个数量时丢弃最旧的部分，一轮聊天记为 1 条。-1 为不限制。",
+                        "hint": "超出这个数量时丢弃最旧的部分，一轮聊天记为 1 条，-1 为不限制",
+                        "condition": {
+                            "provider_settings.agent_runner_type": "local",
+                        },
                     },
                     "provider_settings.dequeue_context_length": {
                         "description": "丢弃对话轮数",
                         "type": "int",
-                        "hint": "超出最多携带对话轮数时, 一次丢弃的聊天轮数。",
+                        "hint": "超出最多携带对话轮数时, 一次丢弃的聊天轮数",
+                        "condition": {
+                            "provider_settings.agent_runner_type": "local",
+                        },
                     },
                     "provider_settings.wake_prefix": {
                         "description": "LLM 聊天额外唤醒前缀 ",
                         "type": "string",
-                        "hint": "如果唤醒前缀为 `/`, 额外聊天唤醒前缀为 `chat`，则需要 `/chat` 才会触发 LLM 请求。默认为空。",
+                        "hint": "如果唤醒前缀为 /, 额外聊天唤醒前缀为 chat，则需要 /chat 才会触发 LLM 请求",
                     },
                     "provider_settings.prompt_prefix": {
                         "description": "用户提示词",
@@ -2381,6 +2493,9 @@ CONFIG_METADATA_3 = {
                         "type": "bool",
                     },
                 },
+                "condition": {
+                    "provider_settings.enable": True,
+                },
             },
         },
     },

astrbot/core/config/i18n_utils.py

@@ -0,0 +1,110 @@
+"""
+配置元数据国际化工具
+
+提供配置元数据的国际化键转换功能
+"""
+
+from typing import Any
+
+
+class ConfigMetadataI18n:
+    """配置元数据国际化转换器"""
+
+    @staticmethod
+    def _get_i18n_key(group: str, section: str, field: str, attr: str) -> str:
+        """
+        生成国际化键
+
+        Args:
+            group: 配置组，如 'ai_group', 'platform_group'
+            section: 配置节，如 'agent_runner', 'general'
+            field: 字段名，如 'enable', 'default_provider'
+            attr: 属性类型，如 'description', 'hint', 'labels'
+
+        Returns:
+            国际化键，格式如: 'ai_group.agent_runner.enable.description'
+        """
+        if field:
+            return f"{group}.{section}.{field}.{attr}"
+        else:
+            return f"{group}.{section}.{attr}"
+
+    @staticmethod
+    def convert_to_i18n_keys(metadata: dict[str, Any]) -> dict[str, Any]:
+        """
+        将配置元数据转换为使用国际化键
+
+        Args:
+            metadata: 原始配置元数据字典
+
+        Returns:
+            使用国际化键的配置元数据字典
+        """
+        result = {}
+
+        for group_key, group_data in metadata.items():
+            group_result = {
+                "name": f"{group_key}.name",
+                "metadata": {},
+            }
+
+            for section_key, section_data in group_data.get("metadata", {}).items():
+                section_result = {
+                    "description": f"{group_key}.{section_key}.description",
+                    "type": section_data.get("type"),
+                }
+
+                # 复制其他属性
+                for key in ["items", "condition", "_special", "invisible"]:
+                    if key in section_data:
+                        section_result[key] = section_data[key]
+
+                # 处理 hint
+                if "hint" in section_data:
+                    section_result["hint"] = f"{group_key}.{section_key}.hint"
+
+                # 处理 items 中的字段
+                if "items" in section_data and isinstance(section_data["items"], dict):
+                    items_result = {}
+                    for field_key, field_data in section_data["items"].items():
+                        # 处理嵌套的点号字段名（如 provider_settings.enable）
+                        field_name = field_key
+
+                        field_result = {}
+
+                        # 复制基本属性
+                        for attr in [
+                            "type",
+                            "condition",
+                            "_special",
+                            "invisible",
+                            "options",
+                        ]:
+                            if attr in field_data:
+                                field_result[attr] = field_data[attr]
+
+                        # 转换文本属性为国际化键
+                        if "description" in field_data:
+                            field_result["description"] = (
+                                f"{group_key}.{section_key}.{field_name}.description"
+                            )
+
+                        if "hint" in field_data:
+                            field_result["hint"] = (
+                                f"{group_key}.{section_key}.{field_name}.hint"
+                            )
+
+                        if "labels" in field_data:
+                            field_result["labels"] = (
+                                f"{group_key}.{section_key}.{field_name}.labels"
+                            )
+
+                        items_result[field_key] = field_result
+
+                    section_result["items"] = items_result
+
+                group_result["metadata"][section_key] = section_result
+
+            result[group_key] = group_result
+
+        return result

astrbot/core/core_lifecycle.py

@@ -16,13 +16,12 @@ import time
 import traceback
 from asyncio import Queue
 
-from astrbot.core import LogBroker, logger, sp
+from astrbot.api import logger, sp
+from astrbot.core import LogBroker
 from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
 from astrbot.core.config.default import VERSION
 from astrbot.core.conversation_mgr import ConversationManager
 from astrbot.core.db import BaseDatabase
-from astrbot.core.db.migration.migra_45_to_46 import migrate_45_to_46
-from astrbot.core.db.migration.migra_webchat_session import migrate_webchat_session
 from astrbot.core.knowledge_base.kb_mgr import KnowledgeBaseManager
 from astrbot.core.persona_mgr import PersonaManager
 from astrbot.core.pipeline.scheduler import PipelineContext, PipelineScheduler
@@ -34,6 +33,7 @@ from astrbot.core.star.context import Context
 from astrbot.core.star.star_handler import EventType, star_handlers_registry, star_map
 from astrbot.core.umop_config_router import UmopConfigRouter
 from astrbot.core.updator import AstrBotUpdator
+from astrbot.core.utils.migra_helper import migra
 
 from . import astrbot_config, html_renderer
 from .event_bus import EventBus
@@ -97,18 +97,16 @@ class AstrBotCoreLifecycle:
             sp=sp,
         )
 
-        # 4.5 to 4.6 migration for umop_config_router
+        # apply migration
         try:
-            await migrate_45_to_46(self.astrbot_config_mgr, self.umop_config_router)
-        except Exception as e:
-            logger.error(f"Migration from version 4.5 to 4.6 failed: {e!s}")
-            logger.error(traceback.format_exc())
-
-        # migration for webchat session
-        try:
-            await migrate_webchat_session(self.db)
+            await migra(
+                self.db,
+                self.astrbot_config_mgr,
+                self.umop_config_router,
+                self.astrbot_config_mgr,
+            )
         except Exception as e:
-            logger.error(f"Migration for webchat session failed: {e!s}")
+            logger.error(f"AstrBot migration failed: {e!s}")
             logger.error(traceback.format_exc())
 
         # 初始化事件队列

astrbot/core/db/po.py

@@ -173,7 +173,7 @@ class PlatformSession(SQLModel, table=True):
         max_length=100,
         nullable=False,
         unique=True,
-        default_factory=lambda: f"webchat_{uuid.uuid4()}",
+        default_factory=lambda: str(uuid.uuid4()),
     )
     platform_id: str = Field(default="webchat", nullable=False)
     """Platform identifier (e.g., 'webchat', 'qq', 'discord')"""

astrbot/core/db/sqlite.py

@@ -794,7 +794,7 @@ class SQLiteDatabase(BaseDatabase):
 
                 await session.execute(
                     update(PlatformSession)
-                    .where(col(PlatformSession.session_id == session_id))
+                    .where(col(PlatformSession.session_id) == session_id)
                     .values(**values),
                 )
 
@@ -805,6 +805,6 @@ class SQLiteDatabase(BaseDatabase):
             async with session.begin():
                 await session.execute(
                     delete(PlatformSession).where(
-                        col(PlatformSession.session_id == session_id),
+                        col(PlatformSession.session_id) == session_id,
                     ),
                 )

astrbot/core/pipeline/process_stage/method/agent_request.py

@@ -0,0 +1,48 @@
+from collections.abc import AsyncGenerator
+
+from astrbot.core import logger
+from astrbot.core.platform.astr_message_event import AstrMessageEvent
+from astrbot.core.star.session_llm_manager import SessionServiceManager
+
+from ...context import PipelineContext
+from ..stage import Stage
+from .agent_sub_stages.internal import InternalAgentSubStage
+from .agent_sub_stages.third_party import ThirdPartyAgentSubStage
+
+
+class AgentRequestSubStage(Stage):
+    async def initialize(self, ctx: PipelineContext) -> None:
+        self.ctx = ctx
+        self.config = ctx.astrbot_config
+
+        self.bot_wake_prefixs: list[str] = self.config["wake_prefix"]
+        self.prov_wake_prefix: str = self.config["provider_settings"]["wake_prefix"]
+        for bwp in self.bot_wake_prefixs:
+            if self.prov_wake_prefix.startswith(bwp):
+                logger.info(
+                    f"识别 LLM 聊天额外唤醒前缀 {self.prov_wake_prefix} 以机器人唤醒前缀 {bwp} 开头，已自动去除。",
+                )
+                self.prov_wake_prefix = self.prov_wake_prefix[len(bwp) :]
+
+        agent_runner_type = self.config["provider_settings"]["agent_runner_type"]
+        if agent_runner_type == "local":
+            self.agent_sub_stage = InternalAgentSubStage()
+        else:
+            self.agent_sub_stage = ThirdPartyAgentSubStage()
+        await self.agent_sub_stage.initialize(ctx)
+
+    async def process(self, event: AstrMessageEvent) -> AsyncGenerator[None, None]:
+        if not self.ctx.astrbot_config["provider_settings"]["enable"]:
+            logger.debug(
+                "This pipeline does not enable AI capability, skip processing."
+            )
+            return
+
+        if not SessionServiceManager.should_process_llm_request(event):
+            logger.debug(
+                f"The session {event.unified_msg_origin} has disabled AI capability, skipping processing."
+            )
+            return
+
+        async for resp in self.agent_sub_stage.process(event, self.prov_wake_prefix):
+            yield resp