Fixes for ophyd-async 0.9.0a2

pyproject.toml

@@ -15,7 +15,7 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async == 0.9.0a1",
+    "ophyd-async >= 0.9.0a2",
     "bluesky",
     "pyepics",
     "dataclasses-json",

src/dodal/beamlines/adsim.py

@@ -71,5 +71,5 @@ def det() -> SimDetector:
         f"{PREFIX.beamline_prefix}-DI-CAM-01:",
         path_provider=get_path_provider(),
         drv_suffix="DET:",
-        hdf_suffix="HDF:",
+        fileio_suffix="HDF:",
     )

src/dodal/beamlines/b01_1.py

@@ -58,5 +58,5 @@ def manta() -> AravisDetector:
         f"{PREFIX.beamline_prefix}-DI-DCAM-02:",
         path_provider=get_path_provider(),
         drv_suffix="CAM:",
-        hdf_suffix=HDF5_PREFIX,
+        fileio_suffix=HDF5_PREFIX,
     )

src/dodal/beamlines/i13_1.py

@@ -61,7 +61,7 @@ def side_camera(
         name="side_camera",
         bl_prefix=False,
         drv_suffix="CAM:",
-        hdf_suffix="HDF5:",
+        fileio_suffix="HDF5:",
         path_provider=get_path_provider(),
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,
@@ -77,7 +77,7 @@ def merlin(
         name="merlin",
         bl_prefix=False,
         drv_suffix="CAM:",
-        hdf_suffix="HDF5:",
+        fileio_suffix="HDF5:",
         path_provider=get_path_provider(),
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,

src/dodal/beamlines/i22.py

@@ -64,7 +64,7 @@ def saxs() -> PilatusDetector:
         prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-01:",
         path_provider=get_path_provider(),
         drv_suffix="CAM:",
-        hdf_suffix=HDF5_PREFIX,
+        fileio_suffix=HDF5_PREFIX,
         metadata_holder=metadata_holder,
     )
 
@@ -89,7 +89,7 @@ def waxs() -> PilatusDetector:
         prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-03:",
         path_provider=get_path_provider(),
         drv_suffix="CAM:",
-        hdf_suffix=HDF5_PREFIX,
+        fileio_suffix=HDF5_PREFIX,
         metadata_holder=metadata_holder,
     )
 
@@ -249,7 +249,7 @@ def oav() -> AravisDetector:
     return NXSasOAV(
         prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
         drv_suffix="DET:",
-        hdf_suffix=HDF5_PREFIX,
+        fileio_suffix=HDF5_PREFIX,
         path_provider=get_path_provider(),
         metadata_holder=metadata_holder,
     )

src/dodal/beamlines/p38.py

@@ -55,7 +55,7 @@ def d3(
         wait_for_connection,
         fake_with_ophyd_sim,
         drv_suffix="DET:",
-        hdf_suffix="HDF5:",
+        fileio_suffix="HDF5:",
         path_provider=get_path_provider(),
     )
 
@@ -72,7 +72,7 @@ def d11(
         wait_for_connection,
         fake_with_ophyd_sim,
         drv_suffix="DET:",
-        hdf_suffix="HDF5:",
+        fileio_suffix="HDF5:",
         path_provider=get_path_provider(),
     )
 
@@ -87,7 +87,7 @@ def d12(
         wait_for_connection,
         fake_with_ophyd_sim,
         drv_suffix="DET:",
-        hdf_suffix="HDF5:",
+        fileio_suffix="HDF5:",
         path_provider=get_path_provider(),
     )
 

src/dodal/beamlines/p45.py

@@ -61,7 +61,7 @@ def det(
         wait_for_connection,
         fake_with_ophyd_sim,
         drv_suffix="DET:",
-        hdf_suffix="HDF5:",
+        fileio_suffix="HDF5:",
         path_provider=get_path_provider(),
     )
 
@@ -78,7 +78,7 @@ def diff(
         wait_for_connection,
         fake_with_ophyd_sim,
         drv_suffix="DET:",
-        hdf_suffix="HDF5:",
+        fileio_suffix="HDF5:",
         path_provider=get_path_provider(),
     )
 

src/dodal/beamlines/training_rig.py

@@ -51,7 +51,7 @@ def det() -> AravisDetector:
         f"{PREFIX.beamline_prefix}-EA-DET-01:",
         path_provider=get_path_provider(),
         drv_suffix="DET:",
-        hdf_suffix=HDF5_PREFIX,
+        fileio_suffix=HDF5_PREFIX,
     )
 
 

src/dodal/devices/i13_1/merlin.py

@@ -14,11 +14,11 @@ def __init__(
         prefix: str,
         path_provider: PathProvider,
         drv_suffix="CAM:",
-        hdf_suffix="HDF:",
+        fileio_suffix="HDF:",
         name: str = "",
     ):
         self.drv = MerlinDriverIO(prefix + drv_suffix)
