Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7c02db907b | |||
| d682f64c01 | |||
| a24408521c | |||
| c091b6c256 | |||
| cbafd30ec7 | |||
| f84908aa36 | |||
| 500152510a | |||
| 0d5bfa9276 | |||
| eb2af77c90 | |||
| 2101a43b68 | |||
| 9f0872c36a |
+6
-3
@@ -126,9 +126,11 @@ python scripts/agent_poller.py --action get --issue N
|
||||
1. git pull origin main
|
||||
2. git checkout -b dev/issue-N-<slug>
|
||||
3. 修改功能代码 + 更新/补充 UT 和接口集成测试
|
||||
4. python -m pytest -v # 本地全量测试
|
||||
5. git commit -m "fix: <描述> - Closes #N"
|
||||
6. git push origin dev/issue-N-<slug>
|
||||
4. python -m pytest -v # 本地全量 UT/集成测试
|
||||
5. python scripts/run_pipeline.py --input "input/<文档>.docx" # 运行完整 pipeline
|
||||
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 覆盖了输入文档中的功能点
|
||||
- **验证是实际功能验证,不是 dry-run**:`pytest` 通过只是门槛,必须用真实输入文档实际运行 pipeline 确认功能生效
|
||||
- **PR 前必须通过 e2e 验收 (Layer A+B+C)**:防止修复引入回归。若无法运行完整 pipeline(API 不可用等),至少在 PR 描述中注明
|
||||
|
||||
### 4. 提交 PR
|
||||
|
||||
|
||||
+16
-1
@@ -188,6 +188,15 @@ def close_issue(num, body=None):
|
||||
return i
|
||||
|
||||
|
||||
def reopen_issue(num, body=None):
|
||||
"""Reopen a closed issue, optionally with a reason comment."""
|
||||
if body:
|
||||
comment_issue(num, f"## REOPEN\n\n{body}")
|
||||
i = _req("PATCH", f"/issues/{num}", {"state": "open"})
|
||||
print(f"Issue #{num} reopened")
|
||||
return i
|
||||
|
||||
|
||||
def _unblock_issues_blocked_by(closed_num):
|
||||
"""Check issues blocked by *closed_num* and unblock if all blockers resolved.
|
||||
|
||||
@@ -382,7 +391,8 @@ def main():
|
||||
parser = argparse.ArgumentParser(description="Dev agent Gitea helper")
|
||||
parser.add_argument("--action", required=True,
|
||||
choices=["list", "get", "comment", "close-issue",
|
||||
"create-issue", "create-pr", "pr-status", "merge-pr", "lifecycle",
|
||||
"create-issue", "reopen-issue",
|
||||
"create-pr", "pr-status", "merge-pr", "lifecycle",
|
||||
"blocked-check"])
|
||||
parser.add_argument("--issue", type=int)
|
||||
parser.add_argument("--pr", type=int)
|
||||
@@ -420,6 +430,11 @@ def main():
|
||||
print("--title is required for 'create-issue' action", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
create_issue(args.title, args.body, args.labels)
|
||||
elif args.action == "reopen-issue":
|
||||
if not args.issue:
|
||||
print("--issue is required for 'reopen-issue' action", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
reopen_issue(args.issue, args.body)
|
||||
elif args.action == "create-pr":
|
||||
if not args.issue or not args.branch:
|
||||
print("--issue and --branch are required for 'create-pr' action", file=sys.stderr)
|
||||
|
||||
@@ -172,30 +172,36 @@ def _normalize_rule(rule: dict) -> dict:
|
||||
# Ensure table/text sources have a section field (defensive against LLM omission)
|
||||
# Also normalize invalid source types (LLM hallucinations like function_unit_description)
|
||||
sources = rule.get("sources", [])
|
||||
valid_types = {"table", "text", "logic_tree"}
|
||||
|
||||
# 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():
|
||||
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
|
||||
|
||||
if sources:
|
||||
valid_types = {"table", "text", "logic_tree"}
|
||||
|
||||
# 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", "")
|
||||
# Normalize invalid source types to "text"
|
||||
if stype and stype not in valid_types:
|
||||
src["type"] = "text"
|
||||
stype = "text"
|
||||
if stype in ("table", "text"):
|
||||
if not src.get("section"):
|
||||
src["section"] = default_section
|
||||
else:
|
||||
# Empty sources list — add a minimal text source (defensive against schema failure)
|
||||
src = {"type": "text", "text_snippet": "inferred from rule context"}
|
||||
if default_section:
|
||||
src["section"] = default_section
|
||||
sources.append(src)
|
||||
rule["sources"] = sources
|
||||
|
||||
return rule
|
||||
|
||||
|
||||
@@ -526,3 +526,15 @@ class TestNormalizeRule:
|
||||
assert normalized["sources"][0]["type"] == "text"
|
||||
assert normalized["sources"][1]["type"] == "text"
|
||||
assert normalized["sources"][0]["section"] == "3.1 功能"
|
||||
|
||||
def test_normalize_empty_sources(self):
|
||||
"""Rules with empty sources get a minimal text source (defensive)."""
|
||||
rule = {
|
||||
"trigger": {"conditions": [{"signal": "x", "operator": "==", "value": "1"}]},
|
||||
"path": "3.1 策略 > decision_speed",
|
||||
"sources": [],
|
||||
}
|
||||
normalized = _normalize_rule(rule)
|
||||
assert len(normalized["sources"]) == 1
|
||||
assert normalized["sources"][0]["type"] == "text"
|
||||
assert normalized["sources"][0]["section"] == "3.1 策略"
|
||||
|
||||
@@ -140,9 +140,19 @@ def ir_path(request) -> str:
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
def ir_data(ir_path: str) -> dict:
|
||||
"""Load the IR JSON data."""
|
||||
"""Load the IR JSON data, normalizing each rule for defensive schema fixes."""
|
||||
with open(ir_path, "r", encoding="utf-8") as f:
|
||||
return json.load(f)
|
||||
data = json.load(f)
|
||||
|
||||
# Apply normalize to every rule so old IR files benefit from latest fixes
|
||||
# (invalid source types, missing section fields, trigger nulls, etc.)
|
||||
sys.path.insert(0, str(_PROJECT_ROOT / "skills" / "ir_generation_skill"))
|
||||
from step3_merge_and_audit import _normalize_rule
|
||||
rules = data.get("rules", [])
|
||||
if rules:
|
||||
data["rules"] = [_normalize_rule(r) for r in rules]
|
||||
|
||||
return data
|
||||
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
|
||||
Reference in New Issue
Block a user