Removed 'get_machine_config_for_instrument' from 'session_shared' and replaced it with 'get_machine_config' from 'murfey.util.config' instead

Author: tieneupin

src/murfey/server/api/session_control.py

@@ -24,15 +24,14 @@
     get_foil_holes_from_grid_square as _get_foil_holes_from_grid_square,
     get_grid_squares as _get_grid_squares,
     get_grid_squares_from_dcg as _get_grid_squares_from_dcg,
-    get_machine_config_for_instrument,
     get_tiff_file as _get_tiff_file,
     get_upstream_file as _get_upstream_file,
     remove_session_by_id,
 )
 from murfey.server.ispyb import DB as ispyb_db, get_all_ongoing_visits
 from murfey.server.murfey_db import murfey_db
 from murfey.util import sanitise
-from murfey.util.config import MachineConfig
+from murfey.util.config import get_machine_config
 from murfey.util.db import (
     AutoProcProgram,
     ClientEnvironment,
@@ -80,8 +79,8 @@ async def get_current_timestamp():
 
 
 @router.get("/instruments/{instrument_name}/machine")
-def machine_info_by_instrument(instrument_name: str) -> Optional[MachineConfig]:
-    return get_machine_config_for_instrument(instrument_name)
+def machine_info_by_instrument(instrument_name: str):
+    return get_machine_config(instrument_name)[instrument_name]
 
 
 @router.get("/new_client_id/")

src/murfey/server/api/session_info.py

@@ -24,15 +24,14 @@
     get_foil_holes_from_grid_square as _get_foil_holes_from_grid_square,
     get_grid_squares as _get_grid_squares,
     get_grid_squares_from_dcg as _get_grid_squares_from_dcg,
-    get_machine_config_for_instrument,
     get_tiff_file as _get_tiff_file,
     get_upstream_file as _get_upstream_file,
     remove_session_by_id,
 )
 from murfey.server.ispyb import DB as ispyb_db, get_all_ongoing_visits
 from murfey.server.murfey_db import murfey_db
 from murfey.util import sanitise
-from murfey.util.config import MachineConfig
+from murfey.util.config import get_machine_config
 from murfey.util.db import (
     ClassificationFeedbackParameters,
     ClientEnvironment,
@@ -78,8 +77,8 @@ def connections_check():
 @router.get("/instruments/{instrument_name}/machine")
 def machine_info_by_instrument(
     instrument_name: MurfeyInstrumentName,
-) -> Optional[MachineConfig]:
-    return get_machine_config_for_instrument(instrument_name)
+):
+    return get_machine_config(instrument_name)[instrument_name]
 
 
 @router.get("/instruments/{instrument_name}/visits_raw", response_model=List[Visit])

src/murfey/server/api/session_shared.py

@@ -1,20 +1,14 @@
 import logging
-from functools import lru_cache
 from pathlib import Path
-from typing import Dict, List, Optional
+from typing import Dict, List
 
 from sqlmodel import select
 from sqlmodel.orm.session import Session as SQLModelSession
 from werkzeug.utils import secure_filename
 
 import murfey.server.prometheus as prom
 from murfey.util import safe_run, sanitise, secure_path
-from murfey.util.config import (
-    MachineConfig,
-    get_machine_config,
-    machine_config_from_file,
-    settings,
-)
+from murfey.util.config import get_machine_config
 from murfey.util.db import (
     DataCollection,
     DataCollectionGroup,
@@ -28,15 +22,6 @@
 logger = logging.getLogger("murfey.server.api.shared")
 
 
-@lru_cache(maxsize=5)
-def get_machine_config_for_instrument(instrument_name: str) -> Optional[MachineConfig]:
-    if settings.murfey_machine_configuration:
-        return machine_config_from_file(
-            Path(settings.murfey_machine_configuration), instrument_name
-        )[instrument_name]
-    return None
-
-
 def remove_session_by_id(session_id: int, db):
     session = db.exec(select(MurfeySession).where(MurfeySession.id == session_id)).one()
     sessions_for_visit = db.exec(