dls-dodal 1.40.0__tar.gz → 1.41.0__tar.gz

dls_dodal-1.41.0/.github/scripts/check_test_durations.py

@@ -0,0 +1,30 @@
+import json
+import sys
+
+# Get report filename and threshold from command-line arguments
+REPORT_FILE = sys.argv[1] if len(sys.argv) > 1 else "report.json"
+THRESHOLD = float(sys.argv[2]) if len(sys.argv) > 2 else 1.0
+
+try:
+    with open(REPORT_FILE) as f:
+        data = json.load(f)
+except FileNotFoundError:
+    print(f"❌ Error: Report file '{REPORT_FILE}' not found.")
+    sys.exit(1)
+except json.JSONDecodeError:
+    print(f"❌ Error: Failed to parse JSON in '{REPORT_FILE}'.")
+    sys.exit(1)
+
+slow_tests = [
+    (t["nodeid"], t["call"]["duration"])
+    for t in data.get("tests", [])
+    if "call" in t and t["call"]["duration"] > THRESHOLD
+]
+
+if slow_tests:
+    print(f"❌ The following tests exceeded the {THRESHOLD:.2f}s threshold:")
+    for test, duration in slow_tests:
+        print(f" - {test}: {duration:.2f}s")
+    sys.exit(1)
+
+print("✅ All tests ran within the acceptable time limit.")

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/.github/workflows/_test.yml

@@ -50,13 +50,24 @@ jobs:
           python-version: ${{ inputs.python-version }}
           pip-install: ".[dev]"
 
-      - name: Run tests
-        run: tox -e tests
+      - name: Run unit tests
+        run: tox -e unit-report
+
+      - name: Check unit test durations
+        run: |
+          python .github/scripts/check_test_durations.py unit-report.json 1
+
+      - name: Run system tests
+        run: tox -e system-report
+
+      - name: Check system test durations
+        run: |
+          python .github/scripts/check_test_durations.py system-report.json 5
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4
         with:
           name: ${{ inputs.python-version }}/${{ inputs.runs-on }}
-          files: cov.xml
+          files: ./unit_cov.xml,./system_cov.xml
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/.gitignore

@@ -74,3 +74,7 @@ lockfiles/
 
 # pycharm project files
 .idea/
+
+
+# custom CI setup 
+report.json

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dls-dodal
-Version: 1.40.0
+Version: 1.41.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -238,6 +238,7 @@ Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"
 Requires-Dist: import-linter; extra == "dev"
+Requires-Dist: ispyb; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
 Requires-Dist: ophyd_async[sim]; extra == "dev"
@@ -245,10 +246,11 @@ Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"
 Requires-Dist: pydata-sphinx-theme>=0.12; extra == "dev"
-Requires-Dist: pyright; extra == "dev"
+Requires-Dist: pyright==1.1.394; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-json-report; extra == "dev"
 Requires-Dist: pytest-random-order; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: sphinx<7.4.6; extra == "dev"

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/pyproject.toml

