Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2cd02453ec | |||
| 140e49342c | |||
| 93bbfe6029 | |||
| 6b1424b1c4 | |||
| efb5ed481e | |||
| e54a221f34 | |||
| 473a3c8d4f | |||
| 5f094a9a48 | |||
| 7c02db907b | |||
| d682f64c01 |
+6
-3
@@ -126,9 +126,11 @@ python scripts/agent_poller.py --action get --issue N
|
|||||||
1. git pull origin main
|
1. git pull origin main
|
||||||
2. git checkout -b dev/issue-N-<slug>
|
2. git checkout -b dev/issue-N-<slug>
|
||||||
3. 修改功能代码 + 更新/补充 UT 和接口集成测试
|
3. 修改功能代码 + 更新/补充 UT 和接口集成测试
|
||||||
4. python -m pytest -v # 本地全量测试
|
4. python -m pytest -v # 本地全量 UT/集成测试
|
||||||
5. git commit -m "fix: <描述> - Closes #N"
|
5. python scripts/run_pipeline.py --input "input/<文档>.docx" # 运行完整 pipeline
|
||||||
6. git push origin dev/issue-N-<slug>
|
6. python -m pytest tests/acceptance/ -v --run-acceptance # e2e 验收 (Layer A+B+C)
|
||||||
|
7. git commit -m "fix: <描述> - Closes #N"
|
||||||
|
8. git push origin dev/issue-N-<slug>
|
||||||
```
|
```
|
||||||
|
|
||||||
**开发原则:**
|
**开发原则:**
|
||||||
@@ -137,6 +139,7 @@ python scripts/agent_poller.py --action get --issue N
|
|||||||
- 关注 IR 一致性:对同一输入的多次运行结果应尽量稳定
|
- 关注 IR 一致性:对同一输入的多次运行结果应尽量稳定
|
||||||
- 关注功能覆盖率:确保 IR 覆盖了输入文档中的功能点
|
- 关注功能覆盖率:确保 IR 覆盖了输入文档中的功能点
|
||||||
- **验证是实际功能验证,不是 dry-run**:`pytest` 通过只是门槛,必须用真实输入文档实际运行 pipeline 确认功能生效
|
- **验证是实际功能验证,不是 dry-run**:`pytest` 通过只是门槛,必须用真实输入文档实际运行 pipeline 确认功能生效
|
||||||
|
- **PR 前必须通过 e2e 验收 (Layer A+B+C)**:防止修复引入回归。若无法运行完整 pipeline(API 不可用等),至少在 PR 描述中注明
|
||||||
|
|
||||||
### 4. 提交 PR
|
### 4. 提交 PR
|
||||||
|
|
||||||
|
|||||||
@@ -880,9 +880,9 @@ def run_ensemble_semantic_index(doc: dict) -> dict:
|
|||||||
if v:
|
if v:
|
||||||
print(f" {k}: {len(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
|
retry_count = 0
|
||||||
while retry_count < 2:
|
while retry_count < 3:
|
||||||
feedback = _build_coverage_feedback(gaps)
|
feedback = _build_coverage_feedback(gaps)
|
||||||
if not feedback:
|
if not feedback:
|
||||||
break
|
break
|
||||||
@@ -906,13 +906,16 @@ def run_ensemble_semantic_index(doc: dict) -> dict:
|
|||||||
if src.get("section"):
|
if src.get("section"):
|
||||||
retry_sections.add(src["section"])
|
retry_sections.add(src["section"])
|
||||||
print(f" 重试新增 sections: {sorted(retry_sections)}", flush=True)
|
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_indices = semantic_indices + [retry_result]
|
||||||
trial_merged = ensemble_merge(trial_indices)
|
trial_merged = ensemble_merge(trial_indices)
|
||||||
trial_passed, trial_gaps = _quick_validate(trial_merged, doc, all_paths)
|
trial_passed, trial_gaps = _quick_validate(trial_merged, doc, all_paths)
|
||||||
trial_warnings = len(trial_gaps.get("coverage_warnings", []))
|
trial_warnings = len(trial_gaps.get("coverage_warnings", []))
|
||||||
trial_missing = len(trial_gaps.get("missing_table_rows", []))
|
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)
|
semantic_indices.append(retry_result)
|
||||||
merged = trial_merged
|
merged = trial_merged
|
||||||
passed, gaps = trial_passed, trial_gaps
|
passed, gaps = trial_passed, trial_gaps
|
||||||
|
|||||||
@@ -174,11 +174,25 @@ def _normalize_rule(rule: dict) -> dict:
|
|||||||
sources = rule.get("sources", [])
|
sources = rule.get("sources", [])
|
||||||
valid_types = {"table", "text", "logic_tree"}
|
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
|
# try to infer a default section from the rule path
|
||||||
default_section = ""
|
default_section = ""
|
||||||
for s in sources:
|
for s in sources:
|
||||||
sec = s.get("section", "")
|
sec = s.get("section", "")
|
||||||
if sec and sec.strip():
|
if sec and isinstance(sec, str) and sec.strip():
|
||||||
default_section = sec.strip()
|
default_section = sec.strip()
|
||||||
break
|
break
|
||||||
if not default_section:
|
if not default_section:
|
||||||
@@ -192,7 +206,12 @@ def _normalize_rule(rule: dict) -> dict:
|
|||||||
if stype and stype not in valid_types:
|
if stype and stype not in valid_types:
|
||||||
src["type"] = "text"
|
src["type"] = "text"
|
||||||
stype = "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"):
|
if not src.get("section"):
|
||||||
src["section"] = default_section
|
src["section"] = default_section
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -512,6 +512,18 @@ class TestNormalizeRule:
|
|||||||
normalized = _normalize_rule(rule)
|
normalized = _normalize_rule(rule)
|
||||||
assert "section" not in normalized["sources"][0]
|
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):
|
def test_normalize_source_invalid_type(self):
|
||||||
"""Invalid source types (LLM hallucinations) are normalized to text."""
|
"""Invalid source types (LLM hallucinations) are normalized to text."""
|
||||||
rule = {
|
rule = {
|
||||||
@@ -538,3 +550,28 @@ class TestNormalizeRule:
|
|||||||
assert len(normalized["sources"]) == 1
|
assert len(normalized["sources"]) == 1
|
||||||
assert normalized["sources"][0]["type"] == "text"
|
assert normalized["sources"][0]["type"] == "text"
|
||||||
assert normalized["sources"][0]["section"] == "3.1 策略"
|
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 关闭流程"
|
||||||
|
|||||||
@@ -150,7 +150,20 @@ def ir_data(ir_path: str) -> dict:
|
|||||||
from step3_merge_and_audit import _normalize_rule
|
from step3_merge_and_audit import _normalize_rule
|
||||||
rules = data.get("rules", [])
|
rules = data.get("rules", [])
|
||||||
if 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
|
return data
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user