mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-15 17:20:01 +08:00
* ♻️ refactor(ai): 重构 AI 服务模块并完善文档注释 - 【重构】统一清理并优化所有 AI 服务模块文件的导入语句,将其移至文件顶部 - 【重构】重构 `hooks.py` 中的 `Hooks` 派发逻辑,使用通用管道函数消除重复代码,并引入 `HookPoint` 描述符 - 【重构】重构工具装饰器实现,新增 `toolkit` 类装饰器,优化 `BaseToolkit` 配置合并与前缀处理 - 【功能】Docker 沙箱容器创建时支持自动注入系统代理环境变量并配置 `ExtraHosts` - 【功能】Jupyter 服务启动前自动清理旧进程并初始化临时目录权限 - 【修复】优化 Pydantic 结构化输出校验失败时的错误信息提取,提供更详细的字段级错误反馈 - 【修复】在 `api.py` 中避免将 `ModelRetry` 和 `ControlFlowExit` 异常错误地包装为 `LLMException` - 【文档】为 AI 服务、沙箱、工具链、工作流等核心模块补充完整的 Docstring 和类型注释 * 📝 docs(ai): 补全核心模块文档注释并清理冗余代码 - 补全 `run/context`、`run/hooks` 和 `tools/engine/registry` 中类与方法的中文文档注释 - 清理 `tools/providers/builtin/sandbox` 中未使用的 `PythonPluginProtocol` 协议及相关导入 - 规范化部分代码的格式与尾随逗号 * ♻️ refactor!(flow): 重构 Task 为 AgentTask 并优化工作流元数据定义 - 【Breaking Change】将 `Task` 重命名为 `AgentTask` 以避免命名冲突 - 更新 Agent、Team、Workflow 等模块中的类型声明与相关逻辑 - 引入 `AutoNodeMeta` 强类型元数据,替换工作流装饰器中的裸字典定义 - 将 `StepMeta`、`ConditionMeta` 和 `RouterMeta` 统一移动至 `types.py` - 优化 `RunnableNode` 对上游 `AgentTask` 的处理与拼接逻辑 - 调整团队协作策略中 `FinishAction` 的返回值为完整结果对象 * ♻️ refactor(workflow): 移除人工确认机制并重构错误策略 - 移除工作流节点的人工确认(HITL)与挂起继续机制 - 删除 `auto` 自动化工作流及相关装饰器文件 - 将错误处理策略类从 `types.py` 拆分并移动到新文件 `policies.py` - 优化节点执行失败时的异常信息格式化输出 - 移除 `WorkflowRunResult` 和 `StepOutput` 中与挂起相关的状态字段 * 🚨 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>
99 lines
3.7 KiB
Python
99 lines
3.7 KiB
Python
from collections.abc import AsyncGenerator
|
||
from contextlib import asynccontextmanager
|
||
import json
|
||
from typing import Any
|
||
|
||
from anyio import create_memory_object_stream, create_task_group
|
||
from mcp.shared.message import SessionMessage
|
||
from mcp.types import JSONRPCMessage
|
||
|
||
from zhenxun.services.ai.sandbox.addons.base import BaseMcpProxyExtension
|
||
from zhenxun.services.ai.sandbox.protocols import SupportsStreamExecution
|
||
from zhenxun.services.ai.sandbox.registry import SandboxRegistry
|
||
from zhenxun.services.log import logger
|
||
from zhenxun.utils.pydantic_compat import model_dump_json, model_validate
|
||
|
||
|
||
class UniversalMcpExtension(BaseMcpProxyExtension):
|
||
"""通用 MCP 代理扩展类,用于在沙箱内连接 MCP 服务"""
|
||
|
||
@property
|
||
def extension_name(self) -> str:
|
||
"""获取 MCP 代理扩展的唯一名称"""
|
||
return "universal_mcp"
|
||
|
||
@asynccontextmanager
|
||
async def connect_mcp(
|
||
self, command: str, args: list[str], env: dict[str, str] | None = None
|
||
) -> AsyncGenerator[tuple[Any, Any], None]:
|
||
"""启动沙箱内的 MCP 服务器,并建立与之进行 JSON-RPC 通信的双向内存流管道"""
|
||
if not isinstance(self.session, SupportsStreamExecution):
|
||
raise RuntimeError(
|
||
"当前沙箱驱动不支持流式后台进程执行 (SupportsStreamExecution),"
|
||
"无法启动原生 MCP 代理。"
|
||
)
|
||
|
||
logger.info(
|
||
"[UniversalMcpExtension] 正在沙箱内原生启动 MCP 服务器: "
|
||
f"{command} {' '.join(args)}"
|
||
)
|
||
|
||
cmd_list = [command, *args]
|
||
|
||
async with self.session.create_stream_process(
|
||
command=cmd_list, cwd=self.session.workspace_path, env=env
|
||
) as process_stream:
|
||
read_prod, read_cons = create_memory_object_stream(10)
|
||
write_prod, write_cons = create_memory_object_stream(10)
|
||
|
||
async def stream_reader():
|
||
buffer = b""
|
||
try:
|
||
while True:
|
||
msg = await process_stream.read()
|
||
if msg is None:
|
||
break
|
||
if msg.stream_type == 1:
|
||
buffer += msg.data
|
||
while b"\n" in buffer:
|
||
line, buffer = buffer.split(b"\n", 1)
|
||
if not line.strip():
|
||
continue
|
||
try:
|
||
msg = model_validate(
|
||
JSONRPCMessage, json.loads(line)
|
||
)
|
||
await read_prod.send(SessionMessage(message=msg))
|
||
except Exception as exc:
|
||
await read_prod.send(exc)
|
||
except Exception:
|
||
pass
|
||
finally:
|
||
await read_prod.aclose()
|
||
|
||
async def stream_writer():
|
||
try:
|
||
async for msg in write_cons:
|
||
data = (
|
||
model_dump_json(
|
||
msg.message, by_alias=True, exclude_none=True
|
||
).encode("utf-8")
|
||
+ b"\n"
|
||
)
|
||
await process_stream.write(data)
|
||
except Exception:
|
||
pass
|
||
|
||
async with create_task_group() as tg:
|
||
tg.start_soon(stream_reader)
|
||
tg.start_soon(stream_writer)
|
||
yield read_cons, write_prod
|
||
tg.cancel_scope.cancel()
|
||
|
||
|
||
SandboxRegistry.register_extension(UniversalMcpExtension)
|
||
|
||
__all__ = [
|
||
"UniversalMcpExtension",
|
||
]
|