@@ -45,6 +45,7 @@ dev = [
     "black",
     "diff-cover",
     "import-linter",
+    "ispyb",
     "mypy",
     # Commented out due to dependency version conflict with pydantic 1.x
     # "copier",
@@ -54,10 +55,11 @@ 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",
+    "pytest-json-report",
     "pytest-random-order",
     "ruff",
     "sphinx<7.4.6",              #  pinned due to https://github.com/sphinx-doc/sphinx/issues/12660
@@ -141,7 +143,7 @@ legacy_tox_ini = """
 [tox]
 skipsdist=True
 
-[testenv:{pre-commit,type-checking,tests,docs}]
+[testenv:{pre-commit,type-checking,tests,docs,unit-report,system-report}]
 # Don't create a virtualenv for the command, requires tox-direct plugin
 direct = True
 passenv = *
@@ -156,6 +158,8 @@ commands =
     type-checking: pyright src tests {posargs}
     pre-commit: pre-commit run --all-files --show-diff-on-failure {posargs}
     docs: sphinx-{posargs:build -E} -T docs build/html
+    unit-report: pytest -m 'not (s03 or adsim)' --cov=dodal --cov-report term --cov-report xml:unit_cov.xml --json-report --json-report-file=unit-report.json tests {posargs}
+    system-report: pytest -m 'not (s03 or adsim)' --cov=dodal --cov-report term --cov-report xml:system_cov.xml --json-report --json-report-file=system-report.json system_tests {posargs}
 """
 
 [tool.ruff]

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dls-dodal
-Version: 1.40.0
+Version: 1.41.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -238,6 +238,7 @@ Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"
 Requires-Dist: import-linter; extra == "dev"
+Requires-Dist: ispyb; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
 Requires-Dist: ophyd_async[sim]; extra == "dev"
@@ -245,10 +246,11 @@ Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"
 Requires-Dist: pydata-sphinx-theme>=0.12; extra == "dev"
-Requires-Dist: pyright; extra == "dev"
+Requires-Dist: pyright==1.1.394; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-json-report; extra == "dev"
 Requires-Dist: pytest-random-order; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: sphinx<7.4.6; extra == "dev"

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ pyproject.toml
 .github/actions/install_requirements/action.yml
 .github/pages/index.html
 .github/pages/make_switcher.py
+.github/scripts/check_test_durations.py
 .github/workflows/_check.yml
 .github/workflows/_dist.yml
 .github/workflows/_docs.yml

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/src/dls_dodal.egg-info/requires.txt

@@ -23,6 +23,7 @@ scanspec>=0.7.3
 black
 diff-cover
 import-linter
+ispyb
 mypy
 myst-parser
 ophyd_async[sim]
@@ -30,10 +31,11 @@ pipdeptree
 pre-commit
 psutil
 pydata-sphinx-theme>=0.12
-pyright
+pyright==1.1.394
 pytest
 pytest-asyncio
 pytest-cov
+pytest-json-report
 pytest-random-order
 ruff
 sphinx<7.4.6

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/src/dodal/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.40.0'
-__version_tuple__ = version_tuple = (1, 40, 0)
+__version__ = version = '1.41.0'
+__version_tuple__ = version_tuple = (1, 41, 0)

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/src/dodal/beamlines/i23.py

@@ -1,13 +1,15 @@
-from dodal.common.beamlines.beamline_utils import device_instantiation
+from dodal.common.beamlines.beamline_utils import device_factory
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
 from dodal.log import set_beamline as set_log_beamline
-from dodal.utils import get_beamline_name, get_hostname, skip_device
+from dodal.utils import BeamlinePrefix, get_beamline_name, get_hostname
 
 BL = get_beamline_name("i23")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
+PREFIX = BeamlinePrefix(BL)
+
 
 def _is_i23_machine():
     """
@@ -18,16 +20,11 @@ def _is_i23_machine():
     return hostname.startswith("i23-ws") or hostname.startswith("i23-control")
 
 
-@skip_device(lambda: not _is_i23_machine())
-def oav_pin_tip_detection(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> PinTipDetection:
+@device_factory(skip=lambda: not _is_i23_machine())
+def oav_pin_tip_detection() -> PinTipDetection:
     """Get the i23 OAV pin-tip detection device"""
 
-    return device_instantiation(
-        PinTipDetection,
+    return PinTipDetection(
+        f"{PREFIX.beamline_prefix}-DI-OAV-01:",
         "pin_tip_detection",
-        "-DI-OAV-01:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
     )

dls_dodal-1.41.0/src/dodal/beamlines/p38.py

@@ -0,0 +1,210 @@
+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 HDF5_SUFFIX
+from dodal.common.crystal_metadata import (
+    MaterialsEnum,
+    make_crystal_metadata_from_material,
+)
+from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
+from dodal.devices.focusing_mirror import FocusingMirror
+from dodal.devices.i22.dcm import DoubleCrystalMonochromator
+from dodal.devices.i22.fswitch import FSwitch
+from dodal.devices.linkam3 import Linkam3
+from dodal.devices.pressure_jump_cell import PressureJumpCell
+from dodal.devices.slits import Slits
+from dodal.devices.tetramm import TetrammDetector
+from dodal.devices.undulator import Undulator
+from dodal.devices.watsonmarlow323_pump import WatsonMarlow323Pump
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("p38")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+# Currently we must hard-code the visit, determining the visit at runtime requires
+# infrastructure that is still WIP.
+# Communication with GDA is also WIP so for now we determine an arbitrary scan number
+# locally and write the commissioning directory. The scan number is not guaranteed to
+# be unique and the data is at risk - this configuration is for testing only.
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/dls/p38/data/2024/cm37282-2/bluesky"),
+        client=LocalDirectoryServiceClient(),
+    )
+)
+
+
+@device_factory()
+def d3() -> AravisDetector:
+    return AravisDetector(
+        f"{PREFIX.beamline_prefix}-DI-DCAM-01:",
+        path_provider=get_path_provider(),
+        drv_suffix="DET:",
+        fileio_suffix=HDF5_SUFFIX,
+    )
+
+
+# Disconnected
+@device_factory(skip=True)
+def d11() -> AravisDetector:
+    return AravisDetector(
+        f"{PREFIX.beamline_prefix}-DI-DCAM-03:",
+        path_provider=get_path_provider(),
+        drv_suffix="DET:",
+        fileio_suffix=HDF5_SUFFIX,
+    )
+
+
+@device_factory()
+def d12() -> AravisDetector:
+    return AravisDetector(
+        f"{PREFIX.beamline_prefix}-DI-DCAM-04:",
+        path_provider=get_path_provider(),
+        drv_suffix="DET:",
+        fileio_suffix=HDF5_SUFFIX,
+    )
+
+
+@device_factory()
+def i0() -> TetrammDetector:
+    return TetrammDetector(
+        f"{PREFIX.beamline_prefix}-EA-XBPM-01:",
+        path_provider=get_path_provider(),
+    )
+
+
+#
+# The following devices are created as fake by default since P38 has no optics,
+# but having mock devices here means they will be reflected in downstream data
+# processing, where they may be required.
+#
+
+
+@device_factory(mock=True)
+def slits_1() -> Slits:
+    return Slits(f"{PREFIX.beamline_prefix}-AL-SLITS-01:")
+
+
+@device_factory(mock=True)
+def slits_2() -> Slits:
+    return Slits(f"{PREFIX.beamline_prefix}-AL-SLITS-02:")
+
+
+@device_factory(mock=True)
+def slits_3() -> Slits:
+    return Slits(f"{PREFIX.beamline_prefix}-AL-SLITS-03:")
+
+
+@device_factory(mock=True)
+def slits_4() -> Slits:
+    return Slits(f"{PREFIX.beamline_prefix}-AL-SLITS-04:")
+
+
+@device_factory(mock=True)
+def slits_5() -> Slits:
+    return Slits(f"{PREFIX.beamline_prefix}-AL-SLITS-05:")
+
+
+@device_factory(mock=True)
+def slits_6() -> Slits:
+    return Slits(f"{PREFIX.beamline_prefix}-AL-SLITS-06:")
+
+
+@device_factory(mock=True)
+def fswitch() -> FSwitch:
+    return FSwitch(
+        f"{PREFIX.beamline_prefix}-MO-FSWT-01:",
+        lens_geometry="paraboloid",
+        cylindrical=True,
+        lens_material="Beryllium",
+    )
+
+
+@device_factory(mock=True)
+def vfm() -> FocusingMirror:
+    return FocusingMirror(f"{PREFIX.beamline_prefix}-OP-KBM-01:VFM:")
+
+
+@device_factory(mock=True)
+def hfm() -> FocusingMirror:
+    return FocusingMirror(f"{PREFIX.beamline_prefix}-OP-KBM-01:HFM:")
+
+
+@device_factory(mock=True)
+def dcm() -> DoubleCrystalMonochromator:
+    return DoubleCrystalMonochromator(
+        temperature_prefix=f"{PREFIX.beamline_prefix}-DI-DCM-01:",
+        crystal_1_metadata=make_crystal_metadata_from_material(
+            MaterialsEnum.Si, (1, 1, 1)
+        ),
+        crystal_2_metadata=make_crystal_metadata_from_material(
+            MaterialsEnum.Si, (1, 1, 1)
+        ),
+    )
+
+
+@device_factory(mock=True)
+def undulator() -> Undulator:
+    return Undulator(
+        f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        poles=80,
+        length=2.0,
+    )
+
+
+# Must document what PandAs are physically connected to
+# See: https://github.com/bluesky/ophyd-async/issues/284
+@device_factory(skip=True)
+def panda1() -> HDFPanda:
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-EA-PANDA-01:",
+        path_provider=get_path_provider(),
+    )
+
+
+@device_factory(skip=True)
+def panda2() -> HDFPanda:
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-EA-PANDA-02:",
+        path_provider=get_path_provider(),
+    )
+
+
+@device_factory(skip=True)
+def panda3() -> HDFPanda:
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-EA-PANDA-03:",
+        path_provider=get_path_provider(),
+    )
+
+
+@device_factory(skip=True)
+def linkam() -> Linkam3:
+    return Linkam3(f"{PREFIX.beamline_prefix}-EA-LINKM-02:")
+
+
+@device_factory()
+def ppump() -> WatsonMarlow323Pump:
+    """Peristaltic Pump"""
+    return WatsonMarlow323Pump(f"{PREFIX.beamline_prefix}-EA-PUMP-01:")
+
+
+@device_factory()
+def high_pressure_xray_cell() -> PressureJumpCell:
+    return PressureJumpCell(
+        f"{PREFIX.beamline_prefix}-EA",
+        cell_prefix="-HPXC-01:",
+        adc_prefix="-ADC",
+    )

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/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.
 

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/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 pydantic import BaseModel, ConfigDict, RootModel
 
 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 @@ class SafeUndulatorMover(StandardReadable, Movable):
         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 @@ class SafeUndulatorMover(StandardReadable, Movable):
         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 @@ class SafeUndulatorMover(StandardReadable, Movable):
             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 @@ class UndulatorGap(SafeUndulatorMover):
             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 @@ class UndulatorPhaseMotor(StandardReadable):
         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 @@ class UndulatorPhaseAxes(SafeUndulatorMover):
         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.

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/src/dodal/devices/attenuator/attenuator.py

@@ -29,7 +29,7 @@ class ReadOnlyAttenuator(StandardReadable):
         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
 

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/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

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/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 @@ class BimorphMirrorChannel(StandardReadable, Movable, EpicsDevice):
         await self.output_voltage.set(value)
 
 
-class BimorphMirror(StandardReadable, Movable):
+class BimorphMirror(StandardReadable, Movable[Mapping[int, float]]):
     """Class to represent CAENels Bimorph Mirrors.
 
     Attributes:

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/src/dodal/devices/fast_grid_scan.py

@@ -200,6 +200,7 @@ class FastGridScanCommon(StandardReadable, Flyable, ABC, Generic[ParamType]):
         self.scan_invalid = epics_signal_r(float, f"{prefix}SCAN_INVALID")
 
         self.run_cmd = epics_signal_x(f"{prefix}RUN.PROC")
+        self.stop_cmd = epics_signal_x(f"{prefix}STOP.PROC")
         self.status = epics_signal_r(int, f"{prefix}SCAN_STATUS")
 
         self.expected_images = create_hardware_backed_soft_signal(
@@ -257,7 +258,15 @@ class FastGridScanCommon(StandardReadable, Flyable, ABC, Generic[ParamType]):
 
     @AsyncStatus.wrap
     async def complete(self):
-        await wait_for_value(self.status, 0, self.COMPLETE_STATUS)
+        try:
+            await wait_for_value(self.status, 0, self.COMPLETE_STATUS)
+        except asyncio.TimeoutError:
+            LOGGER.error(
+                "Hyperion timed out waiting for FGS motion to complete. This may have been caused by a goniometer stage getting stuck.\n\
+                Forcibly stopping the FGS motion program..."
+            )
+            await self.stop_cmd.trigger()
+            raise
 
     @abstractmethod
     def _create_position_counter(self, prefix: str) -> SignalRW[int]:

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/src/dodal/devices/hutch_shutter.py

@@ -55,7 +55,7 @@ class HutchInterlock(StandardReadable):
         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 \

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/src/dodal/devices/i10/i10_apple2.py

@@ -175,7 +175,7 @@ class I10Apple2(Apple2):
         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 @@ class I10Apple2PGM(StandardReadable, Movable):
         )
 
 
-class I10Apple2Pol(StandardReadable, Movable):
+class I10Apple2Pol(StandardReadable, Movable[str]):
     """
     Compound device to set polorisation of ID.
     """
@@ -240,7 +240,7 @@ class I10Apple2Pol(StandardReadable, Movable):
         )  # 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

{dls_dodal-1.40.0 → dls_dodal-1.41.0}/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 \