mirror of
https://github.com/zvx-echo6/meshai.git
synced 2026-08-26 09:21:33 +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>
128 lines
5.3 KiB
Python
128 lines
5.3 KiB
Python
"""Tests for the shared FIRMS pixel-ingest core (`_ingest_pixel_core`) +
|
|
`_parse_acq_epoch` -- the parts of the retired v0.6-1 FIRMS handler that are
|
|
still LIVE, shared by the native `env/firms.py` adapter via
|
|
`ingest_hotspot_pixel`.
|
|
|
|
chore/ripout-2dii: `handle_firms` (the dead Central NATS-envelope entrypoint
|
|
this file used to test -- confidence/FRP/bbox filtering, envelope field
|
|
extraction, missing-coords/missing-acq-time drops, non-firms-adapter guard,
|
|
event_log accounting) has been REMOVED from `meshai.env.fire_fusion` -- zero
|
|
live production callers, and no live equivalent (the native adapter's own
|
|
confidence/bbox filtering happens upstream in `env/firms.py`'s CSV fetch, a
|
|
different code path entirely; see `tests/test_adapter_firms.py`). Those tests
|
|
were deleted with it.
|
|
|
|
What remains: the dedup behavior of `_ingest_pixel_core` (INSERT OR IGNORE on
|
|
a meters-quantized dedup key -- genuinely shared/live, exercised by BOTH the
|
|
native adapter and formerly by handle_firms) and `_parse_acq_epoch`'s
|
|
int/short/zero-padded acq_time parsing (also shared/live -- env/firms.py
|
|
imports and calls it directly). Both rewritten to drive
|
|
`ingest_hotspot_pixel` directly instead of the dead handler.
|
|
"""
|
|
import pytest
|
|
|
|
from meshai.env.fire_fusion import ingest_hotspot_pixel, _parse_acq_epoch
|
|
from meshai.persistence import close_thread_connection, init_db
|
|
from meshai.persistence import db as persistence_db
|
|
|
|
|
|
# ---------- fixtures --------------------------------------------------------
|
|
|
|
|
|
@pytest.fixture
|
|
def mem_db(monkeypatch, tmp_path):
|
|
db_path = str(tmp_path / "firms-test.sqlite")
|
|
monkeypatch.setenv("MESHAI_DB_PATH", db_path)
|
|
persistence_db._initialised.clear()
|
|
close_thread_connection()
|
|
conn = init_db()
|
|
yield conn
|
|
close_thread_connection()
|
|
persistence_db._initialised.discard(db_path)
|
|
|
|
|
|
def _pixel(*, lat=42.19664, lon=-113.70981, frp=135.93, confidence="high",
|
|
satellite="N", acq_date="2026-05-28", acq_time="1949",
|
|
brightness=367.0):
|
|
acq_epoch = _parse_acq_epoch(acq_date, acq_time)
|
|
return {"lat": lat, "lon": lon, "frp": frp, "confidence": confidence,
|
|
"brightness": brightness, "satellite": satellite,
|
|
"acq_epoch": acq_epoch}
|
|
|
|
|
|
def _row_count(mem_db, table):
|
|
return mem_db.execute(f"SELECT COUNT(*) AS n FROM {table}").fetchone()["n"]
|
|
|
|
|
|
# ============================================================================
|
|
# _parse_acq_epoch -- acq_time format quirks (shared with env/firms.py)
|
|
# ============================================================================
|
|
|
|
|
|
def test_acq_time_int_accepted():
|
|
"""FIRMS sometimes publishes acq_time as int 2013 rather than '2013'."""
|
|
assert _parse_acq_epoch("2026-05-28", 1949) is not None
|
|
assert _parse_acq_epoch("2026-05-28", 1949) == _parse_acq_epoch("2026-05-28", "1949")
|
|
|
|
|
|
def test_short_acq_time_zero_padded():
|
|
"""acq_time '49' (early-morning pass) must zero-pad to '0049'."""
|
|
epoch = _parse_acq_epoch("2026-05-28", "49")
|
|
assert epoch is not None
|
|
import datetime as _dt
|
|
dt = _dt.datetime.fromtimestamp(epoch, tz=_dt.timezone.utc)
|
|
assert (dt.hour, dt.minute) == (0, 49)
|
|
|
|
|
|
def test_missing_acq_time_returns_none():
|
|
assert _parse_acq_epoch(None, None) is None
|
|
assert _parse_acq_epoch("2026-05-28", None) is None
|
|
|
|
|
|
# ============================================================================
|
|
# Dedup: same satellite pixel observation arriving twice = no-op.
|
|
# `_ingest_pixel_core`'s meters-quantized dedup_key + INSERT OR IGNORE is the
|
|
# LIVE, source-agnostic core shared by ingest_hotspot_pixel.
|
|
# ============================================================================
|
|
|
|
|
|
def test_dedup_same_pixel_idempotent(mem_db):
|
|
p = _pixel()
|
|
ingest_hotspot_pixel(p, now=1_780_660_000)
|
|
ingest_hotspot_pixel(p, now=1_780_660_001)
|
|
assert _row_count(mem_db, "firms_pixels") == 1, "OR IGNORE collapses dup"
|
|
|
|
|
|
def test_dedup_collapses_lat_lon_float_noise(mem_db):
|
|
"""Same coord with sub-1m float noise must hit the same dedup key.
|
|
Meters-based quantization absorbs differences well under 1 pixel."""
|
|
p1 = _pixel(lat=42.196641234567, lon=-113.709810000001)
|
|
p2 = _pixel(lat=42.196641111111, lon=-113.709810999999)
|
|
ingest_hotspot_pixel(p1, now=1_780_660_000)
|
|
ingest_hotspot_pixel(p2, now=1_780_660_001)
|
|
assert _row_count(mem_db, "firms_pixels") == 1
|
|
|
|
|
|
def test_dedup_different_satellite_stored_separately(mem_db):
|
|
"""Same coord + acq_time but different satellite is 2 distinct observations."""
|
|
ingest_hotspot_pixel(_pixel(satellite="N"), now=1_780_660_000)
|
|
ingest_hotspot_pixel(_pixel(satellite="N20"), now=1_780_660_001)
|
|
assert _row_count(mem_db, "firms_pixels") == 2
|
|
|
|
|
|
def test_dedup_different_acq_time_stored_separately(mem_db):
|
|
"""Same pixel observed on two passes 12h apart -> 2 rows."""
|
|
ingest_hotspot_pixel(_pixel(acq_time="0700"), now=1_780_660_000)
|
|
ingest_hotspot_pixel(_pixel(acq_time="1900"), now=1_780_660_001)
|
|
assert _row_count(mem_db, "firms_pixels") == 2
|
|
|
|
|
|
def test_missing_frp_stored(mem_db):
|
|
"""A pixel with no FRP still stores (null in column) -- ingest_hotspot_pixel
|
|
never filters on FRP (that was handle_firms-specific, now gone)."""
|
|
p = _pixel()
|
|
p["frp"] = None
|
|
ingest_hotspot_pixel(p, now=1_780_660_000)
|
|
assert _row_count(mem_db, "firms_pixels") == 1
|
|
row = mem_db.execute("SELECT * FROM firms_pixels").fetchone()
|
|
assert row["frp"] is None
|