More contexts

Author: stephen-riggs

src/murfey/client/contexts/atlas.py

@@ -6,7 +6,6 @@
 from murfey.client.contexts.spa import _get_source
 from murfey.client.contexts.spa_metadata import _atlas_destination
 from murfey.client.instance_environment import MurfeyInstanceEnvironment
-from murfey.util.api import url_path_for
 from murfey.util.client import capture_post
 
 logger = logging.getLogger("murfey.client.contexts.atlas")
@@ -40,8 +39,11 @@ def post_transfer(
                     environment, source, transferred_file
                 ) / 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={"path": str(transferred_atlas_name)},
+                    base_url=str(environment.url.geturl()),
+                    router_name="session_control.spa_router",
+                    function_name="make_atlas_jpg",
+                    session_id=environment.murfey_session,
+                    data={"path": str(transferred_atlas_name)},
                 )
                 logger.info(
                     f"Submitted request to create JPG image of atlas {str(transferred_atlas_name)!r}"

src/murfey/client/contexts/clem.py

@@ -13,7 +13,6 @@
 
 from murfey.client.context import Context
 from murfey.client.instance_environment import MurfeyInstanceEnvironment
-from murfey.util.api import url_path_for
 from murfey.util.client import capture_post, get_machine_config_client
 
 # Create logger object
@@ -353,19 +352,14 @@ def register_lif_file(
         register the LIF file in the database correctly as part of the CLEM workflow.
         """
         try:
-            # Construct URL to post to post the request to
-            url = f"{environment.url.geturl()}{url_path_for('clem.router', 'register_lif_file', session_id=environment.murfey_session)}?lif_file={quote(str(lif_file), safe='')}"
-            # Validate
-            if not url:
-                logger.error(
-                    "URL could not be constructed from the environment and file path"
-                )
-                return False
-
-            # Send the message
-            capture_post(url)
+            capture_post(
+                base_url=str(environment.url.geturl()),
+                router_name="clem.router",
+                function_name="register_lif_file",
+                session_id=environment.murfey_session,
+                data={"lif_file": quote(str(lif_file), safe="")},
+            )
             return True
-
         except Exception as e:
             logger.error(
                 f"Error encountered when registering the LIF file in the database: {e}"
@@ -383,19 +377,14 @@ def process_lif_file(
         """
 
         try:
-            # Construct the URL to post the request to
-            url = f"{environment.url.geturl()}{url_path_for('clem.router', 'process_raw_lifs', session_id=environment.murfey_session)}?lif_file={quote(str(lif_file), safe='')}"
-            # Validate
-            if not url:
-                logger.error(
-                    "URL could not be constructed from the environment and file path"
-                )
-                return False
-
-            # Send the message
-            capture_post(url)
+            capture_post(
+                base_url=str(environment.url.geturl()),
+                router_name="clem.router",
+                function_name="process_raw_lifs",
+                session_id=environment.murfey_session,
+                data={"lif_file": quote(str(lif_file), safe="")},
+            )
             return True
-
         except Exception as e:
             logger.error(f"Error encountered processing LIF file: {e}")
             return False
@@ -411,17 +400,14 @@ def register_tiff_file(
         """
 
         try:
-            url = f"{environment.url.geturl()}{url_path_for('clem.router', 'register_tiff_file', session_id=environment.murfey_session)}?tiff_file={quote(str(tiff_file), safe='')}"
-            if not url:
-                logger.error(
-                    "URL could not be constructed from the environment and file path"
-                )
-                return False
-
-            # Send the message
-            capture_post(url)
+            capture_post(
+                base_url=str(environment.url.geturl()),
+                router_name="clem.router",
+                function_name="register_tiff_file",
+                session_id=environment.murfey_session,
+                data={"tiff_file": quote(str(tiff_file), safe="")},
+            )
             return True
-
         except Exception as e:
             logger.error(
                 f"Error encountered when registering the TIFF file in the database: {e}"
@@ -439,18 +425,14 @@ def process_tiff_series(
         """
 
         try:
-            # Construct URL for Murfey server to communicate with
-            url = f"{environment.url.geturl()}{url_path_for('clem.router', 'process_raw_tiffs', session_id=environment.murfey_session)}"
-            if not url:
-                logger.error(
-                    "URL could not be constructed from the environment and file path"
-                )
-                return False
-
-            # Send the message
-            capture_post(url, json=tiff_dataset)
+            capture_post(
+                base_url=str(environment.url.geturl()),
+                router_name="clem.router",
+                function_name="process_raw_tiffs",
+                session_id=environment.murfey_session,
+                data=tiff_dataset,
+            )
             return True
-
         except Exception as e:
             logger.error(f"Error encountered processing the TIFF series: {e}")
             return False