Need to use instrument name when getting machine configuration

Author: d-j-hatton

src/murfey/client/tui/app.py

@@ -105,7 +105,9 @@ def __init__(
         self._strict = strict
         self._skip_existing_processing = skip_existing_processing
         self._machine_config = get_machine_config(
-            str(self._environment.url.geturl()), demo=self._environment.demo
+            str(self._environment.url.geturl()),
+            instrument_name=self._environment.instrument_name,
+            demo=self._environment.demo,
         )
         self._data_suffixes = (".mrc", ".tiff", ".tif", ".eer")
         self._data_substrings = [

src/murfey/client/tui/screens.py

@@ -263,7 +263,9 @@ def __init__(
         self._selected_dir = basepath
         self._add_basepath = add_basepath
         cfg = get_machine_config(
-            str(self.app._environment.url.geturl()), demo=self.app._environment.demo
+            str(self.app._environment.url.geturl()),
+            instrument_name=self.app._environment.instrument_name,
+            demo=self.app._environment.demo,
         )
         self._context: (
             Type[SPAModularContext] | Type[SPAContext] | Type[TomographyContext]
@@ -660,7 +662,7 @@ def on_button_pressed(self, event: Button.Pressed):
             self.app.pop_screen()
         session_name = "Client connection"
         self.app._environment.murfey_session = requests.post(
-            f"{self.app._environment.url.geturl()}/instruments/{self._environment.instrument_name}/clients/{self.app._environment.client_id}/session",
+            f"{self.app._environment.url.geturl()}/instruments/{self.app._environment.instrument_name}/clients/{self.app._environment.client_id}/session",
             json={"session_id": session_id, "session_name": session_name},
         ).json()
 
@@ -897,7 +899,9 @@ def on_button_pressed(self, event: Button.Pressed):
         visit_dir.mkdir(exist_ok=True)
         self.app._set_default_acquisition_directories(visit_dir)
         machine_config = get_machine_config(
-            str(self.app._environment.url.geturl()), demo=self.app._environment.demo
+            str(self.app._environment.url.geturl()),
+            instrument_name=self.app._environment.instrument_name,
+            demo=self.app._environment.demo,
         )
         for dir in machine_config["create_directories"].values():
             (visit_dir / dir).mkdir(exist_ok=True)
@@ -936,7 +940,10 @@ def compose(self):
             )
             yield RadioButton("Tomography", value=self._context is TomographyContext)
         if self.app._multigrid:
-            machine_config = get_machine_config(str(self.app._environment.url.geturl()))
+            machine_config = get_machine_config(
+                str(self.app._environment.url.geturl()),
+                instrument_name=self.app._environment.instrument_name,
+            )
             destinations = []
             if self._destination_overrides:
                 for k, v in self._destination_overrides.items():
@@ -993,7 +1000,10 @@ def compose(self):
                                 )
                             )
         else:
-            machine_config = get_machine_config(str(self.app._environment.url.geturl()))
+            machine_config = get_machine_config(
+                str(self.app._environment.url.geturl()),
+                instrument_name=self.app._environment.instrument_name,
+            )
             for s, d in self._transfer_routes.items():
                 if Path(d).name not in machine_config["create_directories"].values():
                     bulk.append(Label(f"Copy the source {s} to:"))
@@ -1022,7 +1032,9 @@ def compose(self):
                 params_bulk.append(i)
                 self._inputs[i] = k.name
             machine_config = get_machine_config(
-                str(self.app._environment.url.geturl()), demo=self.app._environment.demo
+                str(self.app._environment.url.geturl()),
+                instrument_name=self.app._environment.instrument_name,
+                demo=self.app._environment.demo,
             )
             if machine_config.get("superres"):
                 params_bulk.append(
@@ -1072,7 +1084,9 @@ def on_switch_changed(self, event):
     def on_radio_set_changed(self, event: RadioSet.Changed) -> None:
         if event.index == 0:
             cfg = get_machine_config(
-                str(self.app._environment.url.geturl()), demo=self.app._environment.demo
+                str(self.app._environment.url.geturl()),
+                instrument_name=self.app._environment.instrument_name,
+                demo=self.app._environment.demo,
             )
             if cfg.get("modular_spa"):
                 self._context = SPAContext