Atlas post needs to be a model

Author: stephen-riggs

src/murfey/client/contexts/atlas.py

@@ -45,5 +45,5 @@ def post_transfer(
                 ) / transferred_file.relative_to(source.parent)
                 capture_post(
                     f"{str(environment.url.geturl())}{url_path_for('session_control.spa_router', 'make_atlas_jpg', session_id=environment.murfey_session)}",
-                    json={"atlas_mrc": str(transferred_atlas_name)},
+                    json={"path": str(transferred_atlas_name)},
                 )

src/murfey/client/multigrid_control.py

@@ -232,7 +232,7 @@ def _rsyncer_stopped(self, source: Path, explicit_stop: bool = False):
             requests.delete(remove_url)
         else:
             stop_url = f"{self.murfey_url}{url_path_for('session_control.router', 'register_stopped_rsyncer', session_id=self.session_id)}"
-            capture_post(stop_url, json={"source": str(source)})
+            capture_post(stop_url, json={"path": str(source)})
 
     def _finalise_rsyncer(self, source: Path):
         finalise_thread = threading.Thread(
@@ -248,7 +248,7 @@ def _finalise_rsyncer(self, source: Path):
     def _restart_rsyncer(self, source: Path):
         self.rsync_processes[source].restart()
         restarted_url = f"{self.murfey_url}{url_path_for('session_control.router', 'register_restarted_rsyncer', session_id=self.session_id)}"
-        capture_post(restarted_url, json={"source": str(source)})
+        capture_post(restarted_url, json={"path": str(source)})
 
     def _request_watcher_stop(self, source: Path):
         self._environment.watchers[source]._stopping = True

src/murfey/server/api/session_control.py

@@ -263,18 +263,18 @@ def get_rsyncers_for_session(session_id: MurfeySessionID, db=murfey_db):
     return rsync_instances.all()
 
 
-class RsyncerSource(BaseModel):
-    source: str
+class StringOfPathModel(BaseModel):
+    path: str
 
 
 @router.post("/sessions/{session_id}/rsyncer_stopped")
 def register_stopped_rsyncer(
-    session_id: int, rsyncer_source: RsyncerSource, db=murfey_db
+    session_id: int, rsyncer_source: StringOfPathModel, db=murfey_db
 ):
     rsyncer = db.exec(
         select(RsyncInstance)
         .where(RsyncInstance.session_id == session_id)
-        .where(RsyncInstance.source == rsyncer_source.source)
+        .where(RsyncInstance.source == rsyncer_source.path)
     ).one()
     rsyncer.transferring = False
     db.add(rsyncer)
@@ -283,12 +283,12 @@ def register_stopped_rsyncer(
 
 @router.post("/sessions/{session_id}/rsyncer_started")
 def register_restarted_rsyncer(
-    session_id: int, rsyncer_source: RsyncerSource, db=murfey_db
+    session_id: int, rsyncer_source: StringOfPathModel, db=murfey_db
 ):
     rsyncer = db.exec(
         select(RsyncInstance)
         .where(RsyncInstance.session_id == session_id)
-        .where(RsyncInstance.source == rsyncer_source.source)
+        .where(RsyncInstance.source == rsyncer_source.path)
     ).one()
     rsyncer.transferring = True
     db.add(rsyncer)
@@ -349,9 +349,13 @@ def get_foil_hole(
 
 
 @spa_router.post("/sessions/{session_id}/make_atlas_jpg")
-def make_atlas_jpg(session_id: MurfeySessionID, atlas_mrc: str, db=murfey_db):
+def make_atlas_jpg(
+    session_id: MurfeySessionID, atlas_mrc: StringOfPathModel, db=murfey_db
+):
     session = db.exec(select(Session).where(Session.id == session_id)).one()
-    return atlas_jpg_from_mrc(session.instrument_name, session.visit, Path(atlas_mrc))
+    return atlas_jpg_from_mrc(
+        session.instrument_name, session.visit, Path(atlas_mrc.path)
+    )
 
 
 @spa_router.post("/sessions/{session_id}/grid_square/{gsid}")