Update bluesky and pin pyright (#1072)

* Pin to latest bluesky and fix tests

* Remove no longer needed type ignores

* Use improved typing on Movable

* Fix some typing errors

* Unpin bluesky so we use the latest

* Pin pyright

Author: DominicOram

pyproject.toml

@@ -55,7 +55,7 @@ dev = [
     "pre-commit",
     "psutil",
     "pydata-sphinx-theme>=0.12",
-    "pyright",
+    "pyright==1.1.394",          # See https://github.com/DiamondLightSource/dodal/issues/1079
     "pytest",
     "pytest-asyncio",
     "pytest-cov",

src/dodal/devices/aperturescatterguard.py

@@ -123,7 +123,7 @@ def load_positions_from_beamline_parameters(
     }
 
 
-class ApertureScatterguard(StandardReadable, Movable, Preparable):
+class ApertureScatterguard(StandardReadable, Movable[ApertureValue], 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
+from typing import Any, Generic, TypeVar
 
 import numpy as np
 from bluesky.protocols import Movable
@@ -21,6 +21,8 @@
 
 from dodal.log import LOGGER
 
+T = TypeVar("T")
+
 
 class UndulatorGateStatus(StrictEnum):
     OPEN = "Open"
@@ -99,7 +101,7 @@ async def estimate_motor_timeout(
     return abs((target_pos - cur_pos) * 2.0 / vel) + 1
 
 
-class SafeUndulatorMover(StandardReadable, Movable):
+class SafeUndulatorMover(StandardReadable, Movable[T], Generic[T]):
     """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.
     """
@@ -115,7 +117,7 @@ def __init__(self, set_move: SignalW, prefix: str, name: str = ""):
         super().__init__(name)
 
     @AsyncStatus.wrap
-    async def set(self, value) -> None:
+    async def set(self, value: T) -> None:
         LOGGER.info(f"Setting {self.name} to {value}")
         await self.raise_if_cannot_move()
         await self._set_demand_positions(value)
@@ -125,7 +127,7 @@ async def set(self, value) -> None:
         await wait_for_value(self.gate, UndulatorGateStatus.CLOSE, timeout=timeout)
 
     @abc.abstractmethod
-    async def _set_demand_positions(self, value) -> None:
+    async def _set_demand_positions(self, value: T) -> None:
         """Set the demand positions on the device without actually hitting move."""
 
     @abc.abstractmethod
@@ -139,7 +141,7 @@ async def raise_if_cannot_move(self) -> None:
             raise RuntimeError(f"{self.name} is already in motion.")
 
 
-class UndulatorGap(SafeUndulatorMover):
+class UndulatorGap(SafeUndulatorMover[float]):
     """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
@@ -185,7 +187,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) -> None:
+    async def _set_demand_positions(self, value: float) -> None:
         await self.user_setpoint.set(str(value))
 
     async def get_timeout(self) -> float:
@@ -234,7 +236,7 @@ def __init__(self, prefix: str, infix: str, name: str = ""):
         super().__init__(name=name)
 
 
-class UndulatorPhaseAxes(SafeUndulatorMover):
+class UndulatorPhaseAxes(SafeUndulatorMover[Apple2PhasesVal]):
     """
     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
@@ -290,7 +292,7 @@ async def get_timeout(self) -> float:
         return np.max(timeouts)
 
 
-class UndulatorJawPhase(SafeUndulatorMover):
+class UndulatorJawPhase(SafeUndulatorMover[float]):
     """
     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):
+class BinaryFilterAttenuator(ReadOnlyAttenuator, Movable[float]):
     """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):
+class Backlight(StandardReadable, Movable[BacklightPosition]):
     """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, EpicsDevice):
+class BimorphMirrorChannel(StandardReadable, Movable[float], 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):
+class BimorphMirror(StandardReadable, Movable[Mapping[int, float]]):
     """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):
+class HutchShutter(StandardReadable, Movable[ShutterDemand]):
     """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):
+class I10Apple2PGM(StandardReadable, Movable[float]):
     """
     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):
+class I10Apple2Pol(StandardReadable, Movable[str]):
     """
     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):
+class LinearArbitraryAngle(StandardReadable, Movable[SupportsFloat]):
     """
     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):
+class HutchConditionalShutter(StandardReadable, Movable[ShutterDemand]):
     """ 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):
+class PMACStringLaser(Device, Movable[LaserSettings]):
     """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):
+class PMACStringEncReset(Device, Movable[EncReset]):
     """Set a pmac_string to control the encoder channels in the controller."""
 
     def __init__(