Merge branch 'main' into 1663-i09-energy

Author: Relm-Arrowny

pyproject.toml

@@ -14,7 +14,7 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async[ca,pva]>=0.13.2",
+    "ophyd-async[ca,pva]>=0.13.5",
     "bluesky>=1.14.5",
     "pyepics",
     "dataclasses-json",
@@ -54,7 +54,8 @@ dev = [
     "pre-commit",
     "psutil",
     "pydata-sphinx-theme>=0.12",
-    "pyright",
+    # Pin to previous pyright until https://github.com/microsoft/pyright/issues/11060 is fixed
+    "pyright==1.1.406", 
     "pytest",
     "pytest-asyncio",
     "pytest-cov",

src/dodal/beamlines/i19_2.py

@@ -1,12 +1,17 @@
+from pathlib import Path
+
+from ophyd_async.fastcs.eiger import EigerDetector
 from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
     device_factory,
     get_path_provider,
+    set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import (
     set_beamline as set_utils_beamline,
 )
+from dodal.common.visit import StaticVisitPathProvider
 from dodal.devices.i19.access_controlled.blueapi_device import HutchState
 from dodal.devices.i19.access_controlled.shutter import AccessControlledShutter
 from dodal.devices.i19.backlight import BacklightPosition
@@ -31,6 +36,13 @@
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/dls/i19-2/data/2025/cm40639-4/"),
+    )
+)
+
 
 I19_2_ZEBRA_MAPPING = ZebraMapping(
     outputs=ZebraTTLOutputs(),
@@ -105,3 +117,13 @@ def panda() -> HDFPanda:
         prefix=f"{PREFIX.beamline_prefix}-EA-PANDA-01:",
         path_provider=get_path_provider(),
     )
+
+
+@device_factory()
+def eiger() -> EigerDetector:
+    return EigerDetector(
+        prefix=PREFIX.beamline_prefix,
+        path_provider=get_path_provider(),
+        drv_suffix="-EA-EIGER-01:",
+        hdf_suffix="-EA-EIGER-01:OD:",
+    )

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

src/dodal/devices/i22/nxsas.py

@@ -1,11 +1,9 @@
-import asyncio
-from collections.abc import Awaitable, Iterable
 from dataclasses import dataclass, fields
 from typing import TypeVar
 
 from bluesky.protocols import Reading
 from event_model.documents.event_descriptor import DataKey
-from ophyd_async.core import PathProvider
+from ophyd_async.core import PathProvider, merge_gathered_dicts
 from ophyd_async.epics.adaravis import AravisDetector
 from ophyd_async.epics.adcore import NDPluginBaseIO
 from ophyd_async.epics.adpilatus import PilatusDetector
@@ -14,23 +12,6 @@
 T = TypeVar("T")
 
 
-# TODO: Remove this file as part of github.com/DiamondLightSource/dodal/issues/595
-# Until which, temporarily duplicated non-public method from ophyd_async
-async def _merge_gathered_dicts(
-    coros: Iterable[Awaitable[dict[str, T]]],
-) -> dict[str, T]:
-    """Merge dictionaries produced by a sequence of coroutines.
-
-    Can be used for merging ``read()`` or ``describe``. For instance::
-
-        combined_read = await merge_gathered_dicts(s.read() for s in signals)
-    """
-    ret: dict[str, T] = {}
-    for result in await asyncio.gather(*coros):
-        ret.update(result)
-    return ret
-
-
 @dataclass
 class MetadataHolder:
     # TODO: just in case this is useful more widely...
