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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dls-dodal
-Version: 1.41.0
+Version: 1.42.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
@@ -217,7 +217,7 @@ License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
 Requires-Dist: ophyd-async>=0.9.0a2
-Requires-Dist: bluesky
+Requires-Dist: bluesky==1.13.0
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
 Requires-Dist: pillow
@@ -246,7 +246,7 @@ 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==1.1.394; extra == "dev"
+Requires-Dist: pyright; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

{dls_dodal-1.41.0 → dls_dodal-1.42.0}/docs/how-to/create-beamline.rst

@@ -7,7 +7,7 @@ They include motors in the experiment hutch, optical components in the optics hu
 Beamline Modules
 ----------------
 
-Each beamline should have its own file in the ``doodal.beamlines`` folder, in which the particular devices for the 
+Each beamline should have its own file in the ``dodal.beamlines`` folder, in which the particular devices for the 
 beamline are instantiated. The file should be named after the colloquial name for the beamline. For example:
 
 * ``i03.py``
@@ -25,55 +25,67 @@ The following example creates a fictitious beamline ``w41``, with a simulated tw
 
 .. code-block:: python
 
-    from dodal.common.beamlines.beamline_utils import device_instantiation
+    from ophyd_async.epics.adaravis import AravisDetector
+
+    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.devices.areadetector.adaravis import AdAravisDetector
+    from dodal.common.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
+    from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
     from dodal.devices.synchrotron import Synchrotron
     from dodal.log import set_beamline as set_log_beamline
-    from dodal.utils import get_beamline_name, skip_device
+    from dodal.utils import BeamlinePrefix
 
     BL = get_beamline_name("s41")  # Default used when not on a live beamline
+    PREFIX = BeamlinePrefix(BL)
     set_log_beamline(BL)  # Configure logging and util functions
     set_utils_beamline(BL)
 
+    # Currently we must hard-code the visit, determining the visit is WIP.
+    set_path_provider(
+        StaticVisitPathProvider(
+            BL,
+            # Root directory for all detectors
+            Path("/dls/w41/data/YYYY/cm12345-1"),
+            # Uses an existing GDA server to ensure filename uniqueness
+            client=RemoteDirectoryServiceClient("http://s41-control:8088/api"),
+            # Else if no GDA server use a LocalDirectoryServiceClient(),
+        )
+    )
 
     """
     Define device factory functions below this point.
-    A device factory function is any function that has a return type which conforms 
+    A device factory function is any function that has a return type which conforms
     to one or more Bluesky Protocols.
     """
 
-
     """
-    A valid factory function which is:
-    - instantiated only on the live beamline
-    - a maximum of once
-    - can optionally be faked with ophyd simulated axes
-    - can optionally be connected concurrently by not waiting for connect to complete
-    - if constructor took a prefix, could optionally exclude the BLIXX prefix
+    A valid factory function which:
+    - may be instantiated automatically, selectively on live beamline
+        - caches and re-uses the result for subsequent calls
+    - automatically names the device
+    - may be skipped when make_all_devices is called on this module
+    - must be explicitly connected (may be automated by tools)
+        - when connected may connect to a simulated backend
+        - may be connected concurrently (when automated by tools)
     """"
