Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f2b9301fa1 | |||
| a8ba8d4b4a | |||
| 1477dbdd18 | |||
| 6d0a5284e7 | |||
| b193aaf8f7 | |||
| a4ab3ef27e |
+17
-3
@@ -1,3 +1,17 @@
|
|||||||
{
|
{
|
||||||
"permissionMode": "bypass"
|
"permissionMode": "bypass",
|
||||||
}
|
"permissions": {
|
||||||
|
"allow": [
|
||||||
|
"Bash(git *)",
|
||||||
|
"Bash(python scripts/agent_poller.py *)",
|
||||||
|
"Bash(python scripts/run_pipeline.py *)",
|
||||||
|
"Bash(python scripts/create_failure_issue.py *)",
|
||||||
|
"Bash(python -m pytest *)",
|
||||||
|
"Bash(python -c *)",
|
||||||
|
"Bash(curl *)"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -880,10 +880,14 @@ 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 (one retry)
|
# Feedback retry: re-run with coverage feedback (up to 2 retries)
|
||||||
|
retry_count = 0
|
||||||
|
while retry_count < 2:
|
||||||
feedback = _build_coverage_feedback(gaps)
|
feedback = _build_coverage_feedback(gaps)
|
||||||
if feedback:
|
if not feedback:
|
||||||
print(f"\n 覆盖反馈重试 (feedback长度={len(feedback)}字符)...", flush=True)
|
break
|
||||||
|
retry_count += 1
|
||||||
|
print(f"\n 覆盖反馈重试 #{retry_count} (feedback长度={len(feedback)}字符)...", flush=True)
|
||||||
try:
|
try:
|
||||||
retry_prompt = build_prompt(doc, feedback, all_paths)
|
retry_prompt = build_prompt(doc, feedback, all_paths)
|
||||||
print(f" 重试 prompt 长度: {len(retry_prompt)} 字符", flush=True)
|
print(f" 重试 prompt 长度: {len(retry_prompt)} 字符", flush=True)
|
||||||
@@ -892,17 +896,15 @@ def run_ensemble_semantic_index(doc: dict) -> dict:
|
|||||||
n_retry_concepts = len(retry_result.get("concepts", []))
|
n_retry_concepts = len(retry_result.get("concepts", []))
|
||||||
print(f" 重试返回: {n_retry_concepts} 概念, {n_retry_units} 功能单元", flush=True)
|
print(f" 重试返回: {n_retry_concepts} 概念, {n_retry_units} 功能单元", flush=True)
|
||||||
if n_retry_units > 0:
|
if n_retry_units > 0:
|
||||||
# Check which new sections were covered
|
|
||||||
retry_sections = set()
|
retry_sections = set()
|
||||||
for fu in retry_result.get("function_units", []):
|
for fu in retry_result.get("function_units", []):
|
||||||
for src in fu.get("sources", []):
|
for src in fu.get("sources", []):
|
||||||
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)
|
||||||
# Merge retry into results and re-validate
|
|
||||||
semantic_indices.append(retry_result)
|
semantic_indices.append(retry_result)
|
||||||
merged = ensemble_merge(semantic_indices)
|
merged = ensemble_merge(semantic_indices)
|
||||||
merged["ensemble_temperatures"] = list(temperatures) + ["feedback_retry"]
|
merged["ensemble_temperatures"] = list(temperatures) + [f"feedback_retry_{retry_count}"]
|
||||||
passed, gaps = _quick_validate(merged, doc, all_paths)
|
passed, gaps = _quick_validate(merged, doc, all_paths)
|
||||||
merged["validation_passed"] = passed
|
merged["validation_passed"] = passed
|
||||||
merged["validation_gaps"] = {
|
merged["validation_gaps"] = {
|
||||||
@@ -913,6 +915,7 @@ def run_ensemble_semantic_index(doc: dict) -> dict:
|
|||||||
print(f" 覆盖反馈重试失败: {e}", flush=True)
|
print(f" 覆盖反馈重试失败: {e}", flush=True)
|
||||||
import traceback
|
import traceback
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
|
break
|
||||||
|
|
||||||
return merged
|
return merged
|
||||||
|
|
||||||
|
|||||||
@@ -169,6 +169,27 @@ def _normalize_rule(rule: dict) -> dict:
|
|||||||
"value": "active"
|
"value": "active"
|
||||||
}]
|
}]
|
||||||
|
|
||||||
|
# Ensure table/text sources have a section field (defensive against LLM omission)
|
||||||
|
sources = rule.get("sources", [])
|
||||||
|
if sources:
|
||||||
|
# try to infer a default section from sibling sources or the rule path
|
||||||
|
default_section = ""
|
||||||
|
for s in sources:
|
||||||
|
sec = s.get("section", "")
|
||||||
|
if sec and sec.strip():
|
||||||
|
default_section = sec.strip()
|
||||||
|
break
|
||||||
|
if not default_section:
|
||||||
|
path = rule.get("path", "")
|
||||||
|
if path:
|
||||||
|
default_section = path.split(" > ")[0] if " > " in path else path
|
||||||
|
|
||||||
|
for src in sources:
|
||||||
|
stype = src.get("type", "")
|
||||||
|
if stype in ("table", "text"):
|
||||||
|
if not src.get("section"):
|
||||||
|
src["section"] = default_section
|
||||||
|
|
||||||
return rule
|
return rule
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -465,3 +465,49 @@ class TestNormalizeRule:
|
|||||||
normalized = _normalize_rule(rule)
|
normalized = _normalize_rule(rule)
|
||||||
assert normalized["trigger"]["operator"] == "AND"
|
assert normalized["trigger"]["operator"] == "AND"
|
||||||
assert normalized["trigger"]["conditions"][0]["operator"] == ">="
|
assert normalized["trigger"]["conditions"][0]["operator"] == ">="
|
||||||
|
|
||||||
|
def test_normalize_source_missing_section_from_sibling(self):
|
||||||
|
"""Table/text sources without section get it from sibling sources."""
|
||||||
|
rule = {
|
||||||
|
"trigger": {"conditions": [{"signal": "x", "operator": "==", "value": "1"}]},
|
||||||
|
"sources": [
|
||||||
|
{"type": "table", "section": "3.1.1 系统限制", "row": 1},
|
||||||
|
{"type": "text", "text_snippet": "missing section"},
|
||||||
|
],
|
||||||
|
}
|
||||||
|
normalized = _normalize_rule(rule)
|
||||||
|
assert normalized["sources"][1]["section"] == "3.1.1 系统限制"
|
||||||
|
|
||||||
|
def test_normalize_source_missing_section_from_path(self):
|
||||||
|
"""Table/text sources without section and no sibling fall back to rule path."""
|
||||||
|
rule = {
|
||||||
|
"trigger": {"conditions": [{"signal": "x", "operator": "==", "value": "1"}]},
|
||||||
|
"path": "4.2 关闭流程 > decision_speed > action_disable",
|
||||||
|
"sources": [
|
||||||
|
{"type": "table", "row": 3, "text_snippet": "no section anywhere"},
|
||||||
|
],
|
||||||
|
}
|
||||||
|
normalized = _normalize_rule(rule)
|
||||||
|
assert normalized["sources"][0]["section"] == "4.2 关闭流程"
|
||||||
|
|
||||||
|
def test_normalize_source_keeps_existing_section(self):
|
||||||
|
"""Sources that already have section are not modified."""
|
||||||
|
rule = {
|
||||||
|
"trigger": {"conditions": [{"signal": "x", "operator": "==", "value": "1"}]},
|
||||||
|
"sources": [
|
||||||
|
{"type": "table", "section": "1.0 概述", "row": 1},
|
||||||
|
],
|
||||||
|
}
|
||||||
|
normalized = _normalize_rule(rule)
|
||||||
|
assert normalized["sources"][0]["section"] == "1.0 概述"
|
||||||
|
|
||||||
|
def test_normalize_source_skips_logic_tree(self):
|
||||||
|
"""Logic tree sources are not touched (don't need section)."""
|
||||||
|
rule = {
|
||||||
|
"trigger": {"conditions": [{"signal": "x", "operator": "==", "value": "1"}]},
|
||||||
|
"sources": [
|
||||||
|
{"type": "logic_tree", "image_id": "img1", "node_ids": ["n1"]},
|
||||||
|
],
|
||||||
|
}
|
||||||
|
normalized = _normalize_rule(rule)
|
||||||
|
assert "section" not in normalized["sources"][0]
|
||||||
|
|||||||
Reference in New Issue
Block a user