More moving shared endpoints

Author: d-j-hatton

src/murfey/client/multigrid_control.py

@@ -20,6 +20,11 @@
 from murfey.client.rsync import RSyncer, RSyncerUpdate, TransferResult
 from murfey.client.tui.screens import determine_default_destination
 from murfey.client.watchdir import DirWatcher
+from murfey.server.api.file_manip import router as file_manip_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, get_machine_config_client
 
@@ -114,7 +119,7 @@ async def dormancy_check(self):
             ):
                 async with aiohttp.ClientSession() as clientsession:
                     async with clientsession.delete(
-                        f"{self._environment.url.geturl()}/sessions/{self.session_id}",
+                        f"{self._environment.url.geturl()}{session_router.url_path_for('remove_session', session_id=self.session_id)}",
                         json={"access_token": self.token, "token_type": "bearer"},
                     ) as response:
                         success = response.status == 200
@@ -153,7 +158,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/{self.instrument_name}/machine"
+            f"{self._environment.url.geturl()}{session_router.url_path_for('machine_info_by_instrument', instrument_name=self.instrument_name)}"
         ).json()
         if destination_overrides.get(source):
             destination = (
@@ -428,7 +433,7 @@ def _start_dc(self, json, from_form: bool = False):
             log.info("Registering tomography processing parameters")
             if self._environment.data_collection_parameters.get("num_eer_frames"):
                 eer_response = requests.post(
-                    f"{str(self._environment.url.geturl())}/visits/{self._environment.visit}/{self._environment.murfey_session}/eer_fractionation_file",
+                    f"{str(self._environment.url.geturl())}{file_manip_router.url_path_for('write_eer_fractionation_file', visit_name=self._environment.visit, session_id=self._environment.murfey_session)}",
                     json={
                         "num_frames": self._environment.data_collection_parameters[
                             "num_eer_frames"
@@ -445,17 +450,17 @@ 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})
             capture_post(
-                f"{self._environment.url.geturl()}/sessions/{self._environment.murfey_session}/tomography_processing_parameters",
+                f"{self._environment.url.geturl()}{workflow_tomo_router.url_path_for('register_tomo_proc_params', session_id=self._environment.murfey_session)}",
                 json=json,
             )
             capture_post(
-                f"{self._environment.url.geturl()}/visits/{self._environment.visit}/{self._environment.murfey_session}/flush_tomography_processing",
+                f"{self._environment.url.geturl()}{workflow_tomo_router.url_path_for('flush_tomography_processing', visit_name=self._environment.visit, session_id=self._environment.murfey_session)}",
                 json={"rsync_source": str(source)},
             )
             log.info("Tomography processing flushed")
 
         elif isinstance(context, SPAModularContext):
-            url = f"{str(self._environment.url.geturl())}/visits/{str(self._environment.visit)}/{self.session_id}/register_data_collection_group"
+            url = f"{str(self._environment.url.geturl())}{workflow_router.url_path_for('register_dc_group', visit_name=self._environment.visit, session_id=self.session_id)}"
             dcg_data = {
                 "experiment_type": "single particle",
                 "experiment_type_id": 37,
@@ -494,7 +499,7 @@ def _start_dc(self, json, from_form: bool = False):
                     "phase_plate": json.get("phase_plate", False),
                 }
                 capture_post(
-                    f"{str(self._environment.url.geturl())}/visits/{str(self._environment.visit)}/{self.session_id}/start_data_collection",
+                    f"{str(self._environment.url.geturl())}{workflow_spa_router.url_path_for('start_dc', visit_name=self._environment.visit, session_id=self.session_id)}",
                     json=data,
                 )
                 for recipe in (
@@ -505,7 +510,7 @@ def _start_dc(self, json, from_form: bool = False):
                     "em-spa-refine",
                 ):
                     capture_post(
-                        f"{str(self._environment.url.geturl())}/visits/{str(self._environment.visit)}/{self.session_id}/register_processing_job",
+                        f"{str(self._environment.url.geturl())}{workflow_router.url_path_for('register_proc', visit_name=self._environment.visit, session_id=self.session_id)}",
                         json={
                             "tag": str(source),
                             "source": str(source),
@@ -514,7 +519,7 @@ def _start_dc(self, json, from_form: bool = False):
                     )
                 log.info(f"Posting SPA processing parameters: {json}")
                 response = capture_post(
-                    f"{self._environment.url.geturl()}/sessions/{self.session_id}/spa_processing_parameters",
+                    f"{self._environment.url.geturl()}{workflow_router.url_path_for('register_spa_proc_params', session_id=self.session_id)}",
                     json={
                         **{k: None if v == "None" else v for k, v in json.items()},
                         "tag": str(source),
@@ -523,7 +528,7 @@ def _start_dc(self, json, from_form: bool = False):
                 if response and not str(response.status_code).startswith("2"):
                     log.warning(f"{response.reason}")
                 capture_post(
-                    f"{self._environment.url.geturl()}/visits/{self._environment.visit}/{self.session_id}/flush_spa_processing",
+                    f"{self._environment.url.geturl()}{workflow_spa_router.url_path_for('flush_spa_processing', visit_name=self._environment.visit, session_id=self.session_id)}",
                     json={"tag": str(source)},
                 )
 

src/murfey/server/api/__init__.py

@@ -26,7 +26,6 @@
 )
 from murfey.server.api.auth import MurfeySessionID, validate_token
 from murfey.server.murfey_db import murfey_db
-from murfey.util import safe_run
 from murfey.util.db import (
     ClientEnvironment,
     DataCollection,
@@ -424,70 +423,6 @@ async def send_murfey_message(instrument_name: str, msg: RegistrationMessage):
         )
 
 
-@router.delete("/sessions/{session_id}")
-def remove_session_by_id(session_id: MurfeySessionID, db=murfey_db):
-    session = db.exec(select(Session).where(Session.id == session_id)).one()
-    sessions_for_visit = db.exec(
-        select(Session).where(Session.visit == session.visit)
-    ).all()
-    # Don't remove prometheus metrics if there are other sessions using them
-    if len(sessions_for_visit) == 1:
-        safe_run(
-            prom.monitoring_switch.remove,
-            args=(session.visit,),
-            label="monitoring_switch",
-        )
-        rsync_instances = db.exec(
-            select(RsyncInstance).where(RsyncInstance.session_id == session_id)
-        ).all()
-        for ri in rsync_instances:
-            safe_run(
-                prom.seen_files.remove,
-                args=(ri.source, session.visit),
-                label="seen_files",
-            )
-            safe_run(
-                prom.transferred_files.remove,
-                args=(ri.source, session.visit),
-                label="transferred_files",
-            )
-            safe_run(
-                prom.transferred_files_bytes.remove,
-                args=(ri.source, session.visit),
-                label="transferred_files_bytes",
-            )
-            safe_run(
-                prom.seen_data_files.remove,
-                args=(ri.source, session.visit),
-                label="seen_data_files",
-            )
-            safe_run(
-                prom.transferred_data_files.remove,
-                args=(ri.source, session.visit),
-                label="transferred_data_files",
-            )
-            safe_run(
-                prom.transferred_data_files_bytes.remove,
-                args=(ri.source, session.visit),
-                label="transferred_data_file_bytes",
-            )
-    collected_ids = db.exec(
-        select(DataCollectionGroup, DataCollection, ProcessingJob)
-        .where(DataCollectionGroup.session_id == session_id)
-        .where(DataCollection.dcg_id == DataCollectionGroup.id)
-        .where(ProcessingJob.dc_id == DataCollection.id)
-    ).all()
-    for c in collected_ids:
-        safe_run(
-            prom.preprocessed_movies.remove,
-            args=(c[2].id,),
-            label="preprocessed_movies",
-        )
-    db.delete(session)
-    db.commit()
-    return
-
-
 @router.post("/visits/{year}/{visit_name}/{session_id}/make_milling_gif")
 async def make_gif(
     year: int,

src/murfey/server/api/session_control.py

@@ -8,7 +8,10 @@
 import murfey.server.ispyb
 from murfey.server import _transport_object
 from murfey.server.api.auth import MurfeySessionID, validate_token
-from murfey.server.api.shared import get_machine_config_for_instrument
+from murfey.server.api.shared import (
+    get_machine_config_for_instrument,
+    remove_session_by_id,
+)
 from murfey.server.murfey_db import murfey_db
 from murfey.util.config import MachineConfig
 from murfey.util.db import (
@@ -67,6 +70,11 @@ def link_client_to_session(
     return sid
 
 
+@router.delete("/sessions/{session_id}")
+def remove_session(session_id: MurfeySessionID, db=murfey_db):
+    remove_session_by_id(session_id, db)
+
+
 @router.post("/sessions/{session_id}/successful_processing")
 def register_processing_success_in_ispyb(
     session_id: MurfeySessionID, db=murfey.server.ispyb.DB, murfey_db=murfey_db

src/murfey/server/api/session_info.py

@@ -11,7 +11,10 @@
 import murfey.server.ispyb
 from murfey.server import sanitise, templates
 from murfey.server.api.auth import MurfeySessionID, validate_token
-from murfey.server.api.shared import get_machine_config_for_instrument
+from murfey.server.api.shared import (
+    get_machine_config_for_instrument,
+    remove_session_by_id,
+)
 from murfey.server.murfey_db import murfey_db
 from murfey.util.config import MachineConfig, get_machine_config
 from murfey.util.db import (
@@ -117,6 +120,11 @@ async def get_sessions(db=murfey_db):
     return res
 
 
+@router.delete("/sessions/{session_id}")
+def remove_session(session_id: MurfeySessionID, db=murfey_db):
+    remove_session_by_id(session_id, db)
+
+
 @router.get("/sessions/{session_id}/upstream_visits")
 async def find_upstream_visits(session_id: MurfeySessionID, db=murfey_db):
     murfey_session = db.exec(select(Session).where(Session.id == session_id)).one()

src/murfey/server/api/shared.py

@@ -2,7 +2,18 @@
 from pathlib import Path
 from typing import Optional
 
+from sqlmodel import select
+
+import murfey.server.prometheus as prom
+from murfey.util import safe_run
 from murfey.util.config import MachineConfig, from_file, settings
+from murfey.util.db import (
+    DataCollection,
+    DataCollectionGroup,
+    ProcessingJob,
+    RsyncInstance,
+    Session,
+)
 
 
 @lru_cache(maxsize=5)
@@ -12,3 +23,66 @@ def get_machine_config_for_instrument(instrument_name: str) -> Optional[MachineC
             instrument_name
         ]
     return None
+
+
+def remove_session_by_id(session_id: int, db):
+    session = db.exec(select(Session).where(Session.id == session_id)).one()
+    sessions_for_visit = db.exec(
+        select(Session).where(Session.visit == session.visit)
+    ).all()
+    # Don't remove prometheus metrics if there are other sessions using them
+    if len(sessions_for_visit) == 1:
+        safe_run(
+            prom.monitoring_switch.remove,
+            args=(session.visit,),
+            label="monitoring_switch",
+        )
+        rsync_instances = db.exec(
+            select(RsyncInstance).where(RsyncInstance.session_id == session_id)
+        ).all()
+        for ri in rsync_instances:
+            safe_run(
+                prom.seen_files.remove,
+                args=(ri.source, session.visit),
+                label="seen_files",
+            )
+            safe_run(
+                prom.transferred_files.remove,
+                args=(ri.source, session.visit),
+                label="transferred_files",
+            )
+            safe_run(
+                prom.transferred_files_bytes.remove,
+                args=(ri.source, session.visit),
+                label="transferred_files_bytes",
+            )
+            safe_run(
+                prom.seen_data_files.remove,
+                args=(ri.source, session.visit),
+                label="seen_data_files",
+            )
+            safe_run(
+                prom.transferred_data_files.remove,
+                args=(ri.source, session.visit),
+                label="transferred_data_files",
+            )
+            safe_run(
+                prom.transferred_data_files_bytes.remove,
+                args=(ri.source, session.visit),
+                label="transferred_data_file_bytes",
+            )
+    collected_ids = db.exec(
+        select(DataCollectionGroup, DataCollection, ProcessingJob)
+        .where(DataCollectionGroup.session_id == session_id)
+        .where(DataCollection.dcg_id == DataCollectionGroup.id)
+        .where(ProcessingJob.dc_id == DataCollection.id)
+    ).all()
+    for c in collected_ids:
+        safe_run(
+            prom.preprocessed_movies.remove,
+            args=(c[2].id,),
+            label="preprocessed_movies",
+        )
+    db.delete(session)
+    db.commit()
+    return