-    @skip_device(lambda: BL == "s41")  # Conditionally do not instantiate this device
-    def synchrotron(
-        wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-    ) -> Synchrotron:
-        """Calls the Synchrotron class's constructor with name="synchrotron", prefix=""
-        If this is called when already instantiated, it will return the existing object.
-        """
-        return device_instantiation(
-            Synchrotron,
-            "synchrotron",
-            "",
-            wait_for_connection,
-            fake_with_ophyd_sim,
-            bl_prefix=False,
+    @device_factory(skip = BL == "s41")
+    def synchrotron() -> Synchrotron:
+        return Synchrotron()
+
+
+    @device_factory()
+    def d11() -> AravisDetector:
+        return AravisDetector(
+            f"{PREFIX.beamline_prefix}-DI-DCAM-01:",
+            path_provider=get_path_provider(),
+            drv_suffix=CAM_SUFFIX,
+            fileio_suffix=HDF5_SUFFIX,
         )
 
-    def d11(name: str = "D11") -> AdAravisDetector:
-        """
-        Also a valid Device factory function, but as multiple calls would instantiate
-        multiple copies of a device, discouraged.
-        """
-        return AdAravisDetector(name=name, prefix=f"{BL}-DI-DCAM-01:")
 
 ``w41`` should also be added to the list of ``ALL_BEAMLINES`` in ``tests/beamlines/test_device_instantiation``.
 This test checks that the function returns a type that conforms to Bluesky protocols, 

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

@@ -16,7 +16,7 @@ dependencies = [
     "click",
     "ophyd",
     "ophyd-async >= 0.9.0a2",
-    "bluesky",
+    "bluesky == 1.13.0",
     "pyepics",
     "dataclasses-json",
     "pillow",
@@ -55,7 +55,7 @@ dev = [
     "pre-commit",
     "psutil",
     "pydata-sphinx-theme>=0.12",
-    "pyright==1.1.394",          # See https://github.com/DiamondLightSource/dodal/issues/1079
+    "pyright",
     "pytest",
     "pytest-asyncio",
     "pytest-cov",
@@ -178,14 +178,15 @@ lint.select = [
     "I",   # isort - https://docs.astral.sh/ruff/rules/#isort-i
     "UP",  # pyupgrade - https://docs.astral.sh/ruff/rules/#pyupgrade-up
     "SLF", # self - https://docs.astral.sh/ruff/settings/#lintflake8-self
+    "RUF018" # walrus operators in asserts - https://docs.astral.sh/ruff/rules/assignment-in-assert/
 ]
 
 [tool.ruff.lint.per-file-ignores]
 # By default, private member access is allowed in tests
 # See https://github.com/DiamondLightSource/python-copier-template/issues/154
-# Remove this line to forbid private member access in tests
-"tests/**/*" = ["SLF001"]
-"system_tests/**/*" = ["SLF001"]
+# Remove this line to forbid private member access and walrus operators in asserts in tests 
+"tests/**/*" = ["SLF001", "RUF018"]
+"system_tests/**/*" = ["SLF001", "RUF018"]
 
 [tool.importlinter]
 root_package = "dodal"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dls-dodal
-Version: 1.41.0
+Version: 1.42.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
@@ -217,7 +217,7 @@ License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
 Requires-Dist: ophyd-async>=0.9.0a2
-Requires-Dist: bluesky
+Requires-Dist: bluesky==1.13.0
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
 Requires-Dist: pillow
@@ -246,7 +246,7 @@ 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==1.1.394; extra == "dev"
+Requires-Dist: pyright; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

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

@@ -90,6 +90,7 @@ src/dodal/beamline_specific_utils/i03.py
 src/dodal/beamlines/README.md
 src/dodal/beamlines/__init__.py
 src/dodal/beamlines/adsim.py
+src/dodal/beamlines/aithre.py
 src/dodal/beamlines/b01_1.py
 src/dodal/beamlines/i02_1.py
 src/dodal/beamlines/i03.py
@@ -99,6 +100,7 @@ src/dodal/beamlines/i13_1.py
 src/dodal/beamlines/i18.py
 src/dodal/beamlines/i19_1.py
 src/dodal/beamlines/i19_2.py
+src/dodal/beamlines/i19_optics.py
 src/dodal/beamlines/i20_1.py
 src/dodal/beamlines/i22.py
 src/dodal/beamlines/i23.py
@@ -161,6 +163,7 @@ src/dodal/devices/undulator_dcm.py
 src/dodal/devices/watsonmarlow323_pump.py
 src/dodal/devices/webcam.py
 src/dodal/devices/xbpm_feedback.py
+src/dodal/devices/aithre_lasershaping/goniometer.py
 src/dodal/devices/areadetector/plugins/CAM.py
 src/dodal/devices/areadetector/plugins/MJPG.py
 src/dodal/devices/attenuator/attenuator.py
@@ -197,6 +200,7 @@ src/dodal/devices/i18/diode.py
 src/dodal/devices/i18/table.py
 src/dodal/devices/i18/thor_labs_stage.py
 src/dodal/devices/i19/__init__.py
+src/dodal/devices/i19/hutch_access.py
 src/dodal/devices/i19/shutter.py
 src/dodal/devices/i20_1/__init__.py
 src/dodal/devices/i22/dcm.py
@@ -255,7 +259,10 @@ src/dodal/plan_stubs/wrapped.py
 src/dodal/plans/__init__.py
 src/dodal/plans/save_panda.py
 src/dodal/plans/scanspec.py
+src/dodal/plans/verify_undulator_gap.py
 src/dodal/plans/wrapped.py
+src/dodal/plans/preprocessors/__init__.py
+src/dodal/plans/preprocessors/verify_undulator_gap.py
 system_tests/__init__.py
 system_tests/test_adsim.py
 system_tests/test_aperturescatterguard_system.py
@@ -272,6 +279,7 @@ system_tests/test_zebra_system.py
 system_tests/test_zocalo_results.py
 tests/__init__.py
 tests/conftest.py
+tests/constants.py
 tests/fake_beamline.py
 tests/fake_beamline_all_devices_raise_exception.py
 tests/fake_beamline_broken_dependency.py
@@ -403,7 +411,9 @@ tests/plan_stubs/test_wrapped_stubs.py
 tests/plans/conftest.py
 tests/plans/test_compliance.py
 tests/plans/test_scanspec.py
+tests/plans/test_verify_undulator_gap_plan.py
 tests/plans/test_wrapped.py
+tests/plans/test_preprocessors/test_verify_undulator_gap.py
 tests/preprocessors/test_filesystem_metadata.py
 tests/test_data/bad_beamlineParameters
 tests/test_data/i04_beamlineParameters

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

@@ -1,7 +1,7 @@
 click
 ophyd
 ophyd-async>=0.9.0a2
-bluesky
+bluesky==1.13.0
 pyepics
 dataclasses-json
 pillow
@@ -31,7 +31,7 @@ pipdeptree
 pre-commit
 psutil
 pydata-sphinx-theme>=0.12
-pyright==1.1.394
+pyright
 pytest
 pytest-asyncio
 pytest-cov

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

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.41.0'
-__version_tuple__ = version_tuple = (1, 41, 0)
+__version__ = version = '1.42.0'
+__version_tuple__ = version_tuple = (1, 42, 0)

{dls_dodal-1.41.0 → dls_dodal-1.42.0}/src/dodal/beamlines/__init__.py

@@ -13,6 +13,7 @@ _BEAMLINE_NAME_OVERRIDES = {
     "i20-1": "i20_1",
     "i19-1": "i19_1",
     "i19-2": "i19_2",
+    "i19-optics": "i19_optics",
     "s03": "i03",
     "p46": "training_rig",
     "p47": "training_rig",

{dls_dodal-1.41.0 → dls_dodal-1.42.0}/src/dodal/beamlines/adsim.py

@@ -40,7 +40,7 @@ https://epics-containers.github.io/main/tutorials/launch_example.html
 And ensure that the signals are visible:
 
 ```sh
-export EPICS_CA_ADDR_LIST=127.0.0.1
+export EPICS_CA_ADDR_LIST=127.0.0.1:5094
 ```
 
 How to use the devices in a plan:

dls_dodal-1.42.0/src/dodal/beamlines/aithre.py

@@ -0,0 +1,9 @@
+from dodal.common.beamlines.beamline_utils import device_factory
+from dodal.devices.aithre_lasershaping.goniometer import Goniometer
+
+PREFIX = "LA18L"
+
+
+@device_factory()
+def goniometer() -> Goniometer:
+    return Goniometer(f"{PREFIX}-MO-LSR-01:", "goniometer")

{dls_dodal-1.41.0 → dls_dodal-1.42.0}/src/dodal/beamlines/i04.py

@@ -46,7 +46,7 @@ ZOOM_PARAMS_FILE = (
 DISPLAY_CONFIG = "/dls_sw/i04/software/gda_versions/var/display.configuration"
 DAQ_CONFIGURATION_PATH = "/dls_sw/i04/software/daq_configuration"
 
-REDIS_HOST = os.environ.get("VALKEY_PROD_SVC_SERVICE_HOST", "test_redis")
+REDIS_HOST = "i04-valkey-murko.diamond.ac.uk"
 REDIS_PASSWORD = os.environ.get("VALKEY_PASSWORD", "test_redis_password")
 MURKO_REDIS_DB = 7
 

dls_dodal-1.42.0/src/dodal/beamlines/i19_optics.py

@@ -0,0 +1,34 @@
+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.hutch_shutter import HutchShutter
+from dodal.devices.i19.hutch_access import HutchAccessControl
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix
+
+BL = "i19-optics"
+PREFIX = BeamlinePrefix("i19", "I")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def shutter() -> HutchShutter:
+    """Get the i19 hutch shutter device, instantiate it if it hasn't already been.
+    If this is called when already instantiated, it will return the existing object.
+    """
+    return HutchShutter(
+        f"{PREFIX.beamline_prefix}-PS-SHTR-01:",
+        "shutter",
+    )
+
+
+@device_factory()
+def access_control() -> HutchAccessControl:
+    """Get a device that checks the active hutch for i19, instantiate it if it hasn't already been.
+    If this is called when already instantiated, it will return the existing object.
+    """
+    return HutchAccessControl(f"{PREFIX.beamline_prefix}-OP-STAT-01:", "access_control")

dls_dodal-1.42.0/src/dodal/beamlines/p45.py

@@ -0,0 +1,78 @@
+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 DET_SUFFIX, HDF5_SUFFIX
+from dodal.common.visit import StaticVisitPathProvider
+from dodal.devices.p45 import Choppers, TomoStageWithStretchAndSkew
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("p45")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/data/2024/cm37283-2/"),  # latest commissioning visit
+    )
+)
+
+
+@device_factory()
+def sample() -> TomoStageWithStretchAndSkew:
+    return TomoStageWithStretchAndSkew(f"{PREFIX.beamline_prefix}-MO-STAGE-01:")
+
+
+@device_factory()
+def choppers() -> Choppers:
+    return Choppers(f"{PREFIX.beamline_prefix}-MO-CHOP-01:")
+
+
+# Disconnected
+@device_factory(skip=True)
+def det() -> AravisDetector:
+    return AravisDetector(
+        f"{PREFIX.beamline_prefix}-EA-MAP-01:",
+        path_provider=get_path_provider(),
+        drv_suffix=DET_SUFFIX,
+        fileio_suffix=HDF5_SUFFIX,
+    )
+
+
+# Disconnected
+@device_factory(skip=True)
+def diff() -> AravisDetector:
+    return AravisDetector(
+        f"{PREFIX.beamline_prefix}-EA-DIFF-01:",
+        path_provider=get_path_provider(),
+        drv_suffix=DET_SUFFIX,
+        fileio_suffix=HDF5_SUFFIX,
+    )
+
+
+# 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}-MO-PANDA-01:",
+        path_provider=get_path_provider(),
+    )
+
+
+@device_factory(skip=True)
+def panda2() -> HDFPanda:
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-MO-PANDA-02:",
+        path_provider=get_path_provider(),
+    )

{dls_dodal-1.41.0 → dls_dodal-1.42.0}/src/dodal/common/visit.py

@@ -78,7 +78,7 @@ class RemoteDirectoryServiceClient(DirectoryServiceClient):
         ):
             response.raise_for_status()
             json = await response.json()
