mirror of
https://github.com/zvx-echo6/meshai.git
synced 2026-06-11 17:34:44 +02:00
Merge origin/feature/mesh-intelligence into feature/mesh-intelligence
Merged remote changes with local notification verification system: - Kept local: channels.py, router.py, notification_routes.py, Notifications.tsx (contains the new end-to-end verification system) - Accepted remote: Config, Environment, Reference pages, new commands, categories, summarizer, and other supporting files Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
commit
5b78e38d2e
43 changed files with 8966 additions and 4183 deletions
|
|
@ -1,85 +1,99 @@
|
|||
"""Alert API routes."""
|
||||
|
||||
from fastapi import APIRouter, Request
|
||||
|
||||
router = APIRouter(tags=["alerts"])
|
||||
|
||||
|
||||
@router.get("/alerts/active")
|
||||
async def get_active_alerts(request: Request):
|
||||
"""Get currently active alerts."""
|
||||
alert_engine = request.app.state.alert_engine
|
||||
|
||||
if not alert_engine:
|
||||
return []
|
||||
|
||||
# Get recent alerts from alert engine if it has internal state
|
||||
alerts = []
|
||||
|
||||
# Check for AlertState or similar if available
|
||||
if hasattr(alert_engine, "get_active_alerts"):
|
||||
try:
|
||||
raw_alerts = alert_engine.get_active_alerts()
|
||||
for alert in raw_alerts:
|
||||
alerts.append({
|
||||
"type": alert.get("type", "unknown"),
|
||||
"severity": alert.get("severity", "info"),
|
||||
"message": alert.get("message", ""),
|
||||
"timestamp": alert.get("timestamp"),
|
||||
"scope_type": alert.get("scope_type"),
|
||||
"scope_value": alert.get("scope_value"),
|
||||
})
|
||||
except Exception:
|
||||
pass
|
||||
elif hasattr(alert_engine, "_recent_alerts"):
|
||||
try:
|
||||
for alert in alert_engine._recent_alerts:
|
||||
alerts.append({
|
||||
"type": alert.get("type", "unknown"),
|
||||
"severity": alert.get("severity", "info"),
|
||||
"message": alert.get("message", ""),
|
||||
"timestamp": alert.get("timestamp"),
|
||||
})
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return alerts
|
||||
|
||||
|
||||
@router.get("/alerts/history")
|
||||
async def get_alert_history(
|
||||
request: Request,
|
||||
limit: int = 50,
|
||||
offset: int = 0,
|
||||
):
|
||||
"""Get historical alerts with pagination."""
|
||||
# Historical alert data would come from SQLite
|
||||
# For now, return empty list
|
||||
return []
|
||||
|
||||
|
||||
@router.get("/subscriptions")
|
||||
async def get_subscriptions(request: Request):
|
||||
"""Get all alert subscriptions."""
|
||||
subscription_manager = request.app.state.subscription_manager
|
||||
|
||||
if not subscription_manager:
|
||||
return []
|
||||
|
||||
try:
|
||||
subs = subscription_manager.get_all_subs()
|
||||
return [
|
||||
{
|
||||
"id": sub["id"],
|
||||
"user_id": sub["user_id"],
|
||||
"sub_type": sub["sub_type"],
|
||||
"schedule_time": sub.get("schedule_time"),
|
||||
"schedule_day": sub.get("schedule_day"),
|
||||
"scope_type": sub.get("scope_type", "mesh"),
|
||||
"scope_value": sub.get("scope_value"),
|
||||
"enabled": sub.get("enabled", 1) == 1,
|
||||
}
|
||||
for sub in subs
|
||||
]
|
||||
except Exception:
|
||||
return []
|
||||
"""Alert API routes."""
|
||||
|
||||
from fastapi import APIRouter, Request, Query
|
||||
from typing import Optional
|
||||
|
||||
router = APIRouter(tags=["alerts"])
|
||||
|
||||
|
||||
@router.get("/alerts/active")
|
||||
async def get_active_alerts(request: Request):
|
||||
"""Get currently active alerts."""
|
||||
alert_engine = getattr(request.app.state, "alert_engine", None)
|
||||
|
||||
if not alert_engine:
|
||||
return []
|
||||
|
||||
alerts = []
|
||||
|
||||
# Try get_pending_alerts first (our method)
|
||||
if hasattr(alert_engine, "get_pending_alerts"):
|
||||
try:
|
||||
raw_alerts = alert_engine.get_pending_alerts()
|
||||
for alert in raw_alerts:
|
||||
alerts.append({
|
||||
"type": alert.get("type", "unknown"),
|
||||
"severity": _map_severity(alert),
|
||||
"message": alert.get("message", ""),
|
||||
"timestamp": alert.get("timestamp"),
|
||||
"scope_type": alert.get("scope_type"),
|
||||
"scope_value": alert.get("scope_value"),
|
||||
})
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return alerts
|
||||
|
||||
|
||||
@router.get("/alerts/history")
|
||||
async def get_alert_history(
|
||||
request: Request,
|
||||
limit: int = Query(50, ge=1, le=200),
|
||||
offset: int = Query(0, ge=0),
|
||||
type: Optional[str] = Query(None),
|
||||
severity: Optional[str] = Query(None),
|
||||
):
|
||||
"""Get historical alerts with pagination and filtering.
|
||||
|
||||
Note: Alert history persistence is not yet implemented.
|
||||
Returns empty array for now.
|
||||
"""
|
||||
# Future: Query SQLite for historical alerts
|
||||
# For now, return empty with proper structure
|
||||
return {
|
||||
"items": [],
|
||||
"total": 0,
|
||||
}
|
||||
|
||||
|
||||
@router.get("/subscriptions")
|
||||
async def get_subscriptions(request: Request):
|
||||
"""Get all alert subscriptions."""
|
||||
subscription_manager = getattr(request.app.state, "subscription_manager", None)
|
||||
|
||||
if not subscription_manager:
|
||||
return []
|
||||
|
||||
try:
|
||||
subs = subscription_manager.get_all_subs()
|
||||
return [
|
||||
{
|
||||
"id": sub["id"],
|
||||
"user_id": sub["user_id"],
|
||||
"sub_type": sub["sub_type"],
|
||||
"schedule_time": sub.get("schedule_time"),
|
||||
"schedule_day": sub.get("schedule_day"),
|
||||
"scope_type": sub.get("scope_type", "mesh"),
|
||||
"scope_value": sub.get("scope_value"),
|
||||
"enabled": sub.get("enabled", 1) == 1,
|
||||
}
|
||||
for sub in subs
|
||||
]
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
|
||||
def _map_severity(alert: dict) -> str:
|
||||
"""Map alert properties to severity level."""
|
||||
if alert.get("is_critical"):
|
||||
return "critical"
|
||||
alert_type = alert.get("type", "")
|
||||
if "emergency" in alert_type:
|
||||
return "emergency"
|
||||
if "critical" in alert_type:
|
||||
return "critical"
|
||||
if "warning" in alert_type:
|
||||
return "warning"
|
||||
if "watch" in alert_type:
|
||||
return "watch"
|
||||
return "info"
|
||||
|
|
|
|||
|
|
@ -26,7 +26,9 @@ RESTART_REQUIRED_SECTIONS = {
|
|||
}
|
||||
|
||||
# Valid config section names
|
||||
VALID_SECTIONS = {
|
||||
VALID_SECTIONS = {
|
||||
"notifications",
|
||||
"environmental",
|
||||
"bot",
|
||||
"connection",
|
||||
"response",
|
||||
|
|
|
|||
|
|
@ -106,3 +106,87 @@ async def get_avalanche_data(request: Request):
|
|||
"off_season": False,
|
||||
"advisories": env_store.get_active(source="avalanche"),
|
||||
}
|
||||
|
||||
|
||||
@router.get("/env/streams")
|
||||
async def get_streams_data(request: Request):
|
||||
"""Get USGS stream gauge readings."""
|
||||
env_store = getattr(request.app.state, "env_store", None)
|
||||
|
||||
if not env_store:
|
||||
return []
|
||||
|
||||
return env_store.get_active(source="usgs")
|
||||
|
||||
|
||||
@router.get("/env/usgs/lookup/{site_id}")
|
||||
async def lookup_usgs_site(request: Request, site_id: str):
|
||||
"""Lookup USGS site metadata and NWS flood stages.
|
||||
|
||||
Returns site name, location, and flood stage thresholds from NWS NWPS.
|
||||
Used by the config UI to auto-populate fields when adding a new gauge.
|
||||
"""
|
||||
env_store = getattr(request.app.state, "env_store", None)
|
||||
|
||||
if not env_store:
|
||||
return {"error": "Environmental feeds not enabled"}
|
||||
|
||||
adapters = getattr(env_store, "_adapters", {})
|
||||
usgs_adapter = adapters.get("usgs")
|
||||
|
||||
if not usgs_adapter:
|
||||
# Create a temporary adapter for lookup
|
||||
from meshai.env.usgs import USGSStreamsAdapter
|
||||
from meshai.config import USGSConfig
|
||||
usgs_adapter = USGSStreamsAdapter(USGSConfig())
|
||||
|
||||
try:
|
||||
result = usgs_adapter.lookup_site(site_id)
|
||||
return result
|
||||
except Exception as e:
|
||||
return {"error": str(e), "site_id": site_id}
|
||||
|
||||
|
||||
@router.get("/env/traffic")
|
||||
async def get_traffic_data(request: Request):
|
||||
"""Get TomTom traffic flow data."""
|
||||
env_store = getattr(request.app.state, "env_store", None)
|
||||
|
||||
if not env_store:
|
||||
return []
|
||||
|
||||
return env_store.get_active(source="traffic")
|
||||
|
||||
|
||||
@router.get("/env/roads")
|
||||
async def get_roads_data(request: Request):
|
||||
"""Get 511 road conditions."""
|
||||
env_store = getattr(request.app.state, "env_store", None)
|
||||
|
||||
if not env_store:
|
||||
return []
|
||||
|
||||
return env_store.get_active(source="511")
|
||||
|
||||
|
||||
@router.get("/env/hotspots")
|
||||
async def get_hotspots_data(request: Request):
|
||||
"""Get NASA FIRMS satellite fire hotspots."""
|
||||
env_store = getattr(request.app.state, "env_store", None)
|
||||
|
||||
if not env_store:
|
||||
return {"hotspots": [], "new_ignitions": 0}
|
||||
|
||||
firms_adapter = getattr(env_store, "_firms", None)
|
||||
|
||||
if not firms_adapter:
|
||||
return {"hotspots": [], "new_ignitions": 0, "enabled": False}
|
||||
|
||||
hotspots = env_store.get_active(source="firms")
|
||||
new_ignitions = [h for h in hotspots if h.get("properties", {}).get("new_ignition")]
|
||||
|
||||
return {
|
||||
"enabled": True,
|
||||
"hotspots": hotspots,
|
||||
"new_ignitions": len(new_ignitions),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,356 +1,409 @@
|
|||
"""Mesh health and node API routes."""
|
||||
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
|
||||
from fastapi import APIRouter, HTTPException, Request
|
||||
|
||||
router = APIRouter(tags=["mesh"])
|
||||
|
||||
|
||||
def _serialize_health_score(score) -> dict:
|
||||
"""Serialize a HealthScore object."""
|
||||
return {
|
||||
"composite": round(score.composite, 1),
|
||||
"tier": score.tier,
|
||||
"infrastructure": round(score.infrastructure, 1),
|
||||
"utilization": round(score.utilization, 1),
|
||||
"behavior": round(score.behavior, 1),
|
||||
"power": round(score.power, 1),
|
||||
"infra_online": score.infra_online,
|
||||
"infra_total": score.infra_total,
|
||||
"util_percent": round(score.util_percent, 1),
|
||||
"flagged_nodes": score.flagged_nodes,
|
||||
"battery_warnings": score.battery_warnings,
|
||||
"solar_index": round(score.solar_index, 1),
|
||||
}
|
||||
|
||||
|
||||
def _serialize_region(region) -> dict:
|
||||
"""Serialize a RegionHealth object."""
|
||||
return {
|
||||
"name": region.name,
|
||||
"center_lat": region.center_lat,
|
||||
"center_lon": region.center_lon,
|
||||
"node_count": len(region.node_ids),
|
||||
"locality_count": len(region.localities),
|
||||
"score": _serialize_health_score(region.score),
|
||||
"node_ids": region.node_ids,
|
||||
}
|
||||
|
||||
|
||||
def _format_timestamp(ts: Optional[float]) -> Optional[str]:
|
||||
"""Format a Unix timestamp as ISO string."""
|
||||
if not ts or ts <= 0:
|
||||
return None
|
||||
try:
|
||||
return datetime.fromtimestamp(ts).isoformat()
|
||||
except (ValueError, OSError):
|
||||
return None
|
||||
|
||||
|
||||
@router.get("/health")
|
||||
async def get_health(request: Request):
|
||||
"""Get mesh health data."""
|
||||
health_engine = request.app.state.health_engine
|
||||
|
||||
if not health_engine or not health_engine.mesh_health:
|
||||
return {
|
||||
"score": 0,
|
||||
"tier": "Unknown",
|
||||
"message": "Health engine not ready",
|
||||
}
|
||||
|
||||
health = health_engine.mesh_health
|
||||
score = health.score
|
||||
|
||||
return {
|
||||
"score": round(score.composite, 1),
|
||||
"tier": score.tier,
|
||||
"pillars": {
|
||||
"infrastructure": round(score.infrastructure, 1),
|
||||
"utilization": round(score.utilization, 1),
|
||||
"behavior": round(score.behavior, 1),
|
||||
"power": round(score.power, 1),
|
||||
},
|
||||
"infra_online": score.infra_online,
|
||||
"infra_total": score.infra_total,
|
||||
"util_percent": round(score.util_percent, 1),
|
||||
"flagged_nodes": score.flagged_nodes,
|
||||
"battery_warnings": score.battery_warnings,
|
||||
"total_nodes": health.total_nodes,
|
||||
"total_regions": health.total_regions,
|
||||
"unlocated_count": len(health.unlocated_nodes),
|
||||
"last_computed": _format_timestamp(health.last_computed),
|
||||
"recommendations": [], # TODO: Add recommendations
|
||||
}
|
||||
|
||||
|
||||
@router.get("/nodes")
|
||||
async def get_nodes(request: Request):
|
||||
"""Get all nodes."""
|
||||
data_store = request.app.state.data_store
|
||||
health_engine = request.app.state.health_engine
|
||||
|
||||
if not data_store:
|
||||
return []
|
||||
|
||||
try:
|
||||
raw_nodes = data_store.get_all_nodes()
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
nodes = []
|
||||
for node in raw_nodes:
|
||||
# Extract node_num from various formats
|
||||
node_num = node.get("nodeNum") or node.get("num") or node.get("node_num")
|
||||
if node_num is None:
|
||||
node_id = node.get("node_id") or node.get("id")
|
||||
if node_id and isinstance(node_id, str):
|
||||
try:
|
||||
node_num = int(node_id.lstrip("!"), 16)
|
||||
except ValueError:
|
||||
continue
|
||||
|
||||
if node_num is None:
|
||||
continue
|
||||
|
||||
# Get health data if available
|
||||
health_data = {}
|
||||
if health_engine and health_engine.mesh_health:
|
||||
node_health = health_engine.mesh_health.nodes.get(str(node_num))
|
||||
if node_health:
|
||||
health_data = {
|
||||
"region": node_health.region,
|
||||
"locality": node_health.locality,
|
||||
"is_infrastructure": node_health.is_infrastructure,
|
||||
"is_online": node_health.is_online,
|
||||
"packet_count_24h": node_health.packet_count_24h,
|
||||
}
|
||||
|
||||
# Build node dict
|
||||
node_dict = {
|
||||
"node_num": node_num,
|
||||
"node_id_hex": f"!{node_num:08x}",
|
||||
"short_name": node.get("shortName") or node.get("short_name") or "",
|
||||
"long_name": node.get("longName") or node.get("long_name") or "",
|
||||
"role": node.get("role") or "",
|
||||
"latitude": node.get("latitude"),
|
||||
"longitude": node.get("longitude"),
|
||||
"last_heard": _format_timestamp(node.get("last_heard")),
|
||||
"battery_level": node.get("battery_level") or node.get("batteryLevel"),
|
||||
"voltage": node.get("voltage"),
|
||||
"snr": node.get("snr"),
|
||||
"firmware": node.get("firmware_version") or node.get("firmwareVersion") or "",
|
||||
"hardware": node.get("hw_model") or node.get("hwModel") or "",
|
||||
"uptime": node.get("uptime_seconds") or node.get("uptimeSeconds"),
|
||||
"sources": node.get("_sources", []),
|
||||
**health_data,
|
||||
}
|
||||
nodes.append(node_dict)
|
||||
|
||||
return nodes
|
||||
|
||||
|
||||
@router.get("/nodes/{node_num}")
|
||||
async def get_node_detail(node_num: int, request: Request):
|
||||
"""Get detailed info for a specific node."""
|
||||
data_store = request.app.state.data_store
|
||||
health_engine = request.app.state.health_engine
|
||||
|
||||
if not data_store:
|
||||
raise HTTPException(status_code=404, detail="Data store not available")
|
||||
|
||||
# Find the node
|
||||
try:
|
||||
raw_nodes = data_store.get_all_nodes()
|
||||
except Exception:
|
||||
raise HTTPException(status_code=500, detail="Failed to fetch nodes")
|
||||
|
||||
target_node = None
|
||||
for node in raw_nodes:
|
||||
n_num = node.get("nodeNum") or node.get("num") or node.get("node_num")
|
||||
if n_num is None:
|
||||
node_id = node.get("node_id") or node.get("id")
|
||||
if node_id and isinstance(node_id, str):
|
||||
try:
|
||||
n_num = int(node_id.lstrip("!"), 16)
|
||||
except ValueError:
|
||||
continue
|
||||
|
||||
if n_num == node_num:
|
||||
target_node = node
|
||||
break
|
||||
|
||||
if not target_node:
|
||||
raise HTTPException(status_code=404, detail=f"Node {node_num} not found")
|
||||
|
||||
# Get health data
|
||||
health_data = {}
|
||||
if health_engine and health_engine.mesh_health:
|
||||
node_health = health_engine.mesh_health.nodes.get(str(node_num))
|
||||
if node_health:
|
||||
health_data = {
|
||||
"region": node_health.region,
|
||||
"locality": node_health.locality,
|
||||
"is_infrastructure": node_health.is_infrastructure,
|
||||
"is_online": node_health.is_online,
|
||||
"packet_count_24h": node_health.packet_count_24h,
|
||||
"text_packet_count_24h": node_health.text_packet_count_24h,
|
||||
"non_text_packets": node_health.non_text_packets,
|
||||
"has_solar": node_health.has_solar,
|
||||
}
|
||||
|
||||
# Get neighbors from edges
|
||||
neighbors = []
|
||||
try:
|
||||
edges = data_store.get_all_edges()
|
||||
for edge in edges:
|
||||
from_num = edge.get("from_node") or edge.get("from")
|
||||
to_num = edge.get("to_node") or edge.get("to")
|
||||
|
||||
if from_num == node_num:
|
||||
neighbors.append({
|
||||
"node_num": to_num,
|
||||
"snr": edge.get("snr"),
|
||||
})
|
||||
elif to_num == node_num:
|
||||
neighbors.append({
|
||||
"node_num": from_num,
|
||||
"snr": edge.get("snr"),
|
||||
})
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return {
|
||||
"node_num": node_num,
|
||||
"node_id_hex": f"!{node_num:08x}",
|
||||
"short_name": target_node.get("shortName") or target_node.get("short_name") or "",
|
||||
"long_name": target_node.get("longName") or target_node.get("long_name") or "",
|
||||
"role": target_node.get("role") or "",
|
||||
"latitude": target_node.get("latitude"),
|
||||
"longitude": target_node.get("longitude"),
|
||||
"last_heard": _format_timestamp(target_node.get("last_heard")),
|
||||
"battery_level": target_node.get("battery_level") or target_node.get("batteryLevel"),
|
||||
"voltage": target_node.get("voltage"),
|
||||
"snr": target_node.get("snr"),
|
||||
"firmware": target_node.get("firmware_version") or target_node.get("firmwareVersion") or "",
|
||||
"hardware": target_node.get("hw_model") or target_node.get("hwModel") or "",
|
||||
"uptime": target_node.get("uptime_seconds") or target_node.get("uptimeSeconds"),
|
||||
"sources": target_node.get("_sources", []),
|
||||
"neighbors": neighbors,
|
||||
**health_data,
|
||||
}
|
||||
|
||||
|
||||
@router.get("/regions")
|
||||
async def get_regions(request: Request):
|
||||
"""Get region summaries."""
|
||||
health_engine = request.app.state.health_engine
|
||||
|
||||
if not health_engine or not health_engine.mesh_health:
|
||||
return []
|
||||
|
||||
regions = []
|
||||
for region in health_engine.mesh_health.regions:
|
||||
# Count online infrastructure
|
||||
infra_online = 0
|
||||
infra_total = 0
|
||||
online_count = 0
|
||||
|
||||
for nid in region.node_ids:
|
||||
node = health_engine.mesh_health.nodes.get(nid)
|
||||
if node:
|
||||
if node.is_online:
|
||||
online_count += 1
|
||||
if node.is_infrastructure:
|
||||
infra_total += 1
|
||||
if node.is_online:
|
||||
infra_online += 1
|
||||
|
||||
regions.append({
|
||||
"name": region.name,
|
||||
"local_name": region.name, # Could be overridden by region_labels
|
||||
"node_count": len(region.node_ids),
|
||||
"infra_count": infra_total,
|
||||
"infra_online": infra_online,
|
||||
"online_count": online_count,
|
||||
"score": round(region.score.composite, 1),
|
||||
"tier": region.score.tier,
|
||||
"center_lat": region.center_lat,
|
||||
"center_lon": region.center_lon,
|
||||
})
|
||||
|
||||
return regions
|
||||
|
||||
|
||||
@router.get("/sources")
|
||||
async def get_sources(request: Request):
|
||||
"""Get per-source health information."""
|
||||
data_store = request.app.state.data_store
|
||||
|
||||
if not data_store:
|
||||
return []
|
||||
|
||||
sources = []
|
||||
try:
|
||||
for name, source in data_store._sources.items():
|
||||
source_info = {
|
||||
"name": name,
|
||||
"type": "meshview" if hasattr(source, "edges") else "meshmonitor",
|
||||
"url": getattr(source, "url", ""),
|
||||
"is_loaded": source.is_loaded,
|
||||
"last_error": source.last_error,
|
||||
"consecutive_errors": getattr(source, "consecutive_errors", 0),
|
||||
"response_time_ms": getattr(source, "last_response_time_ms", None),
|
||||
"tick_count": getattr(source, "tick_count", 0),
|
||||
"node_count": len(source.nodes) if hasattr(source, "nodes") else 0,
|
||||
}
|
||||
sources.append(source_info)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return sources
|
||||
|
||||
|
||||
@router.get("/edges")
|
||||
async def get_edges(request: Request):
|
||||
"""Get neighbor/edge relationships."""
|
||||
data_store = request.app.state.data_store
|
||||
|
||||
if not data_store:
|
||||
return []
|
||||
|
||||
try:
|
||||
raw_edges = data_store.get_all_edges()
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
edges = []
|
||||
for edge in raw_edges:
|
||||
from_num = edge.get("from_node") or edge.get("from")
|
||||
to_num = edge.get("to_node") or edge.get("to")
|
||||
snr = edge.get("snr")
|
||||
|
||||
# Derive quality from SNR
|
||||
if snr is None:
|
||||
quality = "unknown"
|
||||
elif snr > 12:
|
||||
quality = "excellent"
|
||||
elif snr > 8:
|
||||
quality = "good"
|
||||
elif snr > 5:
|
||||
quality = "fair"
|
||||
elif snr > 3:
|
||||
quality = "marginal"
|
||||
else:
|
||||
quality = "poor"
|
||||
|
||||
edges.append({
|
||||
"from_node": from_num,
|
||||
"to_node": to_num,
|
||||
"snr": snr,
|
||||
"quality": quality,
|
||||
})
|
||||
|
||||
return edges
|
||||
"""Mesh health and node API routes."""
|
||||
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
|
||||
from fastapi import APIRouter, HTTPException, Request
|
||||
|
||||
router = APIRouter(tags=["mesh"])
|
||||
|
||||
|
||||
def _serialize_health_score(score) -> dict:
|
||||
"""Serialize a HealthScore object."""
|
||||
return {
|
||||
"composite": round(score.composite, 1),
|
||||
"tier": score.tier,
|
||||
"infrastructure": round(score.infrastructure, 1),
|
||||
"utilization": round(score.utilization, 1),
|
||||
"behavior": round(score.behavior, 1),
|
||||
"power": round(score.power, 1),
|
||||
"infra_online": score.infra_online,
|
||||
"infra_total": score.infra_total,
|
||||
"util_percent": round(score.util_percent, 1),
|
||||
"util_max_percent": round(getattr(score, 'util_max_percent', score.util_percent), 1),
|
||||
"util_method": getattr(score, 'util_method', 'unknown'),
|
||||
"util_node_count": getattr(score, 'util_node_count', 0),
|
||||
"flagged_nodes": score.flagged_nodes,
|
||||
"battery_warnings": score.battery_warnings,
|
||||
"solar_index": round(score.solar_index, 1),
|
||||
}
|
||||
|
||||
|
||||
def _serialize_region(region) -> dict:
|
||||
"""Serialize a RegionHealth object."""
|
||||
return {
|
||||
"name": region.name,
|
||||
"center_lat": region.center_lat,
|
||||
"center_lon": region.center_lon,
|
||||
"node_count": len(region.node_ids),
|
||||
"locality_count": len(region.localities),
|
||||
"score": _serialize_health_score(region.score),
|
||||
"node_ids": region.node_ids,
|
||||
}
|
||||
|
||||
|
||||
def _format_timestamp(ts: Optional[float]) -> Optional[str]:
|
||||
"""Format a Unix timestamp as ISO string."""
|
||||
if not ts or ts <= 0:
|
||||
return None
|
||||
try:
|
||||
return datetime.fromtimestamp(ts).isoformat()
|
||||
except (ValueError, OSError):
|
||||
return None
|
||||
|
||||
|
||||
@router.get("/health")
|
||||
async def get_health(request: Request):
|
||||
"""Get mesh health data."""
|
||||
health_engine = request.app.state.health_engine
|
||||
|
||||
if not health_engine or not health_engine.mesh_health:
|
||||
return {
|
||||
"score": 0,
|
||||
"tier": "Unknown",
|
||||
"message": "Health engine not ready",
|
||||
}
|
||||
|
||||
health = health_engine.mesh_health
|
||||
score = health.score
|
||||
|
||||
return {
|
||||
"score": round(score.composite, 1),
|
||||
"tier": score.tier,
|
||||
"pillars": {
|
||||
"infrastructure": round(score.infrastructure, 1),
|
||||
"utilization": round(score.utilization, 1),
|
||||
"behavior": round(score.behavior, 1),
|
||||
"power": round(score.power, 1),
|
||||
},
|
||||
"infra_online": score.infra_online,
|
||||
"infra_total": score.infra_total,
|
||||
"util_percent": round(score.util_percent, 1),
|
||||
"util_max_percent": round(getattr(score, 'util_max_percent', score.util_percent), 1),
|
||||
"util_method": getattr(score, 'util_method', 'unknown'),
|
||||
"util_node_count": getattr(score, 'util_node_count', 0),
|
||||
"flagged_nodes": score.flagged_nodes,
|
||||
"battery_warnings": score.battery_warnings,
|
||||
"total_nodes": health.total_nodes,
|
||||
"total_regions": health.total_regions,
|
||||
"unlocated_count": len(health.unlocated_nodes),
|
||||
"last_computed": _format_timestamp(health.last_computed),
|
||||
"recommendations": [], # TODO: Add recommendations
|
||||
}
|
||||
|
||||
|
||||
@router.get("/nodes")
|
||||
async def get_nodes(request: Request):
|
||||
"""Get all nodes."""
|
||||
data_store = request.app.state.data_store
|
||||
health_engine = request.app.state.health_engine
|
||||
|
||||
if not data_store:
|
||||
return []
|
||||
|
||||
try:
|
||||
raw_nodes = data_store.get_all_nodes()
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
nodes = []
|
||||
for node in raw_nodes:
|
||||
# Extract node_num from various formats
|
||||
node_num = node.get("nodeNum") or node.get("num") or node.get("node_num")
|
||||
if node_num is None:
|
||||
node_id = node.get("node_id") or node.get("id")
|
||||
if node_id and isinstance(node_id, str):
|
||||
try:
|
||||
node_num = int(node_id.lstrip("!"), 16)
|
||||
except ValueError:
|
||||
continue
|
||||
|
||||
if node_num is None:
|
||||
continue
|
||||
|
||||
# Get health data if available
|
||||
health_data = {}
|
||||
if health_engine and health_engine.mesh_health:
|
||||
node_health = health_engine.mesh_health.nodes.get(str(node_num))
|
||||
if node_health:
|
||||
health_data = {
|
||||
"region": node_health.region,
|
||||
"locality": node_health.locality,
|
||||
"is_infrastructure": node_health.is_infrastructure,
|
||||
"is_online": node_health.is_online,
|
||||
"packet_count_24h": node_health.packet_count_24h,
|
||||
}
|
||||
|
||||
# Build node dict
|
||||
node_dict = {
|
||||
"node_num": node_num,
|
||||
"node_id_hex": f"!{node_num:08x}",
|
||||
"short_name": node.get("shortName") or node.get("short_name") or "",
|
||||
"long_name": node.get("longName") or node.get("long_name") or "",
|
||||
"role": node.get("role") or "",
|
||||
"latitude": node.get("latitude"),
|
||||
"longitude": node.get("longitude"),
|
||||
"last_heard": _format_timestamp(node.get("last_heard")),
|
||||
"battery_level": node.get("battery_level") or node.get("batteryLevel"),
|
||||
"voltage": node.get("voltage"),
|
||||
"snr": node.get("snr"),
|
||||
"firmware": node.get("firmware_version") or node.get("firmwareVersion") or "",
|
||||
"hardware": node.get("hw_model") or node.get("hwModel") or "",
|
||||
"uptime": node.get("uptime_seconds") or node.get("uptimeSeconds"),
|
||||
"sources": node.get("_sources", []),
|
||||
**health_data,
|
||||
}
|
||||
nodes.append(node_dict)
|
||||
|
||||
return nodes
|
||||
|
||||
|
||||
@router.get("/nodes/{node_num}")
|
||||
async def get_node_detail(node_num: int, request: Request):
|
||||
"""Get detailed info for a specific node."""
|
||||
data_store = request.app.state.data_store
|
||||
health_engine = request.app.state.health_engine
|
||||
|
||||
if not data_store:
|
||||
raise HTTPException(status_code=404, detail="Data store not available")
|
||||
|
||||
# Find the node
|
||||
try:
|
||||
raw_nodes = data_store.get_all_nodes()
|
||||
except Exception:
|
||||
raise HTTPException(status_code=500, detail="Failed to fetch nodes")
|
||||
|
||||
target_node = None
|
||||
for node in raw_nodes:
|
||||
n_num = node.get("nodeNum") or node.get("num") or node.get("node_num")
|
||||
if n_num is None:
|
||||
node_id = node.get("node_id") or node.get("id")
|
||||
if node_id and isinstance(node_id, str):
|
||||
try:
|
||||
n_num = int(node_id.lstrip("!"), 16)
|
||||
except ValueError:
|
||||
continue
|
||||
|
||||
if n_num == node_num:
|
||||
target_node = node
|
||||
break
|
||||
|
||||
if not target_node:
|
||||
raise HTTPException(status_code=404, detail=f"Node {node_num} not found")
|
||||
|
||||
# Get health data
|
||||
health_data = {}
|
||||
if health_engine and health_engine.mesh_health:
|
||||
node_health = health_engine.mesh_health.nodes.get(str(node_num))
|
||||
if node_health:
|
||||
health_data = {
|
||||
"region": node_health.region,
|
||||
"locality": node_health.locality,
|
||||
"is_infrastructure": node_health.is_infrastructure,
|
||||
"is_online": node_health.is_online,
|
||||
"packet_count_24h": node_health.packet_count_24h,
|
||||
"text_packet_count_24h": node_health.text_packet_count_24h,
|
||||
"non_text_packets": node_health.non_text_packets,
|
||||
"has_solar": node_health.has_solar,
|
||||
}
|
||||
|
||||
# Get neighbors from edges
|
||||
neighbors = []
|
||||
try:
|
||||
edges = data_store.get_all_edges()
|
||||
for edge in edges:
|
||||
from_num = edge.get("from_node") or edge.get("from")
|
||||
to_num = edge.get("to_node") or edge.get("to")
|
||||
|
||||
if from_num == node_num:
|
||||
neighbors.append({
|
||||
"node_num": to_num,
|
||||
"snr": edge.get("snr"),
|
||||
})
|
||||
elif to_num == node_num:
|
||||
neighbors.append({
|
||||
"node_num": from_num,
|
||||
"snr": edge.get("snr"),
|
||||
})
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return {
|
||||
"node_num": node_num,
|
||||
"node_id_hex": f"!{node_num:08x}",
|
||||
"short_name": target_node.get("shortName") or target_node.get("short_name") or "",
|
||||
"long_name": target_node.get("longName") or target_node.get("long_name") or "",
|
||||
"role": target_node.get("role") or "",
|
||||
"latitude": target_node.get("latitude"),
|
||||
"longitude": target_node.get("longitude"),
|
||||
"last_heard": _format_timestamp(target_node.get("last_heard")),
|
||||
"battery_level": target_node.get("battery_level") or target_node.get("batteryLevel"),
|
||||
"voltage": target_node.get("voltage"),
|
||||
"snr": target_node.get("snr"),
|
||||
"firmware": target_node.get("firmware_version") or target_node.get("firmwareVersion") or "",
|
||||
"hardware": target_node.get("hw_model") or target_node.get("hwModel") or "",
|
||||
"uptime": target_node.get("uptime_seconds") or target_node.get("uptimeSeconds"),
|
||||
"sources": target_node.get("_sources", []),
|
||||
"neighbors": neighbors,
|
||||
**health_data,
|
||||
}
|
||||
|
||||
|
||||
@router.get("/regions")
|
||||
async def get_regions(request: Request):
|
||||
"""Get region summaries."""
|
||||
health_engine = request.app.state.health_engine
|
||||
|
||||
if not health_engine or not health_engine.mesh_health:
|
||||
return []
|
||||
|
||||
regions = []
|
||||
for region in health_engine.mesh_health.regions:
|
||||
# Count online infrastructure
|
||||
infra_online = 0
|
||||
infra_total = 0
|
||||
online_count = 0
|
||||
|
||||
for nid in region.node_ids:
|
||||
node = health_engine.mesh_health.nodes.get(nid)
|
||||
if node:
|
||||
if node.is_online:
|
||||
online_count += 1
|
||||
if node.is_infrastructure:
|
||||
infra_total += 1
|
||||
if node.is_online:
|
||||
infra_online += 1
|
||||
|
||||
regions.append({
|
||||
"name": region.name,
|
||||
"local_name": region.name, # Could be overridden by region_labels
|
||||
"node_count": len(region.node_ids),
|
||||
"infra_count": infra_total,
|
||||
"infra_online": infra_online,
|
||||
"online_count": online_count,
|
||||
"score": round(region.score.composite, 1),
|
||||
"tier": region.score.tier,
|
||||
"center_lat": region.center_lat,
|
||||
"center_lon": region.center_lon,
|
||||
})
|
||||
|
||||
return regions
|
||||
|
||||
|
||||
@router.get("/sources")
|
||||
async def get_sources(request: Request):
|
||||
"""Get per-source health information."""
|
||||
data_store = request.app.state.data_store
|
||||
|
||||
if not data_store:
|
||||
return []
|
||||
|
||||
sources = []
|
||||
try:
|
||||
for name, source in data_store._sources.items():
|
||||
source_info = {
|
||||
"name": name,
|
||||
"type": "meshview" if hasattr(source, "edges") else "meshmonitor",
|
||||
"url": getattr(source, "url", ""),
|
||||
"is_loaded": source.is_loaded,
|
||||
"last_error": source.last_error,
|
||||
"consecutive_errors": getattr(source, "consecutive_errors", 0),
|
||||
"response_time_ms": getattr(source, "last_response_time_ms", None),
|
||||
"tick_count": getattr(source, "tick_count", 0),
|
||||
"node_count": len(source.nodes) if hasattr(source, "nodes") else 0,
|
||||
}
|
||||
sources.append(source_info)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return sources
|
||||
|
||||
|
||||
@router.get("/edges")
|
||||
async def get_edges(request: Request):
|
||||
"""Get neighbor/edge relationships."""
|
||||
data_store = request.app.state.data_store
|
||||
|
||||
if not data_store:
|
||||
return []
|
||||
|
||||
try:
|
||||
raw_edges = data_store.get_all_edges()
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
edges = []
|
||||
for edge in raw_edges:
|
||||
from_num = edge.get("from_node") or edge.get("from")
|
||||
to_num = edge.get("to_node") or edge.get("to")
|
||||
snr = edge.get("snr")
|
||||
|
||||
# Derive quality from SNR
|
||||
if snr is None:
|
||||
quality = "unknown"
|
||||
elif snr > 12:
|
||||
quality = "excellent"
|
||||
elif snr > 8:
|
||||
quality = "good"
|
||||
elif snr > 5:
|
||||
quality = "fair"
|
||||
elif snr > 3:
|
||||
quality = "marginal"
|
||||
else:
|
||||
quality = "poor"
|
||||
|
||||
edges.append({
|
||||
"from_node": from_num,
|
||||
"to_node": to_num,
|
||||
"snr": snr,
|
||||
"quality": quality,
|
||||
})
|
||||
|
||||
return edges
|
||||
|
||||
|
||||
|
||||
@router.get("/channels")
|
||||
async def get_channels(request: Request):
|
||||
"""Get radio channels from the connected Meshtastic interface."""
|
||||
connector = getattr(request.app.state, "connector", None)
|
||||
|
||||
if not connector or not connector.connected:
|
||||
return []
|
||||
|
||||
try:
|
||||
interface = connector._interface
|
||||
if not interface or not hasattr(interface, "localNode"):
|
||||
return []
|
||||
|
||||
local_node = interface.localNode
|
||||
if not local_node or not hasattr(local_node, "channels"):
|
||||
return []
|
||||
|
||||
channels = []
|
||||
for ch in local_node.channels:
|
||||
if ch is None:
|
||||
continue
|
||||
|
||||
# Get channel settings
|
||||
settings = getattr(ch, "settings", None)
|
||||
name = getattr(settings, "name", "") if settings else ""
|
||||
role_val = getattr(ch, "role", 0)
|
||||
|
||||
# Map role enum to string
|
||||
role_map = {0: "DISABLED", 1: "PRIMARY", 2: "SECONDARY"}
|
||||
role = role_map.get(role_val, "UNKNOWN")
|
||||
|
||||
channels.append({
|
||||
"index": ch.index,
|
||||
"name": name or f"Channel {ch.index}",
|
||||
"role": role,
|
||||
"enabled": role_val != 0,
|
||||
})
|
||||
|
||||
return channels
|
||||
|
||||
except Exception as e:
|
||||
import logging
|
||||
logging.getLogger(__name__).warning(f"Failed to get channels: {e}")
|
||||
return []
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ def create_app() -> FastAPI:
|
|||
from .api.mesh_routes import router as mesh_router
|
||||
from .api.env_routes import router as env_router
|
||||
from .api.alert_routes import router as alert_router
|
||||
from .api.notification_routes import router as notification_router
|
||||
|
||||
app.include_router(system_router, prefix="/api")
|
||||
app.include_router(config_router, prefix="/api")
|
||||
|
|
@ -59,6 +60,7 @@ def create_app() -> FastAPI:
|
|||
app.include_router(env_router, prefix="/api")
|
||||
app.include_router(alert_router, prefix="/api")
|
||||
|
||||
app.include_router(notification_router, prefix="/api")
|
||||
# WebSocket router (no prefix, path is /ws/live)
|
||||
app.include_router(ws_router)
|
||||
|
||||
|
|
@ -110,6 +112,8 @@ async def start_dashboard(meshai_instance: "MeshAI") -> DashboardBroadcaster:
|
|||
app.state.alert_engine = getattr(meshai_instance, "alert_engine", None)
|
||||
app.state.env_store = getattr(meshai_instance, "env_store", None)
|
||||
app.state.subscription_manager = meshai_instance.subscription_manager
|
||||
app.state.notification_router = getattr(meshai_instance, "notification_router", None)
|
||||
app.state.connector = meshai_instance.connector
|
||||
|
||||
# Create broadcaster and attach to app state
|
||||
broadcaster = DashboardBroadcaster()
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
513
meshai/dashboard/static/assets/index-BXyt_EfK.js
Normal file
513
meshai/dashboard/static/assets/index-BXyt_EfK.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
meshai/dashboard/static/assets/index-CtFYHJy4.css
Normal file
1
meshai/dashboard/static/assets/index-CtFYHJy4.css
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -1,17 +1,17 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en" class="dark">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>MeshAI Dashboard</title>
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500;600;700&display=swap" rel="stylesheet">
|
||||
<script type="module" crossorigin src="/assets/index-BaC2Rd9C.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/assets/index-0HCYKWnt.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
</body>
|
||||
</html>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" class="dark">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>MeshAI Dashboard</title>
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500;600;700&display=swap" rel="stylesheet">
|
||||
<script type="module" crossorigin src="/assets/index-BXyt_EfK.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/assets/index-CtFYHJy4.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue