Finalize simplified release interface for scripts/extract_vlac2_release_frames.py

scripts/extract_vlac2_release_frames.py

@@ -20,11 +20,9 @@ from vlac2_release_common import (
     discover_benchmark_jsons,
     dump_json,
     ensure_generated_marker,
-    ensure_release_tree,
     infer_main_path_from_row,
     load_json,
     normalize_main_path,
-    resolve_benchmark_root,
 )
 
 try:
@@ -40,9 +38,7 @@ except ImportError:
 
 @dataclass(frozen=True)
 class EpisodeSpec:
-    group_key: str
     main_path: Path
-    benchmark_sources: tuple[str, ...]
 
 
 def parse_args() -> argparse.Namespace:
@@ -50,34 +46,10 @@ def parse_args() -> argparse.Namespace:
         description="Extract the portable VLAC2 release benchmark episodes into the release-local JPG tree."
     )
     parser.add_argument(
-        "--release-root",
+        "--data-root",
         type=Path,
         required=True,
-        help="Release root containing benchmark_splits/, data/, and scripts/.",
-    )
-    parser.add_argument(
-        "--raw-root",
-        type=Path,
-        default=None,
-        help="Override raw video root. Defaults to <release-root>/data.",
-    )
-    parser.add_argument(
-        "--output-root",
-        type=Path,
-        default=None,
-        help="Override extracted image root. Defaults to <release-root>/_extracted_frames.",
-    )
-    parser.add_argument(
-        "--benchmark-json",
-        action="append",
-        default=None,
-        help="Optional specific benchmark JSON(s). Defaults to discovering benchmark_splits/**/*.json inside the release root.",
-    )
-    parser.add_argument(
-        "--view-mode",
-        choices=["all-available", "main-only"],
-        default="all-available",
-        help="Extract only the benchmark main view, or all sibling observation.images.* views for the referenced episode.",
+        help="Directory containing the extracted raw benchmark videos.",
     )
     parser.add_argument("--jobs", type=int, default=max(1, (os.cpu_count() or 8) // 2))
     parser.add_argument(
@@ -88,6 +60,10 @@ def parse_args() -> argparse.Namespace:
     return parser.parse_args()
 
 
+def bundled_release_root() -> Path:
+    return SCRIPT_DIR.parent.resolve()
+
+
 def require_decoder() -> None:
     if cv2 is None and imageio is None:
         raise SystemExit(
@@ -95,10 +71,7 @@ def require_decoder() -> None:
         )
 
 
-def benchmark_files_from_args(release_root: Path, raw_paths: list[str] | None) -> list[Path]:
-    if raw_paths:
-        return [Path(path).resolve() for path in raw_paths]
-    benchmark_root = resolve_benchmark_root(release_root)
+def benchmark_files_from_root(benchmark_root: Path) -> list[Path]:
     files = discover_benchmark_jsons(benchmark_root)
     if not files:
         raise SystemExit(f"No benchmark json found under {benchmark_root}")
@@ -139,8 +112,8 @@ def collect_episode_specs(benchmark_paths: list[Path]) -> tuple[list[EpisodeSpec
                 grouped[key][1].add(str(benchmark_path))
 
     specs = [
-        EpisodeSpec(group_key=key, main_path=main_path, benchmark_sources=tuple(sorted(sources)))
-        for key, (main_path, sources) in sorted(grouped.items())
+        EpisodeSpec(main_path=main_path)
+        for _group_key, (main_path, _sources) in sorted(grouped.items())
     ]
     stats["episodes_unique"] = len(specs)
     return specs, stats
@@ -164,25 +137,11 @@ def resolve_main_video(raw_root: Path, main_path: Path) -> Path:
     return preferred
 
 
-def discover_view_videos(raw_root: Path, main_path: Path, view_mode: str) -> list[Path]:
+def discover_view_videos(raw_root: Path, main_path: Path) -> list[Path]:
     main_video = resolve_main_video(raw_root, main_path)
     if not main_video.exists():
         raise FileNotFoundError(f"Missing raw video: {main_video}")
-    if view_mode == "main-only":
-        return [main_video]
-
-    chunk_dir = main_video.parent.parent
-    episode_file = main_video.name
-    discovered: list[Path] = []
-    for child in sorted(chunk_dir.iterdir()):
-        if not child.is_dir() or not child.name.startswith("observation.images."):
-            continue
-        candidate = child / episode_file
-        if candidate.exists():
-            discovered.append(candidate)
-    if main_video not in discovered:
-        discovered.insert(0, main_video)
-    return discovered
+    return [main_video]
 
 
 def manifest_path_for(output_dir: Path) -> Path:
@@ -319,19 +278,21 @@ def main() -> None:
     args = parse_args()
     require_decoder()
 
-    paths = ensure_release_tree(args.release_root)
-    release_root = paths["release_root"]
-    raw_root = args.raw_root.resolve() if args.raw_root else paths["raw_root"]
-    output_root = args.output_root.resolve() if args.output_root else paths["portable_image_root"]
+    release_root = bundled_release_root()
+    benchmark_root = (release_root / "benchmark_splits").resolve()
+    if not benchmark_root.exists():
+        raise SystemExit(f"Missing benchmark_splits under {release_root}")
+    data_root = args.data_root.resolve()
+    output_root = (release_root / "_extracted_frames").resolve()
     ensure_generated_marker(output_root)
-    benchmark_paths = benchmark_files_from_args(release_root, args.benchmark_json)
+    benchmark_paths = benchmark_files_from_root(benchmark_root)
 
     specs, stats = collect_episode_specs(benchmark_paths)
     jobs: list[tuple[Path, Path]] = []
     missing_raw_episodes: list[dict[str, str]] = []
     for spec in specs:
         try:
-            view_videos = discover_view_videos(raw_root, spec.main_path, args.view_mode)
+            view_videos = discover_view_videos(data_root, spec.main_path)
         except FileNotFoundError as exc:
             missing_raw_episodes.append(
                 {
@@ -341,7 +302,7 @@ def main() -> None:
             )
             continue
         for video_path in view_videos:
-            jobs.append((video_path, output_dir_from_video(raw_root, output_root, video_path)))
+            jobs.append((video_path, output_dir_from_video(data_root, output_root, video_path)))
 
     results: list[dict[str, Any]] = []
     with ThreadPoolExecutor(max_workers=max(1, args.jobs)) as executor:
@@ -366,9 +327,9 @@ def main() -> None:
     summary = {
         **stats,
         "release_root": str(release_root),
-        "raw_root": str(raw_root),
+        "benchmark_root": str(benchmark_root),
+        "data_root": str(data_root),
         "output_root": str(output_root),
-        "view_mode": args.view_mode,
         "benchmark_files": [str(path) for path in benchmark_paths],
         "jobs_total": len(jobs),
         "jobs_extracted": sum(1 for row in results if row["status"] == "extracted"),
@@ -377,7 +338,7 @@ def main() -> None:
         "missing_raw_episodes": missing_raw_episodes,
         "results": results,
     }
-    summary_path = release_root / "frame_extraction_summary.json"
+    summary_path = output_root / "frame_extraction_summary.json"
     dump_json(summary_path, summary)
     print(f"[frame-extraction] {summary_path}")