dls-dodal 1.40.0__py3-none-any.whl → 1.42.0__py3-none-any.whl

{dls_dodal-1.40.0.dist-info → dls_dodal-1.42.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dls-dodal
-Version: 1.40.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
@@ -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"
@@ -249,6 +250,7 @@ Requires-Dist: pyright; 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.dist-info → dls_dodal-1.42.0.dist-info}/RECORD

@@ -1,29 +1,31 @@
 dodal/__init__.py,sha256=Ksms_WJF8LTkbm38gEpm1jBpGqcQ8NGvmb2ZJlOE1j8,198
 dodal/__main__.py,sha256=kP2S2RPitnOWpNGokjZ1Yq-1umOtp5sNOZk2B3tBPLM,111
-dodal/_version.py,sha256=OZahUNEA3xgbZje9FKlSoVRqeVZRytC_0_3XfHXmWYo,413
+dodal/_version.py,sha256=ovREbwPKWGv5kafSj2cj_y_IxXNlgemp5GRlT3e-7yQ,513
 dodal/cli.py,sha256=NieWNUgLUxyck1rHoFAPJjX1xXLzHNdQ-s4wvxYFfps,3757
 dodal/log.py,sha256=ry8WMq1S4WMIAPqtqGeKuegMRN7Jy3qdVTJlkpKXkL8,9503
-dodal/utils.py,sha256=2Qh0jItUUsOCJhVaM6Sm6nIKXGL5DNQ5hg8XO1fg_Bc,19868
+dodal/utils.py,sha256=nZ_gilv1KErYKnTmknFYaE-JnCC-RxZWQ975cchklFA,19790
 dodal/beamline_specific_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/beamline_specific_utils/i03.py,sha256=P6Ls4FoVtcacH0RJM3v6ZwwGx27oMppcBdW0la-ohTY,377
 dodal/beamlines/README.md,sha256=K9MkL_GomxlsoTB7Mz-_dJA5NNSbmCfMiutchGg3C8o,404
-dodal/beamlines/__init__.py,sha256=VJOFt2N6Ge-kvKzpiGee8so2Qs1BLO4k7SYFaF3lG8U,3118
-dodal/beamlines/adsim.py,sha256=_LMMjPou7r-T8Jt9ZSj2SGFLuDUju_WNtF5ID6xiZJU,1925
+dodal/beamlines/__init__.py,sha256=dTmVSfeEVUHgxOTQO94lbQQiJHfFcvK2RAwVeTpCqxo,3150
+dodal/beamlines/adsim.py,sha256=uOmFYZIGyput93XHk9R5ydZdxnTrS_wA2zSEm62UCVU,1930
+dodal/beamlines/aithre.py,sha256=1q7zeMYunOBIWCm203NIkCl5tgVl_-jMWc0f5af-W_E,263
 dodal/beamlines/b01_1.py,sha256=-NYuJv6FhOgJvNYqDtpYb5HucI5_0HS4uDphRXUWzl4,1807
 dodal/beamlines/i02_1.py,sha256=d2IyqFMgeaSEyZYm7GMSjTKr7_02SakyC_oARx-XwnY,1204
 dodal/beamlines/i03.py,sha256=q0dMF0W44kCNXiXOUENaUv3nmAfxyOSr5C1zPonCbvk,14856
-dodal/beamlines/i04.py,sha256=IwZOnRPL1PC0Oe8m_L4xwXVW2IYJBo0wSbADLWBupyg,12128
+dodal/beamlines/i04.py,sha256=V0fgXfEJnkh0spDXelK6zwjFChN6VaV9_CtrxJLZx2E,12100
 dodal/beamlines/i10.py,sha256=lkn_xg0pt-vFuWkUGyl62A0xT-Rzs71JztJ1EeQkMi0,11487
 dodal/beamlines/i13_1.py,sha256=EgnBzsJ55BmsBtq2sDHD6pKnWZsqqAtL0ZM-JP908zE,2467
 dodal/beamlines/i18.py,sha256=Y5qLniqUkbYHcGGLPdBbiMILQHonPT2oz5M1hKMGqzs,3434
 dodal/beamlines/i19_1.py,sha256=I5vz64UsVUkDDT7itdpGVFuYq8zkmPECB0rCbCVUkAY,2325
 dodal/beamlines/i19_2.py,sha256=DihbYZ27rCdF7fvBclyhZ6Rf0YRSs2rc7hmDNtEr6cA,1939
+dodal/beamlines/i19_optics.py,sha256=TAl2ZNVveRGSbdxRjZC_vW8XFrCZlFB648Bkz7g-8oM,1148
 dodal/beamlines/i20_1.py,sha256=7ZZhPfjjKAhGjdXOI6mu2FPbMbsSjFHJOPa1toZRa0U,1725
 dodal/beamlines/i22.py,sha256=XCAVBkZxN9cmxfpGoWaCvo77lu8hVIJ_e3BUc_qxdu0,7664
-dodal/beamlines/i23.py,sha256=2j5qLoqE_hg9ETHqNkOVu7LLkVB8qalgXeORnVYKN_I,1075
+dodal/beamlines/i23.py,sha256=Qnu3Rk9gb2BD3YolMqUXiupt0ehxw5rVnfPJXBWFoCU,973
 dodal/beamlines/i24.py,sha256=9rBQMCWGdKiRnFbcVvmjiBWiC9WJIJCtLh5m6LkHUtU,7096
-dodal/beamlines/p38.py,sha256=hz-njuiP82LpsTlG0s9dy-CCszJtVmJNzy3bCWLAjE0,8772
-dodal/beamlines/p45.py,sha256=0mQ_AEURczc7yzfJzR9QK9i-b6rBGIjGZ4xCIdLNfdI,3031
+dodal/beamlines/p38.py,sha256=MwxBqYe_rUIj-MCRIFZpHJmR0JtA22bSFKfBpoDI9P0,5777
+dodal/beamlines/p45.py,sha256=2snO895TGwf4LbNIvg4BkvAGSfvZcevdpv_82MRpXKo,2129
 dodal/beamlines/p99.py,sha256=k24QhYpoOHBd0188Fu3wvmpT6dsu8okiIVqVVckdBkw,1063
 dodal/beamlines/training_rig.py,sha256=8u1TulTFgvu28sfo6vFY-uo_VBAYKT66ENXTqegw3y0,1940
 dodal/common/__init__.py,sha256=ZC4ICKUDB0BDxRaVy8nmqclVmDBne-dPtk6UJsoFq6I,258
@@ -33,7 +35,7 @@ dodal/common/maths.py,sha256=K9x7iL3xXLtWYTV-xlFHDNSTIL9a2UP3Ws7wr6Dm2rQ,1803
 dodal/common/signal_utils.py,sha256=-p4h7xtGPp13t6HTjgFGcs5nN22kVArlkfCPVjpLuRU,1728
 dodal/common/types.py,sha256=fkL7UOwDbe3v2_VJ5f1W5RxR98Wx-Ra-LxUZWkNDtls,486
 dodal/common/udc_directory_provider.py,sha256=v5OBaCUwjtQZAsRQUw6LlVL58UvwwDO1l2MKlilXjdk,2403
-dodal/common/visit.py,sha256=2UbbCmgOjZWSCxFzE9RYiTJhA_IoVOegma-Jv-PJqps,5787
+dodal/common/visit.py,sha256=BLpr3GrP7Ij95V135hRJLgg7gWtBKXVxyOibWtcO8RE,5782
 dodal/common/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/common/beamlines/beamline_parameters.py,sha256=oIPHooqu5vTAwfqZutsKbzwdi9nvFF8568Mz7jrK5rI,3618
 dodal/common/beamlines/beamline_utils.py,sha256=-FEBuz4fYBclgifAODKaaBB5GIQFhPHPaktGS5c5lWc,5236
@@ -49,9 +51,9 @@ dodal/devices/bimorph_mirror.py,sha256=kG9waIdTkKglUrvY_wD9w533oKPqa7fct1-wa_GCF
 dodal/devices/cryostream.py,sha256=K-ldpredpeDTzNt4qtQMg99nKJNjBYoXBbK0WJGexzw,656
 dodal/devices/dcm.py,sha256=JbyxLnrS68nnnv39l9XEWgJgXUBqxX6aFo19MZnL36E,2574
 dodal/devices/diamond_filter.py,sha256=A--RHd7WuH-IBhvCyENcRCTP4K-mm_Kqpa0pojpHZow,1098
-dodal/devices/eiger.py,sha256=n9-rCrIdRnmDNdAz6sCKTYLhiglwlDTmKuMkLUdIWZg,15832
+dodal/devices/eiger.py,sha256=RN3klVASvdTT_jer2HJHUCZWZBKoOUQQdTpsKdgTPfo,15836
 dodal/devices/eiger_odin.py,sha256=ytUH_18YuM1nJDhplS6OTdtADloYvHpO6ppENjVd4jU,7411
-dodal/devices/fast_grid_scan.py,sha256=N5tNSxNpnwLi7NgCHIqgArIUo8qbtVagIW-AIonZiJE,11630
+dodal/devices/fast_grid_scan.py,sha256=SJTolz-LHlkxWA3Fb0lHa90CH8IjyJ1v2vkaaCURGpU,12044
 dodal/devices/fluorescence_detector_motion.py,sha256=-1qCSvW0PdT0m6BcoLxrtc0OJ5UDIBsEe11EOLr-gFw,501
 dodal/devices/flux.py,sha256=1CDsq9yU2-ho8MfYBl50Tl9ABZwpUBHnV486PQXKNoQ,462
 dodal/devices/focusing_mirror.py,sha256=vdUPkwyCAZBSR3LQ-EojDOoxVy1ZmOaD_nevETbj7BA,6592
@@ -60,9 +62,9 @@ dodal/devices/ipin.py,sha256=eq5jlKw7WGQi8VLrAWpaAIsZmfiVf-5Q0td_B22H6A4,473
 dodal/devices/linkam3.py,sha256=2sf-_heIsDg4qmqae-w9C2Py8pG8bPB3mT0TFPQIzd0,3869
 dodal/devices/logging_ophyd_device.py,sha256=dUVE-XhWA56WUXez0mrc4sf322CXY3MVLreTycO5j_A,668
 dodal/devices/motors.py,sha256=K1df9Pn1ThvsW-g7LrfKWOFaiaQXXUAf2BtbRehzUc4,1108
-dodal/devices/p45.py,sha256=hNCfWb8xubuHO8uJ5MpHPurp-r1ss7JMgbZQwHVJg-w,1743
+dodal/devices/p45.py,sha256=hoBPpnj3b-njKqmhjAUFb79AyM4qFbWC9tuN6Aa47Rk,1703
 dodal/devices/pgm.py,sha256=am-AST9iTqma1PkGOKLozqAokZWbJUbM3TNcqXzB-6A,1132
-dodal/devices/pressure_jump_cell.py,sha256=LZbHqvClIe4oYX6SU1Rg7WVPjyKZOtGqOFmr3l3mvYg,10251
+dodal/devices/pressure_jump_cell.py,sha256=QYU3BTA6O8lvWdg8UX81Ya0BCbGz4dirjt0xp2ez7O0,10423
 dodal/devices/qbpm.py,sha256=FfrWWAHHtYv3fGRT1qljyPpAwoHJYfbooT9CfKg-oXI,465
 dodal/devices/robot.py,sha256=5Y5lNkAbXooIAkSWHwDKyeKKzlqMeH3TuLHzCsw2FPI,5993
 dodal/devices/s4_slit_gaps.py,sha256=4KdarIQoRqX4ry3LUS1Km7fkjUFahA0VuTd2DvYEqQ8,446
@@ -80,6 +82,7 @@ dodal/devices/undulator_dcm.py,sha256=zulVn1wvu4-WEpf0BgLiDet58IsaKV7KW6qruAdRR_
 dodal/devices/watsonmarlow323_pump.py,sha256=rwU94YE6esgGLYdh-pe8nBo_3tvgp6brrrbPDrqp5_M,1406
 dodal/devices/webcam.py,sha256=mef075ynDbzZ4pNAjfxR_9tdTTqF_rM7hAOVEEOV-Do,2408
 dodal/devices/xbpm_feedback.py,sha256=j8MHhhE0feoe6R54zPKqS5EbQ0bEDR-nOpLHzHhnHHQ,1156
+dodal/devices/aithre_lasershaping/goniometer.py,sha256=YEl0DEXW4Dl9b3nsyfwrM7FDiwEZCXK-evGxlyOJr8k,512
 dodal/devices/areadetector/plugins/CAM.py,sha256=sZzJm5Ez3eWfXZi_EB67wluhZmMQm1UyOc2bJFfzd1U,964
 dodal/devices/areadetector/plugins/MJPG.py,sha256=QTsxCoWbofNpLMGPoOR2hWoM33KyntuLepbF0YmX0KE,3031
 dodal/devices/attenuator/attenuator.py,sha256=eHJpM-E4XQfzy1mxGRk754y3n9q6i3youkCqQg_6SUM,3986
@@ -95,7 +98,7 @@ dodal/devices/detector/__init__.py,sha256=-RdACL3tzc3lLArWOoGNje48UUlv2fElOmGOz9
 dodal/devices/detector/det_dim_constants.py,sha256=arBWvzMwybatdSiCMAiwB4Bq1dX-wkLi54xPPfTfQhY,2772
 dodal/devices/detector/det_dist_to_beam_converter.py,sha256=7keoqZYfvgayePVx97lHYpcFRTJnQOfAk_PYP4EZTZQ,1951
 dodal/devices/detector/det_resolution.py,sha256=aQkKp24LpRGiwzPAQM3wLVa4ANw32HdrKc2kftHfKQA,3253
-dodal/devices/detector/detector.py,sha256=syzkl52kGaMINXCXEviFuYPbgNatm5tioVPDmjgro8s,4768
+dodal/devices/detector/detector.py,sha256=sIOGwkixbJTYPdNiwZjDiY7DfYuYzRomKltO2EztDZE,4770
 dodal/devices/detector/detector_motion.py,sha256=UGDQriDWRluDZOZh1mDX9w_fPjMD-_BGe11kA36Kezs,1616
 dodal/devices/i03/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i03/beamstop.py,sha256=D1-QeGNpNlUE1qtFz-XxgzQGZbvM5bdb09f69yDB7U0,2802
