host
f39ed3654e
基底：#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 漏洞；试跑产物已删， 提交后工作树干净。
232 lines
9.1 KiB
Python
232 lines
9.1 KiB
Python
"""自动化与分诊收件箱模块单测(cloud/automations.py)。
|
|
|
|
不跑真实模型、不联网：临时 SQLite 文件 + 模块函数直调。
|
|
覆盖：建表幂等、创建校验与同名规则、到期边界、claim 抢单
|
|
防重、取消语义、产出记录、分诊四段聚合。
|
|
"""
|
|
|
|
import os
|
|
import sqlite3
|
|
import sys
|
|
import tempfile
|
|
import unittest
|
|
from pathlib import Path
|
|
|
|
try:
|
|
from cloud.automations import (
|
|
cancel_automation,
|
|
claim_due_automation,
|
|
create_automation,
|
|
due_automations,
|
|
ensure_automations_tables,
|
|
get_automation,
|
|
is_due,
|
|
list_automation_runs,
|
|
list_automations,
|
|
record_automation_run,
|
|
triage_inbox,
|
|
)
|
|
from cloud.peer_messages import ensure_followups_table
|
|
except ImportError: # discover -s cloud/tests 时把项目根目录补进 sys.path
|
|
sys.path.insert(0, str(Path(__file__).resolve().parents[2]))
|
|
from cloud.automations import (
|
|
cancel_automation,
|
|
claim_due_automation,
|
|
create_automation,
|
|
due_automations,
|
|
ensure_automations_tables,
|
|
get_automation,
|
|
is_due,
|
|
list_automation_runs,
|
|
list_automations,
|
|
record_automation_run,
|
|
triage_inbox,
|
|
)
|
|
from cloud.peer_messages import ensure_followups_table
|
|
|
|
|
|
class AutomationsTestCase(unittest.TestCase):
|
|
def setUp(self):
|
|
self.tmp = tempfile.TemporaryDirectory()
|
|
self.db_path = os.path.join(self.tmp.name, "control.db")
|
|
self.conn = sqlite3.connect(self.db_path)
|
|
self.conn.row_factory = sqlite3.Row
|
|
self.conn.execute(
|
|
"CREATE TABLE tasks(id TEXT PRIMARY KEY, project_id TEXT,"
|
|
" prompt TEXT, status TEXT, created_at DOUBLE PRECISION,"
|
|
" updated_at DOUBLE PRECISION, error_text TEXT)")
|
|
ensure_automations_tables(self.conn)
|
|
ensure_followups_table(self.conn)
|
|
self.conn.commit()
|
|
self.now = 1700000000.0
|
|
self.project = "proj-1"
|
|
|
|
def tearDown(self):
|
|
self.conn.close()
|
|
self.tmp.cleanup()
|
|
|
|
def _make(self, name="daily", interval=3600, **kw):
|
|
kw.setdefault("project_id", self.project)
|
|
return create_automation(
|
|
self.conn, kw.pop("project_id"), name, "做每日检查",
|
|
"user-1", interval, now=self.now, **kw)
|
|
|
|
def test_ensure_is_idempotent(self):
|
|
ensure_automations_tables(self.conn)
|
|
ensure_automations_tables(self.conn)
|
|
self.conn.commit()
|
|
rows = self.conn.execute(
|
|
"SELECT name FROM sqlite_master WHERE type = 'table'"
|
|
" AND name IN ('automations', 'automation_runs')").fetchall()
|
|
self.assertEqual(len(rows), 2)
|
|
|
|
def test_create_fields_and_due_immediately(self):
|
|
auto = self._make()
|
|
self.assertEqual(auto["status"], "active")
|
|
self.assertEqual(auto["interval_seconds"], 3600)
|
|
self.assertIsNone(auto["last_run_at"])
|
|
self.assertEqual(auto["next_run_at"], self.now)
|
|
self.assertTrue(auto["due"])
|
|
self.assertTrue(is_due(auto, self.now))
|
|
got = get_automation(self.conn, auto["id"])
|
|
self.assertEqual(got["name"], "daily")
|
|
self.assertIsNone(get_automation(self.conn, "missing"))
|
|
|
|
def test_create_validation(self):
|
|
for name, prompt, interval in (
|
|
("", "x", 3600),
|
|
(" ", "x", 3600),
|
|
("n", "", 3600),
|
|
("n", "x", 59),
|
|
("n", "x", True),
|
|
("n", "x", 3600.5),
|
|
("x" * 101, "x", 3600),
|
|
("n", "x" * 20001, 3600)):
|
|
with self.assertRaises(ValueError, msg=(name, interval)):
|
|
create_automation(
|
|
self.conn, self.project, name, prompt, "user-1",
|
|
interval, now=self.now)
|
|
|
|
def test_duplicate_active_name_rejected_reusable_after_cancel(self):
|
|
self._make(name="dup")
|
|
with self.assertRaises(ValueError):
|
|
self._make(name="dup")
|
|
autos = list_automations(self.conn, self.project, self.now)
|
|
self.assertEqual(len(autos), 1)
|
|
ok, cancelled = cancel_automation(
|
|
self.conn, autos[0]["id"], self.now)
|
|
self.assertTrue(ok)
|
|
self.assertEqual(cancelled["status"], "cancelled")
|
|
again = self._make(name="dup")
|
|
self.assertEqual(again["status"], "active")
|
|
|
|
def test_due_boundary_matches_host_rundue_rule(self):
|
|
auto = self._make(interval=3600)
|
|
self.conn.execute(
|
|
"UPDATE automations SET last_run_at = ? WHERE id = ?",
|
|
(self.now - 3599, auto["id"]))
|
|
self.conn.commit()
|
|
self.assertEqual(due_automations(
|
|
self.conn, self.project, self.now), [])
|
|
self.conn.execute(
|
|
"UPDATE automations SET last_run_at = ? WHERE id = ?",
|
|
(self.now - 3600, auto["id"]))
|
|
self.conn.commit()
|
|
due = due_automations(self.conn, self.project, self.now)
|
|
self.assertEqual([d["id"] for d in due], [auto["id"]])
|
|
|
|
def test_claim_is_the_duplicate_gate(self):
|
|
auto = self._make(interval=3600)
|
|
self.assertTrue(claim_due_automation(
|
|
self.conn, auto["id"], self.now))
|
|
# 同一间隔内第二次抢单必须失败：这就是防重复执行。
|
|
self.assertFalse(claim_due_automation(
|
|
self.conn, auto["id"], self.now))
|
|
self.assertFalse(claim_due_automation(
|
|
self.conn, auto["id"], self.now + 3599))
|
|
# 下个间隔到了才能再抢。
|
|
self.assertTrue(claim_due_automation(
|
|
self.conn, auto["id"], self.now + 3600))
|
|
self.assertFalse(claim_due_automation(
|
|
self.conn, "missing", self.now))
|
|
ok, _ = cancel_automation(self.conn, auto["id"], self.now)
|
|
self.assertTrue(ok)
|
|
self.assertFalse(claim_due_automation(
|
|
self.conn, auto["id"], self.now + 7200))
|
|
|
|
def test_cancel_semantics(self):
|
|
ok, auto = cancel_automation(self.conn, "missing", self.now)
|
|
self.assertFalse(ok)
|
|
self.assertIsNone(auto)
|
|
made = self._make()
|
|
ok, auto = cancel_automation(self.conn, made["id"], self.now)
|
|
self.assertTrue(ok)
|
|
self.assertEqual(auto["status"], "cancelled")
|
|
self.assertFalse(auto["due"])
|
|
ok, auto = cancel_automation(self.conn, made["id"], self.now)
|
|
self.assertFalse(ok)
|
|
self.assertEqual(auto["status"], "cancelled")
|
|
|
|
def test_record_run_and_list_runs(self):
|
|
auto = self._make()
|
|
run = record_automation_run(
|
|
self.conn, auto["id"], self.project, task_id="task-1",
|
|
status="created", detail="claimed", now=self.now)
|
|
self.assertEqual(run["task_id"], "task-1")
|
|
self.assertEqual(run["status"], "created")
|
|
runs = list_automation_runs(self.conn, auto["id"])
|
|
self.assertEqual(len(runs), 1)
|
|
with self.assertRaises(ValueError):
|
|
record_automation_run(
|
|
self.conn, "missing", self.project, now=self.now)
|
|
|
|
def test_triage_inbox_four_sections(self):
|
|
auto = self._make()
|
|
other = self._make(name="weekly", interval=86400)
|
|
cancel_automation(self.conn, other["id"], self.now)
|
|
self.conn.execute(
|
|
"INSERT INTO tasks(id, project_id, prompt, status,"
|
|
" created_at, updated_at, error_text)"
|
|
" VALUES('t-fail', ?, '坏任务', 'failed', ?, ?, 'boom')",
|
|
(self.project, self.now, self.now))
|
|
self.conn.execute(
|
|
"INSERT INTO tasks(id, project_id, prompt, status,"
|
|
" created_at, updated_at, error_text)"
|
|
" VALUES('t-run', ?, '跑中任务', 'running', ?, ?, NULL)",
|
|
(self.project, self.now, self.now))
|
|
self.conn.execute(
|
|
"INSERT INTO task_followups(id, task_id, project_id, body,"
|
|
" mode, status, created_by, sender_task_id, created_at,"
|
|
" updated_at) VALUES('f-1', 't-run', ?, '请看一下',"
|
|
" 'queued', 'pending', 'user-1', NULL, ?, ?)",
|
|
(self.project, self.now, self.now))
|
|
self.conn.execute(
|
|
"INSERT INTO tasks(id, project_id, prompt, status,"
|
|
" created_at, updated_at, error_text)"
|
|
" VALUES('t-done', ?, '已完成', 'completed', ?, ?, NULL)",
|
|
(self.project, self.now, self.now))
|
|
record_automation_run(
|
|
self.conn, auto["id"], self.project, task_id="t-done",
|
|
status="created", detail="", now=self.now)
|
|
self.conn.commit()
|
|
inbox = triage_inbox(self.conn, self.project, self.now)
|
|
self.assertEqual(
|
|
[d["id"] for d in inbox["automations_due"]], [auto["id"]])
|
|
self.assertEqual(
|
|
[t["id"] for t in inbox["failed_tasks"]], ["t-fail"])
|
|
self.assertEqual(
|
|
[f["id"] for f in inbox["pending_followups"]], ["f-1"])
|
|
self.assertEqual(len(inbox["recent_runs"]), 1)
|
|
self.assertEqual(inbox["recent_runs"][0]["task_status"],
|
|
"completed")
|
|
self.assertEqual(inbox["counts"], {
|
|
"automations_due": 1,
|
|
"failed_tasks": 1,
|
|
"pending_followups": 1,
|
|
"recent_runs": 1,
|
|
})
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|