Phase 4 of docs/RUST_REWRITE.md. Since 2026-10-18 ping-collector (rust/) collects, forecasts, notifies (ntfy + Matrix) and serves the website/API; nothing in production ran the Python service code any more. Removed (~17k lines): the FastAPI app (web_api, schemas, health_check, metrics, postgres_history, forecast_history, thaiwater), the Python RID collector and CLI (water_scraper_v3, main, run.py), the notifier and Matrix alerting (notify, alerting), the multi-backend adapters (SQLite, MySQL, InfluxDB, VictoriaMetrics) with demo databases, models/validators/exceptions/ logging/rate limiter, ml/skill.py (served by Rust now), the migration tooling (api_parity, collector_parity, e2e_notify, install_collector.sh, gen_notify_cases.py, spikes/rust-forecast), Docker/compose/Grafana files, sql/, the release workflow and the docs for all of that. Their tests went with them. Kept in Python: src/ml (training, evaluation harness, export; predict.py as the reference the Rust forecaster is tested against), the HII and RID-dam clients/stores for the archive backfills (their live collectors removed), the backfill scripts, retrain.sh + timer, forecast_parity.py. - PostgreSQL only: src/config.py is database_url() from POSTGRES_* / .env; the stores lost their sqlite/mysql branches (and the 2026-08 column migration). The database tests run against a throwaway schema from TEST_DATABASE_URL (tests/conftest.py pg_url, skipped without it), as the Rust tests do; CI gets a PostgreSQL service. 100 tests (66 without a DB). - The notifier settings moved from src/notify.py into src/ml/export.py; flood_config.json regenerates byte-identical. - tests/test_dashboard.py checks every path the dashboard fetches against ping-collector's router. - Dependencies: fastapi, uvicorn, pydantic, influxdb, pymysql, psutil, schedule, sphinx, pyinstaller, mypy, pytest-asyncio dropped; python-dotenv 1.1.1 explicit (it came in through uvicorn[standard]). - Formatting contract extended to scripts/ and tests/ (reformatted once). - scripts/install.sh is the one installer (fresh host or update, in place in a checkout without touching its ownership): binary, units, uv sync, .env defaults, removes the retired water-monitor.service and any old --alert-check cron job, dry run + forecast check, restart, readiness wait. - Docs, CLAUDE.md, CONTRIBUTING.md, .env.example, Makefile, unit comments and Rust doc comments updated to the Rust service.
118 lines
4.2 KiB
Python
118 lines
4.2 KiB
Python
#!/usr/bin/env python3
|
|
"""Backfill rid_reservoir_daily with RID large-dam history (Mae Ngat et al.).
|
|
|
|
Two paths, both idempotent and both skipping what is already stored, so a
|
|
rerun repairs holes left by transient failures and is safe alongside the
|
|
live collector (ping-collector, today + yesterday):
|
|
|
|
--dam-id (default: Mae Ngat) one dam, whole range, via api/dam — a handful
|
|
of requests for the entire 2009-today archive
|
|
--all-dams all ~35 dams, one request per calendar day via
|
|
api/dams — thousands of requests, ~25 minutes
|
|
|
|
Usage:
|
|
uv run scripts/backfill_rid_reservoir.py # Mae Ngat since 2018-08-01
|
|
uv run scripts/backfill_rid_reservoir.py --start 2009-01-01 # full archive
|
|
uv run scripts/backfill_rid_reservoir.py --refresh # rewrite stored days too
|
|
uv run scripts/backfill_rid_reservoir.py --all-dams --start 2015-01-01
|
|
uv run scripts/backfill_rid_reservoir.py --db-url postgresql://...
|
|
"""
|
|
|
|
import argparse
|
|
import datetime
|
|
import logging
|
|
import os
|
|
import sys
|
|
|
|
sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
|
|
|
|
from src.config import database_url
|
|
from src.rid_reservoir import MAE_NGAT_DAM_ID, RidReservoirStore, backfill, backfill_dam
|
|
|
|
DEFAULT_START = datetime.date(2018, 8, 1) # start of the water_measurements grid
|
|
|
|
|
|
def main(argv=None) -> int:
|
|
parser = argparse.ArgumentParser(description=__doc__)
|
|
parser.add_argument(
|
|
"--start", type=datetime.date.fromisoformat, default=DEFAULT_START
|
|
)
|
|
parser.add_argument("--end", type=datetime.date.fromisoformat, default=None)
|
|
parser.add_argument("--db-url", default=None)
|
|
parser.add_argument("--throttle", type=float, default=0.4)
|
|
parser.add_argument(
|
|
"--dam-id",
|
|
default=MAE_NGAT_DAM_ID,
|
|
help="dam to backfill via the fast range endpoint (default Mae Ngat)",
|
|
)
|
|
parser.add_argument(
|
|
"--all-dams",
|
|
action="store_true",
|
|
help="every dam, one request per calendar day (slow full-fleet path)",
|
|
)
|
|
parser.add_argument(
|
|
"--chunk-days",
|
|
type=int,
|
|
default=1830,
|
|
help="days per range request; the endpoint imposes no limit of its own",
|
|
)
|
|
parser.add_argument(
|
|
"--refresh",
|
|
action="store_true",
|
|
help="re-fetch days already stored (adds level_msl to api/dams rows)",
|
|
)
|
|
args = parser.parse_args(argv)
|
|
|
|
logging.basicConfig(
|
|
level=logging.INFO, format="%(asctime)s %(levelname)s %(message)s"
|
|
)
|
|
connection_string = args.db_url or database_url()
|
|
if not connection_string:
|
|
print(
|
|
"no database: set POSTGRES_CONNECTION_STRING or POSTGRES_*", file=sys.stderr
|
|
)
|
|
return 1
|
|
|
|
store = RidReservoirStore(connection_string)
|
|
if not store.connect():
|
|
print(
|
|
"database connection failed — check the connection string",
|
|
file=sys.stderr,
|
|
)
|
|
return 1
|
|
end = args.end or datetime.date.today()
|
|
span_days = (end - args.start).days + 1
|
|
dam_id = None if args.all_dams else args.dam_id
|
|
missing = span_days - len(store.present_dates(args.start, end, dam_id=dam_id))
|
|
if args.all_dams:
|
|
saved = backfill(store, args.start, end, throttle_seconds=args.throttle)
|
|
print(f"backfilled {saved} dam-day rows ({missing} days were missing)")
|
|
return 0 if saved or missing == 0 else 1
|
|
|
|
stats = {}
|
|
saved = backfill_dam(
|
|
store,
|
|
dam_id=args.dam_id,
|
|
start=args.start,
|
|
end=end,
|
|
chunk_days=args.chunk_days,
|
|
throttle_seconds=max(args.throttle, 1.0),
|
|
skip_present=not args.refresh,
|
|
stats=stats,
|
|
)
|
|
still_missing = span_days - len(
|
|
store.present_dates(args.start, end, dam_id=args.dam_id)
|
|
)
|
|
print(
|
|
f"backfilled {saved} dam-day rows for dam {args.dam_id} "
|
|
f"(requests: {stats.get('requests', 0)}, {missing} days were missing, "
|
|
f"{still_missing} never published by the source)"
|
|
)
|
|
# A rerun saves nothing once the archive is complete — only a real
|
|
# transport/database failure is an error here.
|
|
return 1 if stats.get("aborted") or stats.get("failures") else 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|