dls-dodal 1.43.0__tar.gz → 1.44.0__tar.gz

{dls_dodal-1.43.0 → dls_dodal-1.44.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.43.0
+Version: 1.44.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
@@ -216,7 +216,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async>=0.9.0a2
+Requires-Dist: ophyd-async>=0.10.0a1
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -264,6 +264,7 @@ Requires-Dist: types-requests; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"
 Requires-Dist: types-PyYAML; extra == "dev"
 Requires-Dist: types-aiofiles; extra == "dev"
+Dynamic: license-file
 
 [![CI](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml/badge.svg)](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml)
 [![Coverage](https://codecov.io/gh/DiamondLightSource/dodal/branch/main/graph/badge.svg)](https://codecov.io/gh/DiamondLightSource/dodal)

{dls_dodal-1.43.0 → dls_dodal-1.44.0}/docs/reference/device-standards.rst

@@ -150,7 +150,7 @@ based on this and so this has the issues listed above. Instead you should make s
         def __init__(self):
             self.underlying_motor = Motor("MOTOR")
             with self.add_children_as_readables():
-                self.in_out = create_hardware_backed_soft_signal(InOut, self._get_in_out_from_hardware)
+                self.in_out = create_r_hardware_backed_soft_signal(InOut, self._get_in_out_from_hardware)
                 
         async def _get_in_out_from_hardware(self):
             current_position = await self.underlying_motor.get_value()

{dls_dodal-1.43.0 → dls_dodal-1.44.0}/pyproject.toml

@@ -15,7 +15,7 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async >= 0.9.0a2",
+    "ophyd-async>=0.10.0a1",
     "bluesky",
     "pyepics",
     "dataclasses-json",
@@ -170,23 +170,27 @@ lint.extend-ignore = [
     "F811", # support typing.overload decorator
 ]
 lint.select = [
-    "B",   # flake8-bugbear - https://docs.astral.sh/ruff/rules/#flake8-bugbear-b
-    "C4",  # flake8-comprehensions - https://docs.astral.sh/ruff/rules/#flake8-comprehensions-c4
-    "E",   # pycodestyle errors - https://docs.astral.sh/ruff/rules/#error-e
-    "F",   # pyflakes rules - https://docs.astral.sh/ruff/rules/#pyflakes-f
-    "W",   # pycodestyle warnings - https://docs.astral.sh/ruff/rules/#warning-w
-    "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/
+    "B",      # flake8-bugbear - https://docs.astral.sh/ruff/rules/#flake8-bugbear-b
+    "C4",     # flake8-comprehensions - https://docs.astral.sh/ruff/rules/#flake8-comprehensions-c4
+    "E",      # pycodestyle errors - https://docs.astral.sh/ruff/rules/#error-e
+    "F",      # pyflakes rules - https://docs.astral.sh/ruff/rules/#pyflakes-f
+    "W",      # pycodestyle warnings - https://docs.astral.sh/ruff/rules/#warning-w
+    "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/
+    "TID251", # banned api - https://docs.astral.sh/ruff/rules/banned-api/
 ]
 
 [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 and walrus operators in asserts in tests 
-"tests/**/*" = ["SLF001", "RUF018"]
-"system_tests/**/*" = ["SLF001", "RUF018"]
+# Remove this line to forbid private member access, walrus operators, banned api in asserts in tests 
+"tests/**/*" = ["SLF001", "RUF018", "TID251"]
+"system_tests/**/*" = ["SLF001", "RUF018", "TID251"]
+
+[tool.ruff.lint.flake8-tidy-imports.banned-api]
+"time.sleep".msg = "Use bps.sleep or asyncio.sleep instead. # noqa will disable this rule for that line. See https://github.com/DiamondLightSource/mx-bluesky/issues/925"
 
 [tool.importlinter]
 root_package = "dodal"

{dls_dodal-1.43.0 → dls_dodal-1.44.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.43.0
+Version: 1.44.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
@@ -216,7 +216,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async>=0.9.0a2
+Requires-Dist: ophyd-async>=0.10.0a1
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -264,6 +264,7 @@ Requires-Dist: types-requests; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"
 Requires-Dist: types-PyYAML; extra == "dev"
 Requires-Dist: types-aiofiles; extra == "dev"
+Dynamic: license-file
 
 [![CI](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml/badge.svg)](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml)
 [![Coverage](https://codecov.io/gh/DiamondLightSource/dodal/branch/main/graph/badge.svg)](https://codecov.io/gh/DiamondLightSource/dodal)

{dls_dodal-1.43.0 → dls_dodal-1.44.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -112,6 +112,7 @@ src/dodal/beamlines/training_rig.py
 src/dodal/common/__init__.py
 src/dodal/common/coordination.py
 src/dodal/common/crystal_metadata.py
+src/dodal/common/data_util.py
 src/dodal/common/maths.py
 src/dodal/common/signal_utils.py
 src/dodal/common/types.py
@@ -128,6 +129,7 @@ src/dodal/devices/aperture.py
 src/dodal/devices/aperturescatterguard.py
 src/dodal/devices/apple2_undulator.py
 src/dodal/devices/backlight.py
+src/dodal/devices/baton.py
 src/dodal/devices/bimorph_mirror.py
 src/dodal/devices/cryostream.py
 src/dodal/devices/dcm.py
@@ -181,6 +183,12 @@ src/dodal/devices/detector/det_dist_to_beam_converter.py
 src/dodal/devices/detector/det_resolution.py
 src/dodal/devices/detector/detector.py
 src/dodal/devices/detector/detector_motion.py
+src/dodal/devices/electron_analyser/__init__.py
+src/dodal/devices/electron_analyser/base_region.py
+src/dodal/devices/electron_analyser/specs/__init__.py
+src/dodal/devices/electron_analyser/specs/specs_region.py
+src/dodal/devices/electron_analyser/vgscienta/__init__.py
+src/dodal/devices/electron_analyser/vgscienta/vgscienta_region.py
 src/dodal/devices/i03/__init__.py
 src/dodal/devices/i03/beamstop.py
 src/dodal/devices/i04/transfocator.py
@@ -194,12 +202,12 @@ src/dodal/devices/i10/rasor/rasor_scaler_cards.py
 src/dodal/devices/i13_1/__init__.py
 src/dodal/devices/i13_1/merlin.py
 src/dodal/devices/i13_1/merlin_controller.py
-src/dodal/devices/i13_1/merlin_io.py
 src/dodal/devices/i18/KBMirror.py
 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/beamstop.py
 src/dodal/devices/i19/hutch_access.py
 src/dodal/devices/i19/shutter.py
 src/dodal/devices/i20_1/__init__.py
@@ -218,7 +226,6 @@ src/dodal/devices/i24/pilatus_metadata.py
 src/dodal/devices/i24/pmac.py
 src/dodal/devices/i24/vgonio.py
 src/dodal/devices/oav/__init__.py
-src/dodal/devices/oav/microns_for_zoom_levels.json
 src/dodal/devices/oav/oav_calculations.py
 src/dodal/devices/oav/oav_detector.py
 src/dodal/devices/oav/oav_parameters.py
@@ -228,7 +235,8 @@ src/dodal/devices/oav/pin_image_recognition/__init__.py
 src/dodal/devices/oav/pin_image_recognition/manual_test.py
 src/dodal/devices/oav/pin_image_recognition/utils.py
 src/dodal/devices/oav/snapshots/grid_overlay.py
-src/dodal/devices/oav/snapshots/snapshot_with_beam_centre.py
+src/dodal/devices/oav/snapshots/snapshot.py
+src/dodal/devices/oav/snapshots/snapshot_image_processing.py
 src/dodal/devices/oav/snapshots/snapshot_with_grid.py
 src/dodal/devices/p99/__init__.py
 src/dodal/devices/p99/sample_stage.py
@@ -298,6 +306,7 @@ tests/common/__init__.py
 tests/common/test_coordination.py
 tests/common/test_crystal_metadata.py
 tests/common/test_maths.py
+tests/common/test_signal_utils.py
 tests/common/test_udc_directory_provider.py
 tests/common/test_visit.py
 tests/common/beamlines/__init__.py
@@ -323,6 +332,7 @@ tests/devices/i18/test_kb_mirror.py
 tests/devices/i18/test_table.py
 tests/devices/i18/test_thor_labs_stage.py
 tests/devices/i19/__init__.py
+tests/devices/i19/test_beamstop.py
 tests/devices/i19/test_shutter.py
 tests/devices/i22/test_dcm.py
 tests/devices/i22/test_fswitch.py
@@ -337,6 +347,7 @@ tests/devices/unit_tests/test_apple2_undulator.py
 tests/devices/unit_tests/test_attenuator.py
 tests/devices/unit_tests/test_backlight.py
 tests/devices/unit_tests/test_bart_robot.py
+tests/devices/unit_tests/test_baton.py
 tests/devices/unit_tests/test_beam_converter.py
 tests/devices/unit_tests/test_beamline_undulator_to_gap_lookup_table.txt
 tests/devices/unit_tests/test_bimorph_mirror.py
@@ -353,7 +364,6 @@ tests/devices/unit_tests/test_lookup_table_2.txt
 tests/devices/unit_tests/test_odin.py
 tests/devices/unit_tests/test_pressure_jump_cell.py
 tests/devices/unit_tests/test_qbpm.py
-tests/devices/unit_tests/test_shutter.py
 tests/devices/unit_tests/test_slits.py
 tests/devices/unit_tests/test_smargon.py
 tests/devices/unit_tests/test_status.py
@@ -369,6 +379,7 @@ tests/devices/unit_tests/test_xbpm_feedback.py
 tests/devices/unit_tests/test_xspress3.py
 tests/devices/unit_tests/test_zebra.py
 tests/devices/unit_tests/test_zebra_constants_mapping.py
+tests/devices/unit_tests/test_zebra_shutter.py
 tests/devices/unit_tests/test_zocalo_interaction.py
 tests/devices/unit_tests/test_zocalo_results.py
 tests/devices/unit_tests/current_amplifier/test_femto.py
@@ -376,6 +387,9 @@ tests/devices/unit_tests/current_amplifier/test_sr570.py
 tests/devices/unit_tests/detector/test_det_dim_constants.py
 tests/devices/unit_tests/detector/test_det_resolution.py
 tests/devices/unit_tests/detector/test_detector.py
+tests/devices/unit_tests/electron_analyser/test_specs_region.py
+tests/devices/unit_tests/electron_analyser/test_vgscienta_region.py
+tests/devices/unit_tests/electron_analyser/utils.py
 tests/devices/unit_tests/i24/__init__.py
 tests/devices/unit_tests/i24/test_dual_backlight.py
 tests/devices/unit_tests/i24/test_focus_mirrors.py
@@ -389,6 +403,7 @@ tests/devices/unit_tests/oav/test_oav.py
 tests/devices/unit_tests/oav/test_oav_parameters.py
 tests/devices/unit_tests/oav/test_oav_to_redis_forwarder.py
 tests/devices/unit_tests/oav/test_oav_utils.py
+tests/devices/unit_tests/oav/test_snapshot_image_processing.py
 tests/devices/unit_tests/oav/test_snapshots.py
 tests/devices/unit_tests/oav/image_recognition/test_pin_tip_detect.py
 tests/devices/unit_tests/oav/image_recognition/test_pin_tip_detect_utils.py
@@ -425,6 +440,8 @@ tests/test_data/test_beamline_parameters.txt
 tests/test_data/test_det_dist_converter.txt
 tests/test_data/topup_long_delay.txt
 tests/test_data/topup_short_params.txt
+tests/test_data/electron_analyser/specs_sequence.seq
+tests/test_data/electron_analyser/vgscienta_sequence.seq
 tests/test_data/test_images/oav_snapshot_expected.png
 tests/test_data/test_images/oav_snapshot_test.png
 tests/unit_tests/__init__.py

{dls_dodal-1.43.0 → dls_dodal-1.44.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click
 ophyd
-ophyd-async>=0.9.0a2
+ophyd-async>=0.10.0a1
 bluesky
 pyepics
 dataclasses-json

{dls_dodal-1.43.0 → dls_dodal-1.44.0}/src/dodal/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.43.0'
-__version_tuple__ = version_tuple = (1, 43, 0)
+__version__ = version = '1.44.0'
+__version_tuple__ = version_tuple = (1, 44, 0)

{dls_dodal-1.43.0 → dls_dodal-1.44.0}/src/dodal/beamlines/b01_1.py

@@ -11,6 +11,7 @@ from dodal.common.beamlines.beamline_utils import (
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
+from dodal.devices.motors import XYZPositioner
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix
@@ -60,3 +61,10 @@ def manta() -> AravisDetector:
         drv_suffix=CAM_SUFFIX,
         fileio_suffix=HDF5_SUFFIX,
     )
+
+
+@device_factory()
+def sample_stage() -> XYZPositioner:
+    return XYZPositioner(
+        f"{PREFIX.beamline_prefix}-MO-PPMAC-01:",
+    )

{dls_dodal-1.43.0 → dls_dodal-1.44.0}/src/dodal/beamlines/i03.py

@@ -16,6 +16,7 @@ from dodal.devices.aperturescatterguard import (
 )
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
+from dodal.devices.baton import Baton
 from dodal.devices.cryostream import CryoStream
 from dodal.devices.dcm import DCM
 from dodal.devices.detector.detector_motion import DetectorMotion
@@ -436,3 +437,13 @@ def qbpm() -> QBPM:
         f"{PREFIX.beamline_prefix}-DI-QBPM-01:",
         "qbpm",
     )
+
+
+@device_factory(
+    skip=True
+)  # Skipping as not yet on the beamline, see https://jira.diamond.ac.uk/browse/I03-894
+def baton() -> Baton:
+    """Get the i03 baton device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i03, it will return the existing object.
+    """
+    return Baton(f"{PREFIX.beamline_prefix}:")

dls_dodal-1.44.0/src/dodal/beamlines/i13_1.py

@@ -0,0 +1,59 @@
+from pathlib import Path
+
+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.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
+from dodal.devices.i13_1.merlin import Merlin
+from dodal.devices.motors import XYZPositioner
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i13-1")
+PREFIX_BL13I = BeamlinePrefix(BL)  # Can't use this yet as returns BL13I
+PREFIX = "BL13J"
+set_log_beamline(BL)
+set_utils_beamline(BL)
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/dls/i13-1/data/2024/cm37257-5/tmp/"),  # latest commissioning visit
+        client=LocalDirectoryServiceClient(),
+    )
+)
+
+
+@device_factory()
+def sample_xyz_stage() -> XYZPositioner:
+    return XYZPositioner(prefix=f"{PREFIX}-MO-PI-02:")
+
+
+@device_factory()
+def sample_xyz_lab_fa_stage() -> XYZPositioner:
+    return XYZPositioner(prefix=f"{PREFIX}-MO-PI-02:FIXANG:")
+
+
+@device_factory()
+def side_camera() -> AravisDetector:
+    return AravisDetector(
+        prefix=f"{PREFIX}-OP-FLOAT-03:",
+        drv_suffix="CAM:",
+        fileio_suffix="HDF5:",
+        path_provider=get_path_provider(),
+    )
+
+
+@device_factory()
+def merlin() -> Merlin:
+    return Merlin(
+        prefix=f"{PREFIX}-EA-DET-04:",
+        name="merlin",
+        drv_suffix="CAM:",
+        fileio_suffix="HDF5:",
+        path_provider=get_path_provider(),
+    )

{dls_dodal-1.43.0 → dls_dodal-1.44.0}/src/dodal/beamlines/i19_1.py

@@ -4,7 +4,8 @@ from dodal.common.beamlines.beamline_utils import (
 from dodal.common.beamlines.beamline_utils import (
     set_beamline as set_utils_beamline,
 )
-from dodal.devices.i19.shutter import HutchConditionalShutter, HutchState
+from dodal.devices.i19.beamstop import BeamStop
+from dodal.devices.i19.shutter import AccessControlledShutter, HutchState
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVConfig
 from dodal.devices.synchrotron import Synchrotron
@@ -35,10 +36,20 @@ ZOOM_PARAMS_FILE = (
 DISPLAY_CONFIG = "/dls_sw/i19-1/software/daq_configuration/domain/display.configuration"
 
 
+# Needs to wait until enum is fixed on the beamline
+# See https://github.com/DiamondLightSource/dodal/issues/1150
+@device_factory(skip=True)
+def beamstop() -> BeamStop:
+    """Get the i19-1 beamstop device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i19-1, it will return the existing object.
+    """
+    return BeamStop(prefix=f"{PREFIX.beamline_prefix}-RS-ABSB-01:")
+
+
 @device_factory()
 def oav() -> OAV:
     return OAV(
-        prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
+        prefix=f"{PREFIX.beamline_prefix}-EA-OAV-01:",
         config=OAVConfig(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
     )
 
@@ -56,11 +67,11 @@ def zebra() -> Zebra:
 
 
 @device_factory()
-def shutter() -> HutchConditionalShutter:
-    """Get the i19-2 hutch shutter device, instantiate it if it hasn't already been.
+def shutter() -> AccessControlledShutter:
+    """Get the i19-1 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 HutchConditionalShutter(
+    return AccessControlledShutter(
         prefix=f"{PREFIX.beamline_prefix}-PS-SHTR-01:",
         hutch=HutchState.EH1,
     )

{dls_dodal-1.43.0 → dls_dodal-1.44.0}/src/dodal/beamlines/i19_2.py

@@ -4,7 +4,8 @@ from dodal.common.beamlines.beamline_utils import (
 from dodal.common.beamlines.beamline_utils import (
     set_beamline as set_utils_beamline,
 )
-from dodal.devices.i19.shutter import HutchConditionalShutter, HutchState
+from dodal.devices.i19.beamstop import BeamStop
+from dodal.devices.i19.shutter import AccessControlledShutter, HutchState
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.zebra.zebra import Zebra
 from dodal.devices.zebra.zebra_constants_mapping import (
@@ -30,6 +31,14 @@ I19_2_ZEBRA_MAPPING = ZebraMapping(
 )
 
 
+@device_factory()
+def beamstop() -> BeamStop:
+    """Get the i19-2 beamstop device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i19-2, it will return the existing object.
+    """
+    return BeamStop(prefix=f"{PREFIX.beamline_prefix}-OP-ABSB-02:")
+
+
 @device_factory()
 def zebra() -> Zebra:
     """Get the i19-2 zebra device, instantiate it if it hasn't already been.
@@ -43,11 +52,11 @@ def zebra() -> Zebra:
 
 
 @device_factory()
-def shutter() -> HutchConditionalShutter:
+def shutter() -> AccessControlledShutter:
     """Get the i19-2 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 HutchConditionalShutter(
+    return AccessControlledShutter(
         prefix=f"{PREFIX.beamline_prefix}-PS-SHTR-01:",
         hutch=HutchState.EH2,
     )

{dls_dodal-1.43.0 → dls_dodal-1.44.0}/src/dodal/beamlines/i19_optics.py

@@ -5,7 +5,7 @@ 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.devices.i19.hutch_access import ACCESS_DEVICE_NAME, HutchAccessControl
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix
 
@@ -31,4 +31,6 @@ 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")
+    return HutchAccessControl(
+        f"{PREFIX.beamline_prefix}-OP-STAT-01:", ACCESS_DEVICE_NAME
+    )

dls_dodal-1.44.0/src/dodal/common/data_util.py

@@ -0,0 +1,20 @@
+from typing import TypeVar
+
+from pydantic import BaseModel
+
+TBaseModel = TypeVar("TBaseModel", bound=BaseModel)
+
+
+def load_json_file_to_class(
+    t: type[TBaseModel],
+    file: str,
+) -> TBaseModel:
+    with open(file) as f:
+        json_obj = f.read()
+    cls = t.model_validate_json(json_obj)
+    return cls
+
+
+def save_class_to_json_file(model: BaseModel, file: str) -> None:
+    with open(file, "w") as f:
+        f.write(model.model_dump_json())

dls_dodal-1.44.0/src/dodal/common/signal_utils.py

@@ -0,0 +1,88 @@
+from collections.abc import Callable, Coroutine
+from typing import Any
+
+from bluesky.protocols import Reading
+from ophyd_async.core import SignalDatatypeT, SignalR, SignalRW, SoftSignalBackend
+
+SetHardwareType = Callable[[SignalDatatypeT], Coroutine[Any, Any, None]]
+
+
+class HardwareBackedSoftSignalBackend(SoftSignalBackend[SignalDatatypeT]):
+    def __init__(
+        self,
+        get_from_hardware_func: Callable[[], Coroutine[Any, Any, SignalDatatypeT]],
+        set_to_hardware_func: SetHardwareType | None = None,
+        *args,
+        **kwargs,
+    ) -> None:
+        self.get_from_hardware_func = get_from_hardware_func
+        self.set_to_hardware_func = set_to_hardware_func
+        super().__init__(*args, **kwargs)
+
+    async def _update_value(self):
+        new_value = await self.get_from_hardware_func()
+        self.set_value(new_value)
+
+    async def get_reading(self) -> Reading:
+        await self._update_value()
+        return await super().get_reading()
+
+    async def get_value(self) -> SignalDatatypeT:
+        await self._update_value()
+        return await super().get_value()
+
+    async def put(self, value: SignalDatatypeT | None, wait: bool) -> None:
+        if self.set_to_hardware_func:
+            write_value = self.initial_value if value is None else value
+            await self.set_to_hardware_func(write_value)
+
+
+def create_rw_hardware_backed_soft_signal(
+    datatype: type[SignalDatatypeT],
+    get_from_hardware_func: Callable[[], Coroutine[Any, Any, SignalDatatypeT]],
+    set_to_hardware_func: SetHardwareType,
+    units: str | None = None,
+    precision: int | None = None,
+):
+    """Creates a soft signal that, when read will call the function passed into
+    `get_from_hardware_func` and return this. When set it will call `set_to_hardware_func`
+    and send something to the hardware.
+
+    This will allow you to make soft signals derived from arbitrary hardware signals.
+    However, calling subscribe on this signal does not give you a sensible value. See https://github.com/bluesky/ophyd-async/issues/525
+    for a more full solution.
+    """
+    return SignalRW(
+        backend=HardwareBackedSoftSignalBackend(
+            get_from_hardware_func,
+            set_to_hardware_func,
+            datatype,
+            units=units,
+            precision=precision,
+        )
+    )
+
+
+def create_r_hardware_backed_soft_signal(
+    datatype: type[SignalDatatypeT],
+    get_from_hardware_func: Callable[[], Coroutine[Any, Any, SignalDatatypeT]],
+    units: str | None = None,
+    precision: int | None = None,
+):
+    """Creates a soft signal that, when read will call the function passed into
+    `get_from_hardware_func` and return this.
+
+    This will allow you to make soft signals derived from arbitrary hardware signals.
+    However, calling subscribe on this signal does not give you a sensible value and
+    the signal is currently read only. See https://github.com/bluesky/ophyd-async/issues/525
+    for a more full solution.
+    """
+    return SignalR(
+        backend=HardwareBackedSoftSignalBackend(
+            get_from_hardware_func,
+            None,
+            datatype,
+            units=units,
+            precision=precision,
+        )
+    )

{dls_dodal-1.43.0 → dls_dodal-1.44.0}/src/dodal/devices/aperturescatterguard.py

@@ -12,7 +12,7 @@ from ophyd_async.core import (
 from pydantic import BaseModel, Field
 
 from dodal.common.beamlines.beamline_parameters import GDABeamlineParameters
-from dodal.common.signal_utils import create_hardware_backed_soft_signal
+from dodal.common.signal_utils import create_r_hardware_backed_soft_signal
 from dodal.devices.aperture import Aperture
 from dodal.devices.scatterguard import Scatterguard
 
@@ -164,7 +164,7 @@ class ApertureScatterguard(StandardReadable, Movable[ApertureValue], Preparable)
     ) -> None:
         self.aperture = Aperture(prefix + "-MO-MAPT-01:")
         self.scatterguard = Scatterguard(prefix + "-MO-SCAT-01:")
-        self.radius = create_hardware_backed_soft_signal(
+        self.radius = create_r_hardware_backed_soft_signal(
             float, self._get_current_radius, units="µm"
         )
         self._loaded_positions = loaded_positions
@@ -181,7 +181,7 @@ class ApertureScatterguard(StandardReadable, Movable[ApertureValue], Preparable)
         )
 
         with self.add_children_as_readables(StandardReadableFormat.HINTED_SIGNAL):
-            self.selected_aperture = create_hardware_backed_soft_signal(
+            self.selected_aperture = create_r_hardware_backed_soft_signal(
                 ApertureValue, self._get_current_aperture_position
             )
 

dls_dodal-1.44.0/src/dodal/devices/baton.py

@@ -0,0 +1,17 @@
+from typing import Annotated as A
+
+from ophyd_async.core import (
+    SignalRW,
+    StandardReadable,
+)
+from ophyd_async.core import StandardReadableFormat as Format
+from ophyd_async.epics.core import EpicsDevice, PvSuffix
+
+
+class Baton(StandardReadable, EpicsDevice):
+    requested_user: A[
+        SignalRW[str], PvSuffix("REQUESTED_USER"), Format.HINTED_UNCACHED_SIGNAL
+    ]
+    current_user: A[
+        SignalRW[str], PvSuffix("CURRENT_USER"), Format.HINTED_UNCACHED_SIGNAL
+    ]

{dls_dodal-1.43.0 → dls_dodal-1.44.0}/src/dodal/devices/current_amplifiers/current_amplifier.py

@@ -23,7 +23,6 @@ class CurrentAmp(ABC, StandardReadable, Movable):
         super().__init__(name)
 
     @abstractmethod
-    @AsyncStatus.wrap
     async def increase_gain(self, value: int = 1) -> None:
         """Increase gain, increment by 1 by default.
 
@@ -31,7 +30,6 @@ class CurrentAmp(ABC, StandardReadable, Movable):
             bool: True if success.
         """
 
-    @AsyncStatus.wrap
     @abstractmethod
     async def decrease_gain(self, value: int = 1) -> None:
         """Decrease gain, decrement by 1 by default.
@@ -40,21 +38,18 @@ class CurrentAmp(ABC, StandardReadable, Movable):
             bool: True if success.
         """
 
-    @AsyncStatus.wrap
     @abstractmethod
-    async def get_gain(self) -> type[Enum]:
+    async def get_gain(self) -> Enum:
         """Get the current gain setting
 
         Returns:
             Enum: The member name of the current gain setting in gain_conversion_table.
         """
 
-    @AsyncStatus.wrap
     @abstractmethod
     async def get_upperlimit(self) -> float:
         """Get the upper limit of the current amplifier"""
 
-    @AsyncStatus.wrap
     @abstractmethod
     async def get_lowerlimit(self) -> float:
         """Get the lower limit of the current amplifier"""