Skip to content

Adds config server to i19_2 #2067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Matt-Carre merged 6 commits into from
May 20, 2026
Merged

Adds config server to i19_2 #2067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ee2a37
Adds initial circular plans
Matt-Carre May 18, 2026
2a7ae1c
Merge branch 'main' of github.com:DiamondLightSource/dodal
Matt-Carre May 19, 2026
c928479
Merge branch 'main' of github.com:DiamondLightSource/dodal
Matt-Carre May 19, 2026
f474d7e
fixed last part
Matt-Carre May 20, 2026
e0cc93d
adds config
Matt-Carre May 20, 2026
100204f
Changes existing test - unsure if its correct? it does seem to work t…
Matt-Carre May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/dodal/beamlines/i19_2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
from functools import cache
from pathlib import Path

from daq_config_server import ConfigClient
from ophyd_async.core import PathProvider
from ophyd_async.fastcs.eiger import EigerDetector
from ophyd_async.fastcs.panda import HDFPanda

from dodal.common.beamlines.beamline_utils import (
set_beamline as set_utils_beamline,
)
from dodal.common.beamlines.beamline_utils import set_config_client
from dodal.common.visit import StaticVisitPathProvider
from dodal.device_manager import DeviceManager
from dodal.devices.beamlines.i19.access_controlled.attenuator_motor_squad import (
Expand Down Expand Up @@ -54,6 +56,14 @@
devices = DeviceManager()


@devices.fixture
@cache
def config_client() -> ConfigClient:
client = ConfigClient()
set_config_client(client)
return client


@devices.fixture
@cache
def path_provider() -> PathProvider:
Expand Down
4 changes: 3 additions & 1 deletion tests/common/beamlines/test_config_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import pytest
from daq_config_server import ConfigClient

from dodal.beamlines import i03, i04
from dodal.beamlines import i03, i04, i19_1, i19_2


@pytest.mark.parametrize(
"client, expected_url",
[
(i03.config_client(), "https://i03-daq-config.diamond.ac.uk"),
(i04.config_client(), "https://i04-daq-config.diamond.ac.uk"),
(i19_1.config_client(), "https://daq-config.diamond.ac.uk"),
(i19_2.config_client(), "https://daq-config.diamond.ac.uk"),
],
)
def test_config_client_has_correct_url_for_each_beamline(
Expand Down
Loading