URL fix

Author: d-j-hatton

src/murfey/client/__init__.py

@@ -25,6 +25,7 @@
 from murfey.client.instance_environment import MurfeyInstanceEnvironment
 from murfey.client.tui.app import MurfeyTUI
 from murfey.client.tui.status_bar import StatusBar
+from murfey.server.api.session_control import router as session_router
 from murfey.util.client import authorised_requests, read_config
 from murfey.util.models import Visit
 
@@ -36,7 +37,7 @@
 def _get_visit_list(api_base: ParseResult, instrument_name: str):
     proxy_path = api_base.path.rstrip("/")
     get_visits_url = api_base._replace(
-        path=f"{proxy_path}/instruments/{instrument_name}/visits_raw"
+        path=f"{proxy_path}{session_router.url_path_for('get_current_visits', instrument_name=instrument_name)}"
     )
     server_reply = requests.get(get_visits_url.geturl())
     if server_reply.status_code != 200:

src/murfey/server/api/session_control.py

@@ -9,6 +9,7 @@
 from sqlmodel import select
 from werkzeug.utils import secure_filename
 
+import murfey.server.ispyb
 import murfey.server.prometheus as prom
 
 try:
@@ -43,7 +44,12 @@
     RsyncInstance,
     Session,
 )
-from murfey.util.models import FoilHoleParameters, GridSquareParameters, RsyncerInfo
+from murfey.util.models import (
+    FoilHoleParameters,
+    GridSquareParameters,
+    RsyncerInfo,
+    Visit,
+)
 from murfey.workflows.spa.flush_spa_preprocess import (
     register_foil_hole as _register_foil_hole,
 )
@@ -74,6 +80,11 @@ async def new_client_id(db=murfey_db):
     return {"new_id": sorted_ids[-1] + 1}
 
 
+@router.get("/instruments/{instrument_name}/visits_raw", response_model=List[Visit])
+def get_current_visits(instrument_name: str, db=murfey.server.ispyb.DB):
+    return murfey.server.ispyb.get_all_ongoing_visits(instrument_name, db)
+
+
 class SessionInfo(BaseModel):
     session_id: Optional[int]
     session_name: str = ""