fix: add plugin set and knowledge bases selection in custom rules page

fixes: #3806

.gitignore

@@ -34,7 +34,6 @@ dashboard/node_modules/
 dashboard/dist/
 package-lock.json
 package.json
-yarn.lock
 
 # Operating System
 **/.DS_Store

astrbot/cli/__init__.py

@@ -1 +1 @@
-__version__ = "4.7.2"
+__version__ = "3.5.23"

astrbot/core/agent/message.py

@@ -153,7 +153,6 @@ class AssistantMessageSegment(Message):
     """A message segment from the assistant."""
 
     role: Literal["assistant"] = "assistant"
-    content: str | list[ContentPart] | None = None
     tool_calls: list[ToolCall] | list[dict] | None = None
 
 

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.2"
+VERSION = "4.7.0"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 # 默认配置
@@ -90,7 +90,6 @@ DEFAULT_CONFIG = {
         "group_icl_enable": False,
         "group_message_max_cnt": 300,
         "image_caption": False,
-        "image_caption_provider_id": "",
         "active_reply": {
             "enable": False,
             "method": "possibility_reply",
@@ -2110,9 +2109,6 @@ CONFIG_METADATA_2 = {
                     "image_caption": {
                         "type": "bool",
                     },
-                    "image_caption_provider_id": {
-                        "type": "string",
-                    },
                     "image_caption_prompt": {
                         "type": "string",
                     },
@@ -2789,16 +2785,7 @@ CONFIG_METADATA_3 = {
                     "provider_ltm_settings.image_caption": {
                         "description": "自动理解图片",
                         "type": "bool",
-                        "hint": "需要设置群聊图片转述模型。",
-                    },
-                    "provider_ltm_settings.image_caption_provider_id": {
-                        "description": "群聊图片转述模型",
-                        "type": "string",
-                        "_special": "select_provider",
-                        "hint": "用于群聊上下文感知的图片理解，与默认图片转述模型分开配置。",
-                        "condition": {
-                            "provider_ltm_settings.image_caption": True,
-                        },
+                        "hint": "需要设置默认图片转述模型。",
                     },
                     "provider_ltm_settings.active_reply.enable": {
                         "description": "主动回复",

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

@@ -2,7 +2,7 @@ import asyncio
 from collections.abc import AsyncGenerator
 from typing import TYPE_CHECKING
 
-from astrbot.core import astrbot_config, logger
+from astrbot.core import logger
 from astrbot.core.agent.runners.coze.coze_agent_runner import CozeAgentRunner
 from astrbot.core.agent.runners.dashscope.dashscope_agent_runner import (
     DashscopeAgentRunner,
@@ -88,15 +88,12 @@ class ThirdPartyAgentSubStage(Stage):
             return
 
         self.prov_cfg: dict = next(
-            (p for p in astrbot_config["provider"] if p["id"] == self.prov_id),
+            (p for p in self.conf["provider"] if p["id"] == self.prov_id),
             {},
         )
-        if not self.prov_id:
-            logger.error("没有填写 Agent Runner 提供商 ID，请前往配置页面配置。")
-            return
-        if not self.prov_cfg:
+        if not self.prov_id or not self.prov_cfg:
             logger.error(
-                f"Agent Runner 提供商 {self.prov_id} 配置不存在，请前往配置页面修改配置。"
+                "Third Party Agent Runner provider ID is not configured properly."
             )
             return
 

astrbot/core/pipeline/process_stage/stage.py

@@ -1,5 +1,6 @@
 from collections.abc import AsyncGenerator
 
+from astrbot.core import logger
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.provider.entities import ProviderRequest
 from astrbot.core.star.star_handler import StarHandlerMetadata
@@ -62,5 +63,12 @@ class ProcessStage(Stage):
             if (
                 event.get_result() and not event.get_result().is_stopped()
             ) or not event.get_result():
+                # 事件没有终止传播
+                provider = self.ctx.plugin_manager.context.get_using_provider()
+
+                if not provider:
+                    logger.info("未找到可用的 LLM 提供商，请先前往配置服务提供商。")
+                    return
+
                 async for _ in self.agent_sub_stage.process(event):
                     yield

astrbot/core/provider/sources/anthropic_source.py

@@ -290,7 +290,7 @@ class ProviderAnthropic(Provider):
         try:
             llm_response = await self._query(payloads, func_tool)
         except Exception as e:
-            # logger.error(f"发生了错误。Provider 配置如下: {model_config}")
+            logger.error(f"发生了错误。Provider 配置如下: {model_config}")
             raise e
 
         return llm_response

astrbot/core/provider/sources/gemini_source.py

@@ -111,9 +111,9 @@ class ProviderGoogleGenAI(Provider):
                 f"检测到 Key 异常({e.message})，且已没有可用的 Key。 当前 Key: {self.chosen_api_key[:12]}...",
             )
             raise Exception("达到了 Gemini 速率限制, 请稍后再试...")
-        # logger.error(
-        #     f"发生了错误(gemini_source)。Provider 配置如下: {self.provider_config}",
-        # )
+        logger.error(
+            f"发生了错误(gemini_source)。Provider 配置如下: {self.provider_config}",
+        )
         raise e
 
     async def _prepare_query_config(

astrbot/core/provider/sources/openai_source.py

@@ -433,7 +433,7 @@ class ProviderOpenAIOfficial(Provider):
             )
             payloads.pop("tools", None)
             return False, chosen_key, available_api_keys, payloads, context_query, None
-        # logger.error(f"发生了错误。Provider 配置如下: {self.provider_config}")
+        logger.error(f"发生了错误。Provider 配置如下: {self.provider_config}")
 
         if "tool" in str(e).lower() and "support" in str(e).lower():
             logger.error("疑似该模型不支持函数调用工具调用。请输入 /tool off_all")

changelogs/v4.7.1.md

@@ -1,22 +0,0 @@
-## What's Changed
-
-### 修复了自定义规则页面无法设置插件和知识库的规则的问题
-
----
-
-重构：
-- 将 Dify、Coze、阿里云百炼应用等 LLMOps 提供商迁移到 Agent 执行器层，理清和本地 Agent 执行器的边界。详见：[Agent 执行器](https://docs.astrbot.app/use/agent-runner.html)
-- 将「会话管理」功能重构为「自定义规则」功能，理清和多配置文件功能的边界。详见：[自定义规则](https://docs.astrbot.app/use/custom-rules.html)
-
-优化：
-- Dify、阿里云百炼应用支持流式输出
-- 防止分段回复正则表达式解析错误导致消息不发送
-- 群聊上下文感知记录 At 信息
-- 优化模型提供商页面的测试提供商功能
-
-新增：
-- 支持在配置文件页面快速测试对话
-- 为配置文件配置项内容添加国际化支持
-
-修复：
-- 在更新 MCP Server 配置后，MCP 无法正常重启的问题

changelogs/v4.7.2.md

@@ -1,25 +0,0 @@
-## What's Changed
-
-1. 修复使用非默认配置文件情况下时，第三方 Agent Runner (Dify、Coze、阿里云百炼应用等)无法正常工作的问题
-2. 修复当“聊天模型”未设置，并且模型提供商中仅有 Agent Runner 时，无法正常使用 Agent Runner 的问题
-3. 修复部分情况下报错 `pydantic_core._pydantic_core.ValidationError: 1 validation error for Message content` 的问题
-4. 新增群聊模式下的专用图片转述模型配置 ([#3822](https://github.com/AstrBotDevs/AstrBot/issues/3822))
-
----
-
-重构：
-- 将 Dify、Coze、阿里云百炼应用等 LLMOps 提供商迁移到 Agent 执行器层，理清和本地 Agent 执行器的边界。详见：[Agent 执行器](https://docs.astrbot.app/use/agent-runner.html)
-- 将「会话管理」功能重构为「自定义规则」功能，理清和多配置文件功能的边界。详见：[自定义规则](https://docs.astrbot.app/use/custom-rules.html)
-
-优化：
-- Dify、阿里云百炼应用支持流式输出
-- 防止分段回复正则表达式解析错误导致消息不发送
-- 群聊上下文感知记录 At 信息
-- 优化模型提供商页面的测试提供商功能
-
-新增：
-- 支持在配置文件页面快速测试对话
-- 为配置文件配置项内容添加国际化支持
-
-修复：
-- 在更新 MCP Server 配置后，MCP 无法正常重启的问题

dashboard/src/components/chat/MessageList.vue

@@ -549,7 +549,7 @@ export default {
 }
 
 .bot-embedded-image {
-    max-width: 40%;
+    max-width: 80%;
     width: auto;
     height: auto;
     border-radius: 8px;
@@ -558,6 +558,10 @@ export default {
     transition: transform 0.2s ease;
 }
 
+.bot-embedded-image:hover {
+    transform: scale(1.02);
+}
+
 .embedded-audio {
     width: 300px;
     margin-top: 8px;

dashboard/src/components/shared/ConsoleDisplayer.vue

@@ -7,8 +7,8 @@ import { useCommonStore } from '@/stores/common';
     <!-- 添加筛选级别控件 -->
     <div class="filter-controls mb-2" v-if="showLevelBtns">
       <v-chip-group v-model="selectedLevels" column multiple>
-        <v-chip v-for="level in logLevels" :key="level" :color="getLevelColor(level)" filter variant="flat" size="small"
-          :text-color="level === 'DEBUG' || level === 'INFO' ? 'black' : 'white'" class="font-weight-medium">
+        <v-chip v-for="level in logLevels" :key="level" :color="getLevelColor(level)" filter
+          :text-color="level === 'DEBUG' || level === 'INFO' ? 'black' : 'white'">
           {{ level }}
         </v-chip>
       </v-chip-group>
@@ -168,7 +168,6 @@ export default {
   flex-wrap: wrap;
   gap: 8px;
   margin-bottom: 8px;
-  margin-left: 20px;
 }
 
 .fade-in {

dashboard/src/i18n/locales/en-US/features/config-metadata.json

@@ -379,11 +379,7 @@
         },
         "image_caption": {
           "description": "Auto-understand Images",
-          "hint": "Requires setting a group chat image caption model."
-        },
-        "image_caption_provider_id": {
-          "description": "Group Chat Image Caption Model",
-          "hint": "Used for image understanding in group chat context awareness, configured separately from the default image caption model."
+          "hint": "Requires setting a default image caption model."
         },
         "active_reply": {
           "enable": {

dashboard/src/i18n/locales/zh-CN/features/config-metadata.json

@@ -379,11 +379,7 @@
         },
         "image_caption": {
           "description": "自动理解图片",
-          "hint": "需要设置群聊图片转述模型。"
-        },
-        "image_caption_provider_id": {
-          "description": "群聊图片转述模型",
-          "hint": "用于群聊上下文感知的图片理解，与默认图片转述模型分开配置。"
+          "hint": "需要设置默认图片转述模型。"
         },
         "active_reply": {
           "enable": {

dashboard/src/views/PlatformPage.vue

@@ -35,7 +35,7 @@
       </div>
 
       <!-- 日志部分 -->
-      <v-card elevation="0" class="mt-4 mb-10">
+      <v-card elevation="0" class="mt-4">
         <v-card-title class="d-flex align-center py-3 px-4">
           <v-icon class="me-2">mdi-console-line</v-icon>
           <span class="text-h4">{{ tm('logs.title') }}</span>
@@ -233,6 +233,5 @@ export default {
 .platform-page {
   padding: 20px;
   padding-top: 8px;
-  padding-bottom: 40px;
 }
 </style>

dashboard/src/views/ProviderPage.vue

@@ -148,7 +148,7 @@
       </div>
 
       <!-- 日志部分 -->
-      <v-card elevation="0" class="mt-4 mb-10">
+      <v-card elevation="0" class="mt-4">
         <v-card-title class="d-flex align-center py-3 px-4">
           <v-icon class="me-2">mdi-console-line</v-icon>
           <span class="text-h4">{{ tm('logs.title') }}</span>
@@ -849,7 +849,6 @@ export default {
 .provider-page {
   padding: 20px;
   padding-top: 8px;
-  padding-bottom: 40px;
 }
 
 .status-card {

packages/astrbot/long_term_memory.py

@@ -30,13 +30,16 @@ class LongTermMemory:
         except BaseException as e:
             logger.error(e)
             max_cnt = 300
+        image_caption = (
+            True
+            if cfg["provider_settings"]["default_image_caption_provider_id"]
+            and cfg["provider_ltm_settings"]["image_caption"]
+            else False
+        )
         image_caption_prompt = cfg["provider_settings"]["image_caption_prompt"]
-        image_caption_provider_id = cfg["provider_ltm_settings"].get(
-            "image_caption_provider_id"
-        )
-        image_caption = cfg["provider_ltm_settings"]["image_caption"] and bool(
-            image_caption_provider_id
-        )
+        image_caption_provider_id = cfg["provider_settings"][
+            "default_image_caption_provider_id"
+        ]
         active_reply = cfg["provider_ltm_settings"]["active_reply"]
         enable_active_reply = active_reply.get("enable", False)
         ar_method = active_reply["method"]

pyproject.toml

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