Fixes for instrument image display endpoints

src/murfey/instrument_server/api.py

@@ -237,9 +237,9 @@ def get_possible_gain_references(
         headers={"Authorization": f"Bearer {tokens[session_id]}"},
     ).json()
     candidates = []
-    for gf in secure_path(Path(machine_config["gain_reference_directory"])).glob(
-        "**/*"
-    ):
+    for gf in secure_path(
+        Path(machine_config["gain_reference_directory"]), keep_spaces=True
+    ).glob("**/*"):
         if gf.is_file():
             candidates.append(
                 File(

src/murfey/server/api/__init__.py

@@ -167,8 +167,8 @@ def get_instrument_display_name(instrument_name: str) -> str:
     machine_config = get_machine_config(instrument_name=instrument_name)[
         instrument_name
     ]
-    if machine_config.get(instrument_name):
-        return machine_config[instrument_name].display_name
+    if machine_config:
+        return machine_config.display_name
     return ""
 
 

src/murfey/server/api/display.py

@@ -13,10 +13,10 @@
 machine_config = get_machine_config()
 
 
-@router.get("/microscope_image/")
-def get_mic_image():
-    if machine_config.image_path:
-        return FileResponse(machine_config.image_path)
+@router.get("/instruments/{instrument_name}/image/")
+def get_mic_image(instrument_name: str):
+    if machine_config[instrument_name].image_path:
+        return FileResponse(machine_config[instrument_name].image_path)
     return None
 
 

src/murfey/server/websocket.py

@@ -137,7 +137,7 @@ async def websocket_connection_endpoint(
             except Exception:
                 await manager.broadcast(f"Client #{client_id} sent message {data}")
     except WebSocketDisconnect:
-        log.info(f"Disconnecting Client {int(sanitise(str(client_id)))}")
+        log.info(f"Disconnecting Client {sanitise(str(client_id))}")
         manager.disconnect(websocket, client_id, unregister_client=False)
         await manager.broadcast(f"Client #{client_id} disconnected")
         await manager.delete_state(f"Client {client_id}")

src/murfey/util/__init__.py

@@ -62,8 +62,11 @@ def sanitise_nonpath(in_string: str) -> str:
     return in_string
 
 
-def secure_path(in_path: Path) -> Path:
-    secured_parts = [secure_filename(p) for p in in_path.parts]
+def secure_path(in_path: Path, keep_spaces: bool = False) -> Path:
+    if keep_spaces:
+        secured_parts = [secure_filename(p) for p in in_path.parts if " " not in p]
+    else:
+        secured_parts = [secure_filename(p) for p in in_path.parts]
     return Path("/".join(secured_parts))