mirror of
https://github.com/zvx-echo6/meshai.git
synced 2026-08-26 17:31:34 +00:00
* chore(fire-ripout 2dii-a): remove dead wildfire_growth cutover path + handle_firms
wildfire_growth events are always fully precomposed (env/firms.py sets
_meshai_precomposed=True + title=<wire from _render()>) and the category is
not in cutover.NATIVE_ALWAYS_DECIDE, so the registered fire formatter could
never be reached live via compose_mesh_message for this category -- the
precomposed-title bypass always won first. Removes the dead
is_cutover("wildfire_growth") NEW-PATH branch in
fire_fusion._handle_pass_boundary (kept the live legacy leg that calls
_render unconditionally) and the now-unreachable wildfire_growth formatter
registration in notifications/formatters/__init__.py.
Also removes handle_firms, the dead Central NATS-envelope entrypoint (zero
live production callers -- Central's consumer that drove it is gone), plus
its envelope-specific filtering helpers (_confidence_passes, _in_bbox,
_coerce_severity, _log_event, FIRMS_CONFIDENCE_FLOOR/FRP_FLOOR/BBOX_OPTIONAL)
that had no live callers left. The shared, LIVE fusion core
(_ingest_pixel_core, attribution, clustering, growth/spotting/halt) and
_parse_acq_epoch are unaffected -- still the engine behind the native
ingest_hotspot_pixel entrypoint.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* chore(fire-ripout 2dii-b): remove dead handle_wfigs entrypoint
handle_wfigs (the dead Central NATS-envelope entrypoint) had zero live
production callers -- Central's consumer that drove it is gone. The LIVE
WFIGS path is env/fires.py (native adapter) -> env/store.py::_emit_event,
forced onto gating.fire.decide + the shared fire formatter via
cutover.NATIVE_ALWAYS_DECIDE, independent of this dead handler.
Removes handle_wfigs and its private-only helpers (_coerce_severity,
_log_event, _log_event_returning_id) that had no callers left. _render
remains -- it is called directly by env.fire_fusion._handle_pass_boundary on
the FIRMS wildfire_growth path, and is used as a byte-identity oracle by
tests against the shared, live fire formatter. _build_canonical,
_attach_commit_handles, _fire_too_old_to_announce, _now, _cleanup_stale_fires
and WFIGS_BROADCAST_COOLDOWN_S are kept -- each has its own direct test
coverage independent of handle_wfigs.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* test(fire-ripout 2dii-c): rewire fire tests off the deleted dead entrypoints
handle_firms and handle_wfigs (both removed in the prior two commits) were
used throughout this test suite purely as convenient DRIVERS for live logic
(pixel attribution/clustering/growth/spotting/halt fusion; the WFIGS
New/Update/cooldown/closed decider). Per-file disposition:
Rewired to drive the LIVE native entrypoint directly (no behavior change --
same underlying _ingest_pixel_core / gating.fire.decide engines):
- test_fire_tracker_phase1/2/3.py: handle_firms -> ingest_hotspot_pixel
- test_firms_refactor.py: handle_firms driver helpers -> ingest_hotspot_pixel;
dropped the dead wildfire_growth cutover test + the fully-redundant
TestNotCutoverLegacyVerbatim class (already covered by
test_firms_native_fusion.py's TestIngestGrowth/Spotting/Halt against the
live entrypoint); wildfire_growth formatter registration test now
asserts None (matches source change).
- test_wfigs_handler.py: handle_wfigs -> _render (the live WFIGS renderer)
called directly, for the anchor-priority + missing-acres cases that
exercise shared/live code (_location_anchor).
- test_fire_refactor.py: handle_wfigs -> gating.fire.decide() driven
directly, with state written the same unconditional shape the live
native path uses; TestGateSequenceParity trimmed to focus on the
tombstone/closed lifecycle step (not covered by
test_fire_native_growth.py's native-adapter New/Update/cooldown coverage).
- test_tombstone_broadcast.py, test_fire_age_gate.py: handle_wfigs ->
gating.fire.decide() driven directly; same assertions, off the dead path.
Deleted as pure dead-entrypoint contract testing with no live equivalent:
- test_firms_native_fusion.py::TestCentralPathUnchanged (2 tests) --
existed only to guard handle_firms's own envelope parsing.
- test_firms_handler.py: confidence/FRP/bbox filtering, missing-coords,
non-firms-adapter guard, event_log accounting (all handle_firms-specific;
the native adapter filters upstream in a different code path). Kept +
rewired: the shared _ingest_pixel_core dedup behavior and
_parse_acq_epoch's int/short acq_time parsing (both genuinely live/shared).
- test_wfigs_handler.py: envelope field-extraction (acres-fallback chain,
IA-placeholder-as-name), tombstone/perimeter subject -> event_log,
New/Update/cooldown decision + audit-row wiring (all redundant with
tests/test_fire_native_growth.py's coverage of gating.fire.decide()
through the real native adapter).
- test_tombstone_broadcast.py::test_commit_callback_flips_handled --
asserted handle_wfigs's own event_log-row flip on commit, a Central-only
concept the native path never used.
- test_tail_followups.py::test_wfigs_tombstone_stamps_column -- asserted
handle_wfigs's own inline tombstoned_at UPDATE; no live producer emits
_kind=wfigs_tombstone today, so nothing in the live system stamps it.
Both live renderers stay covered: fire_format (wildfire_declared/incident,
via test_fire_refactor.py + test_fire_native_growth.py, untouched) and
_render (wildfire_growth via FIRMS, via test_fire_tracker_phase2.py +
test_firms_native_fusion.py's TestIngestGrowth, both driving the live
ingest_hotspot_pixel entrypoint).
Collection: 2010 -> 1974 tests (net -36: dead-only tests deleted, live
behavior rewired 1:1 or consolidated onto already-existing native-path
coverage). Full suite: 1974 passed, 0 failed.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Matt Johnson <mj@k7zvx.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
357 lines
13 KiB
Python
357 lines
13 KiB
Python
"""v0.6-tail tests: 5 follow-ups."""
|
|
from __future__ import annotations
|
|
|
|
import time
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
|
|
import pytest
|
|
from fastapi import FastAPI
|
|
from fastapi.testclient import TestClient
|
|
|
|
from meshai.adapter_config import adapter_config, invalidate_cache
|
|
from meshai.persistence import get_db
|
|
|
|
|
|
# ============================================================================
|
|
# Item 1 -- auto-refresh ToggleFilter on PUT /api/config/notifications
|
|
# ============================================================================
|
|
|
|
|
|
def test_auto_refresh_middleware_fires_on_notifications_put():
|
|
"""The middleware calls ToggleFilter.refresh() on a successful PUT
|
|
that touches the notifications section."""
|
|
from meshai.dashboard.api import config_routes
|
|
from types import SimpleNamespace
|
|
|
|
refreshed = {"n": 0}
|
|
|
|
class _StubTF:
|
|
def refresh(self, config):
|
|
refreshed["n"] += 1
|
|
|
|
app = FastAPI()
|
|
app.state.config = SimpleNamespace() # any truthy stand-in
|
|
bus = SimpleNamespace()
|
|
bus._pipeline_components = {"toggle_filter": _StubTF()}
|
|
app.state.bus = bus
|
|
|
|
config_routes.register_config_routes_hooks(app)
|
|
|
|
@app.put("/api/config/notifications")
|
|
async def _put(): return {"ok": True}
|
|
|
|
client = TestClient(app)
|
|
client.put("/api/config/notifications", json={"enabled": True})
|
|
assert refreshed["n"] == 1
|
|
|
|
|
|
def test_auto_refresh_does_not_fire_on_other_section():
|
|
from meshai.dashboard.api import config_routes
|
|
from types import SimpleNamespace
|
|
|
|
refreshed = {"n": 0}
|
|
|
|
class _StubTF:
|
|
def refresh(self, config):
|
|
refreshed["n"] += 1
|
|
|
|
app = FastAPI()
|
|
app.state.config = SimpleNamespace()
|
|
bus = SimpleNamespace()
|
|
bus._pipeline_components = {"toggle_filter": _StubTF()}
|
|
app.state.bus = bus
|
|
|
|
config_routes.register_config_routes_hooks(app)
|
|
|
|
@app.put("/api/config/llm")
|
|
async def _put(): return {"ok": True}
|
|
|
|
client = TestClient(app)
|
|
client.put("/api/config/llm", json={})
|
|
assert refreshed["n"] == 0
|
|
|
|
|
|
def test_create_app_registers_auto_refresh_middleware():
|
|
"""Regression: create_app() must actually WIRE the auto-refresh middleware.
|
|
It was defined in register_config_routes_hooks() but never called from
|
|
create_app(), so in prod a saved toggle never refreshed the live filter and
|
|
had to be poked with POST /api/notifications/refresh-toggles by hand."""
|
|
from meshai.dashboard.server import create_app
|
|
|
|
app = create_app()
|
|
dispatches = []
|
|
for mw in app.user_middleware:
|
|
fn = (getattr(mw, "kwargs", {}) or {}).get("dispatch")
|
|
if fn is not None:
|
|
dispatches.append(getattr(fn, "__qualname__", ""))
|
|
assert any("_auto_refresh_toggle_filter" in q for q in dispatches), (
|
|
"create_app() did not register the toggle auto-refresh middleware"
|
|
)
|
|
|
|
|
|
# ============================================================================
|
|
# Item 2 -- env_reporter cap from adapter_config
|
|
# ============================================================================
|
|
|
|
|
|
def test_env_reporter_default_cap_3000():
|
|
invalidate_cache()
|
|
from meshai.notifications.env_reporter import _block_cap, _DEFAULT_BLOCK_MAX_CHARS
|
|
assert _block_cap() == 3000
|
|
assert _DEFAULT_BLOCK_MAX_CHARS == 3000
|
|
|
|
|
|
def test_env_reporter_cap_respects_config_mutation():
|
|
"""PUT-equivalent: change the row, invalidate, next call returns new cap."""
|
|
invalidate_cache()
|
|
conn = get_db()
|
|
conn.execute(
|
|
"UPDATE adapter_config SET value_json=? "
|
|
"WHERE adapter='pipeline' AND key='env_reporter_block_chars'",
|
|
("500",),
|
|
)
|
|
invalidate_cache()
|
|
from meshai.notifications.env_reporter import _block_cap
|
|
assert _block_cap() == 500
|
|
|
|
|
|
# ============================================================================
|
|
# Item 3 -- gauge_sites bulk import (CSV path)
|
|
# ============================================================================
|
|
|
|
|
|
@pytest.fixture
|
|
def client():
|
|
from meshai.dashboard.api.gauge_sites_import import router as imp_router
|
|
from meshai.dashboard.api.curation_routes import router as cur_router
|
|
app = FastAPI()
|
|
app.include_router(imp_router, prefix="/api")
|
|
app.include_router(cur_router, prefix="/api")
|
|
return TestClient(app)
|
|
|
|
|
|
def test_csv_import_inserts_new_rows(client):
|
|
csv_data = (
|
|
"site_id,gauge_name,lat,lon,action_ft,flood_minor_ft,"
|
|
"flood_moderate_ft,flood_major_ft\n"
|
|
"USGS-NEW1,Bellevue Creek,43.467,-114.255,3.0,4.5,,\n"
|
|
"USGS-NEW2,Phantom River,42.0,-114.0,2.0,3.0,4.0,5.0\n"
|
|
)
|
|
r = client.post("/api/gauge-sites/import", json={
|
|
"format": "csv", "data": csv_data,
|
|
})
|
|
assert r.status_code == 200, r.text
|
|
assert r.json()["inserted"] == 2
|
|
|
|
r2 = client.get("/api/gauge-sites/USGS-NEW1")
|
|
assert r2.status_code == 200
|
|
assert r2.json()["gauge_name"] == "Bellevue Creek"
|
|
|
|
|
|
def test_csv_import_updates_existing(client):
|
|
"""Re-importing the same site updates rather than dupes."""
|
|
csv1 = "site_id,gauge_name,lat,lon\nUSGS-UPSERT,Original,43,-115\n"
|
|
r = client.post("/api/gauge-sites/import", json={"format": "csv", "data": csv1})
|
|
assert r.json()["inserted"] == 1
|
|
|
|
csv2 = "site_id,gauge_name,lat,lon\nUSGS-UPSERT,Renamed,43.5,-115.5\n"
|
|
r2 = client.post("/api/gauge-sites/import", json={"format": "csv", "data": csv2})
|
|
assert r2.json()["updated"] == 1
|
|
assert r2.json()["inserted"] == 0
|
|
|
|
r3 = client.get("/api/gauge-sites/USGS-UPSERT")
|
|
assert r3.json()["gauge_name"] == "Renamed"
|
|
|
|
|
|
def test_csv_import_skips_bad_rows(client):
|
|
csv_data = (
|
|
"site_id,gauge_name,lat,lon\n"
|
|
"USGS-GOOD,Good Gauge,43,-115\n"
|
|
",NoSiteId,42,-114\n"
|
|
"USGS-BAD,Bad Coords,not_a_number,oops\n"
|
|
)
|
|
r = client.post("/api/gauge-sites/import", json={
|
|
"format": "csv", "data": csv_data,
|
|
})
|
|
body = r.json()
|
|
assert body["inserted"] == 1
|
|
assert body["skipped"] == 2
|
|
|
|
|
|
def test_csv_import_rejects_missing_required(client):
|
|
csv_data = "gauge_name,lat,lon\nNo Site Id Column,43,-115\n"
|
|
r = client.post("/api/gauge-sites/import", json={
|
|
"format": "csv", "data": csv_data,
|
|
})
|
|
assert r.status_code == 400
|
|
|
|
|
|
def test_import_rejects_bad_format(client):
|
|
r = client.post("/api/gauge-sites/import", json={
|
|
"format": "yaml", "data": "x: 1",
|
|
})
|
|
assert r.status_code == 400
|
|
|
|
|
|
# ---- AHPS parsing (unit-level, no live HTTP) ---------------------------
|
|
|
|
|
|
def test_ahps_index_parses_gauge_links():
|
|
from meshai.dashboard.api.gauge_sites_import import _ahps_parse_index
|
|
html = """
|
|
<html><body>
|
|
<a href="hydrograph.php?gage=hyiq2&prog=foo">HYIQ2 Cache Peak Gauge</a>
|
|
<a href="hydrograph.php?gage=bldz2">BLDZ2 Boise River</a>
|
|
<a href="other.php?gage=ignored">ignore me</a>
|
|
</body></html>
|
|
"""
|
|
gauges = _ahps_parse_index(html)
|
|
assert ("hyiq2", "HYIQ2 Cache Peak Gauge") in gauges
|
|
assert ("bldz2", "BLDZ2 Boise River") in gauges
|
|
assert len(gauges) == 2
|
|
|
|
|
|
def test_ahps_detail_extracts_thresholds():
|
|
from meshai.dashboard.api.gauge_sites_import import _ahps_parse_detail
|
|
html = """
|
|
Latitude: 43.690
|
|
Longitude: -116.200
|
|
Action Stage 8.0 ft
|
|
Minor Flood Stage 10.5 ft
|
|
Moderate Flood Stage 12.0 ft
|
|
Major Flood Stage 14.5 ft
|
|
"""
|
|
parsed = _ahps_parse_detail(html)
|
|
assert parsed["lat"] == 43.690
|
|
assert parsed["lon"] == -116.200
|
|
assert parsed["action_ft"] == 8.0
|
|
assert parsed["flood_minor_ft"] == 10.5
|
|
assert parsed["flood_moderate_ft"] == 12.0
|
|
assert parsed["flood_major_ft"] == 14.5
|
|
|
|
|
|
# ============================================================================
|
|
# Item 3b -- gauge_sites import route is registered on the real app
|
|
#
|
|
# The endpoint logic above is fully covered, but until server.create_app()
|
|
# calls app.include_router(gauge_sites_import_router, ...) the route is
|
|
# unreachable in production -- the raw-router `client` fixture above can't
|
|
# catch that because it builds its own bare FastAPI app. This test drives
|
|
# the actual dashboard app the server process serves.
|
|
# ============================================================================
|
|
|
|
|
|
def test_gauge_sites_import_reachable_through_real_app():
|
|
from meshai.dashboard.server import create_app
|
|
|
|
app = create_app()
|
|
real_client = TestClient(app)
|
|
|
|
res = real_client.post(
|
|
"/api/gauge-sites/import",
|
|
json={
|
|
"format": "csv",
|
|
"data": "site_id,gauge_name,lat,lon\nUSGS-REAL1,Real App Creek,43.5,-114.5\n",
|
|
},
|
|
)
|
|
assert res.status_code == 200, res.text
|
|
body = res.json()
|
|
assert body["inserted"] == 1
|
|
assert body["updated"] == 0
|
|
|
|
# And it actually landed -- round-trip through the sibling curation
|
|
# router (also mounted on the real app) to prove the 200 reflects a
|
|
# real DB write through the real app, not a false positive.
|
|
listed = real_client.get("/api/gauge-sites").json()
|
|
assert any(r["site_id"] == "USGS-REAL1" for r in listed)
|
|
|
|
|
|
# ============================================================================
|
|
# Item 4 -- WFIGS tombstone column + reminder behavior
|
|
# ============================================================================
|
|
|
|
|
|
def test_fires_has_tombstoned_at_column():
|
|
conn = get_db()
|
|
cols = {r["name"] for r in conn.execute("PRAGMA table_info(fires)").fetchall()}
|
|
assert "tombstoned_at" in cols
|
|
|
|
|
|
# chore/ripout-2dii: test_wfigs_tombstone_stamps_column REMOVED. It asserted
|
|
# handle_wfigs's OWN inline `UPDATE fires SET tombstoned_at=...` write -- a
|
|
# dead-entrypoint-only side effect (handle_wfigs is gone, zero live
|
|
# production callers; the native WFIGS path -- env/fires.py -- never emits a
|
|
# `_kind=wfigs_tombstone` event, so nothing in the live system currently
|
|
# stamps tombstoned_at). The column itself remains covered by
|
|
# test_fires_has_tombstoned_at_column above.
|
|
|
|
|
|
def _enable_wfigs_reminders():
|
|
"""Enable wfigs reminders (default is disabled in adapter_config)."""
|
|
conn = get_db()
|
|
conn.execute(
|
|
"UPDATE adapter_config SET default_json='true' "
|
|
"WHERE adapter='reminders_wfigs' AND key='enabled'"
|
|
)
|
|
conn.execute(
|
|
"UPDATE adapter_config SET value_json='true' "
|
|
"WHERE adapter='reminders_wfigs' AND key='enabled'"
|
|
)
|
|
from meshai.adapter_config import adapter_config as _ac
|
|
_ac.invalidate()
|
|
|
|
|
|
def test_reminder_skipped_when_fire_tombstoned():
|
|
"""ReminderScheduler treats fires.tombstoned_at NOT NULL as terminated."""
|
|
from meshai.notifications.reminders import ReminderScheduler
|
|
conn = get_db()
|
|
now = 1_780_000_000
|
|
irwin = "REM-TOMB"
|
|
last = now - 10 * 3600
|
|
# Active fire 10h past last broadcast (would otherwise fire)
|
|
conn.execute(
|
|
"INSERT INTO fires(irwin_id, incident_name, incident_type, "
|
|
"current_acres, current_contained_pct, lat, lon, county, state, "
|
|
"declared_at, last_event_at, first_broadcast_at, last_broadcast_at, "
|
|
"tombstoned_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
|
|
(irwin, "T", "WF", 100, 10, 43.6, -116.2, "Ada", "ID",
|
|
last, now, last, last, now - 100), # tombstoned
|
|
)
|
|
dispatcher = MagicMock()
|
|
dispatcher.dispatch_scheduled_broadcast = AsyncMock(return_value=True)
|
|
sch = ReminderScheduler(dispatcher, clock=lambda: now)
|
|
import asyncio
|
|
fired = asyncio.run(sch.tick_once())
|
|
assert fired == 0
|
|
dispatcher.dispatch_scheduled_broadcast.assert_not_called()
|
|
|
|
|
|
def test_reminder_fires_when_fire_not_tombstoned():
|
|
"""Same shape but tombstoned_at IS NULL -> reminder fires."""
|
|
from meshai.notifications.reminders import ReminderScheduler
|
|
_enable_wfigs_reminders()
|
|
conn = get_db()
|
|
now = 1_780_000_000
|
|
irwin = "REM-LIVE"
|
|
last = now - 10 * 3600
|
|
conn.execute(
|
|
"INSERT INTO fires(irwin_id, incident_name, incident_type, "
|
|
"current_acres, current_contained_pct, lat, lon, county, state, "
|
|
"declared_at, last_event_at, first_broadcast_at, last_broadcast_at, "
|
|
"tombstoned_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
|
|
(irwin, "L", "WF", 100, 10, 43.6, -116.2, "Ada", "ID",
|
|
last, now, last, last, None),
|
|
)
|
|
dispatcher = MagicMock()
|
|
dispatcher.dispatch_scheduled_broadcast = AsyncMock(return_value=True)
|
|
# wfigs reminders go out via dispatch_scheduled_fire_broadcast, a
|
|
# distinct method from the generic dispatch_scheduled_broadcast (see
|
|
# meshai/notifications/reminders/__init__.py); both must be mocked as
|
|
# AsyncMock or the un-mocked plain-MagicMock attribute raises
|
|
# "object MagicMock can't be used in 'await' expression" (test_reminders.py
|
|
# mocks both for the same reason).
|
|
dispatcher.dispatch_scheduled_fire_broadcast = AsyncMock(return_value=True)
|
|
sch = ReminderScheduler(dispatcher, clock=lambda: now)
|
|
import asyncio
|
|
fired = asyncio.run(sch.tick_once())
|
|
assert fired == 1
|