Translate some URLs from TUI app

Author: d-j-hatton

src/murfey/client/tui/app.py

@@ -33,6 +33,12 @@
 from murfey.client.tui.status_bar import StatusBar
 from murfey.client.watchdir import DirWatcher
 from murfey.client.watchdir_multigrid import MultigridDirWatcher
+from murfey.server.api.file_manip import router as file_manip_router
+from murfey.server.api.prometheus import router as prom_router
+from murfey.server.api.session_control import router as session_router
+from murfey.server.api.workflow import router as workflow_router
+from murfey.server.api.workflow import spa_router as workflow_spa_router
+from murfey.server.api.workflow import tomo_router as workflow_tomo_router
 from murfey.util import posix_path
 from murfey.util.client import (
     capture_post,
@@ -156,7 +162,7 @@ def _start_rsyncer_multigrid(
         log.info(f"starting multigrid rsyncer: {source}")
         destination_overrides = destination_overrides or {}
         machine_data = requests.get(
-            f"{self._environment.url.geturl()}/instruments/{instrument_name}/machine"
+            f"{self._environment.url.geturl()}{session_router.url_path_for('machine_info_by_instrument', instrument_name=instrument_name)}"
         ).json()
         if destination_overrides.get(source):
             destination = destination_overrides[source] + f"/{extra_directory}"
@@ -208,7 +214,7 @@ def _start_rsyncer(
         log.info(f"starting rsyncer: {source}")
         if transfer:
             # Always make sure the destination directory exists
-            make_directory_url = f"{str(self._url.geturl())}/sessions/{str(self._environment.murfey_session)}/make_rsyncer_destination"
+            make_directory_url = f"{str(self._url.geturl())}{file_manip_router.url_path_for('make_rsyncer_destination', session_id=self._environment.murfey_session)}"
             capture_post(make_directory_url, json={"destination": destination})
         if self._environment:
             self._environment.default_destinations[source] = destination
@@ -274,7 +280,7 @@ def rsync_result(update: RSyncerUpdate):
                 ),
                 secondary=True,
             )
-            url = f"{str(self._url.geturl())}/sessions/{str(self._environment.murfey_session)}/rsyncer"
+            url = f"{str(self._url.geturl())}{session_router.url_path_for('register_rsyncer', session_id=self._environment.murfey_session)}"
             rsyncer_data = {
                 "source": str(source),
                 "destination": destination,
@@ -344,7 +350,7 @@ def _increment_file_count(
         self, observed_files: List[Path], source: str, destination: str
     ):
         if len(observed_files):
-            url = f"{str(self._url.geturl())}/visits/{str(self._visit)}/increment_rsync_file_count"
+            url = f"{str(self._url.geturl())}{prom_router.url_path_for('increment_rsync_file_count', visit_name=self._visit)}"
             num_data_files = len(
                 [
                     f
@@ -368,7 +374,7 @@ def _increment_transferred_files_prometheus(
         self, update: RSyncerUpdate, source: str, destination: str
     ):
         if update.outcome is TransferResult.SUCCESS:
-            url = f"{str(self._url.geturl())}/visits/{str(self._visit)}/increment_rsync_transferred_files_prometheus"
+            url = f"{str(self._url.geturl())}{prom_router.url_path_for('increment_rsync_transferred_files_prometheus', visit_name=self._visit)}"
             data_files = (
                 [update]
                 if update.file_path.suffix in self._data_suffixes
@@ -397,7 +403,7 @@ def _increment_transferred_files(
         ]
         if not checked_updates:
             return
-        url = f"{str(self._url.geturl())}/visits/{str(self._visit)}/increment_rsync_transferred_files"
+        url = f"{str(self._url.geturl())}{prom_router.url_path_for('increment_rsync_transferred_files', visit_name=self._visit)}"
         data_files = [
             u
             for u in updates
@@ -487,7 +493,7 @@ def _start_dc(self, json, from_form: bool = False):
             log.info("Registering tomography processing parameters")
             if self.app._environment.data_collection_parameters.get("num_eer_frames"):
                 eer_response = requests.post(
-                    f"{str(self.app._environment.url.geturl())}/visits/{self.app._environment.visit}/{self.app._environment.murfey_session}/eer_fractionation_file",
+                    f"{str(self.app._environment.url.geturl())}{file_manip_router.url_path_for('write_eer_fractionation_file', visit_name=self.app._environment.visit, session_id=self.app._environment.murfey_session)}",
                     json={
                         "num_frames": self.app._environment.data_collection_parameters[
                             "num_eer_frames"
@@ -504,16 +510,16 @@ def _start_dc(self, json, from_form: bool = False):
                 eer_fractionation_file = eer_response.json()["eer_fractionation_file"]
                 json.update({"eer_fractionation_file": eer_fractionation_file})
             requests.post(
-                f"{self.app._environment.url.geturl()}/sessions/{self.app._environment.murfey_session}/tomography_processing_parameters",
+                f"{self.app._environment.url.geturl()}{workflow_tomo_router.url_path_for('register_tomo_proc_params', session_id=self.app._environment.murfey_session)}",
                 json=json,
             )
             capture_post(
-                f"{self.app._environment.url.geturl()}/visits/{self._visit}/{self.app._environment.murfey_session}/flush_tomography_processing",
+                f"{self.app._environment.url.geturl()}{workflow_tomo_router.url_path_for('flush_tomography_processing', visit_name=self._visit, session_id=self.app._environment.murfey_session)}",
                 json={"rsync_source": str(source)},
             )
             log.info("Tomography processing flushed")
         elif isinstance(context, SPAModularContext):
-            url = f"{str(self._url.geturl())}/visits/{str(self._visit)}/{self._environment.murfey_session}/register_data_collection_group"
+            url = f"{str(self._url.geturl())}{workflow_router.url_path_for('register_dc_group', visit_name=self._visit, session_id=self._environment.murfey_session)}"
             dcg_data = {
                 "experiment_type": "single particle",
                 "experiment_type_id": 37,
@@ -552,7 +558,7 @@ def _start_dc(self, json, from_form: bool = False):
                     "phase_plate": json.get("phase_plate", False),
                 }
                 capture_post(
-                    f"{str(self._url.geturl())}/visits/{str(self._visit)}/{self._environment.murfey_session}/start_data_collection",
+                    f"{str(self._url.geturl())}{workflow_router.url_path_for('start_dc', visit_name=self._visit, session_id=self._environment.murfey_session)}",
                     json=data,
                 )
                 for recipe in (
@@ -563,7 +569,7 @@ def _start_dc(self, json, from_form: bool = False):
                     "em-spa-refine",
                 ):
                     capture_post(
-                        f"{str(self._url.geturl())}/visits/{str(self._visit)}/{self._environment.murfey_session}/register_processing_job",
+                        f"{str(self._url.geturl())}{workflow_router.url_path_for('register_proc', visit_name=self._visit, session_id=self._environment.murfey_session)}",
                         json={
                             "tag": str(source),
                             "source": str(source),
@@ -572,7 +578,7 @@ def _start_dc(self, json, from_form: bool = False):
                     )
                 log.info(f"Posting SPA processing parameters: {json}")
                 response = capture_post(
-                    f"{self.app._environment.url.geturl()}/sessions/{self.app._environment.murfey_session}/spa_processing_parameters",
+                    f"{self.app._environment.url.geturl()}{workflow_spa_router.url_path_for('register_spa_proc_params', session_id=self.app._environment.murfey_session)}",
                     json={
                         **{k: None if v == "None" else v for k, v in json.items()},
                         "tag": str(source),
@@ -586,7 +592,7 @@ def _start_dc(self, json, from_form: bool = False):
                 if not str(response.status_code).startswith("2"):
                     log.warning(f"{response.reason}")
                 capture_post(
-                    f"{self.app._environment.url.geturl()}/visits/{self.app._environment.visit}/{self.app._environment.murfey_session}/flush_spa_processing",
+                    f"{self.app._environment.url.geturl()}{workflow_spa_router.url_path_for('flush_spa_processing', visit_name=self.app._environment.visit, session_id=self.app._environment.murfey_session)}",
                     json={"tag": str(source)},
                 )
 

src/murfey/server/api/file_manip.py

@@ -36,7 +36,7 @@ class SuggestedPathParameters(BaseModel):
 def suggest_path(
     visit_name: str, session_id: int, params: SuggestedPathParameters, db=murfey_db
 ):
-    count: int | None = None
+    count: Optional[int] = None
     secure_path_parts = [secure_filename(p) for p in params.base_path.parts]
     base_path = "/".join(secure_path_parts)
     instrument_name = (

src/murfey/server/api/workflow.py

@@ -400,7 +400,7 @@ async def request_spa_preprocessing(
             .where(SPARelionParameters.pj_id == collected_ids[2].id)
             .where(SPAFeedbackParameters.pj_id == SPARelionParameters.pj_id)
         ).one()
-        proc_params: dict | None = dict(params[0])
+        proc_params: Optional[dict] = dict(params[0])
         feedback_params = params[1]
     except sqlalchemy.exc.NoResultFound:
         proc_params = None