Compare commits

...

45 Commits

Author SHA1 Message Date
Soulter 1de377e749 fix: enhance file naming logic in File component and update prompt handling in InternalAgentSubStage 2025-12-01 18:12:03 +08:00
Soulter 6aa6963ab5 feat: add condition settings for local agent runner in default configuration 2025-12-01 17:41:14 +08:00
Soulter d3001d8148 fix: update file name handling in InternalAgentSubStage to correctly associate file names with extracted content 2025-12-01 17:40:30 +08:00
Soulter 380c4faf17 fix: add error handling for file extract application in InternalAgentSubStage 2025-12-01 14:58:18 +08:00
Soulter bd2a88783c fix: correct indentation in default configuration file 2025-12-01 14:56:32 +08:00
Soulter 17d7f822e7 feat: introduce file extract capability
powered by MoonshotAI
2025-12-01 14:54:25 +08:00
雪語 0e034f0fbd fix: aiocqhttp 适配器 NapCat 文件名获取为空 (#3853)
* aiocqhttp 适配器 NapCat 文件名获取为空

修复使用 NapCat 时,文件消息的 File.name 为空的问题。原代码硬编码 name="",导致下游插件无法获取文件名和扩展名

* Enhance file name retrieval from message data

Updated file name extraction logic to check multiple fields for better accuracy.
2025-12-01 13:36:19 +08:00
Soulter 2a7d03f9e1 fix: fit language and log AI responses more clearly (#3864)
* fix: fit language and log AI responses more clearly

* chore: ruff format
2025-12-01 13:24:52 +08:00
Soulter 72fac4b9f1 feat: implement unified provider availability testing across components (#3865)
- Added a `test` method to each provider class to standardize availability checks.
- Updated the dashboard and command routes to utilize the new `test` method for provider reachability verification, simplifying the logic and improving maintainability.
- Removed redundant reachability check logic from the command handler.
2025-12-01 13:17:20 +08:00
Soulter 38281ba2cf refactor: restore reachability check configuration in default settings and localization files 2025-12-01 00:38:30 +08:00
Soulter 21aa3174f4 fix: disable reachability check in default configuration 2025-12-01 00:16:11 +08:00
邹永赫 dcda871fc0 feat: provider availability reachability improvements (#3708) 2025-12-01 01:06:10 +09:00
Soulter c13c51f499 fix: assistant message validation error when tool_call exists but content not exists (#3862)
* fix: assistant message validation error when tool_call exists but content not exists

* fix: enhance content validation in Message model to allow None for assistant role with tool_calls
2025-11-30 23:42:37 +08:00
Dt8333 a130db5cf4 fix: 将 Graceful shutdown 的异常改为 KeyboardInterrupt (#3855) 2025-11-30 20:31:17 +08:00
邹永赫 7faeb5cea8 Merge pull request #3850 from zouyonghe/feature/plugin-upgrade-all
增加升级所有插件按钮
2025-11-30 15:12:36 +09:00
ZouYonghe 8d3ff61e0d Format plugin route with ruff 2025-11-30 11:56:24 +08:00
ZouYonghe 4c03e82570 Fix plugin update JSON parsing and concurrency handling 2025-11-30 11:50:46 +08:00
ZouYonghe e7e8664ab4 chore: tweak update all label 2025-11-30 11:18:30 +08:00
ZouYonghe 1dd1623e7d feat: batch update plugins via new api 2025-11-30 11:11:36 +08:00
ZouYonghe 80d8161d58 feat: add update all plugins action 2025-11-30 10:40:46 +08:00
Soulter fc80d7d681 chore: bump version to 4.7.3 2025-11-30 00:42:49 +08:00
Soulter c2f036b27c chore: bump vertion to 4.7.2 2025-11-30 00:33:07 +08:00
Soulter 4087bbb512 perf: set content attribute optional to AssistantMessageSegment for enhanced message handling
fixes: #3843
2025-11-30 00:32:00 +08:00
Soulter e1c728582d chore: bump version to 4.7.2 2025-11-30 00:18:23 +08:00
Oscar Shaw 93c69a639a feat: 新增群聊模式下的专用图片转述模型配置 (#3822)
* feat: add image caption provider configuration for group chat

- Introduced `image_caption_provider_id` to allow separate configuration for group chat image understanding.
- Updated metadata and hints in English and Chinese for clarity on new settings.
- Adjusted logic in long term memory to utilize the new provider ID for image captioning.

* fix: format

* Fix logic for image caption and active reply settings

* Fix indentation and formatting in long_term_memory.py

* chore: ruff format

---------

Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>
Co-authored-by: Soulter <905617992@qq.com>
2025-11-29 23:53:32 +08:00
Soulter a7fdc98b29 fix: third party agent runner cannot run properly when using non-default config file
fix: #3815
2025-11-29 23:45:12 +08:00
Soulter 85b7f104df fix: remove unnecessary provider check (#3846)
fixes: #3815
2025-11-29 23:15:19 +08:00
Oscar Shaw d76d1bd7fe perf: adjust padding for PlatformPage and ProviderPage log sections (#3825)
- Added bottom margin to log card for better spacing.
2025-11-29 19:15:35 +08:00
Soulter df4412aa80 style: adjust bot-embedded-image max-width and remove hover effect for improved layout 2025-11-29 01:31:25 +08:00
Soulter ab2c94e19a chore: comment out error logging in provider sources to reduce verbosity 2025-11-28 19:59:33 +08:00
Oscar Shaw 37cc4e2121 perf: console tag UI improve (#3816)
- Added yarn.lock to .gitignore to prevent tracking of Yarn lock files.
- Updated ConsoleDisplayer.vue to improve chip styling
2025-11-28 17:17:11 +08:00
Soulter 60dfdd0a66 chore: update astrbot cli version 2025-11-28 16:53:20 +08:00
Soulter bb8b2cb194 chore: bump version to 4.7.1 2025-11-28 15:13:35 +08:00
Soulter 4e29684aa3 fix: add plugin set and knowledge bases selection in custom rules page (#3813)
fixes: #3806
2025-11-28 13:29:50 +08:00
Soulter 0e17e3553d chore: bump version to 4.7.0 2025-11-27 23:50:05 +08:00
Soulter 0a55060e89 fix: session controller in webchat 2025-11-27 22:32:35 +08:00
Soulter 77859c7daa feat: enhance provider status display in ProviderPage
- Added a tooltip to show detailed provider status, including availability and error messages.
- Refactored item details template to include status chips for better visual representation.
- Removed unused status section to streamline the UI.
2025-11-27 16:39:51 +08:00
Soulter ba39c393a0 perf: enhance provider management with reload locking and logging (#3793)
- Introduced a reload lock to prevent concurrent reloads of providers.
- Added logging to indicate when a provider is disabled and when providers are being synchronized with the configuration.
- Refactored the reload method to improve clarity and maintainability.


Co-authored-by: anka <1350989414@qq.com>
2025-11-27 16:25:31 +08:00
Soulter 6a50d316d9 fix: mcp server cannot reload successfully after updating mcp server config (#3797)
fixes: #3780
2025-11-27 16:22:26 +08:00
Soulter 88c1d77f0b perf: add at message to group chat history (#3796)
* feat: enhance long-term memory message formatting

- Added support for 'At' message components in long-term memory, allowing for better representation of mentions in messages.

* chore: ruff check
2025-11-27 15:59:07 +08:00
Dt8333 758ce40cc1 chore: fix test (#3787) 2025-11-27 14:02:42 +08:00
Soulter 3e7bb80492 chore: ruff format 2025-11-27 14:01:25 +08:00
Soulter 75e95aa9ca fix: update session management icon in sidebar
- Changed the icon for the session management sidebar item from 'mdi-account-group' to 'mdi-pencil-ruler' for better representation.
2025-11-27 14:00:05 +08:00
Soulter a389842e25 feat: update session management UI with information button and layout adjustments
- Added an information button linking to custom rules documentation.
- Adjusted layout for improved spacing and readability in the session management page.
- Minor refactoring of the data table component for better alignment.
2025-11-27 13:58:37 +08:00
Soulter 0f6a3c3f5a refactor: session management custom rules (#3792)
* refactor: umo custom rules

* feat(i18n): update session management translations and improve provider configuration handling

- Updated English and Chinese translations for session management, including "Unified Message Origin" and "Follow Config".
- Enhanced provider configuration options to include "Follow Config" as a selectable item.
- Removed unused clear buttons and refactored provider configuration saving logic to handle updates and deletions more efficiently.
2025-11-27 13:30:43 +08:00
53 changed files with 2214 additions and 2576 deletions
+3
View File
@@ -34,6 +34,7 @@ dashboard/node_modules/
dashboard/dist/ dashboard/dist/
package-lock.json package-lock.json
package.json package.json
yarn.lock
# Operating System # Operating System
**/.DS_Store **/.DS_Store
@@ -47,3 +48,5 @@ astrbot.lock
chroma chroma
venv/* venv/*
pytest.ini pytest.ini
AGENTS.md
IFLOW.md
+1 -1
View File
@@ -1 +1 @@
__version__ = "3.5.23" __version__ = "4.7.3"
+3 -3
View File
@@ -345,9 +345,6 @@ class MCPClient:
async def cleanup(self): async def cleanup(self):
"""Clean up resources including old exit stacks from reconnections""" """Clean up resources including old exit stacks from reconnections"""
# Set running_event first to unblock any waiting tasks
self.running_event.set()
# Close current exit stack # Close current exit stack
try: try:
await self.exit_stack.aclose() await self.exit_stack.aclose()
@@ -359,6 +356,9 @@ class MCPClient:
# Just clear the list to release references # Just clear the list to release references
self._old_exit_stacks.clear() self._old_exit_stacks.clear()
# Set running_event first to unblock any waiting tasks
self.running_event.set()
class MCPTool(FunctionTool, Generic[TContext]): class MCPTool(FunctionTool, Generic[TContext]):
"""A function tool that calls an MCP service.""" """A function tool that calls an MCP service."""
+21 -4
View File
@@ -3,7 +3,7 @@
from typing import Any, ClassVar, Literal, cast from typing import Any, ClassVar, Literal, cast
from pydantic import BaseModel, GetCoreSchemaHandler from pydantic import BaseModel, GetCoreSchemaHandler, model_validator
from pydantic_core import core_schema from pydantic_core import core_schema
@@ -145,22 +145,39 @@ class Message(BaseModel):
"tool", "tool",
] ]
content: str | list[ContentPart] content: str | list[ContentPart] | None = None
"""The content of the message.""" """The content of the message."""
tool_calls: list[ToolCall] | list[dict] | None = None
"""The tool calls of the message."""
tool_call_id: str | None = None
"""The ID of the tool call."""
@model_validator(mode="after")
def check_content_required(self):
# assistant + tool_calls is not None: allow content to be None
if self.role == "assistant" and self.tool_calls is not None:
return self
# other all cases: content is required
if self.content is None:
raise ValueError(
"content is required unless role='assistant' and tool_calls is not None"
)
return self
class AssistantMessageSegment(Message): class AssistantMessageSegment(Message):
"""A message segment from the assistant.""" """A message segment from the assistant."""
role: Literal["assistant"] = "assistant" role: Literal["assistant"] = "assistant"
tool_calls: list[ToolCall] | list[dict] | None = None
class ToolCallMessageSegment(Message): class ToolCallMessageSegment(Message):
"""A message segment representing a tool call.""" """A message segment representing a tool call."""
role: Literal["tool"] = "tool" role: Literal["tool"] = "tool"
tool_call_id: str
class UserMessageSegment(Message): class UserMessageSegment(Message):
+70 -2
View File
@@ -4,7 +4,7 @@ import os
from astrbot.core.utils.astrbot_path import get_astrbot_data_path from astrbot.core.utils.astrbot_path import get_astrbot_data_path
VERSION = "4.6.1" VERSION = "4.7.3"
DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db") DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
# 默认配置 # 默认配置
@@ -73,8 +73,14 @@ DEFAULT_CONFIG = {
"coze_agent_runner_provider_id": "", "coze_agent_runner_provider_id": "",
"dashscope_agent_runner_provider_id": "", "dashscope_agent_runner_provider_id": "",
"unsupported_streaming_strategy": "realtime_segmenting", "unsupported_streaming_strategy": "realtime_segmenting",
"reachability_check": False,
"max_agent_step": 30, "max_agent_step": 30,
"tool_call_timeout": 60, "tool_call_timeout": 60,
"file_extract": {
"enable": False,
"provider": "moonshotai",
"moonshotai_api_key": "",
},
}, },
"provider_stt_settings": { "provider_stt_settings": {
"enable": False, "enable": False,
@@ -90,6 +96,7 @@ DEFAULT_CONFIG = {
"group_icl_enable": False, "group_icl_enable": False,
"group_message_max_cnt": 300, "group_message_max_cnt": 300,
"image_caption": False, "image_caption": False,
"image_caption_provider_id": "",
"active_reply": { "active_reply": {
"enable": False, "enable": False,
"method": "possibility_reply", "method": "possibility_reply",
@@ -2067,6 +2074,20 @@ CONFIG_METADATA_2 = {
"tool_call_timeout": { "tool_call_timeout": {
"type": "int", "type": "int",
}, },
"file_extract": {
"type": "object",
"items": {
"enable": {
"type": "bool",
},
"provider": {
"type": "string",
},
"moonshotai_api_key": {
"type": "string",
},
},
},
}, },
}, },
"provider_stt_settings": { "provider_stt_settings": {
@@ -2109,6 +2130,9 @@ CONFIG_METADATA_2 = {
"image_caption": { "image_caption": {
"type": "bool", "type": "bool",
}, },
"image_caption_provider_id": {
"type": "string",
},
"image_caption_prompt": { "image_caption_prompt": {
"type": "string", "type": "string",
}, },
@@ -2398,6 +2422,36 @@ CONFIG_METADATA_3 = {
"provider_settings.enable": True, "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": { "others": {
"description": "其他配置", "description": "其他配置",
"type": "object", "type": "object",
@@ -2492,6 +2546,11 @@ CONFIG_METADATA_3 = {
"description": "开启 TTS 时同时输出语音和文字内容", "description": "开启 TTS 时同时输出语音和文字内容",
"type": "bool", "type": "bool",
}, },
"provider_settings.reachability_check": {
"description": "提供商可达性检测",
"type": "bool",
"hint": "/provider 命令列出模型时是否并发检测连通性。开启后会主动调用模型测试连通性,可能产生额外 token 消耗。",
},
}, },
"condition": { "condition": {
"provider_settings.enable": True, "provider_settings.enable": True,
@@ -2785,7 +2844,16 @@ CONFIG_METADATA_3 = {
"provider_ltm_settings.image_caption": { "provider_ltm_settings.image_caption": {
"description": "自动理解图片", "description": "自动理解图片",
"type": "bool", "type": "bool",
"hint": "需要设置默认图片转述模型。", "hint": "需要设置群聊图片转述模型。",
},
"provider_ltm_settings.image_caption_provider_id": {
"description": "群聊图片转述模型",
"type": "string",
"_special": "select_provider",
"hint": "用于群聊上下文感知的图片理解,与默认图片转述模型分开配置。",
"condition": {
"provider_ltm_settings.image_caption": True,
},
}, },
"provider_ltm_settings.active_reply.enable": { "provider_ltm_settings.active_reply.enable": {
"description": "主动回复", "description": "主动回复",
+6 -1
View File
@@ -722,7 +722,12 @@ class File(BaseMessageComponent):
"""下载文件""" """下载文件"""
download_dir = os.path.join(get_astrbot_data_path(), "temp") download_dir = os.path.join(get_astrbot_data_path(), "temp")
os.makedirs(download_dir, exist_ok=True) os.makedirs(download_dir, exist_ok=True)
file_path = os.path.join(download_dir, f"{uuid.uuid4().hex}") if self.name:
name, ext = os.path.splitext(self.name)
filename = f"{name}_{uuid.uuid4().hex[:8]}{ext}"
else:
filename = f"{uuid.uuid4().hex}"
file_path = os.path.join(download_dir, filename)
await download_file(self.url, file_path) await download_file(self.url, file_path)
self.file_ = os.path.abspath(file_path) self.file_ = os.path.abspath(file_path)
@@ -9,7 +9,7 @@ from astrbot.core import logger
from astrbot.core.agent.tool import ToolSet from astrbot.core.agent.tool import ToolSet
from astrbot.core.astr_agent_context import AstrAgentContext from astrbot.core.astr_agent_context import AstrAgentContext
from astrbot.core.conversation_mgr import Conversation from astrbot.core.conversation_mgr import Conversation
from astrbot.core.message.components import Image from astrbot.core.message.components import File, Image, Reply
from astrbot.core.message.message_event_result import ( from astrbot.core.message.message_event_result import (
MessageChain, MessageChain,
MessageEventResult, MessageEventResult,
@@ -22,6 +22,7 @@ from astrbot.core.provider.entities import (
ProviderRequest, ProviderRequest,
) )
from astrbot.core.star.star_handler import EventType, star_map from astrbot.core.star.star_handler import EventType, star_map
from astrbot.core.utils.file_extract import extract_file_moonshotai
from astrbot.core.utils.metrics import Metric from astrbot.core.utils.metrics import Metric
from astrbot.core.utils.session_lock import session_lock_manager from astrbot.core.utils.session_lock import session_lock_manager
@@ -56,6 +57,13 @@ class InternalAgentSubStage(Stage):
self.show_reasoning = settings.get("display_reasoning_text", False) self.show_reasoning = settings.get("display_reasoning_text", False)
self.kb_agentic_mode: bool = conf.get("kb_agentic_mode", False) self.kb_agentic_mode: bool = conf.get("kb_agentic_mode", False)
file_extract_conf: dict = settings.get("file_extract", {})
self.file_extract_enabled: bool = file_extract_conf.get("enable", False)
self.file_extract_prov: str = file_extract_conf.get("provider", "moonshotai")
self.file_extract_msh_api_key: str = file_extract_conf.get(
"moonshotai_api_key", ""
)
self.conv_manager = ctx.plugin_manager.context.conversation_manager self.conv_manager = ctx.plugin_manager.context.conversation_manager
def _select_provider(self, event: AstrMessageEvent): def _select_provider(self, event: AstrMessageEvent):
@@ -114,6 +122,50 @@ class InternalAgentSubStage(Stage):
req.func_tool = ToolSet() req.func_tool = ToolSet()
req.func_tool.add_tool(KNOWLEDGE_BASE_QUERY_TOOL) req.func_tool.add_tool(KNOWLEDGE_BASE_QUERY_TOOL)
async def _apply_file_extract(
self,
event: AstrMessageEvent,
req: ProviderRequest,
):
"""Apply file extract to the provider request"""
file_paths = []
file_names = []
for comp in event.message_obj.message:
if isinstance(comp, File):
file_paths.append(await comp.get_file())
file_names.append(comp.name)
elif isinstance(comp, Reply) and comp.chain:
for reply_comp in comp.chain:
if isinstance(reply_comp, File):
file_paths.append(await reply_comp.get_file())
file_names.append(reply_comp.name)
if not file_paths:
return
if not req.prompt:
req.prompt = "总结一下文件里面讲了什么?"
if self.file_extract_prov == "moonshotai":
if not self.file_extract_msh_api_key:
logger.error("Moonshot AI API key for file extract is not set")
return
file_contents = await asyncio.gather(
*[
extract_file_moonshotai(file_path, self.file_extract_msh_api_key)
for file_path in file_paths
]
)
else:
logger.error(f"Unsupported file extract provider: {self.file_extract_prov}")
return
# add file extract results to contexts
for file_content, file_name in zip(file_contents, file_names):
req.contexts.append(
{
"role": "system",
"content": f"File Extract Results of user uploaded files:\n{file_content}\nFile Name: {file_name or 'Unknown'}",
},
)
def _truncate_contexts( def _truncate_contexts(
self, self,
contexts: list[dict], contexts: list[dict],
@@ -346,6 +398,17 @@ class InternalAgentSubStage(Stage):
event.set_extra("provider_request", req) event.set_extra("provider_request", req)
# fix contexts json str
if isinstance(req.contexts, str):
req.contexts = json.loads(req.contexts)
# apply file extract
if self.file_extract_enabled:
try:
await self._apply_file_extract(event, req)
except Exception as e:
logger.error(f"Error occurred while applying file extract: {e}")
if not req.prompt and not req.image_urls: if not req.prompt and not req.image_urls:
return return
@@ -356,10 +419,6 @@ class InternalAgentSubStage(Stage):
# apply knowledge base feature # apply knowledge base feature
await self._apply_kb(event, req) await self._apply_kb(event, req)
# fix contexts json str
if isinstance(req.contexts, str):
req.contexts = json.loads(req.contexts)
# truncate contexts to fit max length # truncate contexts to fit max length
if req.contexts: if req.contexts:
req.contexts = self._truncate_contexts(req.contexts) req.contexts = self._truncate_contexts(req.contexts)
@@ -2,7 +2,7 @@ import asyncio
from collections.abc import AsyncGenerator from collections.abc import AsyncGenerator
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from astrbot.core import logger from astrbot.core import astrbot_config, logger
from astrbot.core.agent.runners.coze.coze_agent_runner import CozeAgentRunner from astrbot.core.agent.runners.coze.coze_agent_runner import CozeAgentRunner
from astrbot.core.agent.runners.dashscope.dashscope_agent_runner import ( from astrbot.core.agent.runners.dashscope.dashscope_agent_runner import (
DashscopeAgentRunner, DashscopeAgentRunner,
@@ -88,12 +88,15 @@ class ThirdPartyAgentSubStage(Stage):
return return
self.prov_cfg: dict = next( self.prov_cfg: dict = next(
(p for p in self.conf["provider"] if p["id"] == self.prov_id), (p for p in astrbot_config["provider"] if p["id"] == self.prov_id),
{}, {},
) )
if not self.prov_id or not self.prov_cfg: if not self.prov_id:
logger.error("没有填写 Agent Runner 提供商 ID,请前往配置页面配置。")
return
if not self.prov_cfg:
logger.error( logger.error(
"Third Party Agent Runner provider ID is not configured properly." f"Agent Runner 提供商 {self.prov_id} 配置不存在,请前往配置页面修改配置。"
) )
return return
@@ -1,6 +1,5 @@
from collections.abc import AsyncGenerator from collections.abc import AsyncGenerator
from astrbot.core import logger
from astrbot.core.platform.astr_message_event import AstrMessageEvent from astrbot.core.platform.astr_message_event import AstrMessageEvent
from astrbot.core.provider.entities import ProviderRequest from astrbot.core.provider.entities import ProviderRequest
from astrbot.core.star.star_handler import StarHandlerMetadata from astrbot.core.star.star_handler import StarHandlerMetadata
@@ -63,12 +62,5 @@ class ProcessStage(Stage):
if ( if (
event.get_result() and not event.get_result().is_stopped() event.get_result() and not event.get_result().is_stopped()
) or not event.get_result(): ) 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): async for _ in self.agent_sub_stage.process(event):
yield yield
@@ -246,7 +246,13 @@ class AiocqhttpAdapter(Platform):
if m["data"].get("url") and m["data"].get("url").startswith("http"): if m["data"].get("url") and m["data"].get("url").startswith("http"):
# Lagrange # Lagrange
logger.info("guessing lagrange") logger.info("guessing lagrange")
file_name = m["data"].get("file_name", "file") # 检查多个可能的文件名字段
file_name = (
m["data"].get("file_name", "")
or m["data"].get("name", "")
or m["data"].get("file", "")
or "file"
)
abm.message.append(File(name=file_name, url=m["data"]["url"])) abm.message.append(File(name=file_name, url=m["data"]["url"]))
else: else:
try: try:
@@ -265,7 +271,14 @@ class AiocqhttpAdapter(Platform):
) )
if ret and "url" in ret: if ret and "url" in ret:
file_url = ret["url"] # https file_url = ret["url"] # https
a = File(name="", url=file_url) # 优先从 API 返回值获取文件名,其次从原始消息数据获取
file_name = (
ret.get("file_name", "")
or ret.get("name", "")
or m["data"].get("file", "")
or m["data"].get("file_name", "")
)
a = File(name=file_name, url=file_url)
abm.message.append(a) abm.message.append(a)
else: else:
logger.error(f"获取文件失败: {ret}") logger.error(f"获取文件失败: {ret}")
@@ -250,7 +250,7 @@ class DingtalkPlatformAdapter(Platform):
async def terminate(self): async def terminate(self):
def monkey_patch_close(): def monkey_patch_close():
raise Exception("Graceful shutdown") raise KeyboardInterrupt("Graceful shutdown")
self.client_.open_connection = monkey_patch_close self.client_.open_connection = monkey_patch_close
await self.client_.websocket.close(code=1000, reason="Graceful shutdown") await self.client_.websocket.close(code=1000, reason="Graceful shutdown")
@@ -381,7 +381,9 @@ class TelegramPlatformAdapter(Platform):
f"Telegram document file_path is None, cannot save the file {file_name}.", f"Telegram document file_path is None, cannot save the file {file_name}.",
) )
else: else:
message.message.append(Comp.File(file=file_path, name=file_name)) message.message.append(
Comp.File(file=file_path, name=file_name, url=file_path)
)
elif update.message.video: elif update.message.video:
file = await update.message.video.get_file() file = await update.message.video.get_file()
+39 -31
View File
@@ -1,7 +1,7 @@
import asyncio import asyncio
import traceback import traceback
from astrbot.core import logger, sp from astrbot.core import astrbot_config, logger, sp
from astrbot.core.astrbot_config_mgr import AstrBotConfigManager from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
from astrbot.core.db import BaseDatabase from astrbot.core.db import BaseDatabase
@@ -24,6 +24,7 @@ class ProviderManager:
db_helper: BaseDatabase, db_helper: BaseDatabase,
persona_mgr: PersonaManager, persona_mgr: PersonaManager,
): ):
self.reload_lock = asyncio.Lock()
self.persona_mgr = persona_mgr self.persona_mgr = persona_mgr
self.acm = acm self.acm = acm
config = acm.confs["default"] config = acm.confs["default"]
@@ -226,6 +227,7 @@ class ProviderManager:
async def load_provider(self, provider_config: dict): async def load_provider(self, provider_config: dict):
if not provider_config["enable"]: if not provider_config["enable"]:
logger.info(f"Provider {provider_config['id']} is disabled, skipping")
return return
if provider_config.get("provider_type", "") == "agent_runner": if provider_config.get("provider_type", "") == "agent_runner":
return return
@@ -434,40 +436,46 @@ class ProviderManager:
) )
async def reload(self, provider_config: dict): async def reload(self, provider_config: dict):
await self.terminate_provider(provider_config["id"]) async with self.reload_lock:
if provider_config["enable"]: await self.terminate_provider(provider_config["id"])
await self.load_provider(provider_config) if provider_config["enable"]:
await self.load_provider(provider_config)
# 和配置文件保持同步 # 和配置文件保持同步
config_ids = [provider["id"] for provider in self.providers_config] self.providers_config = astrbot_config["provider"]
logger.debug(f"providers in user's config: {config_ids}") config_ids = [provider["id"] for provider in self.providers_config]
for key in list(self.inst_map.keys()): logger.info(f"providers in user's config: {config_ids}")
if key not in config_ids: for key in list(self.inst_map.keys()):
await self.terminate_provider(key) if key not in config_ids:
await self.terminate_provider(key)
if len(self.provider_insts) == 0: if len(self.provider_insts) == 0:
self.curr_provider_inst = None self.curr_provider_inst = None
elif self.curr_provider_inst is None and len(self.provider_insts) > 0: elif self.curr_provider_inst is None and len(self.provider_insts) > 0:
self.curr_provider_inst = self.provider_insts[0] self.curr_provider_inst = self.provider_insts[0]
logger.info( logger.info(
f"自动选择 {self.curr_provider_inst.meta().id} 作为当前提供商适配器。", f"自动选择 {self.curr_provider_inst.meta().id} 作为当前提供商适配器。",
) )
if len(self.stt_provider_insts) == 0: if len(self.stt_provider_insts) == 0:
self.curr_stt_provider_inst = None self.curr_stt_provider_inst = None
elif self.curr_stt_provider_inst is None and len(self.stt_provider_insts) > 0: elif (
self.curr_stt_provider_inst = self.stt_provider_insts[0] self.curr_stt_provider_inst is None and len(self.stt_provider_insts) > 0
logger.info( ):
f"自动选择 {self.curr_stt_provider_inst.meta().id} 作为当前语音转文本提供商适配器。", self.curr_stt_provider_inst = self.stt_provider_insts[0]
) logger.info(
f"自动选择 {self.curr_stt_provider_inst.meta().id} 作为当前语音转文本提供商适配器。",
)
if len(self.tts_provider_insts) == 0: if len(self.tts_provider_insts) == 0:
self.curr_tts_provider_inst = None self.curr_tts_provider_inst = None
elif self.curr_tts_provider_inst is None and len(self.tts_provider_insts) > 0: elif (
self.curr_tts_provider_inst = self.tts_provider_insts[0] self.curr_tts_provider_inst is None and len(self.tts_provider_insts) > 0
logger.info( ):
f"自动选择 {self.curr_tts_provider_inst.meta().id} 作为当前文本转语音提供商适配器。", self.curr_tts_provider_inst = self.tts_provider_insts[0]
) logger.info(
f"自动选择 {self.curr_tts_provider_inst.meta().id} 作为当前文本转语音提供商适配器。",
)
def get_insts(self): def get_insts(self):
return self.provider_insts return self.provider_insts
+57
View File
@@ -1,5 +1,6 @@
import abc import abc
import asyncio import asyncio
import os
from collections.abc import AsyncGenerator from collections.abc import AsyncGenerator
from astrbot.core.agent.message import Message from astrbot.core.agent.message import Message
@@ -11,6 +12,7 @@ from astrbot.core.provider.entities import (
ToolCallsResult, ToolCallsResult,
) )
from astrbot.core.provider.register import provider_cls_map from astrbot.core.provider.register import provider_cls_map
from astrbot.core.utils.astrbot_path import get_astrbot_path
class AbstractProvider(abc.ABC): class AbstractProvider(abc.ABC):
@@ -43,6 +45,14 @@ class AbstractProvider(abc.ABC):
) )
return meta return meta
async def test(self) -> bool:
"""test the provider is a
Returns:
bool: the provider is available
"""
return True
class Provider(AbstractProvider): class Provider(AbstractProvider):
"""Chat Provider""" """Chat Provider"""
@@ -165,6 +175,16 @@ class Provider(AbstractProvider):
return dicts return dicts
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): class STTProvider(AbstractProvider):
def __init__(self, provider_config: dict, provider_settings: dict) -> None: def __init__(self, provider_config: dict, provider_settings: dict) -> None:
@@ -177,6 +197,20 @@ class STTProvider(AbstractProvider):
"""获取音频的文本""" """获取音频的文本"""
raise NotImplementedError raise NotImplementedError
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): class TTSProvider(AbstractProvider):
def __init__(self, provider_config: dict, provider_settings: dict) -> None: def __init__(self, provider_config: dict, provider_settings: dict) -> None:
@@ -189,6 +223,13 @@ class TTSProvider(AbstractProvider):
"""获取文本的音频,返回音频文件路径""" """获取文本的音频,返回音频文件路径"""
raise NotImplementedError raise NotImplementedError
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): class EmbeddingProvider(AbstractProvider):
def __init__(self, provider_config: dict, provider_settings: dict) -> None: def __init__(self, provider_config: dict, provider_settings: dict) -> None:
@@ -211,6 +252,15 @@ class EmbeddingProvider(AbstractProvider):
"""获取向量的维度""" """获取向量的维度"""
... ...
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( async def get_embeddings_batch(
self, self,
texts: list[str], texts: list[str],
@@ -294,3 +344,10 @@ class RerankProvider(AbstractProvider):
) -> list[RerankResult]: ) -> list[RerankResult]:
"""获取查询和文档的重排序分数""" """获取查询和文档的重排序分数"""
... ...
async def test(self) -> bool:
try:
await self.rerank("Apple", documents=["apple", "banana"])
return True
except Exception:
return False
@@ -290,7 +290,7 @@ class ProviderAnthropic(Provider):
try: try:
llm_response = await self._query(payloads, func_tool) llm_response = await self._query(payloads, func_tool)
except Exception as e: except Exception as e:
logger.error(f"发生了错误。Provider 配置如下: {model_config}") # logger.error(f"发生了错误。Provider 配置如下: {model_config}")
raise e raise e
return llm_response return llm_response
@@ -111,9 +111,9 @@ class ProviderGoogleGenAI(Provider):
f"检测到 Key 异常({e.message}),且已没有可用的 Key。 当前 Key: {self.chosen_api_key[:12]}...", f"检测到 Key 异常({e.message}),且已没有可用的 Key。 当前 Key: {self.chosen_api_key[:12]}...",
) )
raise Exception("达到了 Gemini 速率限制, 请稍后再试...") raise Exception("达到了 Gemini 速率限制, 请稍后再试...")
logger.error( # logger.error(
f"发生了错误(gemini_source)。Provider 配置如下: {self.provider_config}", # f"发生了错误(gemini_source)。Provider 配置如下: {self.provider_config}",
) # )
raise e raise e
async def _prepare_query_config( async def _prepare_query_config(
@@ -433,7 +433,7 @@ class ProviderOpenAIOfficial(Provider):
) )
payloads.pop("tools", None) payloads.pop("tools", None)
return False, chosen_key, available_api_keys, payloads, context_query, 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(): if "tool" in str(e).lower() and "support" in str(e).lower():
logger.error("疑似该模型不支持函数调用工具调用。请输入 /tool off_all") logger.error("疑似该模型不支持函数调用工具调用。请输入 /tool off_all")
-107
View File
@@ -171,110 +171,3 @@ class SessionServiceManager:
# 如果没有配置,默认为启用(兼容性考虑) # 如果没有配置,默认为启用(兼容性考虑)
return True return True
@staticmethod
def set_session_status(session_id: str, enabled: bool) -> None:
"""设置会话的整体启停状态
Args:
session_id: 会话ID (unified_msg_origin)
enabled: True表示启用,False表示禁用
"""
session_config = (
sp.get("session_service_config", {}, scope="umo", scope_id=session_id) or {}
)
session_config["session_enabled"] = enabled
sp.put(
"session_service_config",
session_config,
scope="umo",
scope_id=session_id,
)
logger.info(
f"会话 {session_id} 的整体状态已更新为: {'启用' if enabled else '禁用'}",
)
@staticmethod
def should_process_session_request(event: AstrMessageEvent) -> bool:
"""检查是否应该处理会话请求(会话整体启停检查)
Args:
event: 消息事件
Returns:
bool: True表示应该处理,False表示跳过
"""
session_id = event.unified_msg_origin
return SessionServiceManager.is_session_enabled(session_id)
# =============================================================================
# 会话命名相关方法
# =============================================================================
@staticmethod
def get_session_custom_name(session_id: str) -> str | None:
"""获取会话的自定义名称
Args:
session_id: 会话ID (unified_msg_origin)
Returns:
str: 自定义名称,如果没有设置则返回None
"""
session_services = sp.get(
"session_service_config",
{},
scope="umo",
scope_id=session_id,
)
return session_services.get("custom_name")
@staticmethod
def set_session_custom_name(session_id: str, custom_name: str) -> None:
"""设置会话的自定义名称
Args:
session_id: 会话ID (unified_msg_origin)
custom_name: 自定义名称,可以为空字符串来清除名称
"""
session_config = (
sp.get("session_service_config", {}, scope="umo", scope_id=session_id) or {}
)
if custom_name and custom_name.strip():
session_config["custom_name"] = custom_name.strip()
else:
# 如果传入空名称,则删除自定义名称
session_config.pop("custom_name", None)
sp.put(
"session_service_config",
session_config,
scope="umo",
scope_id=session_id,
)
logger.info(
f"会话 {session_id} 的自定义名称已更新为: {custom_name.strip() if custom_name and custom_name.strip() else '已清除'}",
)
@staticmethod
def get_session_display_name(session_id: str) -> str:
"""获取会话的显示名称(优先显示自定义名称,否则显示原始session_id的最后一段)
Args:
session_id: 会话ID (unified_msg_origin)
Returns:
str: 显示名称
"""
custom_name = SessionServiceManager.get_session_custom_name(session_id)
if custom_name:
return custom_name
# 如果没有自定义名称,返回session_id的最后一段
return session_id.split(":")[2] if session_id.count(":") >= 2 else session_id
@@ -42,87 +42,6 @@ class SessionPluginManager:
# 如果都没有配置,默认为启用(兼容性考虑) # 如果都没有配置,默认为启用(兼容性考虑)
return True return True
@staticmethod
def set_plugin_status_for_session(
session_id: str,
plugin_name: str,
enabled: bool,
) -> None:
"""设置插件在指定会话中的启停状态
Args:
session_id: 会话ID (unified_msg_origin)
plugin_name: 插件名称
enabled: True表示启用,False表示禁用
"""
# 获取当前配置
session_plugin_config = sp.get(
"session_plugin_config",
{},
scope="umo",
scope_id=session_id,
)
if session_id not in session_plugin_config:
session_plugin_config[session_id] = {
"enabled_plugins": [],
"disabled_plugins": [],
}
session_config = session_plugin_config[session_id]
enabled_plugins = session_config.get("enabled_plugins", [])
disabled_plugins = session_config.get("disabled_plugins", [])
if enabled:
# 启用插件
if plugin_name in disabled_plugins:
disabled_plugins.remove(plugin_name)
if plugin_name not in enabled_plugins:
enabled_plugins.append(plugin_name)
else:
# 禁用插件
if plugin_name in enabled_plugins:
enabled_plugins.remove(plugin_name)
if plugin_name not in disabled_plugins:
disabled_plugins.append(plugin_name)
# 保存配置
session_config["enabled_plugins"] = enabled_plugins
session_config["disabled_plugins"] = disabled_plugins
session_plugin_config[session_id] = session_config
sp.put(
"session_plugin_config",
session_plugin_config,
scope="umo",
scope_id=session_id,
)
logger.info(
f"会话 {session_id} 的插件 {plugin_name} 状态已更新为: {'启用' if enabled else '禁用'}",
)
@staticmethod
def get_session_plugin_config(session_id: str) -> dict[str, list[str]]:
"""获取指定会话的插件配置
Args:
session_id: 会话ID (unified_msg_origin)
Returns:
Dict[str, List[str]]: 包含enabled_plugins和disabled_plugins的字典
"""
session_plugin_config = sp.get(
"session_plugin_config",
{},
scope="umo",
scope_id=session_id,
)
return session_plugin_config.get(
session_id,
{"enabled_plugins": [], "disabled_plugins": []},
)
@staticmethod @staticmethod
def filter_handlers_by_session(event: AstrMessageEvent, handlers: list) -> list: def filter_handlers_by_session(event: AstrMessageEvent, handlers: list) -> list:
"""根据会话配置过滤处理器列表 """根据会话配置过滤处理器列表
+23
View File
@@ -0,0 +1,23 @@
from pathlib import Path
from openai import AsyncOpenAI
async def extract_file_moonshotai(file_path: str, api_key: str) -> str:
"""Extract text from a file using Moonshot AI API"""
"""
Args:
file_path: The path to the file to extract text from
api_key: The API key to use to extract text from the file
Returns:
The text extracted from the file
"""
client = AsyncOpenAI(
api_key=api_key,
base_url="https://api.moonshot.cn/v1",
)
file_object = await client.files.create(
file=Path(file_path),
purpose="file-extract", # type: ignore
)
return (await client.files.content(file_id=file_object.id)).text
+17 -163
View File
@@ -18,11 +18,8 @@ from astrbot.core.config.i18n_utils import ConfigMetadataI18n
from astrbot.core.core_lifecycle import AstrBotCoreLifecycle from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
from astrbot.core.platform.register import platform_cls_map, platform_registry from astrbot.core.platform.register import platform_cls_map, platform_registry
from astrbot.core.provider import Provider from astrbot.core.provider import Provider
from astrbot.core.provider.entities import ProviderType
from astrbot.core.provider.provider import RerankProvider
from astrbot.core.provider.register import provider_registry from astrbot.core.provider.register import provider_registry
from astrbot.core.star.star import star_registry from astrbot.core.star.star import star_registry
from astrbot.core.utils.astrbot_path import get_astrbot_path
from .route import Response, Route, RouteContext from .route import Response, Route, RouteContext
@@ -356,169 +353,26 @@ class ConfigRoute(Route):
f"Attempting to check provider: {status_info['name']} (ID: {status_info['id']}, Type: {status_info['type']}, Model: {status_info['model']})", f"Attempting to check provider: {status_info['name']} (ID: {status_info['id']}, Type: {status_info['type']}, Model: {status_info['model']})",
) )
if provider_capability_type == ProviderType.CHAT_COMPLETION: try:
try: result = await provider.test()
logger.debug(f"Sending 'Ping' to provider: {status_info['name']}") if result:
response = await asyncio.wait_for(
provider.text_chat(prompt="REPLY `PONG` ONLY"),
timeout=45.0,
)
logger.debug(
f"Received response from {status_info['name']}: {response}",
)
if response is not None:
status_info["status"] = "available"
response_text_snippet = ""
if (
hasattr(response, "completion_text")
and response.completion_text
):
response_text_snippet = (
response.completion_text[:70] + "..."
if len(response.completion_text) > 70
else response.completion_text
)
elif hasattr(response, "result_chain") and response.result_chain:
try:
response_text_snippet = (
response.result_chain.get_plain_text()[:70] + "..."
if len(response.result_chain.get_plain_text()) > 70
else response.result_chain.get_plain_text()
)
except Exception as _:
pass
logger.info(
f"Provider {status_info['name']} (ID: {status_info['id']}) is available. Response snippet: '{response_text_snippet}'",
)
else:
status_info["error"] = (
"Test call returned None, but expected an LLMResponse object."
)
logger.warning(
f"Provider {status_info['name']} (ID: {status_info['id']}) test call returned None.",
)
except asyncio.TimeoutError:
status_info["error"] = (
"Connection timed out after 45 seconds during test call."
)
logger.warning(
f"Provider {status_info['name']} (ID: {status_info['id']}) timed out.",
)
except Exception as e:
error_message = str(e)
status_info["error"] = error_message
logger.warning(
f"Provider {status_info['name']} (ID: {status_info['id']}) is unavailable. Error: {error_message}",
)
logger.debug(
f"Traceback for {status_info['name']}:\n{traceback.format_exc()}",
)
elif provider_capability_type == ProviderType.EMBEDDING:
try:
# For embedding, we can call the get_embedding method with a short prompt.
embedding_result = await provider.get_embedding("health_check")
if isinstance(embedding_result, list) and (
not embedding_result or isinstance(embedding_result[0], float)
):
status_info["status"] = "available"
else:
status_info["status"] = "unavailable"
status_info["error"] = (
f"Embedding test failed: unexpected result type {type(embedding_result)}"
)
except Exception as e:
logger.error(
f"Error testing embedding provider {provider_name}: {e}",
exc_info=True,
)
status_info["status"] = "unavailable"
status_info["error"] = f"Embedding test failed: {e!s}"
elif provider_capability_type == ProviderType.TEXT_TO_SPEECH:
try:
# For TTS, we can call the get_audio method with a short prompt.
audio_result = await provider.get_audio("你好")
if isinstance(audio_result, str) and audio_result:
status_info["status"] = "available"
else:
status_info["status"] = "unavailable"
status_info["error"] = (
f"TTS test failed: unexpected result type {type(audio_result)}"
)
except Exception as e:
logger.error(
f"Error testing TTS provider {provider_name}: {e}",
exc_info=True,
)
status_info["status"] = "unavailable"
status_info["error"] = f"TTS test failed: {e!s}"
elif provider_capability_type == ProviderType.SPEECH_TO_TEXT:
try:
logger.debug(
f"Sending health check audio to provider: {status_info['name']}",
)
sample_audio_path = os.path.join(
get_astrbot_path(),
"samples",
"stt_health_check.wav",
)
if not os.path.exists(sample_audio_path):
status_info["status"] = "unavailable"
status_info["error"] = (
"STT test failed: sample audio file not found."
)
logger.warning(
f"STT test for {status_info['name']} failed: sample audio file not found at {sample_audio_path}",
)
else:
text_result = await provider.get_text(sample_audio_path)
if isinstance(text_result, str) and text_result:
status_info["status"] = "available"
snippet = (
text_result[:70] + "..."
if len(text_result) > 70
else text_result
)
logger.info(
f"Provider {status_info['name']} (ID: {status_info['id']}) is available. Response snippet: '{snippet}'",
)
else:
status_info["status"] = "unavailable"
status_info["error"] = (
f"STT test failed: unexpected result type {type(text_result)}"
)
logger.warning(
f"STT test for {status_info['name']} failed: unexpected result type {type(text_result)}",
)
except Exception as e:
logger.error(
f"Error testing STT provider {provider_name}: {e}",
exc_info=True,
)
status_info["status"] = "unavailable"
status_info["error"] = f"STT test failed: {e!s}"
elif provider_capability_type == ProviderType.RERANK:
try:
assert isinstance(provider, RerankProvider)
await provider.rerank("Apple", documents=["apple", "banana"])
status_info["status"] = "available" status_info["status"] = "available"
except Exception as e: logger.info(
logger.error( f"Provider {status_info['name']} (ID: {status_info['id']}) is available.",
f"Error testing rerank provider {provider_name}: {e}",
exc_info=True,
) )
status_info["status"] = "unavailable" else:
status_info["error"] = f"Rerank test failed: {e!s}" status_info["error"] = "Provider test returned False."
logger.warning(
else: f"Provider {status_info['name']} (ID: {status_info['id']}) test returned False.",
logger.debug( )
f"Provider {provider_name} is not a Chat Completion or Embedding provider. Marking as available without test. Meta: {meta}", except Exception as e:
error_message = str(e)
status_info["error"] = error_message
logger.warning(
f"Provider {status_info['name']} (ID: {status_info['id']}) is unavailable. Error: {error_message}",
) )
status_info["status"] = "available" logger.debug(
status_info["error"] = ( f"Traceback for {status_info['name']}:\n{traceback.format_exc()}",
"This provider type is not tested and is assumed to be available."
) )
return status_info return status_info
-156
View File
@@ -60,10 +60,6 @@ class KnowledgeBaseRoute(Route):
# "/kb/media/delete": ("POST", self.delete_media), # "/kb/media/delete": ("POST", self.delete_media),
# 检索 # 检索
"/kb/retrieve": ("POST", self.retrieve), "/kb/retrieve": ("POST", self.retrieve),
# 会话知识库配置
"/kb/session/config/get": ("GET", self.get_session_kb_config),
"/kb/session/config/set": ("POST", self.set_session_kb_config),
"/kb/session/config/delete": ("POST", self.delete_session_kb_config),
} }
self.register_routes() self.register_routes()
@@ -920,158 +916,6 @@ class KnowledgeBaseRoute(Route):
logger.error(traceback.format_exc()) logger.error(traceback.format_exc())
return Response().error(f"检索失败: {e!s}").__dict__ return Response().error(f"检索失败: {e!s}").__dict__
# ===== 会话知识库配置 API =====
async def get_session_kb_config(self):
"""获取会话的知识库配置
Query 参数:
- session_id: 会话 ID (必填)
返回:
- kb_ids: 知识库 ID 列表
- top_k: 返回结果数量
- enable_rerank: 是否启用重排序
"""
try:
from astrbot.core import sp
session_id = request.args.get("session_id")
if not session_id:
return Response().error("缺少参数 session_id").__dict__
# 从 SharedPreferences 获取配置
config = await sp.session_get(session_id, "kb_config", default={})
logger.debug(f"[KB配置] 读取到配置: session_id={session_id}")
# 如果没有配置,返回默认值
if not config:
config = {"kb_ids": [], "top_k": 5, "enable_rerank": True}
return Response().ok(config).__dict__
except Exception as e:
logger.error(f"[KB配置] 获取配置时出错: {e}", exc_info=True)
return Response().error(f"获取会话知识库配置失败: {e!s}").__dict__
async def set_session_kb_config(self):
"""设置会话的知识库配置
Body:
- scope: 配置范围 (目前只支持 "session")
- scope_id: 会话 ID (必填)
- kb_ids: 知识库 ID 列表 (必填)
- top_k: 返回结果数量 (可选, 默认 5)
- enable_rerank: 是否启用重排序 (可选, 默认 true)
"""
try:
from astrbot.core import sp
data = await request.json
scope = data.get("scope")
scope_id = data.get("scope_id")
kb_ids = data.get("kb_ids", [])
top_k = data.get("top_k", 5)
enable_rerank = data.get("enable_rerank", True)
# 验证参数
if scope != "session":
return Response().error("目前仅支持 session 范围的配置").__dict__
if not scope_id:
return Response().error("缺少参数 scope_id").__dict__
if not isinstance(kb_ids, list):
return Response().error("kb_ids 必须是列表").__dict__
# 验证知识库是否存在
kb_mgr = self._get_kb_manager()
invalid_ids = []
valid_ids = []
for kb_id in kb_ids:
kb_helper = await kb_mgr.get_kb(kb_id)
if kb_helper:
valid_ids.append(kb_id)
else:
invalid_ids.append(kb_id)
logger.warning(f"[KB配置] 知识库不存在: {kb_id}")
if invalid_ids:
logger.warning(f"[KB配置] 以下知识库ID无效: {invalid_ids}")
# 允许保存空列表,表示明确不使用任何知识库
if kb_ids and not valid_ids:
# 只有当用户提供了 kb_ids 但全部无效时才报错
return Response().error(f"所有提供的知识库ID都无效: {kb_ids}").__dict__
# 如果 kb_ids 为空列表,表示用户想清空配置
if not kb_ids:
valid_ids = []
# 构建配置对象(只保存有效的ID
config = {
"kb_ids": valid_ids,
"top_k": top_k,
"enable_rerank": enable_rerank,
}
# 保存到 SharedPreferences
await sp.session_put(scope_id, "kb_config", config)
# 立即验证是否保存成功
verify_config = await sp.session_get(scope_id, "kb_config", default={})
if verify_config == config:
return (
Response()
.ok(
{"valid_ids": valid_ids, "invalid_ids": invalid_ids},
"保存知识库配置成功",
)
.__dict__
)
logger.error("[KB配置] 配置保存失败,验证不匹配")
return Response().error("配置保存失败").__dict__
except Exception as e:
logger.error(f"[KB配置] 设置配置时出错: {e}", exc_info=True)
return Response().error(f"设置会话知识库配置失败: {e!s}").__dict__
async def delete_session_kb_config(self):
"""删除会话的知识库配置
Body:
- scope: 配置范围 (目前只支持 "session")
- scope_id: 会话 ID (必填)
"""
try:
from astrbot.core import sp
data = await request.json
scope = data.get("scope")
scope_id = data.get("scope_id")
# 验证参数
if scope != "session":
return Response().error("目前仅支持 session 范围的配置").__dict__
if not scope_id:
return Response().error("缺少参数 scope_id").__dict__
# 从 SharedPreferences 删除配置
await sp.session_remove(scope_id, "kb_config")
return Response().ok(message="删除知识库配置成功").__dict__
except Exception as e:
logger.error(f"删除会话知识库配置失败: {e}")
logger.error(traceback.format_exc())
return Response().error(f"删除会话知识库配置失败: {e!s}").__dict__
async def upload_document_from_url(self): async def upload_document_from_url(self):
"""从 URL 上传文档 """从 URL 上传文档
+65 -6
View File
@@ -1,3 +1,4 @@
import asyncio
import json import json
import os import os
import ssl import ssl
@@ -19,6 +20,10 @@ from astrbot.core.star.star_manager import PluginManager
from .route import Response, Route, RouteContext from .route import Response, Route, RouteContext
PLUGIN_UPDATE_CONCURRENCY = (
3 # limit concurrent updates to avoid overwhelming plugin sources
)
class PluginRoute(Route): class PluginRoute(Route):
def __init__( def __init__(
@@ -33,6 +38,7 @@ class PluginRoute(Route):
"/plugin/install": ("POST", self.install_plugin), "/plugin/install": ("POST", self.install_plugin),
"/plugin/install-upload": ("POST", self.install_plugin_upload), "/plugin/install-upload": ("POST", self.install_plugin_upload),
"/plugin/update": ("POST", self.update_plugin), "/plugin/update": ("POST", self.update_plugin),
"/plugin/update-all": ("POST", self.update_all_plugins),
"/plugin/uninstall": ("POST", self.uninstall_plugin), "/plugin/uninstall": ("POST", self.uninstall_plugin),
"/plugin/market_list": ("GET", self.get_online_plugins), "/plugin/market_list": ("GET", self.get_online_plugins),
"/plugin/off": ("POST", self.off_plugin), "/plugin/off": ("POST", self.off_plugin),
@@ -63,7 +69,7 @@ class PluginRoute(Route):
.__dict__ .__dict__
) )
data = await request.json data = await request.get_json()
plugin_name = data.get("name", None) plugin_name = data.get("name", None)
try: try:
success, message = await self.plugin_manager.reload(plugin_name) success, message = await self.plugin_manager.reload(plugin_name)
@@ -346,7 +352,7 @@ class PluginRoute(Route):
.__dict__ .__dict__
) )
post_data = await request.json post_data = await request.get_json()
repo_url = post_data["url"] repo_url = post_data["url"]
proxy: str = post_data.get("proxy", None) proxy: str = post_data.get("proxy", None)
@@ -393,7 +399,7 @@ class PluginRoute(Route):
.__dict__ .__dict__
) )
post_data = await request.json post_data = await request.get_json()
plugin_name = post_data["name"] plugin_name = post_data["name"]
delete_config = post_data.get("delete_config", False) delete_config = post_data.get("delete_config", False)
delete_data = post_data.get("delete_data", False) delete_data = post_data.get("delete_data", False)
@@ -418,7 +424,7 @@ class PluginRoute(Route):
.__dict__ .__dict__
) )
post_data = await request.json post_data = await request.get_json()
plugin_name = post_data["name"] plugin_name = post_data["name"]
proxy: str = post_data.get("proxy", None) proxy: str = post_data.get("proxy", None)
try: try:
@@ -432,6 +438,59 @@ class PluginRoute(Route):
logger.error(f"/api/plugin/update: {traceback.format_exc()}") logger.error(f"/api/plugin/update: {traceback.format_exc()}")
return Response().error(str(e)).__dict__ return Response().error(str(e)).__dict__
async def update_all_plugins(self):
if DEMO_MODE:
return (
Response()
.error("You are not permitted to do this operation in demo mode")
.__dict__
)
post_data = await request.get_json()
plugin_names: list[str] = post_data.get("names") or []
proxy: str = post_data.get("proxy", "")
if not isinstance(plugin_names, list) or not plugin_names:
return Response().error("插件列表不能为空").__dict__
results = []
sem = asyncio.Semaphore(PLUGIN_UPDATE_CONCURRENCY)
async def _update_one(name: str):
async with sem:
try:
logger.info(f"批量更新插件 {name}")
await self.plugin_manager.update_plugin(name, proxy)
return {"name": name, "status": "ok", "message": "更新成功"}
except Exception as e:
logger.error(
f"/api/plugin/update-all: 更新插件 {name} 失败: {traceback.format_exc()}",
)
return {"name": name, "status": "error", "message": str(e)}
raw_results = await asyncio.gather(
*(_update_one(name) for name in plugin_names),
return_exceptions=True,
)
for name, result in zip(plugin_names, raw_results):
if isinstance(result, asyncio.CancelledError):
raise result
if isinstance(result, BaseException):
results.append(
{"name": name, "status": "error", "message": str(result)}
)
else:
results.append(result)
failed = [r for r in results if r["status"] == "error"]
message = (
"批量更新完成,全部成功。"
if not failed
else f"批量更新完成,其中 {len(failed)}/{len(results)} 个插件失败。"
)
return Response().ok({"results": results}, message).__dict__
async def off_plugin(self): async def off_plugin(self):
if DEMO_MODE: if DEMO_MODE:
return ( return (
@@ -440,7 +499,7 @@ class PluginRoute(Route):
.__dict__ .__dict__
) )
post_data = await request.json post_data = await request.get_json()
plugin_name = post_data["name"] plugin_name = post_data["name"]
try: try:
await self.plugin_manager.turn_off_plugin(plugin_name) await self.plugin_manager.turn_off_plugin(plugin_name)
@@ -458,7 +517,7 @@ class PluginRoute(Route):
.__dict__ .__dict__
) )
post_data = await request.json post_data = await request.get_json()
plugin_name = post_data["name"] plugin_name = post_data["name"]
try: try:
await self.plugin_manager.turn_on_plugin(plugin_name) await self.plugin_manager.turn_on_plugin(plugin_name)
File diff suppressed because it is too large Load Diff
+18
View File
@@ -0,0 +1,18 @@
## What's Changed
重构:
- 将 Dify、Coze、阿里云百炼应用等 LLMOps 提供商迁移到 Agent 执行器层,理清和本地 Agent 执行器的边界
- 将「会话管理」功能重构为「自定义规则」功能,理清和多配置文件功能的边界。详见:[自定义规则](https://docs.astrbot.app/use/custom-rules.html)
优化:
- Dify、阿里云百炼应用支持流式输出
- 防止分段回复正则表达式解析错误导致消息不发送
- 群聊上下文感知记录 At 信息
- 优化模型提供商页面的测试提供商功能
新增:
- 支持在配置文件页面快速测试对话
- 为配置文件配置项内容添加国际化支持
修复:
- 在更新 MCP Server 配置后,MCP 无法正常重启的问题
+22
View File
@@ -0,0 +1,22 @@
## 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 无法正常重启的问题
+25
View File
@@ -0,0 +1,25 @@
## 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 无法正常重启的问题
+1 -1
View File
@@ -84,7 +84,7 @@
v-model:prompt="prompt" v-model:prompt="prompt"
:stagedImagesUrl="stagedImagesUrl" :stagedImagesUrl="stagedImagesUrl"
:stagedAudioUrl="stagedAudioUrl" :stagedAudioUrl="stagedAudioUrl"
:disabled="isStreaming || isConvRunning" :disabled="isStreaming"
:enableStreaming="enableStreaming" :enableStreaming="enableStreaming"
:isRecording="isRecording" :isRecording="isRecording"
:session-id="currSessionId || null" :session-id="currSessionId || null"
@@ -549,7 +549,7 @@ export default {
} }
.bot-embedded-image { .bot-embedded-image {
max-width: 80%; max-width: 40%;
width: auto; width: auto;
height: auto; height: auto;
border-radius: 8px; border-radius: 8px;
@@ -558,10 +558,6 @@ export default {
transition: transform 0.2s ease; transition: transform 0.2s ease;
} }
.bot-embedded-image:hover {
transform: scale(1.02);
}
.embedded-audio { .embedded-audio {
width: 300px; width: 300px;
margin-top: 8px; margin-top: 8px;
@@ -22,7 +22,7 @@
v-model:prompt="prompt" v-model:prompt="prompt"
:stagedImagesUrl="stagedImagesUrl" :stagedImagesUrl="stagedImagesUrl"
:stagedAudioUrl="stagedAudioUrl" :stagedAudioUrl="stagedAudioUrl"
:disabled="isStreaming || isConvRunning" :disabled="isStreaming"
:enableStreaming="enableStreaming" :enableStreaming="enableStreaming"
:isRecording="isRecording" :isRecording="isRecording"
:session-id="currSessionId || null" :session-id="currSessionId || null"
@@ -7,8 +7,8 @@ import { useCommonStore } from '@/stores/common';
<!-- 添加筛选级别控件 --> <!-- 添加筛选级别控件 -->
<div class="filter-controls mb-2" v-if="showLevelBtns"> <div class="filter-controls mb-2" v-if="showLevelBtns">
<v-chip-group v-model="selectedLevels" column multiple> <v-chip-group v-model="selectedLevels" column multiple>
<v-chip v-for="level in logLevels" :key="level" :color="getLevelColor(level)" filter <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'"> :text-color="level === 'DEBUG' || level === 'INFO' ? 'black' : 'white'" class="font-weight-medium">
{{ level }} {{ level }}
</v-chip> </v-chip>
</v-chip-group> </v-chip-group>
@@ -168,6 +168,7 @@ export default {
flex-wrap: wrap; flex-wrap: wrap;
gap: 8px; gap: 8px;
margin-bottom: 8px; margin-bottom: 8px;
margin-left: 20px;
} }
.fade-in { .fade-in {
@@ -8,7 +8,7 @@
"chat": "Chat", "chat": "Chat",
"extension": "Extensions", "extension": "Extensions",
"conversation": "Conversations", "conversation": "Conversations",
"sessionManagement": "Session Management", "sessionManagement": "Custom Rules",
"console": "Console", "console": "Console",
"alkaid": "Alkaid Lab", "alkaid": "Alkaid Lab",
"knowledgeBase": "Knowledge Base", "knowledgeBase": "Knowledge Base",
@@ -109,6 +109,22 @@
} }
} }
}, },
"file_extract": {
"description": "File Extract",
"provider_settings": {
"file_extract": {
"enable": {
"description": "Enable File Extract"
},
"provider": {
"description": "File Extract Provider"
},
"moonshotai_api_key": {
"description": "Moonshot AI API Key"
}
}
}
},
"others": { "others": {
"description": "Other Settings", "description": "Other Settings",
"provider_settings": { "provider_settings": {
@@ -159,6 +175,10 @@
"prompt_prefix": { "prompt_prefix": {
"description": "User Prompt", "description": "User Prompt",
"hint": "You can use {{prompt}} as a placeholder for user input. If no placeholder is provided, it will be added before the user input." "hint": "You can use {{prompt}} as a placeholder for user input. If no placeholder is provided, it will be added before the user input."
},
"reachability_check": {
"description": "Provider Reachability Check",
"hint": "When running the /provider command, test provider connectivity in parallel. This actively pings models and may consume extra tokens."
} }
}, },
"provider_tts_settings": { "provider_tts_settings": {
@@ -379,7 +399,11 @@
}, },
"image_caption": { "image_caption": {
"description": "Auto-understand Images", "description": "Auto-understand Images",
"hint": "Requires setting a default image caption model." "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."
}, },
"active_reply": { "active_reply": {
"enable": { "enable": {
@@ -449,4 +473,4 @@
} }
} }
} }
} }
@@ -32,7 +32,8 @@
"actions": "Actions", "actions": "Actions",
"back": "Back", "back": "Back",
"selectFile": "Select File", "selectFile": "Select File",
"refresh": "Refresh" "refresh": "Refresh",
"updateAll": "Update All"
}, },
"status": { "status": {
"enabled": "Enabled", "enabled": "Enabled",
@@ -141,7 +142,9 @@
"confirmDelete": "Are you sure you want to delete this extension?", "confirmDelete": "Are you sure you want to delete this extension?",
"fillUrlOrFile": "Please fill in extension URL or upload extension file", "fillUrlOrFile": "Please fill in extension URL or upload extension file",
"dontFillBoth": "Please don't fill in both extension URL and upload file", "dontFillBoth": "Please don't fill in both extension URL and upload file",
"supportedFormats": "Supports .zip extension files" "supportedFormats": "Supports .zip extension files",
"updateAllSuccess": "All upgradable extensions have been updated!",
"updateAllFailed": "{failed} of {total} extensions failed to update:"
}, },
"upload": { "upload": {
"fromFile": "Install from File", "fromFile": "Install from File",
@@ -1,124 +1,110 @@
{ {
"title": "Session Management", "title": "Custom Rules",
"subtitle": "Manage active sessions and configurations", "subtitle": "Set custom rules for specific sessions, which take priority over global settings",
"buttons": { "buttons": {
"refresh": "Refresh", "refresh": "Refresh",
"edit": "Edit", "edit": "Edit",
"apply": "Apply Batch Settings", "editRule": "Edit Rules",
"editName": "Edit Session Name", "deleteAllRules": "Delete All Rules",
"addRule": "Add Rule",
"save": "Save", "save": "Save",
"cancel": "Cancel", "cancel": "Cancel",
"delete": "Delete" "delete": "Delete",
"clear": "Clear",
"next": "Next",
"editCustomName": "Edit Note",
"batchDelete": "Batch Delete"
}, },
"sessions": { "customRules": {
"activeSessions": "Active Sessions", "title": "Custom Rules",
"sessionCount": "sessions", "rulesCount": "rules",
"noActiveSessions": "No active sessions", "hasRules": "Configured",
"noActiveSessionsDesc": "Sessions will appear here when users interact with the bot" "noRules": "No Custom Rules",
"noRulesDesc": "Click 'Add Rule' to configure custom rules for specific sessions",
"serviceConfig": "Service Config",
"pluginConfig": "Plugin Config",
"kbConfig": "Knowledge Base",
"providerConfig": "Provider Config",
"configured": "Configured",
"noCustomName": "No note set"
},
"quickEditName": {
"title": "Edit Note"
}, },
"search": { "search": {
"placeholder": "Search sessions...", "placeholder": "Search sessions..."
"platformFilter": "Platform Filter"
}, },
"table": { "table": {
"headers": { "headers": {
"sessionStatus": "Session Status", "umoInfo": "Unified Message Origin",
"sessionInfo": "Session Info", "rulesOverview": "Rules Overview",
"persona": "Persona",
"chatProvider": "Chat Provider",
"sttProvider": "STT Provider",
"ttsProvider": "TTS Provider",
"llmStatus": "LLM Status",
"ttsStatus": "TTS Status",
"knowledgeBase": "Knowledge Base",
"pluginManagement": "Plugin Management",
"actions": "Actions" "actions": "Actions"
} }
}, },
"status": {
"enabled": "Enabled",
"disabled": "Disabled"
},
"persona": { "persona": {
"none": "No Persona" "none": "Follow Config"
}, },
"batchOperations": { "provider": {
"title": "Batch Operations", "followConfig": "Follow Config"
"setPersona": "Batch Set Persona",
"setChatProvider": "Batch Set Chat Provider",
"setSttProvider": "Batch Set STT Provider",
"setTtsProvider": "Batch Set TTS Provider",
"setLlmStatus": "Batch Set LLM Status",
"setTtsStatus": "Batch Set TTS Status",
"noSttProvider": "No STT Provider Available",
"noTtsProvider": "No TTS Provider Available"
}, },
"pluginManagement": { "addRule": {
"title": "Plugin Management", "title": "Add Custom Rule",
"noPlugins": "No available plugins", "description": "Select a session (UMO) to configure custom rules. Custom rules take priority over global settings.",
"noPluginsDesc": "Currently no active plugins", "selectUmo": "Select Session",
"loading": "Loading plugin list...", "noUmos": "No sessions available"
"author": "Author"
}, },
"nameEditor": { "ruleEditor": {
"title": "Edit Session Name", "title": "Edit Custom Rules",
"customName": "Custom Name", "description": "Configure custom rules for this session. These rules take priority over global settings.",
"placeholder": "Enter custom session name (leave empty to use original name)", "serviceConfig": {
"originalName": "Original Name", "title": "Service Configuration",
"fullSessionId": "Full Session ID", "sessionEnabled": "Enable Session",
"hint": "Custom names help you easily identify sessions. The small information icon (!) will show the actual UMO when hovering." "llmEnabled": "Enable LLM",
}, "ttsEnabled": "Enable TTS",
"knowledgeBase": { "customName": "Custom Name"
"title": "Knowledge Base Configuration", },
"configure": "Configure", "providerConfig": {
"selectKB": "Select Knowledge Bases", "title": "Provider Configuration",
"selectMultiple": "You can select multiple knowledge bases", "chatProvider": "Chat Provider",
"noKBAvailable": "No knowledge bases available", "sttProvider": "STT Provider",
"noKBDesc": "No knowledge bases have been created yet", "ttsProvider": "TTS Provider"
"createKB": "Create Knowledge Base", },
"advancedSettings": "Advanced Settings", "personaConfig": {
"topK": "Result Count", "title": "Persona Configuration",
"topKHint": "Number of results to retrieve from knowledge base", "selectPersona": "Select Persona",
"enableRerank": "Enable Reranking", "hint": "Persona settings affect the conversation style and behavior of the LLM"
"enableRerankHint": "Use reranking model to improve retrieval quality", },
"clearConfig": "Clear Configuration", "pluginConfig": {
"save": "Save", "title": "Plugin Configuration",
"cancel": "Cancel", "disabledPlugins": "Disabled Plugins",
"loading": "Loading knowledge base configuration...", "hint": "Select plugins to disable for this session. Unselected plugins will remain enabled."
"description": "Configure knowledge bases for this session. The session will use configured knowledge bases to enhance conversation context.", },
"saveSuccess": "Knowledge base configuration saved successfully", "kbConfig": {
"saveFailed": "Failed to save knowledge base configuration", "title": "Knowledge Base Configuration",
"loadFailed": "Failed to load knowledge base configuration", "selectKbs": "Select Knowledge Bases",
"clearSuccess": "Knowledge base configuration cleared", "topK": "Top K Results",
"clearFailed": "Failed to clear knowledge base configuration", "enableRerank": "Enable Reranking"
"clearConfirm": "Are you sure you want to clear the knowledge base configuration for this session?" }
},
"list": {
"documents": "documents"
}, },
"deleteConfirm": { "deleteConfirm": {
"message": "Are you sure you want to delete session {sessionName}?", "title": "Confirm Delete",
"warning": "This action will permanently delete all chat history and preference settings for this session (except for data linked via plugins), and this cannot be undone. Continue?" "message": "Are you sure you want to delete all custom rules for this session? Global settings will be used after deletion."
},
"batchDeleteConfirm": {
"title": "Confirm Batch Delete",
"message": "Are you sure you want to delete {count} selected rules? Global settings will be used after deletion."
}, },
"messages": { "messages": {
"refreshSuccess": "Session list refreshed", "refreshSuccess": "Data refreshed",
"personaUpdateSuccess": "Persona updated successfully", "loadError": "Failed to load data",
"personaUpdateError": "Failed to update persona", "saveSuccess": "Saved successfully",
"providerUpdateSuccess": "Provider updated successfully", "saveError": "Failed to save",
"providerUpdateError": "Failed to update provider", "clearSuccess": "Cleared successfully",
"sessionStatusSuccess": "Session {status}", "clearError": "Failed to clear",
"llmStatusSuccess": "LLM {status}", "deleteSuccess": "Deleted successfully",
"ttsStatusSuccess": "TTS {status}", "deleteError": "Failed to delete",
"statusUpdateError": "Failed to update status", "noChanges": "No changes to save",
"loadSessionsError": "Failed to load session list", "batchDeleteSuccess": "Batch delete successful",
"batchUpdateSuccess": "Successfully batch updated {count} settings", "batchDeleteError": "Batch delete failed"
"batchUpdatePartial": "Batch update completed, {success} successful, {error} failed",
"loadPluginsError": "Failed to load plugin list",
"pluginStatusSuccess": "Plugin {name} {status}",
"pluginStatusError": "Failed to update plugin status",
"nameUpdateSuccess": "Session name updated successfully",
"nameUpdateError": "Failed to update session name",
"deleteSuccess": "Session deleted successfully",
"deleteError": "Failed to delete session"
} }
} }
@@ -8,7 +8,7 @@
"config": "配置文件", "config": "配置文件",
"chat": "聊天", "chat": "聊天",
"conversation": "对话数据", "conversation": "对话数据",
"sessionManagement": "会话管理", "sessionManagement": "自定义规则",
"console": "控制台", "console": "控制台",
"alkaid": "Alkaid", "alkaid": "Alkaid",
"knowledgeBase": "知识库", "knowledgeBase": "知识库",
@@ -11,7 +11,12 @@
}, },
"agent_runner_type": { "agent_runner_type": {
"description": "执行器", "description": "执行器",
"labels": ["内置 Agent", "Dify", "Coze", "阿里云百炼应用"] "labels": [
"内置 Agent",
"Dify",
"Coze",
"阿里云百炼应用"
]
}, },
"coze_agent_runner_provider_id": { "coze_agent_runner_provider_id": {
"description": "Coze Agent 执行器提供商 ID" "description": "Coze Agent 执行器提供商 ID"
@@ -109,6 +114,22 @@
} }
} }
}, },
"file_extract": {
"description": "文档解析能力",
"provider_settings": {
"file_extract": {
"enable": {
"description": "启用文档解析能力"
},
"provider": {
"description": "文档解析提供商"
},
"moonshotai_api_key": {
"description": "Moonshot AI API Key"
}
}
}
},
"others": { "others": {
"description": "其他配置", "description": "其他配置",
"provider_settings": { "provider_settings": {
@@ -142,7 +163,10 @@
"unsupported_streaming_strategy": { "unsupported_streaming_strategy": {
"description": "不支持流式回复的平台", "description": "不支持流式回复的平台",
"hint": "选择在不支持流式回复的平台上的处理方式。实时分段回复会在系统接收流式响应检测到诸如标点符号等分段点时,立即发送当前已接收的内容", "hint": "选择在不支持流式回复的平台上的处理方式。实时分段回复会在系统接收流式响应检测到诸如标点符号等分段点时,立即发送当前已接收的内容",
"labels": ["实时分段回复", "关闭流式回复"] "labels": [
"实时分段回复",
"关闭流式回复"
]
}, },
"max_context_length": { "max_context_length": {
"description": "最多携带对话轮数", "description": "最多携带对话轮数",
@@ -159,6 +183,10 @@
"prompt_prefix": { "prompt_prefix": {
"description": "用户提示词", "description": "用户提示词",
"hint": "可使用 {{prompt}} 作为用户输入的占位符。如果不输入占位符则代表添加在用户输入的前面。" "hint": "可使用 {{prompt}} 作为用户输入的占位符。如果不输入占位符则代表添加在用户输入的前面。"
},
"reachability_check": {
"description": "提供商可达性检测",
"hint": "/provider 命令列出模型时并发检测连通性。开启后会主动调用模型测试连通性,可能产生额外 token 消耗。"
} }
}, },
"provider_tts_settings": { "provider_tts_settings": {
@@ -379,7 +407,11 @@
}, },
"image_caption": { "image_caption": {
"description": "自动理解图片", "description": "自动理解图片",
"hint": "需要设置默认图片转述模型。" "hint": "需要设置群聊图片转述模型。"
},
"image_caption_provider_id": {
"description": "群聊图片转述模型",
"hint": "用于群聊上下文感知的图片理解,与默认图片转述模型分开配置。"
}, },
"active_reply": { "active_reply": {
"enable": { "enable": {
@@ -449,4 +481,4 @@
} }
} }
} }
} }
@@ -32,7 +32,8 @@
"actions": "操作", "actions": "操作",
"back": "返回", "back": "返回",
"selectFile": "选择文件", "selectFile": "选择文件",
"refresh": "刷新" "refresh": "刷新",
"updateAll": "更新全部插件"
}, },
"status": { "status": {
"enabled": "启用", "enabled": "启用",
@@ -141,7 +142,9 @@
"confirmDelete": "确定要删除插件吗?", "confirmDelete": "确定要删除插件吗?",
"fillUrlOrFile": "请填写插件链接或上传插件文件", "fillUrlOrFile": "请填写插件链接或上传插件文件",
"dontFillBoth": "请不要同时填写插件链接和上传文件", "dontFillBoth": "请不要同时填写插件链接和上传文件",
"supportedFormats": "支持 .zip 格式的插件文件" "supportedFormats": "支持 .zip 格式的插件文件",
"updateAllSuccess": "所有可更新的插件都已更新!",
"updateAllFailed": "有 {failed}/{total} 个插件更新失败:"
}, },
"upload": { "upload": {
"fromFile": "从文件安装", "fromFile": "从文件安装",
@@ -1,124 +1,110 @@
{ {
"title": "会话管理", "title": "自定义规则",
"subtitle": "管理活跃会话和配置", "subtitle": "为特定会话设置自定义规则,优先级高于全局配置",
"buttons": { "buttons": {
"refresh": "刷新", "refresh": "刷新",
"edit": "编辑", "edit": "编辑",
"apply": "应用批量设置", "editRule": "编辑规则",
"editName": "备注", "deleteAllRules": "删除所有规则",
"addRule": "添加规则",
"save": "保存", "save": "保存",
"cancel": "取消", "cancel": "取消",
"delete": "删除" "delete": "删除",
"clear": "清除",
"next": "下一步",
"editCustomName": "编辑备注",
"batchDelete": "批量删除"
}, },
"sessions": { "customRules": {
"activeSessions": "活跃会话", "title": "自定义规则",
"sessionCount": "个会话", "rulesCount": "条规则",
"noActiveSessions": "暂无活跃会话", "hasRules": "已配置",
"noActiveSessionsDesc": "当有用户与机器人交互时,会话将会显示在这里" "noRules": "暂无自定义规则",
"noRulesDesc": "点击「添加规则」为特定会话配置自定义规则",
"serviceConfig": "服务配置",
"pluginConfig": "插件配置",
"kbConfig": "知识库配置",
"providerConfig": "模型配置",
"configured": "已配置",
"noCustomName": "未设置备注"
},
"quickEditName": {
"title": "编辑备注名"
}, },
"search": { "search": {
"placeholder": "搜索会话...", "placeholder": "搜索会话..."
"platformFilter": "平台筛选"
}, },
"table": { "table": {
"headers": { "headers": {
"sessionStatus": "会话状态", "umoInfo": "消息会话来源",
"sessionInfo": "消息会话来源", "rulesOverview": "规则概览",
"persona": "人格",
"chatProvider": "聊天模型",
"sttProvider": "语音识别模型",
"ttsProvider": "语音合成模型",
"llmStatus": "启用 LLM",
"ttsStatus": "启用 TTS",
"knowledgeBase": "知识库配置",
"pluginManagement": "插件管理",
"actions": "操作" "actions": "操作"
} }
}, },
"status": {
"enabled": "已启用",
"disabled": "已禁用"
},
"persona": { "persona": {
"none": "无人格" "none": "跟随配置文件"
}, },
"batchOperations": { "provider": {
"title": "批量操作", "followConfig": "跟随配置文件"
"setPersona": "批量设置人格",
"setChatProvider": "批量设置 Chat Provider",
"setSttProvider": "批量设置 STT Provider",
"setTtsProvider": "批量设置 TTS Provider",
"setLlmStatus": "批量设置 LLM 状态",
"setTtsStatus": "批量设置 TTS 状态",
"noSttProvider": "暂无可用 STT Provider",
"noTtsProvider": "暂无可用 TTS Provider"
}, },
"pluginManagement": { "addRule": {
"title": "插件管理", "title": "添加自定义规则",
"noPlugins": "暂无可用插件", "description": "选择一个消息会话来源 (UMO) 来配置自定义规则。自定义规则的优先级高于该来源所属的配置文件中的全局规则。可以使用 /sid 指令获取该来源的 UMO 信息。",
"noPluginsDesc": "目前没有激活的插件", "selectUmo": "选择会话",
"loading": "加载插件列表中...", "noUmos": "暂无可用会话"
"author": "作者"
}, },
"nameEditor": { "ruleEditor": {
"title": "编辑会话名称", "title": "编辑自定义规则",
"customName": "自定义名称", "description": "为此会话配置自定义规则,这些规则将优先于全局配置生效。",
"placeholder": "输入自定义会话名称(留空则使用原始名称)", "serviceConfig": {
"originalName": "原始名称", "title": "服务配置",
"fullSessionId": "完整会话ID", "sessionEnabled": "启用该消息会话来源的消息处理",
"hint": "自定义名称帮助您轻松识别会话。当设置了自定义名称时,会显示一个小感叹号标识(!),鼠标悬停时会显示实际的UMO。" "llmEnabled": "启用 LLM",
}, "ttsEnabled": "启用 TTS",
"knowledgeBase": { "customName": "消息会话来源备注名称"
"title": "知识库配置", },
"configure": "配置", "providerConfig": {
"selectKB": "选择知识库", "title": "模型配置",
"selectMultiple": "可以选择多个知识库", "chatProvider": "聊天模型",
"noKBAvailable": "暂无可用的知识库", "sttProvider": "语音识别模型",
"noKBDesc": "目前没有创建任何知识库", "ttsProvider": "语音合成模型"
"createKB": "创建知识库", },
"advancedSettings": "高级配置", "personaConfig": {
"topK": "返回结果数量", "title": "人格配置",
"topKHint": "从知识库检索的结果数量", "selectPersona": "选择人格",
"enableRerank": "启用重排序", "hint": "应用人格配置后,将会强制该来源的所有对话使用该人格。"
"enableRerankHint": "使用重排序模型提高检索质量", },
"clearConfig": "清除配置", "pluginConfig": {
"save": "保存", "title": "插件配置",
"cancel": "取消", "disabledPlugins": "禁用的插件",
"loading": "加载知识库配置中...", "hint": "选择要在此会话中禁用的插件。未选择的插件将保持启用状态。"
"description": "为此会话配置使用的知识库。会话将使用配置的知识库来增强对话上下文。", },
"saveSuccess": "知识库配置保存成功", "kbConfig": {
"saveFailed": "保存知识库配置失败", "title": "知识库配置",
"loadFailed": "加载知识库配置失败", "selectKbs": "选择知识库",
"clearSuccess": "知识库配置已清除", "topK": "返回结果数量 (Top K)",
"clearFailed": "清除知识库配置失败", "enableRerank": "启用重排序"
"clearConfirm": "确定要清除此会话的知识库配置吗?" }
},
"list": {
"documents": "篇文档"
}, },
"deleteConfirm": { "deleteConfirm": {
"message": "确定要删除会话 {sessionName} 吗?", "title": "确认删除",
"warning": "此操作将永久删除本次会话的「全部对话记录」与「偏好设置」(插件对会话的关联数据除外),且无法恢复。确认继续?" "message": "确定要删除此会话的所有自定义规则吗?删除后将恢复使用全局配置。"
},
"batchDeleteConfirm": {
"title": "确认批量删除",
"message": "确定要删除选中的 {count} 条规则吗?删除后将恢复使用全局配置。"
}, },
"messages": { "messages": {
"refreshSuccess": "会话列表已刷新", "refreshSuccess": "数据已刷新",
"personaUpdateSuccess": "人格更新成功", "loadError": "加载数据失败",
"personaUpdateError": "人格更新失败", "saveSuccess": "保存成功",
"providerUpdateSuccess": "Provider 更新成功", "saveError": "保存失败",
"providerUpdateError": "Provider 更新失败", "clearSuccess": "已清除",
"sessionStatusSuccess": "会话 {status}", "clearError": "清除失败",
"llmStatusSuccess": "LLM {status}", "deleteSuccess": "删除成功",
"ttsStatusSuccess": "TTS {status}", "deleteError": "删除失败",
"statusUpdateError": "状态更新失败", "noChanges": "没有需要保存的更改",
"loadSessionsError": "加载会话列表失败", "batchDeleteSuccess": "批量删除成功",
"batchUpdateSuccess": "成功批量更新 {count} 项设置", "batchDeleteError": "批量删除失败"
"batchUpdatePartial": "批量更新完成,{success} 项成功,{error} 项失败",
"loadPluginsError": "加载插件列表失败",
"pluginStatusSuccess": "插件 {name} {status}",
"pluginStatusError": "插件状态更新失败",
"nameUpdateSuccess": "会话名称更新成功",
"nameUpdateError": "会话名称更新失败",
"deleteSuccess": "会话删除成功",
"deleteError": "会话删除失败"
} }
} }
@@ -69,7 +69,7 @@ const sidebarItem: menu[] = [
}, },
{ {
title: 'core.navigation.sessionManagement', title: 'core.navigation.sessionManagement',
icon: 'mdi-account-group', icon: 'mdi-pencil-ruler',
to: '/session-management' to: '/session-management'
}, },
{ {
+61
View File
@@ -42,6 +42,7 @@ const loadingDialog = reactive({
const showPluginInfoDialog = ref(false); const showPluginInfoDialog = ref(false);
const selectedPlugin = ref({}); const selectedPlugin = ref({});
const curr_namespace = ref(""); const curr_namespace = ref("");
const updatingAll = ref(false);
const readmeDialog = reactive({ const readmeDialog = reactive({
show: false, show: false,
@@ -226,6 +227,10 @@ const paginatedPlugins = computed(() => {
return sortedPlugins.value.slice(start, end); return sortedPlugins.value.slice(start, end);
}); });
const updatableExtensions = computed(() => {
return extension_data?.data?.filter(ext => ext.has_update) || [];
});
// //
const toggleShowReserved = () => { const toggleShowReserved = () => {
showReserved.value = !showReserved.value; showReserved.value = !showReserved.value;
@@ -372,6 +377,56 @@ const updateExtension = async (extension_name) => {
} }
}; };
const updateAllExtensions = async () => {
if (updatingAll.value || updatableExtensions.value.length === 0) return;
updatingAll.value = true;
loadingDialog.title = tm('status.loading');
loadingDialog.statusCode = 0;
loadingDialog.result = "";
loadingDialog.show = true;
const targets = updatableExtensions.value.map(ext => ext.name);
try {
const res = await axios.post('/api/plugin/update-all', {
names: targets,
proxy: localStorage.getItem('selectedGitHubProxy') || ""
});
if (res.data.status === "error") {
onLoadingDialogResult(2, res.data.message || tm('messages.updateAllFailed', {
failed: targets.length,
total: targets.length
}), -1);
return;
}
const results = res.data.data?.results || [];
const failures = results.filter(r => r.status !== 'ok');
try {
await getExtensions();
} catch (err) {
const errorMsg = err.response?.data?.message || err.message || String(err);
failures.push({ name: 'refresh', status: 'error', message: errorMsg });
}
if (failures.length === 0) {
onLoadingDialogResult(1, tm('messages.updateAllSuccess'));
} else {
const failureText = tm('messages.updateAllFailed', {
failed: failures.length,
total: targets.length
});
const detail = failures.map(f => `${f.name}: ${f.message}`).join('\n');
onLoadingDialogResult(2, `${failureText}\n${detail}`, -1);
}
} catch (err) {
const errorMsg = err.response?.data?.message || err.message || String(err);
onLoadingDialogResult(2, errorMsg, -1);
} finally {
updatingAll.value = false;
}
};
const pluginOn = async (extension) => { const pluginOn = async (extension) => {
try { try {
const res = await axios.post('/api/plugin/on', { name: extension.name }); const res = await axios.post('/api/plugin/on', { name: extension.name });
@@ -720,6 +775,12 @@ watch(marketSearch, (newVal) => {
{{ showReserved ? tm('buttons.hideSystemPlugins') : tm('buttons.showSystemPlugins') }} {{ showReserved ? tm('buttons.hideSystemPlugins') : tm('buttons.showSystemPlugins') }}
</v-btn> </v-btn>
<v-btn class="ml-2" color="warning" variant="tonal" :disabled="updatableExtensions.length === 0"
:loading="updatingAll" @click="updateAllExtensions">
<v-icon>mdi-update</v-icon>
{{ tm('buttons.updateAll') }}
</v-btn>
<v-btn class="ml-2" color="primary" variant="tonal" @click="dialog = true"> <v-btn class="ml-2" color="primary" variant="tonal" @click="dialog = true">
<v-icon>mdi-plus</v-icon> <v-icon>mdi-plus</v-icon>
{{ tm('buttons.install') }} {{ tm('buttons.install') }}
+2 -1
View File
@@ -35,7 +35,7 @@
</div> </div>
<!-- 日志部分 --> <!-- 日志部分 -->
<v-card elevation="0" class="mt-4"> <v-card elevation="0" class="mt-4 mb-10">
<v-card-title class="d-flex align-center py-3 px-4"> <v-card-title class="d-flex align-center py-3 px-4">
<v-icon class="me-2">mdi-console-line</v-icon> <v-icon class="me-2">mdi-console-line</v-icon>
<span class="text-h4">{{ tm('logs.title') }}</span> <span class="text-h4">{{ tm('logs.title') }}</span>
@@ -233,5 +233,6 @@ export default {
.platform-page { .platform-page {
padding: 20px; padding: 20px;
padding-top: 8px; padding-top: 8px;
padding-bottom: 40px;
} }
</style> </style>
+45 -57
View File
@@ -69,6 +69,25 @@
:loading="isProviderTesting(provider.id)" @toggle-enabled="providerStatusChange" :loading="isProviderTesting(provider.id)" @toggle-enabled="providerStatusChange"
:bglogo="getProviderIcon(provider.provider)" @delete="deleteProvider" @edit="configExistingProvider" :bglogo="getProviderIcon(provider.provider)" @delete="deleteProvider" @edit="configExistingProvider"
@copy="copyProvider" :show-copy-button="true"> @copy="copyProvider" :show-copy-button="true">
<template #item-details="{ item }">
<!-- 测试状态 chip -->
<v-tooltip v-if="getProviderStatus(item.id)" location="top" max-width="300">
<template v-slot:activator="{ props }">
<v-chip v-bind="props" :color="getStatusColor(getProviderStatus(item.id).status)" size="small">
<v-icon start size="small">
{{ getProviderStatus(item.id).status === 'available' ? 'mdi-check-circle' :
getProviderStatus(item.id).status === 'unavailable' ? 'mdi-alert-circle' :
'mdi-clock-outline' }}
</v-icon>
{{ getStatusText(getProviderStatus(item.id).status) }}
</v-chip>
</template>
<span v-if="getProviderStatus(item.id).status === 'unavailable'">
{{ getProviderStatus(item.id).error }}
</span>
<span v-else>{{ getStatusText(getProviderStatus(item.id).status) }}</span>
</v-tooltip>
</template>
<template #actions="{ item }"> <template #actions="{ item }">
<v-btn style="z-index: 100000;" variant="tonal" color="info" rounded="xl" size="small" <v-btn style="z-index: 100000;" variant="tonal" color="info" rounded="xl" size="small"
:loading="isProviderTesting(item.id)" @click="testSingleProvider(item)"> :loading="isProviderTesting(item.id)" @click="testSingleProvider(item)">
@@ -96,75 +115,40 @@
:loading="isProviderTesting(provider.id)" @toggle-enabled="providerStatusChange" :loading="isProviderTesting(provider.id)" @toggle-enabled="providerStatusChange"
:bglogo="getProviderIcon(provider.provider)" @delete="deleteProvider" @edit="configExistingProvider" :bglogo="getProviderIcon(provider.provider)" @delete="deleteProvider" @edit="configExistingProvider"
@copy="copyProvider" :show-copy-button="true"> @copy="copyProvider" :show-copy-button="true">
<template #item-details="{ item }">
<!-- 测试状态 chip -->
<v-tooltip v-if="getProviderStatus(item.id)" location="top" max-width="300">
<template v-slot:activator="{ props }">
<v-chip v-bind="props" :color="getStatusColor(getProviderStatus(item.id).status)" size="small">
<v-icon start size="small">
{{ getProviderStatus(item.id).status === 'available' ? 'mdi-check-circle' :
getProviderStatus(item.id).status === 'unavailable' ? 'mdi-alert-circle' :
'mdi-clock-outline' }}
</v-icon>
{{ getStatusText(getProviderStatus(item.id).status) }}
</v-chip>
</template>
<span v-if="getProviderStatus(item.id).status === 'unavailable'">
{{ getProviderStatus(item.id).error }}
</span>
<span v-else>{{ getStatusText(getProviderStatus(item.id).status) }}</span>
</v-tooltip>
</template>
<template #actions="{ item }"> <template #actions="{ item }">
<v-btn style="z-index: 100000;" variant="tonal" color="info" rounded="xl" size="small" <v-btn style="z-index: 100000;" variant="tonal" color="info" rounded="xl" size="small"
:loading="isProviderTesting(item.id)" @click="testSingleProvider(item)"> :loading="isProviderTesting(item.id)" @click="testSingleProvider(item)">
{{ tm('availability.test') }} {{ tm('availability.test') }}
</v-btn> </v-btn>
</template> </template>
<template v-slot:details="{ item }">
</template>
</item-card> </item-card>
</v-col> </v-col>
</v-row> </v-row>
</template> </template>
</div> </div>
<!-- 供应商状态部分 -->
<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-heart-pulse</v-icon>
<span class="text-h4">{{ tm('availability.title') }}</span>
<v-spacer></v-spacer>
<v-btn color="primary" variant="tonal" :loading="testingProviders.length > 0" @click="fetchProviderStatus">
<v-icon left>mdi-refresh</v-icon>
{{ tm('availability.refresh') }}
</v-btn>
<v-btn variant="text" color="primary" @click="showStatus = !showStatus" style="margin-left: 8px;">
{{ showStatus ? tm('logs.collapse') : tm('logs.expand') }}
<v-icon>{{ showStatus ? 'mdi-chevron-up' : 'mdi-chevron-down' }}</v-icon>
</v-btn>
</v-card-title>
<v-expand-transition>
<v-card-text class="pa-0" v-if="showStatus">
<v-card-text class="px-4 py-3">
<v-alert v-if="providerStatuses.length === 0" type="info" variant="tonal">
{{ tm('availability.noData') }}
</v-alert>
<v-container v-else class="pa-0">
<v-row>
<v-col v-for="status in providerStatuses" :key="status.id" cols="12" sm="6" md="4">
<v-card variant="outlined" class="status-card" :class="`status-${status.status}`">
<v-card-item>
<v-icon v-if="status.status === 'available'" color="success"
class="me-2">mdi-check-circle</v-icon>
<v-icon v-else-if="status.status === 'unavailable'" color="error"
class="me-2">mdi-alert-circle</v-icon>
<v-progress-circular v-else-if="status.status === 'pending'" indeterminate color="primary"
size="20" width="2" class="me-2"></v-progress-circular>
<span class="font-weight-bold">{{ status.id }}</span>
<v-chip :color="getStatusColor(status.status)" size="small" class="ml-2">
{{ getStatusText(status.status) }}
</v-chip>
</v-card-item>
<v-card-text v-if="status.status === 'unavailable'" class="text-caption text-medium-emphasis">
<span class="font-weight-bold">{{ tm('availability.errorMessage') }}:</span> {{ status.error }}
</v-card-text>
</v-card>
</v-col>
</v-row>
</v-container>
</v-card-text>
</v-card-text>
</v-expand-transition>
</v-card>
<!-- 日志部分 --> <!-- 日志部分 -->
<v-card elevation="0" class="mt-4"> <v-card elevation="0" class="mt-4 mb-10">
<v-card-title class="d-flex align-center py-3 px-4"> <v-card-title class="d-flex align-center py-3 px-4">
<v-icon class="me-2">mdi-console-line</v-icon> <v-icon class="me-2">mdi-console-line</v-icon>
<span class="text-h4">{{ tm('logs.title') }}</span> <span class="text-h4">{{ tm('logs.title') }}</span>
@@ -751,11 +735,14 @@ export default {
return this.testingProviders.includes(providerId); return this.testingProviders.includes(providerId);
}, },
getProviderStatus(providerId) {
return this.providerStatuses.find(s => s.id === providerId);
},
async testSingleProvider(provider) { async testSingleProvider(provider) {
if (this.isProviderTesting(provider.id)) return; if (this.isProviderTesting(provider.id)) return;
this.testingProviders.push(provider.id); this.testingProviders.push(provider.id);
this.showStatus = true; //
// UIpending // UIpending
const statusIndex = this.providerStatuses.findIndex(s => s.id === provider.id); const statusIndex = this.providerStatuses.findIndex(s => s.id === provider.id);
@@ -862,6 +849,7 @@ export default {
.provider-page { .provider-page {
padding: 20px; padding: 20px;
padding-top: 8px; padding-top: 8px;
padding-bottom: 40px;
} }
.status-card { .status-card {
File diff suppressed because it is too large Load Diff
+18 -2
View File
@@ -1,6 +1,6 @@
import builtins import builtins
from astrbot.api import star from astrbot.api import sp, star
from astrbot.api.event import AstrMessageEvent, MessageEventResult from astrbot.api.event import AstrMessageEvent, MessageEventResult
@@ -17,6 +17,13 @@ class PersonaCommands:
default_persona = await self.context.persona_manager.get_default_persona_v3( default_persona = await self.context.persona_manager.get_default_persona_v3(
umo=umo, umo=umo,
) )
force_applied_persona_id = (
await sp.get_async(
scope="umo", scope_id=umo, key="session_service_config", default={}
)
).get("persona_id")
curr_cid_title = "" curr_cid_title = ""
if cid: if cid:
conv = await self.context.conversation_manager.get_conversation( conv = await self.context.conversation_manager.get_conversation(
@@ -36,6 +43,9 @@ class PersonaCommands:
else: else:
curr_persona_name = conv.persona_id curr_persona_name = conv.persona_id
if force_applied_persona_id:
curr_persona_name = f"{curr_persona_name} (自定义规则)"
curr_cid_title = conv.title if conv.title else "新对话" curr_cid_title = conv.title if conv.title else "新对话"
curr_cid_title += f"({cid[:4]})" curr_cid_title += f"({cid[:4]})"
@@ -113,9 +123,15 @@ class PersonaCommands:
message.unified_msg_origin, message.unified_msg_origin,
ps, ps,
) )
force_warn_msg = ""
if force_applied_persona_id:
force_warn_msg = (
"提醒:由于自定义规则,您现在切换的人格将不会生效。"
)
message.set_result( message.set_result(
MessageEventResult().message( MessageEventResult().message(
"设置成功。如果您正在切换到不同的人格,请注意使用 /reset 来清空上下文,防止原人格对话影响现人格。", f"设置成功。如果您正在切换到不同的人格,请注意使用 /reset 来清空上下文,防止原人格对话影响现人格。{force_warn_msg}",
), ),
) )
else: else:
+153 -19
View File
@@ -1,5 +1,7 @@
import asyncio
import re import re
from astrbot import logger
from astrbot.api import star from astrbot.api import star
from astrbot.api.event import AstrMessageEvent, MessageEventResult from astrbot.api.event import AstrMessageEvent, MessageEventResult
from astrbot.core.provider.entities import ProviderType from astrbot.core.provider.entities import ProviderType
@@ -9,6 +11,53 @@ class ProviderCommands:
def __init__(self, context: star.Context): def __init__(self, context: star.Context):
self.context = context self.context = context
def _log_reachability_failure(
self,
provider,
provider_capability_type: ProviderType | None,
err_code: str,
err_reason: str,
):
"""记录不可达原因到日志。"""
meta = provider.meta()
logger.warning(
"Provider reachability check failed: id=%s type=%s code=%s reason=%s",
meta.id,
provider_capability_type.name if provider_capability_type else "unknown",
err_code,
err_reason,
)
async def _test_provider_capability(self, provider):
"""测试单个 provider 的可用性"""
meta = provider.meta()
provider_capability_type = meta.provider_type
try:
result = await provider.test()
if result:
return True, None, None
err_code = "TEST_FAILED"
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
)
return False, err_code, err_reason
async def provider( async def provider(
self, self,
event: AstrMessageEvent, event: AstrMessageEvent,
@@ -17,46 +66,131 @@ class ProviderCommands:
): ):
"""查看或者切换 LLM Provider""" """查看或者切换 LLM Provider"""
umo = event.unified_msg_origin umo = event.unified_msg_origin
cfg = self.context.get_config(umo).get("provider_settings", {})
reachability_check_enabled = cfg.get("reachability_check", True)
if idx is None: if idx is None:
parts = ["## 载入的 LLM 提供商\n"] parts = ["## 载入的 LLM 提供商\n"]
for idx, llm in enumerate(self.context.get_all_providers()):
id_ = llm.meta().id # 获取所有类型的提供商
line = f"{idx + 1}. {id_} ({llm.meta().model})" llms = list(self.context.get_all_providers())
ttss = self.context.get_all_tts_providers()
stts = self.context.get_all_stt_providers()
# 构造待检测列表: [(provider, type_label), ...]
all_providers = []
all_providers.extend([(p, "llm") for p in llms])
all_providers.extend([(p, "tts") for p in ttss])
all_providers.extend([(p, "stt") for p in stts])
# 并发测试连通性
if reachability_check_enabled:
if all_providers:
await event.send(
MessageEventResult().message(
"正在进行提供商可达性测试,请稍候..."
)
)
check_results = await asyncio.gather(
*[self._test_provider_capability(p) for p, _ in all_providers],
return_exceptions=True,
)
else:
# 用 None 表示未检测
check_results = [None for _ in all_providers]
# 整合结果
display_data = []
for (p, p_type), reachable in zip(all_providers, check_results):
meta = p.meta()
id_ = meta.id
error_code = None
if isinstance(reachable, Exception):
# 异常情况下兜底处理,避免单个 provider 导致列表失败
self._log_reachability_failure(
p,
None,
reachable.__class__.__name__,
str(reachable),
)
reachable_flag = False
error_code = reachable.__class__.__name__
elif isinstance(reachable, tuple):
reachable_flag, error_code, _ = reachable
else:
reachable_flag = reachable
# 根据类型构建显示名称
if p_type == "llm":
info = f"{id_} ({meta.model})"
else:
info = f"{id_}"
# 确定状态标记
if reachable_flag is True:
mark = ""
elif reachable_flag is False:
if error_code:
mark = f" ❌(错误码: {error_code})"
else:
mark = ""
else:
mark = "" # 不支持检测时不显示标记
display_data.append(
{
"type": p_type,
"info": info,
"mark": mark,
"provider": p,
}
)
# 分组输出
# 1. LLM
llm_data = [d for d in display_data if d["type"] == "llm"]
for i, d in enumerate(llm_data):
line = f"{i + 1}. {d['info']}{d['mark']}"
provider_using = self.context.get_using_provider(umo=umo) provider_using = self.context.get_using_provider(umo=umo)
if provider_using and provider_using.meta().id == id_: if (
provider_using
and provider_using.meta().id == d["provider"].meta().id
):
line += " (当前使用)" line += " (当前使用)"
parts.append(line + "\n") parts.append(line + "\n")
tts_providers = self.context.get_all_tts_providers() # 2. TTS
if tts_providers: tts_data = [d for d in display_data if d["type"] == "tts"]
if tts_data:
parts.append("\n## 载入的 TTS 提供商\n") parts.append("\n## 载入的 TTS 提供商\n")
for idx, tts in enumerate(tts_providers): for i, d in enumerate(tts_data):
id_ = tts.meta().id line = f"{i + 1}. {d['info']}{d['mark']}"
line = f"{idx + 1}. {id_}"
tts_using = self.context.get_using_tts_provider(umo=umo) tts_using = self.context.get_using_tts_provider(umo=umo)
if tts_using and tts_using.meta().id == id_: if tts_using and tts_using.meta().id == d["provider"].meta().id:
line += " (当前使用)" line += " (当前使用)"
parts.append(line + "\n") parts.append(line + "\n")
stt_providers = self.context.get_all_stt_providers() # 3. STT
if stt_providers: stt_data = [d for d in display_data if d["type"] == "stt"]
if stt_data:
parts.append("\n## 载入的 STT 提供商\n") parts.append("\n## 载入的 STT 提供商\n")
for idx, stt in enumerate(stt_providers): for i, d in enumerate(stt_data):
id_ = stt.meta().id line = f"{i + 1}. {d['info']}{d['mark']}"
line = f"{idx + 1}. {id_}"
stt_using = self.context.get_using_stt_provider(umo=umo) stt_using = self.context.get_using_stt_provider(umo=umo)
if stt_using and stt_using.meta().id == id_: if stt_using and stt_using.meta().id == d["provider"].meta().id:
line += " (当前使用)" line += " (当前使用)"
parts.append(line + "\n") parts.append(line + "\n")
parts.append("\n使用 /provider <序号> 切换 LLM 提供商。") parts.append("\n使用 /provider <序号> 切换 LLM 提供商。")
ret = "".join(parts) ret = "".join(parts)
if tts_providers: if ttss:
ret += "\n使用 /provider tts <序号> 切换 TTS 提供商。" ret += "\n使用 /provider tts <序号> 切换 TTS 提供商。"
if stt_providers: if stts:
ret += "\n使用 /provider stt <切换> STT 提供商。" ret += "\n使用 /provider stt <序号> 切换 STT 提供商。"
if not reachability_check_enabled:
ret += "\n已跳过提供商可达性检测,如需检测请在配置文件中开启。"
event.set_result(MessageEventResult().message(ret)) event.set_result(MessageEventResult().message(ret))
elif idx == "tts": elif idx == "tts":
+22 -17
View File
@@ -6,9 +6,9 @@ from collections import defaultdict
from astrbot import logger from astrbot import logger
from astrbot.api import star from astrbot.api import star
from astrbot.api.event import AstrMessageEvent from astrbot.api.event import AstrMessageEvent
from astrbot.api.message_components import Image, Plain from astrbot.api.message_components import At, Image, Plain
from astrbot.api.platform import MessageType from astrbot.api.platform import MessageType
from astrbot.api.provider import Provider, ProviderRequest from astrbot.api.provider import LLMResponse, Provider, ProviderRequest
from astrbot.core.astrbot_config_mgr import AstrBotConfigManager from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
""" """
@@ -30,16 +30,13 @@ class LongTermMemory:
except BaseException as e: except BaseException as e:
logger.error(e) logger.error(e)
max_cnt = 300 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_prompt = cfg["provider_settings"]["image_caption_prompt"]
image_caption_provider_id = cfg["provider_settings"][ image_caption_provider_id = cfg["provider_ltm_settings"].get(
"default_image_caption_provider_id" "image_caption_provider_id"
] )
image_caption = cfg["provider_ltm_settings"]["image_caption"] and bool(
image_caption_provider_id
)
active_reply = cfg["provider_ltm_settings"]["active_reply"] active_reply = cfg["provider_ltm_settings"]["active_reply"]
enable_active_reply = active_reply.get("enable", False) enable_active_reply = active_reply.get("enable", False)
ar_method = active_reply["method"] ar_method = active_reply["method"]
@@ -142,6 +139,8 @@ class LongTermMemory:
logger.error(f"获取图片描述失败: {e}") logger.error(f"获取图片描述失败: {e}")
else: else:
parts.append(" [Image]") parts.append(" [Image]")
elif isinstance(comp, At):
parts.append(f" [At: {comp.name}]")
final_message = "".join(parts) final_message = "".join(parts)
logger.debug(f"ltm | {event.unified_msg_origin} | {final_message}") logger.debug(f"ltm | {event.unified_msg_origin} | {final_message}")
@@ -159,8 +158,12 @@ class LongTermMemory:
cfg = self.cfg(event) cfg = self.cfg(event)
if cfg["enable_active_reply"]: if cfg["enable_active_reply"]:
prompt = req.prompt prompt = req.prompt
req.prompt = f"You are now in a chatroom. The chat history is as follows:\n{chats_str}" req.prompt = (
req.prompt += f"\nNow, a new message is coming: `{prompt}`. Please react to it. Only output your response and do not output any other information." f"You are now in a chatroom. The chat history is as follows:\n{chats_str}"
f"\nNow, a new message is coming: `{prompt}`. "
"Please react to it. Only output your response and do not output any other information. "
"You MUST use the SAME language as the chatroom is using."
)
req.contexts = [] # 清空上下文,当使用了主动回复,所有聊天记录都在一个prompt中。 req.contexts = [] # 清空上下文,当使用了主动回复,所有聊天记录都在一个prompt中。
else: else:
req.system_prompt += ( req.system_prompt += (
@@ -168,13 +171,15 @@ class LongTermMemory:
) )
req.system_prompt += chats_str req.system_prompt += chats_str
async def after_req_llm(self, event: AstrMessageEvent): async def after_req_llm(self, event: AstrMessageEvent, llm_resp: LLMResponse):
if event.unified_msg_origin not in self.session_chats: if event.unified_msg_origin not in self.session_chats:
return return
if event.get_result() and event.get_result().is_llm_result(): if llm_resp.completion_text:
final_message = f"[You/{datetime.datetime.now().strftime('%H:%M:%S')}]: {event.get_result().get_plain_text()}" final_message = f"[You/{datetime.datetime.now().strftime('%H:%M:%S')}]: {llm_resp.completion_text}"
logger.debug(f"ltm | {event.unified_msg_origin} | {final_message}") logger.debug(
f"Recorded AI response: {event.unified_msg_origin} | {final_message}"
)
self.session_chats[event.unified_msg_origin].append(final_message) self.session_chats[event.unified_msg_origin].append(final_message)
cfg = self.cfg(event) cfg = self.cfg(event)
if len(self.session_chats[event.unified_msg_origin]) > cfg["max_cnt"]: if len(self.session_chats[event.unified_msg_origin]) > cfg["max_cnt"]:
+2 -5
View File
@@ -322,7 +322,7 @@ class Main(star.Star):
@filter.on_llm_response() @filter.on_llm_response()
async def inject_reasoning(self, event: AstrMessageEvent, resp: LLMResponse): async def inject_reasoning(self, event: AstrMessageEvent, resp: LLMResponse):
"""在 LLM 响应后基于配置注入思考过程文本""" """在 LLM 响应后基于配置注入思考过程文本 / 在 LLM 响应后记录对话"""
umo = event.unified_msg_origin umo = event.unified_msg_origin
cfg = self.context.get_config(umo).get("provider_settings", {}) cfg = self.context.get_config(umo).get("provider_settings", {})
show_reasoning = cfg.get("display_reasoning_text", False) show_reasoning = cfg.get("display_reasoning_text", False)
@@ -331,12 +331,9 @@ class Main(star.Star):
f"🤔 思考: {resp.reasoning_content}\n\n{resp.completion_text}" f"🤔 思考: {resp.reasoning_content}\n\n{resp.completion_text}"
) )
@filter.after_message_sent()
async def after_llm_req(self, event: AstrMessageEvent):
"""在 LLM 请求后记录对话"""
if self.ltm and self.ltm_enabled(event): if self.ltm and self.ltm_enabled(event):
try: try:
await self.ltm.after_req_llm(event) await self.ltm.after_req_llm(event, resp)
except Exception as e: except Exception as e:
logger.error(f"ltm: {e}") logger.error(f"ltm: {e}")
+18 -8
View File
@@ -3,7 +3,7 @@ import copy
import datetime import datetime
import zoneinfo import zoneinfo
from astrbot.api import logger, star from astrbot.api import logger, sp, star
from astrbot.api.event import AstrMessageEvent from astrbot.api.event import AstrMessageEvent
from astrbot.api.message_components import Image, Reply from astrbot.api.message_components import Image, Reply
from astrbot.api.provider import Provider, ProviderRequest from astrbot.api.provider import Provider, ProviderRequest
@@ -21,16 +21,26 @@ class ProcessLLMRequest:
else: else:
logger.info(f"Timezone set to: {self.timezone}") logger.info(f"Timezone set to: {self.timezone}")
def _ensure_persona(self, req: ProviderRequest, cfg: dict): async def _ensure_persona(self, req: ProviderRequest, cfg: dict, umo: str):
"""确保用户人格已加载""" """确保用户人格已加载"""
if not req.conversation: if not req.conversation:
return return
# persona inject # persona inject
persona_id = req.conversation.persona_id or cfg.get("default_personality")
if not persona_id and persona_id != "[%None]": # [%None] 为用户取消人格 # custom rule is preferred
default_persona = self.ctx.persona_manager.selected_default_persona_v3 persona_id = (
if default_persona: await sp.get_async(
persona_id = default_persona["name"] scope="umo", scope_id=umo, key="session_service_config", default={}
)
).get("persona_id")
if not persona_id:
persona_id = req.conversation.persona_id or cfg.get("default_personality")
if not persona_id and persona_id != "[%None]": # [%None] 为用户取消人格
default_persona = self.ctx.persona_manager.selected_default_persona_v3
if default_persona:
persona_id = default_persona["name"]
persona = next( persona = next(
builtins.filter( builtins.filter(
lambda persona: persona["name"] == persona_id, lambda persona: persona["name"] == persona_id,
@@ -152,7 +162,7 @@ class ProcessLLMRequest:
img_cap_prov_id: str = cfg.get("default_image_caption_provider_id") or "" img_cap_prov_id: str = cfg.get("default_image_caption_provider_id") or ""
if req.conversation: if req.conversation:
# inject persona for this request # inject persona for this request
self._ensure_persona(req, cfg) await self._ensure_persona(req, cfg, event.unified_msg_origin)
# image caption # image caption
if img_cap_prov_id and req.image_urls: if img_cap_prov_id and req.image_urls:
+1 -1
View File
@@ -14,7 +14,7 @@ from astrbot.core.utils.session_waiter import (
) )
class Waiter(Star): class Main(Star):
"""会话控制""" """会话控制"""
def __init__(self, context: Context): def __init__(self, context: Context):
+1 -1
View File
@@ -1,6 +1,6 @@
[project] [project]
name = "AstrBot" name = "AstrBot"
version = "4.6.1" version = "4.7.3"
description = "Easy-to-use multi-platform LLM chatbot and development framework" description = "Easy-to-use multi-platform LLM chatbot and development framework"
readme = "README.md" readme = "README.md"
requires-python = ">=3.10" requires-python = ">=3.10"
+11 -1
View File
@@ -21,7 +21,17 @@ async def core_lifecycle_td(tmp_path_factory):
log_broker = LogBroker() log_broker = LogBroker()
core_lifecycle = AstrBotCoreLifecycle(log_broker, db) core_lifecycle = AstrBotCoreLifecycle(log_broker, db)
await core_lifecycle.initialize() await core_lifecycle.initialize()
return core_lifecycle try:
yield core_lifecycle
finally:
# 优先停止核心生命周期以释放资源(包括关闭 MCP 等后台任务)
try:
_stop_res = core_lifecycle.stop()
if asyncio.iscoroutine(_stop_res):
await _stop_res
except Exception:
# 停止过程中如有异常,不影响后续清理
pass
@pytest.fixture(scope="module") @pytest.fixture(scope="module")
+2
View File
@@ -39,6 +39,7 @@ def plugin_manager_pm(tmp_path):
message_history_manager = MagicMock() message_history_manager = MagicMock()
persona_manager = MagicMock() persona_manager = MagicMock()
astrbot_config_mgr = MagicMock() astrbot_config_mgr = MagicMock()
knowledge_base_manager = MagicMock()
star_context = Context( star_context = Context(
event_queue, event_queue,
@@ -50,6 +51,7 @@ def plugin_manager_pm(tmp_path):
message_history_manager, message_history_manager,
persona_manager, persona_manager,
astrbot_config_mgr, astrbot_config_mgr,
knowledge_base_manager=knowledge_base_manager,
) )
# Create the PluginManager instance # Create the PluginManager instance