Lock file maintenance (#1899)

* Lock file maintenance

* Remove wait from mapt_config

* Remove wait from backlight

* Fix linting

* Pin mysql-connector dependency

* Update uv.lock

* Remove all wait=True from set, no additional change needed as True is the default value

* Start fixing tests

* Fix a few more tests

* Fix the obvious ones

* Missed change

* Remove wait=False from tetramm unstage

* Fix for focusing mirror

* Fix for apple2 undulator

* Fix bimporph tests

* Fix tetramm tests

* Fix motor_util_plans tests

* Fixup incorrect use of group parameter in configure_arm_trigger_and_disarm_detector

* Fix robot unit tests

* Revert waits on plan stub calls in test_pmac

* Change to not wait on apple2

* Move gap and phase sets into own async function

* Ensure task is reachable to prevent it being GC'd

* Update wait signals and pin ophyd-async

* Update lock file

* Remove unused param from robot test

* Fix more tests

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Noemi Frisina <noemi.frisina@diamond.ac.uk>
Co-authored-by: Robert Tuck <robert.tuck@diamond.ac.uk>
Co-authored-by: Dominic Oram <dominic.oram@diamond.ac.uk>

Author: 4 people

pyproject.toml

@@ -14,23 +14,24 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async[ca,pva]>=v0.14.0",
+    "ophyd-async[ca,pva]>=v0.15.0",
     "bluesky>=1.14.5",
     "pyepics",
     "pillow",
     "zocalo>=1.0.0",
     "requests",
     "graypy",
     "pydantic>=2.0",
-    "opencv-python-headless",       # For pin-tip detection.
+    "opencv-python-headless",          # For pin-tip detection.
     "numpy",
     "aiofiles",
     "aiohttp",
     "redis",
     "scanspec>=0.7.3",
     "pyzmq==27.1.0",
     "deepdiff",
-    "daq-config-server>=v1.1.2",    # For getting Configuration settings.
+    "daq-config-server>=v1.1.2",       # For getting Configuration settings.
+    "mysql-connector-python == 9.5.0", # Can unpin once https://github.com/DiamondLightSource/ispyb-api/pull/244 is merged and released
 ]
 
 dynamic = ["version"]
