feat(review): 新增确定性检查前置与结论结构化内核
- checks.py：确定性检查（find_zero_length / find_duplicate_entities 传 window + 纯 Python 派生空文字、未闭合多段线）。问题带 source=deterministic，handle 来自 工具/数据本身，不依赖 LLM 回忆 - findings.py：解析 LLM 的 JSON 结论 + handle 交叉校验（引用未知 handle 时保留问题、 剥掉 handle、verified=False）+ findings 装配 - config.py：新增 DETERMINISTIC_CHECKS / VALIDATE_HANDLES / CHECK_UNCLOSED_POLYLINES 开关与 ZERO_LENGTH_TOLERANCE / DUP_TOLERANCE / DUP_GROUP_LIMIT 实机验证：find_zero_length / find_duplicate_entities 的 window 参数在基座上生效 （schema 未声明，C++ 侧 parseCommonQuery 实际支持）。
This commit is contained in:
gjm committed
1 parent
a0ea902b50
commit
f6d61f8d07
6 files changed
+884
No files matched your search
@@ -0,0 +1,164 @@
|
||||
"""确定性检查：MCP 工具（find_zero_length / find_duplicate_entities）+ 纯 Python 派生。
|
||||
|
||||
产出的 issue 带 `source="deterministic"`，其 handle 来自工具/数据本身，
|
||||
因此被视为**可信**，可直接进入批注链路，不依赖 LLM 回忆。
|
||||
|
||||
注意：`find_zero_length` / `find_duplicate_entities` 的 `window` 参数在 C++ 侧
|
||||
（`parseCommonQuery`）**实际生效**，只是 JSON schema 未声明——Python 侧显式传参即可。
|
||||
"""
|
||||
|
||||
from . import config
|
||||
from .mcp_client import McpError, McpToolError, result_json
|
||||
|
||||
|
||||
def make_issue(category, severity, message, *, handle=None, handles=None,
|
||||
source="deterministic"):
|
||||
"""构造统一 issue（`verified` 由 findings 层补齐）。"""
|
||||
issue = {
|
||||
"category": category,
|
||||
"severity": severity,
|
||||
"message": message,
|
||||
"source": source,
|
||||
}
|
||||
if handle:
|
||||
issue["handle"] = handle
|
||||
if handles:
|
||||
issue["handles"] = list(handles)
|
||||
return issue
|
||||
|
||||
|
||||
def _iter_items(envelope):
|
||||
"""健壮迭代 items（`result_json` 解析失败会返回原始字符串）。"""
|
||||
if not isinstance(envelope, dict):
|
||||
return []
|
||||
items = envelope.get("items")
|
||||
if not isinstance(items, list):
|
||||
return []
|
||||
return [i for i in items if isinstance(i, dict)]
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# MCP 检查
|
||||
# ---------------------------------------------------------------------------
|
||||
def check_zero_length(ctx, window, *, tolerance, limit, log=print):
|
||||
"""find_zero_length(window) → 逐条零长度实体转 issue。"""
|
||||
try:
|
||||
resp = ctx.tools.call(
|
||||
"find_zero_length",
|
||||
{"window": window, "tolerance": tolerance, "limit": limit},
|
||||
)
|
||||
except (McpError, McpToolError) as exc:
|
||||
log(f" [确定性] find_zero_length 失败: {exc}")
|
||||
return []
|
||||
|
||||
out = []
|
||||
for item in _iter_items(result_json(resp, {})):
|
||||
handle = item.get("handle")
|
||||
if not handle:
|
||||
continue
|
||||
out.append(
|
||||
make_issue(
|
||||
"几何", "medium",
|
||||
f"零长度/退化实体（类型 {item.get('type')}，长度 {item.get('length')}）",
|
||||
handle=handle,
|
||||
)
|
||||
)
|
||||
return out
|
||||
|
||||
|
||||
def check_duplicate_entities(ctx, window, *, tolerance, group_limit, log=print):
|
||||
"""find_duplicate_entities(window) → 每个重复组一条 issue。
|
||||
|
||||
`limit` 的语义是「最大重复组数」（非条目数）。一组重复是一个问题，
|
||||
故只产出一条 issue，主 handle 取组内首个，全部 handle 放进 `handles`。
|
||||
"""
|
||||
try:
|
||||
resp = ctx.tools.call(
|
||||
"find_duplicate_entities",
|
||||
{"window": window, "tolerance": tolerance, "limit": group_limit},
|
||||
)
|
||||
except (McpError, McpToolError) as exc:
|
||||
log(f" [确定性] find_duplicate_entities 失败: {exc}")
|
||||
return []
|
||||
|
||||
env = result_json(resp, {})
|
||||
groups = env.get("groups") if isinstance(env, dict) else None
|
||||
out = []
|
||||
for group in groups or []:
|
||||
if not isinstance(group, dict):
|
||||
continue
|
||||
handles = [h for h in (group.get("handles") or []) if h]
|
||||
if not handles:
|
||||
continue
|
||||
out.append(
|
||||
make_issue(
|
||||
"几何", "low",
|
||||
f"重复/重叠实体组（类型 {group.get('type')}，共 {len(handles)} 个几何相同）",
|
||||
handle=handles[0],
|
||||
handles=handles,
|
||||
)
|
||||
)
|
||||
return out
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# 纯 Python 派生（零额外 MCP 往返）
|
||||
# ---------------------------------------------------------------------------
|
||||
def _empty_texts(evidence):
|
||||
out = []
|
||||
for item in _iter_items(evidence.get("texts")):
|
||||
content = item.get("content")
|
||||
if content is None or str(content).strip() == "":
|
||||
out.append(
|
||||
make_issue("文字", "medium", "存在空文字或仅含空格的文字",
|
||||
handle=item.get("handle"))
|
||||
)
|
||||
return out
|
||||
|
||||
|
||||
def _unclosed_polylines(evidence):
|
||||
out = []
|
||||
for item in _iter_items(evidence.get("polylines")):
|
||||
if item.get("vertex_count", 0) >= 3 and item.get("closed") is False:
|
||||
out.append(
|
||||
make_issue("几何", "low",
|
||||
"多段线顶点≥3但未闭合，可能是应当闭合的轮廓",
|
||||
handle=item.get("handle"))
|
||||
)
|
||||
return out
|
||||
|
||||
|
||||
def derive_from_evidence(evidence, *, check_unclosed=True):
|
||||
"""从已采集证据里做零成本派生检查。"""
|
||||
issues = _empty_texts(evidence)
|
||||
if check_unclosed:
|
||||
issues += _unclosed_polylines(evidence)
|
||||
return issues
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# 入口
|
||||
# ---------------------------------------------------------------------------
|
||||
def run_deterministic_checks(ctx, evidence, *, log=print):
|
||||
"""对单个图框跑全部确定性检查，返回 issue 列表。
|
||||
|
||||
任何单项 MCP 失败都只记录并跳过，不抛出（不拖垮该图框）。
|
||||
"""
|
||||
issues = derive_from_evidence(
|
||||
evidence, check_unclosed=config.CHECK_UNCLOSED_POLYLINES
|
||||
)
|
||||
window = evidence.get("window")
|
||||
if window:
|
||||
issues += check_zero_length(
|
||||
ctx, window,
|
||||
tolerance=config.ZERO_LENGTH_TOLERANCE,
|
||||
limit=config.FRAME_ENTITY_LIMIT,
|
||||
log=log,
|
||||
)
|
||||
issues += check_duplicate_entities(
|
||||
ctx, window,
|
||||
tolerance=config.DUP_TOLERANCE,
|
||||
group_limit=config.DUP_GROUP_LIMIT,
|
||||
log=log,
|
||||
)
|
||||
return issues
|
||||
@@ -47,6 +47,14 @@ def _read_env(name: str) -> str:
|
||||
return ""
|
||||
|
||||
|
||||
def _read_bool(name: str, default: bool = True) -> bool:
|
||||
"""读取布尔型环境变量；未设置或空串时返回 default。"""
|
||||
value = os.environ.get(name)
|
||||
if value is None or value.strip() == "":
|
||||
return default
|
||||
return value.strip().lower() in ("1", "true", "yes", "on")
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# CAD MCP 基座（TCP JSON-RPC）
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -87,6 +95,22 @@ REPORT_DIR = _resolve_path(os.environ.get("REPORT_DIR", "reports"))
|
||||
# 批注回写使用的图层
|
||||
ANNOTATE_LAYER = os.environ.get("ANNOTATE_LAYER", "AI_REVIEW")
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# 可信度三件套：确定性检查前置 / 结论结构化 / 证据交叉校验
|
||||
# ---------------------------------------------------------------------------
|
||||
# 是否在 LLM 审查前跑确定性检查（零长度、重复实体、空文字、未闭合多段线）
|
||||
DETERMINISTIC_CHECKS = _read_bool("DETERMINISTIC_CHECKS", True)
|
||||
# 是否校验 LLM 引用的 handle 确实出现在已采集证据中（不在则剥掉 handle）
|
||||
VALIDATE_HANDLES = _read_bool("VALIDATE_HANDLES", True)
|
||||
# 是否检查未闭合多段线（中心线/开放轮廓多时误报，可关闭）
|
||||
CHECK_UNCLOSED_POLYLINES = _read_bool("CHECK_UNCLOSED_POLYLINES", True)
|
||||
# find_zero_length 的长度阈值
|
||||
ZERO_LENGTH_TOLERANCE = float(os.environ.get("ZERO_LENGTH_TOLERANCE", "0.001"))
|
||||
# find_duplicate_entities 的几何量化容差
|
||||
DUP_TOLERANCE = float(os.environ.get("DUP_TOLERANCE", "0.001"))
|
||||
# find_duplicate_entities 的 limit（语义是「最大重复组数」，非条目数）
|
||||
DUP_GROUP_LIMIT = int(os.environ.get("DUP_GROUP_LIMIT", "50"))
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# 截图（视觉 token 成本控制）
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@@ -0,0 +1,207 @@
|
||||
"""结构化结论：解析 LLM 的 JSON 输出、交叉校验 handle、装配 findings。
|
||||
|
||||
设计要点：
|
||||
- `review_frame` 的结论是**受约束的 JSON**（`{summary, issues[]}`），不再是自由文本，
|
||||
因此不需要第二次 LLM 调用来「抽取」结构。
|
||||
- 解析失败时降级为 `summary=原文, issues=[]`：信息不丢，只是不进批注链路。
|
||||
- LLM 引用的 handle 若不在已采集证据中 → **保留问题、剥掉 handle**（verified=False），
|
||||
既不会丢发现，也绝不会批注到不存在的实体。
|
||||
"""
|
||||
|
||||
import json
|
||||
import re
|
||||
|
||||
# evidence 中带 handle 的数据源（items[].handle）
|
||||
_SOURCES = ("entities", "texts", "dimensions", "blocks", "polylines")
|
||||
_SEVERITIES = ("high", "medium", "low")
|
||||
_FENCE = re.compile(r"```(?:json)?\s*(.*?)```", re.S)
|
||||
_MISS = object() # 解析失败的哨兵（区别于合法的 JSON null）
|
||||
|
||||
|
||||
def _try_load(text):
|
||||
try:
|
||||
return json.loads(text)
|
||||
except (json.JSONDecodeError, TypeError):
|
||||
return _MISS
|
||||
|
||||
|
||||
def _iter_items(envelope):
|
||||
"""健壮迭代数据信封的 items。
|
||||
|
||||
`result_json` 在解析失败时会返回**原始字符串**，因此必须做 dict/list 守卫。
|
||||
"""
|
||||
if not isinstance(envelope, dict):
|
||||
return []
|
||||
items = envelope.get("items")
|
||||
if not isinstance(items, list):
|
||||
return []
|
||||
return [i for i in items if isinstance(i, dict)]
|
||||
|
||||
|
||||
def _outermost_json(text):
|
||||
"""抓文本中第一个 `{`/`[` 起、括号配平的整段 JSON（正确处理字符串内的括号）。"""
|
||||
start = None
|
||||
for i, ch in enumerate(text):
|
||||
if ch in "{[":
|
||||
start, open_c = i, ch
|
||||
break
|
||||
if start is None:
|
||||
return None
|
||||
close_c = "}" if open_c == "{" else "]"
|
||||
depth = 0
|
||||
in_str = False
|
||||
esc = False
|
||||
for i in range(start, len(text)):
|
||||
ch = text[i]
|
||||
if in_str:
|
||||
if esc:
|
||||
esc = False
|
||||
elif ch == "\\":
|
||||
esc = True
|
||||
elif ch == '"':
|
||||
in_str = False
|
||||
continue
|
||||
if ch == '"':
|
||||
in_str = True
|
||||
elif ch == open_c:
|
||||
depth += 1
|
||||
elif ch == close_c:
|
||||
depth -= 1
|
||||
if depth == 0:
|
||||
cand = text[start : i + 1]
|
||||
return cand if _try_load(cand) is not _MISS else None
|
||||
return None
|
||||
|
||||
|
||||
def extract_json_block(text):
|
||||
"""从可能含围栏/前后缀的文本中抽出可解析的 JSON 字符串；抽不到返回 None。"""
|
||||
t = (text or "").strip()
|
||||
if not t:
|
||||
return None
|
||||
if _try_load(t) is not _MISS: # 整体就是 JSON
|
||||
return t
|
||||
m = _FENCE.search(t)
|
||||
if m:
|
||||
inner = m.group(1).strip()
|
||||
if _try_load(inner) is not _MISS:
|
||||
return inner
|
||||
t = inner
|
||||
return _outermost_json(t)
|
||||
|
||||
|
||||
def parse_conclusion(text, *, log=print):
|
||||
"""把 LLM 结论解析为 {"summary": str, "issues": [dict], "raw": str}。
|
||||
|
||||
支持：`{summary, issues}` 对象、裸 issues 数组、围栏包裹、前后夹带解释文字。
|
||||
解析不到结构化内容时降级为 summary=原文、issues=[]。
|
||||
"""
|
||||
block = extract_json_block(text)
|
||||
if block is not None:
|
||||
data = json.loads(block)
|
||||
if isinstance(data, dict):
|
||||
raw_issues = data.get("issues")
|
||||
issues = (
|
||||
[i for i in raw_issues if isinstance(i, dict)]
|
||||
if isinstance(raw_issues, list)
|
||||
else []
|
||||
)
|
||||
summary = data.get("summary")
|
||||
return {
|
||||
"summary": str(summary).strip() if summary is not None else "",
|
||||
"issues": issues,
|
||||
"raw": text,
|
||||
}
|
||||
if isinstance(data, list):
|
||||
return {
|
||||
"summary": "",
|
||||
"issues": [i for i in data if isinstance(i, dict)],
|
||||
"raw": text,
|
||||
}
|
||||
log("[结论解析] 非结构化输出，降级为纯文本 summary")
|
||||
return {"summary": (text or "").strip(), "issues": [], "raw": text}
|
||||
|
||||
|
||||
def collect_known_handles(evidence, extra_handles=None):
|
||||
"""汇总证据里出现过的全部 handle（统一大写），外加 extra_handles。"""
|
||||
known = set()
|
||||
for key in _SOURCES:
|
||||
for item in _iter_items((evidence or {}).get(key)):
|
||||
handle = item.get("handle")
|
||||
if handle:
|
||||
known.add(str(handle).upper())
|
||||
for handle in extra_handles or ():
|
||||
if handle:
|
||||
known.add(str(handle).upper())
|
||||
return known
|
||||
|
||||
|
||||
def normalize_issue(issue, *, frame_index, source, known_handles, validate_handles):
|
||||
"""补 frame/source/verified 并做 handle 交叉校验，返回统一 issue 结构。"""
|
||||
issue = issue if isinstance(issue, dict) else {}
|
||||
handle = issue.get("handle")
|
||||
handle = str(handle) if handle else None
|
||||
verified = True
|
||||
# 确定性问题的 handle 来自工具/数据本身，恒可信；只校验 LLM 的引用
|
||||
if source != "deterministic" and handle and validate_handles:
|
||||
if handle.upper() not in known_handles:
|
||||
verified, handle = False, None
|
||||
|
||||
severity = issue.get("severity")
|
||||
if severity not in _SEVERITIES:
|
||||
severity = "low"
|
||||
|
||||
out = {
|
||||
"frame": frame_index,
|
||||
"category": str(issue.get("category") or "图面整体"),
|
||||
"severity": severity,
|
||||
"message": str(issue.get("message") or "").strip(),
|
||||
"handle": handle,
|
||||
"source": source,
|
||||
"verified": verified,
|
||||
}
|
||||
handles = issue.get("handles")
|
||||
if isinstance(handles, list) and handles:
|
||||
out["handles"] = [str(h) for h in handles if h]
|
||||
return out
|
||||
|
||||
|
||||
def build_finding(evidence, conclusion, checks_issues=None, *,
|
||||
validate_handles=True, log=print):
|
||||
"""把确定性检查与 LLM 结论合并、校验后装配成一个 findings 元素。"""
|
||||
evidence = evidence or {}
|
||||
index = evidence.get("index")
|
||||
checks = checks_issues or []
|
||||
known = collect_known_handles(
|
||||
evidence, extra_handles=[i.get("handle") for i in checks]
|
||||
)
|
||||
|
||||
det = [
|
||||
normalize_issue(i, frame_index=index, source="deterministic",
|
||||
known_handles=known, validate_handles=validate_handles)
|
||||
for i in checks
|
||||
]
|
||||
llm = [
|
||||
normalize_issue(i, frame_index=index, source="llm",
|
||||
known_handles=known, validate_handles=validate_handles)
|
||||
for i in (conclusion or {}).get("issues", [])
|
||||
]
|
||||
issues = det + llm
|
||||
return {
|
||||
"frame": index,
|
||||
"sheet": (evidence.get("frame") or {}).get("sheet_size"),
|
||||
"summary": (conclusion or {}).get("summary", ""),
|
||||
"issues": issues,
|
||||
"counts": {
|
||||
"deterministic": len(det),
|
||||
"llm": len(llm),
|
||||
"unverified": sum(1 for i in issues if not i["verified"]),
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def flatten_issues(findings):
|
||||
"""拍平所有图框的 issues，供 annotator / save_report 使用。"""
|
||||
out = []
|
||||
for finding in findings or []:
|
||||
out.extend(finding.get("issues") or [])
|
||||
return out
|
||||
Reference in new issue
Block a user