Endpoint for getting rsyncer info direct from the rsyncer

Author: d-j-hatton

src/murfey/instrument_server/api.py

@@ -232,6 +232,26 @@ def restart_rsyncer(session_id: MurfeySessionID, rsyncer_source: RsyncerSource):
     return {"success": True}
 
 
+class RSyncerInfo(BaseModel):
+    source: str
+    num_files_transferred: int
+    num_files_in_queue: int
+
+
+@router.get("/sessions/{session_id}/rsyncer_info")
+def get_rsyncer_info(session_id: MurfeySessionID) -> list[RSyncerInfo]:
+    info = []
+    for k, v in controllers[session_id].rsync_processes.items():
+        info.append(
+            RSyncerInfo(
+                source=str(k),
+                num_files_transferred=v._files_transferred,
+                num_files_in_queue=v.queue.qsize(),
+            )
+        )
+    return info
+
+
 class ProcessingParameters(BaseModel):
     gain_ref: str
     dose_per_frame: Optional[float] = None

src/murfey/server/api/instrument.py

@@ -428,3 +428,29 @@ async def restart_rsyncer(
                 ) as resp:
                     data = await resp.json()
     return data
+
+
+class RSyncerInfo(BaseModel):
+    source: str
+    num_files_transferred: int
+    num_files_in_queue: int
+
+
+@router.get("/instruments/{instrument_name}/sessions/{session_id}/rsyncer_info")
+async def get_rsyncer_info(
+    instrument_name: str, session_id: MurfeySessionID
+) -> List[RSyncerInfo]:
+    data = []
+    machine_config = get_machine_config(instrument_name=instrument_name)[
+        instrument_name
+    ]
+    if machine_config.instrument_server_url:
+        async with lock:
+            token = instrument_server_tokens[session_id]["access_token"]
+        async with aiohttp.ClientSession() as clientsession:
+            async with clientsession.get(
+                f"{machine_config.instrument_server_url}/sessions/{sanitise(str(session_id))}/rsyncer_info",
+                headers={"Authorization": f"Bearer {token}"},
+            ) as resp:
+                data = await resp.json()
+    return data