dls-dodal 1.30.0__py3-none-any.whl → 1.31.0__py3-none-any.whl

{dls_dodal-1.30.0.dist-info → dls_dodal-1.31.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dls-dodal
-Version: 1.30.0
+Version: 1.31.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,15 +216,15 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async <0.4.0
+Requires-Dist: ophyd-async >=0.5.2
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
 Requires-Dist: pillow
-Requires-Dist: zocalo <1.0.0,>=0.32.0
+Requires-Dist: zocalo >=1.0.0
 Requires-Dist: requests
 Requires-Dist: graypy
-Requires-Dist: pydantic
+Requires-Dist: pydantic >=2.0
 Requires-Dist: opencv-python-headless
 Requires-Dist: aioca
 Requires-Dist: p4p

{dls_dodal-1.30.0.dist-info → dls_dodal-1.31.0.dist-info}/RECORD

@@ -1,99 +1,99 @@
 dodal/__init__.py,sha256=v-rRiDOgZ3sQSMQKq0vgUQZvpeOkoHFXissAx6Ktg84,61
 dodal/__main__.py,sha256=kP2S2RPitnOWpNGokjZ1Yq-1umOtp5sNOZk2B3tBPLM,111
-dodal/_version.py,sha256=3O7CSAW5ITJG2wygPANaMSiqdTff8ZC6oMkdurXzaA8,413
+dodal/_version.py,sha256=dzZT_zSNuduMjHe-sn5PEo3LacKN_h-teTqnUR5SOGk,413
 dodal/adsim.py,sha256=OW2dcS7ciD4Yq9WFw4PN_c5Bwccrmu7R-zr-u6ZCbQM,497
 dodal/cli.py,sha256=_crmaHchxphSW8eEJB58_XZIeK82aiUv9bV7tpz-LpA,2122
-dodal/log.py,sha256=1o93tmUdeTxfzM5c1eAJq5yi_dwOBitcWIC1wp60CfI,8873
+dodal/log.py,sha256=0to7CRsbzbgVfAAfKRAMhsaUuKqF2-7CGdQc-z8Uhno,9499
 dodal/utils.py,sha256=VV-IQHehAdE95wxq3C4kIl5Dt5MTtmgzVaqKm-k3Q4I,11769
 dodal/beamline_specific_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/beamline_specific_utils/i03.py,sha256=Ixe1anFQl-kwRJubmQx28TIW4Zw8qDxpElNNNapWQHI,396
+dodal/beamline_specific_utils/i03.py,sha256=eM6ZWZzpL0JYNBff8LhOnwFoZTJ5PDCY2XWI7ZKdtFY,276
 dodal/beamlines/README.md,sha256=K9MkL_GomxlsoTB7Mz-_dJA5NNSbmCfMiutchGg3C8o,404
-dodal/beamlines/__init__.py,sha256=XNjwp8yvxlF9eik6igebVs9jeur4Cu7xwEAMFcuhspU,2968
-dodal/beamlines/i03.py,sha256=NF-CcIC93_6JyVuURgcX-w0iqrhbHaKr-vzqXYn6o24,17045
-dodal/beamlines/i04.py,sha256=34m9KqKc9QlR_CeeXC_A1C_bPq9QJ5YdMg_-gTEZYtc,13759
+dodal/beamlines/__init__.py,sha256=CD0Dz2H1adLsqY4H3-_QxTdODPZD6mquMfsep5W5s0Q,3076
+dodal/beamlines/i03.py,sha256=VHfGk4-Smz5KviL4OpPVlnYGO4rbDAtnGwKtN20hxK0,17004
+dodal/beamlines/i04.py,sha256=JbpOssCBdpDd-TbElc0TfVOZ1tUnDjEFZkj5h1gR6Og,13767
 dodal/beamlines/i04_1.py,sha256=KDxSUQNhIs_NFiRaLY-Jiory0DeN7Y0ErvGuoTrwCDU,4731
-dodal/beamlines/i13_1.py,sha256=Nda_Saz1Q-ov37XKKWdjv8I3_jQEmjjjXQBVw1eOMzg,1879
+dodal/beamlines/i13_1.py,sha256=csXHrdwUh4sXTmb4X6ZiiSS_XxRkNShsVoBMxYI6rG0,1833
 dodal/beamlines/i20_1.py,sha256=MaPgONHqpoZuBtkiKEzYtViJnKBM2_ekeP4OdbmuXHE,1158
-dodal/beamlines/i22.py,sha256=xvCqL3GH4JBz6GzjbCKhWTbymTIir8UlqYV4gk5ww2o,9880
+dodal/beamlines/i22.py,sha256=ko3bo0WoZCFTSQkrNs9m_qDhvEpGWkSzEAZgpo0sRU0,9804
 dodal/beamlines/i23.py,sha256=2j5qLoqE_hg9ETHqNkOVu7LLkVB8qalgXeORnVYKN_I,1075
 dodal/beamlines/i24.py,sha256=1XVCNWbzowQB6CWpJGSLp9Ih0zypktIzHxb64h-Xj6Y,6583
-dodal/beamlines/p38.py,sha256=M6616HlwWhznK5MsDNqVy8KUFk1NcicCigDEAxBsSUo,8032
-dodal/beamlines/p45.py,sha256=wyjrO2PdOGvhtz0hKXAoo-RegN_dQVt-iFzh2V9ZaKU,2997
+dodal/beamlines/p38.py,sha256=mCDjRVpY6AIFIAAYCWe-jGABHadFwfJB7poa-dGMU6s,7940
+dodal/beamlines/p45.py,sha256=N4SDTIFok3uMqb37higZHMr3xRjxItsT4ib_KacKKAE,2935
 dodal/beamlines/p99.py,sha256=mHMYi1M_jgSB9SrOPadxvPuMrxG8LmJOYtU0Iw6fnIQ,1708
+dodal/beamlines/training_rig.py,sha256=yagMEQruA1iTOeQCNpux-6xOtkBuB-hhGvAJwQ5c9bg,1846
 dodal/common/__init__.py,sha256=ZC4ICKUDB0BDxRaVy8nmqclVmDBne-dPtk6UJsoFq6I,258
 dodal/common/coordination.py,sha256=OxIjDiO1-9A9KESRPFtzwkvvQlavbgA5RHemlbubBPg,1168
 dodal/common/maths.py,sha256=K9x7iL3xXLtWYTV-xlFHDNSTIL9a2UP3Ws7wr6Dm2rQ,1803
-dodal/common/types.py,sha256=0dAF8XK9FT6PmT1KPMM4_YkN4zqMtfFzDPVRGpfEMDE,571
-dodal/common/udc_directory_provider.py,sha256=kftG-Fb3hprSIh9AAXoA2bULlsxYU0-XHe60Kbx1WM0,1942
-dodal/common/visit.py,sha256=i7I2sTzIzV7aGDKL5-xFEt_jB5cY9wKVb8-BCOXSCxc,6042
+dodal/common/types.py,sha256=r7Oxcw4lIGi-mvBWc1TF4LDB45q7N4IawNgOMhPohK8,621
+dodal/common/udc_directory_provider.py,sha256=H-9f6uSVGuA8jyiErPi8ikCw1JDrhRAJv-qPpN-HwJk,2379
+dodal/common/visit.py,sha256=2UbbCmgOjZWSCxFzE9RYiTJhA_IoVOegma-Jv-PJqps,5787
 dodal/common/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/common/beamlines/beamline_parameters.py,sha256=PiOhmpNwF3Z8RsUZwgEqiF1RFQZVEiaxKDoiCaz9gxo,3570
-dodal/common/beamlines/beamline_utils.py,sha256=7A1RL5ZyJiN5wsdtaAY51J5gXaqi7bUgS_YiI7XJ4Ls,4482
+dodal/common/beamlines/beamline_parameters.py,sha256=oIPHooqu5vTAwfqZutsKbzwdi9nvFF8568Mz7jrK5rI,3618
+dodal/common/beamlines/beamline_utils.py,sha256=rL-XgqAbaZF2FJDFj8OHSbvzCxSwzCUGMfTUWT5qOXs,4422
 dodal/common/beamlines/device_helpers.py,sha256=s79js7no9k8JMfG7NvdmFomSP5m5VDQ6th_Hsbx1znA,939
-dodal/devices/CTAB.py,sha256=vmvb7uleWCicKhFpIfCG-LgCYkhmTi7Lp6uxxnMR3uI,2001
+dodal/devices/CTAB.py,sha256=MoExneblYUHg9Va8vAVx_p_Vw_HnqbhkzxxrX7Ic_wo,2000
 dodal/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/adsim.py,sha256=dMU0TKIuiODHYFHQOH4_5UvB8iJtaJEtjqaEDGjcU-w,311
-dodal/devices/aperture.py,sha256=0MtTzKMDZ5DVAz0DE0kXI0M76VCp0y9vFsrMggEMpxk,586
-dodal/devices/aperturescatterguard.py,sha256=sgpYrvDTa1z9KwoPSzg0jx4ZCdfI16pFRuVnrZ_L8X0,10158
+dodal/devices/aperture.py,sha256=BLaroQ3n8yd7uZyacJ3KvDWZH8yhA_sJc8b49QMKg9o,585
+dodal/devices/aperturescatterguard.py,sha256=id2-h6VB9hMU2dmgkpFkTLOPKiqAktMHsLb7YY0LX-4,8428
 dodal/devices/attenuator.py,sha256=viK1iccNekX6ZvR_ZmSwj5JdM1j2B8pcTg8qWDdmzhQ,2584
-dodal/devices/backlight.py,sha256=vsNGZB4C_mVMafllvJlOTghsfv6UqALMKUMLXu3WZ5k,1115
-dodal/devices/beamstop.py,sha256=8L3qhlk-3ZBOp10xK1i8qZqYTGOXX1mVF1MgXoN0dfg,215
+dodal/devices/backlight.py,sha256=mOnptopsVOsT8JUIX_siDRgJ73CQPz_bm0Eb7oA81wc,1607
 dodal/devices/cryostream.py,sha256=CpNA2HGhN_PXkL9eqH_yAPsDxyOLIiehlUxEoNmXJVg,668
-dodal/devices/dcm.py,sha256=vfyGYDzfSwTiNqlzkfNjkrL-Q1hNVSgJddvJ5Un_lvg,1610
+dodal/devices/dcm.py,sha256=eZNMGjLM56Ll0siU14XomB77W_grLIdxIrMOQNmYFG8,1609
 dodal/devices/eiger.py,sha256=sR-Fr97Y0lzzq57fFOUTwUZw5E7asoj36A1JR1QUkLI,13985
 dodal/devices/eiger_odin.py,sha256=tDpEhOUY02YManYAMRI3TwSDDa3uITBxI0JHevaK7Rk,7010
-dodal/devices/fast_grid_scan.py,sha256=HCa8WeNbkyaQFKS-qcSRqWh77sFNxhjP86OJgowVxlY,12531
+dodal/devices/fast_grid_scan.py,sha256=7u4YvaoR0CsKs9hgawi5p73v0dY_yJwC0_RlFz25R7Y,11922
 dodal/devices/fluorescence_detector_motion.py,sha256=5IcyaVHXa9TXLFlLB0tfpQ1_ThgIRJNaFNw_uj6ahCA,501
 dodal/devices/flux.py,sha256=RtPStHw7Mad0igVKntKWVZfuZn2clokVJqH14HLix6M,198
-dodal/devices/focusing_mirror.py,sha256=gZhJWXaea2SPx9LklbxRWsFtX2rQAtBdHXoT35Rsz1Q,5943
+dodal/devices/focusing_mirror.py,sha256=Gx3diH-0VH457MR40HMCovXRjcAALSCO0q2np4l-dL4,5911
 dodal/devices/hutch_shutter.py,sha256=_-hR3SJHM05YHV_fEtc0VYOLamYnpVGDE56AwJGJS48,3320
 dodal/devices/ipin.py,sha256=qsf8E3xrJYNDwzsacNLCCp3gaqsadqmN1b-Fvou8y8k,420
-dodal/devices/linkam3.py,sha256=xcOAMTnifyML7e4qEluqDwAJSiaIzAtIYiqAs8rW6Yc,3850
+dodal/devices/linkam3.py,sha256=3oYwPtaKSPvLKEat8m7tuhE4Wizz8mg8HMrEWPCYxn0,3820
 dodal/devices/logging_ophyd_device.py,sha256=dUVE-XhWA56WUXez0mrc4sf322CXY3MVLreTycO5j_A,668
-dodal/devices/motors.py,sha256=uezbefx_vt6rAkmXkJZYuT0mjlNQ2WbUjGwmXsAMz5s,1040
+dodal/devices/motors.py,sha256=dYa9T6FDMTbr8GvTb-lXtk3v4QEqAWRuGmHIO20fazQ,1039
 dodal/devices/p45.py,sha256=jzBW2fGRhIbGzSRs5Fgupxro6aqE611n1RTcrTTG-yY,1047
-dodal/devices/robot.py,sha256=1HfS65aSW-n3UaxkRi-lvEwkgESJ1LsANpV_2ph6fgo,4856
+dodal/devices/robot.py,sha256=VaD2_ogt497myakfkCC1cGfBoz1I6QVdO8AXzFuGis4,4813
 dodal/devices/s4_slit_gaps.py,sha256=j3kgF9WfGFaU9xdUuiAh-QqI5u_vhiAftaDVINt91SM,243
-dodal/devices/scatterguard.py,sha256=0qnvhoo3RjLsrxVgIoDJpryqunlgMVgaTsoyKRC2g4Y,331
-dodal/devices/scintillator.py,sha256=nALikcx8Kix_1ampU-MQBNur_xykAovnFQDrd1EawJw,366
-dodal/devices/slits.py,sha256=URru9VN2N19KqeUPDZaBmyKYn0_JJiE0Vko4sZpfsl8,601
-dodal/devices/smargon.py,sha256=tylxDN4yfGNx5Pwe12wgn7FpEXuGK6K0XnuNxiJ0spc,4707
+dodal/devices/scatterguard.py,sha256=jx03in9QgaThWxD4t1S8_Llent2kWrn_hThJ9KkUWTk,330
+dodal/devices/scintillator.py,sha256=PlD6cnJ39PTB_e7QrRspPliLYE4kL_K7ziJURzuxgdA,365
+dodal/devices/slits.py,sha256=uOyVmbgeygiP6e5Z9t5zMPXLuVEWFfYg9GB3ZU76Tug,600
+dodal/devices/smargon.py,sha256=hX-tCftKumxk67eS5-_gQRmYOrjSyQ4s3mMJsTRuvCk,4706
 dodal/devices/status.py,sha256=hVrJS1yooQo6PRumRACoIEh-SKBUKxvBlQl-MtLFUMQ,327
 dodal/devices/synchrotron.py,sha256=QtTufJA_fCaBawHougSc7nxwu240oX46_y0P-4qIW8o,1960
-dodal/devices/tetramm.py,sha256=QdDvQiD_wZpR_ZdVH8NG6Y4MpCn9JWulq1bXCBC9OBA,8585
+dodal/devices/tetramm.py,sha256=ofWhLYFZHCRopDK_WRs1eo-B1ra4bUhwq1MLaVKl4ys,8572
 dodal/devices/thawer.py,sha256=Gq-3f__KJUM6_Ds9OVxpZ5jC447HywJxQGXen6L33Lk,1616
-dodal/devices/turbo_slit.py,sha256=W3ZRIqDhq4iMhr5GcIiWvl2U1GaPtGanqkL7upQOZTY,1132
-dodal/devices/undulator.py,sha256=kn84MQpuBHtQj7H7HeBoAYKXu5buGKvTgs3tf2gdEdw,2074
+dodal/devices/turbo_slit.py,sha256=B6SPXqviMnG-U4PnUF1BdTO0LBKmTuwAUKRbxMiNJXo,1125
+dodal/devices/undulator.py,sha256=Uf7DpRjhtqkRcNWTqgtrRjoj6tLLgHEPgkxccWU6LE8,2073
 dodal/devices/undulator_dcm.py,sha256=qUMGKnRluO2jsfz6TuXx6ddN59MlLg1lBqloeBgYZIg,5134
 dodal/devices/webcam.py,sha256=znZHHmQjM0T0XSAYXJraCGlwPPGbt3PF6rWjTSbAikI,1394
-dodal/devices/xbpm_feedback.py,sha256=MxWi_jYGHJFehumadL9fuG8B9IDYCiWFMKjstAVmcoM,1209
-dodal/devices/zebra.py,sha256=MQleFvBeS94JqEhPLi7e9USC20nebeq0bcM_uTNHK34,9182
-dodal/devices/zebra_controlled_shutter.py,sha256=J6emrPmDhRXhH8d9m4dlGHJcNDhS1-T4Tr2AXJ1WXTY,1061
+dodal/devices/xbpm_feedback.py,sha256=-1wbnahJ_oSljQR0Sjiwn3mytVP-VwsAy0a_YPjPM0Y,1168
+dodal/devices/zebra.py,sha256=iTHkKv8EP-gkr0Cl2gR9yxt2qTHT2Q4etS67Rshf83k,9327
+dodal/devices/zebra_controlled_shutter.py,sha256=w2ISASJ_sb3dbQGi63Yuj3ymTkjX73aSl_ZTYs8TyaI,1860
 dodal/devices/areadetector/__init__.py,sha256=8IwLxuZMW0MOJpJp_ZDdlaE20hrtsH_PXWGaKgMiYs4,240
 dodal/devices/areadetector/adaravis.py,sha256=Cqw_Mzrp_zODFxQ2LZBJzHp_DsZ6_dAITkZz8gYz_0w,3797
 dodal/devices/areadetector/adsim.py,sha256=cIc9PRbKnftBk7Ut8d8CU_TVrin8EwcKHObP2n9VxWM,1876
 dodal/devices/areadetector/adutils.py,sha256=4axFR3wtn-K-sjMVJyfTcu-8g35odf2cY8mTKv1gS-o,3093
-dodal/devices/areadetector/plugins/MJPG.py,sha256=2ISGUg9JxJYzEH640WUIsvFwKolSTywkTyPy9wz6f_k,4064
+dodal/devices/areadetector/plugins/MJPG.py,sha256=MqxDbrgpTzM0ezjcEWuLlK80i4M_KLNfdknHCx7k_LM,4100
 dodal/devices/detector/__init__.py,sha256=-RdACL3tzc3lLArWOoGNje48UUlv2fElOmGOz9yOuO0,317
 dodal/devices/detector/det_dim_constants.py,sha256=LNrVMd0DbFEcnyNFmXosCP-VYaZ71Ajuv6inwo4Mg3U,2299
 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=h0vhSj_oKitECuM_yhfx_Mlff-BvYtpxWKJ3A9bJlLA,4829
-dodal/devices/detector/detector_motion.py,sha256=oB0I9HnIBTsDpEsKUYC7GgYQe4J_r0JsfIYZl8csDbA,1629
+dodal/devices/detector/detector.py,sha256=RT0cIytpTua1L4k0LrtsZYaXFpB0lkwlGN8q7sQhBrA,4767
+dodal/devices/detector/detector_motion.py,sha256=LjHNi9FcDSZoriQYrFde8fEmwCGccFgSHPtcxivix4g,1628
 dodal/devices/i03/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i04/transfocator.py,sha256=uieByXIj0JRbmvMB_om5NOAEbEJkzfkCD24bl2aEo1g,3154
 dodal/devices/i20_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/i22/dcm.py,sha256=csNl3UAR4Sw4OfAaZZHeUwn72a9xshIzGWs2fhiRzQE,6291
-dodal/devices/i22/fswitch.py,sha256=_ToiihS_6WjxwJ2gosvpcb-2JCrsE_pRwSPRdwm0tC8,3060
-dodal/devices/i22/nxsas.py,sha256=RRzZHfpHZv6tWppB77zsAXgXe71ETzNc6aAHNAJfqo8,5450
+dodal/devices/i22/dcm.py,sha256=YXf4iH4-dNTfm0NPUgrbn1iLP24id4pR8xLsvLc_iWg,6290
+dodal/devices/i22/fswitch.py,sha256=AlyZ_RdbXoMHrG2-sddNOUyLl3vkBdduXVnFL_rMgLo,3046
+dodal/devices/i22/nxsas.py,sha256=a8oJXl5uhkh9zcb9rSZmVooU-SplzzO3EsAaHJZRfrQ,6086
 dodal/devices/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/i24/aperture.py,sha256=kKfHli5oKp-j-qZhZoXTRK81SAUNyhpI6VRvtw0SkZA,850
-dodal/devices/i24/beamstop.py,sha256=28hQowTvgN5Zw38tkDh32h2ceyN-2GE8bAaGPvDOt5U,1234
-dodal/devices/i24/dcm.py,sha256=Hx5pQ-SHEQ_bLCOnpQYDm6-t-it7nNDmUvopGyiGA2w,1991
+dodal/devices/i24/aperture.py,sha256=bbT4ts5jfrjrOxG199RGDxIYmzVyv1k0ZlZcmS6kEzU,849
+dodal/devices/i24/beamstop.py,sha256=GpqSaHlyZfcUfaCgvQRjhDgNdGsrOwV_NqG9JLfcusY,1233
+dodal/devices/i24/dcm.py,sha256=nP2qymTy5TrOu078XOY7h1TEwVfcgli5lTyxmwsG4O8,1990
 dodal/devices/i24/dual_backlight.py,sha256=Th-RKr28aFxE8LCT_mdN9KkRIVw0BHLGKkI0ienfRZU,2049
-dodal/devices/i24/i24_detector_motion.py,sha256=Joqr1orgeNvRS7n01bjaO-4Yu4obb8fnKaWHQfjPX14,365
+dodal/devices/i24/i24_detector_motion.py,sha256=_HgdsZqFYY0tKqUgMzViHaPEUFXL3WlXXioGvDehRUw,364
 dodal/devices/i24/i24_vgonio.py,sha256=Igqs7687z6lyhGVeJEDtDmPachYxU48MUH2BF0RpK9Q,461
-dodal/devices/i24/pmac.py,sha256=vJrd8U00ZVoVJXcChMGzclPhc9TLVgKjNRVvm1Ufxcw,5266
+dodal/devices/i24/pmac.py,sha256=suWoOIQKhCeQvgBJ8_htRAG6k0REN32viElwvs2nkEg,5224
 dodal/devices/oav/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/oav/grid_overlay.py,sha256=kYs4sCvmo7yG75HQtptuI8jPzM7dR4fSqnOGL0D5j6g,5338
 dodal/devices/oav/microns_for_zoom_levels.json,sha256=kJTkbu2v6_Ccc_cDy7FRTX-gRhXxfYskjVqwBCZIqCQ,1209
@@ -101,32 +101,34 @@ dodal/devices/oav/oav_calculations.py,sha256=wt71vFcyQrr98FvX8oyUM2n5vmKi3K7PyOT
 dodal/devices/oav/oav_detector.py,sha256=NpIs6gcMrwe39M1y42M2ZtUhjrbl2LuMmNuUjjc13vg,3785
 dodal/devices/oav/oav_errors.py,sha256=cc4mGnaTiAc5WIlOt_BIYOc7CRSkrCdnBaavfAJ0pXY,754
 dodal/devices/oav/oav_parameters.py,sha256=rI0kRl8B-N2mw91yYf1lEQVn0hkBQCPU7jvljr5ZNpk,8235
-dodal/devices/oav/oav_to_redis_forwarder.py,sha256=h5TBcA7uigKPSlslz29itD1z7jvvKQ-5ftWZYmCEmZY,3688
+dodal/devices/oav/oav_to_redis_forwarder.py,sha256=3I8Vk1Qx04aVftXb7VVkHUVHweGGUyuLFdmaasmb_Qk,4606
 dodal/devices/oav/utils.py,sha256=OyE4h4eq_jg9bEq5DfcjCU-wfSJifO2-PIsrDbsa0NE,3020
 dodal/devices/oav/pin_image_recognition/__init__.py,sha256=l5IsWMDZDw3-jk0DkGpiw_BzqyfVYRonlfX6Je1ZPR0,6446
 dodal/devices/oav/pin_image_recognition/manual_test.py,sha256=h1Rto6ZDCB3jWhjSy9N8ECxRN583iYDJr9LxrTJ8kfE,903
 dodal/devices/oav/pin_image_recognition/utils.py,sha256=L9ypluYqeOFoS7gQuws-vTNc8LqaKl2ZIDNeQ2JaNpg,8592
 dodal/devices/p99/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/p99/sample_stage.py,sha256=kvwKCDUmXqcoXfIbAENtqm3Hi2cHP7dZIPQgQT6hsXw,1140
+dodal/devices/training_rig/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dodal/devices/training_rig/sample_stage.py,sha256=jktTp837ij8wor5LidE3AajCk95L7DebJotMlO7QwTE,355
 dodal/devices/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dodal/devices/util/adjuster_plans.py,sha256=kAgC0Ze_gif4A0B1OOjUHAWvnvxX42oKrvIypNVO8Lk,879
+dodal/devices/util/adjuster_plans.py,sha256=g4HTpji3XhIhpWvyDLyCYYLGOSE7uNpDeQHfh8259hE,878
 dodal/devices/util/epics_util.py,sha256=R0_I9HEZ2l19BZaTpevPqT3p3kp5GZCfmNNmnXGfdsc,4689
 dodal/devices/util/lookup_tables.py,sha256=EkO4FlRluakobZzmTQnl1XYYuzezE5T4O760bDTtYRM,2137
 dodal/devices/util/motor_utils.py,sha256=pNY-aUk9LxaIWeDr5rpMS6udiB9j19wcCXkNDLp1uA0,257
-dodal/devices/util/save_panda.py,sha256=7hoR3pRrnDaouRzkq4Dk-KcTg5oGtqObfjnH-8VZQc4,2531
-dodal/devices/util/test_utils.py,sha256=MiXb-tJciL5tk0FvF2hiAqPM_32I69wqi6gVpLXNx6I,563
-dodal/devices/xspress3/xspress3.py,sha256=29elzI3JtceryKeMWXhcP9nWl0tlSdnTZhltCitet6A,4668
+dodal/devices/util/save_panda.py,sha256=PHFlkerBhkkU0-o5dNEdi2P95_jD9Lk8yYgaqn9R97o,2538
+dodal/devices/util/test_utils.py,sha256=VrSFFGLNKOcCAsWFMZOxwhng3wGR5kV8NqqnKfj8Vuw,562
+dodal/devices/xspress3/xspress3.py,sha256=JTx3ppAc8GwV9K-Gfqo81iGYH_L-ONyFWiPRs9XUs-w,4661
 dodal/devices/xspress3/xspress3_channel.py,sha256=yJRwseLmtkW2Vv6GB8sLdOFuBn3e4c9Q8fgPacMgl5w,1638
 dodal/devices/zocalo/__init__.py,sha256=oPhjFB39yf2NWkGD-MMcPFnnOVZ_RtdyBt2OLYn-Xa4,505
 dodal/devices/zocalo/zocalo_interaction.py,sha256=cc-OwjNsh9oMpMghceVWKW9gym_TFmP-mOYBd3H1H7Q,3379
-dodal/devices/zocalo/zocalo_results.py,sha256=O97H-ZX2qtzSHXpxCesOt9Ghb0K_JNjddDw8KC5R4Go,9911
+dodal/devices/zocalo/zocalo_results.py,sha256=L4bUc8xkYCmn5KCx_vcMKFBiBO5F9nhYEffv8fGUS48,9891
 dodal/parameters/experiment_parameter_base.py,sha256=O7JamfuJ5cYHkPf9tsHJPqn-OMHTAGouigvM1cDFehE,313
-dodal/plans/check_topup.py,sha256=Pj6Eu8fa6nvoW4awrMxvzE_ftpLfYz8bN0QDLRw0Yuk,2989
-dodal/plans/data_session_metadata.py,sha256=TolX_js4mfO_oT3ee9RaB4AyAv8vO-Un9p0ej7cyB80,1695
-dodal/plans/motor_util_plans.py,sha256=pOiytk5L85z7jAcCt7uJ-_XuqnIFCs4ENp6TictQy_I,4523
-dls_dodal-1.30.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-dls_dodal-1.30.0.dist-info/METADATA,sha256=XR1WeLos79yzY6LsNxDD_v2IcOACDZaF885uhbyTSIw,16548
-dls_dodal-1.30.0.dist-info/WHEEL,sha256=nCVcAvsfA9TDtwGwhYaRrlPhTLV9m-Ga6mdyDtuwK18,91
-dls_dodal-1.30.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
-dls_dodal-1.30.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
-dls_dodal-1.30.0.dist-info/RECORD,,
+dodal/plans/check_topup.py,sha256=3gyLHfHNQBCgEWuAg4QE-ONx7y2Do1vVv5HP8ss0Z1I,5371
+dodal/plans/data_session_metadata.py,sha256=urexZ3mA0K6VWxVW3MlrcsB1Tyi09tFvpKBlaVil7TQ,1567
+dodal/plans/motor_util_plans.py,sha256=JT1K4DBB66MrzNqimxFgiL6mRsj11fF7xZXOz0udEeo,4522
+dls_dodal-1.31.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+dls_dodal-1.31.0.dist-info/METADATA,sha256=uNvk8E5kYjd9SACW3TCTd32eTJtrTCHJSM_bn9sZhyc,16547
+dls_dodal-1.31.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+dls_dodal-1.31.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
+dls_dodal-1.31.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
+dls_dodal-1.31.0.dist-info/RECORD,,

{dls_dodal-1.30.0.dist-info → dls_dodal-1.31.0.dist-info}/WHEEL

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

dodal/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.30.0'
-__version_tuple__ = version_tuple = (1, 30, 0)
+__version__ = version = '1.31.0'
+__version_tuple__ = version_tuple = (1, 31, 0)

dodal/beamline_specific_utils/i03.py

@@ -1,7 +1,5 @@
 from dataclasses import dataclass
 
-from dodal.devices.aperturescatterguard import SingleAperturePosition
-
 I03_BEAM_HEIGHT_UM = 20
 
 
@@ -11,6 +9,5 @@ class BeamSize:
     y_um: float | None
 
 
-def beam_size_from_aperture(position: SingleAperturePosition):
-    aperture_size = position.radius_microns
+def beam_size_from_aperture(aperture_size: float | None):
     return BeamSize(aperture_size, I03_BEAM_HEIGHT_UM if aperture_size else None)

dodal/beamlines/__init__.py

@@ -13,6 +13,10 @@ _BEAMLINE_NAME_OVERRIDES = {
     "i13-1": "i13_1",
     "i20-1": "i20_1",
     "s03": "i03",
+    "p46": "training_rig",
+    "p47": "training_rig",
+    "p48": "training_rig",
+    "p49": "training_rig",
 }
 
 

dodal/beamlines/i03.py

@@ -1,17 +1,17 @@
-from ophyd_async.panda import HDFPanda
+from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_parameters import get_beamline_parameters
 from dodal.common.beamlines.beamline_utils import (
     device_instantiation,
-    get_directory_provider,
-    set_directory_provider,
+    get_path_provider,
+    set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-from dodal.common.udc_directory_provider import PandASubdirectoryProvider
+from dodal.common.udc_directory_provider import PandASubpathProvider
 from dodal.devices.aperturescatterguard import (
+    AperturePosition,
     ApertureScatterguard,
     load_positions_from_beamline_parameters,
-    load_tolerances_from_beamline_params,
 )
 from dodal.devices.attenuator import Attenuator
 from dodal.devices.backlight import Backlight
@@ -52,7 +52,7 @@ BL = get_beamline_name("s03")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
-set_directory_provider(PandASubdirectoryProvider())
+set_path_provider(PandASubpathProvider())
 
 
 def aperture_scatterguard(
@@ -71,7 +71,7 @@ def aperture_scatterguard(
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,
         loaded_positions=load_positions_from_beamline_parameters(params),
-        tolerances=load_tolerances_from_beamline_params(params),
+        tolerances=AperturePosition.tolerances_from_gda_params(params),
     )
 
 
@@ -378,7 +378,7 @@ def panda(
         "-EA-PANDA-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 

dodal/beamlines/i04.py

@@ -2,13 +2,12 @@ from dodal.common.beamlines.beamline_parameters import get_beamline_parameters
 from dodal.common.beamlines.beamline_utils import device_instantiation
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.aperturescatterguard import (
+    AperturePosition,
     ApertureScatterguard,
     load_positions_from_beamline_parameters,
-    load_tolerances_from_beamline_params,
 )
 from dodal.devices.attenuator import Attenuator
 from dodal.devices.backlight import Backlight
-from dodal.devices.beamstop import BeamStop
 from dodal.devices.dcm import DCM
 from dodal.devices.detector import DetectorParams
 from dodal.devices.detector.detector_motion import DetectorMotion
@@ -107,14 +106,14 @@ def ipin(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) ->
 
 def beamstop(
     wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> BeamStop:
+) -> XYZPositioner:
     """Get the i04 beamstop device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.
     """
     return device_instantiation(
-        BeamStop,
+        XYZPositioner,
         "beamstop",
-        "",
+        "-MO-BS-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
     )
@@ -237,7 +236,7 @@ def aperture_scatterguard(
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,
         loaded_positions=load_positions_from_beamline_parameters(params),
-        tolerances=load_tolerances_from_beamline_params(params),
+        tolerances=AperturePosition.tolerances_from_gda_params(params),
     )
 
 
@@ -411,9 +410,11 @@ def oav_to_redis_forwarder(
     """
     return device_instantiation(
         OAVToRedisForwarder,
-        "oav_to_redis",
-        "",
+        "oav_to_redis_forwarder",
+        "-DI-OAV-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        params=OAVConfigParams(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
+        redis_host=REDIS_HOST,
+        redis_password=REDIS_PASSWORD,
+        redis_db=7,
     )

dodal/beamlines/i13_1.py

@@ -1,14 +1,14 @@
 from pathlib import Path
 
-from ophyd_async.epics.areadetector.aravis import AravisDetector
+from ophyd_async.epics.adaravis import AravisDetector
 
 from dodal.common.beamlines.beamline_utils import (
     device_instantiation,
-    get_directory_provider,
-    set_directory_provider,
+    get_path_provider,
+    set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-from dodal.common.visit import StaticVisitDirectoryProvider
+from dodal.common.visit import StaticVisitPathProvider
 from dodal.devices.motors import XYZPositioner
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import get_beamline_name
@@ -16,8 +16,8 @@ from dodal.utils import get_beamline_name
 BL = get_beamline_name("i13-1")
 set_log_beamline(BL)
 set_utils_beamline(BL)
-set_directory_provider(
-    StaticVisitDirectoryProvider(
+set_path_provider(
+    StaticVisitPathProvider(
         BL,
         Path("/data/2024/cm37257-4/"),  # latest commissioning visit
     )
@@ -60,7 +60,7 @@ def side_camera(
         bl_prefix=False,
         drv_suffix="CAM:",
         hdf_suffix="HDF5:",
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,
     )

dodal/beamlines/i22.py

@@ -1,16 +1,17 @@
 from pathlib import Path
 
-from ophyd_async.epics.areadetector import AravisDetector, PilatusDetector
-from ophyd_async.panda import HDFPanda
+from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.epics.adpilatus import PilatusDetector
+from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
     device_instantiation,
-    get_directory_provider,
-    set_directory_provider,
+    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 numbered_slits
-from dodal.common.visit import DirectoryServiceClient, StaticVisitDirectoryProvider
+from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.focusing_mirror import FocusingMirror
 from dodal.devices.i22.dcm import CrystalMetadata, DoubleCrystalMonochromator
 from dodal.devices.i22.fswitch import FSwitch
@@ -32,11 +33,11 @@ set_utils_beamline(BL)
 # Communication with GDA is also WIP so for now we determine an arbitrary scan number
 # locally and write the commissioning directory. The scan number is not guaranteed to
 # be unique and the data is at risk - this configuration is for testing only.
-set_directory_provider(
-    StaticVisitDirectoryProvider(
+set_path_provider(
+    StaticVisitPathProvider(
         BL,
         Path("/dls/i22/data/2024/cm37271-2/bluesky"),
-        client=DirectoryServiceClient("http://i22-control:8088/api"),
+        client=RemoteDirectoryServiceClient("http://i22-control:8088/api"),
     )
 )
 
@@ -61,7 +62,7 @@ def saxs(
             sensor_thickness=(0.45, "mm"),
             distance=(4711.833684146172, "mm"),
         ),
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -97,7 +98,7 @@ def waxs(
             sensor_thickness=(0.45, "mm"),
             distance=(175.4199417092314, "mm"),
         ),
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -112,7 +113,7 @@ def i0(
         wait_for_connection,
         fake_with_ophyd_sim,
         type="Cividec Diamond XBPM",
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -127,7 +128,7 @@ def it(
         wait_for_connection,
         fake_with_ophyd_sim,
         type="PIN Diode",
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -234,7 +235,6 @@ def slits_3(
     )
 
 
-@skip_device()
 def slits_4(
     wait_for_connection: bool = True,
     fake_with_ophyd_sim: bool = False,
@@ -296,7 +296,7 @@ def panda1(
         "-EA-PANDA-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -311,7 +311,7 @@ def panda2(
         "-EA-PANDA-02:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -326,7 +326,7 @@ def panda3(
         "-EA-PANDA-03:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -341,7 +341,7 @@ def panda4(
         "-EA-PANDA-04:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -362,7 +362,7 @@ def oav(
             description="AVT Mako G-507B",
             distance=(-1.0, "m"),
         ),
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 

dodal/beamlines/p38.py

@@ -1,16 +1,16 @@
 from pathlib import Path
 
-from ophyd_async.epics.areadetector import AravisDetector
-from ophyd_async.panda import HDFPanda
+from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
     device_instantiation,
-    get_directory_provider,
-    set_directory_provider,
+    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 numbered_slits
-from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitDirectoryProvider
+from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.focusing_mirror import FocusingMirror
 from dodal.devices.i22.dcm import CrystalMetadata, DoubleCrystalMonochromator
 from dodal.devices.i22.fswitch import FSwitch
@@ -30,8 +30,8 @@ set_utils_beamline(BL)
 # Communication with GDA is also WIP so for now we determine an arbitrary scan number
 # locally and write the commissioning directory. The scan number is not guaranteed to
 # be unique and the data is at risk - this configuration is for testing only.
-set_directory_provider(
-    StaticVisitDirectoryProvider(
+set_path_provider(
+    StaticVisitPathProvider(
         BL,
         Path("/dls/p38/data/2024/cm37282-2/bluesky"),
         client=LocalDirectoryServiceClient(),
@@ -50,7 +50,7 @@ def d3(
         fake_with_ophyd_sim,
         drv_suffix="DET:",
         hdf_suffix="HDF5:",
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -67,7 +67,7 @@ def d11(
         fake_with_ophyd_sim,
         drv_suffix="DET:",
         hdf_suffix="HDF5:",
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -82,7 +82,7 @@ def d12(
         fake_with_ophyd_sim,
         drv_suffix="DET:",
         hdf_suffix="HDF5:",
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -96,7 +96,7 @@ def i0(
         "-EA-XBPM-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -273,7 +273,7 @@ def panda1(
         "-EA-PANDA-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -288,7 +288,7 @@ def panda2(
         "-EA-PANDA-02:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )
 
 
@@ -303,7 +303,7 @@ def panda3(
         "-EA-PANDA-03:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        directory_provider=get_directory_provider(),
+        path_provider=get_path_provider(),
     )