Endpoints to flush skipped files for an rsyncer

Author: d-j-hatton

src/murfey/client/rsync.py

@@ -222,6 +222,7 @@ def enqueue(self, file_path: Path):
     def flush_skipped(self):
         for f in self._skipped_files:
             self.queue.put(f)
+        self._skipped_files = []
 
     def _process(self):
         logger.info("RSync thread starting")

src/murfey/instrument_server/api.py

@@ -268,6 +268,12 @@ def restart_rsyncer(session_id: MurfeySessionID, rsyncer_source: RsyncerSource):
     return {"success": True}
 
 
+@router.post("/sessions/{session_id}/flush_skipped_rsyncer")
+def flush_skipped_rsyncer(session_id: MurfeySessionID, rsyncer_source: RsyncerSource):
+    controllers[session_id].rsync_processes[rsyncer_source.source].flush_skipped()
+    return {"success": True}
+
+
 class ObserverInfo(BaseModel):
     source: str
     num_files_transferred: int

src/murfey/server/api/instrument.py

@@ -495,6 +495,34 @@ async def restart_rsyncer(
     return data
 
 
+@router.post("/sessions/{session_id}/flush_skipped_rsyncer")
+async def flush_skipped_rsyncer(
+    session_id: MurfeySessionID, rsyncer_source: RsyncerSource, db=murfey_db
+):
+    data = {}
+    instrument_name = (
+        db.exec(select(Session).where(Session.id == session_id)).one().instrument_name
+    )
+    machine_config = get_machine_config(instrument_name=instrument_name)[
+        instrument_name
+    ]
+    if isinstance(session_id, int):
+        if machine_config.instrument_server_url:
+            async with aiohttp.ClientSession() as clientsession:
+                async with clientsession.post(
+                    f"{machine_config.instrument_server_url}{url_path_for('api.router', 'flush_skipped_rsyncer', session_id=session_id)}",
+                    json={
+                        "label": session_id,
+                        "source": str(secure_path(Path(rsyncer_source.source))),
+                    },
+                    headers={
+                        "Authorization": f"Bearer {instrument_server_tokens[session_id]['access_token']}"
+                    },
+                ) as resp:
+                    data = await resp.json()
+    return data
+
+
 class RSyncerInfo(BaseModel):
     source: str
     num_files_transferred: int

src/murfey/util/route_manifest.yaml

@@ -73,6 +73,11 @@ murfey.instrument_server.api.router:
     path_params: []
     methods:
       - POST
+  - path: /sessions/{session_id}/flush_skipped_rsyncer
+    function: flush_skipped_rsyncer
+    path_params: []
+    methods:
+      - POST
   - path: /sessions/{session_id}/rsyncer_info
     function: get_rsyncer_info
     path_params: []
@@ -560,6 +565,11 @@ murfey.server.api.instrument.router:
     path_params: []
     methods:
       - POST
+  - path: /instrument_server/sessions/{session_id}/flush_skipped_rsyncer
+    function: flush_skipped_rsyncer
+    path_params: []
+    methods:
+      - POST
   - path: /instrument_server/instruments/{instrument_name}/sessions/{session_id}/rsyncer_info
     function: get_rsyncer_info
     path_params: