Skip to content

Commit 7aebba2

Browse files
jacob720jacob720
authored
Reflect new config server structure (#1977)
* Reflect new config server structure * Fix tests
1 parent 8d14783 commit 7aebba2

13 files changed

Lines changed: 49 additions & 49 deletions

File tree

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies = [
3030
"scanspec>=0.7.3",
3131
"pyzmq==27.1.0",
3232
"deepdiff",
33-
"daq-config-server>=v1.1.2", # For getting Configuration settings.
33+
"daq-config-server >= 1.3.0", # For getting Configuration settings.
3434
"mysql-connector-python == 9.5.0", # Can unpin once https://github.com/DiamondLightSource/ispyb-api/pull/244 is merged and released
3535
]
3636

‎src/dodal/beamlines/i09_2_shared.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from pathlib import Path
22

3-
from daq_config_server.client import ConfigServer
3+
from daq_config_server import ConfigClient
44

55
from dodal.device_manager import DeviceManager
66
from dodal.devices.beamlines.i09.enums import Grating
@@ -25,7 +25,7 @@
2525
from dodal.devices.pgm import PlaneGratingMonochromator
2626
from dodal.utils import BeamlinePrefix, get_beamline_name
2727

28-
J09_CONF_CLIENT = ConfigServer(url="https://daq-config.diamond.ac.uk")
28+
J09_CONF_CLIENT = ConfigClient(url="https://daq-config.diamond.ac.uk")
2929
LOOK_UPTABLE_DIR = "/dls_sw/i09-2/software/gda/workspace_git/gda-diamond.git/configurations/i09-2-shared/lookupTables/"
3030
GAP_LOOKUP_FILE_NAME = "JIDEnergy2GapCalibrations.csv"
3131
PHASE_LOOKUP_FILE_NAME = "JIDEnergy2PhaseCalibrations.csv"

‎src/dodal/beamlines/i10_shared.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from pathlib import Path
99

10-
from daq_config_server.client import ConfigServer
10+
from daq_config_server import ConfigClient
1111

1212
from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
1313
from dodal.device_manager import DeviceManager
@@ -86,7 +86,7 @@ def switching_mirror() -> XYZPiezoCollimatingMirror:
8686

8787
"""ID"""
8888

89-
I10_CONF_CLIENT = ConfigServer(url="https://daq-config.diamond.ac.uk")
89+
I10_CONF_CLIENT = ConfigClient(url="https://daq-config.diamond.ac.uk")
9090

9191
LOOK_UPTABLE_DIR = "/dls_sw/i10/software/gda/workspace_git/gda-diamond.git/configurations/i10-shared/lookupTables/"
9292

‎src/dodal/beamlines/i21.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from pathlib import Path
22

3-
from daq_config_server.client import ConfigServer
3+
from daq_config_server import ConfigClient
44

55
from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
66
from dodal.device_manager import DeviceManager
@@ -38,7 +38,7 @@
3838
I21_PHASE_POLY_DEG_COLUMNS = ["b"]
3939
I21_GRATING_COLUMNS = "Grating"
4040

41-
I21_CONF_CLIENT = ConfigServer(url="https://daq-config.diamond.ac.uk")
41+
I21_CONF_CLIENT = ConfigClient(url="https://daq-config.diamond.ac.uk")
4242
LOOK_UPTABLE_DIR = "/dls_sw/i21/software/gda/workspace_git/gda-diamond.git/configurations/i21-config/lookupTables/"
4343
GAP_LOOKUP_FILE_NAME = "IDEnergy2GapCalibrations.csv"
4444
PHASE_LOOKUP_FILE_NAME = "IDEnergy2PhaseCalibrations.csv"

‎src/dodal/beamlines/k07.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from pathlib import Path
22

3-
from daq_config_server.client import ConfigServer
3+
from daq_config_server import ConfigClient
44
from ophyd_async.core import StrictEnum
55

66
from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
@@ -23,7 +23,7 @@
2323
devices = DeviceManager()
2424

2525

26-
K07_CONF_CLIENT = ConfigServer(url="https://daq-config.diamond.ac.uk")
26+
K07_CONF_CLIENT = ConfigClient(url="https://daq-config.diamond.ac.uk")
2727

2828
LOOK_UPTABLE_DIR = "/dls_sw/k07/software/gda/workspace_git/gda-diamond.git/configurations/k07/lookupTables/"
2929
GAP_LOOKUP_FILE_NAME = "JIDEnergy2GapCalibrations.csv"

‎src/dodal/common/beamlines/config_client.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from functools import cache
22

3-
from daq_config_server.client import ConfigServer
3+
from daq_config_server import ConfigClient
44

55
BEAMLINE_CONFIG_SERVER_ENDPOINTS = {
66
"i03": "https://i03-daq-config.diamond.ac.uk",
@@ -9,8 +9,8 @@
99

1010

1111
@cache
12-
def get_config_client(beamline: str) -> ConfigServer:
12+
def get_config_client(beamline: str) -> ConfigClient:
1313
url = BEAMLINE_CONFIG_SERVER_ENDPOINTS.get(
1414
beamline, "https://daq-config.diamond.ac.uk"
1515
)
16-
return ConfigServer(url=url)
16+
return ConfigClient(url=url)

‎src/dodal/devices/insertion_device/energy_motor_lookup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from pathlib import Path
22

3-
from daq_config_server.client import ConfigServer
3+
from daq_config_server import ConfigClient
44

55
from dodal.devices.insertion_device.enum import Pol
66
from dodal.devices.insertion_device.lookup_table_models import (
@@ -62,7 +62,7 @@ class ConfigServerEnergyMotorLookup(EnergyMotorLookup):
6262

6363
def __init__(
6464
self,
65-
config_client: ConfigServer,
65+
config_client: ConfigClient,
6666
lut_config: LookupTableColumnConfig,
6767
path: Path,
6868
):

‎src/dodal/testing/fixtures/config_server.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def mock_config_server():
3232
# Don't actually talk to central service during unit tests, and reset caches between test
3333

3434
with patch(
35-
"daq_config_server.client.ConfigServer.get_file_contents",
35+
"daq_config_server.app.client.ConfigClient.get_file_contents",
3636
side_effect=fake_config_server_get_file_contents,
3737
):
3838
yield

‎src/dodal/testing/fixtures/devices/apple2.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from unittest.mock import MagicMock
22

33
import pytest
4-
from daq_config_server.client import ConfigServer
4+
from daq_config_server import ConfigClient
55
from ophyd_async.core import (
66
init_devices,
77
set_mock_value,
@@ -21,8 +21,8 @@
2121

2222

2323
@pytest.fixture
24-
def mock_config_client() -> ConfigServer:
25-
mock_config_client = ConfigServer()
24+
def mock_config_client() -> ConfigClient:
25+
mock_config_client = ConfigClient()
2626

2727
mock_config_client.get_file_contents = MagicMock(spec=["get_file_contents"])
2828

‎tests/common/beamlines/test_config_client.py‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,49 @@
33
from dodal.common.beamlines.config_client import get_config_client
44

55

6-
@patch("dodal.common.beamlines.config_client.ConfigServer")
6+
@patch("dodal.common.beamlines.config_client.ConfigClient")
77
def test_by_default_get_config_client_uses_centrally_deployed_config_server(
8-
mock_config_server: MagicMock,
8+
mock_config_client: MagicMock,
99
):
1010
get_config_client("")
11-
mock_config_server.assert_called_once_with(url="https://daq-config.diamond.ac.uk")
11+
mock_config_client.assert_called_once_with(url="https://daq-config.diamond.ac.uk")
1212

1313

14-
@patch("dodal.common.beamlines.config_client.ConfigServer")
14+
@patch("dodal.common.beamlines.config_client.ConfigClient")
1515
def test_get_config_client_uses_i03_beamline_cluster_server_for_i03(
16-
mock_config_server: MagicMock,
16+
mock_config_client: MagicMock,
1717
):
1818
get_config_client("i03")
19-
mock_config_server.assert_called_once_with(
19+
mock_config_client.assert_called_once_with(
2020
url="https://i03-daq-config.diamond.ac.uk"
2121
)
2222

2323

24-
@patch("dodal.common.beamlines.config_client.ConfigServer")
24+
@patch("dodal.common.beamlines.config_client.ConfigClient")
2525
def test_get_config_client_uses_centrally_deployed_config_server_for_i04(
26-
mock_config_server: MagicMock,
26+
mock_config_client: MagicMock,
2727
):
2828
get_config_client("i04")
29-
mock_config_server.assert_called_once_with(url="https://daq-config.diamond.ac.uk")
29+
mock_config_client.assert_called_once_with(url="https://daq-config.diamond.ac.uk")
3030

3131

32-
@patch("dodal.common.beamlines.config_client.ConfigServer")
32+
@patch("dodal.common.beamlines.config_client.ConfigClient")
3333
def test_get_config_client_caches_if_called_with_same_beamline(
34-
mock_config_server: MagicMock,
34+
mock_config_client: MagicMock,
3535
):
3636
get_config_client("i04")
37-
mock_config_server.assert_called_once()
37+
mock_config_client.assert_called_once()
3838
get_config_client("i04")
39-
mock_config_server.assert_called_once()
39+
mock_config_client.assert_called_once()
4040

4141

42-
@patch("dodal.common.beamlines.config_client.ConfigServer")
42+
@patch("dodal.common.beamlines.config_client.ConfigClient")
4343
def test_get_config_client_resets_cache_if_called_with_same_beamline(
44-
mock_config_server: MagicMock,
44+
mock_config_client: MagicMock,
4545
):
46-
assert mock_config_server.assert_not_called
46+
assert mock_config_client.assert_not_called
4747
get_config_client("i04")
48-
mock_config_server.assert_called_once_with(url="https://daq-config.diamond.ac.uk")
48+
mock_config_client.assert_called_once_with(url="https://daq-config.diamond.ac.uk")
4949
get_config_client("i03")
50-
assert mock_config_server.call_count == 2
51-
mock_config_server.assert_called_with(url="https://i03-daq-config.diamond.ac.uk")
50+
assert mock_config_client.call_count == 2
51+
mock_config_client.assert_called_with(url="https://i03-daq-config.diamond.ac.uk")

0 commit comments

Comments
 (0)