Updated dodal to be compatible with ophyd-async 0.13.5 and above (#1666)

* Updated dodal to be compatible with latest ophyd-async release

* Pinned to 0.13.5 and above

Author: oliwenmandiamond

pyproject.toml

@@ -14,8 +14,7 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    # pin new ophyd-async can be built
-    "ophyd-async[ca,pva]==0.13.4",
+    "ophyd-async[ca,pva]>=0.13.5",
     "bluesky>=1.14.5",
     "pyepics",
     "dataclasses-json",

src/dodal/cli.py

@@ -4,7 +4,7 @@
 
 import click
 from bluesky.run_engine import RunEngine
-from ophyd_async.core import NotConnected, StaticPathProvider, UUIDFilenameProvider
+from ophyd_async.core import NotConnectedError, StaticPathProvider, UUIDFilenameProvider
 from ophyd_async.plan_stubs import ensure_connected
 
 from dodal.beamlines import all_beamline_names, module_name_for_beamline
@@ -79,7 +79,7 @@ def connect(beamline: str, all: bool, sim_backend: bool) -> None:
     # If exceptions have occurred, this will print details of the relevant PVs
     exceptions = {**instance_exceptions, **connect_exceptions}
     if len(exceptions) > 0:
-        raise NotConnected(exceptions)
+        raise NotConnectedError(exceptions)
 
 
 def _report_successful_devices(
@@ -113,7 +113,7 @@ def _connect_devices(
     # Connect ophyd-async devices
     try:
         run_engine(ensure_connected(*ophyd_async_devices.values(), mock=sim_backend))
-    except NotConnected as ex:
+    except NotConnectedError as ex:
         exceptions = {**exceptions, **ex.sub_errors}
 
     # Only return the subset of devices that haven't raised an exception

tests/common/beamlines/test_device_instantiation.py

@@ -1,7 +1,7 @@
 from typing import Any
 
 import pytest
-from ophyd_async.core import NotConnected
+from ophyd_async.core import NotConnectedError
 
 from dodal.beamlines import all_beamline_modules
 from dodal.utils import BLUESKY_PROTOCOLS, make_all_devices
@@ -23,7 +23,7 @@ def test_device_creation(module_and_devices_for_beamline):
     """
     _, devices, exceptions = module_and_devices_for_beamline
     if len(exceptions) > 0:
-        raise NotConnected(exceptions)
+        raise NotConnectedError(exceptions)
     devices_not_following_bluesky_protocols = [
         name
         for name, device in devices.items()

tests/devices/i04/test_transfocator.py

@@ -2,6 +2,7 @@
 from unittest.mock import AsyncMock, patch
 
 import pytest
+from bluesky.protocols import Reading
 from ophyd_async.core import (
     init_devices,
     wait_for_value,
@@ -19,10 +20,13 @@ async def fake_transfocator() -> Transfocator:
 
 
 def given_predicted_lenses_is_half_of_beamsize(transfocator: Transfocator):
-    def lens_number_is_half_beamsize(value, *args, **kwargs):
+    def lens_number_is_half_beamsize(
+        reading: dict[str, Reading[float]], *args, **kwargs
+    ):
+        value = reading[transfocator.beamsize_set_microns.name]["value"]
         set_mock_value(transfocator.predicted_vertical_num_lenses, int(value / 2))
 
-    transfocator.beamsize_set_microns.subscribe_value(lens_number_is_half_beamsize)
+    transfocator.beamsize_set_microns.subscribe_reading(lens_number_is_half_beamsize)
 
 
 async def set_beamsize_to_same_value_as_mock_signal(

tests/devices/test_smargon.py

@@ -5,7 +5,7 @@
 from bluesky import plan_stubs as bps
 from bluesky.run_engine import RunEngine
 from ophyd_async.core import init_devices, observe_value
-from ophyd_async.epics.motor import MotorLimitsException
+from ophyd_async.epics.motor import MotorLimitsError
 from ophyd_async.testing import get_mock_put, set_mock_value
 
 from dodal.devices.smargon import CombinedMove, DeferMoves, Smargon, StubPosition
@@ -121,7 +121,7 @@ async def test_given_set_with_value_outside_motor_limit(
     set_mock_value(smargon.chi.high_limit_travel, 1999)
     set_mock_value(smargon.phi.high_limit_travel, 1999)
 
-    with pytest.raises(MotorLimitsException):
+    with pytest.raises(MotorLimitsError):
         await smargon.set(
             CombinedMove(
                 x=test_x,

tests/test_cli.py

@@ -7,7 +7,7 @@
 from ophyd_async.core import (
     DEFAULT_TIMEOUT,
     LazyMock,
-    NotConnected,
+    NotConnectedError,
 )
 
 from dodal import __version__
@@ -282,7 +282,7 @@ def test_cli_connect_when_devices_error(
     runner: CliRunner,
     devices: tuple[dict[str, AnyDevice], dict[str, Exception]],
 ):
-    with pytest.raises(NotConnected):
+    with pytest.raises(NotConnectedError):
         _mock_connect(
             EXAMPLE_BEAMLINE,
             runner=runner,