Release v1.6.0 dashboard architecture cleanup

app/api/v1/actuators.py

@@ -326,13 +326,10 @@ def _dashboard_overview(
     include_background: bool,
     include_actuators: bool,
 ) -> DashboardOverview:
-    cache_payload = _load_entity_cache_payload(request)
-    raw_entities = cache_payload.get("entities", [])
-    if not isinstance(raw_entities, list):
-        raw_entities = []
-    raw_updated_at = cache_payload.get("updated_at")
+    cache_status = _load_entity_cache_status(request)
+    raw_updated_at = cache_status.get("updated_at")
     updated_at = raw_updated_at if isinstance(raw_updated_at, str) else None
-    raw_groups = cache_payload.get("discovery_groups", [])
+    raw_groups = cache_status.get("discovery_groups", [])
     cached_groups = [
         DashboardDiscoveryGroup.model_validate(group)
         for group in raw_groups
@@ -350,6 +347,9 @@ def _dashboard_overview(
     job_p95_duration_ms, slow_job_count, performance_status = _performance_status(jobs)
     anomaly_count = sum(record.anomaly_count for record in actuators)
     critical_anomaly_count = sum(record.critical_anomaly_count for record in actuators)
+    entity_count = cache_status.get("entity_count")
+    if not isinstance(entity_count, int):
+        entity_count = 0
     return DashboardOverview(
         system=DashboardSystemStatus(
             websocket_status=getattr(ws_status, "status", "unavailable"),
@@ -373,9 +373,9 @@ def _dashboard_overview(
             critical_anomaly_count=critical_anomaly_count,
         ),
         cache=EntityCacheStatus(
-            available=bool(raw_entities),
+            available=bool(entity_count),
             updated_at=updated_at,
-            entity_count=len(raw_entities),
+            entity_count=entity_count,
         ),
         actuators=actuators,
         discovery_groups=cached_groups,
@@ -846,6 +846,11 @@ def _load_cached_entity_map(
 ) -> dict[str, HaEntitySummary]:
     if not entity_ids:
         return {}
+    cache = getattr(request.app.state, "dashboard_cache", None)
+    if isinstance(cache, DashboardCache):
+        cached_result = cache.load_entity_map(entity_ids)
+        if cached_result:
+            return cached_result
     payload = _load_entity_cache_payload(request)
     raw_entities = payload.get("entities", [])
     if not isinstance(raw_entities, list):
@@ -864,6 +869,29 @@ def _load_cached_entity_map(
     return result
 
 
+def _load_entity_cache_status(request: Request) -> dict[str, object]:
+    cache = getattr(request.app.state, "dashboard_cache", None)
+    if isinstance(cache, DashboardCache):
+        status_payload = cache.load_status()
+        if status_payload.get("entity_count"):
+            return status_payload
+    path = _entity_cache_path(request)
+    if not path.exists():
+        return {}
+    try:
+        payload = json.loads(path.read_text(encoding="utf-8"))
+    except (OSError, TypeError, ValueError):
+        return {}
+    if not isinstance(payload, dict):
+        return {}
+    raw_entities = payload.get("entities", [])
+    return {
+        "updated_at": payload.get("updated_at"),
+        "discovery_groups": payload.get("discovery_groups", []),
+        "entity_count": len(raw_entities) if isinstance(raw_entities, list) else 0,
+    }
+
+
 def _load_entity_cache_payload(request: Request) -> dict[str, object]:
     cache = getattr(request.app.state, "dashboard_cache", None)
     if isinstance(cache, DashboardCache):