Return last_exposure_no in get_spectrogaph_status

src/lvmapi/routers/spectrographs.py

@@ -12,7 +12,7 @@
 
 import polars
 from fastapi import APIRouter, HTTPException, Query
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 from lvmapi.tools import (
     get_spectrograph_mechanics,
@@ -32,6 +32,17 @@ class SplitDataFrameToDict(BaseModel):
     data: list[tuple]
 
 
+class SpecStatusResponse(BaseModel):
+    status: dict[Spectrographs, SpecStatus] = Field(
+        ...,
+        description="The status of each spectrograph",
+    )
+    last_exposure_no: int = Field(
+        ...,
+        description="The last exposure number",
+    )
+
+
 router = APIRouter(prefix="/spectrographs", tags=["spectrographs"])
 
 
@@ -42,17 +53,16 @@ async def get_cryostats() -> list[str]:
     return list(get_args(Spectrographs))
 
 
-@router.get("/status", summary="Returns the spectrograph status")
-async def get_status(
-    spec: Spectrographs | None = None,
-) -> dict[Spectrographs, SpecStatus]:
+@router.get(
+    "/status",
+    summary="Returns the spectrograph status",
+    response_model=SpecStatusResponse,
+)
+async def get_status(spec: Spectrographs | None = None) -> SpecStatusResponse:
     """Returns the spectrograph status."""
 
-    status = await get_spectrogaph_status()
-    if spec:
-        return {spec: status[spec]}
-
-    return status
+    spec_status = await get_spectrogaph_status()
+    return SpecStatusResponse(status=spec_status[0], last_exposure_no=spec_status[1])
 
 
 @router.get(

src/lvmapi/tools/spectrograph.py

@@ -271,7 +271,7 @@ async def read_thermistors(
     return df
 
 
-async def get_spectrogaph_status():
+async def get_spectrogaph_status() -> tuple[dict[Spectrographs, SpecStatus], int]:
     """Returns the status of the spectrograph (integrating, reading, etc.)"""
 
     spec_names = get_args(Spectrographs)
@@ -288,6 +288,7 @@ async def get_spectrogaph_status():
                 )
 
     result: dict[Spectrographs, SpecStatus] = {}
+    last_exposure_no: int = -1
 
     for task in group.results():
         if task.status.did_fail:
@@ -308,8 +309,11 @@ async def get_spectrogaph_status():
         else:
             result[controller] = "unknown"
 
+        if "last_exposure_no" in status and status[last_exposure_no] > last_exposure_no:
+            last_exposure_no = status["last_exposure_no"]
+
     for spec in spec_names:
         if spec not in result:
             result[spec] = "unknown"
 
-    return result
+    return result, last_exposure_no