mx-bluesky 1.5.2__tar.gz → 1.5.4__tar.gz

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/.github/workflows/_helm.yml

@@ -6,6 +6,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+
+      - name: checkout repo
+        uses: actions/checkout@v4
+        with:
+          # Need this to get version number from last tag
+          fetch-depth: 0
+
       - name: Install Helm
         uses: Azure/setup-helm@v4.3.0
         id: install

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/.vscode/mx-bluesky.code-workspace

@@ -13,6 +13,8 @@
             "editor.defaultFormatter": "ms-python.black-formatter"
         },
         "python.defaultInterpreterPath": ".venv/bin/python",
+        "python.analysis.extraPaths": ["../dodal"],
+        "python.analysis.autoImportCompletions": true,
         "terminal.integrated.gpuAcceleration": "off",
         "esbonio.sphinx.confDir": ""
     }

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.5.2
+Version: 1.5.4
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -235,12 +235,13 @@ Requires-Dist: scipy
 Requires-Dist: semver
 Requires-Dist: deepdiff
 Requires-Dist: matplotlib
+Requires-Dist: cachetools
+Requires-Dist: daq-config-server>=v1.0.0-rc.2
 Requires-Dist: blueapi>=0.15.0
-Requires-Dist: daq-config-server==0.1.1
 Requires-Dist: ophyd>=1.10.5
 Requires-Dist: ophyd-async>=0.10.0a2
 Requires-Dist: bluesky>=1.13.1
-Requires-Dist: dls-dodal==1.52.0
+Requires-Dist: dls-dodal==1.56.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/conftest.py

@@ -19,5 +19,5 @@ def pytest_addoption(parser):
 @pytest.fixture(scope="session", autouse=True)
 def default_session_fixture() -> Iterator[None]:
     print("Patching bluesky 0MQ Publisher in __main__ for the whole session")
-    with patch("mx_bluesky.hyperion.__main__.Publisher"):
+    with patch("mx_bluesky.hyperion.runner.Publisher"):
         yield

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/docs/developer/general/how-to/deploy-a-release.rst

@@ -38,7 +38,7 @@ For building and deploying a Docker image please see :doc:`../../hyperion/deploy
 
 .. note::
 
-    On i03 the installation will succeed with error messages due to RedHat7 versions of a dependency being unavailable.
+    On i03 the installation will succeed with error messages due to RedHat7 versions of dependencies being unavailable.
     This results in the installation being incomplete, thus requiring the following post-installation steps:
 
     First, on a RedHat8 workstation, run
@@ -47,6 +47,7 @@ For building and deploying a Docker image please see :doc:`../../hyperion/deploy
 
         . ./.venv/bin/activate
         pip install confluent-kafka
+        pip install contourpy
 
     Then, on the control machine, run
 

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/docs/developer/hyperion/reference/coordinate-systems.rst

@@ -20,7 +20,7 @@ defined by ``rotation_direction`` which can be ``POSITIVE`` or ``NEGATIVE``
 
 The coordinate systems of the underlying hardware may differ from the request. At Diamond traditionally the omega 
 axis is implemented to be in the opposite direction, therefore the commands sent to the hardware are transformed and 
-the ``omega_flip`` feature flag controls this behaviour, which by default is set to ``True`` as this is 
+the ``omega_flip`` flag controls this behaviour, which by default is set to ``True`` as this is 
 generally expected to be required for the beamlines here.
 
 In the Nexus output file, there is provision for describing the choice of axis orientations in the nexus file, and 

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/docs/developer/hyperion/reference/readme.md

