grabowski
7e642555b4
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.
44 lines
1.4 KiB
Python
44 lines
1.4 KiB
Python
"""Database settings for the Python tools (training, evaluation, backfills).
|
|
|
|
The service itself is ping-collector (rust/collector); it reads the same
|
|
environment / `.env` file (rust/collector/src/config.rs). PostgreSQL only:
|
|
POSTGRES_CONNECTION_STRING, or POSTGRES_HOST / POSTGRES_PORT / POSTGRES_DB /
|
|
POSTGRES_USER / POSTGRES_PASSWORD with the same defaults as ping-collector.
|
|
"""
|
|
|
|
import os
|
|
import urllib.parse
|
|
from typing import Optional
|
|
|
|
try:
|
|
from dotenv import load_dotenv
|
|
|
|
load_dotenv()
|
|
except ImportError: # the systemd units pass the variables in directly
|
|
pass
|
|
|
|
|
|
def database_url() -> Optional[str]:
|
|
"""The PostgreSQL connection string, or None when none is configured."""
|
|
url = os.getenv("POSTGRES_CONNECTION_STRING", "").strip()
|
|
if url:
|
|
return url
|
|
password = os.getenv("POSTGRES_PASSWORD")
|
|
if not password:
|
|
return None
|
|
user = urllib.parse.quote(os.getenv("POSTGRES_USER", "postgres"), safe="")
|
|
host = os.getenv("POSTGRES_HOST", "localhost")
|
|
port = os.getenv("POSTGRES_PORT", "5432")
|
|
name = os.getenv("POSTGRES_DB", "water_monitoring")
|
|
return (
|
|
f"postgresql://{user}:{urllib.parse.quote(password, safe='')}"
|
|
f"@{host}:{port}/{name}"
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
url = database_url()
|
|
if url and "@" in url:
|
|
url = url.split("://", 1)[0] + "://***@" + url.rsplit("@", 1)[1]
|
|
print(url or "no database configured")
|