@@ -60,7 +61,7 @@ dev = [
     "pytest-timeout",
     "pytest-random-order",
     "ruff",
-    "sphinx<7.4.6",             #  pinned due to https://github.com/sphinx-doc/sphinx/issues/12660
+    "sphinx<7.4.6",              #  pinned due to https://github.com/sphinx-doc/sphinx/issues/12660
     "sphinx-autobuild",
     "sphinx-copybutton",
     "sphinxcontrib-mermaid",

src/dodal/devices/areadetector/plugins/mjpg.py

@@ -68,7 +68,7 @@ async def _save_image(self, image: Image.Image):
 
         await asyncio_save_image(image, path)
 
-        await self.last_saved_path.set(path, wait=True)
+        await self.last_saved_path.set(path)
 
     @AsyncStatus.wrap
     async def trigger(self):

src/dodal/devices/beamlines/b07_1/ccmc.py

@@ -71,4 +71,4 @@ def _convert_pos_to_ev(self, pos_signal: ChannelCutMonochromatorPositions) -> fl
 
     @AsyncStatus.wrap
     async def set(self, value: ChannelCutMonochromatorPositions) -> None:
-        await self.crystal.set(value, wait=True)
+        await self.crystal.set(value)

src/dodal/devices/beamlines/i11/nx100robot.py

@@ -123,7 +123,7 @@ async def set(self, sample_location: int) -> None:
             LOGGER.info(f"Robot already at position {sample_location}")
         else:
             await self.clear_sample(table_in=False)
-            await self.next_sample_position.set(sample_location, wait=True)
+            await self.next_sample_position.set(sample_location)
             await self.load_sample(sample_location)
             await self.current_sample_position.set(sample_location)
 

src/dodal/devices/beamlines/i19/access_controlled/blueapi_device.py

@@ -1,6 +1,6 @@
 import asyncio
 import json
-from enum import Enum
+from enum import StrEnum
 from typing import TypeVar
 
 from aiohttp import ClientSession
@@ -15,7 +15,7 @@
 D = TypeVar("D")
 
 
-class HutchState(str, Enum):
+class HutchState(StrEnum):
     EH1 = "EH1"
     EH2 = "EH2"
 

src/dodal/devices/beamlines/i19/backlight.py

@@ -16,4 +16,4 @@ def __init__(self, prefix: str, name: str = "") -> None:
 
     @AsyncStatus.wrap
     async def set(self, value: InOutUpper):
-        await self.position.set(value, wait=True)
+        await self.position.set(value)

src/dodal/devices/beamlines/i19/pin_col_stages.py

@@ -137,7 +137,7 @@ async def _safe_move_in(self, value: _PinColPosition):
         LOGGER.info(
             f"Moving pinhole and collimator stages to in position: {value.value}"
         )
-        await self.mapt.configuration.select_config.set(value, wait=True)
+        await self.mapt.configuration.select_config.set(value)
         # NOTE. The apply PV will not be used here unless fixed in controls first.
         # This is to avoid collisions. A safe move in will move first the pinhole stage
         # and then the collimator stage, but apply will try to move all the motors

src/dodal/devices/beamlines/i24/dual_backlight.py

@@ -23,7 +23,7 @@ def __init__(self, prefix: str, name: str = "") -> None:
 
     @AsyncStatus.wrap
     async def set(self, value: BacklightPositions):
-        await self.pos_level.set(value, wait=True)
+        await self.pos_level.set(value)
 
 
 class DualBacklight(StandardReadable):
@@ -54,6 +54,6 @@ def __init__(self, prefix: str, name: str = "") -> None:
     async def set(self, value: BacklightPositions):
         await self.backlight_position.set(value)
         if value == BacklightPositions.OUT:
-            await self.backlight_state.set(OnOffUpper.OFF, wait=True)
+            await self.backlight_state.set(OnOffUpper.OFF)
         else:
-            await self.backlight_state.set(OnOffUpper.ON, wait=True)
+            await self.backlight_state.set(OnOffUpper.ON)

src/dodal/devices/beamlines/i24/pmac.py

@@ -1,5 +1,5 @@
 from asyncio import sleep
-from enum import Enum, IntEnum
+from enum import IntEnum, StrEnum
 
 from bluesky.protocols import Flyable, Movable, Triggerable
 from ophyd_async.core import (
@@ -27,7 +27,7 @@ class ScanState(IntEnum):
     DONE = 0
 
 
-class LaserSettings(str, Enum):
+class LaserSettings(StrEnum):
     """PMAC strings to switch laser on and off.
     Note. On the PMAC, M-variables usually have to do with position compare
     set up.
@@ -42,7 +42,7 @@ class LaserSettings(str, Enum):
     LASER_2_OFF = " M812=0 M811=1"
 
 
-class EncReset(str, Enum):
+class EncReset(StrEnum):
     """PMAC strings for position compare on encoder channels in the controller.
 
     For example, for ENC5::
@@ -72,7 +72,7 @@ def __init__(
 
     @AsyncStatus.wrap
     async def trigger(self):
-        await self.signal_ref().set(self.cmd_string, wait=True)
+        await self.signal_ref().set(self.cmd_string)
 
 
 class PMACStringLaser(Device, Movable[LaserSettings]):
@@ -147,7 +147,7 @@ async def kickoff(self):
         wait for the scan status PV to go to 1.
         """
         prog_num_str = await self._get_prog_number_string()
-        await self._signal_ref().set(prog_num_str, wait=True)
+        await self._signal_ref().set(prog_num_str)
         await wait_for_value(
             self._status_ref(),
             ScanState.RUNNING,
@@ -185,9 +185,9 @@ def __init__(
 
     @AsyncStatus.wrap
     async def trigger(self):
-        await self._signal_ref().set("A", wait=True)
+        await self._signal_ref().set("A")
         await sleep(1.0)  # TODO Check with scientist what this sleep is really for.
-        await self._signal_ref().set("P2401=0", wait=True)
+        await self._signal_ref().set("P2401=0")
         await wait_for_value(
             self._status_ref(),
             ScanState.DONE,

src/dodal/devices/eurotherm.py

@@ -91,7 +91,7 @@ def __init__(
     @AsyncStatus.wrap
     async def set(self, value: float):
         """Set the blower to a specific temperature."""
-        await self.setpoint.set(value, wait=True)
+        await self.setpoint.set(value)
 
     async def locate(self) -> Location[float]:
         setpoint = await self.setpoint.get_value()