feat: Move configs to ehn1-configs

src/runconf_ui/apps/__main__shifter_view__.py

@@ -2,25 +2,25 @@
 Main application for the shifter view interface.
 """
 
 from runconf_ui.screens.shifter_view_screen import ShifterViewScreen
 from runconf_ui.utils.file_cleaner import clean_old_files
 from runconf_ui.runconf_ui_configuration.shifter_config_reader import (
     ShifterConfigReader,
 )
 from runconf_ui.runconf_ui_controllers.runconf_ui_state import (
     ShifterInterfaceState,
 )
 from runconf_ui.screens.quit_screen import QuitScreen
 
 from textual.app import App
 import click
 from rich import print
 
 import os
 from pathlib import Path
 import logging
 from datetime import datetime
 import pkg_resources
 
 
 class ShifterView(App):
@@ -29,7 +29,7 @@
     """
 
     CSS_PATH = "shifter_view.tcss"
     BINDINGS = [("ctrl+q", "quit", "Quit")]
 
     def __init__(self, *args, **kwargs):
         """Constructor for the ShifterView class.
@@ -52,19 +52,12 @@
         use_local = kwargs.get("use_local", False)
 
         if use_local:
-            interface_config = f"{Path(__file__).parent.absolute()}/../config_files/interface_configs/local_configuration.yml"
+            interface_config = f"{Path(__file__).parent.absolute()}/../config_files/local_configuration.yml"
         else:
-            interface_config = f"{Path(__file__).parent.absolute()}/../config_files/interface_configs/ehn1_configuration.yml"
+            interface_config = f"{Path(__file__).parent.absolute()}/../config_files/ehn1_configuration.yml"
 
         apparatus = kwargs.get("apparatus", os.environ.get("APPARATUS", "np02"))
 
-        # messy...
-        detector_configuration = f"{Path(__file__).parent.absolute()}/../config_files/detector_configs/{apparatus}_configuration.yml"
-
-        if not Path(detector_configuration).exists():
-            raise Exception(
-                f"Detector configuration file {detector_configuration} does not exist"
-            )
 
         if not Path(interface_config).exists():
             raise Exception(
@@ -73,7 +66,7 @@
 
         # Now we've done logs, we can read the configuration
         interface_config = ShifterConfigReader(
-            detector_config_file=detector_configuration,
+            # detector_config_file=detector_configuration,
             settings_config_file=interface_config,
             **kwargs,
         )

src/runconf_ui/configuration_manager_interfaces/local_daq_conf_manager.py

@@ -1,14 +1,16 @@
 from pathlib import Path
+import os
 from runconf_ui.configuration_manager_interfaces.management_interface import (
     ManagementInterface,
 )
 from runconf_ui.daq_config_interfaces.daq_config_file_io.daq_conf_path_reader import (
     DaqConfPathReader,
 )
 from runconf_ui.runconf_ui_controllers.runconf_ui_state import (
     ShifterInterfaceState,
 )
 
+import logging
 
 class LocalDaqConfManager(ManagementInterface):
     def __init__(self, application_controller: ShifterInterfaceState):
@@ -23,6 +25,15 @@
                 ":"
             )
         ]
+
+        # We can also immediately load in our detector config since this won't change
+        detector_config_path = Path(os.environ["DUNEDAQ_DB_DATA_ROOT"]) / 'runconf-ui-settings' / f"{self.application_controller.apparatus}.yml"
+        if not detector_config_path.exists():
+            raise FileNotFoundError(f"Detector configuration file {detector_config_path} does not exist")
+
+        self.application_controller.shifter_interface_config.open_detector_config(str(detector_config_path))
+
+
 
     def get_daq_versions(self) -> list[Path]:
         """

src/runconf_ui/configuration_manager_interfaces/management_interface.py

@@ -2,17 +2,17 @@
 Simple wrapper for talking to config-management
 """
 
 from runconf_ui.daq_config_interfaces.daq_config_file_io.daq_config_wrapper import (
     DaqConfigurationWrapper,
 )
 from runconf_ui.runconf_ui_controllers.runconf_ui_state import (
     ShifterInterfaceState,
 )
 import runconf_ui.daq_config_interfaces.actions.actions as ca
 
 import logging
 from abc import ABC, abstractmethod
 from pathlib import Path
 
 
 class ManagementInterface(ABC):
@@ -51,9 +51,10 @@
 
     @classmethod
     def find_session(cls, file_name: str):
+
         config_file = DaqConfigurationWrapper(file_name)
         file_sessions = ca.GetDalsOfClassAction(config_file)("Session")
         if file_sessions:
             return ca.GetAttributeAction(config_file)(file_sessions[0], "id")
         else:
             return None

src/runconf_ui/configuration_manager_interfaces/remote_daq_conf_manger.py

@@ -8,23 +8,23 @@
         "Could not import runconftool or config_management. Please install runconftools or config_management"
     )
 
 from runconf_ui.daq_config_interfaces.daq_config_file_io.daq_conf_path_reader import (
     DaqConfPathReader,
 )
 from runconf_ui.runconf_ui_controllers.runconf_ui_state import (
     ShifterInterfaceState,
 )
 from runconf_ui.configuration_manager_interfaces.management_interface import (
     ManagementInterface,
 )
 
 import re
 from pathlib import Path
 import logging
 import traceback
 import shutil
 
 from runconf_ui.exceptions import CiderInvalidRepoException
 
 
 class RemoteDaqConfManager(ManagementInterface):
@@ -75,7 +75,15 @@
         except Exception as e:
             logging.error(traceback.format_exc())
             CiderInvalidRepoException(e)
-
+
+
+        detector_config_path = Path(self.application_controller.shifter_interface_config.download_directory) / 'runconf-ui-settings' / f"{self.application_controller.apparatus}.yml"
+        if not detector_config_path.exists():
+            raise FileNotFoundError(f"Detector configuration file {detector_config_path} does not exist")
+
+        logging.info(f"Using detector configuration file {detector_config_path}")
+
+        self.application_controller.shifter_interface_config.open_detector_config(str(detector_config_path))
         # Now we can open the file
         config_path_reader = DaqConfPathReader()
 
@@ -108,6 +116,7 @@
                 f"Found multiple config files with the same name: {valid_config_files}, using the first one"
             )
 
+
         config_file = valid_config_files[0]
 
         return super().open_file(Path(config_file))