@@ -1,17 +1,18 @@
-# hyperion
+# Hyperion Overview
 
 Repository for the Hyperion project to implement Unattended Data Collections on the Diamond MX beamlines using the [BlueSky](https://nsls-ii.github.io/bluesky/) / Ophyd framework from BNL.
 
-Currently the software is able to:
+The software is able to:
 
+- Fetch and decode UDC instructions from Agamemnon
+- Mount/unmount samples
+- Change energy of the beamline
 - Centre a sample, first using an optical camera, then using an xray grid scan. This centring is done at two orthogonal angles so that the sample is centred in 3D.
 - Perform a rotation scan to take diffraction data of the sample
 
 Left to do is:
 
-- Mount/unmount samples
 - Set up the beamline to be in a standard state for collection
-- Change energy of the beamline
 
 # Development Installation
 
@@ -41,8 +42,6 @@ If in a dev environment Hyperion will log to a local graylog instance instead an
 
 This uses the generic defaults for a local graylog instance. It can be accessed on `localhost:9000` where the username and password for the graylog portal are both admin.
 
-The hyperion python module can also be run directly without the startup script. It takes the same command line options, including:
-
 ## Testing
 
 Unit tests can be run with `pytest --random-order`. To see log output from tests you can turn on logging with the `--logging` command line option and then use the `-s` command line option to print logs into the console. So to run the unit tests such that all logs are at printed to the terminal, you can use `python -m pytest --random-order --logging -s`. Note that this will likely overrun your terminal buffer, so you can narrow the selection of tests with the `-k "<test name pattern>"` option.
@@ -53,6 +52,11 @@ To fake interaction and processing with Zocalo, you can run `fake_zocalo/dls_sta
 
 Tracing information (the time taken to complete different steps of experiments) is collected by an [OpenTelemetry](https://opentelemetry.io/) tracer, and currently we export this information to a local Jaeger monitor (if available). To see the tracing output, run the [Jaeger all-in-one container](https://www.jaegertracing.io/docs/1.6/getting-started/), and go to the web interface at http://localhost:16686.
 
+
+# REST API (GDA Mode)
+
+When running in GDA mode, Hyperion offers the following API
+
 ## Starting a scan
 
 To start a scan you can do the following:
@@ -86,3 +90,7 @@ To make the app write the `DEBUG` level logs stored in the `CircularMemoryHandle
 curl -X PUT http://127.0.0.1:5005/flush_debug_log
 
 ```
+
+# REST API (UDC Mode)
+
+In UDC Mode, the only endpoint available is the `/status` endpoint.

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/docs/developer/serial-crystallography-on-i24/how-to/pmac-docs.rst

@@ -55,7 +55,7 @@ in a couple of different ways.
 
    -  The ``hmz`` strings are homing commands which will reset the
       encoders counts to 0 for the axis. All three motors are homed by
-      sending the string: ``#1hmz#2hmz#3hmz``. In the plans this is done
+      sending the string: ``#5hmz#6hmz#7hmz``. In the plans this is done
       by triggering the home move:
 
       .. code:: python
@@ -74,7 +74,7 @@ in a couple of different ways.
 
 
 2. The stage motors can also be moved directly through the existing PVs
-   ``ME14E-MO-CHIP-01:{X,Y,Z}``, for example:
+   ``BL24I-EA-CHIP-01:{X,Y,Z}``, for example:
 
    .. code:: python
 

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/docs/index.rst

@@ -16,7 +16,14 @@ The documentation consists of a Developer Guide for MX-Bluesky, which also inclu
 
         The Developer Guide contains documentation on how to install, develop and contribute changes to MX-Bluesky; explanations about the purpose of the software and some of the technical concepts; as well as how-to guides and tutorials.
 
+    .. grid-item-card:: :material-regular:`code;4em`
+        :link: user/hyperion/index
+        :link-type: doc
+
+        The User Guide for the Hyperion UDC Service
+
 .. toctree::
     :hidden:
 
     developer/index
+    user/hyperion/index

mx_bluesky-1.5.4/docs/user/hyperion/alerts.rst

@@ -0,0 +1,68 @@
+Alerts
+------
+
+Hyperion can be configured to raise alerts in order to notify staff of issues with data collections or with Hyperion 
+itself.
+
+The currently supported alerting backend uses graylog alerting to send email alert notifications.
+
+Graylog Alert Configuration
+===========================
+
+When hyperion generates an alert it will generate the alert in the form of a log message that will be logged to graylog
+in the normal way.
+
+The log message will have the message ``***ALERT*** summary=<summary> content=<content>`` and will have the following 
+metadata as fields in the log message.
+
+.. csv-table:: Log message fields
+    :widths: auto
+    :header: "Field", "Description"
+
+    "alert_summary", "A single line summary of the alert, that could e.g. be used in an email summary"
+    "alert_content", "The plain text body of the alert message"
+    "beamline", "Beamline on which the alert was raised"
+    "container", "Container ID that was being processed"
+    "ispyb_url", "Link to the ISPyB page of the affected sample"
+    "graylog_url", "Link to the graylog stream in the minutes up to the event"
+    "proposal", "Proposal that was being processed"
+    "sample_id", "Sample ID that was being processed"
+    "visit", "Visit that was being processed"
+
+
+In order to configure alerts in Graylog you will need appropriate Graylog permissions to edit Event Definitions and 
+Notifications.
+
+Event Definitions define which log messages will trigger a Graylog Event, and the information that is contained in 
+the event.
+
+Notifications are triggered by a Graylog Event and define how the information in the event is dispatched to the 
+recipient(s).
+
+For the authoritative Graylog documentation, please see https://go2docs.graylog.org/current/interacting_with_your_log_data/alerts.html
+
+Notification Configuration
+--------------------------
+
+Go to the Alerts->Notifications tab in Graylog, you should see a searchable list of notifications, clicking on the 
+notification you want to edit and click the "Edit Notification" button.
+
+For an email notification, you can edit the subject, recipients, and the plain-text and HTML body.
+
+Inside the subject and body fields, you can include metadata from the event, for example ``${event.timestamp}`` will 
+expand to the event timestamp. 
+
+All the fields that are available in the event are available under the ``event.fields`` object, e.g. ``${event.fields.alert_summary}``
+
+Event Definitions
+-----------------
+
+In order to access fields from the log message, including the ones explicitly added by Hyperion and also any other 
+ones that graylog appends to the message, you must configure the Event Definition.
+
+To configure the Event Definition, go to the Alerts->Event Definitions tab and click on the notification definition, 
+then click "Edit Event Definition".
+
+Under Filter & Aggregation you can configure the conditions under which an event will be generated.
+Under Fields you can add custom fields to the event, for each additional field that you want to use in the 
+notification, you should click Add Custom Field, then populate the fields, see the existing definitions as a guide.

mx_bluesky-1.5.4/docs/user/hyperion/configuration.rst

@@ -0,0 +1,25 @@
+Configuration
+-------------
+
+Configuration of several properties that control Hyperion execution are available. These can be edited in the 
+``domain.properties`` file typically found in
+
+::
+
+    /dls_sw/<beamline>/software/daq_configuration/domain.properties
+
+
+.. csv-table:: Configuration properties
+    :widths: auto
+    :header: "Property Name", "Type", "Description"
+
+    "gda.gridscan.hyperion.flaskServerAddress", "host:port", "Configures the Hyperion server address that GDA connects to."
+    "gda.gridscan.hyperion.multipin", "boolean", "Controls whether multipin collection is enabled."
+    "gda.hyperion.use_grid_snapshots_for_rotation", "boolean", "If true, then rotation snapshots are generated from the grid snapshots instead of directly capturing them"
+    "gda.mx.hyperion.enabled",  "boolean",  "Controls whether GDA invokes Hyperion or performs collection itself"
+    "gda.mx.hyperion.panda.runnup_distance_mm", "double", "Controls the panda runup distance."
+    "gda.mx.hyperion.xrc.box_size", "double", "Configures the grid scan box size in microns."
+    "gda.mx.hyperion.use_panda_for_gridscans", "boolean", "If true then the Panda is used instead of the Zebra for XRC gridscans" 
+    "gda.mx.hyperion.xrc.use_gpu_results", "boolean", "If true, then zocalo gridscan processing uses the GPU results"
+    "gda.mx.hyperion.xrc.use_roi_mode", "boolean", "If true then ROI mode is used."
+    "gda.mx.udc.hyperion.enable", "boolean",  "Enables Hyperion UDC mode."

mx_bluesky-1.5.4/docs/user/hyperion/index.rst

@@ -0,0 +1,27 @@
+Hyperion User Guide
+===================
+
+The Hyperion User Guide describes how to run, configure and troubleshoot Hyperion. For installation instructions, see
+the Developer Guide.
+
+What is Hyperion?
+-----------------
+
+Hyperion is a service for running high throughput unattended data collection (UDC). It does not provide a user 
+interface, instead instructions are pulled from Agamemnon which is controlled by information obtained in ISPyB.
+
+The software supports two modes of operation:
+
+* UDC mode (experimental) where Hyperion automatically fetches instructions from Agamemnon.
+* GDA mode (where GDA fetches and decodes the Agamemnon
+  instructions). GDA mode will be removed in a future release.
+
+The mode of operation is determined by configuration using the ``gda.mx.udc.hyperion.enable`` parameter
+
+
+.. toctree::
+    :caption: Topics
+    :maxdepth: 1
+    :glob:
+
+    *

mx_bluesky-1.5.4/docs/user/hyperion/logging.rst

@@ -0,0 +1,41 @@
+Logging
+-------
+
+Hyperion logs to a number of different locations. The sections below describe the locations that are configured via 
+environment variables for a standard server install; for kubernetes deployments please check the deployment 
+``values.yaml`` for the configured locations. 
+
+Graylog
+~~~~~~~
+
+Graylog is the recommended way to view logs. It is used for more centralised logging which is also more easily 
+searched and archived. Log messages are sent to the `Hyperion graylog stream <https://graylog.diamond.ac.uk/streams/66264f5519ccca6d1c9e4e03/search>`_.
+
+
+Startup Log
+~~~~~~~~~~~
+
+When ``hyperion_restart()`` is called by GDA, it will log the initial console output to a log file. This log file 
+location is 
+controlled by the ``gda.logs.dir`` property and is typically ``/dls_sw/<beamline>/logs/bluesky``.
+
+On kubernetes deployments, the initial startup is sent to standard IO and is captured as part of the standard 
+kubernetes logging facility.
+
+Log files
+~~~~~~~~~
+
+By default, Hyperion logs to the filesystem.
+
+The log file location is controlled by the ``LOG_DIR`` environment value. Typically this can be found in 
+``/dls_sw/<beamline>/logs/bluesky``
+
+Debug Log
+~~~~~~~~~
+
+The standard logs files do not record all messages, only those at INFO level or higher, in order to keep storage 
+requirements to a minimum. 
+In the event of an error occurring, then trace-level logging for the most recent events (by default 5000) is flushed 
+to a separate set of log files. Due to the size of these files, they are stored separately from the main log files
+. These logs are located in ``/dls/tmp/<beamline>/logs/bluesky`` by default, or 
+otherwise as specified by the ``DEBUG_LOG_DIR`` environment variable.  

mx_bluesky-1.5.4/docs/user/hyperion/pvs.rst

@@ -0,0 +1,12 @@
+Special PVs
+-----------
+
+Baton
+~~~~~
+
+In order to arbitrate access to the beamline between Hyperion and GDA there are two baton string PVs REQUESTED_USER and 
+CURRENT_USER.
+
+Hyperion will only start operating once REQUESTED_USER has been set to Hyperion, at which point it will set 
+CURRENT_USER. To request the baton from Hyperion, set REQUESTED_USER to some other value, when Hyperion completes the
+current action, it will relinquish CURRENT_USER.

mx_bluesky-1.5.4/docs/user/hyperion/running.rst

@@ -0,0 +1,13 @@
+Running Hyperion
+----------------
+
+When installed, Hyperion should be running automatically. 
+
+Restarting Hyperion
+-------------------
+
+If Hyperion is running as a standalone server installation, it can be (re)started from GDA by 
+invoking ``hyperion_restart()`` from the Jython console.
+
+If Hyperion is running in a Kubernetes container, then it can be restarted by scaling the deployment or 
+deleting the pod (which will cause a new instance to be created)

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/helm/mx-bluesky-blueapi/values.yaml

@@ -11,9 +11,3 @@ zocalo:
     - name: rabbitmq-api-reader
       secretName: rmq-api-reader
       fileName: rabbitmq-api-reader.yml
-
-ispyb:
-  secrets:
-  - name: ispyb-creds
-    secretName: ispyb-creds
-    fileName: ispyb-credentials.yml

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/pyproject.toml

@@ -38,16 +38,17 @@ dependencies = [
     "semver",
     "deepdiff",
     "matplotlib",
+    "cachetools",
     #
     # These dependencies may be issued as pre-release versions and should have a pin constraint
     # as by default pip-install will not upgrade to a pre-release.
     #
+    "daq-config-server>=v1.0.0-rc.2",
     "blueapi >= 0.15.0",
-    "daq-config-server == 0.1.1",
     "ophyd >= 1.10.5",
     "ophyd-async >= 0.10.0a2",
     "bluesky >= 1.13.1",
-    "dls-dodal == 1.52.0",
+    "dls-dodal == 1.56.0",
 ]
 
 
@@ -94,8 +95,6 @@ run_extruder = "mx_bluesky.beamlines.i24.serial.run_serial:run_extruder"
 run_fixed_target = "mx_bluesky.beamlines.i24.serial.run_serial:run_fixed_target"
 hyperion = "mx_bluesky.hyperion.__main__:main"
 hyperion-callbacks = "mx_bluesky.hyperion.external_interaction.callbacks.__main__: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"
 redis_to_murko = "mx_bluesky.beamlines.i04.redis_to_murko_forwarder:main"
 
 [project.urls]
@@ -122,6 +121,7 @@ markers = [
     "skip_log_setup: marks tests so that loggers are not setup before the test.",
     "skip_in_pycharm: marks test as not working in pycharm testrunner",
     "system_test: marks tests as a system test",
+    "requires: marks a test as having an external dependency such as a service or hardware",
 ]
 addopts = """
     --tb=native -vv --doctest-modules --doctest-glob="*.rst" --durations=10
@@ -142,6 +142,10 @@ filterwarnings = [
     # Ignore warning about deprecations in python-workflows encountered during system tests
     # https://github.com/DiamondLightSource/python-workflows/issues/188
     "ignore:.*`Field` should not be instantiated.*:marshmallow.warnings.ChangedInMarshmallow4Warning",
+    #Remove when we drop python 3.11
+    "ignore:.*__contains__ will no longer raise TypeError.*:DeprecationWarning",
+    # epicscorelibs requires setuptools >= 70.1
+    "ignore:.*The 'wheel' package is no longer the canonical location of the 'bdist_wheel' command.*:DeprecationWarning",
 ]
 # Doctest python code in docs, python code in src docstrings, test functions in tests
 testpaths = "docs src tests/unit_tests"

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/run_hyperion.sh

@@ -5,6 +5,7 @@
 STOP=0
 START=1
 IN_DEV=false
+MODE=gda
 
 for option in "$@"; do
     case $option in
@@ -22,7 +23,9 @@ for option in "$@"; do
         --dev)
             IN_DEV=true
             ;;
-
+        --udc)
+            MODE=udc
+            ;;
         --help|--info|--h)
             source .venv/bin/activate
             echo "`basename $0` [options]"
@@ -38,6 +41,7 @@ Options:
   --skip-startup-connection
                           Do not connect to devices at startup
   --dev                   Enable dev mode to run from a local workspace on a development machine.
+  --udc                   Start hyperion in UDC mode instead of taking commands from GDA
   --help                  This help
 
 By default this script will start an Hyperion server unless the --no-start flag is specified.
@@ -121,7 +125,7 @@ if [[ $START == 1 ]]; then
     declare -A h_and_cb_args=( ["IN_DEV"]="$IN_DEV" )
     declare -A h_and_cb_arg_strings=( ["IN_DEV"]="--dev" )
 
-    h_commands=()
+    h_commands="--mode $MODE"
     cb_commands=()
     for i in "${!h_and_cb_args[@]}"
     do

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/src/mx_bluesky/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.5.2'
-__version_tuple__ = version_tuple = (1, 5, 2)
+__version__ = version = '1.5.4'
+__version_tuple__ = version_tuple = (1, 5, 4)
+
+__commit_id__ = commit_id = 'gb4b359fcc'

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/src/mx_bluesky/beamlines/aithre_lasershaping/__init__.py

@@ -1,4 +1,5 @@
 from mx_bluesky.beamlines.aithre_lasershaping.beamline_safe import (
+    go_to_zero,
     set_beamline_safe_on_robot,
 )
 from mx_bluesky.beamlines.aithre_lasershaping.check_goniometer_performance import (
@@ -18,4 +19,5 @@ __all__ = [
     "go_to_furthest_maximum",
     "rotate_goniometer_relative",
     "jog_sample",
+    "go_to_zero",
 ]

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/src/mx_bluesky/beamlines/aithre_lasershaping/beamline_safe.py

@@ -34,3 +34,20 @@ def set_beamline_safe_on_robot(
         else ForceBit.NO.value
     )
     yield from bps.abs_set(robot.set_beamline_safe, set_value, wait=True)
+
+
+def go_to_zero(
+    goniometer: Goniometer = inject("goniometer"), group="move_to_zero", wait=True
+) -> MsgGenerator:
+    """
+    Rotate the goniometer and set stages to zero in preparation for robot load/unload.
+    Pass wait=False to avoid waiting for the move to complete.
+    """
+    yield from bps.abs_set(goniometer.omega, 0, group=group)
+    yield from bps.abs_set(goniometer.x, 0, group=group)
+    yield from bps.abs_set(goniometer.y, 0, group=group)
+    yield from bps.abs_set(goniometer.z, 0, group=group)
+    yield from bps.abs_set(goniometer.sampy, 0, group=group)
+    yield from bps.abs_set(goniometer.sampz, 0, group=group)
+    if wait:
+        yield from bps.wait(group=group)

mx_bluesky-1.5.4/src/mx_bluesky/beamlines/i04/__init__.py

@@ -0,0 +1,10 @@
+from mx_bluesky.beamlines.i04.experiment_plans.i04_grid_detect_then_xray_centre_plan import (
+    i04_grid_detect_then_xray_centre,
+)
+from mx_bluesky.beamlines.i04.thawing_plan import thaw, thaw_and_stream_to_redis
+
+__all__ = [
+    "thaw",
+    "thaw_and_stream_to_redis",
+    "i04_grid_detect_then_xray_centre",
+]

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/src/mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py

@@ -4,7 +4,6 @@ from functools import partial
 
 import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
-from blueapi.core import BlueskyContext
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
 from dodal.devices.aperturescatterguard import ApertureScatterguard
@@ -66,19 +65,13 @@ from mx_bluesky.common.parameters.gridscan import GridCommon, SpecifiedThreeDGri
 from mx_bluesky.common.preprocessors.preprocessors import (
     transmission_and_xbpm_feedback_for_collection_decorator,
 )
-from mx_bluesky.common.utils.context import device_composite_from_context
+from mx_bluesky.common.utils.log import LOGGER
 from mx_bluesky.phase1_zebra.device_setup_plans.setup_zebra import (
     setup_zebra_for_gridscan,
     tidy_up_zebra_after_gridscan,
 )
 
 
-def create_devices(
-    context: BlueskyContext,
-) -> GridDetectThenXRayCentreComposite:
-    return device_composite_from_context(context, GridDetectThenXRayCentreComposite)
-
-
 # See https://github.com/DiamondLightSource/blueapi/issues/506 for using device composites
 def i04_grid_detect_then_xray_centre(
     parameters: GridCommon,
@@ -184,9 +177,11 @@ def get_ready_for_oav_and_close_shutter(
 ):
     yield from bps.wait(PlanGroupCheckpointConstants.GRID_READY_FOR_DC)
     group = "get_ready_for_oav_and_close_shutter"
+    LOGGER.info("Non-udc tidy: Seting up beamline for OAV")
     yield from setup_beamline_for_OAV(
         smargon, backlight, aperture_scatterguard, group=group
     )
+    LOGGER.info("Non-udc tidy: Closing detector shutter")
     yield from bps.abs_set(
         detector_motion.shutter,
         0,

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/src/mx_bluesky/beamlines/i04/thawing_plan.py

@@ -10,7 +10,7 @@ from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_to_redis_forwarder import OAVToRedisForwarder, Source
 from dodal.devices.robot import BartRobot
 from dodal.devices.smargon import Smargon
-from dodal.devices.thawer import Thawer, ThawerStates
+from dodal.devices.thawer import OnOff, Thawer
 
 from mx_bluesky.beamlines.i04.callbacks.murko_callback import MurkoCallback
 
@@ -117,7 +117,7 @@ def _thaw(
 
     def do_thaw():
         yield from bps.abs_set(smargon.omega.velocity, new_velocity, wait=True)
-        yield from bps.abs_set(thawer.control, ThawerStates.ON, wait=True)
+        yield from bps.abs_set(thawer.control, OnOff.ON, wait=True)
         yield from bps.rel_set(smargon.omega, rotation, wait=True)
         if plan_between_rotations:
             yield from plan_between_rotations()
@@ -125,7 +125,7 @@ def _thaw(
 
     def cleanup():
         yield from bps.abs_set(smargon.omega.velocity, inital_velocity, wait=True)
-        yield from bps.abs_set(thawer.control, ThawerStates.OFF, wait=True)
+        yield from bps.abs_set(thawer.control, OnOff.OFF, wait=True)
 
     # Always cleanup even if there is a failure
     yield from bpp.contingency_wrapper(

{mx_bluesky-1.5.2 → mx_bluesky-1.5.4}/src/mx_bluesky/beamlines/i24/serial/blueapi_config.yaml

@@ -7,11 +7,11 @@ env:
   events:
     broadcast_status_events: false
 api:
-  port: 25565
+  url: http://localhost:25565
   cors:
     allow_credentials: True
     origins: 
       - "*"
 stomp:
   enabled: true
-  host: i24-control.diamond.ac.uk
+  url: http://i24-control.diamond.ac.uk:61613