mx-bluesky 1.4.4__py3-none-any.whl → 1.4.6__py3-none-any.whl

mx_bluesky/hyperion/utils/__init__.py

@@ -0,0 +1 @@
+# placeholder file to start layout

mx_bluesky/hyperion/utils/context.py

@@ -1,74 +1,9 @@
-import dataclasses
-from typing import Any, ClassVar, Protocol, TypeVar, get_type_hints
-
 from blueapi.core import BlueskyContext
-from blueapi.core.bluesky_types import Device
 from dodal.utils import get_beamline_based_on_environment_variable
 
 import mx_bluesky.hyperion.experiment_plans as hyperion_plans
 from mx_bluesky.common.utils.log import LOGGER
 
-T = TypeVar("T", bound=Device)
-
-
-class _IsDataclass(Protocol):
-    """Protocol followed by any dataclass"""
-
-    __dataclass_fields__: ClassVar[dict]
-
-
-DT = TypeVar("DT", bound=_IsDataclass)
-
-
-def find_device_in_context(
-    context: BlueskyContext,
-    name: str,
-    # Typing in here is wrong (see https://github.com/microsoft/pyright/issues/7228#issuecomment-1934500232)
-    # but this whole thing will go away when we do https://github.com/DiamondLightSource/hyperion/issues/868
-    expected_type: type[T] = Device,  # type: ignore
-) -> T:
-    LOGGER.debug(f"Looking for device {name} of type {expected_type} in context")
-
-    device = context.find_device(name)
-    if device is None:
-        raise ValueError(
-            f"Cannot find device named '{name}' in bluesky context {context.devices}."
-        )
-
-    if not isinstance(device, expected_type):
-        raise ValueError(
-            f"Found device named '{name}' and expected it to be a '{expected_type}' but it was a '{device.__class__.__name__}'"
-        )
-
-    LOGGER.debug(f"Found matching device {device}")
-    return device
-
-
-def device_composite_from_context(context: BlueskyContext, dc: type[DT]) -> DT:
-    """
-    Initializes all of the devices referenced in a given dataclass from a provided
-    context, checking that the types of devices returned by the context are compatible
-    with the type annotations of the dataclass.
-
-    Note that if the context was not created with `wait_for_connection=True` devices may
-    still be unconnected.
-    """
-    LOGGER.debug(
-        f"Attempting to initialize devices referenced in dataclass {dc} from blueapi context"
-    )
-
-    devices: dict[str, Any] = {}
-    dc_type_hints: dict[str, Any] = get_type_hints(dc)
-
-    for field in dataclasses.fields(dc):
-        device = find_device_in_context(
-            context, field.name, expected_type=dc_type_hints.get(field.name, Device)
-        )
-
-        devices[field.name] = device
-
-    return dc(**devices)
-
 
 def setup_context(wait_for_connection: bool = True) -> BlueskyContext:
     context = BlueskyContext()

mx_bluesky/hyperion/utils/validation.py

@@ -11,8 +11,8 @@ from dodal.beamlines import i03
 from dodal.devices.oav.oav_parameters import OAVConfig
 from ophyd_async.testing import set_mock_value
 
