From 6b40d05a437052e903ec54a0bd1803eafbc7e7f8 Mon Sep 17 00:00:00 2001 From: David Perl Date: Mon, 6 Jul 2026 11:42:13 +0200 Subject: [PATCH] fix: load beamline configs from correct dir --- src/aarecommon/config/beamline.py | 6 ++++-- .../{logging_configs => beamline_configs}/simulated.yaml | 0 .../config/{logging_configs => beamline_configs}/x06da.yaml | 0 .../config/{logging_configs => beamline_configs}/x06sa.yaml | 0 .../config/{logging_configs => beamline_configs}/x10sa.yaml | 0 5 files changed, 4 insertions(+), 2 deletions(-) rename src/aarecommon/config/{logging_configs => beamline_configs}/simulated.yaml (100%) rename src/aarecommon/config/{logging_configs => beamline_configs}/x06da.yaml (100%) rename src/aarecommon/config/{logging_configs => beamline_configs}/x06sa.yaml (100%) rename src/aarecommon/config/{logging_configs => beamline_configs}/x10sa.yaml (100%) diff --git a/src/aarecommon/config/beamline.py b/src/aarecommon/config/beamline.py index 3f83ed8..9f18142 100644 --- a/src/aarecommon/config/beamline.py +++ b/src/aarecommon/config/beamline.py @@ -1,7 +1,9 @@ import os from pathlib import Path -import yaml from typing import Any, Dict + +import yaml + from aarecommon.models.beamline import MXBeamline @@ -11,7 +13,7 @@ class BeamlineYAMLConfig: self.config = self._load_config() def _load_config(self) -> Dict[str, Any]: - config_dir = Path(__file__).parent / "config" + config_dir = Path(__file__).parent / "beamline_configs" yaml_file = config_dir / f"{self.beamline.value.lower()}.yaml" if not yaml_file.exists(): diff --git a/src/aarecommon/config/logging_configs/simulated.yaml b/src/aarecommon/config/beamline_configs/simulated.yaml similarity index 100% rename from src/aarecommon/config/logging_configs/simulated.yaml rename to src/aarecommon/config/beamline_configs/simulated.yaml diff --git a/src/aarecommon/config/logging_configs/x06da.yaml b/src/aarecommon/config/beamline_configs/x06da.yaml similarity index 100% rename from src/aarecommon/config/logging_configs/x06da.yaml rename to src/aarecommon/config/beamline_configs/x06da.yaml diff --git a/src/aarecommon/config/logging_configs/x06sa.yaml b/src/aarecommon/config/beamline_configs/x06sa.yaml similarity index 100% rename from src/aarecommon/config/logging_configs/x06sa.yaml rename to src/aarecommon/config/beamline_configs/x06sa.yaml diff --git a/src/aarecommon/config/logging_configs/x10sa.yaml b/src/aarecommon/config/beamline_configs/x10sa.yaml similarity index 100% rename from src/aarecommon/config/logging_configs/x10sa.yaml rename to src/aarecommon/config/beamline_configs/x10sa.yaml -- 2.54.0