Completely delete the global state

Author: stephen-riggs

src/murfey/server/api/__init__.py

@@ -77,11 +77,9 @@
     BLSampleParameters,
     BLSubSampleParameters,
     ClientInfo,
-    ContextInfo,
     CurrentGainRef,
     DCGroupParameters,
     DCParameters,
-    File,
     FoilHoleParameters,
     FractionationParameters,
     GainReference,
@@ -1021,23 +1019,6 @@ def visit_info(
         return None
 
 
-@router.post("/visits/{visit_name}/context")
-async def register_context(context_info: ContextInfo):
-    await ws.manager.broadcast(f"Context registered: {context_info}")
-    await ws.manager.set_state("experiment_type", context_info.experiment_type)
-    await ws.manager.set_state(
-        "acquisition_software", context_info.acquisition_software
-    )
-
-
-@router.post("/visits/{visit_name}/files")
-async def add_file(file: File):
-    message = f"File {file} transferred"
-    log.info(message)
-    await ws.manager.broadcast(f"File {file} transferred")
-    return file
-
-
 @router.post("/instruments/{instrument_name}/feedback")
 async def send_murfey_message(instrument_name: str, msg: RegistrationMessage):
     if _transport_object:
@@ -1320,7 +1301,6 @@ async def request_tomography_preprocessing(
         db.add(for_stash)
         db.commit()
         db.close()
-    # await ws.manager.broadcast(f"Pre-processing requested for {ppath.name}")
     return proc_file
 
 

src/murfey/server/demo_api.py

@@ -62,11 +62,9 @@
 )
 from murfey.util.models import (
     ClientInfo,
-    ContextInfo,
     CurrentGainRef,
     DCGroupParameters,
     DCParameters,
-    File,
     FoilHoleParameters,
     FractionationParameters,
     GainReference,
@@ -899,26 +897,6 @@ def visit_info(request: Request, visit_name: str):
     )
 
 
-@router.post("/visits/{visit_name}/context")
-async def register_context(context_info: ContextInfo):
-    log.info(
-        f"Context {context_info.experiment_type}:{context_info.acquisition_software} registered"
-    )
-    await ws.manager.broadcast(f"Context registered: {context_info}")
-    await ws.manager.set_state("experiment_type", context_info.experiment_type)
-    await ws.manager.set_state(
-        "acquisition_software", context_info.acquisition_software
-    )
-
-
-@router.post("/visits/{visit_name}/files")
-async def add_file(file: File):
-    message = f"File {file} transferred"
-    log.info(message)
-    await ws.manager.broadcast(f"File {file} transferred")
-    return file
-
-
 @router.post("/feedback")
 async def send_murfey_message(msg: RegistrationMessage):
     pass

src/murfey/server/websocket.py

@@ -4,7 +4,7 @@
 import json
 import logging
 from datetime import datetime
-from typing import Any, Dict, Generic, TypeVar, Union
+from typing import Any, Dict, TypeVar, Union
 
 from fastapi import APIRouter, WebSocket, WebSocketDisconnect
 from sqlmodel import select
@@ -13,19 +13,16 @@
 from murfey.server.murfey_db import get_murfey_db_session
 from murfey.util import sanitise
 from murfey.util.db import ClientEnvironment
-from murfey.util.state import State, global_state
 
 T = TypeVar("T")
 
 ws = APIRouter(prefix="/ws", tags=["websocket"])
 log = logging.getLogger("murfey.server.websocket")
 
 
-class ConnectionManager(Generic[T]):
-    def __init__(self, state: State[T]):
+class ConnectionManager:
+    def __init__(self):
         self.active_connections: Dict[int | str, WebSocket] = {}
-        self._state = state
-        self._state.subscribe(self._broadcast_state_update)
 
     async def connect(
         self, websocket: WebSocket, client_id: int | str, register_client: bool = True
@@ -38,7 +35,6 @@ async def connect(
                     "To register a client the client ID must be an integer"
                 )
             self._register_new_client(client_id)
-        await websocket.send_json({"message": "state-full", "state": self._state.data})
 
     @staticmethod
     def _register_new_client(client_id: int):
@@ -48,9 +44,7 @@ def _register_new_client(client_id: int):
         murfey_db.commit()
         murfey_db.close()
 
-    def disconnect(
-        self, websocket: WebSocket, client_id: int | str, unregister_client: bool = True
-    ):
+    def disconnect(self, client_id: int | str, unregister_client: bool = True):
         self.active_connections.pop(client_id)
         if unregister_client:
             murfey_db = next(get_murfey_db_session())
@@ -67,33 +61,14 @@ async def broadcast(self, message: str):
         for connection in self.active_connections:
             await self.active_connections[connection].send_text(message)
 
-    async def _broadcast_state_update(
-        self, attribute: str, value: T | None, message: str = "state-update"
-    ):
-        for connection in self.active_connections:
-            await self.active_connections[connection].send_json(
-                {"message": message, "attribute": attribute, "value": value}
-            )
-
-    async def set_state(self, attribute: str, value: T):
-        log.info(
-            f"State attribute {sanitise(attribute)!r} set to {sanitise(str(value))!r}"
-        )
-        await self._state.set(attribute, value)
-
-    async def delete_state(self, attribute: str):
-        log.info(f"State attribute {sanitise(attribute)!r} removed")
-        await self._state.delete(attribute)
-
 
-manager = ConnectionManager(global_state)
+manager = ConnectionManager()
 
 
 @ws.websocket("/test/{client_id}")
 async def websocket_endpoint(websocket: WebSocket, client_id: int):
     await manager.connect(websocket, client_id)
     await manager.broadcast(f"Client {client_id} joined")
-    await manager.set_state(f"Client {client_id}", "joined")
     try:
         while True:
             data = await websocket.receive_text()
@@ -111,9 +86,8 @@ async def websocket_endpoint(websocket: WebSocket, client_id: int):
             select(ClientEnvironment).where(ClientEnvironment.client_id == client_id)
         ).one()
         prom.monitoring_switch.labels(visit=client_env.visit).set(0)
-        manager.disconnect(websocket, client_id)
+        manager.disconnect(client_id)
         await manager.broadcast(f"Client #{client_id} disconnected")
-        await manager.delete_state(f"Client {client_id}")
 
 
 @ws.websocket("/connect/{client_id}")
@@ -122,7 +96,6 @@ async def websocket_connection_endpoint(
 ):
     await manager.connect(websocket, client_id, register_client=False)
     await manager.broadcast(f"Client {client_id} joined")
-    await manager.set_state(f"Client {client_id}", "joined")
     try:
         while True:
             data = await websocket.receive_text()
@@ -138,9 +111,8 @@ async def websocket_connection_endpoint(
                 await manager.broadcast(f"Client #{client_id} sent message {data}")
     except WebSocketDisconnect:
         log.info(f"Disconnecting Client {sanitise(str(client_id))}")
-        manager.disconnect(websocket, client_id, unregister_client=False)
+        manager.disconnect(client_id, unregister_client=False)
         await manager.broadcast(f"Client #{client_id} disconnected")
-        await manager.delete_state(f"Client {client_id}")
 
 
 async def check_connections(active_connections):
@@ -178,7 +150,7 @@ async def close_ws_connection(client_id: int):
     murfey_db.close()
     client_id_str = str(client_id).replace("\r\n", "").replace("\n", "")
     log.info(f"Disconnecting {client_id_str}")
-    manager.disconnect(manager.active_connections[client_id], client_id)
+    manager.disconnect(client_id)
     prom.monitoring_switch.labels(visit=visit_name).set(0)
     await manager.broadcast(f"Client #{client_id} disconnected")
 
@@ -187,5 +159,5 @@ async def close_ws_connection(client_id: int):
 async def close_unrecorded_ws_connection(client_id: Union[int, str]):
     client_id_str = str(client_id).replace("\r\n", "").replace("\n", "")
     log.info(f"Disconnecting {client_id_str}")
-    manager.disconnect(manager.active_connections[client_id], client_id)
+    manager.disconnect(client_id)
     await manager.broadcast(f"Client #{client_id} disconnected")

src/murfey/util/models.py

@@ -83,14 +83,6 @@ class RegistrationMessage(BaseModel):
     params: Optional[Dict[str, Any]] = None
 
 
-class File(BaseModel):
-    name: str
-    description: str
-    size: int
-    timestamp: datetime
-    full_path: str
-
-
 class ConnectionFileParameters(BaseModel):
     filename: str
     destinations: List[str]
@@ -102,11 +94,6 @@ class SessionInfo(BaseModel):
     rescale: bool = True
 
 
-class ContextInfo(BaseModel):
-    experiment_type: str
-    acquisition_software: str
-
-
 class ClientInfo(BaseModel):
     id: int