dls-dodal 1.55.0__tar.gz → 1.55.1__tar.gz

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.55.0
+Version: 1.55.1
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License
@@ -215,7 +215,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async[ca,pva]>=0.12.3
+Requires-Dist: ophyd-async[ca,pva]>=0.13.0
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/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.12.3",
+    "ophyd-async[ca,pva]>=0.13.0",
     "bluesky",
     "pyepics",
     "dataclasses-json",

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.55.0
+Version: 1.55.1
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License
@@ -215,7 +215,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async[ca,pva]>=0.12.3
+Requires-Dist: ophyd-async[ca,pva]>=0.13.0
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/src/dls_dodal.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click
 ophyd
-ophyd-async[ca,pva]>=0.12.3
+ophyd-async[ca,pva]>=0.13.0
 bluesky
 pyepics
 dataclasses-json

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/src/dodal/_version.py

@@ -1,14 +1,7 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = [
-    "__version__",
-    "__version_tuple__",
-    "version",
-    "version_tuple",
-    "__commit_id__",
-    "commit_id",
-]
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -16,19 +9,13 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
-    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
-    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
 
-__version__ = version = '1.55.0'
-__version_tuple__ = version_tuple = (1, 55, 0)
-
-__commit_id__ = commit_id = 'g9d6ec5bbb'
+__version__ = version = '1.55.1'
+__version_tuple__ = version_tuple = (1, 55, 1)

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/src/dodal/beamlines/b01_1.py

@@ -1,16 +1,12 @@
-from pathlib import Path
-
 from ophyd_async.epics.adaravis import AravisDetector
 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.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
-from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.motors import XYZStage
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -21,14 +17,6 @@ PREFIX = BeamlinePrefix(BL)
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
-set_path_provider(
-    StaticVisitPathProvider(
-        BL,
-        Path("/dls/b01-1/data/2025/cm40661-1/"),
-        client=LocalDirectoryServiceClient(),
-    )
-)
-
 """
 NOTE: Due to ArgoCD and the k8s cluster configuration those PVs are not available remotely.
 You need to be on the beamline-local network to access them.

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/src/dodal/devices/attenuator/attenuator.py

@@ -15,6 +15,8 @@ from ophyd_async.epics.core import epics_signal_r, epics_signal_rw, epics_signal
 from dodal.devices.attenuator.filter import FilterMotor
 from dodal.log import LOGGER
 
+DEFAULT_TIMEOUT = 60
+
 
 class ReadOnlyAttenuator(StandardReadable):
     """A read-only attenuator class with a minimum set of PVs for reading.
@@ -83,7 +85,7 @@ class BinaryFilterAttenuator(ReadOnlyAttenuator, Movable[float]):
                 wait_for_value(
                     self._filters_in_position[i],
                     bool(await self._calculated_filter_states[i].get_value()),
-                    None,
+                    DEFAULT_TIMEOUT,
                 )
                 for i in range(16)
             ]

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/src/dodal/devices/tetramm.py

@@ -116,6 +116,19 @@ class TetrammController(DetectorController):
             self.set_exposure(trigger_info.livetime),
         )
 
+        # raise an error if asked to trigger faster than the max.
+        # possible speed for a tetramm
+        self._validate_deadtime(trigger_info)
+
+    def _validate_deadtime(self, value: TriggerInfo) -> None:
+        minimum_deadtime = self.get_deadtime(value.livetime)
+        if minimum_deadtime > value.deadtime:
+            msg = (
+                f"Tetramm {self} needs at least {minimum_deadtime}s "
+                f"deadtime, but trigger logic provides only {value.deadtime}s"
+            )
+            raise ValueError(msg)
+
     async def arm(self):
         self._arm_status = await self.start_acquiring_driver_and_ensure_status()
 

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/src/dodal/devices/util/test_utils.py

@@ -1,3 +1,6 @@
+from contextlib import ExitStack
+
+from ophyd_async.core import Device
 from ophyd_async.epics.motor import Motor
 from ophyd_async.testing import (
     callback_on_mock_put,
@@ -16,3 +19,19 @@ def patch_motor(motor: Motor, initial_position=0):
         motor.user_setpoint,
         lambda pos, *args, **kwargs: set_mock_value(motor.user_readback, pos),
     )
+
+
+def patch_all_motors(parent_device: Device):
+    motors = []
+
+    def recursively_find_motors(device: Device):
+        for _, child_device in device.children():
+            if isinstance(child_device, Motor):
+                motors.append(child_device)
+            recursively_find_motors(child_device)
+
+    recursively_find_motors(parent_device)
+    motor_patch_stack = ExitStack()
+    for motor in motors:
+        motor_patch_stack.enter_context(patch_motor(motor))
+    return motor_patch_stack

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/tests/devices/aithre_lasershaping/test_goniometer.py

