Pass machine config directly to 'ensure_dcg_exists' and pass 'rsync_basepath' directly to '_atlas_destination'

Author: tieneupin

src/murfey/client/context.py

@@ -8,7 +8,7 @@
 import xmltodict
 
 from murfey.client.instance_environment import MurfeyInstanceEnvironment, SampleInfo
-from murfey.util.client import capture_post, get_machine_config_client
+from murfey.util.client import capture_post
 
 logger = logging.getLogger("murfey.client.context")
 
@@ -50,22 +50,19 @@ def _get_source(file_path: Path, environment: MurfeyInstanceEnvironment) -> Path
 
 
 def _atlas_destination(
-    environment: MurfeyInstanceEnvironment, source: Path, token: str
+    environment: MurfeyInstanceEnvironment,
+    source: Path,
+    rsync_basepath: Path,
 ) -> Path:
-    machine_config = get_machine_config_client(
-        str(environment.url.geturl()),
-        token,
-        instrument_name=environment.instrument_name,
-    )
     for i, destination_part in enumerate(
         Path(environment.default_destinations[source]).parts
     ):
         if destination_part == environment.visit:
-            return Path(machine_config.get("rsync_basepath", "")) / "/".join(
+            return rsync_basepath / "/".join(
                 Path(environment.default_destinations[source]).parent.parts[: i + 1]
             )
     return (
-        Path(machine_config.get("rsync_basepath", ""))
+        rsync_basepath
         / Path(environment.default_destinations[source]).parent
         / environment.visit
     )
@@ -75,6 +72,7 @@ def ensure_dcg_exists(
     collection_type: str,
     metadata_source: Path,
     environment: MurfeyInstanceEnvironment,
+    machine_config: dict,
     token: str,
 ) -> str | None:
     """Create  a data collection group"""
@@ -181,7 +179,11 @@ def ensure_dcg_exists(
                 "experiment_type_id": experiment_type_id,
                 "tag": dcg_tag,
                 "atlas": str(
-                    _atlas_destination(environment, session_file.parent, token)
+                    _atlas_destination(
+                        environment,
+                        session_file.parent,
+                        Path(machine_config.get("rsync_basepath", "")),
+                    )
                     / environment.samples[metadata_source].atlas.parent
                     / atlas_xml_path.with_suffix(".jpg").name
                 ).replace("//", "/"),

src/murfey/client/contexts/atlas.py

@@ -76,7 +76,9 @@ def post_transfer_epu(
             source = _get_source(transferred_file, environment)
             if source:
                 transferred_atlas_name = _atlas_destination(
-                    environment, source, self._token
+                    environment,
+                    source,
+                    Path(self._machine_config.get("rsync_basepath", "")),
                 ) / transferred_file.relative_to(source.parent)
                 capture_post(
                     base_url=str(environment.url.geturl()),
@@ -98,7 +100,9 @@ def post_transfer_epu(
             if source:
                 atlas_mrc = transferred_file.with_suffix(".mrc")
                 transferred_atlas_jpg = _atlas_destination(
-                    environment, source, self._token
+                    environment,
+                    source,
+                    Path(self._machine_config.get("rsync_basepath", "")),
                 ) / atlas_mrc.relative_to(source.parent).with_suffix(".jpg")
 
                 with open(transferred_file, "rb") as atlas_xml:

src/murfey/client/contexts/spa_metadata.py

@@ -128,6 +128,7 @@ def post_transfer(
                         collection_type="spa",
                         metadata_source=images_disc,
                         environment=environment,
+                        machine_config=self._machine_config,
                         token=self._token,
                     )
                     for gs, pos_data in gs_pix_positions.items():
@@ -167,6 +168,7 @@ def post_transfer(
                     collection_type="spa",
                     metadata_source=images_disc,
                     environment=environment,
+                    machine_config=self._machine_config,
                     token=self._token,
                 )
 

src/murfey/client/contexts/sxt.py

@@ -53,6 +53,7 @@ def register_sxt_data_collection(
                 collection_type="sxt",
                 metadata_source=metadata_source,
                 environment=environment,
+                machine_config=self._machine_config,
                 token=self._token,
             )
 

src/murfey/client/contexts/tomo.py

@@ -115,6 +115,7 @@ def register_tomography_data_collections(
                 collection_type="tomo",
                 metadata_source=metadata_source,
                 environment=environment,
+                machine_config=self._machine_config,
                 token=self._token,
             )
 

src/murfey/client/contexts/tomo_metadata.py

@@ -57,6 +57,7 @@ def post_transfer(
                 collection_type="tomo",
                 metadata_source=metadata_source,
                 environment=environment,
+                machine_config=self._machine_config,
                 token=self._token,
             )
 
@@ -67,6 +68,7 @@ def post_transfer(
                 collection_type="tomo",
                 metadata_source=metadata_source,
                 environment=environment,
+                machine_config=self._machine_config,
                 token=self._token,
             )
             with open(transferred_file, "r") as sm_xml:
@@ -174,6 +176,7 @@ def post_transfer(
                 collection_type="tomo",
                 metadata_source=metadata_source,
                 environment=environment,
+                machine_config=self._machine_config,
                 token=self._token,
             )
             with open(transferred_file, "r") as sm_xml:
@@ -230,6 +233,7 @@ def post_transfer(
                 collection_type="tomo",
                 metadata_source=metadata_source,
                 environment=environment,
+                machine_config=self._machine_config,
                 token=self._token,
             )
             with open(transferred_file) as xml:

src/murfey/client/multigrid_control.py

@@ -575,6 +575,7 @@ def _start_dc(self, metadata_json):
                     collection_type="spa",
                     metadata_source=metadata_source,
                     environment=self._environment,
+                    machine_config=self._machine_config,
                     token=self.token,
                 )
             except Exception as e: