mirror of
https://github.com/zvx-echo6/central.git
synced 2026-06-10 11:54:37 +02:00
Opens the v0.8.x data-quality cleanup arc. Production code; central-gui AND
central-supervisor restart (adapter contract + enrichment behavior change).
NWIS events rendered as a bare "Water reading: 111 ft3/s" with an empty Location
column -- an operator couldn't tell where the gauge is or whether 111 ft3/s is
drought-low, normal, or near-flood. Coordinates were present but the reverse
geocoder returns null city/state/county for rural gauge points, and USGS site +
percentile data was never fetched. v0.8.0 fetches both.
Approach B (adapter-owned, per the proposal decision): the NWIS adapter -- which
already owns the USGS APIs -- fetches site metadata and daily stats itself and
writes two provenance bundles under event.data["_enriched"]:
- usgs_site {name, lat, lon, state, county} from the OGC monitoring-locations
item-by-id (the API family the adapter already speaks; JSON, no RDB parser).
- usgs_stats {value, percentile, class_label, severity_band, p10..p90, record_max,
count, period} from the legacy RDB daily-statistics service (the OGC API has no
stats endpoint). USGS percentiles are % of days at-or-below, so higher = higher
flow; classified to the WaterWatch bands -> severity 0-4 (record=4, much
above/below=3, above/below=2, normal=1; None reserved for "no stats", distinct
from a normal-flow gauge). Severity is set on the event, so it drives the v0.7.1
severity chip-picker filter + v0.7.2 map-marker opacity.
- new nwis_enrich.py: pure parse/classify/percentile/band helpers + a sqlite
SiteStatsCache (site TTL 365d, stats TTL 90d -- one fetch per site+param serves
every reading for the window, so a warm cache makes zero USGS calls). USGS down
-> cached-if-present else all-null bundle; the event still publishes.
Framework: the single agreed generic change -- supervisor apply_enrichment now
MERGES into _enriched instead of overwriting, so the still-global geocoder phase
doesn't clobber the adapter's bundles. No other adapter writes _enriched, so this
is inert for them.
GUI: _event_summaries/nwis.html -> "<site> -- <value> <units> (<band>, <Nth>
percentile)", with graceful fallback to "<site> -- <value>" then the bare
"Water reading:". _event_rows/nwis.html detail gains site/normalcy/typical/location
rows. _events_rows.html Location column falls back generically to any
_enriched.<source> carrying state/county when the geocoder is null (works for
future enrichers). events.json contract unchanged (additions under _enriched only).
conftest isolate_enrichment_cache also redirects NWIS_CACHE_DB_PATH off the prod
path (unprivileged-user test isolation). Adds tests/test_nwis_enrichment.py (28
tests: parse, band edges incl P0/P9/P10/P75/P90/record, percentile interpolation,
cache hit/miss/expire, adapter enrich + graceful-null + cache-hit-no-refetch,
summary rendering per band).
Full suite: 710 passed, 1 skipped (central and unprivileged zvx, 3x each).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
125 lines
3.5 KiB
Python
125 lines
3.5 KiB
Python
"""Shared fixtures for auth tests."""
|
|
|
|
import asyncio
|
|
import tempfile
|
|
from pathlib import Path
|
|
from typing import AsyncGenerator
|
|
|
|
import asyncpg
|
|
import pytest
|
|
import pytest_asyncio
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
|
|
from central.bootstrap_config import Settings
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def isolate_enrichment_cache(tmp_path, monkeypatch):
|
|
"""Redirect the supervisor's enrichment cache off the production path.
|
|
|
|
`central.supervisor.ENRICHMENT_CACHE_DB_PATH` defaults to
|
|
/var/lib/central/enrichment_cache.db. Constructing a Supervisor opens it,
|
|
so without this fixture the suite writes to (or, for any user without write
|
|
access to /var/lib/central, fails on) the live cache. Point it at a
|
|
per-test temp dir so no test ever touches the production path.
|
|
|
|
Also redirects the NWIS adapter's site/stats cache (v0.8.0,
|
|
`central.adapters.nwis.NWIS_CACHE_DB_PATH`, same /var/lib/central prod
|
|
default) for the same reason — NWISAdapter.startup() opens it.
|
|
"""
|
|
import central.supervisor as supervisor_mod
|
|
import central.adapters.nwis as nwis_mod
|
|
|
|
monkeypatch.setattr(
|
|
supervisor_mod,
|
|
"ENRICHMENT_CACHE_DB_PATH",
|
|
tmp_path / "enrichment_cache.db",
|
|
)
|
|
monkeypatch.setattr(
|
|
nwis_mod,
|
|
"NWIS_CACHE_DB_PATH",
|
|
tmp_path / "nwis_cache.db",
|
|
)
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def event_loop():
|
|
"""Create an event loop for the test session."""
|
|
loop = asyncio.new_event_loop()
|
|
yield loop
|
|
loop.close()
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_settings():
|
|
"""Create mock settings for testing."""
|
|
return Settings(
|
|
db_dsn="postgresql://test:test@localhost/test",
|
|
nats_url="nats://localhost:4222",
|
|
csrf_secret="test-csrf-secret-for-testing-only-32chars",
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_pool():
|
|
"""Create a mock database pool."""
|
|
pool = MagicMock()
|
|
pool.acquire = MagicMock()
|
|
pool.close = AsyncMock()
|
|
return pool
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_conn():
|
|
"""Create a mock database connection."""
|
|
conn = MagicMock()
|
|
conn.fetchrow = AsyncMock()
|
|
conn.fetchval = AsyncMock()
|
|
conn.execute = AsyncMock()
|
|
return conn
|
|
|
|
|
|
# CSRF fixtures for route tests
|
|
|
|
@pytest.fixture
|
|
def bypass_pre_auth_csrf():
|
|
"""Patch pre-auth CSRF validation to always pass.
|
|
|
|
Use for tests of pre-auth routes: /login, /setup/operator
|
|
"""
|
|
with patch("central.gui.routes.validate_pre_auth_csrf", return_value=True):
|
|
with patch("central.gui.routes.generate_pre_auth_csrf", return_value=("test_csrf_token", "test_signed_token")):
|
|
yield
|
|
|
|
|
|
@pytest.fixture
|
|
def bypass_session_csrf():
|
|
"""Create a mock request with session CSRF properly configured.
|
|
|
|
Use for tests of authenticated routes that check request.state.csrf_token.
|
|
Returns a configured mock_request.
|
|
"""
|
|
request = MagicMock()
|
|
request.state.csrf_token = "test_csrf_token_12345"
|
|
request.state.operator = MagicMock()
|
|
request.state.operator.id = 1
|
|
request.state.operator.username = "testuser"
|
|
|
|
# Mock form() to return dict with matching CSRF token
|
|
form_data = {"csrf_token": "test_csrf_token_12345"}
|
|
|
|
async def mock_form():
|
|
return form_data
|
|
|
|
request.form = mock_form
|
|
request._form_data = form_data # Allow tests to modify form data
|
|
|
|
return request
|
|
|
|
|
|
@pytest.fixture
|
|
def patch_route_settings():
|
|
"""Patch get_settings in routes module."""
|
|
with patch("central.gui.routes.get_settings") as mock:
|
|
mock.return_value.csrf_secret = "test-csrf-secret-for-testing-only-32chars"
|
|
yield mock
|