Refactor API endpoints

src/murfey/server/__init__.py

@@ -41,7 +41,6 @@
 
 import murfey
 import murfey.server.prometheus as prom
-import murfey.server.websocket
 from murfey.client.contexts.tomo import _midpoint
 from murfey.server.murfey_db import url  # murfey_db
 from murfey.util.config import (

src/murfey/server/api/__init__.py

@@ -27,12 +27,12 @@
 from sqlmodel import col, select
 from werkzeug.utils import secure_filename
 
+import murfey.server.api.websocket as ws
 import murfey.server.ispyb
 import murfey.server.prometheus as prom
-import murfey.server.websocket as ws
 import murfey.util.eer
+from murfey.client.contexts.tomo import _midpoint
 from murfey.server import (
-    _midpoint,
     _murfey_id,
     _transport_object,
     check_tilt_series_mc,

src/murfey/server/websocket.py → src/murfey/server/api/websocket.py

@@ -18,7 +18,7 @@
 T = TypeVar("T")
 
 ws = APIRouter(prefix="/ws", tags=["websocket"])
-log = logging.getLogger("murfey.server.websocket")
+log = logging.getLogger("murfey.server.api.websocket")
 
 
 class ConnectionManager(Generic[T]):

src/murfey/server/demo_api.py

@@ -21,8 +21,8 @@
 from werkzeug.utils import secure_filename
 
 import murfey.server.api.bootstrap
+import murfey.server.api.websocket as ws
 import murfey.server.prometheus as prom
-import murfey.server.websocket as ws
 import murfey.util.eer
 from murfey.server import (
     _flush_grid_square_records,
@@ -1067,7 +1067,7 @@
             .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
@@ -1281,7 +1281,7 @@
 def suggest_path(
     visit_name: str, session_id: int, params: SuggestedPathParameters, db=murfey_db
 ):
-    count: int | None = router.raw_count
+    count: Optional[int] = router.raw_count
     instrument_name = (
         db.exec(select(Session).where(Session.id == session_id)).one().instrument_name
     )

src/murfey/server/ispyb.py

@@ -271,7 +271,7 @@ def do_buffer_lookup(self, app_id: int, uuid: int) -> Optional[int]:
         return reference
 
 
-def _get_session() -> sqlalchemy.orm.Session:
+def _get_session() -> sqlalchemy.orm.Session:  # type: ignore
     db = Session()
     try:
         yield db

src/murfey/server/main.py

@@ -18,7 +18,7 @@
 import murfey.server.api.hub
 import murfey.server.api.instrument
 import murfey.server.api.spa
-import murfey.server.websocket
+import murfey.server.api.websocket
 import murfey.util.models
 from murfey.server import template_files
 from murfey.util.config import get_security_config
@@ -80,7 +80,7 @@ class Settings(BaseSettings):
 app.include_router(murfey.server.api.display.router)
 app.include_router(murfey.server.api.instrument.router)
 app.include_router(murfey.server.api.hub.router)
-app.include_router(murfey.server.websocket.ws)
+app.include_router(murfey.server.api.websocket.ws)
 
 for r in entry_points(group="murfey.routers"):
     app.include_router(r.load())