Don't pass machine config through the 'MultigridWatcherSpec' model between backend and instrument servers; get machine config via request instead

Author: tieneupin

src/murfey/instrument_server/api.py

@@ -141,8 +141,16 @@ def check_token(session_id: MurfeySessionID):
 def setup_multigrid_watcher(
     session_id: MurfeySessionID, watcher_spec: MultigridWatcherSpec
 ):
+    # Return True if controllers are already set up
     if controllers.get(session_id) is not None:
         return {"success": True}
+
+    # Load machine config as dictionary
+    machine_config: dict[str, Any] = requests.get(
+        f"{_get_murfey_url()}/instruments/{sanitise_nonpath(watcher_spec.instrument_name)}/machine",
+        headers={"Authorization": f"Bearer {tokens[session_id]}"},
+    ).json()
+
     label = watcher_spec.label
     for sid, controller in controllers.items():
         if controller.dormant:
@@ -156,22 +164,19 @@ def setup_multigrid_watcher(
         demo=True,
         do_transfer=True,
         processing_enabled=not watcher_spec.skip_existing_processing,
-        _machine_config=watcher_spec.configuration.dict(),
+        _machine_config=machine_config,
         token=tokens.get(session_id, "token"),
         data_collection_parameters=data_collection_parameters.get(label, {}),
         rsync_restarts=watcher_spec.rsync_restarts,
         visit_end_time=watcher_spec.visit_end_time,
     )
     watcher_spec.source.mkdir(exist_ok=True)
-    machine_config = requests.get(
-        f"{_get_murfey_url()}/instruments/{sanitise_nonpath(watcher_spec.instrument_name)}/machine",
-        headers={"Authorization": f"Bearer {tokens[session_id]}"},
-    ).json()
+
     for d in machine_config.get("create_directories", []):
         (watcher_spec.source / d).mkdir(exist_ok=True)
     watchers[session_id] = MultigridDirWatcher(
         watcher_spec.source,
-        watcher_spec.configuration.dict(),
+        machine_config,
         skip_existing_processing=watcher_spec.skip_existing_processing,
     )
     watchers[session_id].subscribe(

src/murfey/server/api/instrument.py

@@ -106,22 +106,13 @@ async def setup_multigrid_watcher(
     if machine_config.instrument_server_url:
         session = db.exec(select(Session).where(Session.id == session_id)).one()
         visit = session.visit
-        _config = {
-            "acquisition_software": machine_config.acquisition_software,
-            "calibrations": machine_config.calibrations,
-            "data_directories": [str(k) for k in machine_config.data_directories],
-            "create_directories": [str(k) for k in machine_config.create_directories],
-            "rsync_basepath": str(machine_config.rsync_basepath),
-            "visit": visit,
-            "default_model": str(machine_config.default_model),
-        }
+
         async with aiohttp.ClientSession() as clientsession:
             async with clientsession.post(
                 f"{machine_config.instrument_server_url}/sessions/{session_id}/multigrid_watcher",
                 json={
                     "source": str(secure_path(watcher_spec.source / visit)),
                     "visit": visit,
-                    "configuration": _config,
                     "label": visit,
                     "instrument_name": instrument_name,
                     "skip_existing_processing": watcher_spec.skip_existing_processing,

src/murfey/util/instrument_models.py

@@ -4,12 +4,9 @@
 
 from pydantic import BaseModel
 
-from murfey.util.config import MachineConfig
-
 
 class MultigridWatcherSpec(BaseModel):
     source: Path
-    configuration: MachineConfig
     label: str
     visit: str
     instrument_name: str