Get 'feedback_queue' from security config or transport object instead of machine config

Author: tieneupin

src/murfey/server/demo_api.py

@@ -40,7 +40,7 @@
 from murfey.server.api import MurfeySessionID
 from murfey.server.api.auth import validate_token
 from murfey.server.murfey_db import murfey_db
-from murfey.util.config import MachineConfig, from_file
+from murfey.util.config import MachineConfig, from_file, security_from_file
 from murfey.util.db import (
     AutoProcProgram,
     ClientEnvironment,
@@ -962,9 +962,26 @@ def flush_spa_processing(
         return
 
     detached_ids = [c.id for c in collected_ids]
-    instrument_name = (
-        db.exec(select(Session).where(Session.id == session_id)).one().instrument_name
-    )
+    try:
+        instrument_name = (
+            db.exec(select(Session).where(Session.id == session_id))
+            .one()
+            .instrument_name
+        )
+    except Exception:
+        log.error(
+            f"Unable to find a Murfey session associated with session ID {session_id}"
+        )
+        return
+
+    # Load the security config
+    security_config_file = machine_config[instrument_name].security_configuration_path
+    if not security_config_file:
+        log.error(
+            f"No security configuration file set for instrument {instrument_name!r}"
+        )
+        return
+    security_config = security_from_file(security_config_file)
 
     murfey_ids = _murfey_id(
         detached_ids[3], db, number=2 * len(stashed_files), close=False
@@ -986,7 +1003,7 @@ def flush_spa_processing(
         zocalo_message = {
             "recipes": ["em-spa-preprocess"],
             "parameters": {
-                "feedback_queue": machine_config[instrument_name].feedback_queue,
+                "feedback_queue": security_config.feedback_queue,
                 "node_creator_queue": machine_config[
                     instrument_name
                 ].node_creator_queue,

src/murfey/workflows/clem/align_and_merge.py

@@ -37,7 +37,7 @@ def submit_cluster_request(
 
     # Load feedback queue
     machine_config = get_machine_config()[instrument_name]
-    feedback_queue: str = machine_config.feedback_queue
+    feedback_queue: str = messenger.feedback_queue
 
     # Work out session directory from file path
     processed_folder = machine_config.processed_directory_name

src/murfey/workflows/clem/process_raw_lifs.py

@@ -6,8 +6,6 @@
 from pathlib import Path
 from typing import Optional
 
-from murfey.util.config import get_machine_config
-
 try:
     from murfey.server.ispyb import TransportManager  # Session
 except AttributeError:
@@ -43,8 +41,7 @@ def zocalo_cluster_request(
         )
 
         # Load machine config to get the feedback queue
-        machine_config = get_machine_config()
-        feedback_queue = machine_config[instrument_name].feedback_queue
+        feedback_queue: str = messenger.feedback_queue
 
         # Send the message
         #   The keys under "parameters" will populate all the matching fields in {}

src/murfey/workflows/clem/process_raw_tiffs.py

@@ -6,8 +6,6 @@
 from pathlib import Path
 from typing import Optional
 
-from murfey.util.config import get_machine_config
-
 try:
     from murfey.server.ispyb import TransportManager  # Session
 except AttributeError:
@@ -50,8 +48,7 @@ def zocalo_cluster_request(
             metadata = tiff_list[0].parent / "Metadata" / (series_name + ".xlif")
 
         # Load machine config to get the feedback queue
-        machine_config = get_machine_config()
-        feedback_queue = machine_config[instrument_name].feedback_queue
+        feedback_queue: str = messenger.feedback_queue
 
         messenger.send(
             "processing_recipe",