hansjone/oclaw
1
0
Fork 0
mirror of https://github.com/hansjone/oclaw.git synced 2026-10-11 04:10:44 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

适配 Bailian WebParser 兼容接入并完善 sidecar 文档。

Browse source 
新增 WebParser 兼容工具与 MCP health/tools-sync 兼容模式，让 WebParser/sse 可注册到 agent 并暴露明确 schema；同时修复 mcp argv 环境变量展开并补齐微信 sidecar 纯本地化安装与文档说明。

Made-with: Cursor
This commit is contained in:
oliver 2026-05-01 17:40:52 +08:00
parent 329fb2239a
commit df91434936
16 changed files with 640 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

45
interfaces/admin/routes.py
View file

@ -120,6 +120,12 @@ def _mcp_health_and_sync_one(store: SqliteStore, row: dict[str, Any]) -> dict[st
}
store.set_mcp_server_health(server_id=sid, status="error", detail=item["health"])
return item
if _is_bailian_webparser_remote(entry_command=cmd, entry_args=args):
tools = _bailian_webparser_virtual_tools()
store.replace_mcp_server_tools(server_id=sid, tools=tools)
detail = {"synced_tools": len(tools), "compat_mode": "bailian_webparser"}
store.set_mcp_server_health(server_id=sid, status="ok", detail=detail)
return {"server_id": sid, "ok": True, "health": detail, "tools_synced": len(tools)}
rt = McpProcessRuntime(
build_mcp_process_command(cmd, args, store=store),
timeout_s=float(row.get("timeout_s") or 30.0),
@ -158,6 +164,32 @@ def _mcp_health_and_sync_one(store: SqliteStore, row: dict[str, Any]) -> dict[st
rt.stop()
def _is_bailian_webparser_remote(*, entry_command: str, entry_args: list[str]) -> bool:
cmd = str(entry_command or "").strip().lower()
if cmd not in {"npx", "npx.cmd", "node"}:
return False
joined = " ".join(str(x or "").strip().lower() for x in (entry_args or []))
return "mcp-remote" in joined and "/api/v1/mcps/webparser/sse" in joined
def _bailian_webparser_virtual_tools() -> list[dict[str, Any]]:
return [
{
"tool_name": "bailian_webparser_parse",
"description": "Parse webpage via DashScope WebParser compatibility mode. Requires `url` (http/https).",
"parameters": {
"type": "object",
"properties": {
"url": {"type": "string", "description": "Target webpage URL (required). Example: https://example.com"},
"timeout": {"type": "integer", "default": 35, "minimum": 8, "maximum": 90},
},
"required": ["url"],
"additionalProperties": False,
},
}
]
def _http_get_json(url: str, *, timeout: float = 8.0) -> dict[str, Any]:
req = urllib_request.Request(
url,
@ -3178,6 +3210,10 @@ def build_admin_router() -> APIRouter:
args = [str(x) for x in (row.get("entry_args") or []) if str(x).strip()]
if not cmd:
return {"ok": False, "error_code": "mcp_entry_missing", "error": "entry_command_missing"}
if _is_bailian_webparser_remote(entry_command=cmd, entry_args=args):
detail = {"ok": True, "status": "ok", "compat_mode": "bailian_webparser", "tools_count": 1}
store.set_mcp_server_health(server_id=server_id, status="ok", detail=detail)
return {"ok": True, "response": detail}
rt = McpProcessRuntime(
build_mcp_process_command(cmd, args, store=store),
timeout_s=float(row.get("timeout_s") or 30.0),
@ -3225,6 +3261,15 @@ def build_admin_router() -> APIRouter:
args = [str(x) for x in (row.get("entry_args") or []) if str(x).strip()]
if not cmd:
return {"ok": False, "error_code": "mcp_entry_missing", "error": "entry_command_missing"}
if _is_bailian_webparser_remote(entry_command=cmd, entry_args=args):
norm = _bailian_webparser_virtual_tools()
store.replace_mcp_server_tools(server_id=server_id, tools=norm)
store.set_mcp_server_health(
server_id=server_id,
status="ok",
detail={"synced_tools": len(norm), "compat_mode": "bailian_webparser"},
)
return {"ok": True, "server_id": server_id, "tools": norm, "compat_mode": "bailian_webparser"}
rt = McpProcessRuntime(
build_mcp_process_command(cmd, args, store=store),
timeout_s=float(row.get("timeout_s") or 30.0),