Move SLM control center groundwork onto dev

backend/routers/slm_dashboard.py

@@ -10,6 +10,7 @@ from fastapi.responses import HTMLResponse
 from sqlalchemy.orm import Session
 from sqlalchemy import func
 from datetime import datetime, timedelta
+import asyncio
 import httpx
 import logging
 import os
@@ -60,7 +61,13 @@ async def get_slm_stats(request: Request, db: Session = Depends(get_db)):
 async def get_slm_units(
     request: Request,
     db: Session = Depends(get_db),
+<<<<<<< Updated upstream
     search: str = Query(None)
+=======
+    search: str = Query(None),
+    project: str = Query(None),
+    include_measurement: bool = Query(False),
+>>>>>>> Stashed changes
 ):
     """
     Get list of SLM units for the sidebar.
@@ -77,10 +84,39 @@ async def get_slm_units(
             (RosterUnit.address.like(search_term))
         )
 
-    # Only show deployed units by default
-    units = query.filter_by(deployed=True, retired=False).order_by(RosterUnit.id).all()
+    units = query.order_by(
+        RosterUnit.retired.asc(),
+        RosterUnit.deployed.desc(),
+        RosterUnit.id.asc()
+    ).all()
 
-    return templates.TemplateResponse("partials/slm_unit_list.html", {
+    one_hour_ago = datetime.utcnow() - timedelta(hours=1)
+    for unit in units:
+        unit.is_recent = bool(unit.slm_last_check and unit.slm_last_check > one_hour_ago)
+
+    if include_measurement:
+        async def fetch_measurement_state(client: httpx.AsyncClient, unit_id: str) -> str | None:
+            try:
+                response = await client.get(f"{SLMM_BASE_URL}/api/nl43/{unit_id}/measurement-state")
+                if response.status_code == 200:
+                    return response.json().get("measurement_state")
+            except Exception:
+                return None
+            return None
+
+        deployed_units = [unit for unit in units if unit.deployed and not unit.retired]
+        if deployed_units:
+            async with httpx.AsyncClient(timeout=3.0) as client:
+                tasks = [fetch_measurement_state(client, unit.id) for unit in deployed_units]
+                results = await asyncio.gather(*tasks, return_exceptions=True)
+
+            for unit, state in zip(deployed_units, results):
+                if isinstance(state, Exception):
+                    unit.measurement_state = None
+                else:
+                    unit.measurement_state = state
+
+    return templates.TemplateResponse("partials/slm_device_list.html", {
         "request": request,
         "units": units
     })