The 30-file tree moves under atlas as its third rung (D-243), ten verbs fronting it. Each verb restates its module's options so `--help` describes something; tooling/test_planet_router.py hands every declared option to the module's own argparse and fails on drift, and now runs in make test-tooling. The 2026-09-02 half of this move had converted the top-level imports and the repo roots. Finishing it found what the half-move left: - Lazy in-function imports, and all of sol_data/, still named siblings bare. They resolved only through sys.path.insert hacks, so under reach the first globe render in generate, batch or sol-import would have raised ModuleNotFoundError. Qualified; the hacks are gone. - 247 print() calls and a stdout progress writer that fired once per 8 KB block. Report verbs (audit, quality) write through console.out, progress through console.event, and download progress is throttled to 10% steps so a job log is not tens of thousands of lines. - Every error exit raises ReachError with a fix. Two checks that could not fail: - batch --verify-determinism printed a warning and exited 0 on a mismatch. - import-provinces exited 0 with errors > 0. Both now raise. The 271-body bake is only safe to re-run because the first one holds. sol-import --body is action="append" in the module but the router took one value, so --body GJ0d --body GJ0e kept one. Now repeatable, and _flags repeats list options. test_conformance walked one level, so a nested group was reported as a verb missing @command and its ten verbs were never checked. It recurses now; proven by stripping @command from `planet quality` and watching it fail. Stray PNGs from the 2026-09-03 runaway router-test run are parked in .cache/t1288-stray-pngs/, not committed. Their reliefmaps differ from HEAD while the heightmap regenerated byte-identical — filed as T-1291. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
142 lines
4.6 KiB
Python
142 lines
4.6 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
Batch populate terrain_reference column in systems.db bodies table.
|
|
|
|
For each inhabited body with NULL terrain_reference:
|
|
1. Construct expected wiki heightmap path:
|
|
wiki/star-systems/{system_slug}/bodies/{body_id}/heightmap.png
|
|
where system_slug = system_id with spaces replaced by hyphens.
|
|
2. Verify the file exists.
|
|
3. Update terrain_reference to the relative path.
|
|
|
|
Bodies with missing heightmaps are logged to stdout for remediation.
|
|
This is the prerequisite for the atlas importers (import_heightmaps.py, #901).
|
|
|
|
Usage:
|
|
reach atlas planet terrain-reference
|
|
reach atlas planet terrain-reference --dry-run
|
|
reach atlas planet terrain-reference --db path/to/systems.db
|
|
|
|
Decisions: D-191 (atlas pipeline prerequisites)
|
|
"""
|
|
|
|
import argparse
|
|
import sqlite3
|
|
from pathlib import Path
|
|
|
|
from tooling.core import config, console
|
|
|
|
|
|
PLANET_DIR = Path(__file__).resolve().parent
|
|
REPO_ROOT = config.repo_root()
|
|
DB_PATH = REPO_ROOT / "server" / "data" / "systems.db"
|
|
WIKI_DIR = REPO_ROOT / "wiki" / "star-systems"
|
|
|
|
|
|
def system_slug(system_id: str) -> str:
|
|
"""Convert a system_id to its wiki directory slug.
|
|
|
|
'GJ 71' → 'GJ-71'
|
|
'GJ 244A' → 'GJ-244A'
|
|
'GJ 559B' → 'GJ-559B'
|
|
"""
|
|
return system_id.replace(" ", "-")
|
|
|
|
|
|
def expected_heightmap_path(system_id: str, body_id: str) -> Path:
|
|
"""Return the expected absolute heightmap path for a body."""
|
|
return WIKI_DIR / system_slug(system_id) / "bodies" / body_id / "heightmap.png"
|
|
|
|
|
|
def relative_terrain_reference(system_id: str, body_id: str) -> str:
|
|
"""Return the terrain_reference value to store in the DB.
|
|
|
|
Stored as a repo-root-relative path so it is portable across checkouts.
|
|
"""
|
|
return f"wiki/star-systems/{system_slug(system_id)}/bodies/{body_id}/heightmap.png"
|
|
|
|
|
|
def main(argv: list[str] | None = None):
|
|
parser = argparse.ArgumentParser(
|
|
description="Populate terrain_reference column in systems.db bodies table"
|
|
)
|
|
parser.add_argument("--db", default=str(DB_PATH), help="Path to systems.db")
|
|
parser.add_argument(
|
|
"--dry-run",
|
|
action="store_true",
|
|
help="Report without writing changes",
|
|
)
|
|
args = parser.parse_args(argv)
|
|
|
|
db_path = Path(args.db)
|
|
if not db_path.exists():
|
|
console.event(f"error: {db_path} not found")
|
|
raise SystemExit(1)
|
|
|
|
conn = sqlite3.connect(str(db_path))
|
|
conn.execute("PRAGMA foreign_keys=ON")
|
|
|
|
# Fetch all inhabited bodies with NULL terrain_reference.
|
|
rows = conn.execute("""
|
|
SELECT b.body_id, b.system_id
|
|
FROM bodies b
|
|
WHERE b.terrain_reference IS NULL
|
|
ORDER BY b.system_id, b.body_id
|
|
""").fetchall()
|
|
|
|
console.event(" terrain_reference population pass")
|
|
console.event(f" DB: {db_path}")
|
|
if args.dry_run:
|
|
console.event(" Mode: DRY RUN")
|
|
console.event(f" {len(rows)} bodies with NULL terrain_reference\n")
|
|
|
|
found = []
|
|
missing = []
|
|
|
|
for body_id, system_id in rows:
|
|
path = expected_heightmap_path(system_id, body_id)
|
|
if path.exists():
|
|
found.append((body_id, system_id))
|
|
else:
|
|
missing.append((body_id, system_id, str(path)))
|
|
|
|
# Report missing heightmaps before writing — helps flag gaps early.
|
|
if missing:
|
|
console.event(f" MISSING heightmaps ({len(missing)} bodies — no update for these):")
|
|
for body_id, system_id, path in missing:
|
|
console.event(f" {body_id} ({system_id}) → {path}")
|
|
|
|
if found:
|
|
console.event(f" Updating {len(found)} bodies with terrain_reference:")
|
|
for body_id, system_id in found:
|
|
ref = relative_terrain_reference(system_id, body_id)
|
|
console.event(f" {body_id} ({system_id}) → {ref}")
|
|
if not args.dry_run:
|
|
conn.execute(
|
|
"UPDATE bodies SET terrain_reference = ? WHERE body_id = ?",
|
|
(ref, body_id),
|
|
)
|
|
|
|
if not args.dry_run:
|
|
conn.commit()
|
|
console.event(f" Committed {len(found)} terrain_reference updates.")
|
|
else:
|
|
console.event(" Dry run — no changes written.")
|
|
|
|
conn.close()
|
|
|
|
# Summary
|
|
console.event(" Summary:")
|
|
console.event(f" Updated: {len(found)}")
|
|
console.event(f" Missing: {len(missing)}")
|
|
console.event(f" Total: {len(rows)}\n")
|
|
|
|
if missing:
|
|
console.event(f" Action required: generate heightmaps for {len(missing)} bodies "
|
|
f"before running the atlas importers (#901).")
|
|
console.event(" Use: make generate-terrain (or run generate.py per body)\n")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|