mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-21 04:00:04 +08:00
♻️ refactor(core): 重构 AI 能力与定时任务调度系统 (#2148)
* ♻️ refactor(core): 重构 AI 能力与定时任务调度系统 - 【AI 能力与工具】重构 Capability 注册与管理机制,引入 CapabilityManager 统一管理 - 移除全局能力注册表,改用声明式装饰器 `@capability` 进行解耦注册 - 重构工具解析器链,使用统一的 BaseToolResolver 代替原有的多个特定解析器 - 增强工具查询过滤,支持通配符匹配、工具箱过滤和排除标签 - 【定时任务调度】重构定时任务管理器,引入 SchedulerRegistry 统一管理任务元数据 - 引入 JobConfig 聚合定时任务配置,支持用户维度的定时任务调度 - 重构执行分发器,支持并发限制、串行间隔和随机延迟打散 - 【运行上下文】引入 ScheduledDeps 以支持后台和定时任务环境下的依赖注入 - 优化 RunContext,支持从定时任务上下文快速构造,并提供 emit 辅助方法 - 【日志与监控】引入 AILoggerProxy,实现 AI 各模块的专属日志输出 - 将各模块的全局 logger 替换为对应的模块专属日志代理 - 【其他优化】修复 Pydantic V1 兼容层中 model_validator 的装饰器兼容性问题 - 在非交互式环境(如定时任务)中自动隐藏 HITL 交互工具以节省 Token * ♻️ refactor(core): 优化内部导入路径并提升 Pydantic 兼容性 - 【重构】将 `services/ai` 模块内的绝对导入重构为相对导入,优化包结构 - 【重构】移除不必要的 `if TYPE_CHECKING` 保护,通过 `from __future__ import annotations` 直接导入类型 - 【清理】清理 `core/messages/types.py` 中未使用的 `AssistantContentUnion` 等联合类型定义 - 【优化】在 `utils/pydantic_compat.py` 中新增 `model_rebuild` 兼容函数,统一 Pydantic V1/V2 的模型重建逻辑 - 【优化】将部分函数内部的延迟导入提升至模块顶部,规范代码结构 * ♻️ refactor(imports): 优化导入路径为相对导入并清理冗余导入 - 【重构】将 AI 服务相关模块中的绝对导入路径修改为相对导入,提升模块内聚性与可移植性 - 【清理】移除多处函数内部或类方法中未使用的冗余导入,避免循环引用和资源浪费 - 【格式化】微调部分工具装饰器和返回语句的格式与尾随逗号 * 🚨 auto fix by pre-commit hooks --------- Co-authored-by: webjoin111 <455457521@qq.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
co-authored by
webjoin111
pre-commit-ci[bot]
parent
0b32d69c9c
commit
922d092650
@@ -4,8 +4,8 @@ from zhenxun.services.ai.run.context import RunContext
|
||||
from zhenxun.services.ai.run.di import Inject
|
||||
from zhenxun.services.ai.tools.core.decorators import tool
|
||||
from zhenxun.services.ai.tools.core.toolkit import BaseToolkit
|
||||
from zhenxun.services.ai.tools.models import ToolResult
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.services.ai.tools.models import ResolvedToolPayload, ToolResult
|
||||
from zhenxun.services.ai.utils.logger import log_tool as logger
|
||||
|
||||
|
||||
class HITLToolkit(BaseToolkit):
|
||||
@@ -23,6 +23,12 @@ class HITLToolkit(BaseToolkit):
|
||||
"用户回答后,你将收到答案并可以继续任务。"
|
||||
)
|
||||
|
||||
async def resolve(self, context: RunContext | None = None) -> ResolvedToolPayload:
|
||||
"""智能环境感知:如果处于无真实用户交互的后台环境(如定时任务),自动隐身以节省Token"""
|
||||
if context is None or context.get_event() is None:
|
||||
return ResolvedToolPayload()
|
||||
return await super().resolve(context)
|
||||
|
||||
@tool(
|
||||
name="ask_user_for_help",
|
||||
description="向当前对话的用户提出问题以获取信息或指导。当你无法独立完成任务时,请调用此工具。",
|
||||
@@ -47,8 +53,8 @@ class HITLToolkit(BaseToolkit):
|
||||
raise e
|
||||
|
||||
logger.info(f"收到用户求助回复: {user_reply}")
|
||||
if context and context.run.event_bus:
|
||||
await context.run.event_bus.emit(
|
||||
if context:
|
||||
await context.run.emit(
|
||||
ToolStreamChunkEvent(
|
||||
tool_name=context.call.tool_name, content="🗣️ 已收到用户的回复"
|
||||
)
|
||||
|
||||
@@ -10,7 +10,7 @@ from zhenxun.services.ai.tools.core.decorators import tool
|
||||
from zhenxun.services.ai.tools.core.tool import BaseTool
|
||||
from zhenxun.services.ai.tools.core.toolkit import BaseToolkit
|
||||
from zhenxun.services.ai.tools.models import ToolOptions, ToolResult
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.services.ai.utils.logger import log_tool as logger
|
||||
|
||||
|
||||
class MemoryManagementToolkit(BaseToolkit):
|
||||
|
||||
@@ -8,7 +8,7 @@ from zhenxun.services.ai.run.context import RunContext
|
||||
from zhenxun.services.ai.tools.core.decorators import tool
|
||||
from zhenxun.services.ai.tools.core.toolkit import BaseToolkit
|
||||
from zhenxun.services.ai.tools.models import ToolResult
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.services.ai.utils.logger import log_tool as logger
|
||||
|
||||
|
||||
class RestApiToolkit(BaseToolkit):
|
||||
@@ -101,15 +101,15 @@ class RestApiToolkit(BaseToolkit):
|
||||
is_error = response.status_code >= 400
|
||||
result = ToolResult(output=result_dict)
|
||||
|
||||
if context and context.run.event_bus:
|
||||
if context:
|
||||
msg = (
|
||||
f"🌐 已调用 API: {url}"
|
||||
if not is_error
|
||||
else f"❌ API 调用失败 (Status: {response.status_code})"
|
||||
)
|
||||
await context.run.event_bus.emit(
|
||||
await context.run.emit(
|
||||
ToolStreamChunkEvent(
|
||||
tool_name=context.call.tool_name if context else "make_request",
|
||||
tool_name=context.call.tool_name,
|
||||
content=msg,
|
||||
)
|
||||
)
|
||||
@@ -120,10 +120,10 @@ class RestApiToolkit(BaseToolkit):
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"RestApiToolkit 请求失败: {e}")
|
||||
if context and context.run.event_bus:
|
||||
await context.run.event_bus.emit(
|
||||
if context:
|
||||
await context.run.emit(
|
||||
ToolStreamChunkEvent(
|
||||
tool_name=context.call.tool_name if context else "make_request",
|
||||
tool_name=context.call.tool_name,
|
||||
content="❌ API 网络请求发生框架级错误",
|
||||
)
|
||||
)
|
||||
|
||||
@@ -10,7 +10,7 @@ from zhenxun.services.ai.sandbox.models import (
|
||||
from zhenxun.services.ai.tools.core.decorators import Rules, tool
|
||||
from zhenxun.services.ai.tools.core.toolkit import BaseToolkit
|
||||
from zhenxun.services.ai.tools.models import ToolResult
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.services.ai.utils.logger import log_tool as logger
|
||||
from zhenxun.utils.pydantic_compat import model_copy
|
||||
|
||||
|
||||
@@ -103,8 +103,8 @@ class SandboxToolkit(BaseToolkit):
|
||||
|
||||
bp = model_copy(self.blueprint, deep=True)
|
||||
|
||||
if context.run.event_bus:
|
||||
await context.run.event_bus.emit(
|
||||
if context:
|
||||
await context.run.emit(
|
||||
ToolStreamChunkEvent(
|
||||
tool_name="Sandbox", content="正在分析代码依赖并分配沙箱环境..."
|
||||
)
|
||||
@@ -122,8 +122,8 @@ class SandboxToolkit(BaseToolkit):
|
||||
)
|
||||
context.session.shared_state[state_key] = code_executor
|
||||
|
||||
if context.run.event_bus:
|
||||
await context.run.event_bus.emit(
|
||||
if context:
|
||||
await context.run.emit(
|
||||
ToolStreamChunkEvent(
|
||||
tool_name="Sandbox",
|
||||
content=f"沙箱已就绪,正在后台执行 {language} 代码...",
|
||||
@@ -225,8 +225,8 @@ class SandboxToolkit(BaseToolkit):
|
||||
result = ToolResult(
|
||||
output=final_output if len(final_output) > 1 else final_output_text
|
||||
)
|
||||
if len(image_bytes_list) > 0 and context and context.run.event_bus:
|
||||
await context.run.event_bus.emit(UserCustomEvent(display=final_output))
|
||||
if len(image_bytes_list) > 0 and context:
|
||||
await context.run.emit(UserCustomEvent(display=final_output))
|
||||
return result
|
||||
|
||||
@tool(
|
||||
@@ -249,8 +249,8 @@ class SandboxToolkit(BaseToolkit):
|
||||
) -> ToolResult:
|
||||
session_id = self.sandbox_session_id or context.session_id or "default"
|
||||
|
||||
if context.run.event_bus:
|
||||
await context.run.event_bus.emit(
|
||||
if context:
|
||||
await context.run.emit(
|
||||
ToolStreamChunkEvent(
|
||||
tool_name="Sandbox", content=f"正在虚拟终端执行命令: {command} ..."
|
||||
)
|
||||
@@ -319,8 +319,8 @@ class SandboxToolkit(BaseToolkit):
|
||||
await asyncio.sleep(1.5)
|
||||
output = await interactive_session.read_output(timeout=5)
|
||||
|
||||
if context and context.run.event_bus:
|
||||
await context.run.event_bus.emit(
|
||||
if context:
|
||||
await context.run.emit(
|
||||
ToolStreamChunkEvent(
|
||||
tool_name=context.call.tool_name, content="⌨️ 已向后台进程发送输入"
|
||||
)
|
||||
@@ -357,8 +357,8 @@ class SandboxToolkit(BaseToolkit):
|
||||
await interactive_session.interrupt()
|
||||
await asyncio.sleep(1)
|
||||
output = await interactive_session.read_output()
|
||||
if context and context.run.event_bus:
|
||||
await context.run.event_bus.emit(
|
||||
if context:
|
||||
await context.run.emit(
|
||||
ToolStreamChunkEvent(
|
||||
tool_name=context.call.tool_name, content="🛑 已强制中断后台进程"
|
||||
)
|
||||
|
||||
@@ -16,10 +16,11 @@ from zhenxun.services.ai.core.protocols.tool import (
|
||||
)
|
||||
from zhenxun.services.ai.sandbox.models import SandboxBlueprint
|
||||
from zhenxun.services.ai.tools.models import ResolvedToolPayload
|
||||
from zhenxun.services.ai.tools.providers.mcp.toolkit import MCPToolkit
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.services.ai.utils.logger import log_tool as logger
|
||||
from zhenxun.utils.pydantic_compat import model_dump, model_validate, model_validator
|
||||
|
||||
from .toolkit import MCPToolkit
|
||||
|
||||
MCP_PATH = DATA_PATH / "ai" / "mcp.json"
|
||||
|
||||
|
||||
@@ -30,6 +31,8 @@ class MCPServerConfig(BaseModel):
|
||||
"""传输协议类型:stdio / sse / streamable-http / sandbox_proxy"""
|
||||
url: str | None = Field(default=None)
|
||||
"""远端地址(用于 sse 或 streamable-http)"""
|
||||
headers: dict[str, str] | None = Field(default=None)
|
||||
"""HTTP 请求头(用于 sse 或 streamable-http 的接口鉴权)"""
|
||||
timeout: int = Field(default=30)
|
||||
"""请求超时时间(秒)"""
|
||||
command: str | None = None
|
||||
@@ -51,6 +54,34 @@ class MCPServerConfig(BaseModel):
|
||||
sandbox_blueprint: SandboxBlueprint | None = Field(default=None)
|
||||
"""沙箱环境装配配置(用于 sandbox_proxy 自动处理依赖)"""
|
||||
|
||||
@model_validator(mode="before")
|
||||
@classmethod
|
||||
def _normalize_config(cls, values: Any) -> Any:
|
||||
if not isinstance(values, dict):
|
||||
return values
|
||||
|
||||
if "type" in values and "transport" not in values:
|
||||
values["transport"] = values.pop("type")
|
||||
|
||||
transport_val = values.get("transport")
|
||||
if isinstance(transport_val, str) and transport_val.lower() == "streamablehttp":
|
||||
values["transport"] = "streamable-http"
|
||||
|
||||
headers = values.get("headers")
|
||||
if isinstance(headers, dict):
|
||||
new_headers = {}
|
||||
for k, v in headers.items():
|
||||
if k.lower() == "authorization" and isinstance(v, str):
|
||||
if not any(
|
||||
v.startswith(prefix)
|
||||
for prefix in ("Bearer ", "Basic ", "Digest ")
|
||||
):
|
||||
v = f"Bearer {v}"
|
||||
new_headers[k] = v
|
||||
values["headers"] = new_headers
|
||||
|
||||
return values
|
||||
|
||||
|
||||
class MCPToolsConfig(BaseModel):
|
||||
mcpServers: dict[str, MCPServerConfig] = Field(default_factory=dict)
|
||||
@@ -193,6 +224,7 @@ class GlobalMCPProvider(ToolProvider):
|
||||
command=conf.command,
|
||||
args=conf.args,
|
||||
url=conf.url,
|
||||
headers=conf.headers,
|
||||
env=conf.env,
|
||||
cwd=conf.cwd,
|
||||
install_command=conf.install_command,
|
||||
@@ -339,6 +371,7 @@ class MCPSource(BaseModel):
|
||||
command=self.config.command,
|
||||
args=self.config.args,
|
||||
url=self.config.url,
|
||||
headers=self.config.headers,
|
||||
env=self.config.env,
|
||||
cwd=self.config.cwd,
|
||||
install_command=self.config.install_command,
|
||||
|
||||
@@ -23,7 +23,7 @@ from zhenxun.services.ai.sandbox.models import SandboxBlueprint
|
||||
from zhenxun.services.ai.tools.core.tool import BaseTool
|
||||
from zhenxun.services.ai.tools.core.toolkit import BaseToolkit
|
||||
from zhenxun.services.ai.tools.models import ToolkitConfig, ToolResult
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.services.ai.utils.logger import log_tool as logger
|
||||
from zhenxun.utils.lifespan import LifespanManager
|
||||
from zhenxun.utils.pydantic_compat import model_dump
|
||||
|
||||
@@ -270,10 +270,10 @@ class MCPToolkit(BaseToolkit):
|
||||
command: str | None = None,
|
||||
args: list[str] | None = None,
|
||||
url: str | None = None,
|
||||
headers: dict[str, str] | None = None,
|
||||
env: dict | None = None,
|
||||
cwd: str | None = None,
|
||||
install_command: str | None = None,
|
||||
isolation: Literal["shared", "per_session"] = "shared",
|
||||
timeout: int = 30,
|
||||
admin_level: int = 0,
|
||||
header_provider: Callable[[RunContext], dict[str, str]] | None = None,
|
||||
@@ -292,10 +292,10 @@ class MCPToolkit(BaseToolkit):
|
||||
command: 用于 stdio 或 sandbox_proxy 模式启动服务器的可执行命令。
|
||||
args: 启动服务器时附加的命令行参数。
|
||||
url: 用于 sse 或 streamable-http 模式的服务器连接 URL。
|
||||
headers: 静态配置的 HTTP 请求头。
|
||||
env: 启动服务器时的进程环境变量。
|
||||
cwd: 启动服务器时的进程工作目录。
|
||||
install_command: 首次启动前执行的环境热装配/依赖安装命令。
|
||||
isolation: 环境隔离模式,可选 "shared" (共享模式) 或 "per_session" (每个会话独立)。
|
||||
timeout: 初始化和请求网络接口时的超时秒数,默认 30。
|
||||
admin_level: 调用工具所需的管理权限等级,默认 0 (无限制)。
|
||||
header_provider: 动态生成 HTTP 头部信息的工厂函数。
|
||||
@@ -312,6 +312,7 @@ class MCPToolkit(BaseToolkit):
|
||||
self.command = command
|
||||
self.args = args or []
|
||||
self.url = url
|
||||
self.headers = headers or {}
|
||||
self.env = env or {}
|
||||
self.cwd = cwd
|
||||
self.install_command = install_command
|
||||
@@ -587,8 +588,13 @@ class MCPToolkit(BaseToolkit):
|
||||
self._ready_event.clear()
|
||||
self._init_exception = None
|
||||
|
||||
dynamic_headers = {}
|
||||
dynamic_headers = self.headers.copy()
|
||||
if self.header_provider and context:
|
||||
dynamic_headers.update(self.header_provider(context))
|
||||
|
||||
dynamic_env = self.env.copy()
|
||||
if self.env_provider and context:
|
||||
dynamic_env.update(self.env_provider(context))
|
||||
|
||||
self._shared_task = asyncio.create_task(
|
||||
self._spawn_session_task(dynamic_headers, dynamic_env)
|
||||
|
||||
@@ -4,11 +4,12 @@ from typing import Any
|
||||
|
||||
from zhenxun.services.ai.capabilities import AbstractCapability
|
||||
from zhenxun.services.ai.run.context import RunContext
|
||||
from zhenxun.services.ai.tools.providers.skills.manager import skill_manager
|
||||
from zhenxun.services.ai.tools.providers.skills.models import Skill, SkillSource
|
||||
from zhenxun.services.ai.tools.providers.skills.toolkit import SkillMetaToolkit
|
||||
from zhenxun.utils.utils import infer_plugin_namespace
|
||||
|
||||
from .manager import skill_manager
|
||||
from .models import Skill, SkillSource
|
||||
from .toolkit import SkillMetaToolkit
|
||||
|
||||
|
||||
class SkillCapability(AbstractCapability):
|
||||
"""技能库挂载能力组件"""
|
||||
|
||||
@@ -11,7 +11,11 @@ import aiofiles
|
||||
import yaml
|
||||
|
||||
from zhenxun.configs.path_config import DATA_PATH
|
||||
from zhenxun.services.ai.tools.providers.skills.models import (
|
||||
from zhenxun.services.ai.utils.logger import log_tool as logger
|
||||
from zhenxun.utils.pydantic_compat import model_dump, model_validate
|
||||
from zhenxun.utils.utils import infer_plugin_namespace
|
||||
|
||||
from .models import (
|
||||
INSTRUCTIONS,
|
||||
METADATA,
|
||||
RESOURCES,
|
||||
@@ -20,9 +24,6 @@ from zhenxun.services.ai.tools.providers.skills.models import (
|
||||
SkillEnvConfig,
|
||||
SkillFrontmatter,
|
||||
)
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.utils.pydantic_compat import model_dump, model_validate
|
||||
from zhenxun.utils.utils import infer_plugin_namespace
|
||||
|
||||
|
||||
class SkillConfigManager:
|
||||
|
||||
@@ -10,14 +10,15 @@ from zhenxun.services.ai.sandbox.protocols import (
|
||||
from zhenxun.services.ai.tools.core.decorators import Rules, tool
|
||||
from zhenxun.services.ai.tools.core.toolkit import BaseToolkit
|
||||
from zhenxun.services.ai.tools.models import ResolvedToolPayload, ToolResult
|
||||
from zhenxun.services.ai.tools.providers.skills.manager import (
|
||||
from zhenxun.services.ai.utils.logger import log_tool as logger
|
||||
from zhenxun.utils.pydantic_compat import model_copy
|
||||
from zhenxun.utils.utils import infer_plugin_namespace
|
||||
|
||||
from .manager import (
|
||||
skill_env_manager,
|
||||
skill_manager,
|
||||
)
|
||||
from zhenxun.services.ai.tools.providers.skills.models import Skill
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.utils.pydantic_compat import model_copy
|
||||
from zhenxun.utils.utils import infer_plugin_namespace
|
||||
from .models import Skill
|
||||
|
||||
|
||||
class SkillSandboxExecutionMixin:
|
||||
|
||||
Reference in New Issue
Block a user