mx-bluesky 1.4.0__py3-none-any.whl → 1.4.1__py3-none-any.whl

mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/nexus_callback.py

@@ -12,7 +12,7 @@ from mx_bluesky.hyperion.external_interaction.nexus.nexus_utils import (
 from mx_bluesky.hyperion.external_interaction.nexus.write_nexus import NexusWriter
 from mx_bluesky.hyperion.log import NEXUS_LOGGER
 from mx_bluesky.hyperion.parameters.constants import CONST
-from mx_bluesky.hyperion.parameters.gridscan import ThreeDGridScan
+from mx_bluesky.hyperion.parameters.gridscan import HyperionThreeDGridScan
 
 if TYPE_CHECKING:
     from event_model.documents import Event, EventDescriptor, RunStart
@@ -45,11 +45,12 @@ class GridscanNexusFileCallback(PlanReactiveCallback):
 
     def activity_gated_start(self, doc: RunStart):
         if doc.get("subplan_name") == CONST.PLAN.GRIDSCAN_OUTER:
-            json_params = doc.get("hyperion_parameters")
+            hyperion_params = doc.get("hyperion_parameters")
+            assert isinstance(hyperion_params, str)
             NEXUS_LOGGER.info(
-                f"Nexus writer received start document with experiment parameters {json_params}"
+                f"Nexus writer received start document with experiment parameters {hyperion_params}"
             )
-            parameters = ThreeDGridScan.from_json(json_params)
+            parameters = HyperionThreeDGridScan.model_validate_json(hyperion_params)
             d_size = parameters.detector_params.detector_size_constants.det_size_pixels
             grid_n_img_1 = parameters.scan_indices[1]
             grid_n_img_2 = parameters.num_images - grid_n_img_1

mx_bluesky/hyperion/external_interaction/config_server.py

@@ -1,47 +1,18 @@
+from functools import cache
+
 from daq_config_server.client import ConfigServer
-from pydantic import BaseModel, Field, model_validator
 
+from mx_bluesky.common.external_interaction.config_server import FeatureFlags
 from mx_bluesky.hyperion.log import LOGGER
 from mx_bluesky.hyperion.parameters.constants import CONST
 
-_CONFIG_SERVER: ConfigServer | None = None
-
 
-def config_server() -> ConfigServer:
-    global _CONFIG_SERVER
-    if _CONFIG_SERVER is None:
-        _CONFIG_SERVER = ConfigServer(CONST.CONFIG_SERVER_URL, LOGGER)
-    return _CONFIG_SERVER
+class HyperionFeatureFlags(FeatureFlags):
+    @staticmethod
+    @cache
+    def get_config_server() -> ConfigServer:
+        return ConfigServer(CONST.CONFIG_SERVER_URL, LOGGER)
 
-
-class FeatureFlags(BaseModel):
-    # The default value will be used as the fallback when doing a best-effort fetch
-    # from the service
     use_panda_for_gridscan: bool = CONST.I03.USE_PANDA_FOR_GRIDSCAN
     compare_cpu_and_gpu_zocalo: bool = CONST.I03.COMPARE_CPU_AND_GPU_ZOCALO
     set_stub_offsets: bool = CONST.I03.SET_STUB_OFFSETS
-
-    # Feature values supplied at construction will override values from the config server
-    overriden_features: dict = Field(default_factory=dict, exclude=True)
-
-    @model_validator(mode="before")
-    @classmethod
-    def mark_overridden_features(cls, values):
-        assert isinstance(values, dict)
-        values["overriden_features"] = values.copy()
-        return values
-
-    @classmethod
-    def _get_flags(cls):
-        flags = config_server().best_effort_get_all_feature_flags()
-        return {f: flags[f] for f in flags if f in cls.model_fields.keys()}
-
-    def update_self_from_server(self):
-        """Used to update the feature flags from the server during a plan. Where there are flags which were explicitly set from externally supplied parameters, these values will be used instead."""
-        for flag, value in self._get_flags().items():
-            updated_value = (
-                value
-                if flag not in self.overriden_features.keys()
-                else self.overriden_features[flag]
-            )
-            setattr(self, flag, updated_value)

mx_bluesky/hyperion/external_interaction/exceptions.py

@@ -1,13 +1,4 @@
-from mx_bluesky.hyperion.exceptions import WarningException
-
-
 class ISPyBDepositionNotMade(Exception):
     """Raised when the ISPyB or Zocalo callbacks can't access ISPyB deposition numbers."""
 
     pass
-
-
-class NoCentreFoundException(WarningException):
-    """Error for if zocalo is unable to find the centre during a gridscan."""
-
-    pass

mx_bluesky/hyperion/external_interaction/ispyb/exp_eye_store.py

@@ -1,4 +1,6 @@
 import configparser
+from dataclasses import dataclass
+from enum import StrEnum
 
 from requests import patch, post
 from requests.auth import AuthBase
@@ -29,20 +31,44 @@ def _get_base_url_and_token() -> tuple[str, str]:
     return expeye_config["url"], expeye_config["token"]
 
 
+def _send_and_get_response(auth, url, data, send_func) -> dict:
+    response = send_func(url, auth=auth, json=data)
+    if not response.ok:
+        raise ISPyBDepositionNotMade(f"Could not write {data} to {url}: {response}")
+    return response.json()
+
+
+@dataclass
+class BLSample:
+    container_id: int
+    bl_sample_id: int
+    bl_sample_status: str | None
+
+
+class BLSampleStatus(StrEnum):
+    # The sample has been loaded
+    LOADED = "LOADED"
+    # Problem with the sample e.g. pin too long/short
+    ERROR_SAMPLE = "ERROR - sample"
+    # Any other general error
+    ERROR_BEAMLINE = "ERROR - beamline"
+
+
+assert all(
+    len(value) <= 20 for value in BLSampleStatus
+), "Column size limit of 20 for BLSampleStatus"
+
+
 class ExpeyeInteraction:
+    """Exposes functionality from the Expeye core API"""
+
     CREATE_ROBOT_ACTION = "/proposals/{proposal}/sessions/{visit_number}/robot-actions"
     UPDATE_ROBOT_ACTION = "/robot-actions/{action_id}"
 
     def __init__(self) -> None:
         url, token = _get_base_url_and_token()
-        self.base_url = url + "/core"
-        self.auth = BearerAuth(token)
-
-    def _send_and_get_response(self, url, data, send_func) -> dict:
-        response = send_func(url, auth=self.auth, json=data)
-        if not response.ok:
-            raise ISPyBDepositionNotMade(f"Could not write {data} to {url}: {response}")
-        return response.json()
+        self._base_url = url
+        self._auth = BearerAuth(token)
 
     def start_load(
         self,
@@ -66,7 +92,7 @@ class ExpeyeInteraction:
         Returns:
             RobotActionID: The id of the robot load action that is created
         """
-        url = self.base_url + self.CREATE_ROBOT_ACTION.format(
+        url = self._base_url + self.CREATE_ROBOT_ACTION.format(
             proposal=proposal_reference, visit_number=visit_number
         )
 
@@ -77,7 +103,7 @@ class ExpeyeInteraction:
             "containerLocation": container_location,
             "dewarLocation": dewar_location,
         }
-        response = self._send_and_get_response(url, data, post)
+        response = _send_and_get_response(self._auth, url, data, post)
         return response["robotActionId"]
 
     def update_barcode_and_snapshots(
@@ -95,14 +121,14 @@ class ExpeyeInteraction:
             snapshot_before_path (str): Path to the snapshot before robot load
             snapshot_after_path (str): Path to the snapshot after robot load
         """
-        url = self.base_url + self.UPDATE_ROBOT_ACTION.format(action_id=action_id)
+        url = self._base_url + self.UPDATE_ROBOT_ACTION.format(action_id=action_id)
 
         data = {
             "sampleBarcode": barcode,
             "xtalSnapshotBefore": snapshot_before_path,
             "xtalSnapshotAfter": snapshot_after_path,
         }
-        self._send_and_get_response(url, data, patch)
+        _send_and_get_response(self._auth, url, data, patch)
 
     def end_load(self, action_id: RobotActionID, status: str, reason: str):
         """Finish an existing robot action, providing final information about how it went
@@ -113,13 +139,37 @@ class ExpeyeInteraction:
                           otherwise error
             reason (str): If the status is in error than the reason for that error
         """
-        url = self.base_url + self.UPDATE_ROBOT_ACTION.format(action_id=action_id)
+        url = self._base_url + self.UPDATE_ROBOT_ACTION.format(action_id=action_id)
 
         run_status = "SUCCESS" if status == "success" else "ERROR"
 
         data = {
             "endTimestamp": get_current_time_string(),
             "status": run_status,
-            "message": reason,
+            "message": reason[:255] if reason else "",
         }
-        self._send_and_get_response(url, data, patch)
+        _send_and_get_response(self._auth, url, data, patch)
+
+    def update_sample_status(
+        self, bl_sample_id: int, bl_sample_status: BLSampleStatus
+    ) -> BLSample:
+        """Update the blSampleStatus of a sample.
+        Args:
+            bl_sample_id: The sample ID
+            bl_sample_status: The sample status
+            status_message: An optional message
+        Returns:
+             The updated sample
+        """
+        data = {"blSampleStatus": (str(bl_sample_status))}
+        response = _send_and_get_response(
+            self._auth, self._base_url + f"/samples/{bl_sample_id}", data, patch
+        )
+        return self._sample_from_json(response)
+
+    def _sample_from_json(self, response) -> BLSample:
+        return BLSample(
+            bl_sample_id=response["blSampleId"],
+            bl_sample_status=response["blSampleStatus"],
+            container_id=response["containerId"],
+        )

mx_bluesky/hyperion/parameters/components.py

@@ -1,12 +1,7 @@
-from __future__ import annotations
+from pydantic import BaseModel, Field
 
-from pydantic import (
-    BaseModel,
-    Field,
-)
+from mx_bluesky.hyperion.external_interaction.config_server import HyperionFeatureFlags
 
-from mx_bluesky.hyperion.external_interaction.config_server import FeatureFlags
 
-
-class WithFeatures(BaseModel):
-    features: FeatureFlags = Field(default=FeatureFlags())
+class WithHyperionFeatures(BaseModel):
+    features: HyperionFeatureFlags = Field(default=HyperionFeatureFlags())

mx_bluesky/hyperion/parameters/constants.py

@@ -27,7 +27,6 @@ class I03Constants:
     OAV_CENTRING_FILE = OavConstants.OAV_CONFIG_JSON
     SHUTTER_TIME_S = 0.06
     USE_PANDA_FOR_GRIDSCAN = False
-    THAWING_TIME = 20
     SET_STUB_OFFSETS = False
 
     # Turns on GPU processing for zocalo and logs a comparison between GPU and CPU-

mx_bluesky/hyperion/parameters/gridscan.py

@@ -1,8 +1,5 @@
 from __future__ import annotations
 
-import os
-
-from dodal.devices.aperturescatterguard import ApertureValue
 from dodal.devices.detector import (
     DetectorParams,
 )
@@ -15,38 +12,21 @@ from scanspec.core import Path as ScanPath
 from scanspec.specs import Line, Static
 
 from mx_bluesky.common.parameters.components import (
-    DiffractionExperimentWithSample,
-    IspybExperimentType,
-    OptionalGonioAngleStarts,
     SplitScan,
     WithOptionalEnergyChange,
-    WithScan,
-    XyzStarts,
+    WithPandaGridScan,
+)
+from mx_bluesky.common.parameters.gridscan import (
+    GridCommon,
+    SpecifiedGrid,
 )
-from mx_bluesky.common.parameters.constants import GridscanParamConstants
-from mx_bluesky.hyperion.parameters.components import WithFeatures
+from mx_bluesky.hyperion.parameters.components import WithHyperionFeatures
 from mx_bluesky.hyperion.parameters.constants import CONST, I03Constants
-from mx_bluesky.hyperion.parameters.robot_load import RobotLoadAndEnergyChange
 
 
-# This will be restructed once Once https://github.com/DiamondLightSource/mx-bluesky/issues/323#issue-2500957290 is further along
-# to handle slightly different parameters between different beamline implementations
-class GridCommon(
-    DiffractionExperimentWithSample,
-    OptionalGonioAngleStarts,
-    WithFeatures,
-):
-    grid_width_um: float = Field(default=CONST.PARAM.GRIDSCAN.WIDTH_UM)
-    exposure_time_s: float = Field(default=CONST.PARAM.GRIDSCAN.EXPOSURE_TIME_S)
-    use_roi_mode: bool = Field(default=CONST.PARAM.GRIDSCAN.USE_ROI)
-    panda_runup_distance_mm: float = Field(
-        default=GridscanParamConstants.PANDA_RUN_UP_DISTANCE_MM
-    )
-
-    ispyb_experiment_type: IspybExperimentType = Field(
-        default=IspybExperimentType.GRIDSCAN_3D
-    )
-    selected_aperture: ApertureValue | None = Field(default=ApertureValue.SMALL)
+class HyperionGridCommon(GridCommon, WithHyperionFeatures):
+    # This class only exists so that we can properly select enable_dev_shm. Remove in
+    # https://github.com/DiamondLightSource/hyperion/issues/1395"""
 
     @property
     def detector_params(self):
@@ -60,7 +40,6 @@ class GridCommon(
         assert (
             self.detector_distance_mm is not None
         ), "Detector distance must be filled before generating DetectorParams"
-        os.makedirs(self.storage_directory, exist_ok=True)
         return DetectorParams(
             detector_size_constants=I03Constants.DETECTOR,
             expected_energy_ev=self.demand_energy_ev,
@@ -80,36 +59,13 @@ class GridCommon(
         )
 
 
-class GridScanWithEdgeDetect(GridCommon):
-    box_size_um: float = Field(default=CONST.PARAM.GRIDSCAN.BOX_WIDTH_UM)
-
-
-class PinTipCentreThenXrayCentre(GridCommon):
-    tip_offset_um: float = 0
-
-
-class RobotLoadThenCentre(GridCommon):
-    thawing_time: float = Field(default=CONST.I03.THAWING_TIME)
-
-    def robot_load_params(self):
-        my_params = self.model_dump()
-        return RobotLoadAndEnergyChange(**my_params)
-
-    def pin_centre_then_xray_centre_params(self):
-        my_params = self.model_dump()
-        del my_params["thawing_time"]
-        return PinTipCentreThenXrayCentre(**my_params)
-
-
-class SpecifiedGridScan(GridCommon, XyzStarts, WithScan):
-    """A specified grid scan is one which has defined values for the start position,
-    grid and box sizes, etc., as opposed to parameters for a plan which will create
-    those parameters at some point (e.g. through optical pin detection)."""
-
-    ...
-
-
-class ThreeDGridScan(SpecifiedGridScan, SplitScan, WithOptionalEnergyChange):
+class HyperionThreeDGridScan(
+    HyperionGridCommon,
+    SpecifiedGrid,
+    SplitScan,
+    WithOptionalEnergyChange,
+    WithPandaGridScan,
+):
     """Parameters representing a so-called 3D grid scan, which consists of doing a
     gridscan in X and Y, followed by one in X and Z."""
 
@@ -131,14 +87,14 @@ class ThreeDGridScan(SpecifiedGridScan, SplitScan, WithOptionalEnergyChange):
             x_steps=self.x_steps,
             y_steps=self.y_steps,
             z_steps=self.z_steps,
-            x_step_size=self.x_step_size_um,
-            y_step_size=self.y_step_size_um,
-            z_step_size=self.z_step_size_um,
-            x_start=self.x_start_um,
-            y1_start=self.y_start_um,
-            z1_start=self.z_start_um,
-            y2_start=self.y2_start_um,
-            z2_start=self.z2_start_um,
+            x_step_size_mm=self.x_step_size_um / 1000,
+            y_step_size_mm=self.y_step_size_um / 1000,
+            z_step_size_mm=self.z_step_size_um / 1000,
+            x_start_mm=self.x_start_um / 1000,
+            y1_start_mm=self.y_start_um / 1000,
+            z1_start_mm=self.z_start_um / 1000,
+            y2_start_mm=self.y2_start_um / 1000,
+            z2_start_mm=self.z2_start_um / 1000,
             set_stub_offsets=self.features.set_stub_offsets,
             dwell_time_ms=self.exposure_time_s * 1000,
             transmission_fraction=self.transmission_frac,
@@ -147,6 +103,7 @@ class ThreeDGridScan(SpecifiedGridScan, SplitScan, WithOptionalEnergyChange):
     @property
     def panda_FGS_params(self) -> PandAGridScanParams:
         if self.y_steps % 2 and self.z_steps > 0:
+            # See https://github.com/DiamondLightSource/hyperion/issues/1118 for explanation
             raise OddYStepsException(
                 "The number of Y steps must be even for a PandA gridscan"
             )
@@ -154,14 +111,14 @@ class ThreeDGridScan(SpecifiedGridScan, SplitScan, WithOptionalEnergyChange):
             x_steps=self.x_steps,
             y_steps=self.y_steps,
             z_steps=self.z_steps,
-            x_step_size=self.x_step_size_um,
-            y_step_size=self.y_step_size_um,
-            z_step_size=self.z_step_size_um,
-            x_start=self.x_start_um,
-            y1_start=self.y_start_um,
-            z1_start=self.z_start_um,
-            y2_start=self.y2_start_um,
-            z2_start=self.z2_start_um,
+            x_step_size_mm=self.x_step_size_um / 1000,
+            y_step_size_mm=self.y_step_size_um / 1000,
+            z_step_size_mm=self.z_step_size_um / 1000,
+            x_start_mm=self.x_start_um / 1000,
+            y1_start_mm=self.y_start_um / 1000,
+            z1_start_mm=self.z_start_um / 1000,
+            y2_start_mm=self.y2_start_um / 1000,
+            z2_start_mm=self.z2_start_um / 1000,
             set_stub_offsets=self.features.set_stub_offsets,
             run_up_distance_mm=self.panda_runup_distance_mm,
             transmission_fraction=self.transmission_frac,

mx_bluesky/hyperion/parameters/load_centre_collect.py

@@ -4,10 +4,11 @@ from pydantic import BaseModel, model_validator
 
 from mx_bluesky.common.parameters.components import (
     MxBlueskyParameters,
+    WithCentreSelection,
     WithSample,
     WithVisit,
 )
-from mx_bluesky.hyperion.parameters.gridscan import (
+from mx_bluesky.common.parameters.gridscan import (
     RobotLoadThenCentre,
 )
 from mx_bluesky.hyperion.parameters.rotation import MultiRotationScan
@@ -15,13 +16,15 @@ from mx_bluesky.hyperion.parameters.rotation import MultiRotationScan
 T = TypeVar("T", bound=BaseModel)
 
 
-def construct_from_values(parent_context: dict, key: str, t: type[T]) -> T:
-    values = dict(parent_context)
-    values |= values[key]
+def construct_from_values(parent_context: dict, child_dict: dict, t: type[T]) -> T:
+    values = {k: v for k, v in parent_context.items() if not isinstance(v, dict)}
+    values |= child_dict
     return t(**values)
 
 
-class LoadCentreCollect(MxBlueskyParameters, WithVisit, WithSample):
+class LoadCentreCollect(
+    MxBlueskyParameters, WithVisit, WithSample, WithCentreSelection
+):
     """Experiment parameters to perform the combined robot load,
     pin-tip centre and rotation scan operations."""
 
@@ -41,10 +44,12 @@ class LoadCentreCollect(MxBlueskyParameters, WithVisit, WithSample):
             disallowed_keys == set()
         ), f"Unexpected fields found in LoadCentreCollect {disallowed_keys}"
 
-        values["robot_load_then_centre"] = construct_from_values(
-            values, "robot_load_then_centre", RobotLoadThenCentre
+        new_robot_load_then_centre_params = construct_from_values(
+            values, values["robot_load_then_centre"], RobotLoadThenCentre
         )
-        values["multi_rotation_scan"] = construct_from_values(
-            values, "multi_rotation_scan", MultiRotationScan
+        new_multi_rotation_scan_params = construct_from_values(
+            values, values["multi_rotation_scan"], MultiRotationScan
         )
+        values["multi_rotation_scan"] = new_multi_rotation_scan_params
+        values["robot_load_then_centre"] = new_robot_load_then_centre_params
         return values

mx_bluesky/hyperion/parameters/rotation.py

@@ -47,7 +47,9 @@ class RotationExperiment(DiffractionExperimentWithSample):
         default=IspybExperimentType.ROTATION
     )
 
-    def _detector_params(self, omega_start_deg: float):
+    def _detector_params_impl(
+        self, omega_start_deg: float, num_images_per_trigger: int, num_triggers: int
+    ) -> DetectorParams:
         self.det_dist_to_beam_converter_path = (
             self.det_dist_to_beam_converter_path
             or CONST.PARAM.DETECTOR.BEAM_XY_LUT_PATH
@@ -66,13 +68,16 @@ class RotationExperiment(DiffractionExperimentWithSample):
             detector_distance=self.detector_distance_mm,
             omega_start=omega_start_deg,
             omega_increment=self.rotation_increment_deg,
-            num_images_per_trigger=self.num_images,
-            num_triggers=1,
+            num_images_per_trigger=num_images_per_trigger,
+            num_triggers=num_triggers,
             use_roi_mode=False,
             det_dist_to_beam_converter_path=self.det_dist_to_beam_converter_path,
             **optional_args,
         )
 
+    def _detector_params(self, omega_start_deg: float) -> DetectorParams:
+        return self._detector_params_impl(omega_start_deg, self.num_images, 1)
+
     @field_validator("selected_aperture")
     @classmethod
     def _set_default_aperture_position(cls, aperture_position: ApertureValue | None):
@@ -115,7 +120,7 @@ class MultiRotationScan(RotationExperiment, SplitScan):
 
     def _single_rotation_scan(self, scan: RotationScanPerSweep) -> RotationScan:
         # self has everything from RotationExperiment
-        allowed_keys = RotationScan.model_fields.keys()
+        allowed_keys = RotationScan.model_fields.keys()  # type: ignore # mypy doesn't recognise this as a property...
         params_dump = self.model_dump()
         # provided `scan` has everything from RotationScanPerSweep
         scan_dump = scan.model_dump()
@@ -156,8 +161,12 @@ class MultiRotationScan(RotationExperiment, SplitScan):
         return list(accumulate([0, *self._num_images_per_scan()]))
 
     @property
-    def detector_params(self):
-        return self._detector_params(self.rotation_scans[0].omega_start_deg)
+    def detector_params(self) -> DetectorParams:
+        return self._detector_params_impl(
+            self.rotation_scans[0].omega_start_deg,
+            self._num_images_per_scan()[0],
+            len(self._num_images_per_scan()),
+        )
 
     @property
     def ispyb_params(self):  # pyright: ignore

{mx_bluesky-1.4.0.dist-info → mx_bluesky-1.4.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: mx-bluesky
-Version: 1.4.0
+Version: 1.4.1
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
-License: Apache License
+License:                                  Apache License
                                    Version 2.0, January 2004
                                 http://www.apache.org/licenses/
         
@@ -213,7 +213,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: annotated-types
+Requires-Dist: annotated_types
 Requires-Dist: caproto
 Requires-Dist: fastapi[all]
 Requires-Dist: flask-restful
@@ -233,38 +233,39 @@ Requires-Dist: requests
 Requires-Dist: scanspec
 Requires-Dist: scipy
 Requires-Dist: semver
-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.3a5
-Requires-Dist: bluesky >=1.13.0a4
-Requires-Dist: dls-dodal ==1.35.0
+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: bluesky>=1.13.0a4
+Requires-Dist: dls-dodal==1.36.2
 Provides-Extra: dev
-Requires-Dist: black ; extra == 'dev'
-Requires-Dist: build ; extra == 'dev'
-Requires-Dist: diff-cover ; extra == 'dev'
-Requires-Dist: GitPython ; extra == 'dev'
-Requires-Dist: import-linter ; extra == 'dev'
-Requires-Dist: ipython ; extra == 'dev'
-Requires-Dist: mypy ; extra == 'dev'
-Requires-Dist: myst-parser ; extra == 'dev'
-Requires-Dist: pipdeptree ; extra == 'dev'
-Requires-Dist: pre-commit ; extra == 'dev'
-Requires-Dist: pydata-sphinx-theme >=0.12 ; extra == 'dev'
-Requires-Dist: pyright ; extra == 'dev'
-Requires-Dist: pytest-asyncio ; extra == 'dev'
-Requires-Dist: pytest-cov ; extra == 'dev'
-Requires-Dist: pytest-random-order ; extra == 'dev'
-Requires-Dist: pytest ; extra == 'dev'
-Requires-Dist: ruff ; extra == 'dev'
-Requires-Dist: sphinx-autobuild ; extra == 'dev'
-Requires-Dist: sphinx-copybutton ; extra == 'dev'
-Requires-Dist: sphinxcontrib-plantuml ; extra == 'dev'
-Requires-Dist: sphinx-design ; extra == 'dev'
-Requires-Dist: tox-direct ; extra == 'dev'
-Requires-Dist: tox ; extra == 'dev'
-Requires-Dist: types-mock ; extra == 'dev'
-Requires-Dist: types-requests ; extra == 'dev'
+Requires-Dist: black; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: diff-cover; extra == "dev"
+Requires-Dist: GitPython; extra == "dev"
+Requires-Dist: import-linter; extra == "dev"
+Requires-Dist: ipython; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: myst-parser; extra == "dev"
+Requires-Dist: pipdeptree; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: pydata-sphinx-theme>=0.12; extra == "dev"
+Requires-Dist: pyright; extra == "dev"
+Requires-Dist: pytest-asyncio; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-random-order; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
+Requires-Dist: sphinx-autobuild; extra == "dev"
+Requires-Dist: sphinx-copybutton; extra == "dev"
+Requires-Dist: sphinxcontrib-plantuml; extra == "dev"
+Requires-Dist: sphinx-design; extra == "dev"
+Requires-Dist: tox-direct; extra == "dev"
+Requires-Dist: tox; extra == "dev"
+Requires-Dist: types-mock; extra == "dev"
+Requires-Dist: types-requests; extra == "dev"
 
 mx-bluesky
 ===========================