-from mx_bluesky.hyperion.device_setup_plans.read_hardware_for_setup import (
-    read_hardware_during_collection,
+from mx_bluesky.common.plans.read_hardware import (
+    standard_read_hardware_during_collection,
 )
 from mx_bluesky.hyperion.experiment_plans.rotation_scan_plan import (
     RotationScanComposite,
@@ -67,7 +67,7 @@ def fake_rotation_scan(
         }
     )
     def plan():
-        yield from read_hardware_during_collection(
+        yield from standard_read_hardware_during_collection(
             rotation_devices.aperture_scatterguard,
             rotation_devices.attenuator,
             rotation_devices.flux,
@@ -79,27 +79,30 @@ def fake_rotation_scan(
 
 
 def fake_create_rotation_devices():
-    beamstop = i03.beamstop(fake_with_ophyd_sim=True)
-    eiger = i03.eiger(fake_with_ophyd_sim=True)
-    smargon = i03.smargon(fake_with_ophyd_sim=True)
-    zebra = i03.zebra(fake_with_ophyd_sim=True)
-    detector_motion = i03.detector_motion(fake_with_ophyd_sim=True)
-    backlight = i03.backlight(fake_with_ophyd_sim=True)
-    attenuator = i03.attenuator(fake_with_ophyd_sim=True)
-    flux = i03.flux(fake_with_ophyd_sim=True)
-    undulator = i03.undulator(fake_with_ophyd_sim=True)
-    aperture_scatterguard = i03.aperture_scatterguard(fake_with_ophyd_sim=True)
-    synchrotron = i03.synchrotron(fake_with_ophyd_sim=True)
-    s4_slit_gaps = i03.s4_slit_gaps(fake_with_ophyd_sim=True)
-    dcm = i03.dcm(fake_with_ophyd_sim=True)
-    robot = i03.robot(fake_with_ophyd_sim=True)
+    beamstop = i03.beamstop(connect_immediately=True, mock=True)
+    eiger = i03.eiger(connect_immediately=True, mock=True)
+    smargon = i03.smargon(connect_immediately=True, mock=True)
+    zebra = i03.zebra(connect_immediately=True, mock=True)
+    detector_motion = i03.detector_motion(connect_immediately=True, mock=True)
+    backlight = i03.backlight(mock=True)
+    attenuator = i03.attenuator(connect_immediately=True, mock=True)
+    flux = i03.flux(connect_immediately=True, mock=True)
+    undulator = i03.undulator(connect_immediately=True, mock=True)
+    aperture_scatterguard = i03.aperture_scatterguard(
+        connect_immediately=True, mock=True
+    )
+    synchrotron = i03.synchrotron(connect_immediately=True, mock=True)
+    s4_slit_gaps = i03.s4_slit_gaps(connect_immediately=True, mock=True)
+    dcm = i03.dcm(connect_immediately=True, mock=True)
+    robot = i03.robot(connect_immediately=True, mock=True)
     oav = i03.oav(
-        fake_with_ophyd_sim=True,
+        connect_immediately=True,
+        mock=True,
         params=OAVConfig(
             zoom_params_file=ZOOM_LEVELS_XML, display_config_file=DISPLAY_CONFIGURATION
         ),
     )
-    xbpm_feedback = i03.xbpm_feedback(fake_with_ophyd_sim=True)
+    xbpm_feedback = i03.xbpm_feedback(connect_immediately=True, mock=True)
 
     set_mock_value(smargon.omega.max_velocity, 131)
     set_mock_value(dcm.energy_in_kev.user_readback, 12700)
@@ -120,7 +123,7 @@ def fake_create_rotation_devices():
         zebra=zebra,
         robot=robot,
         oav=oav,
-        sample_shutter=i03.sample_shutter(fake_with_ophyd_sim=True),
+        sample_shutter=i03.sample_shutter(connect_immediately=True, mock=True),
         xbpm_feedback=xbpm_feedback,
     )
 

{mx_bluesky-1.4.4.dist-info → mx_bluesky-1.4.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mx-bluesky
-Version: 1.4.4
+Version: 1.4.6
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -215,6 +215,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: annotated_types
 Requires-Dist: caproto
+Requires-Dist: confluent-kafka==2.8.0
 Requires-Dist: fastapi[all]
 Requires-Dist: flask-restful
 Requires-Dist: ispyb
@@ -237,9 +238,9 @@ Requires-Dist: matplotlib
 Requires-Dist: blueapi>=0.5.0
 Requires-Dist: daq-config-server>=0.1.1
 Requires-Dist: ophyd==1.9.0
-Requires-Dist: ophyd-async>=0.8a5
+Requires-Dist: ophyd-async>=0.9.0a2
 Requires-Dist: bluesky>=1.13
-Requires-Dist: dls-dodal==1.39.0
+Requires-Dist: dls-dodal==1.41.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"
@@ -253,7 +254,7 @@ Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: plantweb; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pydata-sphinx-theme>=0.12; extra == "dev"
-Requires-Dist: pyright; extra == "dev"
+Requires-Dist: pyright==1.1.394; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-random-order; extra == "dev"

{mx_bluesky-1.4.4.dist-info → mx_bluesky-1.4.6.dist-info}/RECORD

@@ -1,35 +1,36 @@
 mx_bluesky/__init__.py,sha256=Ksms_WJF8LTkbm38gEpm1jBpGqcQ8NGvmb2ZJlOE1j8,198
 mx_bluesky/__main__.py,sha256=RVqPnxDisFMIn_aoEi0drlThNHgKTJULnSrotouIKI0,480
-mx_bluesky/_version.py,sha256=xV-8Yj_iWn4cgetLWs0HBzWrymonMn9cAMsYPhJoE9k,411
+mx_bluesky/_version.py,sha256=X_hmmrOxuP6swjoZFdUO_TT0Oqty4TKqejPSCRgbntM,511
+mx_bluesky/definitions.py,sha256=ULpEYAUzdQiEbBoTgYTMxfUf3DDDjhYtvDxofs7Qxqw,168
 mx_bluesky/jupyter_example.ipynb,sha256=wpwvPrBvwtRMS5AIFk8F54cIlUoD0o4ji8tKK5cZHA4,1672
 mx_bluesky/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/beamlines/i04/__init__.py,sha256=jZjAMN5_oOEjQoR3iTrnMFW3ElxlHhQ7pEQZIv21Y4I,129
-mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py,sha256=10PKvDRKaaTtlOCfRG8T00XwpIFR9m8jk96QES13LpQ,5894
-mx_bluesky/beamlines/i04/thawing_plan.py,sha256=YykXHXINBDnQ0wJ577v4XrXwcqlRRgoUSbaNuOKd1bc,5464
+mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py,sha256=gcSHxYbmUO9DEVw86jfSR7eFpgYR_XgBN9hwP5_N6y0,6130
+mx_bluesky/beamlines/i04/thawing_plan.py,sha256=1khKSUcY67_kqFF44rYxjv2KIfwrrj71GEzZSak-Jqo,4771
 mx_bluesky/beamlines/i04/callbacks/murko_callback.py,sha256=ZIwkY6gdcmIE-aMBvehN8DVcjGRtb9wwzpgHJNMZ39Q,2125
 mx_bluesky/beamlines/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/beamlines/i24/serial/__init__.py,sha256=gSP8Vu9PMDeIgzge48XS3bOdmvb_a9k8RQP98BNcdZg,1080
+mx_bluesky/beamlines/i24/serial/__init__.py,sha256=XnCeh2GahduKp7d9aFgNjm_SMgh6F0E5M2tk0bNFivY,1423
 mx_bluesky/beamlines/i24/serial/blueapi_config.yaml,sha256=gwOfjzZMbcvpVH71CCyHaxr8hgPYCJIWWWfg1zErtmM,245
-mx_bluesky/beamlines/i24/serial/dcid.py,sha256=iT2mXcS7bG1rQ1l_VlENNh47vsB0CwxRar8I_BHD4AA,14486
-mx_bluesky/beamlines/i24/serial/log.py,sha256=oK7HHjIeuiWdy1vNZL6p-mU8Y3kzeCAgsifCxhAYqOQ,4799
+mx_bluesky/beamlines/i24/serial/dcid.py,sha256=Y2bL0AGPvBqQ4gbqbxjCMG2UJqqIY1B7YAW0C_UxS7Q,14530
+mx_bluesky/beamlines/i24/serial/log.py,sha256=o9xydsKeYdj_sSE56lY4el3FkKjC7cX2VykByiP5UUE,4798
 mx_bluesky/beamlines/i24/serial/run_extruder.sh,sha256=FXYsqdTpVgxB1-QrY4Tg5pl5Ex7PgUoXnuAcr9iDZTE,1078
 mx_bluesky/beamlines/i24/serial/run_fixed_target.sh,sha256=ZzxcVFoitBRvcqsJaBxjtepgkG-ZCGBW6X9xuV_Y478,1229
 mx_bluesky/beamlines/i24/serial/run_serial.py,sha256=Zrudosavh2HnnBXd2CLtOPs3lyQFxaN8YyO_sradRGs,1511
 mx_bluesky/beamlines/i24/serial/run_ssx.sh,sha256=0Ir5iQQ-xSN_5teHtxzht6G-mJ08mE1gxBS32vkh1eM,714
 mx_bluesky/beamlines/i24/serial/set_visit_directory.sh,sha256=WuN5PUBxTofzuESk1-3gWtTcbPjOx-26JaQSVCsZhZs,1660
 mx_bluesky/beamlines/i24/serial/start_blueapi.sh,sha256=4iBzQljTLXQiVIF4UO7drc9qUkP7KSRC6Mjh8hcGxpI,608
-mx_bluesky/beamlines/i24/serial/write_nexus.py,sha256=wb9tQwiWL5BH_XgLH-S9TS5_M2WYMasZzyOiiwjG5z8,3950
+mx_bluesky/beamlines/i24/serial/write_nexus.py,sha256=oCaaPHoEsZ4OhnQIMl4egcyxE_yrGJJBJXVCxws0P9g,3977
 mx_bluesky/beamlines/i24/serial/extruder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/beamlines/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py,sha256=R4Y6axJjULq9ejdRCymNABiAty-uTaZRES5cs8c0-XI,18833
+mx_bluesky/beamlines/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py,sha256=hEPr1rVltE4AtS92tGrkxAC3PKgI_56q-KRMOWx17Ng,18763
 mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DetStage.edl,sha256=9L1CgEdxZD4N3QvM5HLlAlJTcxpzd4ahB2nVJ9jHujw,2013
 mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl,sha256=JaS-PvAHEOqHRuH3LbdpOk2T-TlO8Enq_uwzokQXzZU,31349
 mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/microdrop_alignment.edl,sha256=K79vmGAcf9qVEQLXTgr0g4bZDWaJ7nFoK4e0Ex7qAwM,14690
 mx_bluesky/beamlines/i24/serial/fixed_target/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/beamlines/i24/serial/fixed_target/ft_utils.py,sha256=puO1vg0x-TPgv8FbEFg73ohJqbwDpcG50_2cLUTa2FA,1210
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py,sha256=NgeorAKdXxYDFEkcy4jAq2CFNdqDT--TWSul4bsGkw4,26154
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py,sha256=DbdkQkZFkhGDzi_Xcu1YB2LqHzsQyf-RubphIDbQe4k,33196
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py,sha256=YRE7iO4cbzXLW5gTyDaLsdFMCVbhQCAdx7uJdw7ubXs,26273
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py,sha256=TYdr4XWbLNsmouFmDPhhjEvSXl-fnRULyP52IcDqZlw,32846
 mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_StartUp_py3v1.py,sha256=Vokr_Gl_lpqcUwG18C2h8TYMmyTx1HmUSDd9zgR9-7M,3275
-mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py,sha256=qciUnif6yd5KwJ8_XvRgafHJOFnzJIMg5Bwfjp0VOzw,6418
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py,sha256=IngONbndrLjCmnvMJwHSQcbDul05wFFgI9L4FWkgwLE,6396
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/CustomChip_py3v1.edl,sha256=H9BVU1S3oy8tAVHtKvJvp7YTHA-4X-jtOtiu3jJ7of4,10348
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DetStage.edl,sha256=WBji5SaRQ5e0KFRgrPuv6IgaFxkal1jh7MZW8SqQN88,2016
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl,sha256=-O_kRA5-m741Mja8OXQlGJWrRu9uBUkTvJ_uqUBjuFY,56616
@@ -43,7 +44,7 @@ mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl,sha2
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/short1-laser.png,sha256=wDNuKCa_8hUPy4W01vdIrfdZtCyQKT8qVS5AS6kOTmo,9740
 mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/short2-laser.png,sha256=MrdiCFX7j-ODkfSdzc4NQ_8hj2Gs8i9gQqWyNXvdM5s,10189
 mx_bluesky/beamlines/i24/serial/parameters/__init__.py,sha256=fdXGnTxNRyWV1cqVv8lQmwhUpUWDoz_VIRlo6KGwvS4,615
-mx_bluesky/beamlines/i24/serial/parameters/constants.py,sha256=oFneLWl70pmA9Q9mrsFga_F0EtkFgoQRDPKg-Udhog8,1815
+mx_bluesky/beamlines/i24/serial/parameters/constants.py,sha256=uJE3K7p1s8rXrgA0vH2JKrTaitH5ZDqLoSp_0ZmSCB4,1815
 mx_bluesky/beamlines/i24/serial/parameters/experiment_parameters.py,sha256=n6nRgycKMp5GuxwNoU30CP9enW7vTtTKHKIcIOH9ABY,4879
 mx_bluesky/beamlines/i24/serial/parameters/utils.py,sha256=VcCEBjC8WSrf85Q20A6dwnsy4IxvjcB4JSlbYKz_CVM,2673
 mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/cs_maker.json,sha256=xT3y7SSWjVTAJ58dzwNnEgBdn10A6T8umR18n5xt508,142
@@ -54,11 +55,14 @@ mx_bluesky/beamlines/i24/serial/setup_beamline/__init__.py,sha256=UhBdMcPdJMzwV0
 mx_bluesky/beamlines/i24/serial/setup_beamline/ca.py,sha256=H2gPmsLheYReFlGPFa5zzWbnyqdWbCmgKiAwcpVoYfk,1516
 mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py,sha256=aYgIKeBck2wliQyLq-uukuPiyN7WTkNutLAM6ys3WuM,15623
 mx_bluesky/beamlines/i24/serial/setup_beamline/pv_abstract.py,sha256=WbD5ghgTG0F3-MR0XYm4nkiKYswVP5a2COYx_k_cngE,1806
-mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py,sha256=25kO1JXPl3OVSUf1G4RdcM6ZXbfduskEaDIbZN2xIE8,20595
-mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py,sha256=riBXkgAg3lV6dqoCng_3IF8ZfhwvOHf0zqktJC0rfn0,3241
-mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py,sha256=2e0pWs_ZrGDzp-tnfSE9XdurFH1K9rvh_1-bNY3U0yA,18078
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py,sha256=UnfYQwCUGo6rCmJphZ28I8SK8WoVEUFEaTyshGwufeI,20573
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py,sha256=E8G2F9rvmWJpMEApAmOMOITcIN4JSzmplnLZSXtRokk,3171
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py,sha256=BkJ3ZrE7g-KnQQHbLhtpDtZYD3vOWoL5zSc4ZX7vBLE,17938
+mx_bluesky/beamlines/i24/serial/web_gui_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py,sha256=R1VwqqhPAfG0C8DtIu1ymPpWqJBxYdoWSc0lAdqi1Tk,3538
 mx_bluesky/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/common/device_setup_plans/read_hardware_for_setup.py,sha256=P018shGBEdO0QWBufwITOk3p-sPUCy4P6UIkf6aUuho,583
+mx_bluesky/common/xrc_result.py,sha256=J1uB9Bujz_Sq_MwvYdWOZL3c6kX09TSaZW3eetRXBpw,2351
+mx_bluesky/common/device_setup_plans/setup_panda.py,sha256=OF-ZygZyAyQEUdrAWiIxWZ6QhAsVx4Mm9ngRYB1mzKI,433
 mx_bluesky/common/external_interaction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/external_interaction/config_server.py,sha256=EmvLfOkvoJlnKa0sffAKNICkY26YsQQqY9sYHKmOGzw,2441
 mx_bluesky/common/external_interaction/test_config_server.py,sha256=4wdYsOpXJfc3yNBZvdcjZGSllOHzKBTB8oYFjjSOufU,960
@@ -70,86 +74,87 @@ mx_bluesky/common/external_interaction/callbacks/common/ispyb_callback_base.py,s
 mx_bluesky/common/external_interaction/callbacks/common/ispyb_mapping.py,sha256=n4HUDvJyBmX4pmc0JAFI_pSxYbOL6QFKv2NxH3WF_Ac,2576
 mx_bluesky/common/external_interaction/callbacks/common/log_uid_tag_callback.py,sha256=pfZxQfS9SnXep3F2YAPptDX5bjjWvbXtgy5fINfsoTU,626
 mx_bluesky/common/external_interaction/callbacks/common/logging_callback.py,sha256=NHb8Gp86TAk6PRTV3inWrlW-Lj96LmnZda7ZGewlrFA,712
-mx_bluesky/common/external_interaction/callbacks/common/plan_reactive_callback.py,sha256=7UtkXZluAag_Mx_JnESd7ODPSN3WrcNCgN8mquIpxjE,4086
+mx_bluesky/common/external_interaction/callbacks/common/plan_reactive_callback.py,sha256=3TYQXibOWIKnvM2PMTIjE2IOoX2Jkt9b2KpDCytQtYE,4088
 mx_bluesky/common/external_interaction/callbacks/common/zocalo_callback.py,sha256=RubHJ6wjImsweISHZCG1rI2xcN-49HxmVcwDIaLR6Lc,3728
 mx_bluesky/common/external_interaction/callbacks/xray_centre/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py,sha256=sHtc45hKAmxjZRlm4jKwqqoo1AiwgueO74p99Qv7vRU,11835
-mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_mapping.py,sha256=dQicTEZ0qvUTkcRnegc4eHBTdQ0EaxdewJCvaZKlftw,1818
+mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py,sha256=jm41IQVU08RLjl0c1y9Vm3NAEXYJfi0hg4m_G7bn3tQ,12126
+mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_mapping.py,sha256=fOYJkqaXEfCdLGQwGhTrzfGOj6Ed3t2wcRgv68DOOHc,1790
 mx_bluesky/common/external_interaction/callbacks/xray_centre/nexus_callback.py,sha256=g9ovYSnb6-bB4RqG1KKuzpAArK-d80DPYTKZ6rDzQOQ,4687
 mx_bluesky/common/external_interaction/ispyb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/external_interaction/ispyb/data_model.py,sha256=WURy8W0L4VAULzz39lTW6kYpFDLDiGU2aYO28dq-4II,2706
-mx_bluesky/common/external_interaction/ispyb/exp_eye_store.py,sha256=FWc9MnBdPCvMZ6sd40ByZoR_yC98IC1SvOGvvoJfZnY,5933
-mx_bluesky/common/external_interaction/ispyb/ispyb_store.py,sha256=V809aPFftVKzwk3AbFKolmjFo2CqsLwOMqqj1X_lCgc,10394
+mx_bluesky/common/external_interaction/ispyb/exp_eye_store.py,sha256=Y3nZV5NZ-XnYThettFMhZin4dQb5jAZfT2mGmtLlv74,6076
+mx_bluesky/common/external_interaction/ispyb/ispyb_store.py,sha256=QVgprU9hfBfGIbxPxIBAdzmigLT9S0CtnT4IMf-obyo,10631
 mx_bluesky/common/external_interaction/ispyb/ispyb_utils.py,sha256=Kv0JQVaT8z9Qzt6L1NJEx0U7ZYD6NeyBGF1_wGcI1Dc,728
 mx_bluesky/common/external_interaction/nexus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/common/external_interaction/nexus/nexus_utils.py,sha256=CCKQeDBEmXZvCwBy1-o5hQ6CDdwsnuAwlIK_uq0I26Y,5587
 mx_bluesky/common/external_interaction/nexus/write_nexus.py,sha256=tIz9PFFSiaUs1olbMtLGHddTLj132rEuFSWBK9rOM6Y,4087
 mx_bluesky/common/parameters/components.py,sha256=Ru76EFT2wG4oPeJge6lVwq1vCHYd7T0EFuqp13EoJk4,7299
-mx_bluesky/common/parameters/constants.py,sha256=lO8N8XSwE9-lr4r-Q-N7dGd11pZDAQRZHlotqPi8T70,4045
-mx_bluesky/common/parameters/gridscan.py,sha256=pm0SAVfRs15XEUCvSTY3wu-JG5cx8yyaPuZxobudO1I,5556
+mx_bluesky/common/parameters/constants.py,sha256=JI6W-5GusvU8vqhutw2sJFiQymOajx-1sU6I1GSDlTc,4622
+mx_bluesky/common/parameters/gridscan.py,sha256=rkts8vWuvfzqJaql-Rz8gWQPr1EMPUN5cGYfzQwzpo0,6991
 mx_bluesky/common/plans/__init__.py,sha256=FMA-4VN1TJCPcyURKF0qPIQ8uo8YBbtHPRdJokVF4MA,129
-mx_bluesky/common/plans/do_fgs.py,sha256=oPCV6uXPPRX-oM-jxODi1-x0jMK3ayw328DDLqy-ekc,4807
-mx_bluesky/common/utils/exceptions.py,sha256=xz82au833TDI1wMu738l81kBFlXBTVB4-360N-05e84,2063
+mx_bluesky/common/plans/do_fgs.py,sha256=6aFWvQAuDgBfySzKgt567U_aoDYhAxfUhEDpn3wMjSQ,4775
+mx_bluesky/common/plans/read_hardware.py,sha256=s3Mz11wQOnzO4i4BvV6yWzpDvtQtjZnY-clENH7CVQU,2332
+mx_bluesky/common/utils/context.py,sha256=Fe_YSNv3ZEIZvpdWs-9UqiG6-xEEdCpK6oMYYdCSYT8,2198
+mx_bluesky/common/utils/exceptions.py,sha256=aB_26oowu7gvoaWWKpiBEllrvtGG-Hd6HLsE86mQgKI,2153
 mx_bluesky/common/utils/log.py,sha256=ZgFZu6zSutGD5A0FDp_n9M0rJ6gU1FuZCmD-r5suchY,3913
 mx_bluesky/common/utils/tracing.py,sha256=stnBZIvPuKiAm2wVc8lFr3ns7V5C52rUigULi9V-IFs,1171
 mx_bluesky/common/utils/utils.py,sha256=q2uCaK1E8zLVk1BFmj7qlTnQf3JRKjCjyadIVnL1-4M,1180
 mx_bluesky/hyperion/__init__.py,sha256=f4E8wInL1Ll4eeFtAiyKmipOBTPlUtKmVK-m_LOQG4M,35
-mx_bluesky/hyperion/__main__.py,sha256=-bzpCpTYXCIY8ZLNsXtNd9zLpQEF-Q8WMUvyNOHQP0k,13780
+mx_bluesky/hyperion/__main__.py,sha256=jsHCj6dyrVa2TyGQNXzw9ylanzQgFlDeWMnnKIX2lPE,12321
 mx_bluesky/hyperion/device_setup_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mx_bluesky/hyperion/device_setup_plans/check_beamstop.py,sha256=PG2AXIB_z7U0glz9MTHkapaokMgrHyYSoKYSIGaRgLE,844
 mx_bluesky/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py,sha256=68L4Fd8nvvH_VeQJfOYK_3WLrlKRt09TRsaA9T2uqU0,4703
 mx_bluesky/hyperion/device_setup_plans/manipulate_sample.py,sha256=fuNRH8slknuZ0iNVv2htiuDozc9LzvxUrWuwYQTtLt8,3293
 mx_bluesky/hyperion/device_setup_plans/position_detector.py,sha256=S49ml0KNZ6wXPQqOxNJ2whKTCyRTcKdBXBhyeEyFDQQ,635
-mx_bluesky/hyperion/device_setup_plans/read_hardware_for_setup.py,sha256=kcnUmbQAyNZvixXtQDW40m3pORJgvSo0q1OHM-uO-iM,2225
-mx_bluesky/hyperion/device_setup_plans/setup_oav.py,sha256=pIXLM3FKpf7wYMEiEAOaGTm504XAt5N7nuuu9kKraBk,2914
-mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=bfFQG4PNE9hhjYgUykB-Ps5K1VzDQAK0YwRYC6BpkT8,8292
-mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=-aHDVgyX1oHOV_nwC3AetIvZ2VnpZcCJI4V5n3Xzj70,10317
-mx_bluesky/hyperion/device_setup_plans/smargon.py,sha256=Tsl-wsExNopwCAEUtUgZyDUos4uhOwJ9SJ2WJRawflg,1209
-mx_bluesky/hyperion/device_setup_plans/utils.py,sha256=CAsJXGmL_Gq6HsvPJ8mdQ7r2lAHf2SF72-LEqHr4-JM,2146
-mx_bluesky/hyperion/device_setup_plans/xbpm_feedback.py,sha256=JgOqnPnG-zXrek1w_M_oEQPc1IET3nHeeeVDZhPXIAk,4058
+mx_bluesky/hyperion/device_setup_plans/setup_oav.py,sha256=jVbDCSKDXxJXPfr-dR6dQgKLPmh7pzewj8gH9y-psy8,2564
+mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=GPa42uf4P8B41s_K2mjZfOT0SdaNTjABsoQK3wrz5pc,8383
+mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=q4KRAufuUi-G6xGKYLhmxhLr8EcTu08HMBca5OpigxM,10177
+mx_bluesky/hyperion/device_setup_plans/smargon.py,sha256=Zzej-9uBVTzZuB4lv9QRiHeJKq_3-lnXOhCqZZIZV-o,789
+mx_bluesky/hyperion/device_setup_plans/utils.py,sha256=Hdw_tocY6scVaVc2jlsNG-W4vS0LCbEKF8g5kDRuAeQ,2216
+mx_bluesky/hyperion/device_setup_plans/xbpm_feedback.py,sha256=iDK7g4MxYkEH43ITh0oSymTMAb1GwEC7QJDcdkNhTXs,4287
 mx_bluesky/hyperion/experiment_plans/__init__.py,sha256=3ldTMxgz4yKHJH9iF3nw7uueyX2zQ5Z84V0dsCzW5us,1081
-mx_bluesky/hyperion/experiment_plans/change_aperture_then_move_plan.py,sha256=U-KOA8o5DLeViIVsFkYhUvDmzxUBMXFqXWzzcdljdd4,3690
-mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=Y8MKAxsJ_hax_5Q4UzkN0SAPuXaRgMlSCPu8OZxgjNE,3090
-mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py,sha256=ngz3HzwA8_eZK_ovy2xplem_iwV1ifFQbpjFi2eyTuk,19120
-mx_bluesky/hyperion/experiment_plans/grid_detect_then_xray_centre_plan.py,sha256=jlrSEtCkeYLQ1Sf32Gby0fdJyETyU1l4uhMOMMfA148,8218
-mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=Yn3lOcy6pLO-GSoBMU5QzqiMzyBTG7LIDPF8DppiKUM,4117
-mx_bluesky/hyperion/experiment_plans/oav_grid_detection_plan.py,sha256=IP8usGFtY7XCdxZ2RZ63EkYWYjZPpYykjhmF1u27L9g,7652
-mx_bluesky/hyperion/experiment_plans/oav_snapshot_plan.py,sha256=TfhZjnc_j6sqM7eeAkVNc8KG0O2L-CDjO0xoZWGeCA4,3126
-mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py,sha256=l-bZdKLCd3dyPJP5RUHSm82lGosPX9kI1vJ2FDVPU8o,16197
-mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=u6Cc5DU4XYJxmYNdvMw9cWIMWf3ayCt4GUNBnIJfC68,5050
-mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py,sha256=UsZ07G8ac4SXyv9LfH7L9BSnRuO7E1tl_M15meDR5d4,6174
-mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=kHymdtXkxm4b6KNEBTG7pNThTg70OQYG8AkCyymmCNs,8768
-mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=NoaNddQZ_XV6hOdAFLRNqrmppKxLTjhDXZHx3Lajcmo,7787
-mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=JVe5mNLFnAXR01fIL8Colpp935KVBHbAYfOai2sWYxA,16711
-mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=m46cVAkGHPQg7gXoTKJB3AGe4nAF-RL24yHLCWmz9S0,1858
-mx_bluesky/hyperion/experiment_plans/common/xrc_result.py,sha256=dZRv4chwnLvg9Z96hFHwcPO-h0L3OgoganYLQptGHoI,1806
+mx_bluesky/hyperion/experiment_plans/change_aperture_then_move_plan.py,sha256=umlxNEVRh3iosiPiWe7mWgfOjy9s5DyqoY_uItHLxEw,3531
+mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=25uwWsMnJrwKYPgbAQpJ119lmCK_GdbYHcsf_7LSdR8,2376
+mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py,sha256=h6HFfFAxNgWzc-cH2oax_LqWHF7DpLmmx8La0qYK1bA,17213
+mx_bluesky/hyperion/experiment_plans/grid_detect_then_xray_centre_plan.py,sha256=MuYjeY0JVK6lE4w0b45tJthVi9_AkQDWFB0XfEu84Ps,8524
+mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=6ya0mLSRdrShAW-0FzzSHPbaC6SihFAygfE5NAhCFF4,4540
+mx_bluesky/hyperion/experiment_plans/oav_grid_detection_plan.py,sha256=PRwV04KuvefTm4mV4iE-hB3lLb5LAmJshYKfMnLE-k0,6950
+mx_bluesky/hyperion/experiment_plans/oav_snapshot_plan.py,sha256=BT6xrYAEqyqas0ommGAKBluzOxtIFhJuuSd44X-ar-Q,2751
+mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py,sha256=5ZAH17F5T1YyVgA2ML0NEf4ufrD1G0jPRU0_5pINdTg,16195
+mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=MT1uuxF6g4BGrdKV3MAYO91VLaiBP7VMGdYtx1wyaJA,5006
+mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py,sha256=XjgnSu9RM2UGpyJ4Nepg-Xg5qHvcBAgSFRtWMPSpRRw,6136
+mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=vHAm3AdDaTNeDZ3zc-z6pP1bYXl7c5WImsTI5hutofQ,7917
+mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=j2UrQQhTUMDNlXX3aJ98GCDJ0bL1BbGw8g_JnxPW0jY,7743
+mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=WUlLuob8zTGjXScahufrOFEYmLYSozL0TmhiQlGjqQM,16971
+mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=D-4p4eMK_jGqAvAZICMkhyieBn7YIZTQZLg_7of9gwc,1938
 mx_bluesky/hyperion/external_interaction/__init__.py,sha256=95DwXDmKsx36RgAL-AtLZl2LQoLPKbzeYdlkkP_4Coc,559
-mx_bluesky/hyperion/external_interaction/config_server.py,sha256=LWKWxJIEo9QliggwAU8LWVzPQTHXx5bc0KI07Ve6eGE,1311
+mx_bluesky/hyperion/external_interaction/agamemnon.py,sha256=f8t23jKpMbhvwnjbonyKh2IoJlEYEYPzHcLmMwwimQs,4208
+mx_bluesky/hyperion/external_interaction/config_server.py,sha256=ZI9QCyWLPKzV3stEpXrg7T2IyRb8Y3dd6LWI30tYvqw,1825
 mx_bluesky/hyperion/external_interaction/callbacks/__init__.py,sha256=1XHaxDljMveu_DYIlk7n963gHffyC6r4C_RhF6HA-N8,283
-mx_bluesky/hyperion/external_interaction/callbacks/__main__.py,sha256=1DVg-xok5UznSS7EDNsSAa7T-r4iLrO8VVrPg5EpT34,5470
-mx_bluesky/hyperion/external_interaction/callbacks/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/hyperion/external_interaction/callbacks/common/callback_util.py,sha256=H9kfcmhN7_hayL6LR1SXzqljLmB2P2KXF0XkBOAcNlk,3477
+mx_bluesky/hyperion/external_interaction/callbacks/__main__.py,sha256=6u-jcwGbZmPY994iu30mnnpoVUMN-fE0CRxsgxhdceI,5849
 mx_bluesky/hyperion/external_interaction/callbacks/robot_load/ispyb_callback.py,sha256=7xSvCd95tXjvmsbFLecI1hEwJj_rm8yGuJJ1Pmg-RKU,4142
 mx_bluesky/hyperion/external_interaction/callbacks/rotation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py,sha256=XtVjUdipYNqgooovgjvQeSKLlodzOgs7_kjb3wNBh9s,7465
+mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py,sha256=eFKpDEJaH6zluhNZZkrWOW0BRIjj-Bs2xiGbun7pnSs,7442
 mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_mapping.py,sha256=yz2Z_P6qH2DGlSXCi36E3Xwv7mVVcvYzqQc0NqwW4DI,716
 mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py,sha256=w86HvDMznS1wBH3mLYJMe2TgX8SghTYR4G6dajho3Pk,4724
 mx_bluesky/hyperion/external_interaction/callbacks/sample_handling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mx_bluesky/hyperion/external_interaction/callbacks/sample_handling/sample_handling_callback.py,sha256=IyWawfc0arWXYIzq5CuRwagqlJ36yMA1riM5dw0r9Ig,2117
+mx_bluesky/hyperion/external_interaction/callbacks/sample_handling/sample_handling_callback.py,sha256=RDjcQFVEk7o5ybyQOK5sCz6XVz6V3cDELgSu_WsnIbM,2366
 mx_bluesky/hyperion/parameters/__init__.py,sha256=kf2wfcILBUBpT0tJ8-W39BywQUkn67yxl9IVsfrr1LE,115
-mx_bluesky/hyperion/parameters/cli.py,sha256=FGzvEB76YnQvBydUMPUNHJuqxvEe7Zc627w7gA2KODY,2125
+mx_bluesky/hyperion/parameters/cli.py,sha256=tw8u-_THJ69_Rn8IzeEWjwfUJO8VsTKKqz9K0iZHls0,1796
 mx_bluesky/hyperion/parameters/components.py,sha256=uXxdW6nIE1VZnh4ZXe5O-LOwsx4MbENEWfLGm2ACvsI,313
-mx_bluesky/hyperion/parameters/constants.py,sha256=RVrA1m39HdW5Sm1SR5Sm41YeSPG7GWcfhEomzcBnDhk,1832
-mx_bluesky/hyperion/parameters/gridscan.py,sha256=na88foS9dqEJ43IC3LsA-e9IUz99lMI7PGg8eU-fKjM,5924
+mx_bluesky/hyperion/parameters/constants.py,sha256=9divI1XYUDsGq3HGm2ehq1yGGOD7tUf66xWvhVxEpB0,1982
+mx_bluesky/hyperion/parameters/device_composites.py,sha256=iBm3qNFBG8dmVW4BPAwnhdi-HvpJ-6AuM1ZZceUembE,1645
+mx_bluesky/hyperion/parameters/gridscan.py,sha256=-8pfO7aLMgtNwq60Lx9Q2Mdnp6Z8vPsvBZ5fNN90GGs,6014
 mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=khLBCSeafuw0dNrvDTvKv4GrlBo1LXJZ87NTI1A92jw,3693
 mx_bluesky/hyperion/parameters/robot_load.py,sha256=DSOwIosO629WoXbVFokEjmgqKZz3xzv0feRQHC_ZgpI,1233
 mx_bluesky/hyperion/parameters/rotation.py,sha256=270m55MCYBFEK2LM5DjVqhnMJC1JupMMX-O4UulBSMc,7518
-mx_bluesky/hyperion/resources/panda/panda-gridscan.yaml,sha256=xrhgok-9X2VXdyLEWiYOUEeRCBqhYM6IJFAefnNdgzw,26521
-mx_bluesky/hyperion/utils/context.py,sha256=vy8D9Ygzdpu6k4teespzc_GL7MLb3AtK5vZkAZkT9UE,2714
-mx_bluesky/hyperion/utils/validation.py,sha256=kBxqr-Ue_iv4zGpU3rfNdG0UACXgbQdHAVZssryEqDI,6567
-mx_bluesky-1.4.4.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-mx_bluesky-1.4.4.dist-info/METADATA,sha256=-A2XlrcTzHfF5D_SDyzHjHjCgr0LDRjZAkrtC4hB6Gg,17262
-mx_bluesky-1.4.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-mx_bluesky-1.4.4.dist-info/entry_points.txt,sha256=Bt3iHCqzZtHYnnSKoh_qM2k3K4LbK1Uxr0gF8B34F98,528
-mx_bluesky-1.4.4.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
-mx_bluesky-1.4.4.dist-info/RECORD,,
+mx_bluesky/hyperion/resources/panda/panda-gridscan.yaml,sha256=mhLBJTSjHCkM9F6mjtqbhNmmrV8qSctbCUfhb0q7pYo,28085
+mx_bluesky/hyperion/utils/__init__.py,sha256=f4E8wInL1Ll4eeFtAiyKmipOBTPlUtKmVK-m_LOQG4M,35
+mx_bluesky/hyperion/utils/context.py,sha256=JztC2qhd8ChAGYNUltJnuld_r2zYA37J3LiwxRE3dxQ,604
+mx_bluesky/hyperion/utils/validation.py,sha256=a23OeppZcEMWDffbCk8UFlOk26jS9i9IhTWPkQhP28s,6743
+mx_bluesky-1.4.6.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+mx_bluesky-1.4.6.dist-info/METADATA,sha256=kNmqvzVzK_6-H0ahVkDpSv5X48_F2ByaUZFOSmnwheE,17311
+mx_bluesky-1.4.6.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mx_bluesky-1.4.6.dist-info/entry_points.txt,sha256=-hM2jXf6TAwgqnUHaEVx02j7sdB0L_WaeHW_tIRuj6o,600
+mx_bluesky-1.4.6.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
+mx_bluesky-1.4.6.dist-info/RECORD,,

{mx_bluesky-1.4.4.dist-info → mx_bluesky-1.4.6.dist-info}/WHEEL

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

{mx_bluesky-1.4.4.dist-info → mx_bluesky-1.4.6.dist-info}/entry_points.txt

@@ -4,5 +4,6 @@ hyperion-callbacks = mx_bluesky.hyperion.external_interaction.callbacks.__main__
 hyperion-generate-test-nexus = mx_bluesky.hyperion.utils.validation:generate_test_nexus
 hyperion-populate-test-and-meta-files = mx_bluesky.hyperion.utils.validation:copy_test_meta_data_files
 mx-bluesky = mx_bluesky.__main__:main
+redis_to_murko = mx_bluesky.beamlines.i04.redis_to_murko_forwarder:main
 run_extruder = mx_bluesky.beamlines.i24.serial.run_serial:run_extruder
 run_fixed_target = mx_bluesky.beamlines.i24.serial.run_serial:run_fixed_target

mx_bluesky/common/device_setup_plans/read_hardware_for_setup.py

@@ -1,14 +0,0 @@
-import bluesky.plan_stubs as bps
-from dodal.devices.eiger import EigerDetector
-
-from mx_bluesky.common.parameters.constants import DocDescriptorNames
-
-
-def read_hardware_for_zocalo(detector: EigerDetector):
-    """ "
-    If the RunEngine is subscribed to the ZocaloCallback, this plan will also trigger zocalo.
-    A bluesky run must be open to use this plan
-    """
-    yield from bps.create(name=DocDescriptorNames.ZOCALO_HW_READ)
-    yield from bps.read(detector.odin.file_writer.id)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-    yield from bps.save()

mx_bluesky/hyperion/device_setup_plans/read_hardware_for_setup.py

@@ -1,54 +0,0 @@
-from __future__ import annotations
-
-import bluesky.plan_stubs as bps
-from dodal.devices.aperturescatterguard import ApertureScatterguard
-from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
-from dodal.devices.dcm import DCM
-from dodal.devices.eiger import EigerDetector
-from dodal.devices.flux import Flux
-from dodal.devices.s4_slit_gaps import S4SlitGaps
-from dodal.devices.smargon import Smargon
-from dodal.devices.synchrotron import Synchrotron
-from dodal.devices.undulator import Undulator
-
-from mx_bluesky.common.utils.log import LOGGER
-from mx_bluesky.hyperion.parameters.constants import CONST
-
-
-def read_hardware_pre_collection(
-    undulator: Undulator,
-    synchrotron: Synchrotron,
-    s4_slit_gaps: S4SlitGaps,
-    dcm: DCM,
-    smargon: Smargon,
-):
-    LOGGER.info("Reading status of beamline for callbacks, pre collection.")
-    yield from bps.create(
-        name=CONST.DESCRIPTORS.HARDWARE_READ_PRE
-    )  # gives name to event *descriptor* document
-    yield from bps.read(undulator.current_gap)
-    yield from bps.read(synchrotron.synchrotron_mode)
-    yield from bps.read(s4_slit_gaps.xgap)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-    yield from bps.read(s4_slit_gaps.ygap)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-    yield from bps.read(smargon.x)
-    yield from bps.read(smargon.y)
-    yield from bps.read(smargon.z)
-    yield from bps.read(dcm.energy_in_kev)
-    yield from bps.save()
-
-
-def read_hardware_during_collection(
-    aperture_scatterguard: ApertureScatterguard,
-    attenuator: BinaryFilterAttenuator,
-    flux: Flux,
-    dcm: DCM,
-    detector: EigerDetector,
-):
-    LOGGER.info("Reading status of beamline for callbacks, during collection.")
-    yield from bps.create(name=CONST.DESCRIPTORS.HARDWARE_READ_DURING)
-    yield from bps.read(aperture_scatterguard)
-    yield from bps.read(attenuator.actual_transmission)
-    yield from bps.read(flux.flux_reading)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-    yield from bps.read(dcm.energy_in_kev)
-    yield from bps.read(detector.bit_depth)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-    yield from bps.save()

mx_bluesky/hyperion/external_interaction/callbacks/common/callback_util.py

@@ -1,95 +0,0 @@
-from collections.abc import Callable
-
-from bluesky.callbacks import CallbackBase
-
-from mx_bluesky.common.external_interaction.callbacks.common.zocalo_callback import (
-    ZocaloCallback,
-)
-from mx_bluesky.common.external_interaction.callbacks.xray_centre.ispyb_callback import (
-    GridscanISPyBCallback,
-)
-from mx_bluesky.common.external_interaction.callbacks.xray_centre.nexus_callback import (
-    GridscanNexusFileCallback,
-)
-from mx_bluesky.hyperion.external_interaction.callbacks.robot_load.ispyb_callback import (
-    RobotLoadISPyBCallback,
-)
-from mx_bluesky.hyperion.external_interaction.callbacks.rotation.ispyb_callback import (
-    RotationISPyBCallback,
-)
-from mx_bluesky.hyperion.external_interaction.callbacks.rotation.nexus_callback import (
-    RotationNexusFileCallback,
-)
-from mx_bluesky.hyperion.external_interaction.callbacks.sample_handling.sample_handling_callback import (
-    SampleHandlingCallback,
-)
-from mx_bluesky.hyperion.parameters.constants import CONST
-from mx_bluesky.hyperion.parameters.gridscan import (
-    GridCommonWithHyperionDetectorParams,
-    HyperionSpecifiedThreeDGridScan,
-)
-
-CallbacksFactory = Callable[[], tuple[CallbackBase, ...]]
-
-
-def create_robot_load_and_centre_callbacks() -> tuple[
-    GridscanNexusFileCallback, GridscanISPyBCallback, RobotLoadISPyBCallback
-]:
-    """Note: This is not actually used in production, see https://github.com/DiamondLightSource/mx-bluesky/issues/516"""
-    return (
-        GridscanNexusFileCallback(param_type=HyperionSpecifiedThreeDGridScan),
-        GridscanISPyBCallback(
-            param_type=GridCommonWithHyperionDetectorParams,
-            emit=ZocaloCallback(CONST.PLAN.DO_FGS, CONST.ZOCALO_ENV),
-        ),
-        RobotLoadISPyBCallback(),
-    )
-
-
-def create_gridscan_callbacks() -> tuple[
-    GridscanNexusFileCallback, GridscanISPyBCallback
-]:
-    """Note: This is not actually used in production, see https://github.com/DiamondLightSource/mx-bluesky/issues/516"""
-    return (
-        GridscanNexusFileCallback(param_type=HyperionSpecifiedThreeDGridScan),
-        GridscanISPyBCallback(
-            param_type=GridCommonWithHyperionDetectorParams,
-            emit=ZocaloCallback(CONST.PLAN.DO_FGS, CONST.ZOCALO_ENV),
-        ),
-    )
-
-
-def create_rotation_callbacks() -> tuple[
-    RotationNexusFileCallback, RotationISPyBCallback
-]:
-    """Note: This is not actually used in production, see https://github.com/DiamondLightSource/mx-bluesky/issues/516"""
-    return (
-        RotationNexusFileCallback(),
-        RotationISPyBCallback(
-            emit=ZocaloCallback(CONST.PLAN.ROTATION_MAIN, CONST.ZOCALO_ENV)
-        ),
-    )
-
-
-def create_load_centre_collect_callbacks() -> tuple[
-    GridscanNexusFileCallback,
-    GridscanISPyBCallback,
-    RobotLoadISPyBCallback,
-    RotationNexusFileCallback,
-    RotationISPyBCallback,
-    SampleHandlingCallback,
-]:
-    """Note: This is not actually used in production, see https://github.com/DiamondLightSource/mx-bluesky/issues/516"""
-    return (
-        GridscanNexusFileCallback(param_type=HyperionSpecifiedThreeDGridScan),
-        GridscanISPyBCallback(
-            param_type=GridCommonWithHyperionDetectorParams,
-            emit=ZocaloCallback(CONST.PLAN.DO_FGS, CONST.ZOCALO_ENV),
-        ),
-        RobotLoadISPyBCallback(),
-        RotationNexusFileCallback(),
-        RotationISPyBCallback(
-            emit=ZocaloCallback(CONST.PLAN.ROTATION_MAIN, CONST.ZOCALO_ENV)
-        ),
-        SampleHandlingCallback(),
-    )