Fixes for ophyd async 0.9.0a1 (#704)

* Pin dodal * Fix imports for new ophyd-async * Fix comparison inside pydantic version field validator (#705) --------- Co-authored-by: olliesilvester <[email protected]>
DiamondLightSource · Dec 10, 2024 · 1f3cb61 · 1f3cb61
1 parent 5497217
commit 1f3cb61
Show file tree

Hide file tree

Showing 31 changed files with 42 additions and 36 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -46,7 +46,7 @@ dependencies = [
     "ophyd == 1.9.0",
     "ophyd-async >= 0.8a5",
     "bluesky >= 1.13.0a4",
-    "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@main",
+    "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@4349f34577671c0090a843ccfde8af5f1657bb7b",
 ]
 
 

diff --git a/src/mx_bluesky/common/parameters/components.py b/src/mx_bluesky/common/parameters/components.py
@@ -103,12 +103,12 @@ def __hash__(self) -> int:
 
     @field_validator("parameter_model_version")
     @classmethod
-    def _validate_version(cls, version: Version):
+    def _validate_version(cls, version: SemanticVersion):
         assert (
-            version >= Version(major=PARAMETER_VERSION.major)
+            version >= SemanticVersion(major=PARAMETER_VERSION.major)
         ), f"Parameter version too old! This version of hyperion uses {PARAMETER_VERSION}"
         assert (
-            version <= Version(major=PARAMETER_VERSION.major + 1)
+            version <= SemanticVersion(major=PARAMETER_VERSION.major + 1)
         ), f"Parameter version too new! This version of hyperion uses {PARAMETER_VERSION}"
         return version
 

diff --git a/src/mx_bluesky/hyperion/utils/validation.py b/src/mx_bluesky/hyperion/utils/validation.py
@@ -9,7 +9,7 @@
 from bluesky.run_engine import RunEngine
 from dodal.beamlines import i03
 from dodal.devices.oav.oav_parameters import OAVConfig
-from ophyd_async.core import set_mock_value
+from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.hyperion.device_setup_plans.read_hardware_for_setup import (
     read_hardware_during_collection,

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -57,12 +57,11 @@
     AsyncStatus,
     Device,
     DeviceVector,
-    callback_on_mock_put,
-    set_mock_value,
 )
 from ophyd_async.epics.core import epics_signal_rw
 from ophyd_async.epics.motor import Motor
 from ophyd_async.fastcs.panda import DatasetTable, PandaHdf5DatasetType
+from ophyd_async.testing import callback_on_mock_put, set_mock_value
 from scanspec.core import Path as ScanPath
 from scanspec.specs import Line
 

diff --git a/tests/system_tests/conftest.py b/tests/system_tests/conftest.py
@@ -6,7 +6,7 @@
 from aiohttp import ClientResponse
 from dodal.beamlines import i03
 from dodal.devices.oav.oav_parameters import OAVConfig
-from ophyd_async.core import set_mock_value
+from ophyd_async.testing import set_mock_value
 
 # Map all the case-sensitive column names from their normalised versions
 DATA_COLLECTION_COLUMN_MAP = {

diff --git a/tests/system_tests/hyperion/experiment_plans/test_fgs_plan.py b/tests/system_tests/hyperion/experiment_plans/test_fgs_plan.py
@@ -11,7 +11,7 @@
 from dodal.devices.aperturescatterguard import ApertureValue
 from dodal.devices.smargon import Smargon
 from ophyd.sim import NullStatus
-from ophyd_async.core import set_mock_value
+from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.hyperion.device_setup_plans.read_hardware_for_setup import (
     read_hardware_during_collection,

diff --git a/tests/system_tests/hyperion/external_interaction/conftest.py b/tests/system_tests/hyperion/external_interaction/conftest.py
@@ -34,7 +34,8 @@
     Position,
 )
 from ophyd.sim import NullStatus
-from ophyd_async.core import AsyncStatus, callback_on_mock_put, set_mock_value
+from ophyd_async.core import AsyncStatus
+from ophyd_async.testing import callback_on_mock_put, set_mock_value
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 

diff --git a/tests/system_tests/hyperion/external_interaction/test_load_centre_collect_full_plan.py b/tests/system_tests/hyperion/external_interaction/test_load_centre_collect_full_plan.py
@@ -12,7 +12,8 @@
 from dodal.devices.synchrotron import SynchrotronMode
 from ispyb.sqlalchemy import BLSample
 from ophyd.sim import NullStatus
-from ophyd_async.core import AsyncStatus, set_mock_value
+from ophyd_async.core import AsyncStatus
+from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.hyperion.exceptions import WarningException
 from mx_bluesky.hyperion.experiment_plans.flyscan_xray_centre_plan import (

diff --git a/tests/unit_tests/beamlines/i04/test_thawing.py b/tests/unit_tests/beamlines/i04/test_thawing.py
@@ -16,11 +16,13 @@
 from ophyd_async.core import (
     AsyncStatus,
     DeviceCollector,
+)
+from ophyd_async.epics.motor import Motor
+from ophyd_async.testing import (
     callback_on_mock_put,
     get_mock_put,
     set_mock_value,
 )
-from ophyd_async.epics.motor import Motor
 
 from mx_bluesky.beamlines.i04.thawing_plan import thaw, thaw_and_stream_to_redis
 

diff --git a/tests/unit_tests/beamlines/i24/serial/conftest.py b/tests/unit_tests/beamlines/i24/serial/conftest.py
@@ -16,8 +16,8 @@
 from dodal.devices.i24.focus_mirrors import FocusMirrorsMode, HFocusMode, VFocusMode
 from dodal.devices.i24.pmac import PMAC
 from dodal.devices.zebra import Zebra
-from ophyd_async.core import callback_on_mock_put, get_mock_put, set_mock_value
 from ophyd_async.epics.motor import Motor
+from ophyd_async.testing import callback_on_mock_put, get_mock_put, set_mock_value
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import ChipType
 from mx_bluesky.beamlines.i24.serial.parameters import (
@@ -174,6 +174,6 @@ def pilatus_beam_center(RE) -> DetectorBeamCenter:
 @pytest.fixture
 def mirrors(RE) -> FocusMirrorsMode:
     mirrors: FocusMirrorsMode = i24.focus_mirrors(fake_with_ophyd_sim=True)
-    set_mock_value(mirrors.horizontal, HFocusMode.focus10)
-    set_mock_value(mirrors.vertical, VFocusMode.focus10)
+    set_mock_value(mirrors.horizontal, HFocusMode.FOCUS_10)
+    set_mock_value(mirrors.vertical, VFocusMode.FOCUS_10)
     return mirrors
diff --git a/tests/unit_tests/beamlines/i24/serial/extruder/test_extruder_collect.py b/tests/unit_tests/beamlines/i24/serial/extruder/test_extruder_collect.py
@@ -3,7 +3,7 @@
 import bluesky.plan_stubs as bps
 import pytest
 from dodal.devices.zebra import DISCONNECT, SOFT_IN3
-from ophyd_async.core import get_mock_put, set_mock_value
+from ophyd_async.testing import get_mock_put, set_mock_value
 
 from mx_bluesky.beamlines.i24.serial.extruder.i24ssx_Extruder_Collect_py3v2 import (
     TTL_EIGER,

diff --git a/tests/unit_tests/beamlines/i24/serial/fixed_target/test_chip_manager.py b/tests/unit_tests/beamlines/i24/serial/fixed_target/test_chip_manager.py
@@ -7,7 +7,7 @@
 from dodal.devices.i24.dual_backlight import DualBacklight
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
 from dodal.devices.i24.pmac import PMAC
-from ophyd_async.core import get_mock_put
+from ophyd_async.testing import get_mock_put
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import Fiducials
 from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_Chip_Manager_py3v1 import (

diff --git a/tests/unit_tests/beamlines/i24/serial/fixed_target/test_ft_collect.py b/tests/unit_tests/beamlines/i24/serial/fixed_target/test_ft_collect.py
@@ -7,7 +7,7 @@
 from dodal.devices.hutch_shutter import HutchShutter
 from dodal.devices.i24.pmac import PMAC
 from dodal.devices.zebra import Zebra
-from ophyd_async.core import callback_on_mock_put, get_mock_put, set_mock_value
+from ophyd_async.testing import callback_on_mock_put, get_mock_put, set_mock_value
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
     ChipType,

diff --git a/tests/unit_tests/beamlines/i24/serial/fixed_target/test_moveonclick.py b/tests/unit_tests/beamlines/i24/serial/fixed_target/test_moveonclick.py
@@ -5,7 +5,7 @@
 import pytest
 from dodal.devices.i24.pmac import PMAC
 from dodal.devices.oav.oav_detector import OAV
-from ophyd_async.core import get_mock_put
+from ophyd_async.testing import get_mock_put
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_moveonclick import (
     _calculate_zoom_calibrator,

diff --git a/tests/unit_tests/beamlines/i24/serial/setup_beamline/test_setup_detector.py b/tests/unit_tests/beamlines/i24/serial/setup_beamline/test_setup_detector.py
@@ -3,7 +3,7 @@
 import pytest
 from bluesky.run_engine import RunEngine
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
-from ophyd_async.core import set_mock_value
+from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.beamlines.i24.serial.parameters.constants import SSXType
 from mx_bluesky.beamlines.i24.serial.setup_beamline import Eiger, Pilatus

diff --git a/tests/unit_tests/beamlines/i24/serial/test_dcid.py b/tests/unit_tests/beamlines/i24/serial/test_dcid.py
@@ -3,7 +3,7 @@
 from dodal.devices.i24.beam_center import DetectorBeamCenter
 from dodal.devices.i24.dcm import DCM
 from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
-from ophyd_async.core import set_mock_value
+from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.beamlines.i24.serial.dcid import (
     DCID,

diff --git a/tests/unit_tests/common/plan_stubs/test_do_fgs.py b/tests/unit_tests/common/plan_stubs/test_do_fgs.py
@@ -13,7 +13,8 @@
     ZOCALO_STAGE_GROUP,
 )
 from event_model.documents import Event, RunStart
-from ophyd_async.core import DeviceCollector, set_mock_value
+from ophyd_async.core import DeviceCollector
+from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.common.parameters.constants import (
     EnvironmentConstants,

diff --git a/tests/unit_tests/hyperion/device_setup_plans/test_dcm_pitch_roll_mirror_adjuster.py b/tests/unit_tests/hyperion/device_setup_plans/test_dcm_pitch_roll_mirror_adjuster.py
@@ -9,7 +9,7 @@
     MirrorVoltages,
 )
 from dodal.devices.undulator_dcm import UndulatorDCM
-from ophyd_async.core import get_mock_put
+from ophyd_async.testing import get_mock_put
 
 from mx_bluesky.hyperion.device_setup_plans import dcm_pitch_roll_mirror_adjuster
 from mx_bluesky.hyperion.device_setup_plans.dcm_pitch_roll_mirror_adjuster import (

diff --git a/tests/unit_tests/hyperion/device_setup_plans/test_utils.py b/tests/unit_tests/hyperion/device_setup_plans/test_utils.py
@@ -5,7 +5,7 @@
 from bluesky.utils import FailedStatus
 from dodal.beamlines import i03
 from ophyd.status import Status
-from ophyd_async.core import get_mock_put
+from ophyd_async.testing import get_mock_put
 
 from mx_bluesky.hyperion.device_setup_plans.utils import (
     start_preparing_data_collection_then_do_plan,

diff --git a/tests/unit_tests/hyperion/device_setup_plans/test_xbpm_feedback.py b/tests/unit_tests/hyperion/device_setup_plans/test_xbpm_feedback.py
@@ -6,7 +6,7 @@
 from bluesky.utils import FailedStatus
 from dodal.devices.xbpm_feedback import Pause
 from ophyd.status import Status
-from ophyd_async.core import set_mock_value
+from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.hyperion.device_setup_plans.xbpm_feedback import (
     transmission_and_xbpm_feedback_for_collection_decorator,

diff --git a/tests/unit_tests/hyperion/experiment_plans/conftest.py b/tests/unit_tests/hyperion/experiment_plans/conftest.py
@@ -21,8 +21,9 @@
 from dodal.devices.zocalo import ZocaloResults, ZocaloTrigger
 from event_model import Event
 from ophyd.sim import NullStatus
-from ophyd_async.core import AsyncStatus, set_mock_value
+from ophyd_async.core import AsyncStatus
 from ophyd_async.fastcs.panda import HDFPanda
+from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.hyperion.experiment_plans.common.xrc_result import XRayCentreResult
 from mx_bluesky.hyperion.experiment_plans.grid_detect_then_xray_centre_plan import (

diff --git a/tests/unit_tests/hyperion/experiment_plans/test_flyscan_xray_centre_plan.py b/tests/unit_tests/hyperion/experiment_plans/test_flyscan_xray_centre_plan.py
@@ -21,8 +21,8 @@
 from numpy import isclose
 from ophyd.sim import NullStatus
 from ophyd.status import Status
-from ophyd_async.core import set_mock_value
 from ophyd_async.fastcs.panda import DatasetTable, PandaHdf5DatasetType
+from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.hyperion.device_setup_plans.read_hardware_for_setup import (
     read_hardware_during_collection,

diff --git a/tests/unit_tests/hyperion/experiment_plans/test_grid_detect_then_xray_centre_plan.py b/tests/unit_tests/hyperion/experiment_plans/test_grid_detect_then_xray_centre_plan.py
@@ -11,7 +11,7 @@
 from dodal.devices.aperturescatterguard import ApertureValue
 from dodal.devices.backlight import BacklightPosition
 from dodal.devices.oav.oav_parameters import OAVParameters
-from ophyd_async.core import get_mock_put, set_mock_value
+from ophyd_async.testing import get_mock_put, set_mock_value
 
 from mx_bluesky.common.parameters.gridscan import GridScanWithEdgeDetect
 from mx_bluesky.hyperion.experiment_plans.flyscan_xray_centre_plan import (

diff --git a/tests/unit_tests/hyperion/experiment_plans/test_grid_detection_plan.py b/tests/unit_tests/hyperion/experiment_plans/test_grid_detection_plan.py
@@ -15,7 +15,7 @@
 from dodal.devices.oav.pin_image_recognition.utils import NONE_VALUE, SampleLocation
 from dodal.devices.smargon import Smargon
 from numpy._typing._array_like import NDArray
-from ophyd_async.core import set_mock_value
+from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.hyperion.exceptions import WarningException
 from mx_bluesky.hyperion.experiment_plans.oav_grid_detection_plan import (

diff --git a/tests/unit_tests/hyperion/experiment_plans/test_load_centre_collect_full_plan.py b/tests/unit_tests/hyperion/experiment_plans/test_load_centre_collect_full_plan.py
@@ -11,7 +11,7 @@
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
 from dodal.devices.synchrotron import SynchrotronMode
 from ophyd.sim import NullStatus
-from ophyd_async.core import set_mock_value
+from ophyd_async.testing import set_mock_value
 from pydantic import ValidationError
 
 from mx_bluesky.common.parameters.robot_load import RobotLoadAndEnergyChange

diff --git a/tests/unit_tests/hyperion/experiment_plans/test_multi_rotation_scan_plan.py b/tests/unit_tests/hyperion/experiment_plans/test_multi_rotation_scan_plan.py
@@ -15,7 +15,7 @@
 from bluesky.simulators import RunEngineSimulator, assert_message_and_return_remaining
 from dodal.devices.oav.oav_parameters import OAVParameters
 from dodal.devices.synchrotron import SynchrotronMode
-from ophyd_async.core import set_mock_value
+from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.hyperion.experiment_plans.rotation_scan_plan import (
     RotationScanComposite,

diff --git a/tests/unit_tests/hyperion/experiment_plans/test_optimise_attenuation_plan.py b/tests/unit_tests/hyperion/experiment_plans/test_optimise_attenuation_plan.py
@@ -7,7 +7,8 @@
 from bluesky.run_engine import RunEngine
 from dodal.beamlines import i03
 from ophyd.status import Status
-from ophyd_async.core import AsyncStatus, set_mock_value
+from ophyd_async.core import AsyncStatus
+from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.hyperion.experiment_plans import optimise_attenuation_plan
 from mx_bluesky.hyperion.experiment_plans.optimise_attenuation_plan import (

diff --git a/tests/unit_tests/hyperion/experiment_plans/test_pin_tip_centring.py b/tests/unit_tests/hyperion/experiment_plans/test_pin_tip_centring.py
@@ -11,7 +11,7 @@
 from dodal.devices.oav.pin_image_recognition.utils import SampleLocation
 from dodal.devices.smargon import Smargon
 from ophyd.sim import NullStatus
-from ophyd_async.core import get_mock_put, set_mock_value
+from ophyd_async.testing import get_mock_put, set_mock_value
 
 from mx_bluesky.hyperion.device_setup_plans.smargon import (
     move_smargon_warn_on_out_of_range,

diff --git a/tests/unit_tests/hyperion/experiment_plans/test_robot_load_and_change_energy.py b/tests/unit_tests/hyperion/experiment_plans/test_robot_load_and_change_energy.py
@@ -11,7 +11,7 @@
 from dodal.devices.smargon import Smargon, StubPosition
 from dodal.devices.webcam import Webcam
 from ophyd.sim import NullStatus
-from ophyd_async.core import set_mock_value
+from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.common.parameters.robot_load import RobotLoadAndEnergyChange
 from mx_bluesky.hyperion.experiment_plans.robot_load_and_change_energy import (

diff --git a/tests/unit_tests/hyperion/experiment_plans/test_rotation_scan_plan.py b/tests/unit_tests/hyperion/experiment_plans/test_rotation_scan_plan.py
@@ -16,7 +16,7 @@
 from dodal.devices.xbpm_feedback import Pause
 from dodal.devices.zebra import PC_GATE, SOFT_IN1, Zebra
 from dodal.devices.zebra_controlled_shutter import ZebraShutterControl
-from ophyd_async.core import get_mock_put
+from ophyd_async.testing import get_mock_put
 
 from mx_bluesky.common.parameters.constants import DocDescriptorNames
 from mx_bluesky.hyperion.experiment_plans.oav_snapshot_plan import (

diff --git a/...ests/hyperion/external_interaction/callbacks/robot_load/test_robot_load_ispyb_callback.py b/...ests/hyperion/external_interaction/callbacks/robot_load/test_robot_load_ispyb_callback.py
@@ -7,7 +7,7 @@
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.robot import BartRobot
 from dodal.devices.webcam import Webcam
-from ophyd_async.core import set_mock_value
+from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.hyperion.external_interaction.callbacks.robot_load.ispyb_callback import (
     RobotLoadISPyBCallback,