chore(deps): Update ophyd-async dependency (#1255)

Fixes #1254, requires a release of dodal including
DiamondLightSource/dodal#1666

Author: DiamondJoseph

dev-requirements.txt

@@ -5,6 +5,7 @@ aiohappyeyeballs==2.6.1
 aiohttp==3.12.15
 aiosignal==1.4.0
 alabaster==1.0.0
+annotated-doc==0.0.3
 annotated-types==0.7.0
 anyio==4.11.0
 asgiref==3.9.2
@@ -38,7 +39,7 @@ dataclasses-json==0.6.7
 deepdiff==8.6.1
 deepmerge==2.0
 distlib==0.4.0
-dls-dodal==1.60.0
+dls-dodal==1.64.0
 dnspython==2.8.0
 docopt==0.6.2
 docutils==0.21.2
@@ -123,7 +124,7 @@ opentelemetry-sdk==1.37.0
 opentelemetry-semantic-conventions==0.58b0
 opentelemetry-util-http==0.58b0
 ophyd==1.11.0
-ophyd-async==0.13.3
+ophyd-async==0.13.5
 orderly-set==5.5.0
 orjson==3.11.3
 p4p==4.2.1
@@ -186,6 +187,7 @@ ruff==0.13.3
 scanspec==0.9.0
 semver==3.0.4
 sentry-sdk==2.39.0
+setuptools==80.9.0
 setuptools_dso==2.12.2
 shellingham==1.5.4
 six==1.17.0

pyproject.toml

@@ -14,7 +14,7 @@ description = "Lightweight bluesky-as-a-service wrapper application. Also usable
 dependencies = [
     "tiled[client]",
     "bluesky[plotting]>=1.14.0",                     # plotting includes matplotlib, required for BestEffortCallback in run plans
-    "ophyd-async",
+    "ophyd-async>=0.13.5",
     "aioca",
     "pydantic>=2.0",
     "scanspec>=0.9.0",
@@ -25,7 +25,7 @@ dependencies = [
     "fastapi>=0.112.0",
     "uvicorn",
     "requests",
-    "dls-dodal>=1.60.0",
+    "dls-dodal>=1.64.0",
     "super-state-machine",                           # https://github.com/DiamondLightSource/blueapi/issues/553
     "GitPython",
     "event-model==1.23.1",                           # https://github.com/DiamondLightSource/blueapi/issues/684

src/blueapi/core/context.py

@@ -10,7 +10,7 @@
 from bluesky.run_engine import RunEngine
 from dodal.common.beamlines.beamline_utils import get_path_provider, set_path_provider
 from dodal.utils import AnyDevice, make_all_devices
-from ophyd_async.core import NotConnected
+from ophyd_async.core import NotConnectedError
 from pydantic import BaseModel, GetCoreSchemaHandler, GetJsonSchemaHandler, create_model
 from pydantic.fields import FieldInfo
 from pydantic.json_schema import JsonSchemaValue, SkipJsonSchema
@@ -240,7 +240,7 @@ def with_dodal_module(
             LOGGER.warning(
                 f"{len(exceptions)} exceptions occurred while instantiating devices"
             )
-            LOGGER.exception(NotConnected(exceptions))
+            LOGGER.exception(NotConnectedError(exceptions))
         return devices, exceptions
 
     def register_plan(self, plan: PlanGenerator) -> PlanGenerator:

src/blueapi/utils/connect_devices.py

@@ -9,7 +9,7 @@
     collect_factories,
     filter_ophyd_devices,
 )
-from ophyd_async.core import NotConnected
+from ophyd_async.core import NotConnectedError
 from ophyd_async.plan_stubs import ensure_connected
 
 LOGGER = logging.getLogger(__name__)
@@ -46,7 +46,7 @@ def _establish_device_connections(
     # Connect ophyd-async devices
     try:
         RE(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