@@ -6,16 +6,14 @@ from ophyd_async.core import init_devices
 
 from dodal.beamlines import aithre
 from dodal.devices.aithre_lasershaping.goniometer import Goniometer
-from dodal.devices.util.test_utils import patch_motor
+from dodal.devices.util.test_utils import patch_all_motors
 
 
 @pytest.fixture
 def goniometer(RE: RunEngine) -> Goniometer:
     with init_devices(mock=True):
         gonio = aithre.goniometer(connect_immediately=True, mock=True)
-    patch_motor(gonio.omega)
-    patch_motor(gonio.sampy)
-    patch_motor(gonio.sampz)
+    patch_all_motors(gonio)
     return gonio
 
 

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/tests/devices/unit_tests/i24/test_pmac.py

@@ -11,7 +11,7 @@ from dodal.devices.i24.pmac import (
     EncReset,
     LaserSettings,
 )
-from dodal.devices.util.test_utils import patch_motor
+from dodal.devices.util.test_utils import patch_all_motors
 
 
 @pytest.fixture
@@ -19,11 +19,7 @@ async def fake_pmac(RE):
     pmac = PMAC("", name="fake_pmac")
     await pmac.connect(mock=True)
 
-    with (
-        patch_motor(pmac.x),
-        patch_motor(pmac.y),
-        patch_motor(pmac.z),
-    ):
+    with patch_all_motors(pmac):
         yield pmac
 
 

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/tests/devices/unit_tests/i24/test_vgonio.py

@@ -2,14 +2,14 @@ import bluesky.plan_stubs as bps
 import pytest
 
 from dodal.devices.i24.vgonio import VerticalGoniometer
-from dodal.devices.util.test_utils import patch_motor
+from dodal.devices.util.test_utils import patch_all_motors
 
 
 @pytest.fixture
 async def vgonio(RE):
     vgonio = VerticalGoniometer("", name="fake_vgonio")
     await vgonio.connect(mock=True)
-    with patch_motor(vgonio.x), patch_motor(vgonio.yh), patch_motor(vgonio.z):
+    with patch_all_motors(vgonio):
         yield vgonio
 
 

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/tests/devices/unit_tests/oav/test_oav_utils.py

@@ -1,3 +1,4 @@
+from collections.abc import AsyncGenerator
 from unittest.mock import AsyncMock
 
 import numpy as np
@@ -17,7 +18,7 @@ from dodal.devices.oav.utils import (
     wait_for_tip_to_be_found,
 )
 from dodal.devices.smargon import Smargon
-from dodal.devices.util.test_utils import patch_motor
+from dodal.devices.util.test_utils import patch_all_motors
 
 
 def test_bottom_right_from_top_left():
@@ -31,14 +32,12 @@ def test_bottom_right_from_top_left():
 
 
 @pytest.fixture
-async def smargon(RE: RunEngine):
+async def smargon(RE: RunEngine) -> AsyncGenerator[Smargon]:
     async with init_devices(mock=True):
         smargon = Smargon()
 
-    for motor in [smargon.omega, smargon.x, smargon.y, smargon.z]:
-        patch_motor(motor)
-
-    return smargon
+    with patch_all_motors(smargon):
+        yield smargon
 
 
 @pytest.mark.parametrize(

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/tests/devices/unit_tests/test_aperture_scatterguard.py

@@ -1,6 +1,5 @@
 import asyncio
 from collections.abc import AsyncGenerator
-from contextlib import ExitStack
 from typing import Any
 from unittest.mock import AsyncMock, call
 
@@ -23,7 +22,7 @@ from dodal.devices.aperturescatterguard import (
     InvalidApertureMove,
     load_positions_from_beamline_parameters,
 )
-from dodal.devices.util.test_utils import patch_motor
+from dodal.devices.util.test_utils import patch_all_motors
 
 
 @pytest.fixture
@@ -86,16 +85,14 @@ async def ap_sg(
     RE: RunEngine,
     aperture_positions: dict[ApertureValue, AperturePosition],
     aperture_tolerances: AperturePosition,
-) -> AsyncGenerator[ApertureScatterguard, None]:
+) -> AsyncGenerator[ApertureScatterguard]:
     async with init_devices(mock=True):
         ap_sg = ApertureScatterguard(
             name="test_ap_sg",
             loaded_positions=aperture_positions,
             tolerances=aperture_tolerances,
         )
-    with ExitStack() as motor_patch_stack:
-        for motor in get_all_motors(ap_sg):
-            motor_patch_stack.enter_context(patch_motor(motor))
+    with patch_all_motors(ap_sg):
         yield ap_sg
 
 

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/tests/devices/unit_tests/test_attenuator.py

