ci3: lint/mypy 第二阶段清理 + 覆盖率 76% -> 78%（门槛不动）
基底：#251 头 174b631（堆叠于 #242 feat-ci-expand 之上）， 基线 origin/main aebc6238；本轨不改 #251 已定语义、不动 workflow 门槛、不删检查、不加 skip。 lint（ruff E,F@120）：109 -> 10 - F401 43 -> 0：删未用导入；try/except 双绑定的名字出现 “打地鼠”（删 except 分支后 try 分支又被标出），两分支 均已核对正文无引用后清掉；MCP 三模块的 Error 名不删， 改走 importlib 属性绑定（见下），两路径绑定都保留。 - E702 40 -> 0：全在 host.py main() 的 argparse 段，纯分行， tokenize 按分号 token 拆（含 2377 行多行语句只断首个分号）； 一次 5 空格缩进失误已回滚重做并以 ast + 全量 host 测试验证。 - E501 13 -> 0：host.py 5 项随 E702 分行连带清掉；mcp_server 3 项把描述拆成相邻字面量（AST 比对 24 条工具描述与原值 完全一致，注意 ruff 按东亚宽度计长，CJK 算 2）；test_host 5 项断开 git commit 参数表。 - E402 8 -> 10：生产侧 2 项清掉（db.py _re、github_app _base64 移到顶部，之前无引用、无重名）；剩余 10 项全是 tests/ 的 sys.path 前置 import（6 项旧 + 4 个新测试文件 沿用同一既定模式），移上去会破坏单文件直跑，有意保留。 - F841 4 -> 0：只去绑定、不删调用（run_task、DB 入队、 tarfile 上下文、git 提交），各有注释与原测试/新测试覆盖； host dispatch_from_branch 新增真实 git 仓库回归测试。 - F811 1 -> 0：server 本地 _row_get 与 peer_messages.row_get 逐行相同，删本地定义，全部调用点解析到同一 import； 新增 test_server_row_get（同一对象 + 三路行为）。 mypy（生产范围）：24 -> 0，零新增 type: ignore - no-redef 9 -> 0：MCP 三模块 try/except 两次 from-import 改 importlib.import_module + 属性绑定（cloud 优先、flat copy 回落、内层 ImportError 同样回落，语义与原来一致； flat-copy 子进程测试证实回落后 __module__ 为顶层名）； server _row_get 随 F811 消除。 - arg-type 10 -> 0：harness2_tasks shared 改 TypedDict 逐键精确类型；CodexProbeAdapter 补 no-op validate_tree （_adapter_validate 本就跳过缺失方法，行为一致）。 - var-annotated 3 -> 0：sub2api _SHARED_ADMIN/_login_slots、 verify-multiuser RESULTS 加精确注解。 - assignment/misc 2 -> 0：marker_tools ZoneInfo 先声明 Any 再 try import（草稿先验 mypy 通过）。 bandit：总数 286 不变，High 仍 4 项，全在 host.py，本轨不改 （属第 3 项白名单轨范围），只做 triage： - 1319 run_verify：无插值，整串验测命令，管道/&& 须 shell 语义（新增 test_host_run_verify 断言管道与 && 真实生效）。 - 1497 notify：模板来自算子配置，三处插值全部 shlex.quote， 证据为既有 test_notify_failure_quotes_shell_metacharacters （; touch 与 $(touch ) 不执行）。 - 2099/2103 goal verify：无插值，任务配置验测串，同 run_verify。 - 无新增 High；pip-audit 0 漏洞。 覆盖率（同口径三套件 coverage 计量）：75.96% -> 77.87% （22392 行/缺 5385 -> 22437 行/缺 4963，显示 76% -> 78%） - client.py 0% -> 90%（pipe 假子进程 + main 分支） - run_parallel.py 0% -> 97%、migrate 包装 0% -> 95% - playwright_mcp 37% -> 62%、imagegen_mcp 47% -> 79%、 websearch_mcp 51% -> 86%、deploy.py 56% -> 77% - verify-multiuser 0% -> 27%（仅 check/req helper；main() 是主机侧真实多用户实弹验证，按门禁不建生产任务、 不以 mock 冒充，仍为缺口） - host.py 55% -> 57%（文件 2020 -> 2060 行系 E702 分行 的计量口径变化，非代码膨胀） - 未到 85%：门槛保持 75% 不动，不删低覆盖模块出统计口径； 缺口主力仍是 server.py / worker.py / host.py 大文件， 下一阶段须针对性深测，非本轨快赢可及。 验证：三套件 1576 -> 1629 项全过（tests 127、cloud/tests 1449 skipped=4、deploy/tests 53）；ruff E9 通过；mypy 0； bandit High 4（同上）；pip-audit 0 漏洞；试跑产物已删， 提交后工作树干净。
This commit is contained in:
host committed
1 parent
a502725dc4
commit
537f421e6e
51 files changed
+1480
-120
No files matched your search
@@ -0,0 +1,355 @@
|
||||
"""MCP 三模块覆盖补点（CI 第二阶段覆盖率）。
|
||||
|
||||
- websearch/imagegen：handle_request 全分支（协议方法、工具
|
||||
分发、未知工具、工具异常、非对象请求、通知）+ main() 的
|
||||
stdio 循环（坏 JSON、通知不回包），工具执行用注入的
|
||||
fake，不联网、不调真实模型/网关。
|
||||
- playwright：全部 14 个工具分发 + 未知工具 + 工具异常 +
|
||||
协议方法 + _handle_line 的解析错误与 handler 异常分支。
|
||||
fake browser 只返回标记 dict，断言分发到了正确方法。
|
||||
- flat-copy：三个模块 + 后端文件拷到隔离临时目录，在
|
||||
PYTHONPATH 只含该目录的子进程里 import——cloud 包不可见，
|
||||
必须走 flat-copy 回落；断言后端类的 __module__ 是顶层
|
||||
模块名（不是 cloud.*），即回落真实发生（importlib 重构
|
||||
的回归证据，见 F401/mypy no-redef 一节）。
|
||||
"""
|
||||
|
||||
import io
|
||||
import json
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
from unittest import mock
|
||||
|
||||
try:
|
||||
from cloud.websearch_mcp import handle_request as ws_handle
|
||||
from cloud.websearch_mcp import main as ws_main
|
||||
from cloud.imagegen_mcp import handle_request as ig_handle
|
||||
from cloud.imagegen_mcp import main as ig_main
|
||||
from cloud import playwright_mcp as pw_mod
|
||||
from cloud.playwright_mcp import handle_request as pw_handle
|
||||
from cloud.playwright_mcp import _handle_line
|
||||
except ImportError:
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[2]))
|
||||
from cloud.websearch_mcp import handle_request as ws_handle
|
||||
from cloud.websearch_mcp import main as ws_main
|
||||
from cloud.imagegen_mcp import handle_request as ig_handle
|
||||
from cloud.imagegen_mcp import main as ig_main
|
||||
from cloud import playwright_mcp as pw_mod
|
||||
from cloud.playwright_mcp import handle_request as pw_handle
|
||||
from cloud.playwright_mcp import _handle_line
|
||||
|
||||
|
||||
def _call(handle, method, req_id=1, name=None, args=None):
|
||||
req = {"jsonrpc": "2.0", "id": req_id, "method": method}
|
||||
if name is not None:
|
||||
req["params"] = {"name": name, "arguments": args or {}}
|
||||
return handle(req)
|
||||
|
||||
|
||||
class WebSearchMcpTest(unittest.TestCase):
|
||||
def test_protocol_methods(self):
|
||||
self.assertIsNone(ws_handle({"method": "notifications/initialized"}))
|
||||
self.assertIsNone(ws_handle({"method": "ping"}))
|
||||
ping = _call(ws_handle, "ping")
|
||||
self.assertEqual(ping["result"], {})
|
||||
init = {"jsonrpc": "2.0", "id": 1, "method": "initialize",
|
||||
"params": {"protocolVersion": "2025-01-01"}}
|
||||
resp = ws_handle(init)
|
||||
self.assertEqual(resp["result"]["protocolVersion"], "2025-01-01")
|
||||
self.assertEqual(resp["result"]["serverInfo"]["name"], "websearch")
|
||||
self.assertIsNone(ws_handle({"method": "initialize"}))
|
||||
listed = _call(ws_handle, "tools/list")
|
||||
self.assertIn("web_search",
|
||||
[t["name"] for t in listed["result"]["tools"]])
|
||||
|
||||
def test_tools_call_and_errors(self):
|
||||
fake_search = lambda q, limit=5, provider="auto": { # noqa: E731
|
||||
"results": [{"title": q}]}
|
||||
# 工具执行一律用注入的 fake，不调真实 search（不联网）。
|
||||
resp = ws_handle({"jsonrpc": "2.0", "id": 2, "method": "tools/call",
|
||||
"params": {"name": "web_search",
|
||||
"arguments": {"query": "hello"}}},
|
||||
search_fn=fake_search)
|
||||
self.assertFalse(resp["result"]["isError"])
|
||||
self.assertIn("hello", resp["result"]["content"][0]["text"])
|
||||
resp = ws_handle({"jsonrpc": "2.0", "id": 3, "method": "tools/call",
|
||||
"params": {"name": "web_fetch",
|
||||
"arguments": {"url": "https://x/"}}},
|
||||
fetch_fn=lambda u, char_limit=15000: {"text": "T"})
|
||||
self.assertIn("T", resp["result"]["content"][0]["text"])
|
||||
unknown = _call(ws_handle, "tools/call", name="nope")
|
||||
self.assertEqual(unknown["error"]["code"], -32602)
|
||||
boom = ws_handle({"jsonrpc": "2.0", "id": 4, "method": "tools/call",
|
||||
"params": {"name": "web_search",
|
||||
"arguments": {"query": "q"}}},
|
||||
search_fn=lambda *a, **k: (_ for _ in ()).throw(
|
||||
RuntimeError("boom")))
|
||||
self.assertTrue(boom["result"]["isError"])
|
||||
self.assertIn("boom", boom["result"]["content"][0]["text"])
|
||||
self.assertEqual(ws_handle("nope")["error"]["code"], -32700)
|
||||
self.assertEqual(
|
||||
_call(ws_handle, "bogus/method")["error"]["code"], -32601)
|
||||
self.assertIsNone(ws_handle(
|
||||
{"method": "tools/call",
|
||||
"params": {"name": "web_search", "arguments": {}}}))
|
||||
|
||||
def test_main_stdio_loop(self):
|
||||
lines = ('{"bad json\n'
|
||||
'{"jsonrpc": "2.0", "id": 1, "method": "initialize",'
|
||||
' "params": {}}\n'
|
||||
'{"jsonrpc": "2.0", "id": 2, "method": "tools/list"}\n'
|
||||
'{"jsonrpc": "2.0", "id": 3, "method": "ping"}\n'
|
||||
'{"jsonrpc": "2.0", "method": "notifications/initialized"}\n'
|
||||
'\n'
|
||||
'{"jsonrpc": "2.0", "id": 4, "method": "bogus"}\n')
|
||||
out = io.StringIO()
|
||||
with mock.patch.object(sys, "stdin", io.StringIO(lines)), \
|
||||
mock.patch.object(sys, "stdout", out):
|
||||
ws_main()
|
||||
rows = [json.loads(x) for x in out.getvalue().splitlines()]
|
||||
self.assertEqual(len(rows), 5)
|
||||
self.assertEqual(rows[0]["error"]["code"], -32700)
|
||||
self.assertEqual(rows[1]["result"]["serverInfo"]["name"],
|
||||
"websearch")
|
||||
self.assertEqual(rows[3]["result"], {})
|
||||
self.assertEqual(rows[4]["error"]["code"], -32601)
|
||||
|
||||
|
||||
class ImageGenMcpTest(unittest.TestCase):
|
||||
def test_tools_call_and_errors(self):
|
||||
gen = lambda p, output_filename=None, size="1024x1024", model=None: { # noqa: E731
|
||||
"path": "/w/gen.png", "prompt": p}
|
||||
edit = lambda p, inp, output_filename=None, size="1024x1024", model=None: { # noqa: E731
|
||||
"path": "/w/edit.png", "input": inp}
|
||||
resp = ig_handle({"jsonrpc": "2.0", "id": 1, "method": "tools/call",
|
||||
"params": {"name": "image_generate",
|
||||
"arguments": {"prompt": "cat"}}},
|
||||
generate_fn=gen)
|
||||
self.assertIn("gen.png", resp["result"]["content"][0]["text"])
|
||||
resp = ig_handle({"jsonrpc": "2.0", "id": 2, "method": "tools/call",
|
||||
"params": {"name": "image_edit",
|
||||
"arguments": {"prompt": "dog",
|
||||
"input_filename": "in.png"}}},
|
||||
edit_fn=edit)
|
||||
self.assertIn("in.png", resp["result"]["content"][0]["text"])
|
||||
unknown = _call(ig_handle, "tools/call", name="nope")
|
||||
self.assertEqual(unknown["error"]["code"], -32602)
|
||||
boom = ig_handle({"jsonrpc": "2.0", "id": 3, "method": "tools/call",
|
||||
"params": {"name": "image_generate",
|
||||
"arguments": {"prompt": "x"}}},
|
||||
generate_fn=lambda *a, **k: (_ for _ in ()).throw(
|
||||
RuntimeError("gen boom")))
|
||||
self.assertTrue(boom["result"]["isError"])
|
||||
self.assertIn("gen boom", boom["result"]["content"][0]["text"])
|
||||
self.assertEqual(ig_handle(42)["error"]["code"], -32700)
|
||||
self.assertIsNone(ig_handle({"method": "ping"}))
|
||||
self.assertEqual(_call(ig_handle, "ping")["result"], {})
|
||||
|
||||
def test_main_stdio_loop(self):
|
||||
lines = ('{"jsonrpc": "2.0", "id": 1, "method": "initialize",'
|
||||
' "params": {}}\n'
|
||||
'{"jsonrpc": "2.0", "id": 2, "method": "tools/list"}\n'
|
||||
'not json\n')
|
||||
out = io.StringIO()
|
||||
with mock.patch.object(sys, "stdin", io.StringIO(lines)), \
|
||||
mock.patch.object(sys, "stdout", out):
|
||||
ig_main()
|
||||
rows = [json.loads(x) for x in out.getvalue().splitlines()]
|
||||
self.assertEqual(len(rows), 3)
|
||||
self.assertEqual(rows[0]["result"]["serverInfo"]["name"],
|
||||
"imagegen")
|
||||
self.assertEqual(rows[2]["error"]["code"], -32700)
|
||||
|
||||
|
||||
class FakeBrowserFull:
|
||||
def __init__(self):
|
||||
self.calls = []
|
||||
|
||||
def navigate(self, url):
|
||||
self.calls.append(("navigate", url))
|
||||
return {"tool": "navigate", "url": url}
|
||||
|
||||
def snapshot(self):
|
||||
self.calls.append(("snapshot",))
|
||||
return {"tool": "snapshot"}
|
||||
|
||||
def click(self, selector):
|
||||
self.calls.append(("click", selector))
|
||||
return {"tool": "click"}
|
||||
|
||||
def fill(self, selector, text):
|
||||
self.calls.append(("fill", selector, text))
|
||||
return {"tool": "fill"}
|
||||
|
||||
def click_at(self, x, y):
|
||||
self.calls.append(("click_at", x, y))
|
||||
return {"tool": "click_at"}
|
||||
|
||||
def mouse_move(self, x, y):
|
||||
self.calls.append(("mouse_move", x, y))
|
||||
return {"tool": "mouse_move"}
|
||||
|
||||
def key_press(self, key):
|
||||
self.calls.append(("key_press", key))
|
||||
return {"tool": "key_press"}
|
||||
|
||||
def type_text(self, text):
|
||||
self.calls.append(("type_text", text))
|
||||
return {"tool": "type_text"}
|
||||
|
||||
def snapshot_refs(self):
|
||||
self.calls.append(("snapshot_refs",))
|
||||
return {"tool": "snapshot_refs"}
|
||||
|
||||
def click_ref(self, ref):
|
||||
self.calls.append(("click_ref", ref))
|
||||
return {"tool": "click_ref"}
|
||||
|
||||
def live_shot(self, name=None):
|
||||
self.calls.append(("live_shot", name))
|
||||
return {"tool": "live_shot"}
|
||||
|
||||
def evaluate(self, expression):
|
||||
self.calls.append(("evaluate", expression))
|
||||
return {"tool": "evaluate"}
|
||||
|
||||
def screenshot(self, name=None):
|
||||
self.calls.append(("screenshot", name))
|
||||
return {"tool": "screenshot"}
|
||||
|
||||
def close(self):
|
||||
self.calls.append(("close",))
|
||||
return {"tool": "close"}
|
||||
|
||||
|
||||
class PlaywrightMcpTest(unittest.TestCase):
|
||||
def test_all_tools_dispatch(self):
|
||||
cases = [
|
||||
("browser_navigate", {"url": "https://x/"}, "navigate"),
|
||||
("browser_snapshot", {}, "snapshot"),
|
||||
("browser_click", {"selector": "#a"}, "click"),
|
||||
("browser_fill", {"selector": "#a", "text": "hi"}, "fill"),
|
||||
("browser_click_at", {"x": 1, "y": 2}, "click_at"),
|
||||
("browser_mouse_move", {"x": 1, "y": 2}, "mouse_move"),
|
||||
("browser_key_press", {"key": "Enter"}, "key_press"),
|
||||
("browser_type_text", {"text": "hi"}, "type_text"),
|
||||
("browser_snapshot_refs", {}, "snapshot_refs"),
|
||||
("browser_click_ref", {"ref": "e0"}, "click_ref"),
|
||||
("browser_live_shot", {}, "live_shot"),
|
||||
("browser_evaluate", {"expression": "1+1"}, "evaluate"),
|
||||
("browser_screenshot", {}, "screenshot"),
|
||||
("browser_close", {}, "close"),
|
||||
]
|
||||
for i, (name, args, tool) in enumerate(cases):
|
||||
fake = FakeBrowserFull()
|
||||
resp = pw_handle(
|
||||
{"jsonrpc": "2.0", "id": i + 1, "method": "tools/call",
|
||||
"params": {"name": name, "arguments": args}},
|
||||
browser=fake)
|
||||
self.assertFalse(resp["result"]["isError"], name)
|
||||
self.assertIn(tool, resp["result"]["content"][0]["text"], name)
|
||||
|
||||
def test_unknown_tool_and_tool_exception(self):
|
||||
fake = FakeBrowserFull()
|
||||
unknown = pw_handle(
|
||||
{"jsonrpc": "2.0", "id": 1, "method": "tools/call",
|
||||
"params": {"name": "browser_nope", "arguments": {}}},
|
||||
browser=fake)
|
||||
self.assertEqual(unknown["error"]["code"], -32602)
|
||||
|
||||
class Raising(FakeBrowserFull):
|
||||
def navigate(self, url):
|
||||
raise RuntimeError("nav boom")
|
||||
|
||||
resp = pw_handle(
|
||||
{"jsonrpc": "2.0", "id": 2, "method": "tools/call",
|
||||
"params": {"name": "browser_navigate",
|
||||
"arguments": {"url": "https://x/"}}},
|
||||
browser=Raising())
|
||||
self.assertTrue(resp["result"]["isError"])
|
||||
self.assertIn("nav boom", resp["result"]["content"][0]["text"])
|
||||
|
||||
def test_protocol_and_handle_line(self):
|
||||
self.assertEqual(pw_handle("x")["error"]["code"], -32700)
|
||||
self.assertIsNone(pw_handle({"method": "ping"}))
|
||||
self.assertEqual(_call(pw_handle, "ping")["result"], {})
|
||||
out = io.StringIO()
|
||||
with mock.patch.object(sys, "stdout", out):
|
||||
_handle_line('{"jsonrpc": "2.0", "id": 9, "method": "ping"}',
|
||||
FakeBrowserFull())
|
||||
_handle_line("{bad json", FakeBrowserFull())
|
||||
rows = [json.loads(x) for x in out.getvalue().splitlines()]
|
||||
self.assertEqual(rows[0]["result"], {})
|
||||
self.assertEqual(rows[1]["error"]["code"], -32700)
|
||||
with mock.patch.object(pw_mod, "handle_request",
|
||||
side_effect=RuntimeError("handler boom")):
|
||||
out2, err2 = io.StringIO(), io.StringIO()
|
||||
with mock.patch.object(sys, "stdout", out2), \
|
||||
mock.patch.object(sys, "stderr", err2):
|
||||
_handle_line('{"jsonrpc": "2.0", "id": 10, '
|
||||
'"method": "tools/list"}',
|
||||
FakeBrowserFull())
|
||||
row = json.loads(out2.getvalue().strip())
|
||||
self.assertEqual(row["error"]["code"], -32603)
|
||||
self.assertIn("handler boom", err2.getvalue())
|
||||
|
||||
|
||||
class FlatCopyTest(unittest.TestCase):
|
||||
def _flat_copy(self, pairs):
|
||||
td = tempfile.mkdtemp()
|
||||
self.addCleanup(shutil.rmtree, td, True)
|
||||
root = Path(__file__).resolve().parents[2] / "cloud"
|
||||
for name in pairs:
|
||||
shutil.copy(root / name, os.path.join(td, name))
|
||||
return td
|
||||
|
||||
def _run_flat(self, td, module, check):
|
||||
script = ("import %s as m; print(m.SERVER_NAME); print(check(m))"
|
||||
% module)
|
||||
env = {"PATH": os.environ.get("PATH", ""), "PYTHONPATH": td}
|
||||
proc = subprocess.run(
|
||||
[sys.executable, "-c",
|
||||
script.replace("check(m)", check)],
|
||||
cwd=td, env=env, capture_output=True, text=True, timeout=60)
|
||||
self.assertEqual(proc.returncode, 0, proc.stderr)
|
||||
return proc.stdout
|
||||
|
||||
def test_playwright_flat_copy(self):
|
||||
td = self._flat_copy(["playwright_mcp.py",
|
||||
"playwright_browser.py"])
|
||||
out = self._run_flat(
|
||||
td, "playwright_mcp",
|
||||
"m.Browser.__module__ + '|' + "
|
||||
"str(m.handle_request({'jsonrpc': '2.0', 'id': 1,"
|
||||
" 'method': 'tools/list'})['result']['tools'][0]['name'])")
|
||||
self.assertIn("playwright", out)
|
||||
self.assertIn("playwright_browser|browser_navigate", out)
|
||||
|
||||
def test_websearch_flat_copy(self):
|
||||
td = self._flat_copy(["websearch_mcp.py", "websearch.py"])
|
||||
out = self._run_flat(
|
||||
td, "websearch_mcp",
|
||||
"m.search.__module__ + '|' + "
|
||||
"str(m.handle_request({'jsonrpc': '2.0', 'id': 1,"
|
||||
" 'method': 'ping'})['result'])")
|
||||
self.assertIn("websearch", out)
|
||||
self.assertIn("websearch|{}", out)
|
||||
|
||||
def test_imagegen_flat_copy(self):
|
||||
td = self._flat_copy(["imagegen_mcp.py", "imagegen.py"])
|
||||
out = self._run_flat(
|
||||
td, "imagegen_mcp",
|
||||
"m.generate.__module__ + '|' + "
|
||||
"str(m.handle_request({'jsonrpc': '2.0', 'id': 1,"
|
||||
" 'method': 'ping'})['result'])")
|
||||
self.assertIn("imagegen", out)
|
||||
self.assertIn("imagegen|{}", out)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Reference in new issue
Block a user