mirror of
https://github.com/zvx-echo6/meshai.git
synced 2026-06-11 01:14:45 +02:00
60e8e62e85
Third family of the v0.5.7 NATS-and-categories campaign. Fire is the heaviest of the campaign -- four distinct fixes plus a category audit. Two of the four were broken in production: FIRMS subscribed to a syntactically invalid pattern, and WFIGS tombstones were silently dropped.
FIX 1 -- FIRMS NATS pattern (the canonical bug). Pre-v0.5.7-fire `_subjects_for("firms","us.id")` returned `["central.fire.hotspot.>.us.id"]`, which is INVALID NATS (the `>` multi-level wildcard is only legal at the tail token). It also wouldn't have matched anything Central publishes: per the Central v0.10.0 consumer integration guide §firms, the actual published pattern is `central.fire.hotspot.<satellite>.<confidence>` (5 tokens, no us.<state> suffix). The two slots after "hotspot" are satellite name and confidence band -- NOT tile coordinates or region tokens.
Note on prompt vs. guide discrepancy: the v0.5.7-fire task spec described a tile-coord/state pattern `central.fire.hotspot.*.*.us.id` (7 tokens with us.<state> tail). That's neither what Central v0.10.0 publishes nor what its guide documents. We follow the guide. Subscribing to the prompt's 7-token pattern would silently match zero messages in production (token-count mismatch). State filtering for FIRMS happens client-side via data.latitude / data.longitude against the configured region bbox.
New subscription: `central.fire.hotspot.>` -- tail-only `>`, NATS-legal, matches all <satellite>.<confidence> combinations.
FIX 2 -- WFIGS tombstone subjects. Per guide §wfigs_incidents and §wfigs_perimeters, WFIGS publishes:
active: central.fire.incident.<state>.<county> (Convention A, depth-3 state)
active: central.fire.perimeter.<state>.<county>
tombstone: central.fire.incident.removed.<state> (5 tokens, "removed" at depth-3)
tombstone: central.fire.perimeter.removed.<state>
Pre-v0.5.7-fire `_subjects_for("fires","us.id")` subscribed only to the active subjects (`central.fire.incident.id.>` and `central.fire.perimeter.id.>`). The tombstone subjects have "removed" at depth-3 instead of the state token, so the active-subject `>` filters silently dropped EVERY tombstone. Fall-off signals never reached meshai's inhibitor, so old incidents stayed "live" in the pipeline indefinitely.
Added the two tombstone subjects to the subscription list. Both are 5-token literals with no wildcards -- trivially NATS-legal.
FIX 3 -- WFIGS tombstone dedup. Per guide §wfigs_incidents removal semantics, the tombstone env_id has the shape `<IrwinID>:removed:<iso_now>` -- the `:removed:` is sandwiched in the middle, with a timestamp tail. Pre-v0.5.7-fire the consumer.py group_key recovery was `re.sub(r":removed$", "", group_key)` -- a literal trailing `:removed` match -- which DID NOT FIRE on the WFIGS form (the regex required `:removed` at the very end of the string, but the WFIGS form has `:<iso>` after it).
Consequence: WFIGS tombstones' group_key was the full `<IrwinID>:removed:<iso>` string instead of the bare `<IrwinID>`. The pipeline grouper/inhibitor never matched tombstones to their original incidents, so the lapse signal was lost.
Fixed by switching the regex to `re.sub(r":removed(:.*)?$", "", group_key)` -- handles both the WFIGS `<IrwinID>:removed:<iso>` form AND the legacy GDACS `<id>:removed` form. The `is_tombstone` detection also gained an explicit `":removed:" in env_id` check for the WFIGS shape.
Per the guide: "the same incident can have one or more removal tombstones over its lifecycle" (it can re-enter and re-fall-off). To preserve per-tombstone distinctness for downstream lifecycle accounting, the full env_id is stashed on `Event.data["_central_tombstone_id"]` (the group_key collapses to the IrwinID by design, but the original env_id with the :<iso> tail survives on data).
FIX 4 -- ALERT_CATEGORIES fire-family audit + removed parametric entries. Per Matt's direct feedback ("fire near mesh has its own set of parameters that I don't even know what they could be. like how far is near mesh? I don't know I can't set that."), the parametric `fire_proximity` and the duplicate-named `wildfire_proximity` (both labeled "Fire Near Mesh" with parametric radius-based descriptions) were unselectable in the new Advanced Rules UI. Removed both.
Cross-referenced what FIRMS and WFIGS actually emit (per the guide and the native adapter code) and audited the registry:
Native emit:
firms.py -> new_ignition (when adapter flags new_ignition)
or wildfire_hotspot (otherwise) [v0.5.7-fire: was wildfire_proximity]
fires.py -> wildfire_incident
Central path emit (via map_category):
fire.hotspot.* -> wildfire_hotspot
fire.incident.* -> wildfire_incident
fire.perimeter.* -> wildfire_incident (perimeters merge to the incident)
fire.<other> -> wildfire_incident (catchall)
Registry after v0.5.7-fire:
{new_ignition, wildfire_hotspot, wildfire_incident}
Parity confirmed. No orphans, no missing.
Aligning firms.py to emit `wildfire_hotspot` (matching the central FIRMS map) means native + central FIRMS produce identical categories regardless of which feed path is enabled.
Composer (`_CATEGORY_EMOJI`, `_CATEGORY_LABEL`) and router (three source-attribution tables) updated to drop the removed categories and add the new ones.
Deferred to v0.5.8: distance_max_km field on rules for actual proximity filtering. Replaces the parametric fire_proximity registry entry with a parameterized rule field that the user CAN configure ("alert me about wildfire_incident within 30 km" instead of an opaque "Fire Near Mesh" toggle).
Tests
-----
PYTHONPATH=. pytest -q: 380 passed (was 366; +14 net).
- tests/test_fire_v057.py (new): FIRMS subject is tail-only `>` with no mid-subject placement; WFIGS subjects cover active + four tombstones; WFIGS tombstone strips `:removed(:.*)?$` for group_key; two same-IrwinID tombstones both propagate through _handle and share group_key, with the original env_id preserved on data["_central_tombstone_id"]; legacy GDACS `:removed` shape still strips cleanly; fire_proximity / wildfire_proximity absent from ALERT_CATEGORIES; no "Fire Near Mesh" name duplicates; fire-family parity (native + central emit == registry); required-fields check on the three fire entries.
- tests/test_central_region_routing.py: updated FIRMS test (tail-only `>`) and WFIGS test (includes tombstone subjects).
- tests/test_pipeline_toggle_filter.py, tests/test_adapter_firms.py, tests/test_v052_dispatcher.py, tests/test_pipeline_digest.py: bulk-migrated obsolete category references (wildfire_proximity -> wildfire_hotspot, fire_proximity -> wildfire_incident) so the existing test suites continue to exercise the same routing/digest/dispatch paths with the new category names.
Safe-mode preserved (master off, all family toggles off, all adapters native, central disabled). No live toggle flipped. Not tagging yet -- v0.5.7 tag waits until all families ship.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
110 lines
4.9 KiB
Python
110 lines
4.9 KiB
Python
"""v0.5.4: Central v0.9.20 region-aware subject building.
|
|
|
|
Exercises `_subjects_for(adapter, region)` and the wiring through
|
|
`CentralConsumer._subject_owned()`. The spec is hard-coded in the test
|
|
strings on purpose so a future drift in the v0.9.20 subject scheme
|
|
fails noisily here instead of silently shipping wrong filters.
|
|
"""
|
|
|
|
from meshai.central.consumer import (
|
|
CentralConsumer,
|
|
_subjects_for,
|
|
_SUBJECTS_BARE,
|
|
)
|
|
from meshai.config import EnvironmentalConfig
|
|
|
|
|
|
# --------------------------------------------------------------------- per-adapter
|
|
|
|
def test_subjects_for_nws_us_id():
|
|
"""NWS: region BEFORE wildcard (matches alert.<region>.<...>)."""
|
|
assert _subjects_for("nws", "us.id") == ["central.wx.alert.us.id.>"]
|
|
|
|
|
|
def test_subjects_for_usgs_quake_us_id():
|
|
"""USGS quake: region AFTER wildcard."""
|
|
assert _subjects_for("usgs_quake", "us.id") == ["central.quake.event.>.us.id"]
|
|
|
|
|
|
def test_subjects_for_firms_us_id_uses_tail_only_wildcard():
|
|
"""v0.5.7-fire: FIRMS publishes `central.fire.hotspot.<satellite>.<confidence>`
|
|
with NO region in the subject (per Central v0.10.0 guide §firms). The
|
|
pre-v0.5.7-fire `central.fire.hotspot.>.us.id` was syntactically invalid
|
|
(`>` mid-subject) AND wouldn't have matched anything Central actually
|
|
publishes. Region filtering for FIRMS now happens client-side via
|
|
data.latitude/longitude. Subscription uses tail-only `>` (NATS-legal)."""
|
|
assert _subjects_for("firms", "us.id") == ["central.fire.hotspot.>"]
|
|
|
|
|
|
def test_subjects_for_fires_us_id_includes_tombstones():
|
|
"""v0.5.7-fire: WFIGS subjects -- active state-token at depth-3 + the
|
|
removal-tombstone subjects (`central.fire.{incident,perimeter}.removed.<state>`)
|
|
per Central v0.10.0 guide §wfigs_incidents §wfigs_perimeters. Pre-v0.5.7-fire
|
|
we only subscribed to active subjects, silently dropping fall-off signals."""
|
|
assert _subjects_for("fires", "us.id") == [
|
|
"central.fire.incident.id.>",
|
|
"central.fire.perimeter.id.>",
|
|
"central.fire.incident.removed.id",
|
|
"central.fire.perimeter.removed.id",
|
|
]
|
|
|
|
|
|
def test_subjects_for_traffic_uses_convention_b():
|
|
"""v0.5.7-traffic: traffic adapter -> bare-state Convention B with `*`
|
|
in the event_type slot. Pre-v0.5.7-traffic this was `>.{state}` which
|
|
is invalid NATS (`>` must be at the tail). The bare-state subject is
|
|
shared with roads511 (sub-adapter routing picks the right meshai source)."""
|
|
assert _subjects_for("traffic", "us.id") == ["central.traffic.*.id"]
|
|
|
|
|
|
def test_subjects_for_roads511_dual_subscribes_convention_a_and_b():
|
|
"""v0.5.7-traffic: roads511 owns BOTH the shared bare-state subject
|
|
(Convention B, shared with traffic) AND the us.<state> subject
|
|
(Convention A) where the new Idaho-only itd_511 adapter publishes."""
|
|
assert _subjects_for("roads511", "us.id") == [
|
|
"central.traffic.*.id",
|
|
"central.traffic.*.us.id",
|
|
]
|
|
|
|
|
|
def test_subjects_for_usgs_includes_unknown_workaround():
|
|
"""USGS hydro: subscribes to BOTH the region-tagged filter and the
|
|
".unknown" filter to cover gauges whose state Central v0.9.20 can't
|
|
infer yet (workaround until v0.9.20.1 backfills the tag)."""
|
|
assert _subjects_for("usgs", "us.id") == [
|
|
"central.hydro.>.us.id",
|
|
"central.hydro.>.unknown",
|
|
]
|
|
|
|
|
|
def test_subjects_for_swpc_stays_global():
|
|
"""SWPC: space weather is planetary; region argument is ignored."""
|
|
assert _subjects_for("swpc", "us.id") == ["central.space.>"]
|
|
assert _subjects_for("swpc", "us.mt") == ["central.space.>"] # same regardless
|
|
assert _subjects_for("swpc", "") == ["central.space.>"]
|
|
|
|
|
|
# --------------------------------------------------------------------- backward compat
|
|
|
|
def test_subjects_for_empty_region_falls_back_to_bare_wildcards():
|
|
"""Empty/None region = pre-v0.9.20 behaviour for every adapter, byte-identical
|
|
to the legacy _SUBJECTS_BARE map. Adapters absent from the map return []."""
|
|
for adapter, expected in _SUBJECTS_BARE.items():
|
|
assert _subjects_for(adapter, "") == expected, f"empty region mismatch for {adapter}"
|
|
assert _subjects_for(adapter, None) == expected, f"None region mismatch for {adapter}"
|
|
# Unknown adapters return empty regardless of region.
|
|
assert _subjects_for("ducting", "us.id") == []
|
|
assert _subjects_for("avalanche", "") == []
|
|
|
|
|
|
# --------------------------------------------------------------------- integration
|
|
|
|
def test_central_region_default_propagates_to_consumer_subjects():
|
|
"""Default region = 'us.id': flipping nws to central → consumer subscribes
|
|
to the region-aware subject, not the bare wildcard."""
|
|
env = EnvironmentalConfig()
|
|
assert env.central.region == "us.id" # spec default
|
|
env.nws.feed_source = "central"
|
|
so = CentralConsumer(env, None)._subject_owned()
|
|
assert list(so.keys()) == ["central.wx.alert.us.id.>"]
|
|
assert so["central.wx.alert.us.id.>"] == {"nws"}
|