mirror of
https://github.com/zvx-echo6/meshai.git
synced 2026-06-10 17:04:45 +02:00
c2d5bcfbd1
Pre-v0.5.4 every Central subscription used a bare wildcard (central.wx.>,
central.fire.>, central.traffic.>, central.quake.>, central.hydro.>,
central.space.>), so a Magic Valley operator flipping nws -> central was
in fact subscribing to the all-US firehose and discarding 95% of events
locally. Central v0.9.20 (2026-05-28) added per-region subject suffixes
so the firehose can be filtered server-side. This wires meshai to use them.
Backend (meshai/central/consumer.py):
- New _subjects_for(adapter, region) replaces the static ADAPTER_SUBJECTS
dict. ADAPTER_SUBJECTS is retained as an alias to _SUBJECTS_BARE for any
legacy importers; the dispatcher path is unchanged.
- Per-adapter subject patterns (region='us.id' default):
nws -> central.wx.alert.us.id.> (region BEFORE wildcard)
usgs_quake -> central.quake.event.>.us.id (region AFTER wildcard)
firms -> central.fire.hotspot.>.us.id
fires -> central.fire.incident.id.> (state token at fixed depth)
central.fire.perimeter.id.>
traffic -> central.traffic.>.id (bare state, no us. prefix)
roads511 -> central.traffic.>.id (shared with traffic, sub-adapter routing)
usgs -> central.hydro.>.us.id
central.hydro.>.unknown (workaround until v0.9.20.1)
swpc -> central.space.> (planetary; region ignored)
- Empty/None region falls back to bare wildcards (pre-v0.9.20 behaviour).
- _subject_owned() pulls region from env.central.region and routes through
_subjects_for; v0.5.3 sub-adapter routing (owned-sources set) still
applies on shared subjects like central.traffic.>.id.
- start() logs the active region at connect-time for ops visibility.
Config (meshai/config.py):
- CentralConsumerConfig.region: str = "us.id". One region per consumer
applies to every central-flipped adapter; per-adapter overrides can
land in v0.6 when there is a real use case.
Frontend (dashboard-frontend/src/pages/Environment.tsx):
- Central Connection panel gets a Region text input next to URL/Durable.
- EnvConfig.central type extended with region: string.
- Static bundle rebuilt; index-DCFmSeOM.js -> index-B24tHcYj.js.
Tests:
- tests/test_central_region_routing.py (new, 9 cases): asserts the exact
v0.9.20 subject string for each adapter at region='us.id', the SWPC
global-stays-global rule, the USGS .unknown workaround, the empty-region
backward-compat fallback for all 8 adapters, and integration through
CentralConsumer._subject_owned() with the default region.
- tests/test_central_consumer.py + tests/test_central_sub_adapter_routing.py:
the two tests that asserted bare-wildcard subjects now set
env.central.region = "" explicitly to preserve their original concern
(no region semantics — backward-compat path only).
Why swpc stays global: space weather is planetary -- a CME is detected on
the sun, the geomagnetic response is hemispheric. There is no Idaho-only
solar event; subscribing per-region would only drop events we want.
Why hydro has the .unknown workaround: Central v0.9.20 leaves gauges
whose USGS state can't be inferred on central.hydro.>.unknown. Until
v0.9.20.1 backfills the state tag we subscribe to both filters to
avoid silently losing those rows. Idaho downstream-filtering on
data['_enriched']['usgs_site']['state'] is future v0.6 work.
Orthogonal to v0.5.2 dispatcher guards (staleness / cooldown / dedup)
and v0.5.3 sub-adapter routing: the region filter operates at the NATS
subscription layer (server-side), upstream of everything else.
Verified: pytest 327 passed (318 prior + 9 new region-routing tests);
py_compile clean; frontend build clean. Safe-mode preserved -- no toggle
enabled, no master enabled, no central enabled.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
193 lines
7.4 KiB
Python
193 lines
7.4 KiB
Python
"""v0.4 C.1: Central connector backend — normalization, lifecycle, source gate."""
|
|
|
|
import asyncio
|
|
import json
|
|
|
|
import pytest
|
|
|
|
from meshai.config import EnvironmentalConfig
|
|
from meshai.central.consumer import CentralConsumer, map_category, map_severity
|
|
from meshai.notifications.pipeline.bus import EventBus
|
|
|
|
|
|
def make_consumer():
|
|
env = EnvironmentalConfig()
|
|
bus = EventBus()
|
|
rec = []
|
|
bus.subscribe(rec.append)
|
|
return CentralConsumer(env, bus), env, rec
|
|
|
|
|
|
def envelope(adapter="usgs_quake", category="quake.event", severity=2,
|
|
eid="us6000abcd", centroid=(-114.5, 42.6), upstream=None,
|
|
time="2026-05-27T12:00:00Z", expires=None):
|
|
return {
|
|
"id": eid, "source": "central.echo6.co",
|
|
"type": f"central.{category}.v1", "time": time,
|
|
"centralcategory": category, "centralseverity": severity,
|
|
"specversion": "1.0", "datacontenttype": "application/json",
|
|
"data": {
|
|
"id": eid, "adapter": adapter, "category": category,
|
|
"time": time, "expires": expires, "severity": severity,
|
|
"geo": {"centroid": list(centroid), "bbox": None,
|
|
"regions": ["US-ID"], "primary_region": "US-ID"},
|
|
"data": upstream if upstream is not None else {"magnitude": 4.2, "place": "near Twin Falls"},
|
|
},
|
|
}
|
|
|
|
|
|
class FakeMsg:
|
|
def __init__(self, subject, env):
|
|
self.subject = subject
|
|
self.data = json.dumps(env).encode()
|
|
self.acked = False
|
|
|
|
async def ack(self):
|
|
self.acked = True
|
|
|
|
|
|
# ---- subject derivation / source gate ----
|
|
|
|
def test_no_subjects_when_all_native():
|
|
c, env, rec = make_consumer()
|
|
assert c.subjects() == []
|
|
|
|
|
|
def test_subjects_when_central():
|
|
# v0.5.4: assert the legacy bare-wildcard form by clearing region.
|
|
# Region-aware subject shapes are covered by test_central_region_routing.py.
|
|
c, env, rec = make_consumer()
|
|
env.central.region = ""
|
|
env.usgs_quake.feed_source = "central"
|
|
assert "central.quake.>" in c.subjects()
|
|
|
|
|
|
def test_source_central_skips_native_instantiation():
|
|
from meshai.env.store import EnvironmentalStore
|
|
env = EnvironmentalConfig()
|
|
env.enabled = True
|
|
env.usgs_quake.enabled = True
|
|
env.usgs_quake.feed_source = "central" # should be skipped natively
|
|
env.nws.enabled = True # native -> present
|
|
store = EnvironmentalStore(config=env, region_anchors=[], event_bus=None)
|
|
assert "usgs_quake" not in store._adapters
|
|
assert "nws" in store._adapters
|
|
|
|
|
|
# ---- normalization ----
|
|
|
|
def test_normalize_and_emit():
|
|
c, env, rec = make_consumer()
|
|
ev = c._handle("central.quake.event.moderate", json.dumps(envelope()).encode())
|
|
assert ev is not None
|
|
assert len(rec) == 1
|
|
e = rec[0]
|
|
assert e.source == "usgs_quake"
|
|
assert e.category == "earthquake_event"
|
|
assert e.severity == "priority" # central severity 2
|
|
assert e.lat == 42.6 and e.lon == -114.5 # [lon,lat] -> (lat,lon)
|
|
assert e.group_key == "us6000abcd"
|
|
assert e.region == "US-ID"
|
|
assert e.data.get("magnitude") == 4.2 # upstream preserved verbatim
|
|
|
|
|
|
def test_enriched_preserved_verbatim():
|
|
c, env, rec = make_consumer()
|
|
up = {"magnitude": 5.1, "_enriched": {"geocoder": {"state": "Idaho"}, "usgs_stats": {"x": 1}}}
|
|
ev = c._handle("central.quake.event.strong", json.dumps(envelope(severity=4, upstream=up)).encode())
|
|
assert ev.severity == "immediate"
|
|
assert ev.data["_enriched"]["geocoder"]["state"] == "Idaho"
|
|
assert ev.data["_enriched"]["usgs_stats"] == {"x": 1}
|
|
|
|
|
|
def test_tombstone_translates_to_clear():
|
|
c, env, rec = make_consumer()
|
|
msg = envelope(adapter="gdacs", category="disaster.fl.removed", severity=0, eid="FL1103885:removed")
|
|
ev = c._handle("central.disaster.fl.removed.austria", json.dumps(msg).encode())
|
|
assert ev is not None
|
|
assert ev.group_key == "FL1103885" # ':removed' stripped -> matches original
|
|
assert ev.data.get("_central_tombstone") is True
|
|
|
|
|
|
def test_severity_mapping():
|
|
assert map_severity(0) == "routine"
|
|
assert map_severity(1) == "routine"
|
|
assert map_severity(2) == "priority"
|
|
assert map_severity(3) == "immediate"
|
|
assert map_severity(4) == "immediate"
|
|
assert map_severity(None) == "routine"
|
|
|
|
|
|
def test_category_mapping():
|
|
assert map_category("wx.alert.severe_thunderstorm_warning") == "weather_warning"
|
|
assert map_category("quake.event") == "earthquake_event"
|
|
assert map_category("fire.hotspot.viirs_noaa20.high") == "wildfire_hotspot"
|
|
assert map_category("hydro.00060.usgs.06901250") == "stream_flow"
|
|
|
|
|
|
# ---- async callback path ----
|
|
|
|
def test_on_message_emits_and_acks():
|
|
c, env, rec = make_consumer()
|
|
msg = FakeMsg("central.quake.event.moderate", envelope())
|
|
asyncio.run(c._on_message(msg))
|
|
assert msg.acked is True
|
|
assert len(rec) == 1
|
|
|
|
|
|
def test_start_no_op_when_all_native():
|
|
"""start() is a no-op (no NATS connect) when no adapter is central."""
|
|
c, env, rec = make_consumer()
|
|
asyncio.run(c.start()) # must not raise / must not require NATS
|
|
assert c._nc is None
|
|
|
|
|
|
def test_consumer_config_uses_deliver_policy_new():
|
|
"""C.3.1: Central subscriptions use deliver_policy=NEW (no full-backlog replay)."""
|
|
from meshai.central.consumer import consumer_config
|
|
from nats.js.api import DeliverPolicy
|
|
assert consumer_config().deliver_policy == DeliverPolicy.NEW
|
|
|
|
|
|
def test_subject_domain_fallback_for_unmapped_category():
|
|
"""D.1: an unmapped category (traffic 'work_zone.wzdx') falls back to the
|
|
subject domain instead of returning 'other'."""
|
|
import json
|
|
from meshai.central.consumer import CentralConsumer, category_from_subject
|
|
from meshai.config import EnvironmentalConfig
|
|
from meshai.notifications.pipeline.bus import EventBus
|
|
assert category_from_subject("central.traffic.work_zone.ok") == "traffic_congestion"
|
|
rec = []
|
|
bus = EventBus(); bus.subscribe(rec.append)
|
|
c = CentralConsumer(EnvironmentalConfig(), bus)
|
|
env = {"id": "wz1", "data": {"id": "wz1", "adapter": "wzdx",
|
|
"category": "work_zone.wzdx", "time": "2026-05-28T00:00:00Z", "severity": 1,
|
|
"geo": {"centroid": [-96.2, 36.15], "primary_region": "US-OK", "regions": ["US-OK"]},
|
|
"data": {"road": "I-44"}}}
|
|
ev = c._handle("central.traffic.work_zone.ok", json.dumps(env).encode())
|
|
assert ev is not None and ev.category == "traffic_congestion"
|
|
|
|
|
|
@pytest.mark.parametrize("adapter,expected", [
|
|
("wfigs_incidents", "fires"),
|
|
("nwis", "usgs"),
|
|
("swpc_alerts", "swpc"),
|
|
("wzdx", "traffic"),
|
|
("nws", "nws"), # 1:1 passthrough
|
|
("experimental_foo", "experimental_foo"), # unknown -> passthrough
|
|
])
|
|
def test_central_adapter_source_remap(adapter, expected):
|
|
"""D.2: Central adapter names map to meshai source names (unknown passes through)."""
|
|
import json
|
|
from meshai.central.consumer import CentralConsumer
|
|
from meshai.config import EnvironmentalConfig
|
|
from meshai.notifications.pipeline.bus import EventBus
|
|
rec = []
|
|
bus = EventBus(); bus.subscribe(rec.append)
|
|
c = CentralConsumer(EnvironmentalConfig(), bus)
|
|
env = {"id": "e1", "data": {"id": "e1", "adapter": adapter, "category": "wx.alert.x",
|
|
"time": "2026-05-28T00:00:00Z", "severity": 1,
|
|
"geo": {"centroid": [-114.0, 42.0], "primary_region": "US-ID", "regions": ["US-ID"]},
|
|
"data": {}}}
|
|
ev = c._handle("central.wx.alert.x", json.dumps(env).encode())
|
|
assert ev is not None and ev.source == expected
|