@@ -124,7 +105,7 @@ def __init__(
         self._metadata_holder = metadata_holder
 
     async def read_configuration(self) -> dict[str, Reading]:
-        return await _merge_gathered_dicts(
+        return await merge_gathered_dicts(
             r
             for r in (
                 super().read_configuration(),
@@ -133,7 +114,7 @@ async def read_configuration(self) -> dict[str, Reading]:
         )
 
     async def describe_configuration(self) -> dict[str, DataKey]:
-        return await _merge_gathered_dicts(
+        return await merge_gathered_dicts(
             r
             for r in (
                 super().describe_configuration(),
@@ -167,7 +148,7 @@ def __init__(
         self._metadata_holder = metadata_holder
 
     async def read_configuration(self) -> dict[str, Reading]:
-        return await _merge_gathered_dicts(
+        return await merge_gathered_dicts(
             r
             for r in (
                 super().read_configuration(),
@@ -176,7 +157,7 @@ async def read_configuration(self) -> dict[str, Reading]:
         )
 
     async def describe_configuration(self) -> dict[str, DataKey]:
-        return await _merge_gathered_dicts(
+        return await merge_gathered_dicts(
             r
             for r in (
                 super().describe_configuration(),

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/current_amplifier/test_femto.py

@@ -1,4 +1,4 @@
-from collections import defaultdict
+from collections.abc import Mapping
 from enum import Enum
 from unittest import mock
 from unittest.mock import AsyncMock, Mock
@@ -235,9 +235,10 @@ class MockFemto3xxRaiseTime(float, Enum):
     ],
 )
 async def test_femto_struck_scaler_read(
+    run_engine: RunEngine,
+    run_engine_documents: Mapping[str, list[dict]],
     mock_femto: FemtoDDPCA,
     mock_femto_struck_scaler_detector,
-    run_engine: RunEngine,
     gain,
     raw_voltage,
     expected_current,
@@ -246,16 +247,12 @@ async def test_femto_struck_scaler_read(
     set_mock_value(mock_femto_struck_scaler_detector.counter().count_time, 1)
     set_mock_value(mock_femto_struck_scaler_detector.counter().readout, raw_voltage)
     set_mock_value(mock_femto_struck_scaler_detector.auto_mode, False)
-    docs = defaultdict(list)
     mock_femto_struck_scaler_detector.current_amp().raise_timetable = (
         MockFemto3xxRaiseTime
     )
 
-    def capture_emitted(name, doc):
-        docs[name].append(doc)
-
-    run_engine(count([mock_femto_struck_scaler_detector]), capture_emitted)
-    assert docs["event"][0]["data"][
+    run_engine(count([mock_femto_struck_scaler_detector]))
+    assert run_engine_documents["event"][0]["data"][
         "mock_femto_struck_scaler_detector-current"
     ] == pytest.approx(expected_current)
 
@@ -274,9 +271,10 @@ def capture_emitted(name, doc):
     ],
 )
 async def test_femto_struck_scaler_read_with_auto_gain(
+    run_engine: RunEngine,
+    run_engine_documents: Mapping[str, list[dict]],
     mock_femto: FemtoDDPCA,
     mock_femto_struck_scaler_detector,
-    run_engine: RunEngine,
     gain,
     raw_voltage,
     expected_current,
@@ -302,13 +300,7 @@ def set_mock_counter():
         mock_femto_struck_scaler_detector.counter().trigger_start,
         lambda *_, **__: set_mock_counter(),
     )
-
-    docs = defaultdict(list)
-
-    def capture_emitted(name, doc):
-        docs[name].append(doc)
-
-    run_engine(count([mock_femto_struck_scaler_detector]), capture_emitted)
-    assert docs["event"][0]["data"][
+    run_engine(count([mock_femto_struck_scaler_detector]))
+    assert run_engine_documents["event"][0]["data"][
         "mock_femto_struck_scaler_detector-current"
     ] == pytest.approx(expected_current, rel=1e-14)

tests/devices/current_amplifier/test_sr570.py

@@ -1,4 +1,4 @@
-from collections import defaultdict
+from collections.abc import Mapping
 from enum import Enum
 from unittest import mock
 from unittest.mock import AsyncMock, Mock
@@ -215,7 +215,7 @@ class MockSR570RaiseTimeTable(float, Enum):
 
 
 @pytest.mark.parametrize(
-    "gain,raw_count, expected_current",
+    "gain, raw_count, expected_current",
     [
         ("SEN_1", 0.51e5, 0.51e-3),
         ("SEN_3", -10e5, -2e-3),
@@ -226,8 +226,9 @@ class MockSR570RaiseTimeTable(float, Enum):
     ],
 )
 async def test_sr570_struck_scaler_read(
-    mock_sr570_struck_scaler_detector,
     run_engine: RunEngine,
+    run_engine_documents: Mapping[str, list[dict]],
+    mock_sr570_struck_scaler_detector,
     gain,
     raw_count,
     expected_current,
@@ -241,19 +242,14 @@ async def test_sr570_struck_scaler_read(
     mock_sr570_struck_scaler_detector.current_amp().raise_timetable = (
         MockSR570RaiseTimeTable
     )
-    docs = defaultdict(list)
-
-    def capture_emitted(name, doc):
-        docs[name].append(doc)
-
-    run_engine(count([mock_sr570_struck_scaler_detector]), capture_emitted)
-    assert docs["event"][0]["data"][
+    run_engine(count([mock_sr570_struck_scaler_detector]))
+    assert run_engine_documents["event"][0]["data"][
         "mock_sr570_struck_scaler_detector-current"
     ] == pytest.approx(expected_current)
 
 
 @pytest.mark.parametrize(
-    "gain,raw_count, expected_current",
+    "gain, raw_count, expected_current",
     [
         (
             "SEN_10",
@@ -273,8 +269,9 @@ def capture_emitted(name, doc):
     ],
 )
 async def test_sr570_struck_scaler_read_with_autogain(
-    mock_sr570_struck_scaler_detector,
     run_engine: RunEngine,
+    run_engine_documents: Mapping[str, list[dict]],
+    mock_sr570_struck_scaler_detector,
     gain,
     raw_count,
     expected_current,
@@ -301,14 +298,8 @@ def set_mock_counter():
         mock_sr570_struck_scaler_detector.counter().trigger_start,
         lambda *_, **__: set_mock_counter(),
     )
-
-    docs = defaultdict(list)
-
-    def capture_emitted(name, doc):
-        docs[name].append(doc)
-
     run_engine(prepare(mock_sr570_struck_scaler_detector, 1))
-    run_engine(count([mock_sr570_struck_scaler_detector]), capture_emitted)
-    assert docs["event"][0]["data"][
+    run_engine(count([mock_sr570_struck_scaler_detector]))
+    assert run_engine_documents["event"][0]["data"][
         "mock_sr570_struck_scaler_detector-current"
     ] == pytest.approx(expected_current, rel=1e-14)

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(