Clear URLs from app.py

Author: d-j-hatton

src/murfey/client/tui/app.py

@@ -653,7 +653,7 @@ async def on_mount(self) -> None:
         else:
             session_name = "Client connection"
             resp = capture_post(
-                f"{self._environment.url.geturl()}/instruments/{self._environment.instrument_name}/clients/{self._environment.client_id}/session",
+                f"{self._environment.url.geturl()}{session_router.url_path_for('link_client_to_session', instrument_name=self._environment.instrument_name, client_id=self._environment.client_id)}",
                 json={"session_id": None, "session_name": session_name},
             )
             if resp:
@@ -672,7 +672,7 @@ async def reset(self):
             sources = "\n".join(str(k) for k in self.rsync_processes.keys())
             prompt = f"Remove files from the following:\n {sources} \n"
             rsync_instances = requests.get(
-                f"{self._environment.url.geturl()}/sessions/{self._environment.murfey_session}/rsyncers"
+                f"{self._environment.url.geturl()}{session_router.url_path_for('get_rsyncers_for_session', session_id=self._environment.murfey_session)}"
             ).json()
             prompt += f"Copied {sum(r['files_counted'] for r in rsync_instances)} / {sum(r['files_transferred'] for r in rsync_instances)}"
             self.install_screen(
@@ -696,7 +696,7 @@ async def action_quit(self) -> None:
 
     async def action_remove_session(self) -> None:
         requests.delete(
-            f"{self._environment.url.geturl()}/sessions/{self._environment.murfey_session}"
+            f"{self._environment.url.geturl()}{session_router.url_path_for('remove_session', session_id=self._environment.murfey_session)}"
         )
         if self.rsync_processes:
             for rp in self.rsync_processes.values():
@@ -710,7 +710,7 @@ async def action_remove_session(self) -> None:
 
     def clean_up_quit(self) -> None:
         requests.delete(
-            f"{self._environment.url.geturl()}/sessions/{self._environment.murfey_session}"
+            f"{self._environment.url.geturl()}{session_router.url_path_for('remove_session', session_id=self._environment.murfey_session)}"
         )
         self.exit()
 
@@ -753,10 +753,10 @@ def _remove_data(self, listener: Callable[..., Awaitable[None] | None], **kwargs
             removal_rp.stop()
             log.info(f"rsyncer {rp} rerun with removal")
         requests.post(
-            f"{self._environment.url.geturl()}/sessions/{self._environment.murfey_session}/successful_processing"
+            f"{self._environment.url.geturl()}{session_router.url_path_for('register_processing_success_in_ispyb', session_id=self._environment.murfey_session)}"
         )
         requests.delete(
-            f"{self._environment.url.geturl()}/sessions/{self._environment.murfey_session}"
+            f"{self._environment.url.geturl()}{session_router.url_path_for('remove_session', session_id=self._environment.murfey_session)}"
         )
         self.exit()
 

src/murfey/server/api/__init__.py

@@ -18,7 +18,7 @@
     RsyncInstance,
     Session,
 )
-from murfey.util.models import ClientInfo, RsyncerSource
+from murfey.util.models import ClientInfo
 
 log = logging.getLogger("murfey.server.api")
 
@@ -82,34 +82,6 @@ def delete_rsyncer(session_id: int, source: Path, db=murfey_db):
         )
 
 