@@ -116,6 +119,7 @@ dodal/devices/i18/diode.py,sha256=q8ddVYT7yDXwURzxw5gfXlGT1tFirNfHBmiKnpvvXHk,40
 dodal/devices/i18/table.py,sha256=f6OtVSqCFIpXyoHX97CPLpaVDVXUNc2EvgSFP3qVFKo,446
 dodal/devices/i18/thor_labs_stage.py,sha256=I9JSKY-UqTjN-yBxQWL4CycTNNkUj3vknRrXjA6KZR8,364
 dodal/devices/i19/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dodal/devices/i19/hutch_access.py,sha256=K8hYi5gYg46XPw03qFgwoInapYzNGjf4Fgf9Ifi0gAI,308
 dodal/devices/i19/shutter.py,sha256=9KmS4NBwvifgJ4FF_FeXIfSEAV7ZkBAfutiu_0SLrAs,2196
 dodal/devices/i20_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i22/dcm.py,sha256=SQDh-Sj1OvplHZ9yTWblJwv8PJrUqxseDPupZOWmcLo,4701
@@ -144,7 +148,7 @@ dodal/devices/oav/pin_image_recognition/manual_test.py,sha256=h1Rto6ZDCB3jWhjSy9
 dodal/devices/oav/pin_image_recognition/utils.py,sha256=L9ypluYqeOFoS7gQuws-vTNc8LqaKl2ZIDNeQ2JaNpg,8592
 dodal/devices/oav/snapshots/grid_overlay.py,sha256=CdvCdTKMCiwMwxm2lV28KpcIUSXlscZmWxb73_KKmiI,3694
 dodal/devices/oav/snapshots/snapshot_with_beam_centre.py,sha256=J77RfE3AGTLNdWc6hvsRn2DUdupzuk_FTDGvdP0jqbU,1962
-dodal/devices/oav/snapshots/snapshot_with_grid.py,sha256=EBoCtr1NmOKye2yQHqbTBxSg-DsEKFeyBtMFmOeGPRs,2269
+dodal/devices/oav/snapshots/snapshot_with_grid.py,sha256=KAM7KjF0BzhGxx-MXd4Zc16IBbi1BF8S_VT8T84_2OY,2309
 dodal/devices/p99/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/p99/sample_stage.py,sha256=DvHU556Gp0wFiufZiwY3o2W4xmsCL5uSwNnhd8HPAnc,528
 dodal/devices/training_rig/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -174,10 +178,13 @@ dodal/plan_stubs/wrapped.py,sha256=nriHKX4BF010CmrhdoUhY3-txClW5W8TPLz64kE_AXU,4
 dodal/plans/__init__.py,sha256=nH1jNxw3DzDMg9O8Uda0kqKIalRVEWBrq07OLY6Ey38,93
 dodal/plans/save_panda.py,sha256=1fumH7Ih8uDIv8ahAtgQ_vUuR3dz0sfUs4n9TEtEbSs,3053
 dodal/plans/scanspec.py,sha256=Q0AcvTKRT401iGMRDSqK-D523UX5_ofiVMZ_rNXKOx8,2074
+dodal/plans/verify_undulator_gap.py,sha256=mq2fHtc5o5rSgdTM2xhULOImfjwa6x29tPpeoLw4GcU,553
 dodal/plans/wrapped.py,sha256=BPMw__RcWvk9v5XnhMsi9_k4KsDEbmXogzD2n1ecbUg,2098
-dls_dodal-1.40.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-dls_dodal-1.40.0.dist-info/METADATA,sha256=PnQZPtkcDPvFdDHEHuhmiUv-n7hULVI-_Rlao38WIuo,16696
-dls_dodal-1.40.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-dls_dodal-1.40.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
-dls_dodal-1.40.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
-dls_dodal-1.40.0.dist-info/RECORD,,
+dodal/plans/preprocessors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dodal/plans/preprocessors/verify_undulator_gap.py,sha256=cBZEGq8TW1jrXFXB00iClQVXSEaE_jP_rHMY9WTgYyY,1813
+dls_dodal-1.42.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+dls_dodal-1.42.0.dist-info/METADATA,sha256=z74PYCHBK1Fi9i9jqxo4P2ss7NEXj5rBn2oRmXg4NH0,16791
+dls_dodal-1.42.0.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+dls_dodal-1.42.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
+dls_dodal-1.42.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
+dls_dodal-1.42.0.dist-info/RECORD,,

