Move prometheus update endpoints

Author: d-j-hatton

src/murfey/client/multigrid_control.py

@@ -21,6 +21,7 @@
 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.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
@@ -535,7 +536,7 @@ def _start_dc(self, json, from_form: bool = False):
     def _increment_file_count(
         self, observed_files: List[Path], source: str, destination: str
     ):
-        url = f"{str(self._environment.url.geturl())}/visits/{str(self._environment.visit)}/increment_rsync_file_count"
+        url = f"{str(self._environment.url.geturl())}{prom_router.url_path_for('increment_rsync_file_count', visit_name=self._environment.visit)}"
         num_data_files = len(
             [
                 f
@@ -559,7 +560,7 @@ def _increment_transferred_files_prometheus(
         self, update: RSyncerUpdate, source: str, destination: str
     ):
         if update.outcome is TransferResult.SUCCESS:
-            url = f"{str(self._environment.url.geturl())}/visits/{str(self._environment.visit)}/increment_rsync_transferred_files_prometheus"
+            url = f"{str(self._environment.url.geturl())}{prom_router.url_path_for('increment_rsync_transferred_files_prometheus', visit_name=self._environment.visit)}"
             data_files = (
                 [update]
                 if update.file_path.suffix in self._data_suffixes
@@ -588,7 +589,7 @@ def _increment_transferred_files(
         ]
         if not checked_updates:
             return
-        url = f"{str(self._environment.url.geturl())}/visits/{str(self._environment.visit)}/increment_rsync_transferred_files"
+        url = f"{str(self._environment.url.geturl())}{prom_router.url_path_for('increment_rsync_transferred_files', visit_name=self._environment.visit)}"
         data_files = [
             u
             for u in updates

src/murfey/server/api/__init__.py

@@ -18,7 +18,7 @@
     RsyncInstance,
     Session,
 )
-from murfey.util.models import ClientInfo, RsyncerInfo, RsyncerSource
+from murfey.util.models import ClientInfo, RsyncerSource
 
 log = logging.getLogger("murfey.server.api")
 
@@ -110,70 +110,6 @@ def register_restarted_rsyncer(
     db.commit()
 
 
-@router.post("/visits/{visit_name}/increment_rsync_file_count")
-def increment_rsync_file_count(
-    visit_name: str, rsyncer_info: RsyncerInfo, db=murfey_db
-):
-    rsync_instance = db.exec(
-        select(RsyncInstance).where(
-            RsyncInstance.source == rsyncer_info.source,
-            RsyncInstance.destination == rsyncer_info.destination,
-            RsyncInstance.session_id == rsyncer_info.session_id,
-        )
-    ).one()
-    rsync_instance.files_counted += rsyncer_info.increment_count
-    db.add(rsync_instance)
-    db.commit()
-    db.close()
-    prom.seen_files.labels(rsync_source=rsyncer_info.source, visit=visit_name).inc(
-        rsyncer_info.increment_count
-    )
-    prom.seen_data_files.labels(rsync_source=rsyncer_info.source, visit=visit_name).inc(
-        rsyncer_info.increment_data_count
-    )
-
-
-@router.post("/visits/{visit_name}/increment_rsync_transferred_files")
-def increment_rsync_transferred_files(
-    visit_name: str, rsyncer_info: RsyncerInfo, db=murfey_db
-):
-    rsync_instance = db.exec(
-        select(RsyncInstance).where(
-            RsyncInstance.source == rsyncer_info.source,
-            RsyncInstance.destination == rsyncer_info.destination,
-            RsyncInstance.session_id == rsyncer_info.session_id,
-        )
-    ).one()
-    rsync_instance.files_transferred += rsyncer_info.increment_count
-    db.add(rsync_instance)
-    db.commit()
-    db.close()
-
-
-@router.post("/visits/{visit_name}/increment_rsync_transferred_files_prometheus")
-def increment_rsync_transferred_files_prometheus(
-    visit_name: str, rsyncer_info: RsyncerInfo, db=murfey_db
-):
-    prom.transferred_files.labels(
-        rsync_source=rsyncer_info.source, visit=visit_name
-    ).inc(rsyncer_info.increment_count)
-    prom.transferred_files_bytes.labels(
-        rsync_source=rsyncer_info.source, visit=visit_name
-    ).inc(rsyncer_info.bytes)
-    prom.transferred_data_files.labels(
-        rsync_source=rsyncer_info.source, visit=visit_name
-    ).inc(rsyncer_info.increment_data_count)
-    prom.transferred_data_files_bytes.labels(
-        rsync_source=rsyncer_info.source, visit=visit_name
-    ).inc(rsyncer_info.data_bytes)
-
-
-@router.post("/visits/{visit_name}/monitoring/{on}")
-def change_monitoring_status(visit_name: str, on: int):
-    prom.monitoring_switch.labels(visit=visit_name)
-    prom.monitoring_switch.labels(visit=visit_name).set(on)
-
-
 @router.get("/prometheus/{metric_name}")
 def inspect_prometheus_metrics(
     metric_name: str,

src/murfey/server/api/instrument.py

@@ -13,8 +13,8 @@
 from werkzeug.utils import secure_filename
 
 from murfey.server import sanitise
-from murfey.server.api import MurfeySessionID
 from murfey.server.api.auth import (
+    MurfeySessionID,
     create_access_token,
     instrument_server_tokens,
     oauth2_scheme,

src/murfey/server/api/prometheus.py

@@ -0,0 +1,78 @@
+from fastapi import APIRouter, Depends
+from sqlmodel import select
+
+import murfey.server.prometheus as prom
+from murfey.server.api.auth import validate_token
+from murfey.server.murfey_db import murfey_db
+from murfey.util.db import RsyncInstance
+from murfey.util.models import RsyncerInfo
+
+router = APIRouter(
+    prefix="/prometheus",
+    dependencies=[Depends(validate_token)],
+    tags=["prometheus"],
+)
+
+
+@router.post("/visits/{visit_name}/increment_rsync_file_count")
+def increment_rsync_file_count(
+    visit_name: str, rsyncer_info: RsyncerInfo, db=murfey_db
+):
+    rsync_instance = db.exec(
+        select(RsyncInstance).where(
+            RsyncInstance.source == rsyncer_info.source,
+            RsyncInstance.destination == rsyncer_info.destination,
+            RsyncInstance.session_id == rsyncer_info.session_id,
+        )
+    ).one()
+    rsync_instance.files_counted += rsyncer_info.increment_count
+    db.add(rsync_instance)
+    db.commit()
+    db.close()
+    prom.seen_files.labels(rsync_source=rsyncer_info.source, visit=visit_name).inc(
+        rsyncer_info.increment_count
+    )
+    prom.seen_data_files.labels(rsync_source=rsyncer_info.source, visit=visit_name).inc(
+        rsyncer_info.increment_data_count
+    )
+
+
+@router.post("/visits/{visit_name}/increment_rsync_transferred_files")
+def increment_rsync_transferred_files(
+    visit_name: str, rsyncer_info: RsyncerInfo, db=murfey_db
+):
+    rsync_instance = db.exec(
+        select(RsyncInstance).where(
+            RsyncInstance.source == rsyncer_info.source,
+            RsyncInstance.destination == rsyncer_info.destination,
+            RsyncInstance.session_id == rsyncer_info.session_id,
+        )
+    ).one()
+    rsync_instance.files_transferred += rsyncer_info.increment_count
+    db.add(rsync_instance)
+    db.commit()
+    db.close()
+
+
+@router.post("/visits/{visit_name}/increment_rsync_transferred_files_prometheus")
+def increment_rsync_transferred_files_prometheus(
+    visit_name: str, rsyncer_info: RsyncerInfo, db=murfey_db
+):
+    prom.transferred_files.labels(
+        rsync_source=rsyncer_info.source, visit=visit_name
+    ).inc(rsyncer_info.increment_count)
+    prom.transferred_files_bytes.labels(
+        rsync_source=rsyncer_info.source, visit=visit_name
+    ).inc(rsyncer_info.bytes)
+    prom.transferred_data_files.labels(
+        rsync_source=rsyncer_info.source, visit=visit_name
+    ).inc(rsyncer_info.increment_data_count)
+    prom.transferred_data_files_bytes.labels(
+        rsync_source=rsyncer_info.source, visit=visit_name
+    ).inc(rsyncer_info.data_bytes)
+
+
+@router.post("/visits/{visit_name}/monitoring/{on}")
+def change_monitoring_status(visit_name: str, on: int):
+    prom.monitoring_switch.labels(visit=visit_name)
+    prom.monitoring_switch.labels(visit=visit_name).set(on)

src/murfey/server/demo_api.py

@@ -30,8 +30,7 @@
 )
 from murfey.server import shutdown as _shutdown
 from murfey.server import templates
-from murfey.server.api import MurfeySessionID
-from murfey.server.api.auth import validate_token
+from murfey.server.api.auth import MurfeySessionID, validate_token
 from murfey.server.api.session_info import Visit
 from murfey.server.api.workflow import (
     DCGroupParameters,
@@ -60,15 +59,11 @@
 )
 from murfey.util.models import (
     ClientInfo,
-    CurrentGainRef,
     FoilHoleParameters,
     GridSquareParameters,
-    PostInfo,
     RegistrationMessage,
     RsyncerInfo,
     RsyncerSource,
-    SessionInfo,
-    TiltInfo,
 )
 from murfey.util.processing_params import default_spa_parameters
 
@@ -601,30 +596,6 @@ def get_tilts(client_id: int, tilt_series_tag: str, db=murfey_db):
     return tilts
 
 
-@router.post("/visits/{visit_name}/{client_id}/tilt")
-def register_tilt(visit_name: str, client_id: int, tilt_info: TiltInfo, db=murfey_db):
-    session_id = (
-        db.exec(
-            select(ClientEnvironment).where(ClientEnvironment.client_id == client_id)
-        )
-        .one()
-        .session_id
-    )
-    tilt_series_id = (
-        db.exec(
-            select(TiltSeries)
-            .where(TiltSeries.tag == tilt_info.tilt_series_tag)
-            .where(TiltSeries.session_id == session_id)
-            .where(TiltSeries.rsync_source == tilt_info.source)
-        )
-        .one()
-        .id
-    )
-    tilt = Tilt(movie_path=tilt_info.movie_path, tilt_series_id=tilt_series_id)
-    db.add(tilt)
-    db.commit()
-
-
 @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)
@@ -998,25 +969,6 @@ async def get_sessions_by_instrument_name(
     return sessions
 
 
-@router.post("/instruments/{instrument_name}/clients/{client_id}/session")
-def link_client_to_session(
-    instrument_name: str, client_id: int, sess: SessionInfo, db=murfey_db
-):
-    sid = sess.session_id
-    if sid is None:
-        s = Session(name=sess.session_name, instrument_name=instrument_name)
-        db.add(s)
-        db.commit()
-        sid = s.id
-    client = db.exec(
-        select(ClientEnvironment).where(ClientEnvironment.client_id == client_id)
-    ).one()
-    client.session_id = sid
-    db.add(client)
-    db.commit()
-    return sid
-
-
 @router.delete("/clients/{client_id}/session")
 def remove_session(client_id: int, db=murfey_db):
     client = db.exec(
@@ -1146,26 +1098,10 @@ async def get_tiff(visit_name: str, session_id: int, tiff_path: str, db=murfey_d
     return FileResponse(path=test_path)
 
 
-@router.post("/failed_client_post")
-def failed_client_post(post_info: PostInfo):
-    log.info("Post failed")
-    return
-
-
 @router.post("/instruments/{instrument_name}/visits/{visit}/session/{name}")
 def create_session(instrument_name: str, visit: str, name: str, db=murfey_db) -> int:
     s = Session(name=name, visit=visit, instrument_name=instrument_name)
     db.add(s)
     db.commit()
     sid = s.id
     return sid
-
-
-@router.put("/sessions/{session_id}/current_gain_ref")
-def update_current_gain_ref(
-    session_id: MurfeySessionID, new_gain_ref: CurrentGainRef, db=murfey_db
-):
-    session = db.exec(select(Session).where(Session.id == session_id)).one()
-    session.current_gain_ref = new_gain_ref.path
-    db.add(session)
-    db.commit()

src/murfey/server/main.py

@@ -19,6 +19,8 @@
 import murfey.server.api.hub
 import murfey.server.api.instrument
 import murfey.server.api.processing_parameters
+import murfey.server.api.prometheus
+import murfey.server.api.session_control
 import murfey.server.api.session_info
 import murfey.server.api.spa
 import murfey.server.api.workflow
@@ -78,11 +80,16 @@ class Settings(BaseSettings):
 app.include_router(murfey.server.api.instrument.router)
 app.include_router(murfey.server.api.hub.router)
 app.include_router(murfey.server.api.processing_parameters.router)
+app.include_router(murfey.server.api.prometheus.router)
 app.include_router(murfey.server.api.file_manip.router)
+app.include_router(murfey.server.api.session_control.router)
+app.include_router(murfey.server.api.session_control.spa_router)
 app.include_router(murfey.server.api.session_info.router)
+app.include_router(murfey.server.api.session_info.correlative_router)
 app.include_router(murfey.server.api.session_info.spa_router)
 app.include_router(murfey.server.api.session_info.tomo_router)
 app.include_router(murfey.server.api.workflow.router)
+app.include_router(murfey.server.api.workflow.correlative_router)
 app.include_router(murfey.server.api.workflow.spa_router)
 app.include_router(murfey.server.api.workflow.tomo_router)
 app.include_router(murfey.server.websocket.ws)