Merge branch 'main' into silence-alerts

Author: Abigail-Yates

src/murfey/cli/repost_failed_calls.py

@@ -93,7 +93,6 @@ def handle_failed_posts(messages_path: list[Path], murfey_db: Session):
     # These imports need to happen after transport object is configured
     import murfey.server.api.auth
     import murfey.server.api.bootstrap
-    import murfey.server.api.clem
     import murfey.server.api.display
     import murfey.server.api.file_io_frontend
     import murfey.server.api.file_io_instrument
@@ -106,6 +105,7 @@ def handle_failed_posts(messages_path: list[Path], murfey_db: Session):
     import murfey.server.api.session_info
     import murfey.server.api.websocket
     import murfey.server.api.workflow
+    import murfey.server.api.workflow_clem
 
     for json_file in messages_path:
         with open(json_file, "r") as json_data:

src/murfey/client/analyser.py

@@ -63,7 +63,9 @@ def __init__(
         self._acquisition_software = ""
         self._context: Context | None = None
         self.queue: queue.Queue = queue.Queue()
-        self.thread = threading.Thread(name="Analyser", target=self._analyse_in_thread)
+        self.thread = threading.Thread(
+            name=f"Analyser {basepath_local}", target=self._analyse_in_thread
+        )
         self._stopping = False
         self._halt_thread = False
         self._murfey_config = (

src/murfey/client/contexts/clem.py

@@ -326,7 +326,7 @@ def process_lif_file(
         try:
             capture_post(
                 base_url=str(environment.url.geturl()),
-                router_name="clem.router",
+                router_name="workflow_clem.router",
                 function_name="process_raw_lifs",
                 token=self._token,
                 instrument_name=environment.instrument_name,
@@ -351,7 +351,7 @@ def process_tiff_series(
         try:
             capture_post(
                 base_url=str(environment.url.geturl()),
-                router_name="clem.router",
+                router_name="workflow_clem.router",
                 function_name="process_raw_tiffs",
                 token=self._token,
                 instrument_name=environment.instrument_name,