Compare commits

...

8 Commits

Author SHA1 Message Date
pzhang_zywl 2cd02453ec fix: step1 覆盖反馈重试增至 3 次 + 放宽质量门控 - Closes #75
CI / test (pull_request) Successful in 8s
- 重试次数 2→3,增加 LLM 补全机会
- 质量门控放宽:新增 sections 且无回归即采纳,不只严格要求覆盖率下降

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-06-02 18:35:06 +08:00
pzhang_zywl 140e49342c Merge pull request 'fix: [bug] step3 未防御 table source null row + Layer C QE Audit 100% 不合格 - 来自 #18 e2e - Closes #73' (#74) from dev/issue-73-fix-null-row into main
CI / test (push) Successful in 8s
2026-06-02 18:06:04 +08:00
pzhang_zywl 93bbfe6029 fix: step3 _normalize_rule 将 table source 的 null row 转为 0 - Closes #73
CI / test (pull_request) Successful in 8s
LLM 输出 table source 时 row 字段可能为 null,导致 Layer A schema 失败。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-06-02 18:05:28 +08:00
pzhang_zywl 6b1424b1c4 Merge pull request 'fix: [bug] step2 IR extraction 生成 list 类型 section 字段导致 conftest 崩溃 - 来自 #64 修复 - Closes #69' (#72) from dev/issue-69-fix-list-section into main
CI / test (push) Successful in 12s
2026-06-02 17:45:37 +08:00
pzhang_zywl efb5ed481e fix: step3 _normalize_rule 处理 section 为 list 的 LLM 格式问题 - Closes #69
CI / test (pull_request) Successful in 9s
LLM 输出 section 字段有时为 list 而非 string,导致 .strip() 崩溃。
添加 _clean_section() 将 list→首元素 string,空 list 回退到 rule path。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-06-02 17:44:56 +08:00
pzhang_zywl e54a221f34 Merge pull request 'fix: [test] conftest ir_data fixture 防御 LLM 产出的 list-type section - Closes #70' (#71) from test/issue-70 into main
CI / test (push) Successful in 8s
2026-06-02 17:38:31 +08:00
pzhang_zywl 473a3c8d4f test: conftest ir_data 防御 list-type section + normalize 异常回退 - Closes #70
CI / test (pull_request) Successful in 7s
2026-06-02 17:37:47 +08:00
pzhang_zywl 5f094a9a48 Merge pull request 'fix: [product] Dev-Agent PR 前必须跑完整 e2e pipeline 验收 - 防止修复回归 - Closes #67' (#68) from dev/issue-67-pr-e2e-gate into main
CI / test (push) Successful in 14s
2026-06-02 17:35:16 +08:00
4 changed files with 79 additions and 7 deletions
@@ -880,9 +880,9 @@ def run_ensemble_semantic_index(doc: dict) -> dict:
if v:
print(f" {k}: {len(v)} 个问题")
# Feedback retry: re-run with coverage feedback (up to 2 retries, quality-gated)
# Feedback retry: re-run with coverage feedback (up to 3 retries, quality-gated)
retry_count = 0
while retry_count < 2:
while retry_count < 3:
feedback = _build_coverage_feedback(gaps)
if not feedback:
break
@@ -906,13 +906,16 @@ def run_ensemble_semantic_index(doc: dict) -> dict:
if src.get("section"):
retry_sections.add(src["section"])
print(f" 重试新增 sections: {sorted(retry_sections)}", flush=True)
# Quality gate: only include retry if it improves coverage
# Quality gate: include retry if it adds new sections or doesn't regress coverage
trial_indices = semantic_indices + [retry_result]
trial_merged = ensemble_merge(trial_indices)
trial_passed, trial_gaps = _quick_validate(trial_merged, doc, all_paths)
trial_warnings = len(trial_gaps.get("coverage_warnings", []))
trial_missing = len(trial_gaps.get("missing_table_rows", []))
if trial_warnings < pre_warnings or trial_missing < pre_missing_rows:
improved = trial_warnings < pre_warnings or trial_missing < pre_missing_rows
no_regression = trial_warnings <= pre_warnings and trial_missing <= pre_missing_rows
has_new_sections = len(retry_sections) > 0
if improved or (no_regression and has_new_sections):
semantic_indices.append(retry_result)
merged = trial_merged
passed, gaps = trial_passed, trial_gaps
@@ -174,11 +174,25 @@ def _normalize_rule(rule: dict) -> dict:
sources = rule.get("sources", [])
valid_types = {"table", "text", "logic_tree"}
def _clean_section(val):
"""Normalize section value: list→first element, ensure string."""
if isinstance(val, list):
return str(val[0]).strip() if val else ""
if isinstance(val, str):
return val.strip()
return str(val).strip() if val else ""
# Normalize section fields that might be lists (LLM format instability)
for s in sources:
sec = s.get("section")
if sec is not None:
s["section"] = _clean_section(sec)
# try to infer a default section from the rule path
default_section = ""
for s in sources:
sec = s.get("section", "")
if sec and sec.strip():
if sec and isinstance(sec, str) and sec.strip():
default_section = sec.strip()
break
if not default_section:
@@ -192,7 +206,12 @@ def _normalize_rule(rule: dict) -> dict:
if stype and stype not in valid_types:
src["type"] = "text"
stype = "text"
if stype in ("table", "text"):
if stype == "table":
if not src.get("section"):
src["section"] = default_section
if src.get("row") is None:
src["row"] = 0
elif stype == "text":
if not src.get("section"):
src["section"] = default_section
else:
@@ -512,6 +512,18 @@ class TestNormalizeRule:
normalized = _normalize_rule(rule)
assert "section" not in normalized["sources"][0]
def test_normalize_table_source_null_row(self):
"""Table source with null row gets row=0 (defensive)."""
rule = {
"trigger": {"conditions": [{"signal": "x", "operator": "==", "value": "1"}]},
"sources": [
{"type": "table", "section": "3.1 功能", "row": None},
],
}
normalized = _normalize_rule(rule)
assert normalized["sources"][0]["row"] == 0
def test_normalize_source_invalid_type(self):
"""Invalid source types (LLM hallucinations) are normalized to text."""
rule = {
@@ -538,3 +550,28 @@ class TestNormalizeRule:
assert len(normalized["sources"]) == 1
assert normalized["sources"][0]["type"] == "text"
assert normalized["sources"][0]["section"] == "3.1 策略"
def test_normalize_section_is_list(self):
"""Section field that is a list (LLM format bug) is normalized to string."""
rule = {
"trigger": {"conditions": [{"signal": "x", "operator": "==", "value": "1"}]},
"sources": [
{"type": "table", "section": ["状态", "系统设置"], "row": 1},
{"type": "text", "section": ["后台限制"], "text_snippet": "x"},
],
}
normalized = _normalize_rule(rule)
assert normalized["sources"][0]["section"] == "状态"
assert normalized["sources"][1]["section"] == "后台限制"
def test_normalize_section_is_empty_list(self):
"""Empty list section falls back to rule path."""
rule = {
"trigger": {"conditions": [{"signal": "x", "operator": "==", "value": "1"}]},
"path": "4.2 关闭流程 > decision",
"sources": [
{"type": "table", "section": [], "row": 1},
],
}
normalized = _normalize_rule(rule)
assert normalized["sources"][0]["section"] == "4.2 关闭流程"
+14 -1
View File
@@ -150,7 +150,20 @@ def ir_data(ir_path: str) -> dict:
from step3_merge_and_audit import _normalize_rule
rules = data.get("rules", [])
if rules:
data["rules"] = [_normalize_rule(r) for r in rules]
normalized = []
for i, r in enumerate(rules):
if not isinstance(r, dict):
continue # Skip non-dict entries defensively
# Defensive: flatten list-type section fields (LLM produces these sometimes)
for src in r.get("sources", []):
sec = src.get("section")
if isinstance(sec, list):
src["section"] = sec[0] if sec else ""
try:
normalized.append(_normalize_rule(r))
except Exception:
normalized.append(r) # Fallback: use raw rule if normalize crashes
data["rules"] = normalized
return data