Roll back bluesky version (#1083)

* Revert "Update bluesky and pin pyright (#1072)"

This reverts commit a3b1b8c.

* Pin pyright version

* Actually pin the version

Author: DominicOram

pyproject.toml

@@ -16,7 +16,7 @@ dependencies = [
     "click",
     "ophyd",
     "ophyd-async >= 0.9.0a2",
-    "bluesky",
+    "bluesky == 1.13.0",
     "pyepics",
     "dataclasses-json",
     "pillow",

src/dodal/devices/aperturescatterguard.py

@@ -123,7 +123,7 @@ def load_positions_from_beamline_parameters(
     }
 
 
-class ApertureScatterguard(StandardReadable, Movable[ApertureValue], Preparable):
+class ApertureScatterguard(StandardReadable, Movable, Preparable):
     """Move the aperture and scatterguard assembly in a safe way. There are two ways to
     interact with the device depending on if you want simplicity or move flexibility.
 

src/dodal/devices/apple2_undulator.py

@@ -1,7 +1,7 @@
 import abc
 import asyncio
 from dataclasses import dataclass
-from typing import Any, Generic, TypeVar
+from typing import Any
 
 import numpy as np
 from bluesky.protocols import Movable
@@ -21,8 +21,6 @@
 
 from dodal.log import LOGGER
 
-T = TypeVar("T")
-
 
 class UndulatorGateStatus(StrictEnum):
     OPEN = "Open"
@@ -101,7 +99,7 @@ async def estimate_motor_timeout(
     return abs((target_pos - cur_pos) * 2.0 / vel) + 1
 
 
-class SafeUndulatorMover(StandardReadable, Movable[T], Generic[T]):
+class SafeUndulatorMover(StandardReadable, Movable):
     """A device that will check it's safe to move the undulator before moving it and
     wait for the undulator to be safe again before calling the move complete.
     """
@@ -117,7 +115,7 @@ def __init__(self, set_move: SignalW, prefix: str, name: str = ""):
         super().__init__(name)
 
     @AsyncStatus.wrap
-    async def set(self, value: T) -> None:
+    async def set(self, value) -> None:
         LOGGER.info(f"Setting {self.name} to {value}")
         await self.raise_if_cannot_move()
         await self._set_demand_positions(value)
@@ -127,7 +125,7 @@ async def set(self, value: T) -> None:
         await wait_for_value(self.gate, UndulatorGateStatus.CLOSE, timeout=timeout)
 
     @abc.abstractmethod
-    async def _set_demand_positions(self, value: T) -> None:
+    async def _set_demand_positions(self, value) -> None:
         """Set the demand positions on the device without actually hitting move."""
 
     @abc.abstractmethod
@@ -141,7 +139,7 @@ async def raise_if_cannot_move(self) -> None:
             raise RuntimeError(f"{self.name} is already in motion.")
 
 
-class UndulatorGap(SafeUndulatorMover[float]):
+class UndulatorGap(SafeUndulatorMover):
     """A device with a collection of epics signals to set Apple 2 undulator gap motion.
     Only PV used by beamline are added the full list is here:
     /dls_sw/work/R3.14.12.7/support/insertionDevice/db/IDGapVelocityControl.template
@@ -187,7 +185,7 @@ def __init__(self, prefix: str, name: str = ""):
             self.user_readback = epics_signal_r(float, prefix + "CURRGAPD")
         super().__init__(self.set_move, prefix, name)
 
-    async def _set_demand_positions(self, value: float) -> None:
+    async def _set_demand_positions(self, value) -> None:
         await self.user_setpoint.set(str(value))
 
     async def get_timeout(self) -> float:
@@ -236,7 +234,7 @@ def __init__(self, prefix: str, infix: str, name: str = ""):
         super().__init__(name=name)
 
 
-class UndulatorPhaseAxes(SafeUndulatorMover[Apple2PhasesVal]):
+class UndulatorPhaseAxes(SafeUndulatorMover):
     """
     A collection of 4 phase Motor to make up the full id phase motion. We are using the diamond pv convention.
     e.g. top_outer == Q1
@@ -292,7 +290,7 @@ async def get_timeout(self) -> float:
         return np.max(timeouts)
 
 
-class UndulatorJawPhase(SafeUndulatorMover[float]):
+class UndulatorJawPhase(SafeUndulatorMover):
     """
     A JawPhase movable, this is use for moving the jaw phase which is use to control the
     linear arbitrary polarisation but only one some of the beamline.

src/dodal/devices/attenuator/attenuator.py

@@ -29,7 +29,7 @@ def __init__(self, prefix: str, name: str = "") -> None:
         super().__init__(name)
 
 
-class BinaryFilterAttenuator(ReadOnlyAttenuator, Movable[float]):
+class BinaryFilterAttenuator(ReadOnlyAttenuator, Movable):
     """The attenuator will insert filters into the beam to reduce its transmission.
     In this attenuator, each filter can be in one of two states: IN or OUT
 

src/dodal/devices/backlight.py

@@ -15,7 +15,7 @@ class BacklightPosition(StrictEnum):
     OUT = "Out"
 
 
-class Backlight(StandardReadable, Movable[BacklightPosition]):
+class Backlight(StandardReadable, Movable):
     """Simple device to trigger the pneumatic in/out."""
 
     TIME_TO_MOVE_S = 1.0  # Tested using a stopwatch on the beamline 09/2024

src/dodal/devices/bimorph_mirror.py

@@ -41,7 +41,7 @@ class BimorphMirrorStatus(StrictEnum):
     ERROR = "Error"
 
 
-class BimorphMirrorChannel(StandardReadable, Movable[float], EpicsDevice):
+class BimorphMirrorChannel(StandardReadable, Movable, EpicsDevice):
     """Collection of PVs comprising a single bimorph channel.
 
     Attributes:
@@ -66,7 +66,7 @@ async def set(self, value: float):
         await self.output_voltage.set(value)
 
 
-class BimorphMirror(StandardReadable, Movable[Mapping[int, float]]):
+class BimorphMirror(StandardReadable, Movable):
     """Class to represent CAENels Bimorph Mirrors.
 
     Attributes:

src/dodal/devices/hutch_shutter.py

@@ -55,7 +55,7 @@ async def shutter_safe_to_operate(self) -> bool:
         return interlock_state == HUTCH_SAFE_FOR_OPERATIONS
 
 
-class HutchShutter(StandardReadable, Movable[ShutterDemand]):
+class HutchShutter(StandardReadable, Movable):
     """Device to operate the hutch shutter.
 
     When a demand is sent, the device should first check the hutch status \

src/dodal/devices/i10/i10_apple2.py

@@ -175,7 +175,7 @@ def update_lookuptable(self):
         self._available_pol = list(self.lookup_tables["Gap"].keys())
 
 
-class I10Apple2PGM(StandardReadable, Movable[float]):
+class I10Apple2PGM(StandardReadable, Movable):
     """
     Compound device to set both ID and PGM energy at the sample time,poly_deg
 
@@ -211,7 +211,7 @@ async def set(self, value: float) -> None:
         )
 
 
-class I10Apple2Pol(StandardReadable, Movable[str]):
+class I10Apple2Pol(StandardReadable, Movable):
     """
     Compound device to set polorisation of ID.
     """
@@ -240,7 +240,7 @@ async def set(self, value: str) -> None:
         )  # Move id to new polarisation
 
 
-class LinearArbitraryAngle(StandardReadable, Movable[SupportsFloat]):
+class LinearArbitraryAngle(StandardReadable, Movable):
     """
     Device to set polorisation angle of the ID. Linear Arbitrary Angle (laa)
      is the direction of the magnetic field which can be change by varying the jaw_phase

src/dodal/devices/i19/shutter.py

@@ -18,7 +18,7 @@ class HutchState(str, Enum):
     INVALID = "INVALID"
 
 
-class HutchConditionalShutter(StandardReadable, Movable[ShutterDemand]):
+class HutchConditionalShutter(StandardReadable, Movable):
     """ I19-specific device to operate the hutch shutter.
 
     This device evaluates the hutch state value to work out which of the two I19 \

src/dodal/devices/i24/pmac.py

@@ -71,7 +71,7 @@ async def trigger(self):
         await self.signal_ref().set(self.cmd_string, wait=True)
 
 
-class PMACStringLaser(Device, Movable[LaserSettings]):
+class PMACStringLaser(Device, Movable):
     """Set the pmac_string to control the laser."""
 
     def __init__(
@@ -90,7 +90,7 @@ async def set(
         await self._signal_ref().set(value.value)
 
 
-class PMACStringEncReset(Device, Movable[EncReset]):
+class PMACStringEncReset(Device, Movable):
     """Set a pmac_string to control the encoder channels in the controller."""
 
     def __init__(

src/dodal/devices/oav/oav_detector.py

@@ -29,7 +29,7 @@ def _get_correct_zoom_string(zoom: str) -> str:
     return zoom
 
 
-class ZoomController(StandardReadable, Movable[str]):
+class ZoomController(StandardReadable, Movable):
     """
     Device to control the zoom level. This should be set like
         o = OAV(name="oav")

src/dodal/devices/pressure_jump_cell.py

@@ -76,7 +76,7 @@ class AllValvesControlState:
     valve_6: FastValveControlRequest | None = None
 
 
-class AllValvesControl(StandardReadable, Movable[AllValvesControlState]):
+class AllValvesControl(StandardReadable, Movable):
     """
     valves 2, 4, 7, 8 are not controlled by the IOC,
     as they are under manual control.
@@ -151,9 +151,7 @@ async def set(self, value: AllValvesControlState):
         )
 
 
-class ValveControl(
-    StandardReadable, Movable[ValveControlRequest | ValveOpenSeqRequest]
-):
+class ValveControl(StandardReadable, Movable):
     def __init__(self, prefix: str, name: str = "") -> None:
         with self.add_children_as_readables():
             self.close = epics_signal_rw(ValveControlRequest, prefix + ":CON")
@@ -172,9 +170,7 @@ def set(self, value: ValveControlRequest | ValveOpenSeqRequest) -> AsyncStatus:
         return set_status
 
 
-class FastValveControl(
-    StandardReadable, Movable[FastValveControlRequest | ValveOpenSeqRequest]
-):
+class FastValveControl(StandardReadable, Movable):
     def __init__(self, prefix: str, name: str = "") -> None:
         with self.add_children_as_readables():
             self.close = epics_signal_rw(FastValveControlRequest, prefix + ":CON")

src/dodal/devices/robot.py

@@ -52,7 +52,7 @@ async def raise_if_error(self, raise_from: Exception):
             raise RobotLoadFailed(int(error_code), error_string) from raise_from
 
 
-class BartRobot(StandardReadable, Movable[SampleLocation]):
+class BartRobot(StandardReadable, Movable):
     """The sample changing robot."""
 
     # How long to wait for the robot if it is busy soaking/drying

src/dodal/devices/thawer.py

@@ -1,6 +1,6 @@
 from asyncio import Task, create_task, sleep
 
-from bluesky.protocols import Movable, Stoppable
+from bluesky.protocols import Stoppable
 from ophyd_async.core import (
     AsyncStatus,
     Device,
@@ -21,18 +21,18 @@ class ThawerStates(StrictEnum):
     ON = "On"
 
 
-class ThawingTimer(Device, Stoppable, Movable[float]):
+class ThawingTimer(Device, Stoppable):
     def __init__(self, control_signal: SignalRW[ThawerStates]) -> None:
         self._control_signal_ref = Reference(control_signal)
         self._thawing_task: Task | None = None
         super().__init__("thaw_for_time_s")
 
     @AsyncStatus.wrap
-    async def set(self, value: float):
+    async def set(self, time_to_thaw_for: float):
         await self._control_signal_ref().set(ThawerStates.ON)
         if self._thawing_task and not self._thawing_task.done():
             raise ThawingException("Thawing task already in progress")
-        self._thawing_task = create_task(sleep(value))
+        self._thawing_task = create_task(sleep(time_to_thaw_for))
         try:
             await self._thawing_task
         finally:

src/dodal/devices/undulator.py

@@ -46,7 +46,7 @@ def _get_closest_gap_for_energy(
     return table[1][idx]
 
 
-class Undulator(StandardReadable, Movable[float]):
+class Undulator(StandardReadable, Movable):
     """
     An Undulator-type insertion device, used to control photon emission at a given
     beam energy.

src/dodal/devices/undulator_dcm.py

@@ -12,7 +12,7 @@
 ENERGY_TIMEOUT_S: float = 30.0
 
 
-class UndulatorDCM(StandardReadable, Movable[float]):
+class UndulatorDCM(StandardReadable, Movable):
     """
     Composite device to handle changing beamline energies, wraps the Undulator and the
     DCM. The DCM has a motor which controls the beam energy, when it moves, the

src/dodal/devices/util/epics_util.py

@@ -114,7 +114,7 @@ def call_func(func: Callable[[], StatusBase]) -> StatusBase:
     return func()
 
 
-class SetWhenEnabled(OphydAsyncDevice, Movable[int]):
+class SetWhenEnabled(OphydAsyncDevice, Movable):
     """A device that sets the proc field of a PV when it becomes enabled."""
 
     def __init__(self, name: str = "", prefix: str = ""):

src/dodal/devices/zebra/zebra.py

@@ -4,7 +4,6 @@
 from enum import Enum
 from functools import partialmethod
 
-from bluesky.protocols import Movable
 from ophyd_async.core import (
     AsyncStatus,
     DeviceVector,
@@ -75,7 +74,7 @@ class SoftInState(StrictEnum):
     NO = "No"
 
 
-class ArmingDevice(StandardReadable, Movable[ArmDemand]):
+class ArmingDevice(StandardReadable):
     """A useful device that can abstract some of the logic of arming.
     Allows a user to just call arm.set(ArmDemand.ARM)"""
 
@@ -95,8 +94,8 @@ async def _set_armed(self, demand: ArmDemand):
                 return
 
     @AsyncStatus.wrap
-    async def set(self, value: ArmDemand):
-        await asyncio.wait_for(self._set_armed(value), timeout=self.TIMEOUT)
+    async def set(self, demand: ArmDemand):
+        await asyncio.wait_for(self._set_armed(demand), timeout=self.TIMEOUT)
 
 
 class PositionCompare(StandardReadable):

src/dodal/devices/zebra/zebra_controlled_shutter.py

@@ -19,7 +19,7 @@ class ZebraShutterControl(StrictEnum):
     AUTO = "Auto"
 
 
-class ZebraShutter(StandardReadable, Movable[ZebraShutterState]):
+class ZebraShutter(StandardReadable, Movable):
     """The shutter on most MX beamlines is controlled by the zebra.
 
     Internally in the zebra there are two AND gates, one for manual control and one for