@@ -43,19 +43,25 @@ async def test_given_attenuator_sets_filters_to_expected_value_then_set_returns(
 
     callback_on_mock_put(fake_attenuator._change, mock_apply_values)
 
-    await asyncio.wait_for(fake_attenuator.set(0.65), timeout=0.1)
+    await fake_attenuator.set(0.65)
 
 
-async def test_given_attenuator_fails_to_set_filters_then_set_timeout(
+async def test_attenuator_set_only_complete_once_all_filters_in_position(
     fake_attenuator: BinaryFilterAttenuator,
 ):
-    def mock_apply_values(*args, **kwargs):
+    fake_set_complete = asyncio.Event()
+
+    async def mock_apply_values(*args, **kwargs):
         for i in range(16):
             set_mock_value(
                 fake_attenuator._calculated_filter_states[i], CALCULATED_VALUE[i]
             )
+        await fake_set_complete.wait()
+        for i in range(16):
+            set_mock_value(fake_attenuator._filters_in_position[i], CALCULATED_VALUE[i])
 
     callback_on_mock_put(fake_attenuator._change, mock_apply_values)
-
-    with pytest.raises(TimeoutError):
-        await asyncio.wait_for(fake_attenuator.set(0.65), timeout=0.01)
+    status = fake_attenuator.set(0.65)
+    assert not status.done
+    fake_set_complete.set()
+    await status

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/tests/devices/unit_tests/test_gridscan.py

@@ -22,7 +22,7 @@ from dodal.devices.fast_grid_scan import (
     set_fast_grid_scan_params,
 )
 from dodal.devices.smargon import Smargon
-from dodal.devices.util.test_utils import patch_motor
+from dodal.devices.util.test_utils import patch_all_motors
 
 
 def discard_status(st: Status | DeviceStatus):
@@ -53,10 +53,8 @@ async def smargon(RE: RunEngine):
     async with init_devices(mock=True):
         smargon = Smargon()
 
-    for motor in [smargon.omega, smargon.x, smargon.y, smargon.z]:
-        patch_motor(motor)
-
-    return smargon
+    with patch_all_motors(smargon):
+        yield smargon
 
 
 @pytest.mark.parametrize(

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/tests/devices/unit_tests/test_motors.py

@@ -1,4 +1,5 @@
 import math
+from collections.abc import Generator
 
 import pytest
 from bluesky.run_engine import RunEngine
@@ -6,19 +7,16 @@ from ophyd_async.core import init_devices
 from ophyd_async.testing import assert_reading, partial_reading
 
 from dodal.devices.motors import SixAxisGonio
-from dodal.devices.util.test_utils import patch_motor
+from dodal.devices.util.test_utils import patch_all_motors
 
 
 @pytest.fixture
-def six_axis_gonio(RE: RunEngine) -> SixAxisGonio:
+def six_axis_gonio(RE: RunEngine) -> Generator[SixAxisGonio]:
     with init_devices(mock=True):
         gonio = SixAxisGonio("")
-    patch_motor(gonio.omega)
-    patch_motor(gonio.z)
-    patch_motor(gonio.y)
-    patch_motor(gonio.x)
 
-    return gonio
+    with patch_all_motors(gonio):
+        yield gonio
 
 
 async def test_reading_six_axis_gonio(six_axis_gonio: SixAxisGonio):

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/tests/devices/unit_tests/test_smargon.py

@@ -1,3 +1,4 @@
+from collections.abc import AsyncGenerator
 from unittest.mock import MagicMock, call
 
 import pytest
@@ -7,20 +8,15 @@ from ophyd_async.core import init_devices, observe_value
 from ophyd_async.testing import get_mock_put, set_mock_value
 
 from dodal.devices.smargon import CombinedMove, DeferMoves, Smargon, StubPosition
-from dodal.devices.util.test_utils import patch_motor
+from dodal.devices.util.test_utils import patch_all_motors
 
 
 @pytest.fixture
-async def smargon() -> Smargon:
+async def smargon() -> AsyncGenerator[Smargon]:
     async with init_devices(mock=True):
         smargon = Smargon(name="smargon")
-    patch_motor(smargon.x)
-    patch_motor(smargon.y)
-    patch_motor(smargon.z)
-    patch_motor(smargon.omega)
-    patch_motor(smargon.phi)
-    patch_motor(smargon.chi)
-    return smargon
+    with patch_all_motors(smargon):
+        yield smargon
 
 
 def set_smargon_pos(smargon: Smargon, pos: tuple[float, float, float]):

{dls_dodal-1.55.0 → dls_dodal-1.55.1}/tests/devices/unit_tests/test_tetramm.py

@@ -176,7 +176,7 @@ async def test_prepare_with_too_low_a_deadtime_raises_error(
 ):
     with pytest.raises(
         ValueError,
-        match=r"Detector .* needs at least 2e-05s deadtime, but trigger logic "
+        match=r"Tetramm .* needs at least 2e-05s deadtime, but trigger logic "
         "provides only 1e-05s",
     ):
         await tetramm.prepare(