-@router.post("/sessions/{session_id}/rsyncer_stopped")
-def register_stopped_rsyncer(
-    session_id: int, rsyncer_source: RsyncerSource, db=murfey_db
-):
-    rsyncer = db.exec(
-        select(RsyncInstance)
-        .where(RsyncInstance.session_id == session_id)
-        .where(RsyncInstance.source == rsyncer_source.source)
-    ).one()
-    rsyncer.transferring = False
-    db.add(rsyncer)
-    db.commit()
-
-
-@router.post("/sessions/{session_id}/rsyncer_started")
-def register_restarted_rsyncer(
-    session_id: int, rsyncer_source: RsyncerSource, db=murfey_db
-):
-    rsyncer = db.exec(
-        select(RsyncInstance)
-        .where(RsyncInstance.session_id == session_id)
-        .where(RsyncInstance.source == rsyncer_source.source)
-    ).one()
-    rsyncer.transferring = True
-    db.add(rsyncer)
-    db.commit()
-
-
 @router.get("/prometheus/{metric_name}")
 def inspect_prometheus_metrics(
     metric_name: str,

src/murfey/server/api/session_control.py

@@ -6,8 +6,12 @@
 from pydantic import BaseModel
 from sqlmodel import select
 
-import murfey.server.ispyb
 import murfey.server.prometheus as prom
+
+try:
+    from murfey.server.ispyb import DB
+except ImportError:
+    DB = None
 from murfey.server import _transport_object
 from murfey.server.api.auth import MurfeySessionID, validate_token
 from murfey.server.api.shared import get_foil_hole as _get_foil_hole
@@ -99,7 +103,7 @@ def remove_session(session_id: MurfeySessionID, db=murfey_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
+    session_id: MurfeySessionID, db=DB, murfey_db=murfey_db
 ):
     collected_ids = murfey_db.exec(
         select(DataCollectionGroup, DataCollection, ProcessingJob, AutoProcProgram)
@@ -110,12 +114,13 @@ def register_processing_success_in_ispyb(
     ).all()
     appids = [c[3].id for c in collected_ids]
     if _transport_object:
-        apps = db.query(ISPyBAutoProcProgram).filter(
-            ISPyBAutoProcProgram.autoProcProgramId.in_(appids)
-        )
-        for updated in apps:
-            updated.processingStatus = True
-            _transport_object.do_update_processing_status(updated)
+        if db is not None:
+            apps = db.query(ISPyBAutoProcProgram).filter(
+                ISPyBAutoProcProgram.autoProcProgramId.in_(appids)
+            )
+            for updated in apps:
+                updated.processingStatus = True
+                _transport_object.do_update_processing_status(updated)
 
 
 class PostInfo(BaseModel):
@@ -178,6 +183,46 @@ def register_rsyncer(session_id: int, rsyncer_info: RsyncerInfo, db=murfey_db):
     return rsyncer_info
 
 
+@router.get("/sessions/{session_id}/rsyncers", response_model=List[RsyncInstance])
+def get_rsyncers_for_session(session_id: MurfeySessionID, db=murfey_db):
+    rsync_instances = db.exec(
+        select(RsyncInstance).where(RsyncInstance.session_id == session_id)
+    )
+    return rsync_instances.all()
+
+
+class RsyncerSource(BaseModel):
+    source: str
+
+
+@router.post("/sessions/{session_id}/rsyncer_stopped")
+def register_stopped_rsyncer(
+    session_id: int, rsyncer_source: RsyncerSource, db=murfey_db
+):
+    rsyncer = db.exec(
+        select(RsyncInstance)
+        .where(RsyncInstance.session_id == session_id)
+        .where(RsyncInstance.source == rsyncer_source.source)
+    ).one()
+    rsyncer.transferring = False
+    db.add(rsyncer)
+    db.commit()
+
+
+@router.post("/sessions/{session_id}/rsyncer_started")
+def register_restarted_rsyncer(
+    session_id: int, rsyncer_source: RsyncerSource, db=murfey_db
+):
+    rsyncer = db.exec(
+        select(RsyncInstance)
+        .where(RsyncInstance.session_id == session_id)
+        .where(RsyncInstance.source == rsyncer_source.source)
+    ).one()
+    rsyncer.transferring = True
+    db.add(rsyncer)
+    db.commit()
+
+
 spa_router = APIRouter(
     prefix="/session_control/spa",
     dependencies=[Depends(validate_token)],

src/murfey/util/models.py

@@ -56,10 +56,6 @@ class ClientInfo(BaseModel):
     id: int
 
 
-class RsyncerSource(BaseModel):
-    source: str
-
-
 class RsyncerInfo(BaseModel):
     source: str
     destination: str