-            return DataCollectionIdentifier.model_validate_json(json)
+            return DataCollectionIdentifier.model_validate(json)
 
 
 class LocalDirectoryServiceClient(DirectoryServiceClient):

dls_dodal-1.42.0/src/dodal/devices/aithre_lasershaping/goniometer.py

@@ -0,0 +1,15 @@
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.motor import Motor
+
+
+class Goniometer(StandardReadable):
+    """Goniometer and the stages it sits on"""
+
+    def __init__(self, prefix: str, name: str = "") -> None:
+        self.x = Motor(prefix + "X")
+        self.y = Motor(prefix + "Y")
+        self.z = Motor(prefix + "Z")
+        self.sampy = Motor(prefix + "SAMPY")
+        self.sampz = Motor(prefix + "SAMPZ")
+        self.omega = Motor(prefix + "OMEGA")
+        super().__init__(name)

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

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

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

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

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

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

{dls_dodal-1.41.0 → dls_dodal-1.42.0}/src/dodal/devices/detector/detector.py

@@ -32,7 +32,7 @@ class DetectorParams(BaseModel):
     # Must use model_dump(by_alias=True) if serialising!
 
     expected_energy_ev: float | None = None
-    exposure_time: float
+    exposure_time_s: float
     directory: str  # : Path https://github.com/DiamondLightSource/dodal/issues/774
     prefix: str
     detector_distance: float

