From 36a633a29104d997e2f07de7114118fdafa41a7d Mon Sep 17 00:00:00 2001 From: appleb_m Date: Tue, 12 May 2026 17:04:02 +0200 Subject: [PATCH] COmmon: added yaml files, moved logging yamls to common/config/ --- src/aare/common/{ => config}/logging_dev.yaml | 0 src/aare/common/config/logging_prod.yaml | 39 ++++++++++++++ src/aare/common/config/simulated.yaml | 7 +++ src/aare/common/config/x06da.yaml | 22 ++++++++ src/aare/common/config/x06sa.yaml | 24 +++++++++ src/aare/common/config/x10sa.yaml | 54 +++++++++++++++++++ src/aare/common/logger_config.py | 2 +- 7 files changed, 147 insertions(+), 1 deletion(-) rename src/aare/common/{ => config}/logging_dev.yaml (100%) create mode 100644 src/aare/common/config/logging_prod.yaml create mode 100644 src/aare/common/config/simulated.yaml create mode 100644 src/aare/common/config/x06da.yaml create mode 100644 src/aare/common/config/x06sa.yaml create mode 100644 src/aare/common/config/x10sa.yaml diff --git a/src/aare/common/logging_dev.yaml b/src/aare/common/config/logging_dev.yaml similarity index 100% rename from src/aare/common/logging_dev.yaml rename to src/aare/common/config/logging_dev.yaml diff --git a/src/aare/common/config/logging_prod.yaml b/src/aare/common/config/logging_prod.yaml new file mode 100644 index 00000000..d9e42fd7 --- /dev/null +++ b/src/aare/common/config/logging_prod.yaml @@ -0,0 +1,39 @@ +version: 1 +disable_existing_loggers: False + +formatters: + simple: + format: "%(asctime)s - %(levelname)s - %(message)s" + +handlers: + app_file: + class: logging.handlers.RotatingFileHandler + level: INFO + formatter: simple + filename: logs/app.log + maxBytes: 1000000 + backupCount: 10 + encoding: utf8 + + error_file: + class: logging.handlers.RotatingFileHandler + level: ERROR + formatter: simple + filename: logs/errors.log + maxBytes: 500000 + backupCount: 5 + encoding: utf8 + +loggers: + aareDAQ: + level: DEBUG + handlers: [console, app_file, error_file] + propagate: no + aareGUI: + level: DEBUG + handlers: [ console, app_file, error_file ] + propagate: n + +root: + level: WARNING + handlers: [] diff --git a/src/aare/common/config/simulated.yaml b/src/aare/common/config/simulated.yaml new file mode 100644 index 00000000..ed36a091 --- /dev/null +++ b/src/aare/common/config/simulated.yaml @@ -0,0 +1,7 @@ +beamline: "SIMULATED" +smargon_base: "simulated" +aerotech_base: "simulated" +zmq_camera_url: "simulated" +jfjoch_url: "simulated" +tell_url: "simulated" +redis_host: "localhost" \ No newline at end of file diff --git a/src/aare/common/config/x06da.yaml b/src/aare/common/config/x06da.yaml new file mode 100644 index 00000000..5fe0ee50 --- /dev/null +++ b/src/aare/common/config/x06da.yaml @@ -0,0 +1,22 @@ +beamline_id: "X06DA" +gui: + cameras: + sample_camera_zmq_url: "tcp://x06da-pserv-01:9089" + prediction_zmq_url: "tcp://mx-ml:9091" + beamline_camera_url: "x06da-axis-1.psi.ch" + gonio_camera_url: "axis-accc8ed2972e.psi.ch" + gonio_camera_id: "3" + daq: + daq_url: "http://mx-x06da-queue-01.psi.ch:5210" +shared: + jfjoch: + jfjoch_url: "http://sls-gpu-001:8080" +daq: + hardware: + smargon_url: "http://x06da-smargopolo.psi.ch:3000" + aerotech_url: "http://x06da-smargopolo.psi.ch:5234" # Adjust if needed + tell_url: "http://x06da-tell.psi.ch:22222" + bec_url: "x06da-bec-001.psi.ch" + redis_url: "x06da-redis.psi.ch" + db: + aaredb_url: "https://mx-aaredb-dmz-01.psi.ch/dispatcher" \ No newline at end of file diff --git a/src/aare/common/config/x06sa.yaml b/src/aare/common/config/x06sa.yaml new file mode 100644 index 00000000..68f8c95e --- /dev/null +++ b/src/aare/common/config/x06sa.yaml @@ -0,0 +1,24 @@ +beamline_id: "X06SA" + +redis_host: +gui: + cameras: + sample_camera_zmq_url: "tcp://x06sa-pserv-01:9089" + prediction_zmq_url: "" + beamline_camera_url: "" + gonio_camera_url: "" + gonio_camera_id: "" + daq: + daq_url: "http://mx-x06sa-queue-01.psi.ch:5210" +shared: + jfjoch: + jfjoch_url: "" +daq: + hardware: + smargon_url: "http://x06sa-smargopolo.psi.ch:3000" + aerotech_url: "http://x06sa-queue-01.psi.ch:5234" # Adjust if needed + tell_url: "" + bec_url: "x06sa-bec-001.psi.ch" + redis_url: "" + db: + aaredb_url: "https://mx-aaredb-dmz-01.psi.ch/dispatcher" \ No newline at end of file diff --git a/src/aare/common/config/x10sa.yaml b/src/aare/common/config/x10sa.yaml new file mode 100644 index 00000000..d7d07f96 --- /dev/null +++ b/src/aare/common/config/x10sa.yaml @@ -0,0 +1,54 @@ +beamline_id: "X10SA" + +gui: + + cameras: + + sample_camera_zmq_url: "tcp://x10sa-spark-01:9091" + prediction_zmq_url: "tcp://x10sa-spark-01:9091" + beamline_camera_url: "axis-accc8eb02488.psi.ch" + gonio_camera_url: "axis-accc8ea5e463.psi.ch" + gonio_camera_id: "1" + + daq: + + daq_url: "http://mx-x10sa-queue-01.psi.ch:5210" + +shared: + + jfjoch: + + jfjoch_url: "http://sls-gpu-002:8080" + +daq: + + hardware: + + smargon_url: "http://x10sa-smargopolo.psi.ch:3000" + aerotech_url: "http://mx-x10sa-queue-01.psi.ch:5234" # Adjust if needed + tell_url: "http://PC17488:22222" + bec_url: "x10sa-bec-001.psi.ch" + redis_url: "x10sa-redis.psi.ch" + states: + backlight_levels: {off: 0.0, half: 0.98, max: 1.2} + frontlight_levels: {off: 1.49, half: 2.0, max: 3.0} + + db: + aaredb_url: "https://mx-aaredb-dmz-01.psi.ch/dispatcher" + + data_collection_settings: + + default_raster_scan_settings: + + exp_time_s: 0.01 + transmission: 1.0 + dtz: 150.0 + + default_rotation_settings: + + exp_time_s: 0.01 + transmission: 1.0 + dtz: 150.0 + start_omega_deg: 0.0 + increment_omega_deg: 1.0 + steps: 1800 diff --git a/src/aare/common/logger_config.py b/src/aare/common/logger_config.py index 6cf35e6c..fa3413ff 100644 --- a/src/aare/common/logger_config.py +++ b/src/aare/common/logger_config.py @@ -84,7 +84,7 @@ def get_uvicorn_logging_config() -> dict: def get_config_path(env: str = "dev") -> Path: module_dir = Path(__file__).parent config_filename = f"logging_{env}.yaml" - config_path = module_dir / config_filename + config_path = module_dir / "config" / config_filename if not config_path.exists(): raise FileNotFoundError(f"Logging config not found: {config_path}")