mirror of
https://github.com/zvx-echo6/meshai.git
synced 2026-06-11 01:14:45 +02:00
feat(notifications): Phase 2.7 traffic adapter pipeline integration
Adds TomTomTrafficAdapter.to_event(), wiring the traffic adapter into
the notification EventBus following the FIRMS pattern (Phase 2.6).
to_event() design:
- Category: fixed "traffic_congestion" (a road closure raises severity,
not category).
- Severity: passed through unchanged from the adapter's existing
_fetch_point logic (priority on closure / heavy congestion, else
routine). No threshold is re-derived or introduced in to_event.
- Summary enriched with current/free-flow speed, % free flow, closure,
and confidence.
- Defensive: missing lat/lon or missing corridor identity returns None;
the whole body is try/except-guarded (returns None on corruption).
Inhibit-key composition:
- A single stable per-corridor key, "traffic_{corridor}" (lowercased,
spaces->_), is used as BOTH group_key and the sole inhibit_key. This
matches the adapter's own event_id, so re-polls of a corridor coalesce.
- Severity tiering is delegated to the pipeline Inhibitor, which ranks
routine<priority<immediate per shared inhibit_key: a higher-severity
emission for a corridor suppresses lower-severity re-emissions of the
same corridor within the Inhibitor TTL window. No severity is encoded
into the key (mirrors FIRMS's spatial-key approach).
Store wiring: no change. EnvironmentalStore._ingest()'s generic "else"
branch already emits any adapter exposing to_event() (live since 2.6.5).
Rule 17: to_event introduces no new tunable. The api_key is injected via
the secrets channel ($TOMTOM_API_KEY in /data/secrets/.env, referenced
as ${TOMTOM_API_KEY} in env_feeds.yaml) -- the GUI-editable reference
stays in config while the secret never enters git. The only other knob
in play is the pipeline-level Inhibitor TTL (1800s, set in
build_pipeline), which is pipeline infrastructure, not traffic-owned;
left out of scope.
Tests: tests/test_adapter_traffic.py (15 tests) mirrors
test_adapter_firms.py -- category, severity pass-through,
group_key/inhibit_keys, field population, defensive cases. Full suite:
147 passed.
Smoke test (prod, Magic Valley corridors I-84 @ Jerome, US-93 Perrine
Bridge, US-30 Twin Falls): clean startup, 6 env adapters loaded, no
traceback. "TomTom traffic updated: 3 corridors" (no auth/DNS error),
then 3 Events emitted to the pipeline bus with traffic_congestion
category -- the full store->bus->pipeline path observed live. Emission
count stable at 3 (one per corridor, is_new-gated).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
5c31dbdf4a
commit
d9cc80daf8
2 changed files with 270 additions and 1 deletions
66
meshai/env/traffic.py
vendored
66
meshai/env/traffic.py
vendored
|
|
@ -4,11 +4,13 @@ import json
|
|||
import logging
|
||||
import os
|
||||
import time
|
||||
from typing import TYPE_CHECKING
|
||||
from typing import TYPE_CHECKING, Optional
|
||||
from urllib.error import HTTPError, URLError
|
||||
from urllib.request import Request, urlopen
|
||||
from urllib.parse import urlencode
|
||||
|
||||
from meshai.notifications.events import Event, make_event
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from ..config import TomTomConfig
|
||||
|
||||
|
|
@ -235,6 +237,68 @@ class TomTomTrafficAdapter:
|
|||
self._consecutive_errors += 1
|
||||
return None
|
||||
|
||||
def to_event(self, evt: dict) -> Optional["Event"]:
|
||||
"""Translate a stored traffic event dict into a pipeline Event.
|
||||
|
||||
Args:
|
||||
evt: Internal event dict from get_events()
|
||||
|
||||
Returns:
|
||||
Event instance ready for EventBus emission, or None if the
|
||||
dict is missing required fields (lat/lon or corridor identity).
|
||||
"""
|
||||
try:
|
||||
lat = evt.get("lat")
|
||||
lon = evt.get("lon")
|
||||
if lat is None or lon is None:
|
||||
return None # Can't make a useful Event without coords
|
||||
|
||||
props = evt.get("properties", {}) or {}
|
||||
corridor = props.get("corridor")
|
||||
if not corridor:
|
||||
return None # No stable identity to group/inhibit on
|
||||
|
||||
severity = evt.get("severity", "routine")
|
||||
title = evt.get("headline", "") or f"Traffic: {corridor}"
|
||||
|
||||
# Richer summary: speed vs free flow, closure, confidence
|
||||
summary_parts = [title]
|
||||
if props.get("roadClosure"):
|
||||
summary_parts.append("road closed")
|
||||
if props.get("currentSpeed") is not None and props.get("freeFlowSpeed"):
|
||||
summary_parts.append(
|
||||
f"{int(props['currentSpeed'])}/{int(props['freeFlowSpeed'])} mph"
|
||||
)
|
||||
if props.get("speedRatio") is not None:
|
||||
summary_parts.append(f"{int(props['speedRatio'] * 100)}% free flow")
|
||||
if props.get("confidence") is not None:
|
||||
summary_parts.append(f"conf {props['confidence']}")
|
||||
summary = " | ".join(summary_parts)[:300]
|
||||
|
||||
# Stable per-corridor key (matches the adapter's own event_id
|
||||
# derivation). Re-polls of the same corridor coalesce on this
|
||||
# group_key; using it as the sole inhibit_key lets the pipeline
|
||||
# Inhibitor suppress lower-severity re-emissions while a
|
||||
# higher-severity one is active for the same corridor.
|
||||
corridor_key = f"traffic_{str(corridor).replace(' ', '_').lower()}"
|
||||
|
||||
return make_event(
|
||||
source="traffic",
|
||||
category="traffic_congestion",
|
||||
severity=severity,
|
||||
title=title,
|
||||
summary=summary,
|
||||
timestamp=evt.get("fetched_at"),
|
||||
expires=evt.get("expires"),
|
||||
lat=lat,
|
||||
lon=lon,
|
||||
group_key=corridor_key,
|
||||
inhibit_keys=[corridor_key],
|
||||
)
|
||||
except Exception:
|
||||
logger.exception(f"Traffic to_event failed for evt: {evt.get('event_id')}")
|
||||
return None
|
||||
|
||||
def get_events(self) -> list:
|
||||
"""Get current traffic events."""
|
||||
return self._events
|
||||
|
|
|
|||
205
tests/test_adapter_traffic.py
Normal file
205
tests/test_adapter_traffic.py
Normal file
|
|
@ -0,0 +1,205 @@
|
|||
"""Tests for TomTom traffic adapter Phase 2.7 — to_event() method."""
|
||||
|
||||
import time
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
import pytest
|
||||
|
||||
from meshai.env.traffic import TomTomTrafficAdapter
|
||||
from meshai.notifications.events import Event
|
||||
|
||||
|
||||
# ============================================================
|
||||
# FIXTURES
|
||||
# ============================================================
|
||||
|
||||
@pytest.fixture
|
||||
def mock_config():
|
||||
"""Create a mock TomTomConfig with real scalar fields."""
|
||||
config = MagicMock()
|
||||
config.api_key = "test-key"
|
||||
config.corridors = []
|
||||
config.tick_seconds = 300
|
||||
return config
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def adapter(mock_config):
|
||||
"""Create a TomTomTrafficAdapter with mocked config."""
|
||||
return TomTomTrafficAdapter(mock_config)
|
||||
|
||||
|
||||
def make_traffic_event(
|
||||
name="Cole Rd",
|
||||
lat=43.6,
|
||||
lon=-116.3,
|
||||
severity="routine",
|
||||
headline="Cole Rd: 30mph (50% of free flow)",
|
||||
current_speed=30,
|
||||
free_flow_speed=60,
|
||||
ratio=0.5,
|
||||
road_closure=False,
|
||||
confidence=0.95,
|
||||
):
|
||||
"""Helper to create a stored traffic event dict (mirrors _fetch_point)."""
|
||||
now = time.time()
|
||||
return {
|
||||
"source": "traffic",
|
||||
"event_id": f"traffic_{name.replace(' ', '_').lower()}",
|
||||
"event_type": "Traffic Flow",
|
||||
"headline": headline,
|
||||
"severity": severity,
|
||||
"lat": lat,
|
||||
"lon": lon,
|
||||
"expires": now + 600,
|
||||
"fetched_at": now,
|
||||
"properties": {
|
||||
"corridor": name,
|
||||
"currentSpeed": current_speed,
|
||||
"freeFlowSpeed": free_flow_speed,
|
||||
"speedRatio": ratio,
|
||||
"currentTravelTime": 120,
|
||||
"freeFlowTravelTime": 60,
|
||||
"confidence": confidence,
|
||||
"roadClosure": road_closure,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
# ============================================================
|
||||
# CATEGORY TESTS
|
||||
# ============================================================
|
||||
|
||||
def test_to_event_category_is_traffic_congestion(adapter):
|
||||
"""Traffic events always map to the traffic_congestion category."""
|
||||
event = adapter.to_event(make_traffic_event())
|
||||
assert event is not None
|
||||
assert event.category == "traffic_congestion"
|
||||
|
||||
|
||||
def test_to_event_closure_still_traffic_congestion(adapter):
|
||||
"""A road closure is still traffic_congestion (severity differs, not category)."""
|
||||
event = adapter.to_event(make_traffic_event(road_closure=True, severity="priority"))
|
||||
assert event is not None
|
||||
assert event.category == "traffic_congestion"
|
||||
|
||||
|
||||
# ============================================================
|
||||
# SEVERITY PASS-THROUGH TESTS
|
||||
# ============================================================
|
||||
|
||||
def test_to_event_severity_passes_through(adapter):
|
||||
"""Severity from the stored event passes through unchanged."""
|
||||
for sev in ["routine", "priority", "immediate"]:
|
||||
event = adapter.to_event(make_traffic_event(severity=sev))
|
||||
assert event is not None
|
||||
assert event.severity == sev
|
||||
|
||||
|
||||
# ============================================================
|
||||
# GROUP KEY / INHIBIT KEY TESTS
|
||||
# ============================================================
|
||||
|
||||
def test_to_event_group_key_is_stable_corridor_key(adapter):
|
||||
"""Group key is the stable per-corridor key."""
|
||||
event = adapter.to_event(make_traffic_event(name="Cole Rd"))
|
||||
assert event is not None
|
||||
assert event.group_key == "traffic_cole_rd"
|
||||
|
||||
|
||||
def test_to_event_inhibit_keys_match_group_key(adapter):
|
||||
"""The sole inhibit key equals the group key (Inhibitor does severity tiering)."""
|
||||
event = adapter.to_event(make_traffic_event(name="Cole Rd"))
|
||||
assert event is not None
|
||||
assert event.inhibit_keys == [event.group_key]
|
||||
|
||||
|
||||
def test_two_polls_same_corridor_share_group_key(adapter):
|
||||
"""Two re-polls of the same corridor (any case/spacing) share the group key."""
|
||||
e1 = adapter.to_event(make_traffic_event(name="Cole Rd", severity="routine"))
|
||||
e2 = adapter.to_event(make_traffic_event(name="cole rd", severity="priority"))
|
||||
assert e1 is not None and e2 is not None
|
||||
assert e1.group_key == e2.group_key
|
||||
|
||||
|
||||
def test_group_key_matches_adapter_event_id(adapter):
|
||||
"""The group key matches the adapter's own stable event_id derivation."""
|
||||
evt = make_traffic_event(name="Eagle Rd")
|
||||
event = adapter.to_event(evt)
|
||||
assert event is not None
|
||||
assert event.group_key == evt["event_id"]
|
||||
|
||||
|
||||
# ============================================================
|
||||
# CONTENT / FIELD POPULATION TESTS
|
||||
# ============================================================
|
||||
|
||||
def test_to_event_populates_core_fields(adapter):
|
||||
"""Core Event fields are populated from the stored dict."""
|
||||
evt = make_traffic_event(lat=43.61, lon=-116.21)
|
||||
event = adapter.to_event(evt)
|
||||
assert event is not None
|
||||
assert event.source == "traffic"
|
||||
assert event.lat == 43.61
|
||||
assert event.lon == -116.21
|
||||
assert event.expires == evt["expires"]
|
||||
assert event.timestamp == evt["fetched_at"]
|
||||
assert event.id # auto-computed
|
||||
|
||||
|
||||
def test_to_event_summary_includes_speed(adapter):
|
||||
"""Summary includes current/free-flow speed."""
|
||||
event = adapter.to_event(make_traffic_event(current_speed=25, free_flow_speed=65))
|
||||
assert event is not None
|
||||
assert "25/65 mph" in event.summary
|
||||
|
||||
|
||||
def test_to_event_summary_includes_closure(adapter):
|
||||
"""Summary notes a road closure."""
|
||||
event = adapter.to_event(make_traffic_event(road_closure=True))
|
||||
assert event is not None
|
||||
assert "road closed" in event.summary
|
||||
|
||||
|
||||
def test_to_event_title_falls_back_when_headline_empty(adapter):
|
||||
"""Empty headline falls back to a corridor-based title."""
|
||||
event = adapter.to_event(make_traffic_event(headline=""))
|
||||
assert event is not None
|
||||
assert event.title == "Traffic: Cole Rd"
|
||||
|
||||
|
||||
# ============================================================
|
||||
# DEFENSIVE TESTS
|
||||
# ============================================================
|
||||
|
||||
def test_to_event_missing_coords_returns_none(adapter):
|
||||
"""Missing coordinates returns None."""
|
||||
evt = make_traffic_event()
|
||||
evt["lat"] = None
|
||||
assert adapter.to_event(evt) is None
|
||||
|
||||
|
||||
def test_to_event_missing_corridor_returns_none(adapter):
|
||||
"""Missing corridor identity returns None (no stable group key)."""
|
||||
evt = make_traffic_event()
|
||||
evt["properties"]["corridor"] = None
|
||||
assert adapter.to_event(evt) is None
|
||||
|
||||
|
||||
def test_to_event_missing_properties_returns_none(adapter):
|
||||
"""No properties dict means no corridor, returns None."""
|
||||
evt = {
|
||||
"source": "traffic",
|
||||
"event_id": "traffic_x",
|
||||
"severity": "routine",
|
||||
"headline": "x",
|
||||
"lat": 43.6,
|
||||
"lon": -116.3,
|
||||
"fetched_at": time.time(),
|
||||
}
|
||||
assert adapter.to_event(evt) is None
|
||||
|
||||
|
||||
def test_to_event_does_not_raise_on_corrupted_dict(adapter):
|
||||
"""Corrupted dict returns None without raising."""
|
||||
assert adapter.to_event({"garbage": True}) is None
|
||||
Loading…
Add table
Add a link
Reference in a new issue