Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 150a741e92 |
@@ -34,7 +34,6 @@ 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
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
__version__ = "4.7.3"
|
__version__ = "3.5.23"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
from typing import Any, ClassVar, Literal, cast
|
from typing import Any, ClassVar, Literal, cast
|
||||||
|
|
||||||
from pydantic import BaseModel, GetCoreSchemaHandler, model_validator
|
from pydantic import BaseModel, GetCoreSchemaHandler
|
||||||
from pydantic_core import core_schema
|
from pydantic_core import core_schema
|
||||||
|
|
||||||
|
|
||||||
@@ -145,39 +145,22 @@ class Message(BaseModel):
|
|||||||
"tool",
|
"tool",
|
||||||
]
|
]
|
||||||
|
|
||||||
content: str | list[ContentPart] | None = None
|
content: str | list[ContentPart]
|
||||||
"""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):
|
||||||
|
|||||||
@@ -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.7.3"
|
VERSION = "4.6.1"
|
||||||
DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
|
DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
|
||||||
|
|
||||||
# 默认配置
|
# 默认配置
|
||||||
@@ -90,7 +90,6 @@ 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",
|
||||||
@@ -2110,9 +2109,6 @@ 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",
|
||||||
},
|
},
|
||||||
@@ -2789,16 +2785,7 @@ 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": "主动回复",
|
||||||
|
|||||||
@@ -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 astrbot_config, logger
|
from astrbot.core import 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,15 +88,12 @@ class ThirdPartyAgentSubStage(Stage):
|
|||||||
return
|
return
|
||||||
|
|
||||||
self.prov_cfg: dict = next(
|
self.prov_cfg: dict = next(
|
||||||
(p for p in astrbot_config["provider"] if p["id"] == self.prov_id),
|
(p for p in self.conf["provider"] if p["id"] == self.prov_id),
|
||||||
{},
|
{},
|
||||||
)
|
)
|
||||||
if not self.prov_id:
|
if not self.prov_id or not self.prov_cfg:
|
||||||
logger.error("没有填写 Agent Runner 提供商 ID,请前往配置页面配置。")
|
|
||||||
return
|
|
||||||
if not self.prov_cfg:
|
|
||||||
logger.error(
|
logger.error(
|
||||||
f"Agent Runner 提供商 {self.prov_id} 配置不存在,请前往配置页面修改配置。"
|
"Third Party Agent Runner provider ID is not configured properly."
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
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
|
||||||
@@ -62,5 +63,12 @@ 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
|
||||||
|
|||||||
@@ -250,7 +250,7 @@ class DingtalkPlatformAdapter(Platform):
|
|||||||
|
|
||||||
async def terminate(self):
|
async def terminate(self):
|
||||||
def monkey_patch_close():
|
def monkey_patch_close():
|
||||||
raise KeyboardInterrupt("Graceful shutdown")
|
raise Exception("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")
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import asyncio
|
import asyncio
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
from astrbot.core import astrbot_config, logger, sp
|
from astrbot.core import 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,7 +24,6 @@ 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"]
|
||||||
@@ -227,7 +226,6 @@ 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
|
||||||
@@ -436,46 +434,40 @@ class ProviderManager:
|
|||||||
)
|
)
|
||||||
|
|
||||||
async def reload(self, provider_config: dict):
|
async def reload(self, provider_config: dict):
|
||||||
async with self.reload_lock:
|
await self.terminate_provider(provider_config["id"])
|
||||||
await self.terminate_provider(provider_config["id"])
|
if provider_config["enable"]:
|
||||||
if provider_config["enable"]:
|
await self.load_provider(provider_config)
|
||||||
await self.load_provider(provider_config)
|
|
||||||
|
|
||||||
# 和配置文件保持同步
|
# 和配置文件保持同步
|
||||||
self.providers_config = astrbot_config["provider"]
|
config_ids = [provider["id"] for provider in self.providers_config]
|
||||||
config_ids = [provider["id"] for provider in self.providers_config]
|
logger.debug(f"providers in user's config: {config_ids}")
|
||||||
logger.info(f"providers in user's config: {config_ids}")
|
for key in list(self.inst_map.keys()):
|
||||||
for key in list(self.inst_map.keys()):
|
if key not in config_ids:
|
||||||
if key not in config_ids:
|
await self.terminate_provider(key)
|
||||||
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 (
|
elif self.curr_stt_provider_inst is None and len(self.stt_provider_insts) > 0:
|
||||||
self.curr_stt_provider_inst is None and len(self.stt_provider_insts) > 0
|
self.curr_stt_provider_inst = self.stt_provider_insts[0]
|
||||||
):
|
logger.info(
|
||||||
self.curr_stt_provider_inst = self.stt_provider_insts[0]
|
f"自动选择 {self.curr_stt_provider_inst.meta().id} 作为当前语音转文本提供商适配器。",
|
||||||
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 (
|
elif self.curr_tts_provider_inst is None and len(self.tts_provider_insts) > 0:
|
||||||
self.curr_tts_provider_inst is None and len(self.tts_provider_insts) > 0
|
self.curr_tts_provider_inst = self.tts_provider_insts[0]
|
||||||
):
|
logger.info(
|
||||||
self.curr_tts_provider_inst = self.tts_provider_insts[0]
|
f"自动选择 {self.curr_tts_provider_inst.meta().id} 作为当前文本转语音提供商适配器。",
|
||||||
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
|
||||||
|
|||||||
@@ -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")
|
||||||
|
|||||||
@@ -171,3 +171,110 @@ 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,6 +42,87 @@ 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:
|
||||||
"""根据会话配置过滤处理器列表
|
"""根据会话配置过滤处理器列表
|
||||||
|
|||||||
@@ -60,6 +60,10 @@ 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()
|
||||||
|
|
||||||
@@ -916,6 +920,158 @@ 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 上传文档
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import asyncio
|
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import ssl
|
import ssl
|
||||||
@@ -20,10 +19,6 @@ 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__(
|
||||||
@@ -38,7 +33,6 @@ 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),
|
||||||
@@ -69,7 +63,7 @@ class PluginRoute(Route):
|
|||||||
.__dict__
|
.__dict__
|
||||||
)
|
)
|
||||||
|
|
||||||
data = await request.get_json()
|
data = await request.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)
|
||||||
@@ -352,7 +346,7 @@ class PluginRoute(Route):
|
|||||||
.__dict__
|
.__dict__
|
||||||
)
|
)
|
||||||
|
|
||||||
post_data = await request.get_json()
|
post_data = await request.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)
|
||||||
@@ -399,7 +393,7 @@ class PluginRoute(Route):
|
|||||||
.__dict__
|
.__dict__
|
||||||
)
|
)
|
||||||
|
|
||||||
post_data = await request.get_json()
|
post_data = await request.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)
|
||||||
@@ -424,7 +418,7 @@ class PluginRoute(Route):
|
|||||||
.__dict__
|
.__dict__
|
||||||
)
|
)
|
||||||
|
|
||||||
post_data = await request.get_json()
|
post_data = await request.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:
|
||||||
@@ -438,59 +432,6 @@ 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 (
|
||||||
@@ -499,7 +440,7 @@ class PluginRoute(Route):
|
|||||||
.__dict__
|
.__dict__
|
||||||
)
|
)
|
||||||
|
|
||||||
post_data = await request.get_json()
|
post_data = await request.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)
|
||||||
@@ -517,7 +458,7 @@ class PluginRoute(Route):
|
|||||||
.__dict__
|
.__dict__
|
||||||
)
|
)
|
||||||
|
|
||||||
post_data = await request.get_json()
|
post_data = await request.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)
|
||||||
|
|||||||
@@ -74,10 +74,7 @@ class SessionManagementRoute(Route):
|
|||||||
umo_id = pref.scope_id
|
umo_id = pref.scope_id
|
||||||
if umo_id not in umo_rules:
|
if umo_id not in umo_rules:
|
||||||
umo_rules[umo_id] = {}
|
umo_rules[umo_id] = {}
|
||||||
if pref.key == "session_plugin_config" and umo_id in pref.value["val"]:
|
umo_rules[umo_id][pref.key] = pref.value["val"]
|
||||||
umo_rules[umo_id][pref.key] = pref.value["val"][umo_id]
|
|
||||||
else:
|
|
||||||
umo_rules[umo_id][pref.key] = pref.value["val"]
|
|
||||||
|
|
||||||
# 搜索过滤
|
# 搜索过滤
|
||||||
if search:
|
if search:
|
||||||
@@ -188,35 +185,6 @@ class SessionManagementRoute(Route):
|
|||||||
for p in provider_manager.tts_provider_insts
|
for p in provider_manager.tts_provider_insts
|
||||||
]
|
]
|
||||||
|
|
||||||
# 获取可用的插件列表(排除 reserved 的系统插件)
|
|
||||||
plugin_manager = self.core_lifecycle.plugin_manager
|
|
||||||
available_plugins = [
|
|
||||||
{
|
|
||||||
"name": p.name,
|
|
||||||
"display_name": p.display_name or p.name,
|
|
||||||
"desc": p.desc,
|
|
||||||
}
|
|
||||||
for p in plugin_manager.context.get_all_stars()
|
|
||||||
if not p.reserved and p.name
|
|
||||||
]
|
|
||||||
|
|
||||||
# 获取可用的知识库列表
|
|
||||||
available_kbs = []
|
|
||||||
kb_manager = self.core_lifecycle.kb_manager
|
|
||||||
if kb_manager:
|
|
||||||
try:
|
|
||||||
kbs = await kb_manager.list_kbs()
|
|
||||||
available_kbs = [
|
|
||||||
{
|
|
||||||
"kb_id": kb.kb_id,
|
|
||||||
"kb_name": kb.kb_name,
|
|
||||||
"emoji": kb.emoji,
|
|
||||||
}
|
|
||||||
for kb in kbs
|
|
||||||
]
|
|
||||||
except Exception as e:
|
|
||||||
logger.warning(f"获取知识库列表失败: {e!s}")
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
Response()
|
Response()
|
||||||
.ok(
|
.ok(
|
||||||
@@ -229,8 +197,6 @@ class SessionManagementRoute(Route):
|
|||||||
"available_chat_providers": available_chat_providers,
|
"available_chat_providers": available_chat_providers,
|
||||||
"available_stt_providers": available_stt_providers,
|
"available_stt_providers": available_stt_providers,
|
||||||
"available_tts_providers": available_tts_providers,
|
"available_tts_providers": available_tts_providers,
|
||||||
"available_plugins": available_plugins,
|
|
||||||
"available_kbs": available_kbs,
|
|
||||||
"available_rule_keys": AVAILABLE_SESSION_RULE_KEYS,
|
"available_rule_keys": AVAILABLE_SESSION_RULE_KEYS,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@@ -263,11 +229,6 @@ class SessionManagementRoute(Route):
|
|||||||
if rule_key not in AVAILABLE_SESSION_RULE_KEYS:
|
if rule_key not in AVAILABLE_SESSION_RULE_KEYS:
|
||||||
return Response().error(f"不支持的规则键: {rule_key}").__dict__
|
return Response().error(f"不支持的规则键: {rule_key}").__dict__
|
||||||
|
|
||||||
if rule_key == "session_plugin_config":
|
|
||||||
rule_value = {
|
|
||||||
umo: rule_value,
|
|
||||||
}
|
|
||||||
|
|
||||||
# 使用 shared preferences 更新规则
|
# 使用 shared preferences 更新规则
|
||||||
await sp.session_put(umo, rule_key, rule_value)
|
await sp.session_put(umo, rule_key, rule_value)
|
||||||
|
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
## What's Changed
|
|
||||||
|
|
||||||
重构:
|
|
||||||
- 将 Dify、Coze、阿里云百炼应用等 LLMOps 提供商迁移到 Agent 执行器层,理清和本地 Agent 执行器的边界
|
|
||||||
- 将「会话管理」功能重构为「自定义规则」功能,理清和多配置文件功能的边界。详见:[自定义规则](https://docs.astrbot.app/use/custom-rules.html)
|
|
||||||
|
|
||||||
优化:
|
|
||||||
- Dify、阿里云百炼应用支持流式输出
|
|
||||||
- 防止分段回复正则表达式解析错误导致消息不发送
|
|
||||||
- 群聊上下文感知记录 At 信息
|
|
||||||
- 优化模型提供商页面的测试提供商功能
|
|
||||||
|
|
||||||
新增:
|
|
||||||
- 支持在配置文件页面快速测试对话
|
|
||||||
- 为配置文件配置项内容添加国际化支持
|
|
||||||
|
|
||||||
修复:
|
|
||||||
- 在更新 MCP Server 配置后,MCP 无法正常重启的问题
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
## What's Changed
|
|
||||||
|
|
||||||
### 修复了自定义规则页面无法设置插件和知识库的规则的问题
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
重构:
|
|
||||||
- 将 Dify、Coze、阿里云百炼应用等 LLMOps 提供商迁移到 Agent 执行器层,理清和本地 Agent 执行器的边界。详见:[Agent 执行器](https://docs.astrbot.app/use/agent-runner.html)
|
|
||||||
- 将「会话管理」功能重构为「自定义规则」功能,理清和多配置文件功能的边界。详见:[自定义规则](https://docs.astrbot.app/use/custom-rules.html)
|
|
||||||
|
|
||||||
优化:
|
|
||||||
- Dify、阿里云百炼应用支持流式输出
|
|
||||||
- 防止分段回复正则表达式解析错误导致消息不发送
|
|
||||||
- 群聊上下文感知记录 At 信息
|
|
||||||
- 优化模型提供商页面的测试提供商功能
|
|
||||||
|
|
||||||
新增:
|
|
||||||
- 支持在配置文件页面快速测试对话
|
|
||||||
- 为配置文件配置项内容添加国际化支持
|
|
||||||
|
|
||||||
修复:
|
|
||||||
- 在更新 MCP Server 配置后,MCP 无法正常重启的问题
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
## What's Changed
|
|
||||||
|
|
||||||
1. 修复使用非默认配置文件情况下时,第三方 Agent Runner (Dify、Coze、阿里云百炼应用等)无法正常工作的问题
|
|
||||||
2. 修复当“聊天模型”未设置,并且模型提供商中仅有 Agent Runner 时,无法正常使用 Agent Runner 的问题
|
|
||||||
3. 修复部分情况下报错 `pydantic_core._pydantic_core.ValidationError: 1 validation error for Message content` 的问题
|
|
||||||
4. 新增群聊模式下的专用图片转述模型配置 ([#3822](https://github.com/AstrBotDevs/AstrBot/issues/3822))
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
重构:
|
|
||||||
- 将 Dify、Coze、阿里云百炼应用等 LLMOps 提供商迁移到 Agent 执行器层,理清和本地 Agent 执行器的边界。详见:[Agent 执行器](https://docs.astrbot.app/use/agent-runner.html)
|
|
||||||
- 将「会话管理」功能重构为「自定义规则」功能,理清和多配置文件功能的边界。详见:[自定义规则](https://docs.astrbot.app/use/custom-rules.html)
|
|
||||||
|
|
||||||
优化:
|
|
||||||
- Dify、阿里云百炼应用支持流式输出
|
|
||||||
- 防止分段回复正则表达式解析错误导致消息不发送
|
|
||||||
- 群聊上下文感知记录 At 信息
|
|
||||||
- 优化模型提供商页面的测试提供商功能
|
|
||||||
|
|
||||||
新增:
|
|
||||||
- 支持在配置文件页面快速测试对话
|
|
||||||
- 为配置文件配置项内容添加国际化支持
|
|
||||||
|
|
||||||
修复:
|
|
||||||
- 在更新 MCP Server 配置后,MCP 无法正常重启的问题
|
|
||||||
@@ -84,7 +84,7 @@
|
|||||||
v-model:prompt="prompt"
|
v-model:prompt="prompt"
|
||||||
:stagedImagesUrl="stagedImagesUrl"
|
:stagedImagesUrl="stagedImagesUrl"
|
||||||
:stagedAudioUrl="stagedAudioUrl"
|
:stagedAudioUrl="stagedAudioUrl"
|
||||||
:disabled="isStreaming"
|
:disabled="isStreaming || isConvRunning"
|
||||||
: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: 40%;
|
max-width: 80%;
|
||||||
width: auto;
|
width: auto;
|
||||||
height: auto;
|
height: auto;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
@@ -558,6 +558,10 @@ 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"
|
:disabled="isStreaming || isConvRunning"
|
||||||
: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 variant="flat" size="small"
|
<v-chip v-for="level in logLevels" :key="level" :color="getLevelColor(level)" filter
|
||||||
:text-color="level === 'DEBUG' || level === 'INFO' ? 'black' : 'white'" class="font-weight-medium">
|
:text-color="level === 'DEBUG' || level === 'INFO' ? 'black' : 'white'">
|
||||||
{{ level }}
|
{{ level }}
|
||||||
</v-chip>
|
</v-chip>
|
||||||
</v-chip-group>
|
</v-chip-group>
|
||||||
@@ -168,7 +168,6 @@ 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 {
|
||||||
|
|||||||
@@ -379,11 +379,7 @@
|
|||||||
},
|
},
|
||||||
"image_caption": {
|
"image_caption": {
|
||||||
"description": "Auto-understand Images",
|
"description": "Auto-understand Images",
|
||||||
"hint": "Requires setting a group chat image caption model."
|
"hint": "Requires setting a default 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": {
|
||||||
|
|||||||
@@ -32,8 +32,7 @@
|
|||||||
"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",
|
||||||
@@ -142,9 +141,7 @@
|
|||||||
"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",
|
||||||
|
|||||||
@@ -73,17 +73,6 @@
|
|||||||
"title": "Persona Configuration",
|
"title": "Persona Configuration",
|
||||||
"selectPersona": "Select Persona",
|
"selectPersona": "Select Persona",
|
||||||
"hint": "Persona settings affect the conversation style and behavior of the LLM"
|
"hint": "Persona settings affect the conversation style and behavior of the LLM"
|
||||||
},
|
|
||||||
"pluginConfig": {
|
|
||||||
"title": "Plugin Configuration",
|
|
||||||
"disabledPlugins": "Disabled Plugins",
|
|
||||||
"hint": "Select plugins to disable for this session. Unselected plugins will remain enabled."
|
|
||||||
},
|
|
||||||
"kbConfig": {
|
|
||||||
"title": "Knowledge Base Configuration",
|
|
||||||
"selectKbs": "Select Knowledge Bases",
|
|
||||||
"topK": "Top K Results",
|
|
||||||
"enableRerank": "Enable Reranking"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"deleteConfirm": {
|
"deleteConfirm": {
|
||||||
|
|||||||
@@ -379,11 +379,7 @@
|
|||||||
},
|
},
|
||||||
"image_caption": {
|
"image_caption": {
|
||||||
"description": "自动理解图片",
|
"description": "自动理解图片",
|
||||||
"hint": "需要设置群聊图片转述模型。"
|
"hint": "需要设置默认图片转述模型。"
|
||||||
},
|
|
||||||
"image_caption_provider_id": {
|
|
||||||
"description": "群聊图片转述模型",
|
|
||||||
"hint": "用于群聊上下文感知的图片理解,与默认图片转述模型分开配置。"
|
|
||||||
},
|
},
|
||||||
"active_reply": {
|
"active_reply": {
|
||||||
"enable": {
|
"enable": {
|
||||||
|
|||||||
@@ -32,8 +32,7 @@
|
|||||||
"actions": "操作",
|
"actions": "操作",
|
||||||
"back": "返回",
|
"back": "返回",
|
||||||
"selectFile": "选择文件",
|
"selectFile": "选择文件",
|
||||||
"refresh": "刷新",
|
"refresh": "刷新"
|
||||||
"updateAll": "更新全部插件"
|
|
||||||
},
|
},
|
||||||
"status": {
|
"status": {
|
||||||
"enabled": "启用",
|
"enabled": "启用",
|
||||||
@@ -142,9 +141,7 @@
|
|||||||
"confirmDelete": "确定要删除插件吗?",
|
"confirmDelete": "确定要删除插件吗?",
|
||||||
"fillUrlOrFile": "请填写插件链接或上传插件文件",
|
"fillUrlOrFile": "请填写插件链接或上传插件文件",
|
||||||
"dontFillBoth": "请不要同时填写插件链接和上传文件",
|
"dontFillBoth": "请不要同时填写插件链接和上传文件",
|
||||||
"supportedFormats": "支持 .zip 格式的插件文件",
|
"supportedFormats": "支持 .zip 格式的插件文件"
|
||||||
"updateAllSuccess": "所有可更新的插件都已更新!",
|
|
||||||
"updateAllFailed": "有 {failed}/{total} 个插件更新失败:"
|
|
||||||
},
|
},
|
||||||
"upload": {
|
"upload": {
|
||||||
"fromFile": "从文件安装",
|
"fromFile": "从文件安装",
|
||||||
|
|||||||
@@ -73,17 +73,6 @@
|
|||||||
"title": "人格配置",
|
"title": "人格配置",
|
||||||
"selectPersona": "选择人格",
|
"selectPersona": "选择人格",
|
||||||
"hint": "应用人格配置后,将会强制该来源的所有对话使用该人格。"
|
"hint": "应用人格配置后,将会强制该来源的所有对话使用该人格。"
|
||||||
},
|
|
||||||
"pluginConfig": {
|
|
||||||
"title": "插件配置",
|
|
||||||
"disabledPlugins": "禁用的插件",
|
|
||||||
"hint": "选择要在此会话中禁用的插件。未选择的插件将保持启用状态。"
|
|
||||||
},
|
|
||||||
"kbConfig": {
|
|
||||||
"title": "知识库配置",
|
|
||||||
"selectKbs": "选择知识库",
|
|
||||||
"topK": "返回结果数量 (Top K)",
|
|
||||||
"enableRerank": "启用重排序"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"deleteConfirm": {
|
"deleteConfirm": {
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ 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,
|
||||||
@@ -227,10 +226,6 @@ 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;
|
||||||
@@ -377,56 +372,6 @@ 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 });
|
||||||
@@ -775,12 +720,6 @@ 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') }}
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 日志部分 -->
|
<!-- 日志部分 -->
|
||||||
<v-card elevation="0" class="mt-4 mb-10">
|
<v-card elevation="0" class="mt-4">
|
||||||
<v-card-title class="d-flex align-center py-3 px-4">
|
<v-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,6 +233,5 @@ export default {
|
|||||||
.platform-page {
|
.platform-page {
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
padding-top: 8px;
|
padding-top: 8px;
|
||||||
padding-bottom: 40px;
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -69,25 +69,6 @@
|
|||||||
: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)">
|
||||||
@@ -115,40 +96,75 @@
|
|||||||
: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 mb-10">
|
<v-card elevation="0" class="mt-4">
|
||||||
<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>
|
||||||
@@ -735,14 +751,11 @@ 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; // 自动展开状态部分
|
||||||
|
|
||||||
// 更新UI为pending状态
|
// 更新UI为pending状态
|
||||||
const statusIndex = this.providerStatuses.findIndex(s => s.id === provider.id);
|
const statusIndex = this.providerStatuses.findIndex(s => s.id === provider.id);
|
||||||
@@ -849,7 +862,6 @@ export default {
|
|||||||
.provider-page {
|
.provider-page {
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
padding-top: 8px;
|
padding-top: 8px;
|
||||||
padding-bottom: 40px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.status-card {
|
.status-card {
|
||||||
|
|||||||
@@ -143,11 +143,11 @@
|
|||||||
</v-dialog>
|
</v-dialog>
|
||||||
|
|
||||||
<!-- 规则编辑对话框 -->
|
<!-- 规则编辑对话框 -->
|
||||||
<v-dialog v-model="ruleDialog" max-width="550" scrollable>
|
<v-dialog v-model="ruleDialog" max-width="700" scrollable>
|
||||||
<v-card v-if="selectedUmo" class="d-flex flex-column" height="600">
|
<v-card v-if="selectedUmo" class="d-flex flex-column" height="600">
|
||||||
<v-card-title class="py-3 px-6 d-flex align-center border-b">
|
<v-card-title class="py-3 px-6 d-flex align-center border-b">
|
||||||
<span>{{ tm('ruleEditor.title') }}</span>
|
<span>{{ tm('ruleEditor.title') }}</span>
|
||||||
<v-chip size="x-small" class="ml-2 font-weight-regular" variant="outlined">
|
<v-chip size="small" class="ml-4 font-weight-regular" variant="outlined">
|
||||||
{{ selectedUmo.umo }}
|
{{ selectedUmo.umo }}
|
||||||
</v-chip>
|
</v-chip>
|
||||||
<v-spacer></v-spacer>
|
<v-spacer></v-spacer>
|
||||||
@@ -241,59 +241,6 @@
|
|||||||
{{ tm('buttons.save') }}
|
{{ tm('buttons.save') }}
|
||||||
</v-btn>
|
</v-btn>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Plugin Config Section -->
|
|
||||||
<div class="d-flex align-center mb-4 mt-4">
|
|
||||||
<h3 class="font-weight-bold mb-0">{{ tm('ruleEditor.pluginConfig.title') }}</h3>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<v-row dense>
|
|
||||||
<v-col cols="12">
|
|
||||||
<v-select v-model="pluginConfig.disabled_plugins" :items="pluginOptions" item-title="label"
|
|
||||||
item-value="value" :label="tm('ruleEditor.pluginConfig.disabledPlugins')" variant="outlined"
|
|
||||||
hide-details multiple chips closable-chips clearable />
|
|
||||||
</v-col>
|
|
||||||
<v-col cols="12">
|
|
||||||
<v-alert type="info" variant="tonal" class="mt-2" icon="mdi-information-outline">
|
|
||||||
{{ tm('ruleEditor.pluginConfig.hint') }}
|
|
||||||
</v-alert>
|
|
||||||
</v-col>
|
|
||||||
</v-row>
|
|
||||||
|
|
||||||
<div class="d-flex justify-end mt-4">
|
|
||||||
<v-btn color="primary" variant="tonal" size="small" @click="savePluginConfig" :loading="saving"
|
|
||||||
prepend-icon="mdi-content-save">
|
|
||||||
{{ tm('buttons.save') }}
|
|
||||||
</v-btn>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- KB Config Section -->
|
|
||||||
<div class="d-flex align-center mb-4 mt-4">
|
|
||||||
<h3 class="font-weight-bold mb-0">{{ tm('ruleEditor.kbConfig.title') }}</h3>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<v-row dense>
|
|
||||||
<v-col cols="12">
|
|
||||||
<v-select v-model="kbConfig.kb_ids" :items="kbOptions" item-title="label" item-value="value" :disabled="availableKbs.length === 0"
|
|
||||||
:label="tm('ruleEditor.kbConfig.selectKbs')" variant="outlined" hide-details multiple chips
|
|
||||||
closable-chips clearable />
|
|
||||||
</v-col>
|
|
||||||
<v-col cols="12" md="6">
|
|
||||||
<v-text-field v-model.number="kbConfig.top_k" :label="tm('ruleEditor.kbConfig.topK')"
|
|
||||||
variant="outlined" hide-details type="number" min="1" max="20" class="mt-3"/>
|
|
||||||
</v-col>
|
|
||||||
<v-col cols="12" md="6">
|
|
||||||
<v-checkbox v-model="kbConfig.enable_rerank" :label="tm('ruleEditor.kbConfig.enableRerank')"
|
|
||||||
color="primary" hide-details class="mt-3"/>
|
|
||||||
</v-col>
|
|
||||||
</v-row>
|
|
||||||
|
|
||||||
<div class="d-flex justify-end mt-4">
|
|
||||||
<v-btn color="primary" variant="tonal" size="small" @click="saveKbConfig" :loading="saving"
|
|
||||||
prepend-icon="mdi-content-save">
|
|
||||||
{{ tm('buttons.save') }}
|
|
||||||
</v-btn>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</v-card-text>
|
</v-card-text>
|
||||||
</v-card>
|
</v-card>
|
||||||
@@ -400,8 +347,6 @@ export default {
|
|||||||
availableChatProviders: [],
|
availableChatProviders: [],
|
||||||
availableSttProviders: [],
|
availableSttProviders: [],
|
||||||
availableTtsProviders: [],
|
availableTtsProviders: [],
|
||||||
availablePlugins: [],
|
|
||||||
availableKbs: [],
|
|
||||||
|
|
||||||
// 添加规则
|
// 添加规则
|
||||||
addRuleDialog: false,
|
addRuleDialog: false,
|
||||||
@@ -429,19 +374,6 @@ export default {
|
|||||||
text_to_speech: null,
|
text_to_speech: null,
|
||||||
},
|
},
|
||||||
|
|
||||||
// 插件配置
|
|
||||||
pluginConfig: {
|
|
||||||
enabled_plugins: [],
|
|
||||||
disabled_plugins: [],
|
|
||||||
},
|
|
||||||
|
|
||||||
// 知识库配置
|
|
||||||
kbConfig: {
|
|
||||||
kb_ids: [],
|
|
||||||
top_k: 5,
|
|
||||||
enable_rerank: true,
|
|
||||||
},
|
|
||||||
|
|
||||||
// 删除确认
|
// 删除确认
|
||||||
deleteDialog: false,
|
deleteDialog: false,
|
||||||
deleteTarget: null,
|
deleteTarget: null,
|
||||||
@@ -515,20 +447,6 @@ export default {
|
|||||||
}))
|
}))
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
pluginOptions() {
|
|
||||||
return this.availablePlugins.map(p => ({
|
|
||||||
label: p.display_name || p.name,
|
|
||||||
value: p.name
|
|
||||||
}))
|
|
||||||
},
|
|
||||||
|
|
||||||
kbOptions() {
|
|
||||||
return this.availableKbs.map(kb => ({
|
|
||||||
label: `${kb.emoji || '📚'} ${kb.kb_name}`,
|
|
||||||
value: kb.kb_id
|
|
||||||
}))
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
watch: {
|
watch: {
|
||||||
@@ -574,8 +492,6 @@ export default {
|
|||||||
this.availableChatProviders = data.available_chat_providers
|
this.availableChatProviders = data.available_chat_providers
|
||||||
this.availableSttProviders = data.available_stt_providers
|
this.availableSttProviders = data.available_stt_providers
|
||||||
this.availableTtsProviders = data.available_tts_providers
|
this.availableTtsProviders = data.available_tts_providers
|
||||||
this.availablePlugins = data.available_plugins || []
|
|
||||||
this.availableKbs = data.available_kbs || []
|
|
||||||
} else {
|
} else {
|
||||||
this.showError(response.data.message || this.tm('messages.loadError'))
|
this.showError(response.data.message || this.tm('messages.loadError'))
|
||||||
}
|
}
|
||||||
@@ -673,21 +589,6 @@ export default {
|
|||||||
text_to_speech: this.editingRules['provider_perf_text_to_speech'] || null,
|
text_to_speech: this.editingRules['provider_perf_text_to_speech'] || null,
|
||||||
}
|
}
|
||||||
|
|
||||||
// 初始化插件配置
|
|
||||||
const pluginCfg = this.editingRules.session_plugin_config || {}
|
|
||||||
this.pluginConfig = {
|
|
||||||
enabled_plugins: pluginCfg.enabled_plugins || [],
|
|
||||||
disabled_plugins: pluginCfg.disabled_plugins || [],
|
|
||||||
}
|
|
||||||
|
|
||||||
// 初始化知识库配置
|
|
||||||
const kbCfg = this.editingRules.kb_config || {}
|
|
||||||
this.kbConfig = {
|
|
||||||
kb_ids: kbCfg.kb_ids || [],
|
|
||||||
top_k: kbCfg.top_k ?? 5,
|
|
||||||
enable_rerank: kbCfg.enable_rerank !== false,
|
|
||||||
}
|
|
||||||
|
|
||||||
this.ruleDialog = true
|
this.ruleDialog = true
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -807,117 +708,6 @@ export default {
|
|||||||
this.saving = false
|
this.saving = false
|
||||||
},
|
},
|
||||||
|
|
||||||
async savePluginConfig() {
|
|
||||||
if (!this.selectedUmo) return
|
|
||||||
|
|
||||||
this.saving = true
|
|
||||||
try {
|
|
||||||
const config = {
|
|
||||||
enabled_plugins: this.pluginConfig.enabled_plugins,
|
|
||||||
disabled_plugins: this.pluginConfig.disabled_plugins,
|
|
||||||
}
|
|
||||||
|
|
||||||
// 如果两个列表都为空,删除配置
|
|
||||||
if (config.enabled_plugins.length === 0 && config.disabled_plugins.length === 0) {
|
|
||||||
if (this.editingRules.session_plugin_config) {
|
|
||||||
await axios.post('/api/session/delete-rule', {
|
|
||||||
umo: this.selectedUmo.umo,
|
|
||||||
rule_key: 'session_plugin_config'
|
|
||||||
})
|
|
||||||
delete this.editingRules.session_plugin_config
|
|
||||||
let item = this.rulesList.find(u => u.umo === this.selectedUmo.umo)
|
|
||||||
if (item) delete item.rules.session_plugin_config
|
|
||||||
}
|
|
||||||
this.showSuccess(this.tm('messages.saveSuccess'))
|
|
||||||
} else {
|
|
||||||
const response = await axios.post('/api/session/update-rule', {
|
|
||||||
umo: this.selectedUmo.umo,
|
|
||||||
rule_key: 'session_plugin_config',
|
|
||||||
rule_value: config
|
|
||||||
})
|
|
||||||
|
|
||||||
if (response.data.status === 'ok') {
|
|
||||||
this.showSuccess(this.tm('messages.saveSuccess'))
|
|
||||||
this.editingRules.session_plugin_config = config
|
|
||||||
|
|
||||||
let item = this.rulesList.find(u => u.umo === this.selectedUmo.umo)
|
|
||||||
if (item) {
|
|
||||||
item.rules.session_plugin_config = config
|
|
||||||
} else {
|
|
||||||
this.rulesList.push({
|
|
||||||
umo: this.selectedUmo.umo,
|
|
||||||
platform: this.selectedUmo.platform,
|
|
||||||
message_type: this.selectedUmo.message_type,
|
|
||||||
session_id: this.selectedUmo.session_id,
|
|
||||||
rules: { session_plugin_config: config }
|
|
||||||
})
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this.showError(response.data.message || this.tm('messages.saveError'))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
this.showError(error.response?.data?.message || this.tm('messages.saveError'))
|
|
||||||
}
|
|
||||||
this.saving = false
|
|
||||||
},
|
|
||||||
|
|
||||||
async saveKbConfig() {
|
|
||||||
if (!this.selectedUmo) return
|
|
||||||
|
|
||||||
this.saving = true
|
|
||||||
try {
|
|
||||||
const config = {
|
|
||||||
kb_ids: this.kbConfig.kb_ids,
|
|
||||||
top_k: this.kbConfig.top_k,
|
|
||||||
enable_rerank: this.kbConfig.enable_rerank,
|
|
||||||
}
|
|
||||||
|
|
||||||
// 如果 kb_ids 为空,删除配置
|
|
||||||
if (config.kb_ids.length === 0) {
|
|
||||||
if (this.editingRules.kb_config) {
|
|
||||||
await axios.post('/api/session/delete-rule', {
|
|
||||||
umo: this.selectedUmo.umo,
|
|
||||||
rule_key: 'kb_config'
|
|
||||||
})
|
|
||||||
delete this.editingRules.kb_config
|
|
||||||
let item = this.rulesList.find(u => u.umo === this.selectedUmo.umo)
|
|
||||||
if (item) delete item.rules.kb_config
|
|
||||||
}
|
|
||||||
this.showSuccess(this.tm('messages.saveSuccess'))
|
|
||||||
} else {
|
|
||||||
const response = await axios.post('/api/session/update-rule', {
|
|
||||||
umo: this.selectedUmo.umo,
|
|
||||||
rule_key: 'kb_config',
|
|
||||||
rule_value: config
|
|
||||||
})
|
|
||||||
|
|
||||||
if (response.data.status === 'ok') {
|
|
||||||
this.showSuccess(this.tm('messages.saveSuccess'))
|
|
||||||
this.editingRules.kb_config = config
|
|
||||||
|
|
||||||
let item = this.rulesList.find(u => u.umo === this.selectedUmo.umo)
|
|
||||||
if (item) {
|
|
||||||
item.rules.kb_config = config
|
|
||||||
} else {
|
|
||||||
this.rulesList.push({
|
|
||||||
umo: this.selectedUmo.umo,
|
|
||||||
platform: this.selectedUmo.platform,
|
|
||||||
message_type: this.selectedUmo.message_type,
|
|
||||||
session_id: this.selectedUmo.session_id,
|
|
||||||
rules: { kb_config: config }
|
|
||||||
})
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this.showError(response.data.message || this.tm('messages.saveError'))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
this.showError(error.response?.data?.message || this.tm('messages.saveError'))
|
|
||||||
}
|
|
||||||
this.saving = false
|
|
||||||
},
|
|
||||||
|
|
||||||
confirmDeleteRules(item) {
|
confirmDeleteRules(item) {
|
||||||
this.deleteTarget = item
|
this.deleteTarget = item
|
||||||
this.deleteDialog = true
|
this.deleteDialog = true
|
||||||
|
|||||||
@@ -30,13 +30,16 @@ 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_ltm_settings"].get(
|
image_caption_provider_id = cfg["provider_settings"][
|
||||||
"image_caption_provider_id"
|
"default_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"]
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "AstrBot"
|
name = "AstrBot"
|
||||||
version = "4.7.3"
|
version = "4.6.1"
|
||||||
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"
|
||||||
|
|||||||
Reference in New Issue
Block a user