Fix imports

Author: jacob720

src/dodal/devices/beamlines/i07/id.py

@@ -1,5 +1,5 @@
 import numpy as np
-from daq_config_server.client import ConfigServer
+from daq_config_server import ConfigClient
 
 from dodal.devices.undulator import UndulatorInKeV, UndulatorOrder
 from dodal.devices.util.lookup_tables import energy_distance_table
@@ -14,7 +14,7 @@ def __init__(
         self,
         prefix: str,
         harmonic: UndulatorOrder,
-        config_client: ConfigServer,
+        config_client: ConfigClient,
         id_gap_lookup_table_path: str = "/dls_sw/i07/software/gda/config/lookupTables/"
         + "IIDCalibrationTable.txt",
         name: str = "",

src/dodal/devices/undulator.py

@@ -3,8 +3,10 @@
 
 import numpy as np
 from bluesky.protocols import Locatable, Location, Movable
-from daq_config_server.client import ConfigServer
-from daq_config_server.models import UndulatorEnergyGapLookupTable
+from daq_config_server import ConfigClient
+from daq_config_server.models.lookup_tables.insertion_device import (
+    UndulatorEnergyGapLookupTable,
+)
 from numpy import ndarray
 from ophyd_async.core import (
     AsyncStatus,
@@ -173,7 +175,7 @@ class UndulatorInKeV(BaseUndulator):
     def __init__(
         self,
         prefix: str,
-        config_client: ConfigServer,
+        config_client: ConfigClient,
         id_gap_lookup_table_path: str = os.devnull,
         poles: int | None = None,
         length: float | None = None,

tests/devices/beamlines/i03/test_undulator_dcm.py

@@ -3,8 +3,10 @@
 
 import numpy as np
 import pytest
-from daq_config_server.client import ConfigServer
-from daq_config_server.models import UndulatorEnergyGapLookupTable
+from daq_config_server import ConfigClient
+from daq_config_server.models.lookup_tables.insertion_device import (
+    UndulatorEnergyGapLookupTable,
+)
 from ophyd_async.core import AsyncStatus, get_mock_put, init_devices, set_mock_value
 
 from dodal.common.enums import EnabledDisabledUpper
@@ -50,7 +52,7 @@ async def fake_undulator_dcm() -> UndulatorDCM:
         baton = Baton("BATON-01:")
         undulator = UndulatorInKeV(
             "UND-01",
-            ConfigServer(""),
+            ConfigClient(""),
             name="undulator",
             poles=80,
             id_gap_lookup_table_path=TEST_BEAMLINE_UNDULATOR_TO_GAP_LUT,

tests/devices/beamlines/i07/test_id.py

@@ -1,5 +1,5 @@
 import pytest
-from daq_config_server.client import ConfigServer
+from daq_config_server import ConfigClient
 from ophyd_async.core import init_devices
 
 from dodal.devices.beamlines.i07.id import InsertionDevice
@@ -20,7 +20,7 @@ async def id(harmonic: UndulatorOrder, set_beamline_env_variable) -> InsertionDe
         id = InsertionDevice(
             "ID-01",
             harmonic,
-            ConfigServer(""),
+            ConfigClient(""),
             TEST_LOOKUP_TABLE_PATH,
         )
     return id

tests/devices/test_undulator.py

@@ -5,8 +5,10 @@
 import pytest
 from bluesky import RunEngine
 from bluesky.plan_stubs import mv
-from daq_config_server.client import ConfigServer
-from daq_config_server.models import UndulatorEnergyGapLookupTable
+from daq_config_server import ConfigClient
+from daq_config_server.models.lookup_tables.insertion_device import (
+    UndulatorEnergyGapLookupTable,
+)
 from ophyd_async.core import get_mock_put, init_devices, set_mock_value
 from ophyd_async.testing import (
     assert_configuration,
@@ -36,7 +38,7 @@ async def undulator(set_beamline_env_variable) -> UndulatorInKeV:
         baton = Baton("BATON-01")
         undulator = UndulatorInKeV(
             "UND-01",
-            ConfigServer(""),
+            ConfigClient(""),
             name="undulator",
             poles=80,
             length=2.0,
@@ -115,7 +117,7 @@ async def test_poles_not_propagated_if_not_supplied(set_beamline_env_variable):
     async with init_devices(mock=True):
         undulator = UndulatorInKeV(
             "UND-01",
-            ConfigServer(""),
+            ConfigClient(""),
             name="undulator",
             length=2.0,
             id_gap_lookup_table_path=TEST_BEAMLINE_UNDULATOR_TO_GAP_LUT,
@@ -128,7 +130,7 @@ async def test_length_not_propagated_if_not_supplied(set_beamline_env_variable):
     async with init_devices(mock=True):
         undulator = UndulatorInKeV(
             "UND-01",
-            ConfigServer(""),
+            ConfigClient(""),
             name="undulator",
             poles=80,
             id_gap_lookup_table_path=TEST_BEAMLINE_UNDULATOR_TO_GAP_LUT,

tests/devices/util/test_lookup_tables.py

@@ -1,7 +1,9 @@
 import numpy as np
 import pytest
-from daq_config_server.client import ConfigServer
-from daq_config_server.models import UndulatorEnergyGapLookupTable
+from daq_config_server import ConfigClient
+from daq_config_server.models.lookup_tables.insertion_device import (
+    UndulatorEnergyGapLookupTable,
+)
 from pytest import mark
 
 from dodal.devices.util.lookup_tables import (
@@ -23,7 +25,7 @@
 
 
 async def test_energy_to_distance_table_correct_format():
-    config_server = ConfigServer()
+    config_server = ConfigClient("")
     table = np.array(
         config_server.get_file_contents(
             TEST_BEAMLINE_UNDULATOR_TO_GAP_LUT, UndulatorEnergyGapLookupTable

tests/plans/conftest.py

@@ -3,7 +3,7 @@
 from unittest.mock import patch
 
 import pytest
-from daq_config_server.client import ConfigServer
+from daq_config_server import ConfigClient
 from ophyd_async.core import PathProvider, StandardDetector, init_devices
 from ophyd_async.sim import PatternGenerator, SimBlobDetector, SimMotor
 
@@ -26,7 +26,7 @@ async def mock_undulator_and_dcm(set_beamline_env_variable) -> UndulatorGapCheck
     async with init_devices(mock=True):
         undulator = UndulatorInKeV(
             "",
-            ConfigServer(""),
+            ConfigClient(""),
             id_gap_lookup_table_path=TEST_BEAMLINE_UNDULATOR_TO_GAP_LUT,
         )
         dcm = DCM("")