{dls_dodal-1.41.0 → dls_dodal-1.42.0}/src/dodal/devices/eiger.py

@@ -221,11 +221,11 @@ class EigerDetector(Device, Stageable):
     def set_cam_pvs(self) -> AndStatus:
         assert self.detector_params is not None
         status = self.cam.acquire_time.set(
-            self.detector_params.exposure_time,
+            self.detector_params.exposure_time_s,
             timeout=self.timeouts.general_status_timeout,
         )
         status &= self.cam.acquire_period.set(
-            self.detector_params.exposure_time,
+            self.detector_params.exposure_time_s,
             timeout=self.timeouts.general_status_timeout,
         )
         status &= self.cam.num_exposures.set(

{dls_dodal-1.41.0 → dls_dodal-1.42.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[ShutterDemand]):
+class HutchShutter(StandardReadable, Movable):
     """Device to operate the hutch shutter.
 
     When a demand is sent, the device should first check the hutch status \

{dls_dodal-1.41.0 → dls_dodal-1.42.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[float]):
+class I10Apple2PGM(StandardReadable, Movable):
     """
     Compound device to set both ID and PGM energy at the sample time,poly_deg
 
@@ -211,7 +211,7 @@ class I10Apple2PGM(StandardReadable, Movable[float]):
         )
 
 
-class I10Apple2Pol(StandardReadable, Movable[str]):
+class I10Apple2Pol(StandardReadable, Movable):
     """
     Compound device to set polorisation of ID.
     """
@@ -240,7 +240,7 @@ class I10Apple2Pol(StandardReadable, Movable[str]):
         )  # 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