pass tokens to more places

Author: d-j-hatton

src/murfey/client/analyser.py

@@ -62,6 +62,7 @@ def __init__(
         self._murfey_config = (
             get_machine_config_client(
                 str(environment.url.geturl()),
+                self._token,
                 instrument_name=environment.instrument_name,
                 demo=environment.demo,
             )

src/murfey/client/contexts/atlas.py

@@ -36,7 +36,7 @@ def post_transfer(
             source = _get_source(transferred_file, environment)
             if source:
                 transferred_atlas_name = _atlas_destination(
-                    environment, source, transferred_file
+                    environment, source, transferred_file, self._token
                 ) / transferred_file.relative_to(source.parent)
                 capture_post(
                     base_url=str(environment.url.geturl()),

src/murfey/client/contexts/clem.py

@@ -20,13 +20,14 @@
 
 
 def _file_transferred_to(
-    environment: MurfeyInstanceEnvironment, source: Path, file_path: Path
+    environment: MurfeyInstanceEnvironment, source: Path, file_path: Path, token: str
 ) -> Optional[Path]:
     """
     Returns the Path of the transferred file on the DLS file system.
     """
     machine_config = get_machine_config_client(
         str(environment.url.geturl()),
+        token,
         instrument_name=environment.instrument_name,
         demo=environment.demo,
     )
@@ -128,6 +129,7 @@ def post_transfer(
                 environment=environment,
                 source=source,
                 file_path=transferred_file,
+                token=self._token,
             )
             if not destination_file:
                 logger.warning(
@@ -320,6 +322,7 @@ def post_transfer(
                 environment=environment,
                 source=source,
                 file_path=transferred_file,
+                token=self._token,
             )
             if not destination_file:
                 logger.warning(

src/murfey/client/contexts/spa.py

@@ -26,10 +26,11 @@
 
 
 def _file_transferred_to(
-    environment: MurfeyInstanceEnvironment, source: Path, file_path: Path
+    environment: MurfeyInstanceEnvironment, source: Path, file_path: Path, token: str
 ):
     machine_config = get_machine_config_client(
         str(environment.url.geturl()),
+        token,
         instrument_name=environment.instrument_name,
         demo=environment.demo,
     )
@@ -341,7 +342,9 @@ def _position_analysis(
                 else metadata_source_as_str
             )
             image_path = (
-                _file_transferred_to(environment, metadata_source, Path(gs.image))
+                _file_transferred_to(
+                    environment, metadata_source, Path(gs.image), self._token
+                )
                 if gs.image
                 else ""
             )
@@ -388,7 +391,9 @@ def _position_analysis(
                     else metadata_source_as_str
                 )
                 image_path = (
-                    _file_transferred_to(environment, metadata_source, Path(fh.image))
+                    _file_transferred_to(
+                        environment, metadata_source, Path(fh.image), self._token
+                    )
                     if fh.image
                     else ""
                 )
@@ -449,6 +454,7 @@ def post_transfer(
                     if environment:
                         machine_config = get_machine_config_client(
                             str(environment.url.geturl()),
+                            self._token,
                             instrument_name=environment.instrument_name,
                             demo=environment.demo,
                         )
@@ -475,7 +481,7 @@ def post_transfer(
 
                     if environment:
                         file_transferred_to = _file_transferred_to(
-                            environment, source, transferred_file
+                            environment, source, transferred_file, self._token
                         )
                         if not environment.movie_counters.get(str(source)):
                             movie_counts_get = capture_get(

src/murfey/client/contexts/spa_metadata.py

@@ -70,10 +70,11 @@ def _foil_hole_positions(xml_path: Path, grid_square: int) -> Dict[str, FoilHole
 
 
 def _atlas_destination(
-    environment: MurfeyInstanceEnvironment, source: Path, file_path: Path
+    environment: MurfeyInstanceEnvironment, source: Path, file_path: Path, token: str
 ) -> Path:
     machine_config = get_machine_config_client(
         str(environment.url.geturl()),
+        token,
         instrument_name=environment.instrument_name,
         demo=environment.demo,
     )
@@ -180,7 +181,9 @@ def post_transfer(
                     "experiment_type_id": 37,
                     "tag": dcg_tag,
                     "atlas": str(
-                        _atlas_destination(environment, source, transferred_file)
+                        _atlas_destination(
+                            environment, source, transferred_file, self._token
+                        )
                         / environment.samples[source].atlas.parent
                         / atlas_xml_path.with_suffix(".jpg").name
                     ),
@@ -287,7 +290,9 @@ def post_transfer(
                     gs_name,
                 )
                 image_path = (
-                    _file_transferred_to(environment, source, Path(gs_info.image))
+                    _file_transferred_to(
+                        environment, source, Path(gs_info.image), self._token
+                    )
                     if gs_info.image
                     else ""
                 )

src/murfey/client/contexts/tomo.py

@@ -190,6 +190,7 @@ def _file_transferred_to(
     ):
         machine_config = get_machine_config_client(
             str(environment.url.geturl()),
+            self._token,
             instrument_name=environment.instrument_name,
             demo=environment.demo,
         )
@@ -462,6 +463,7 @@ def post_transfer(
                     if environment:
                         machine_config = get_machine_config_client(
                             str(environment.url.geturl()),
+                            self._token,
                             instrument_name=environment.instrument_name,
                             demo=environment.demo,
                         )

src/murfey/client/contexts/tomo_metadata.py

@@ -111,7 +111,9 @@ def post_transfer(
                 "experiment_type_id": 36,
                 "tag": dcg_tag,
                 "atlas": str(
-                    _atlas_destination(environment, source, transferred_file)
+                    _atlas_destination(
+                        environment, source, transferred_file, self._token
+                    )
                     / environment.samples[source].atlas.parent
                     / atlas_xml_path.with_suffix(".jpg").name
                 ),
@@ -201,7 +203,10 @@ def post_transfer(
             source = _get_source(transferred_file, environment=environment)
             image_path = (
                 _file_transferred_to(
-                    environment, source, transferred_file.parent / "SearchMap.jpg"
+                    environment,
+                    source,
+                    transferred_file.parent / "SearchMap.jpg",
+                    self._token,
                 )
                 if source
                 else ""

src/murfey/client/multigrid_control.py

@@ -80,6 +80,7 @@ def __post_init__(self):
         )
         self._machine_config = get_machine_config_client(
             str(self._environment.url.geturl()),
+            self.token,
             instrument_name=self._environment.instrument_name,
             demo=self._environment.demo,
         )

src/murfey/client/tui/app.py

@@ -103,6 +103,7 @@ def __init__(
         self._skip_existing_processing = skip_existing_processing
         self._machine_config = get_machine_config_client(
             str(self._environment.url.geturl()),
+            token,
             instrument_name=self._environment.instrument_name,
             demo=self._environment.demo,
         )
@@ -121,6 +122,7 @@ def _launch_multigrid_watcher(
         log.info(f"Launching multigrid watcher for source {source}")
         machine_config = get_machine_config_client(
             str(self._environment.url.geturl()),
+            token,
             instrument_name=self._environment.instrument_name,
             demo=self._environment.demo,
         )
@@ -739,6 +741,7 @@ def on_log_book_log(self, message):
     async def reset(self):
         machine_config = get_machine_config_client(
             str(self._environment.url.geturl()),
+            token,
             instrument_name=self._environment.instrument_name,
             demo=self._environment.demo,
         )
@@ -803,6 +806,7 @@ def clean_up_quit(self) -> None:
     async def action_clear(self) -> None:
         machine_config = get_machine_config_client(
             str(self._environment.url.geturl()),
+            token,
             instrument_name=self._environment.instrument_name,
             demo=self._environment.demo,
         )

src/murfey/client/tui/screens.py

@@ -1010,6 +1010,7 @@ def on_button_pressed(self, event: Button.Pressed):
         self.app._set_default_acquisition_directories(visit_dir)
         machine_config = get_machine_config_client(
             str(self.app._environment.url.geturl()),
+            token,
             instrument_name=self.app._environment.instrument_name,
             demo=self.app._environment.demo,
         )
@@ -1048,6 +1049,7 @@ def compose(self):
         if self.app._multigrid:
             machine_config = get_machine_config_client(
                 str(self.app._environment.url.geturl()),
+                token,
                 instrument_name=self.app._environment.instrument_name,
             )
             destinations = []
@@ -1104,6 +1106,7 @@ def compose(self):
         else:
             machine_config = get_machine_config_client(
                 str(self.app._environment.url.geturl()),
+                token,
                 instrument_name=self.app._environment.instrument_name,
             )
             for s, d in self._transfer_routes.items():
@@ -1133,6 +1136,7 @@ def compose(self):
                 self._inputs[i] = k.name
             machine_config = get_machine_config_client(
                 str(self.app._environment.url.geturl()),
+                token,
                 instrument_name=self.app._environment.instrument_name,
                 demo=self.app._environment.demo,
             )