-        self.hdf = adcore.NDFileHDFIO(prefix + hdf_suffix)
+        self.hdf = adcore.NDFileHDFIO(prefix + fileio_suffix)
 
         super().__init__(
             MerlinController(self.drv),

src/dodal/devices/i13_1/merlin_controller.py

@@ -4,15 +4,15 @@
 from ophyd_async.core import (
     DEFAULT_TIMEOUT,
     AsyncStatus,
-    DetectorController,
     TriggerInfo,
 )
 from ophyd_async.epics import adcore
+from ophyd_async.epics.adcore import ADBaseController
 
 from dodal.devices.i13_1.merlin_io import MerlinDriverIO, MerlinImageMode
 
 
-class MerlinController(DetectorController):
+class MerlinController(ADBaseController):
     def __init__(
         self,
         driver: MerlinDriverIO,
@@ -37,11 +37,6 @@ async def prepare(self, trigger_info: TriggerInfo):
             self.driver.image_mode.set(MerlinImageMode.MULTIPLE),
         )
 
-    async def arm(self):
-        self._arm_status = await adcore.start_acquiring_driver_and_ensure_status(
-            self.driver, good_states=self.good_states, timeout=self.frame_timeout
-        )
-
     async def wait_for_idle(self):
         if self._arm_status:
             await self._arm_status

src/dodal/devices/i22/nxsas.py

@@ -103,7 +103,7 @@ def __init__(
         prefix: str,
         path_provider: PathProvider,
         drv_suffix: str,
-        hdf_suffix: str,
+        fileio_suffix: str,
         metadata_holder: NXSasMetadataHolder,
         name: str = "",
     ):
@@ -116,7 +116,7 @@ def __init__(
             prefix,
             path_provider,
             drv_suffix=drv_suffix,
-            hdf_suffix=hdf_suffix,
+            fileio_suffix=fileio_suffix,
             name=name,
         )
         self._metadata_holder = metadata_holder
@@ -146,7 +146,7 @@ def __init__(
         prefix: str,
         path_provider: PathProvider,
         drv_suffix: str,
-        hdf_suffix: str,
+        fileio_suffix: str,
         metadata_holder: NXSasMetadataHolder,
         name: str = "",
         gpio_number: AravisController.GPIO_NUMBER = 1,
@@ -160,7 +160,7 @@ def __init__(
             prefix,
             path_provider,
             drv_suffix=drv_suffix,
-            hdf_suffix=hdf_suffix,
+            fileio_suffix=fileio_suffix,
             name=name,
             gpio_number=gpio_number,
         )

src/dodal/devices/motors.py

@@ -19,10 +19,10 @@ class XYZPositioner(StandardReadable):
     Notes
     -----
     Example usage::
-        async with DeviceCollector():
+        async with init_devices():
             xyz_stage = XYZPositioner("BLXX-MO-STAGE-XX:")
     Or::
-        with DeviceCollector():
+        with init_devices():
             xyz_stage = XYZPositioner("BLXX-MO-STAGE-XX:", infix = ("A", "B", "C"))
 
     """

src/dodal/plans/save_panda.py

@@ -6,8 +6,10 @@
 from typing import cast
 
 from bluesky.run_engine import RunEngine
-from ophyd_async.core import Device, save_device
-from ophyd_async.fastcs.panda import phase_sorter
+from ophyd_async.core import Device, YamlSettingsProvider
+from ophyd_async.plan_stubs import (
+    store_settings,
+)
 
 from dodal.beamlines import module_name_for_beamline
 from dodal.utils import make_device
@@ -17,27 +19,35 @@ def main(argv: list[str]):
     """CLI Utility to save the panda configuration."""
     parser = ArgumentParser(description="Save an ophyd_async panda to yaml")
     parser.add_argument(
-        "--beamline", help="beamline to save from e.g. i03. Defaults to BEAMLINE"
+        "--beamline", help="Beamline to save from e.g. i03. Defaults to BEAMLINE"
     )
     parser.add_argument(
         "--device-name",
-        help='name of the device. The default is "panda"',
+        help='Name of the device. The default is "panda"',
         default="panda",
     )
+    parser.add_argument(
+        "--file-name",
+        help="Name of the output save file",
+        default="panda_settings.yaml",
+    )
+    parser.add_argument(
+        "--output-directory", help="Directory in which save file is output"
+    )
     parser.add_argument(
         "-f",
         "--force",
         action=argparse.BooleanOptionalAction,
         help="Force overwriting an existing file",
     )
-    parser.add_argument("output_file", help="output filename")
 
     # this exit()s with message/help unless args parsed successfully
     args = parser.parse_args(argv[1:])
 
     beamline = args.beamline
     device_name = args.device_name
-    output_file = args.output_file
+    file_name = args.file_name
+    output_directory = args.output_directory
     force = args.force
 
     if beamline:
@@ -49,19 +59,19 @@ def main(argv: list[str]):
         sys.stderr.write("BEAMLINE not set and --beamline not specified\n")
         return 1
 
-    if Path(output_file).exists() and not force:
+    if Path(file_name).exists() and not force:
         sys.stderr.write(
-            f"Output file {output_file} already exists and --force not specified."
+            f"Output file {file_name} already exists and --force not specified."
         )
         return 1
 
-    _save_panda(beamline, device_name, output_file)
+    _save_panda(beamline, device_name, output_directory, file_name)
 
     print("Done.")
     return 0
 
 
-def _save_panda(beamline, device_name, output_file):
+def _save_panda(beamline, device_name, output_directory, file_name):
     RE = RunEngine()
     print("Creating devices...")
     module_name = module_name_for_beamline(beamline)
@@ -72,13 +82,16 @@ def _save_panda(beamline, device_name, output_file):
         sys.exit(1)
 
     panda = devices[device_name]
-    print(f"Saving to {output_file} from {device_name} on {beamline}...")
-    _save_panda_to_file(RE, cast(Device, panda), output_file)
+    print(f"Saving to {file_name} from {device_name} on {beamline}...")
+    _save_panda_to_yaml(RE, cast(Device, panda), file_name, output_directory)
 
 
-def _save_panda_to_file(RE: RunEngine, panda: Device, path: str):
+def _save_panda_to_yaml(
+    RE: RunEngine, panda: Device, file_name: str, output_directory: str
+):
     def save_to_file():
-        yield from save_device(panda, path, sorter=phase_sorter)
+        provider = YamlSettingsProvider(output_directory)
+        yield from store_settings(provider, file_name, panda)
 
     RE(save_to_file())
 

system_tests/test_aperturescatterguard_system.py

@@ -5,7 +5,7 @@
 from bluesky.callbacks import CallbackBase
 from bluesky.run_engine import RunEngine
 from event_model import Event
-from ophyd_async.core import DeviceCollector
+from ophyd_async.core import init_devices
 
 from dodal.common.beamlines.beamline_parameters import GDABeamlineParameters
 from dodal.devices.aperturescatterguard import (
@@ -28,7 +28,7 @@ async def ap_sg():
     positions = load_positions_from_beamline_parameters(params)
     tolerances = AperturePosition.tolerances_from_gda_params(params)
 
-    async with DeviceCollector():
+    async with init_devices():
         ap_sg = ApertureScatterguard(
             prefix="BL03S",
             name="ap_sg",

system_tests/test_oav_system.py

@@ -1,7 +1,7 @@
 import bluesky.plan_stubs as bps
 import pytest
 from bluesky.run_engine import RunEngine
-from ophyd_async.core import DeviceCollector
+from ophyd_async.core import init_devices
 
 from dodal.devices.oav.oav_detector import OAV, OAVConfig, ZoomController
 
@@ -19,7 +19,7 @@
 @pytest.fixture
 async def oav() -> OAV:
     oav_config = OAVConfig(ZOOM_LEVELS_XML, DISPLAY_CONFIGURATION)
-    async with DeviceCollector(connect=True):
+    async with init_devices(connect=True):
         oav = OAV("", config=oav_config, name="oav")
     return oav
 

system_tests/test_oav_to_redis_system.py

@@ -3,14 +3,14 @@
 
 import pytest
 from aiohttp.client_exceptions import ClientConnectorError
-from ophyd_async.core import DeviceCollector
+from ophyd_async.core import init_devices
 from ophyd_async.testing import set_mock_value
 
 from dodal.devices.oav.oav_to_redis_forwarder import OAVToRedisForwarder, Source
 
 
 def _oav_to_redis_forwarder(mock):
-    with DeviceCollector(mock=mock):
+    with init_devices(mock=mock):
         oav_forwarder = OAVToRedisForwarder("BL04I-DI-OAV-01:", "", "")
     oav_forwarder.redis_client.hset = AsyncMock()
     oav_forwarder.redis_client.expire = AsyncMock()

system_tests/test_undulator_system.py

@@ -1,5 +1,5 @@
 import pytest
-from ophyd_async.core import DeviceCollector
+from ophyd_async.core import init_devices
 
 from dodal.devices.undulator import Undulator
 
@@ -12,7 +12,7 @@
 
 @pytest.mark.s03
 def test_undulator_connects():
-    with DeviceCollector():
+    with init_devices():
         undulator = Undulator(  # noqa: F841
             f"{SIM_INSERTION_PREFIX}-MO-SERVC-01:",
             id_gap_lookup_table_path=ID_GAP_LOOKUP_TABLE_PATH,

tests/devices/i04/test_transfocator.py

@@ -3,7 +3,7 @@
 
 import pytest
 from ophyd_async.core import (
-    DeviceCollector,
+    init_devices,
     wait_for_value,
 )
 from ophyd_async.testing import set_mock_value
@@ -13,7 +13,7 @@
 
 @pytest.fixture
 async def fake_transfocator() -> Transfocator:
-    async with DeviceCollector(mock=True):
+    async with init_devices(mock=True):
         transfocator = Transfocator(prefix="", name="transfocator")
     return transfocator