Fix apple2 timing out (#1709)

* fixes timeout

* fixes timeout_for_LA too

* fixes timeout_for_pol too

* lint fix

* ruff fix

* add test to stop it from happening again

* add linear arbitrary test

Author: Relm-Arrowny

src/dodal/devices/apple2_undulator.py

@@ -29,6 +29,7 @@
 T = TypeVar("T")
 
 DEFAULT_MOTOR_MIN_TIMEOUT = 10
+MAXIMUM_MOVE_TIME = 550  # There is no useful movements take longer than this.
 
 
 class UndulatorGateStatus(StrictEnum):
@@ -548,7 +549,7 @@ async def _set_pol(
     ) -> None:
         # This changes the pol setpoint and then changes polarisation via set energy.
         self._polarisation_setpoint_set(value)
-        await self.energy.set(await self.energy.get_value())
+        await self.energy.set(await self.energy.get_value(), timeout=MAXIMUM_MOVE_TIME)
 
     def _read_pol(
         self,
@@ -728,7 +729,7 @@ def __init__(self, id_controller: Apple2Controller, name: str = "") -> None:
 
     @AsyncStatus.wrap
     async def set(self, energy: float) -> None:
-        await self.energy().set(energy)
+        await self.energy().set(energy, timeout=MAXIMUM_MOVE_TIME)
 
 
 class InsertionDevicePolarisation(StandardReadable, Locatable[Pol]):
@@ -743,7 +744,7 @@ def __init__(self, id_controller: Apple2Controller, name: str = "") -> None:
 
     @AsyncStatus.wrap
     async def set(self, pol: Pol) -> None:
-        await self.polarisation().set(pol)
+        await self.polarisation().set(pol, timeout=MAXIMUM_MOVE_TIME)
 
     async def locate(self) -> Location[Pol]:
         """Return the current polarisation"""

src/dodal/devices/i10/i10_apple2.py

@@ -13,6 +13,7 @@
 )
 
 from dodal.devices.apple2_undulator import (
+    MAXIMUM_MOVE_TIME,
     Apple2,
     Apple2Controller,
     Apple2PhasesVal,
@@ -34,7 +35,6 @@
 MAXIMUM_GAP_MOTOR_POSITION = 100
 DEFAULT_JAW_PHASE_POLY_PARAMS = [1.0 / 7.5, -120.0 / 7.5]
 ALPHA_OFFSET = 180
-MAXIMUM_MOVE_TIME = 550  # There is no useful movements take longer than this.
 
 
 class I10EnergyMotorLookup(EnergyMotorLookup):
@@ -282,4 +282,4 @@ def __init__(
 
     @AsyncStatus.wrap
     async def set(self, angle: float) -> None:
-        await self.linear_arbitrary_angle().set(angle)
+        await self.linear_arbitrary_angle().set(angle, timeout=MAXIMUM_MOVE_TIME)

tests/devices/i10/test_i10_apple2.py

@@ -2,7 +2,7 @@
 import pickle
 from collections.abc import Mapping
 from unittest import mock
-from unittest.mock import MagicMock, Mock
+from unittest.mock import AsyncMock, MagicMock, Mock
 
 import pytest
 from bluesky.plans import scan
@@ -18,6 +18,7 @@
 )
 
 from dodal.devices.apple2_undulator import (
+    MAXIMUM_MOVE_TIME,
     BeamEnergy,
     EnabledDisabledUpper,
     InsertionDeviceEnergy,
@@ -303,6 +304,17 @@ async def test_fail_i10_apple2_controller_set_id_not_ready(
     )
 
 
+async def test_fail_i10_apple2_controller_set_energy_has_default(
+    mock_id_energy: InsertionDeviceEnergy,
+    mock_id_controller: I10Apple2Controller,
+):
+    mock_id_controller.energy.set = AsyncMock()
+    await mock_id_energy.set(600)
+    mock_id_controller.energy.set.assert_awaited_once_with(
+        600, timeout=MAXIMUM_MOVE_TIME
+    )
+
+
 async def test_beam_energy_re_scan(
     run_engine: RunEngine,
     run_engine_documents: Mapping[str, list[dict]],
@@ -414,6 +426,18 @@ async def test_id_polarisation_set(
         assert float(gap.call_args[0][0]) == pytest.approx(expect_gap, 0.05)
 
 
+async def test_id_polarisation_set_has_default_timeout(
+    mock_id_pol: InsertionDevicePolarisation,
+    mock_id_controller: I10Apple2Controller,
+):
+    set_mock_value(mock_id_controller._energy, 700)
+    mock_id_controller.polarisation.set = AsyncMock()
+    await mock_id_pol.set(Pol.LV)
+    mock_id_controller.polarisation.set.assert_awaited_once_with(
+        Pol.LV, timeout=MAXIMUM_MOVE_TIME
+    )
+
+
 @pytest.mark.parametrize(
     "pol,energy, top_outer, top_inner, btm_inner,btm_outer",
     [
@@ -551,6 +575,17 @@ async def test_linear_arbitrary_pol_fail_read(
     )
 
 
+async def test_linear_arbitrary_pol_set_default_timeout(
+    mock_linear_arbitrary_angle: LinearArbitraryAngle,
+    mock_id_controller: I10Apple2Controller,
+):
+    mock_id_controller.linear_arbitrary_angle.set = AsyncMock()
+    await mock_linear_arbitrary_angle.set(60)
+    mock_id_controller.linear_arbitrary_angle.set.assert_awaited_once_with(
+        60, timeout=MAXIMUM_MOVE_TIME
+    )
+
+
 @pytest.mark.parametrize(
     "poly",
     [18, -18, 12.01, -12.01],