mirror of
https://github.com/zvx-echo6/meshai.git
synced 2026-06-10 17:04:45 +02:00
fix(traffic): v0.5.7-traffic -- NATS pattern fix + itd_511 sub-adapter routing + categories audit
Second family of the v0.5.7 NATS-and-categories campaign. Weather went first because its NWS pattern was already legal; traffic was carrying invalid NATS syntax in production.
FIX 1 -- Invalid `>` mid-subject in traffic. Pre-v0.5.7-traffic the subject builder shipped `central.traffic.>.{state}` for both the traffic and roads511 adapters. NATS rules say `>` is only legal at the tail token; mid-subject `>` is rejected by the broker at subscribe time (or silently delivers nothing depending on server version). Replaced with Convention B (per Central v0.10.0 meshai_integration_guide.md): single-token `*` in the event_type slot, bare state suffix -- `central.traffic.*.id` for Idaho. Shared by the wzdx, tomtom_incidents and state_511_atis adapters.
FIX 2 -- roads511 dual subscribe. The new Idaho-only itd_511 adapter in Central v0.10.0 uses Convention A (`central.traffic.<event_type>.us.<state>`, the us.<state> form). Convention B (bare state) is shared with the rest of the traffic family. roads511 now owns BOTH:
central.traffic.*.id (Convention B, shared with traffic via _subject_owned)
central.traffic.*.us.id (Convention A, itd_511-only)
Sub-adapter routing in CentralConsumer._subject_owned (v0.5.1) already keeps shared subjects scoped to the right meshai source -- no change needed.
FIX 3 -- itd_511 -> roads511 in CENTRAL_ADAPTER_TO_SOURCE. Mirrors state_511_atis (added v0.5.3). Both Idaho 511 feeds collapse to a single meshai source for UX simplicity; future v0.6 may split them if Matt needs differential rules.
FIX 4 -- Roads-family categories audit + finer event_type mapping. Pre-v0.5.7-traffic the central path flattened every traffic-domain event to `traffic_congestion` because work_zone / incident / closure had no entries in _CATEGORY_MAP and fell through to the `traffic.` catchall (then the subject-domain fallback). Added three explicit map entries before the catchall:
("work_zone", "work_zone") # catches "work_zone" and "work_zone.wzdx"
("incident", "road_incident") # catches incident.tomtom_incidents + bare
("closure", "road_closure") # catches closure + closure.itd_511
ALERT_CATEGORIES gains two new roads-family entries so the Advanced Rules editor can target them:
work_zone -- Active construction/maintenance work zone
road_incident -- Reported incident (crash, hazard, debris)
Existing entries `road_closure` and `traffic_congestion` kept. composer._CATEGORY_EMOJI gains matching glyphs (🚧 work_zone, 🚨 road_incident) so the live LoRa rendering lines up with the category example_message glyphs.
Audit cross-check (test_alert_categories_roads_complete enforces parity):
Native emit: traffic.py -> traffic_congestion; roads511.py -> road_closure
Central path emit (via map_category): {road_closure, traffic_congestion, work_zone, road_incident}
ALERT_CATEGORIES{toggle=roads}: {road_closure, traffic_congestion, work_zone, road_incident}
Parity. No orphans, no missing.
DEFERRED to v0.5.8: itd_511_cameras / traffic_cameras stream lives at a different subject domain (central.traffic_cameras.>) and needs a new meshai source (roads_cameras or similar). Out of scope for v0.5.7.
Tests
-----
PYTHONPATH=. pytest -q: 366 passed (was 345; +21 net).
- tests/test_traffic_v057.py (new): NATS-syntax checks (`>` only at tail, single-token `*`), traffic Convention B, roads511 dual-subscribe, shared bare-state subject, itd_511 + state_511_atis remap, map_category event_type preservation, ALERT_CATEGORIES roads parity (reflection-based scan of native emit + central path), required-fields check on the four roads entries.
- tests/test_central_region_routing.py: updated `test_subjects_for_traffic_and_roads511_share_state_token` -> two new tests covering Convention B (traffic) and dual-subscribe (roads511).
- tests/test_central_consumer.py: updated `test_subject_domain_fallback_for_unmapped_category` (work_zone.wzdx is now mapped, switched to a genuinely-unmapped category) + new `test_v057_traffic_work_zone_now_mapped` asserting wzdx envelopes land on ev.category=="work_zone".
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>
This commit is contained in:
parent
b87696bf67
commit
14d168822b
6 changed files with 278 additions and 11 deletions
|
|
@ -150,8 +150,14 @@ def test_consumer_config_uses_deliver_policy_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'."""
|
||||
"""D.1: an unmapped category falls back to the subject domain instead
|
||||
of returning 'other'.
|
||||
|
||||
v0.5.7-traffic note: 'work_zone.wzdx' is now MAPPED (-> 'work_zone'),
|
||||
so we use a genuinely-unmapped category string here to exercise the
|
||||
fallback path. The subject-domain fallback for central.traffic.* is
|
||||
still 'traffic_congestion'.
|
||||
"""
|
||||
import json
|
||||
from meshai.central.consumer import CentralConsumer, category_from_subject
|
||||
from meshai.config import EnvironmentalConfig
|
||||
|
|
@ -161,13 +167,31 @@ def test_subject_domain_fallback_for_unmapped_category():
|
|||
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,
|
||||
"category": "telematics.unknown_thing", "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"
|
||||
|
||||
|
||||
def test_v057_traffic_work_zone_now_mapped():
|
||||
"""v0.5.7-traffic: 'work_zone.wzdx' maps to the new 'work_zone' meshai
|
||||
category (not flattened to traffic_congestion)."""
|
||||
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": "wz2", "data": {"id": "wz2", "adapter": "wzdx",
|
||||
"category": "work_zone.wzdx", "time": "2026-05-28T00:00:00Z", "severity": 1,
|
||||
"geo": {"centroid": [-114.0, 42.0], "primary_region": "US-ID", "regions": ["US-ID"]},
|
||||
"data": {"road": "I-84"}}}
|
||||
ev = c._handle("central.traffic.work_zone.id", json.dumps(env).encode())
|
||||
assert ev is not None and ev.category == "work_zone"
|
||||
|
||||
|
||||
@pytest.mark.parametrize("adapter,expected", [
|
||||
("wfigs_incidents", "fires"),
|
||||
("nwis", "usgs"),
|
||||
|
|
|
|||
|
|
@ -39,10 +39,22 @@ def test_subjects_for_fires_us_id_uses_state_token():
|
|||
]
|
||||
|
||||
|
||||
def test_subjects_for_traffic_and_roads511_share_state_token():
|
||||
"""Traffic family: bare-state suffix (no us. prefix), shared by both adapters."""
|
||||
assert _subjects_for("traffic", "us.id") == ["central.traffic.>.id"]
|
||||
assert _subjects_for("roads511", "us.id") == ["central.traffic.>.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():
|
||||
|
|
|
|||
177
tests/test_traffic_v057.py
Normal file
177
tests/test_traffic_v057.py
Normal file
|
|
@ -0,0 +1,177 @@
|
|||
"""v0.5.7-traffic: NATS pattern fix + itd_511 sub-adapter routing + categories audit.
|
||||
|
||||
Covers four things shipped in v0.5.7-traffic:
|
||||
|
||||
1. NATS pattern syntax — `>` is legal only at the tail. Pre-v0.5.7-traffic
|
||||
we shipped `central.traffic.>.<state>` (mid-subject `>`), invalid per
|
||||
NATS rules. Now: `central.traffic.*.<state>` (Convention B, bare state)
|
||||
for traffic; roads511 dual-subscribes both Convention B and
|
||||
`central.traffic.*.us.<state>` (Convention A, itd_511 form).
|
||||
2. roads511 dual subscription — owns both shared bare-state and us.<state>
|
||||
subjects so itd_511 events route to the roads511 source in meshai.
|
||||
3. CENTRAL_ADAPTER_TO_SOURCE['itd_511'] == 'roads511'.
|
||||
4. ALERT_CATEGORIES roads-family parity — every category we can emit
|
||||
(native + central path post-map_category) has a registry entry.
|
||||
"""
|
||||
|
||||
import inspect
|
||||
|
||||
import pytest
|
||||
|
||||
from meshai.central.consumer import (
|
||||
CENTRAL_ADAPTER_TO_SOURCE,
|
||||
_SUBJECTS_BARE,
|
||||
_subjects_for,
|
||||
map_category,
|
||||
)
|
||||
from meshai.notifications.categories import ALERT_CATEGORIES
|
||||
|
||||
|
||||
# ---------- NATS pattern validation (Convention A / B) ---------------------
|
||||
|
||||
|
||||
def _assert_legal_nats(subject: str) -> None:
|
||||
"""Assert NATS multi-level wildcard `>` only appears at the tail token."""
|
||||
tokens = subject.split(".")
|
||||
if ">" in tokens:
|
||||
assert tokens[-1] == ">", f"`>` not at tail in {subject!r}"
|
||||
assert tokens.count(">") == 1, f"multiple `>` in {subject!r}"
|
||||
for tok in tokens:
|
||||
# `*` and `>` are wildcards; everything else must be a non-empty
|
||||
# token without further wildcard characters mixed in.
|
||||
assert tok, f"empty token in {subject!r}"
|
||||
if tok not in {"*", ">"}:
|
||||
assert "*" not in tok and ">" not in tok, f"mixed wildcard in token {tok!r}"
|
||||
|
||||
|
||||
def test_subjects_for_traffic_uses_convention_b():
|
||||
"""traffic adapter -> bare-state Convention B; no `>` anywhere."""
|
||||
subs = _subjects_for("traffic", "us.id")
|
||||
assert subs == ["central.traffic.*.id"]
|
||||
for s in subs:
|
||||
_assert_legal_nats(s)
|
||||
assert ">" not in s, f"`>` in {s!r}"
|
||||
|
||||
|
||||
def test_subjects_for_roads511_dual_subscribes():
|
||||
"""roads511 owns bare-state (shared with traffic) AND us.<state> (itd_511)."""
|
||||
subs = _subjects_for("roads511", "us.id")
|
||||
assert subs == ["central.traffic.*.id", "central.traffic.*.us.id"]
|
||||
for s in subs:
|
||||
_assert_legal_nats(s)
|
||||
assert ">" not in s, f"`>` in {s!r}"
|
||||
|
||||
|
||||
def test_traffic_and_roads511_share_convention_b_subject():
|
||||
"""The bare-state subject is shared so sub-adapter routing kicks in."""
|
||||
traffic_subs = set(_subjects_for("traffic", "us.id"))
|
||||
roads511_subs = set(_subjects_for("roads511", "us.id"))
|
||||
shared = traffic_subs & roads511_subs
|
||||
assert shared == {"central.traffic.*.id"}
|
||||
|
||||
|
||||
def test_no_invalid_mid_subject_wildcards_in_traffic_family():
|
||||
"""Sanity sweep, scoped to this phase: traffic + roads511 region-aware
|
||||
subjects are NATS-legal (no `>` mid-subject). Other adapters (firms,
|
||||
usgs, usgs_quake, fires, nws) carry the v0.5.4 mid-`>` patterns and
|
||||
are intentionally OUT OF SCOPE for v0.5.7-traffic -- they'll be fixed
|
||||
per-family later in the v0.5.7 campaign."""
|
||||
for adapter in ("traffic", "roads511"):
|
||||
for s in _subjects_for(adapter, "us.id"):
|
||||
_assert_legal_nats(s)
|
||||
assert ">" not in s, f"`>` still present in {adapter} subject {s!r}"
|
||||
|
||||
|
||||
def test_bare_form_unchanged_when_region_empty():
|
||||
"""Empty region returns _SUBJECTS_BARE for backward compat."""
|
||||
assert _subjects_for("traffic", "") == ["central.traffic.>"]
|
||||
assert _subjects_for("roads511", None) == ["central.traffic.>"]
|
||||
|
||||
|
||||
# ---------- itd_511 -> roads511 remap --------------------------------------
|
||||
|
||||
|
||||
def test_itd_511_remaps_to_roads511():
|
||||
assert CENTRAL_ADAPTER_TO_SOURCE.get("itd_511") == "roads511"
|
||||
|
||||
|
||||
def test_state_511_atis_still_remaps_to_roads511():
|
||||
"""v0.5.3 mapping must survive the v0.5.7-traffic edit."""
|
||||
assert CENTRAL_ADAPTER_TO_SOURCE.get("state_511_atis") == "roads511"
|
||||
|
||||
|
||||
# ---------- map_category preserves event_type distinctions -----------------
|
||||
|
||||
|
||||
@pytest.mark.parametrize("central_cat,expected", [
|
||||
("work_zone.wzdx", "work_zone"),
|
||||
("work_zone", "work_zone"),
|
||||
("incident.tomtom_incidents", "road_incident"),
|
||||
("incident", "road_incident"),
|
||||
("closure.itd_511", "road_closure"),
|
||||
("closure", "road_closure"),
|
||||
# The catchall still flattens unknown traffic.* shapes.
|
||||
("traffic.unknown_thing", "traffic_congestion"),
|
||||
])
|
||||
def test_map_category_traffic_event_types(central_cat, expected):
|
||||
assert map_category(central_cat) == expected
|
||||
|
||||
|
||||
# ---------- ALERT_CATEGORIES roads-family parity ---------------------------
|
||||
|
||||
|
||||
def _native_emitted_roads_categories() -> set[str]:
|
||||
"""Walk traffic.py and roads511.py for category= literals."""
|
||||
import re
|
||||
from meshai.env import traffic as traffic_mod
|
||||
from meshai.env import roads511 as roads511_mod
|
||||
emitted: set[str] = set()
|
||||
for mod in (traffic_mod, roads511_mod):
|
||||
src = inspect.getsource(mod)
|
||||
emitted |= set(re.findall(r'category="([a-z_]+)"', src))
|
||||
return emitted
|
||||
|
||||
|
||||
def _central_path_roads_categories() -> set[str]:
|
||||
"""Categories the central path can deliver into the roads family.
|
||||
|
||||
Drives off map_category() so the test breaks if the routing changes.
|
||||
"""
|
||||
central_inputs = [
|
||||
"work_zone.wzdx",
|
||||
"incident.tomtom_incidents",
|
||||
"closure.itd_511",
|
||||
"closure",
|
||||
"incident",
|
||||
"traffic.flow_slow",
|
||||
]
|
||||
return {map_category(c) for c in central_inputs}
|
||||
|
||||
|
||||
def test_alert_categories_roads_complete():
|
||||
"""Every category emitted by native traffic/roads511 OR delivered via
|
||||
the central path (post-map_category) must have an ALERT_CATEGORIES
|
||||
entry with toggle='roads'. No orphans.
|
||||
"""
|
||||
registry_roads = {
|
||||
cid for cid, info in ALERT_CATEGORIES.items()
|
||||
if info.get("toggle") == "roads"
|
||||
}
|
||||
emitted = _native_emitted_roads_categories() | _central_path_roads_categories()
|
||||
missing = emitted - registry_roads
|
||||
orphans = registry_roads - emitted
|
||||
assert not missing, f"emit set has roads categories missing from ALERT_CATEGORIES: {missing}"
|
||||
assert not orphans, f"ALERT_CATEGORIES has orphan roads entries: {orphans}"
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"cat",
|
||||
["road_closure", "traffic_congestion", "work_zone", "road_incident"],
|
||||
)
|
||||
def test_roads_categories_have_required_fields(cat):
|
||||
info = ALERT_CATEGORIES[cat]
|
||||
assert info["toggle"] == "roads"
|
||||
assert info["name"]
|
||||
assert info["description"]
|
||||
assert info["default_severity"] in {"routine", "priority", "immediate"}
|
||||
assert info["example_message"]
|
||||
Loading…
Add table
Add a link
Reference in a new issue