feat(review): 审查结论改为结构化 JSON，移除二次 LLM 抽取

- checklist.py：系统提示加入结构化输出契约（只输出 {summary, issues[]}，引用 handle 必须真实存在、不得编造） - review.py：review_frame 返回 {summary, issues, raw}；仅在「不再请求工具」的回合解析结论，中间工具回合的 content 永不解析；强制收口那次 chat 不传 tools - report.py：删除 extract_issues 与 _EXTRACT_SYSTEM（不再需要第二次 LLM 调用）；新增 format_finding（用 .get，顺带修复缺 frame 键 KeyError）；save_report 的 issues 省略时从 findings 拍平 - __main__.py：主流程改为确定性检查 → review_frame → build_finding（合并+校验）， issues 由 flatten_issues 派生顺带修复既有 gap：summarize 硬下标 KeyError、extract_issues 单行围栏解析失败。
2026-10-14 19:53:41 +08:00
1 parent f6d61f8d07
commit f7fa8f14d9
@@ -2,19 +2,64 @@

 import json

-import pytest
-
-from dwg_review.phases.report import extract_issues, save_report, summarize
+from dwg_review.phases.report import format_finding, save_report, summarize
 from tests.fakes import FakeLlmClient, make_ctx


+def issue(**over):
+    base = {
+        "frame": 1, "category": "文字", "severity": "high", "message": "文字重叠",
+        "handle": "A1", "source": "llm", "verified": True,
+    }
+    base.update(over)
+    return base
+
+
 def findings_fixture():
    return [
-        {"frame": 1, "sheet": "A1", "finding": "图框1：文字重叠"},
-        {"frame": 2, "sheet": "A3", "finding": "图框2：未发现明显问题"},
+        {
+            "frame": 1, "sheet": "A1", "summary": "该图框存在文字重叠",
+            "issues": [issue()],
+            "counts": {"deterministic": 0, "llm": 1, "unverified": 0},
+        },
+        {
+            "frame": 2, "sheet": "A3", "summary": "未发现明显问题",
+            "issues": [],
+            "counts": {"deterministic": 0, "llm": 0, "unverified": 0},
+        },
    ]


+# ---------------------------------------------------------------------------
+#  format_finding
+# ---------------------------------------------------------------------------
+def test_format_finding_renders_summary_and_issues():
+    text = format_finding(findings_fixture()[0])
+    assert "图框 1" in text and "图幅 A1" in text
+    assert "该图框存在文字重叠" in text
+    assert "[high][LLM] 文字重叠" in text
+    assert "handle=A1" in text
+
+
+def test_format_finding_marks_deterministic_source():
+    finding = {"frame": 1, "sheet": "A1", "summary": "s",
+               "issues": [issue(source="deterministic", handle="Z1")]}
+    assert "[确定性]" in format_finding(finding)
+
+
+def test_format_finding_marks_unverified():
+    finding = {"frame": 1, "sheet": "A1", "summary": "s",
+               "issues": [issue(handle=None, verified=False)]}
+    text = format_finding(finding)
+    assert "未在证据中定位" in text
+    assert "handle=" not in text
+
+
+def test_format_finding_tolerates_missing_keys():
+    text = format_finding({})
+    assert "图框 None" in text  # 不再 KeyError（修复既有硬下标 gap）
+
+
 # ---------------------------------------------------------------------------
 #  summarize
 # ---------------------------------------------------------------------------
@@ -31,7 +76,16 @@ def test_summarize_uses_chat_text():
    ctx = make_ctx(llm=llm)
    assert summarize(ctx, findings_fixture(), log=lambda *a: None) == "## 总报告"
    assert len(llm.calls) == 1
-    assert "图框1" in llm.calls[0]["user"]
+    assert "图框 1" in llm.calls[0]["user"]
+    assert "图框 2" in llm.calls[0]["user"]
+
+
+def test_summarize_input_includes_issue_lines():
+    llm = FakeLlmClient(text="x")
+    ctx = make_ctx(llm=llm)
+    summarize(ctx, findings_fixture(), log=lambda *a: None)
+    user = llm.calls[0]["user"]
+    assert "[high][LLM] 文字重叠" in user


 def test_summarize_falls_back_to_raw_input_on_error():
@@ -42,70 +96,16 @@ def test_summarize_falls_back_to_raw_input_on_error():
    logs = []
    ctx = make_ctx(llm=Boom())
    out = summarize(ctx, findings_fixture(), log=logs.append)
-    assert "图框1" in out and "图框2" in out
+    assert "图框 1" in out and "图框 2" in out
    assert any("汇总失败" in line for line in logs)


