The procedural server cascade (Phase 4) and the frozen names-only pool supersede the Python atlas geometry generator and the LLM namer. Retire: - generate_atlas.py (geometry production — cities/roads/rivers placement) - gemma_naming.py, naming_core.py + tests (test_batch_naming, test_register_selection, qa_naming) and run-atlas-naming.sh (the LLM place-namer; its output is now the frozen pool) - apply_name_fixes.py (name-field patches), fix_fewshot_bleed.py / prune_atlas_features.py (geometry tools) - import_city_names.py (redundant with import_economics name-pool path) Pipeline updates: drop the generate_atlas step + atlas-generate / test-atlas-determinism targets from the Makefile; remove generate_atlas from the stamp registry (import_economics is the sole regen-db generator); drop run-atlas-determinism from tests/run-all; refresh stale references in schema_version, backfill_cultural_corridor, earth_blocklist (kept as reference data), populate_terrain_reference, and heightmap.rs. The Gemma prompting methodology is preserved in docs/gemma-naming-methodology.md (separate commit). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
193 lines
7.0 KiB
Python
193 lines
7.0 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
check-systems-db-stamp — verify that server/data/systems.db is up to date.
|
|
|
|
Reads the meta table from systems.db and checks that the stored SHA-1 of each
|
|
generator's source file(s) matches the current file content on disk.
|
|
|
|
Exit codes:
|
|
0 — DB is stamped and all generator SHAs match current sources
|
|
1 — DB is stale, has an unknown generator, or references a missing source file
|
|
2 — DB does not have a meta table (treat as unstamped — run make regen-db)
|
|
|
|
Usage (called by .config/hooks/pre-push):
|
|
tooling/check-systems-db-stamp
|
|
|
|
Usage (interactive):
|
|
tooling/check-systems-db-stamp --verbose
|
|
|
|
Decision refs: #855 (generator versioning), #857 (pre-push hook)
|
|
"""
|
|
|
|
import hashlib
|
|
import re
|
|
import sqlite3
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
# semver pattern: MAJOR.MINOR.PATCH (no pre-release or build metadata)
|
|
_SEMVER_RE = re.compile(r"^\d+\.\d+\.\d+$")
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parent.parent
|
|
|
|
DB_PATH = REPO_ROOT / "server" / "data" / "systems.db"
|
|
|
|
# Maps generator_name (as stored in meta.generator_name) to the source
|
|
# file(s) whose SHA is stamped. The SHA is computed as SHA-1 of the
|
|
# concatenated bytes of all files in sorted order.
|
|
#
|
|
# import_economics' source set includes the Rust generate_brands binary it now
|
|
# invokes as a subroutine (#136 review T2/H3). Keep this list in sync with
|
|
# IMPORT_ECONOMICS_SOURCES in tooling/economy-db/import_economics.py.
|
|
# The atlas geometry generator (generate_atlas) was retired in #951 (D-223).
|
|
# import_economics is now the sole regen-db generator that writes systems.db; it
|
|
# owns the atlas index (names-only pool + empty geometry tables). The surviving
|
|
# planet-gen importers (import_heightmaps, import_province_boundaries) are
|
|
# one-time build imports baked into the committed DB, not part of regen-db, so
|
|
# they are intentionally not stamped here.
|
|
GENERATOR_SOURCES: dict[str, list[Path]] = {
|
|
"import_economics": [
|
|
REPO_ROOT / "tooling" / "economy-db" / "import_economics.py",
|
|
REPO_ROOT / "server" / "src" / "bin" / "generate_brands" / "main.rs",
|
|
REPO_ROOT / "server" / "src" / "bin" / "generate_brands" / "names.rs",
|
|
REPO_ROOT / "tooling" / "generate-brands",
|
|
REPO_ROOT / "tooling" / "schema_version.py",
|
|
],
|
|
}
|
|
|
|
|
|
def file_sha1(*paths: Path) -> str:
|
|
"""SHA-1 of concatenated file contents (sorted paths).
|
|
|
|
Missing files raise FileNotFoundError rather than silently contributing
|
|
an empty-string hash (H2): a ghost SHA could mask real breakage when
|
|
stored and current SHAs converge on the empty-bytes digest.
|
|
"""
|
|
h = hashlib.sha1()
|
|
for p in sorted(paths):
|
|
if not p.exists():
|
|
raise FileNotFoundError(f"generator source not found: {p}")
|
|
h.update(p.read_bytes())
|
|
return h.hexdigest()
|
|
|
|
|
|
def check(verbose: bool = False) -> int:
|
|
"""Return exit code: 0 = fresh, 1 = stale, 2 = no meta table."""
|
|
if not DB_PATH.exists():
|
|
if verbose:
|
|
print(f"check-systems-db-stamp: {DB_PATH} not found — skipping check")
|
|
return 0
|
|
|
|
try:
|
|
conn = sqlite3.connect(str(DB_PATH))
|
|
rows = conn.execute(
|
|
"SELECT generator_name, schema_version, generator_sha FROM meta"
|
|
).fetchall()
|
|
conn.close()
|
|
except sqlite3.OperationalError:
|
|
# meta table does not exist
|
|
if verbose:
|
|
print("check-systems-db-stamp: no meta table — systems.db has not been stamped")
|
|
print(" Run: make regen-db")
|
|
return 2
|
|
|
|
if not rows:
|
|
if verbose:
|
|
print("check-systems-db-stamp: meta table is empty — systems.db has not been stamped")
|
|
print(" Run: make regen-db")
|
|
return 2
|
|
|
|
stale: list[str] = []
|
|
unknown: list[str] = []
|
|
bad_version: list[str] = []
|
|
seen_versions: dict[str, str] = {} # generator_name -> schema_version
|
|
for generator_name, schema_version, stored_sha in rows:
|
|
seen_versions[generator_name] = schema_version
|
|
# Validate schema_version is a semver string (#888).
|
|
# Old DBs may still carry a SHA-1 hex (40-char) — flag them as stale
|
|
# so the user knows to run make regen-db rather than getting a silent pass.
|
|
if not _SEMVER_RE.match(schema_version or ""):
|
|
bad_version.append(
|
|
f"{generator_name}: schema_version='{schema_version}' "
|
|
f"(expected semver like '1.0.0' — run make regen-db)"
|
|
)
|
|
|
|
sources = GENERATOR_SOURCES.get(generator_name)
|
|
if sources is None:
|
|
# Unknown generator — fail closed (T6). A future branch adding a
|
|
# new generator without registering it here must update this map
|
|
# before the check will pass, preventing the "silent no-op" trap.
|
|
unknown.append(generator_name)
|
|
continue
|
|
try:
|
|
current_sha = file_sha1(*sources)
|
|
except FileNotFoundError as exc:
|
|
# Source file moved/deleted — explicit failure instead of
|
|
# silent empty-hash (H2).
|
|
print(
|
|
f"check-systems-db-stamp: BROKEN — {generator_name}: {exc}",
|
|
file=sys.stderr,
|
|
)
|
|
return 1
|
|
if current_sha != stored_sha:
|
|
stale.append(generator_name)
|
|
if verbose:
|
|
print(
|
|
f"check-systems-db-stamp: STALE — {generator_name}"
|
|
f"\n stored: {stored_sha}"
|
|
f"\n current: {current_sha}"
|
|
)
|
|
|
|
if bad_version:
|
|
for msg in bad_version:
|
|
print(f"check-systems-db-stamp: BAD schema_version — {msg}", file=sys.stderr)
|
|
return 1
|
|
|
|
# All generators must agree on the same schema_version (#888 defense-in-depth).
|
|
# If they differ, the DB was partially regenerated with different source trees.
|
|
unique_versions = set(seen_versions.values())
|
|
if len(unique_versions) > 1:
|
|
print(
|
|
"check-systems-db-stamp: CONFLICT — generators disagree on schema_version:",
|
|
file=sys.stderr,
|
|
)
|
|
for gen, ver in sorted(seen_versions.items()):
|
|
print(f" {gen}: {ver}", file=sys.stderr)
|
|
print(" Run: make regen-db", file=sys.stderr)
|
|
return 1
|
|
|
|
if unknown:
|
|
print(
|
|
"check-systems-db-stamp: UNKNOWN generator(s) in meta table: "
|
|
f"{unknown}",
|
|
file=sys.stderr,
|
|
)
|
|
print(
|
|
" Update GENERATOR_SOURCES in tooling/check-systems-db-stamp to "
|
|
"register them before pushing.",
|
|
file=sys.stderr,
|
|
)
|
|
return 1
|
|
|
|
if stale:
|
|
if not verbose:
|
|
print(
|
|
"systems.db is stale — run `make regen-db` before pushing.",
|
|
file=sys.stderr,
|
|
)
|
|
print(f" Stale generators: {stale}", file=sys.stderr)
|
|
return 1
|
|
|
|
if verbose:
|
|
print(f"check-systems-db-stamp: OK — {len(rows)} generator(s) up to date")
|
|
return 0
|
|
|
|
|
|
def main() -> None:
|
|
verbose = "--verbose" in sys.argv or "-v" in sys.argv
|
|
sys.exit(check(verbose=verbose))
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|