{dls_dodal-1.40.0.dist-info → dls_dodal-1.42.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (76.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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.42.0'
+__version_tuple__ = version_tuple = (1, 42, 0)

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",

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:

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")

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
 

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")

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,
     )

dodal/beamlines/p38.py

@@ -4,16 +4,12 @@ from ophyd_async.epics.adaravis import AravisDetector
 from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
-    device_instantiation,
+    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,
-    numbered_slits,
-)
+from dodal.common.beamlines.device_helpers import HDF5_SUFFIX
 from dodal.common.crystal_metadata import (
     MaterialsEnum,
     make_crystal_metadata_from_material,
@@ -29,9 +25,10 @@ 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, skip_device
+from dodal.utils import BeamlinePrefix, get_beamline_name
 
 BL = get_beamline_name("p38")
+PREFIX = BeamlinePrefix(BL)
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
@@ -49,63 +46,41 @@ set_path_provider(
 )
 
 
-def d3(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> AravisDetector:
-    return device_instantiation(
-        AravisDetector,
-        "d3",
-        "-DI-DCAM-01:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
-        drv_suffix=DET_SUFFIX,
-        fileio_suffix=HDF5_SUFFIX,
+@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
-@skip_device()
-def d11(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> AravisDetector:
-    return device_instantiation(
-        AravisDetector,
-        "d11",
-        "-DI-DCAM-03:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
-        drv_suffix=DET_SUFFIX,
-        fileio_suffix=HDF5_SUFFIX,
+@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,
     )
 
 
-def d12(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> AravisDetector:
-    return device_instantiation(
-        AravisDetector,
-        "d12",
-        "-DI-DCAM-04:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
-        drv_suffix=DET_SUFFIX,
-        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,
     )
 
 
-def i0(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = False,
-) -> TetrammDetector:
-    return device_instantiation(
-        TetrammDetector,
-        "i0",
-        "-EA-XBPM-01:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
+@device_factory()
+def i0() -> TetrammDetector:
+    return TetrammDetector(
+        f"{PREFIX.beamline_prefix}-EA-XBPM-01:",
         path_provider=get_path_provider(),
     )
 
@@ -117,126 +92,60 @@ def i0(
 #
 
 
-def slits_1(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = True,
-) -> Slits:
-    return numbered_slits(
-        1,
-        wait_for_connection,
-        fake_with_ophyd_sim,
-    )
+@device_factory(mock=True)
+def slits_1() -> Slits:
+    return Slits(f"{PREFIX.beamline_prefix}-AL-SLITS-01:")
 
 
-def slits_2(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = True,
-) -> Slits:
-    return numbered_slits(
-        2,
-        wait_for_connection,
-        fake_with_ophyd_sim,
-    )
+@device_factory(mock=True)
+def slits_2() -> Slits:
+    return Slits(f"{PREFIX.beamline_prefix}-AL-SLITS-02:")
 
 
-def slits_3(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = True,
-) -> Slits:
-    return numbered_slits(
-        3,
-        wait_for_connection,
-        fake_with_ophyd_sim,
-    )
+@device_factory(mock=True)
+def slits_3() -> Slits:
+    return Slits(f"{PREFIX.beamline_prefix}-AL-SLITS-03:")
 
 
-def slits_4(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = True,
-) -> Slits:
-    return numbered_slits(
-        4,
-        wait_for_connection,
-        fake_with_ophyd_sim,
-    )
+@device_factory(mock=True)
+def slits_4() -> Slits:
+    return Slits(f"{PREFIX.beamline_prefix}-AL-SLITS-04:")
 
 
-def slits_5(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = True,
-) -> Slits:
-    return numbered_slits(
-        5,
-        wait_for_connection,
-        fake_with_ophyd_sim,
-    )
+@device_factory(mock=True)
+def slits_5() -> Slits:
+    return Slits(f"{PREFIX.beamline_prefix}-AL-SLITS-05:")
 
 
-def slits_6(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = True,
-) -> Slits:
-    return numbered_slits(
-        6,
-        wait_for_connection,
-        fake_with_ophyd_sim,
-    )
+@device_factory(mock=True)
+def slits_6() -> Slits:
+    return Slits(f"{PREFIX.beamline_prefix}-AL-SLITS-06:")
 
 
-def fswitch(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = True,
-) -> FSwitch:
-    return device_instantiation(
-        FSwitch,
-        "fswitch",
-        "-MO-FSWT-01:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
+@device_factory(mock=True)
+def fswitch() -> FSwitch:
+    return FSwitch(
+        f"{PREFIX.beamline_prefix}-MO-FSWT-01:",
         lens_geometry="paraboloid",
         cylindrical=True,
         lens_material="Beryllium",
     )
 
 
-def vfm(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = True,
-) -> FocusingMirror:
-    return device_instantiation(
-        FocusingMirror,
-        "vfm",
-        "-OP-KBM-01:VFM:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
-    )
+@device_factory(mock=True)
+def vfm() -> FocusingMirror:
+    return FocusingMirror(f"{PREFIX.beamline_prefix}-OP-KBM-01:VFM:")
 
 
-def hfm(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = True,
-) -> FocusingMirror:
-    return device_instantiation(
-        FocusingMirror,
-        "hfm",
-        "-OP-KBM-01:HFM:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
-    )
+@device_factory(mock=True)
+def hfm() -> FocusingMirror:
+    return FocusingMirror(f"{PREFIX.beamline_prefix}-OP-KBM-01:HFM:")
 
 
-def dcm(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = True,
-) -> DoubleCrystalMonochromator:
-    return device_instantiation(
-        DoubleCrystalMonochromator,
-        "dcm",
-        f"{BeamlinePrefix(BL).beamline_prefix}-MO-DCM-01:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
-        bl_prefix=False,
-        temperature_prefix=f"{BeamlinePrefix(BL).beamline_prefix}-DI-DCM-01:",
+@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)
         ),
@@ -246,105 +155,56 @@ def dcm(
     )
 
 
-def undulator(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = True,
-) -> Undulator:
-    return device_instantiation(
-        Undulator,
-        "undulator",
-        f"{BeamlinePrefix(BL).insertion_prefix}-MO-SERVC-01:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
-        bl_prefix=False,
+@device_factory(mock=True)
+def undulator() -> Undulator:
+    return Undulator(
+        f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
         poles=80,
         length=2.0,
     )
 
 
-# Must find which PandA IOC(s) are compatible
 # Must document what PandAs are physically connected to
 # See: https://github.com/bluesky/ophyd-async/issues/284
-@skip_device()
-def panda1(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = False,
-) -> HDFPanda:
-    return device_instantiation(
-        HDFPanda,
-        "panda1",
-        "-EA-PANDA-01:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
+@device_factory(skip=True)
+def panda1() -> HDFPanda:
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-EA-PANDA-01:",
         path_provider=get_path_provider(),
     )
 
 
-@skip_device()
-def panda2(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = False,
-) -> HDFPanda:
-    return device_instantiation(
-        HDFPanda,
-        "panda2",
-        "-EA-PANDA-02:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
+@device_factory(skip=True)
+def panda2() -> HDFPanda:
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-EA-PANDA-02:",
         path_provider=get_path_provider(),
     )
 
 
-@skip_device()
-def panda3(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = False,
-) -> HDFPanda:
-    return device_instantiation(
-        HDFPanda,
-        "panda3",
-        "-EA-PANDA-03:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
+@device_factory(skip=True)
+def panda3() -> HDFPanda:
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-EA-PANDA-03:",
         path_provider=get_path_provider(),
     )
 
 
-@skip_device()
-def linkam(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> Linkam3:
-    return device_instantiation(
-        Linkam3,
-        "linkam",
-        f"{BeamlinePrefix(BL).insertion_prefix}-EA-LINKM-02:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
-    )
+@device_factory(skip=True)
+def linkam() -> Linkam3:
+    return Linkam3(f"{PREFIX.beamline_prefix}-EA-LINKM-02:")
 
 
-def ppump(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = True
-) -> WatsonMarlow323Pump:
+@device_factory()
+def ppump() -> WatsonMarlow323Pump:
     """Peristaltic Pump"""
-    return device_instantiation(
-        WatsonMarlow323Pump,
-        "ppump",
-        "-EA-PUMP-01:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
-    )
+    return WatsonMarlow323Pump(f"{PREFIX.beamline_prefix}-EA-PUMP-01:")
 
 
-def high_pressure_xray_cell(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> PressureJumpCell:
-    return device_instantiation(
-        PressureJumpCell,
-        "high_pressure_xray_cell",
-        "-EA",
-        wait_for_connection,
-        fake_with_ophyd_sim,
+@device_factory()
+def high_pressure_xray_cell() -> PressureJumpCell:
+    return PressureJumpCell(
+        f"{PREFIX.beamline_prefix}-EA",
         cell_prefix="-HPXC-01:",
         adc_prefix="-ADC",
     )

dodal/beamlines/p45.py

@@ -4,7 +4,7 @@ from ophyd_async.epics.adaravis import AravisDetector
 from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
-    device_instantiation,
+    device_factory,
     get_path_provider,
     set_path_provider,
 )
@@ -13,11 +13,13 @@ 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 get_beamline_name, skip_device
+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,
@@ -26,92 +28,51 @@ set_path_provider(
 )
 
 
-def sample(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> TomoStageWithStretchAndSkew:
-    return device_instantiation(
-        TomoStageWithStretchAndSkew,
-        "sample_stage",
-        "-MO-STAGE-01:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
-    )
+@device_factory()
+def sample() -> TomoStageWithStretchAndSkew:
+    return TomoStageWithStretchAndSkew(f"{PREFIX.beamline_prefix}-MO-STAGE-01:")
 
 
-def choppers(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> Choppers:
-    return device_instantiation(
-        Choppers,
-        "chopper",
-        "-MO-CHOP-01:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
-    )
+@device_factory()
+def choppers() -> Choppers:
+    return Choppers(f"{PREFIX.beamline_prefix}-MO-CHOP-01:")
 
 
 # Disconnected
-@skip_device()
-def det(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> AravisDetector:
-    return device_instantiation(
-        AravisDetector,
-        "det",
-        "-EA-MAP-01:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
+@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,
-        path_provider=get_path_provider(),
     )
 
 
 # Disconnected
-@skip_device()
-def diff(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> AravisDetector:
-    return device_instantiation(
-        AravisDetector,
-        "diff",
-        "-EA-DIFF-01:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
+@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,
-        path_provider=get_path_provider(),
     )
 
 
-# Must find which PandA IOC(s) are compatible
 # Must document what PandAs are physically connected to
 # See: https://github.com/bluesky/ophyd-async/issues/284
-@skip_device()
-def panda1(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = False,
-) -> HDFPanda:
-    return device_instantiation(
-        HDFPanda,
-        "panda1",
-        "-MO-PANDA-01:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
+@device_factory(skip=True)
+def panda1() -> HDFPanda:
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-MO-PANDA-01:",
         path_provider=get_path_provider(),
     )
 
 
-@skip_device()
-def panda2(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = False,
-) -> HDFPanda:
-    return device_instantiation(
-        HDFPanda,
-        "panda2",
-        "-MO-PANDA-02:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
+@device_factory(skip=True)
+def panda2() -> HDFPanda:
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-MO-PANDA-02:",
         path_provider=get_path_provider(),
     )

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):

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)

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

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(

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]:

dodal/devices/i19/hutch_access.py

@@ -0,0 +1,8 @@
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.core import epics_signal_r
+
+
+class HutchAccessControl(StandardReadable):
+    def __init__(self, prefix: str, name: str = "") -> None:
+        self.active_hutch = epics_signal_r(str, f"{prefix}EHStatus.VALA")
+        super().__init__(name)

dodal/devices/oav/snapshots/snapshot_with_grid.py

@@ -34,9 +34,10 @@ class SnapshotWithGrid(MJPG):
         box_width = await self.box_width.get_value()
         num_boxes_x = await self.num_boxes_x.get_value()
         num_boxes_y = await self.num_boxes_y.get_value()
-
-        assert isinstance(filename_str := await self.filename.get_value(), str)
-        assert isinstance(directory_str := await self.directory.get_value(), str)
+        filename_str = await self.filename.get_value()
+        assert isinstance(filename_str, str)
+        directory_str = await self.directory.get_value()
+        assert isinstance(directory_str, str)
 
         add_grid_border_overlay_to_image(
             image, int(top_left_x), int(top_left_y), box_width, num_boxes_x, num_boxes_y

dodal/devices/p45.py

@@ -7,13 +7,13 @@ class SampleY(StandardReadable):
     Motors for controlling the sample's y position and stretch in the y axis.
     """
 
-    def __init__(self, prefix: str, name="") -> None:
+    def __init__(self, prefix: str, name: str = ""):
         with self.add_children_as_readables():
             self.base = Motor(prefix + "CS:Y")
             self.stretch = Motor(prefix + "CS:Y:STRETCH")
             self.top = Motor(prefix + "Y:TOP")
             self.bottom = Motor(prefix + "Y:BOT")
-            super().__init__(name=name)
+        super().__init__(name)
 
 
 class SampleTheta(StandardReadable):
@@ -21,13 +21,13 @@ class SampleTheta(StandardReadable):
     Motors for controlling the sample's theta position and skew
     """
 
-    def __init__(self, prefix: str, name="") -> None:
+    def __init__(self, prefix: str, name: str = ""):
         with self.add_children_as_readables():
             self.base = Motor(prefix + "THETA:POS")
             self.skew = Motor(prefix + "THETA:SKEW")
             self.top = Motor(prefix + "THETA:TOP")
             self.bottom = Motor(prefix + "THETA:BOT")
-            super().__init__(name=name)
+        super().__init__(name)
 
 
 class TomoStageWithStretchAndSkew(StandardReadable):
@@ -35,12 +35,12 @@ class TomoStageWithStretchAndSkew(StandardReadable):
     Grouping of motors for the P45 tomography stage
     """
 
-    def __init__(self, prefix: str, name="") -> None:
+    def __init__(self, prefix: str, name: str = ""):
         with self.add_children_as_readables():
             self.x = Motor(prefix + "X")
             self.y = SampleY(prefix)
             self.theta = SampleTheta(prefix)
-            super().__init__(name=name)
+        super().__init__(name)
 
 
 class Choppers(StandardReadable):
@@ -48,8 +48,8 @@ class Choppers(StandardReadable):
     Grouping for the P45 chopper motors
     """
 
-    def __init__(self, prefix: str, name="") -> None:
+    def __init__(self, prefix: str, name: str = ""):
         with self.add_children_as_readables():
             self.x = Motor(prefix + "ENDAT")
             self.y = Motor(prefix + "BISS")
-            super().__init__(name=name)
+        super().__init__(name)

dodal/devices/pressure_jump_cell.py

@@ -41,8 +41,8 @@ class ValveControlRequest(StrictEnum):
 
 
 class ValveOpenSeqRequest(StrictEnum):
-    INACTIVE = 0
-    OPEN_SEQ = 1
+    INACTIVE = "0"
+    OPEN_SEQ = "1"
 
 
 class PumpMotorDirectionState(StrictEnum):
@@ -235,6 +235,9 @@ class PressureTransducer(StandardReadable):
             self.beckhoff_pressure = epics_signal_r(
                 float, f"{final_prefix}STATP{transducer_number}:MeanValue_RBV"
             )
+            # P1 beckhoff voltage = BL38P-EA-ADC-02:CH1
+            # P2 beckhoff voltage = BL38P-EA-ADC-01:CH2
+            # P3 beckhoff voltage = BL38P-EA-ADC-01:CH1
             self.slow_beckhoff_voltage_readout = epics_signal_r(
                 float, f"{full_different_prefix_adc}CH{ethercat_channel_number}"
             )

dodal/plans/preprocessors/verify_undulator_gap.py

@@ -0,0 +1,49 @@
+from bluesky.preprocessors import plan_mutator
+from bluesky.utils import Msg, MsgGenerator, make_decorator
+
+from dodal.plans.verify_undulator_gap import CheckUndulatorDevices, verify_undulator_gap
+
+
+def verify_undulator_gap_before_run_wrapper(
+    plan: MsgGenerator,
+    devices: CheckUndulatorDevices,
+    run_key_to_wrap: str | None = None,
+):
+    """
+    Modifies the wrapped plan so that it checks the undulator gap before the specified run is opened and sets it to the correct value if needed.
+
+    After a beam dump, the undulator gap may not return correctly, scientists have often requested that this check is done before collections.
+
+    Args:
+        plan: The plan performing the run.
+        devices (CheckUndulatorDevices): Any device composite including the DCM and undulator
+        run_key_to_wrap: (str | None): The plan to verify the undulator gap is inserted after the 'open_run' message is seen with
+        the matching run key. If not specified, instead wrap the first run encountered.
+    """
+
+    # If no run_key specified, make sure we only do check on first run encountered
+    _wrapped_run_name: None | str = None
+
+    def head(msg: Msg):
+        yield from verify_undulator_gap(devices)
+        yield msg
+
+    def insert_plans(msg: Msg):
+        nonlocal _wrapped_run_name
+
+        match msg.command:
+            case "open_run":
+                if (
+                    not (run_key_to_wrap or _wrapped_run_name)
+                    or run_key_to_wrap is msg.run
+                ):
+                    _wrapped_run_name = msg.run if msg.run else "unnamed_run"
+                    return head(msg), None
+        return None, None
+
+    return plan_mutator(plan, insert_plans)
+
+
+verify_undulator_gap_before_run_decorator = make_decorator(
+    verify_undulator_gap_before_run_wrapper
+)

dodal/plans/verify_undulator_gap.py

@@ -0,0 +1,19 @@
+from typing import Protocol, runtime_checkable
+
+from bluesky import plan_stubs as bps
+
+from dodal.devices.dcm import DCM
+from dodal.devices.undulator import Undulator
+
+
+@runtime_checkable
+class CheckUndulatorDevices(Protocol):
+    undulator: Undulator
+    dcm: DCM
+
+
+def verify_undulator_gap(devices: CheckUndulatorDevices):
+    """Verify Undulator gap is correct - it may not be after a beam dump"""
+
+    energy_in_kev = yield from bps.rd(devices.dcm.energy_in_kev.user_readback)
+    yield from bps.abs_set(devices.undulator, energy_in_kev, wait=True)

dodal/utils.py

@@ -16,6 +16,7 @@ from typing import (
     Any,
     Generic,
     Protocol,
+    TypeAlias,
     TypeGuard,
     TypeVar,
     runtime_checkable,
@@ -43,12 +44,6 @@ from ophyd_async.core import Device as OphydV2Device
 
 import dodal.log
 
-try:
-    from typing import TypeAlias
-except ImportError:
-    from typing import TypeAlias
-
-
 #: Protocols defining interface to hardware
 BLUESKY_PROTOCOLS = [
     Checkable,