-def test_summarize_missing_frame_key_known_gap():
-    """已知瑕疵：summarize 用硬下标 f['frame']，findings 缺该键直接 KeyError。"""
-    ctx = make_ctx(llm=FakeLlmClient(text="x"))
-    with pytest.raises(KeyError):
-        summarize(ctx, [{"finding": "缺 frame 键"}], log=lambda *a: None)
-
-
-# ---------------------------------------------------------------------------
-#  extract_issues
-# ---------------------------------------------------------------------------
-def test_extract_issues_empty_returns_empty_list():
-    llm = FakeLlmClient(text_script=["[]"])
+def test_summarize_tolerates_finding_without_frame_key():
+    # 修复既有硬下标 gap：缺 frame 键不再 KeyError
+    llm = FakeLlmClient(text="ok")
    ctx = make_ctx(llm=llm)
-    assert extract_issues(ctx, [], log=lambda *a: None) == []
-    assert llm.calls == []
-
-
-def test_extract_issues_parses_json_array():
-    payload = '[{"frame": 1, "handle": "A", "severity": "high", "message": "x"}]'
-    llm = FakeLlmClient(text_script=[payload])
-    ctx = make_ctx(llm=llm)
-    issues = extract_issues(ctx, findings_fixture(), log=lambda *a: None)
-    assert issues == [{"frame": 1, "handle": "A", "severity": "high", "message": "x"}]
-
-
-def test_extract_issues_strips_code_fence():
-    fenced = '```json\n[{"frame": 1, "message": "y"}]\n```'
-    llm = FakeLlmClient(text_script=[fenced])
-    ctx = make_ctx(llm=llm)
-    assert extract_issues(ctx, findings_fixture(), log=lambda *a: None) == [
-        {"frame": 1, "message": "y"}
-    ]
-
-
-def test_extract_issues_returns_empty_on_invalid_json():
-    logs = []
-    llm = FakeLlmClient(text_script=["这不是 JSON"])
-    ctx = make_ctx(llm=llm)
-    assert extract_issues(ctx, findings_fixture(), log=logs.append) == []
-    assert any("结构化抽取失败" in line for line in logs)
-
-
-def test_extract_issues_returns_empty_when_not_a_list():
-    llm = FakeLlmClient(text_script=['{"frame": 1}'])
-    ctx = make_ctx(llm=llm)
-    assert extract_issues(ctx, findings_fixture(), log=lambda *a: None) == []
-
-
-def test_extract_issues_single_line_fence_known_gap():
-    """已知瑕疵：围栏剥离依赖换行，单行 ```json[...]``` 会残留 json 前缀 → 解析失败。"""
-    llm = FakeLlmClient(text_script=['```json[{"frame": 1, "message": "z"}]```'])
-    ctx = make_ctx(llm=llm)
-    assert extract_issues(ctx, findings_fixture(), log=lambda *a: None) == []
-
-
-def test_extract_issues_missing_frame_key_known_gap():
-    """已知瑕疵：extract_issues 同样用硬下标 f['frame']，findings 缺该键直接 KeyError。"""
-    ctx = make_ctx(llm=FakeLlmClient(text="[]"))
-    with pytest.raises(KeyError):
-        extract_issues(ctx, [{"finding": "缺 frame 键"}], log=lambda *a: None)
+    out = summarize(ctx, [{"summary": "无 frame 键", "issues": []}], log=lambda *a: None)
+    assert out == "ok"


 # ---------------------------------------------------------------------------
@@ -114,7 +114,7 @@ def test_extract_issues_missing_frame_key_known_gap():
 def test_save_report_writes_md_and_json(tmp_reports):
    findings = findings_fixture()
    plan = {"frames": [{"bbox": [0, 0, 10, 10]}]}
-    issues = [{"frame": 1, "handle": "A", "message": "x"}]
+    issues = [issue()]

    md_path, json_path = save_report("# 报告", findings, plan, issues, log=lambda *a: None)

@@ -127,9 +127,11 @@ def test_save_report_writes_md_and_json(tmp_reports):
    assert "generated_at" in data


-def test_save_report_issues_default_to_empty(tmp_reports):
-    _, json_path = save_report("md", findings_fixture(), {"frames": []}, log=lambda *a: None)
-    assert json.loads(json_path.read_text(encoding="utf-8"))["issues"] == []
+def test_save_report_derives_issues_from_findings(tmp_reports):
+    findings = findings_fixture()
+    _, json_path = save_report("md", findings, {"frames": []}, log=lambda *a: None)
+    data = json.loads(json_path.read_text(encoding="utf-8"))
+    assert data["issues"] == [issue()]  # 拍平自 findings


 def test_save_report_creates_missing_directory(tmp_path, monkeypatch):