diff --git a/AGENTS.md b/AGENTS.md index 595e6ee..273db6d 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -110,6 +110,22 @@ When changing the primary compare page: - redeploy the HTML to `/mnt/sda1/www/newpec/navsea-compare-karatsu-20nm.html` - if the visual change depends on style updates, redeploy the corresponding style JSON too +### 6. Prefer Unified Strict Audit For 20nm Visual Gate + +For the current 20nm visual baseline, prefer: + +- [`navsea_strict_audit.py`](/root/sourceserver/pbf/navsea_strict_audit.py) + +This script combines: + +- browser-rendered screenshot diff from the fixed compare page +- backend render audit summary from the current 20nm audit JSON + +Use it when you need one report that explains both: + +- what the user really sees +- what the backend render audit currently says + ## Resume Checklist At the start of a session: diff --git a/STEP_RECORD.md b/STEP_RECORD.md index 587ea34..489cd4e 100644 --- a/STEP_RECORD.md +++ b/STEP_RECORD.md @@ -329,6 +329,45 @@ Remote: `ssh://git@nas:2222/tei/pbf.git` - 当前 20nm 后台 render audit 更像“样式表达式审计” - 不是浏览器级最终出图审计 +### Strict Audit Unification + +本轮已新增统一审计脚本： + +- [`navsea_strict_audit.py`](/root/sourceserver/pbf/navsea_strict_audit.py) + +它会把两部分合并到同一份报告里： + +- 浏览器真实出图截图差异 +- 当前 20nm backend render audit 摘要 + +当前产物： + +- [strict_audit_summary.md](/root/sourceserver/pbf/report/strict_audit/strict_audit_summary.md) +- [strict_audit_summary.json](/root/sourceserver/pbf/report/strict_audit/strict_audit_summary.json) +- [compare_full.png](/root/sourceserver/pbf/report/strict_audit/compare_full.png) +- [compare_left.png](/root/sourceserver/pbf/report/strict_audit/compare_left.png) +- [compare_right.png](/root/sourceserver/pbf/report/strict_audit/compare_right.png) +- [compare_diff.png](/root/sourceserver/pbf/report/strict_audit/compare_diff.png) + +当前 `r7` strict audit 结论： + +- compare version: + - `20nm-r7-20260331-2044` +- visual changed ratio: + - `0.887847` +- changed pixels: + - `411961 / 464000` +- backend render audit 总体仍是： + - `extra_in_engineering = 258317` + - `missing_in_engineering = 258317` + +这份统一审计的意义是： + +- 以后不再把“视觉变好了”与“后台数字没变”当成互相冲突 +- 可以一眼看出： + - 浏览器真实出图变没变 + - 后台 render audit 有没有跟上 + 线上已同步： - `/mnt/sda1/www/newpec/domain/style.navsea-delivery-karatsu-10nm.json` diff --git a/navsea_strict_audit.py b/navsea_strict_audit.py new file mode 100644 index 0000000..8c63abf --- /dev/null +++ b/navsea_strict_audit.py @@ -0,0 +1,281 @@ +#!/usr/bin/env python3 +from __future__ import annotations + +import argparse +import json +import re +import subprocess +import tempfile +from dataclasses import dataclass +from pathlib import Path +from typing import Any + +import requests +from PIL import Image, ImageChops, ImageStat + + +DEFAULT_COMPARE_URL = "http://192.168.200.184/newpec/navsea-compare-karatsu-20nm.html" +DEFAULT_BACKEND_AUDIT_JSON = Path( + "/root/sourceserver/pbf/NavSea_Original_vs_Delivery_Render_Audit_Karatsu_20nm_2026-03-31.r7.json" +) +DEFAULT_OUTPUT_DIR = Path("/root/sourceserver/pbf/report/strict_audit") + + +@dataclass +class CropBox: + left: int + top: int + right: int + bottom: int + + def as_tuple(self) -> tuple[int, int, int, int]: + return (self.left, self.top, self.right, self.bottom) + + +def parse_args() -> argparse.Namespace: + parser = argparse.ArgumentParser( + description="Run strict audit by combining browser-rendered visual diff with backend render audit summary." + ) + parser.add_argument("--compare-url", default=DEFAULT_COMPARE_URL) + parser.add_argument("--backend-audit-json", type=Path, default=DEFAULT_BACKEND_AUDIT_JSON) + parser.add_argument("--output-dir", type=Path, default=DEFAULT_OUTPUT_DIR) + parser.add_argument("--width", type=int, default=1600) + parser.add_argument("--height", type=int, default=900) + parser.add_argument("--toolbar-height", type=int, default=150) + parser.add_argument("--bottom-trim", type=int, default=170) + parser.add_argument("--timeout-sec", type=int, default=90) + return parser.parse_args() + + +def fetch_compare_version(compare_url: str) -> str | None: + try: + text = requests.get(compare_url, timeout=20).text + except Exception: + return None + match = re.search(r'const\s+COMPARE_VERSION\s*=\s*"([^"]+)"', text) + return match.group(1) if match else None + + +def run_browser_screenshot(compare_url: str, output_png: Path, width: int, height: int, timeout_sec: int) -> None: + cmd = [ + "timeout", + f"{timeout_sec}s", + "google-chrome", + "--headless=new", + "--disable-gpu", + "--enable-unsafe-swiftshader", + "--no-sandbox", + "--virtual-time-budget=20000", + f"--window-size={width},{height}", + f"--screenshot={output_png}", + compare_url, + ] + subprocess.run(cmd, check=True, capture_output=True, text=True) + + +def build_crop_boxes(image_width: int, image_height: int, toolbar_height: int, bottom_trim: int) -> tuple[CropBox, CropBox]: + usable_top = toolbar_height + usable_bottom = max(usable_top + 1, image_height - bottom_trim) + mid_x = image_width // 2 + left_box = CropBox(0, usable_top, mid_x, usable_bottom) + right_box = CropBox(mid_x, usable_top, image_width, usable_bottom) + return left_box, right_box + + +def compute_visual_metrics(left_img: Image.Image, right_img: Image.Image) -> dict[str, Any]: + if left_img.size != right_img.size: + raise ValueError(f"image sizes differ: {left_img.size} vs {right_img.size}") + + diff = ImageChops.difference(left_img, right_img) + diff_rgb = diff.convert("RGB") + diff_gray = diff.convert("L") + stat = ImageStat.Stat(diff_rgb) + mean_abs = [round(v, 4) for v in stat.mean] + rms = [round(v, 4) for v in stat.rms] + + bbox = diff_gray.getbbox() + nonzero_pixels = 0 + if bbox: + mask = diff_gray.point(lambda value: 255 if value else 0) + histogram = mask.histogram() + nonzero_pixels = histogram[255] if len(histogram) > 255 else 0 + + total_pixels = left_img.size[0] * left_img.size[1] + changed_ratio = round(nonzero_pixels / total_pixels, 6) if total_pixels else 0.0 + + return { + "image_width": left_img.size[0], + "image_height": left_img.size[1], + "total_pixels": total_pixels, + "changed_pixels": nonzero_pixels, + "changed_ratio": changed_ratio, + "mean_abs_rgb": mean_abs, + "rms_rgb": rms, + "diff_bbox": list(bbox) if bbox else None, + "diff_image": diff, + } + + +def save_visual_outputs(full_png: Path, left_png: Path, right_png: Path, diff_png: Path, toolbar_height: int, bottom_trim: int) -> dict[str, Any]: + image = Image.open(full_png).convert("RGBA") + left_box, right_box = build_crop_boxes(image.width, image.height, toolbar_height, bottom_trim) + left = image.crop(left_box.as_tuple()) + right = image.crop(right_box.as_tuple()) + left.save(left_png) + right.save(right_png) + + metrics = compute_visual_metrics(left, right) + diff_img = metrics.pop("diff_image") + diff_boost = diff_img.convert("RGB").point(lambda value: min(255, value * 4)) + diff_boost.save(diff_png) + + metrics["full_crop_left"] = list(left_box.as_tuple()) + metrics["full_crop_right"] = list(right_box.as_tuple()) + return metrics + + +def load_backend_summary(report_json_path: Path) -> dict[str, Any]: + data = json.loads(report_json_path.read_text()) + + def top_list(items: list[dict[str, Any]], limit: int = 10) -> list[dict[str, Any]]: + return sorted(items, key=lambda item: item["count"], reverse=True)[:limit] + + return { + "original_feature_instances": data["original_feature_instances"], + "engineering_feature_instances": data["engineering_feature_instances"], + "result_count": data["result_count"], + "status_counts": data["status_counts"], + "top_annotation_issues": top_list(data.get("annotation_issue_counts", [])), + "top_style_semantic_issues": top_list(data.get("style_semantic_issue_counts", [])), + "top_source_layer_issues": top_list(data.get("source_layer_issue_counts", [])), + } + + +def write_reports( + output_dir: Path, + compare_url: str, + compare_version: str | None, + backend_audit_json: Path, + visual_metrics: dict[str, Any], + backend_summary: dict[str, Any], +) -> tuple[Path, Path]: + report_json = output_dir / "strict_audit_summary.json" + report_md = output_dir / "strict_audit_summary.md" + + summary = { + "compare_url": compare_url, + "compare_version": compare_version, + "backend_audit_json": str(backend_audit_json), + "visual_metrics": visual_metrics, + "backend_summary": backend_summary, + "notes": [ + "Visual metrics are browser-rendered screenshot diff metrics from the fixed compare page.", + "Backend metrics are current render-audit summary metrics and may remain blind to sprite-load failures.", + ], + } + report_json.write_text(json.dumps(summary, ensure_ascii=False, indent=2), encoding="utf-8") + + lines = [ + "# NavSea Strict Audit Summary", + "", + "## Scope", + "", + f"- Compare page: `{compare_url}`", + f"- Compare version: `{compare_version or 'unknown'}`", + f"- Backend render audit: `{backend_audit_json}`", + "", + "## Visual Audit", + "", + f"- changed pixels: `{visual_metrics['changed_pixels']}` / `{visual_metrics['total_pixels']}`", + f"- changed ratio: `{visual_metrics['changed_ratio']}`", + f"- mean abs rgb: `{visual_metrics['mean_abs_rgb']}`", + f"- rms rgb: `{visual_metrics['rms_rgb']}`", + f"- left crop: `{visual_metrics['full_crop_left']}`", + f"- right crop: `{visual_metrics['full_crop_right']}`", + "", + "Artifacts:", + "", + f"- `{output_dir / 'compare_full.png'}`", + f"- `{output_dir / 'compare_left.png'}`", + f"- `{output_dir / 'compare_right.png'}`", + f"- `{output_dir / 'compare_diff.png'}`", + "", + "## Backend Render Audit", + "", + f"- original feature instances: `{backend_summary['original_feature_instances']}`", + f"- delivery feature instances: `{backend_summary['engineering_feature_instances']}`", + f"- result count: `{backend_summary['result_count']}`", + "", + "Status counts:", + "", + ] + for key, value in backend_summary["status_counts"].items(): + lines.append(f"- `{key}`: `{value}`") + + lines.extend(["", "Top annotation issues:", ""]) + for item in backend_summary["top_annotation_issues"][:10]: + lines.append(f"- `{item['issue']}` | `{item['source_layer']}` | `{item['count']}`") + + lines.extend(["", "Top style semantic issues:", ""]) + for item in backend_summary["top_style_semantic_issues"][:10]: + lines.append(f"- `{item['issue']}` | `{item['source_layer']}` | `{item['count']}`") + + lines.extend( + [ + "", + "## Interpretation", + "", + "- This report intentionally puts browser-rendered visual output and backend render-audit summary in one place.", + "- If the browser screenshot improves but backend counts do not, the current backend audit is likely blind to a browser/runtime issue such as sprite resolution.", + ] + ) + report_md.write_text("\n".join(lines) + "\n", encoding="utf-8") + return report_md, report_json + + +def main() -> None: + args = parse_args() + args.output_dir.mkdir(parents=True, exist_ok=True) + + compare_version = fetch_compare_version(args.compare_url) + full_png = args.output_dir / "compare_full.png" + left_png = args.output_dir / "compare_left.png" + right_png = args.output_dir / "compare_right.png" + diff_png = args.output_dir / "compare_diff.png" + + run_browser_screenshot(args.compare_url, full_png, args.width, args.height, args.timeout_sec) + visual_metrics = save_visual_outputs( + full_png=full_png, + left_png=left_png, + right_png=right_png, + diff_png=diff_png, + toolbar_height=args.toolbar_height, + bottom_trim=args.bottom_trim, + ) + backend_summary = load_backend_summary(args.backend_audit_json) + report_md, report_json = write_reports( + output_dir=args.output_dir, + compare_url=args.compare_url, + compare_version=compare_version, + backend_audit_json=args.backend_audit_json, + visual_metrics=visual_metrics, + backend_summary=backend_summary, + ) + + print( + json.dumps( + { + "compare_version": compare_version, + "report_md": str(report_md), + "report_json": str(report_json), + "changed_ratio": visual_metrics["changed_ratio"], + "changed_pixels": visual_metrics["changed_pixels"], + }, + ensure_ascii=False, + indent=2, + ) + ) + + +if __name__ == "__main__": + main() diff --git a/report/strict_audit/compare_diff.png b/report/strict_audit/compare_diff.png new file mode 100644 index 0000000..1ae6a86 Binary files /dev/null and b/report/strict_audit/compare_diff.png differ diff --git a/report/strict_audit/compare_full.png b/report/strict_audit/compare_full.png new file mode 100644 index 0000000..a78b744 Binary files /dev/null and b/report/strict_audit/compare_full.png differ diff --git a/report/strict_audit/compare_left.png b/report/strict_audit/compare_left.png new file mode 100644 index 0000000..7a87a68 Binary files /dev/null and b/report/strict_audit/compare_left.png differ diff --git a/report/strict_audit/compare_right.png b/report/strict_audit/compare_right.png new file mode 100644 index 0000000..8ea0c81 Binary files /dev/null and b/report/strict_audit/compare_right.png differ diff --git a/report/strict_audit/strict_audit_summary.json b/report/strict_audit/strict_audit_summary.json new file mode 100644 index 0000000..4ac5b69 --- /dev/null +++ b/report/strict_audit/strict_audit_summary.json @@ -0,0 +1,184 @@ +{ + "compare_url": "http://192.168.200.184/newpec/navsea-compare-karatsu-20nm.html", + "compare_version": "20nm-r7-20260331-2044", + "backend_audit_json": "/root/sourceserver/pbf/NavSea_Original_vs_Delivery_Render_Audit_Karatsu_20nm_2026-03-31.r7.json", + "visual_metrics": { + "image_width": 800, + "image_height": 580, + "total_pixels": 464000, + "changed_pixels": 411961, + "changed_ratio": 0.887847, + "mean_abs_rgb": [ + 30.3034, + 31.6079, + 61.2516 + ], + "rms_rgb": [ + 45.7879, + 45.5806, + 75.4396 + ], + "diff_bbox": [ + 0, + 0, + 800, + 580 + ], + "full_crop_left": [ + 0, + 150, + 800, + 730 + ], + "full_crop_right": [ + 800, + 150, + 1600, + 730 + ] + }, + "backend_summary": { + "original_feature_instances": 258317, + "engineering_feature_instances": 258317, + "result_count": 516634, + "status_counts": { + "extra_in_engineering": 258317, + "missing_in_engineering": 258317 + }, + "top_annotation_issues": [ + { + "issue": "extra_text_in_engineering", + "source_layer": "bathymetry_line", + "count": 24168 + }, + { + "issue": "text_missing_in_engineering", + "source_layer": "L海底地形", + "count": 24168 + }, + { + "issue": "extra_text_in_engineering", + "source_layer": "depth_contour", + "count": 11929 + }, + { + "issue": "text_missing_in_engineering", + "source_layer": "L等深線", + "count": 11929 + }, + { + "issue": "extra_text_in_engineering", + "source_layer": "seabed_text_point", + "count": 4499 + }, + { + "issue": "text_missing_in_engineering", + "source_layer": "p底質", + "count": 4499 + }, + { + "issue": "extra_text_in_engineering", + "source_layer": "navigation_marks", + "count": 1516 + }, + { + "issue": "text_missing_in_engineering", + "source_layer": "p航路標識群", + "count": 1516 + }, + { + "issue": "text_missing_in_engineering", + "source_layer": "p地名", + "count": 1444 + }, + { + "issue": "extra_text_in_engineering", + "source_layer": "place_label_sea", + "count": 1444 + } + ], + "top_style_semantic_issues": [ + { + "issue": "depth_numeric_missing", + "source_layer": "L海底地形", + "count": 24168 + }, + { + "issue": "depth_numeric_missing", + "source_layer": "L等深線", + "count": 11929 + }, + { + "issue": "safety_icon_missing", + "source_layer": "p航路標識群", + "count": 1885 + }, + { + "issue": "depth_numeric_missing", + "source_layer": "L概略等深線", + "count": 350 + }, + { + "issue": "clearance_numeric_missing", + "source_layer": "p高さ制限", + "count": 33 + } + ], + "top_source_layer_issues": [ + { + "status": "extra_in_engineering", + "source_layer": "baseline_outline", + "count": 87709 + }, + { + "status": "missing_in_engineering", + "source_layer": "P基本線ククリ", + "count": 87709 + }, + { + "status": "extra_in_engineering", + "source_layer": "baseline_area", + "count": 50421 + }, + { + "status": "missing_in_engineering", + "source_layer": "P基本線", + "count": 50421 + }, + { + "status": "extra_in_engineering", + "source_layer": "depth_contour", + "count": 36460 + }, + { + "status": "missing_in_engineering", + "source_layer": "L等深線", + "count": 36460 + }, + { + "status": "extra_in_engineering", + "source_layer": "bathymetry_line", + "count": 35940 + }, + { + "status": "missing_in_engineering", + "source_layer": "L海底地形", + "count": 35940 + }, + { + "status": "extra_in_engineering", + "source_layer": "onshore_structure_line", + "count": 10544 + }, + { + "status": "missing_in_engineering", + "source_layer": "L陸上構造物陸", + "count": 10544 + } + ] + }, + "notes": [ + "Visual metrics are browser-rendered screenshot diff metrics from the fixed compare page.", + "Backend metrics are current render-audit summary metrics and may remain blind to sprite-load failures." + ] +} \ No newline at end of file diff --git a/report/strict_audit/strict_audit_summary.md b/report/strict_audit/strict_audit_summary.md new file mode 100644 index 0000000..5127af2 --- /dev/null +++ b/report/strict_audit/strict_audit_summary.md @@ -0,0 +1,60 @@ +# NavSea Strict Audit Summary + +## Scope + +- Compare page: `http://192.168.200.184/newpec/navsea-compare-karatsu-20nm.html` +- Compare version: `20nm-r7-20260331-2044` +- Backend render audit: `/root/sourceserver/pbf/NavSea_Original_vs_Delivery_Render_Audit_Karatsu_20nm_2026-03-31.r7.json` + +## Visual Audit + +- changed pixels: `411961` / `464000` +- changed ratio: `0.887847` +- mean abs rgb: `[30.3034, 31.6079, 61.2516]` +- rms rgb: `[45.7879, 45.5806, 75.4396]` +- left crop: `[0, 150, 800, 730]` +- right crop: `[800, 150, 1600, 730]` + +Artifacts: + +- `/root/sourceserver/pbf/report/strict_audit/compare_full.png` +- `/root/sourceserver/pbf/report/strict_audit/compare_left.png` +- `/root/sourceserver/pbf/report/strict_audit/compare_right.png` +- `/root/sourceserver/pbf/report/strict_audit/compare_diff.png` + +## Backend Render Audit + +- original feature instances: `258317` +- delivery feature instances: `258317` +- result count: `516634` + +Status counts: + +- `extra_in_engineering`: `258317` +- `missing_in_engineering`: `258317` + +Top annotation issues: + +- `extra_text_in_engineering` | `bathymetry_line` | `24168` +- `text_missing_in_engineering` | `L海底地形` | `24168` +- `extra_text_in_engineering` | `depth_contour` | `11929` +- `text_missing_in_engineering` | `L等深線` | `11929` +- `extra_text_in_engineering` | `seabed_text_point` | `4499` +- `text_missing_in_engineering` | `p底質` | `4499` +- `extra_text_in_engineering` | `navigation_marks` | `1516` +- `text_missing_in_engineering` | `p航路標識群` | `1516` +- `text_missing_in_engineering` | `p地名` | `1444` +- `extra_text_in_engineering` | `place_label_sea` | `1444` + +Top style semantic issues: + +- `depth_numeric_missing` | `L海底地形` | `24168` +- `depth_numeric_missing` | `L等深線` | `11929` +- `safety_icon_missing` | `p航路標識群` | `1885` +- `depth_numeric_missing` | `L概略等深線` | `350` +- `clearance_numeric_missing` | `p高さ制限` | `33` + +## Interpretation + +- This report intentionally puts browser-rendered visual output and backend render-audit summary in one place. +- If the browser screenshot improves but backend counts do not, the current backend audit is likely blind to a browser/runtime issue such as sprite resolution.