mx-bluesky 1.4.4__tar.gz → 1.4.6__tar.gz

{mx_bluesky-1.4.4 → mx_bluesky-1.4.6}/.github/CONTRIBUTING.md

@@ -36,6 +36,8 @@ Developers are welcome to ignore **nit** comments if they wish and can choose no
 
 For minor changes to code reviewers are welcome to make the changes themselves but in this case the original developer should then recheck what the reviewer has done.
 
+When beginning to review a PR, it is recommended to assign the PR to yourself on GitHub so that other developers know that this code is already being reviewed. If you decide you cannot complete the review, remember to unassign yourself from this PR to let others know.
+
 ## Issue or Discussion?
 
 Github also offers [discussions](https://github.com/DiamondLightSource/mx-bluesky/discussions) as a place to ask questions and share ideas. If

{mx_bluesky-1.4.4 → mx_bluesky-1.4.6}/.pre-commit-config.yaml

@@ -6,7 +6,7 @@ repos:
         args: ["--maxkb=500"]
       - id: check-yaml
         args: ["--allow-multiple-documents"]
-        exclude: ^helmchart/
+        exclude: ^helmcharts/
       - id: check-merge-conflict
       - id: end-of-file-fixer
 

{mx_bluesky-1.4.4 → mx_bluesky-1.4.6}/Dockerfile.release

@@ -1,5 +1,11 @@
 FROM python:3.11 AS build
 
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt update -y && apt upgrade -y
+# Needed for python cv2 dependency
+RUN apt install -y libgl1 libglib2.0-0
+
 RUN pip install setuptools_scm
 
 # Copy the pyproject.toml and install dependencies for better caching when developing

{mx_bluesky-1.4.4 → mx_bluesky-1.4.6}/PKG-INFO

@@ -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 → mx_bluesky-1.4.6}/docs/developer/hyperion/index.rst

@@ -15,6 +15,7 @@ Documentation specific for the Hyperion module within MX-Bluesky
             reference/param-hierarchy
             reference/readme
             deploying-hyperion
+            system-tests
 
         +++
 

mx_bluesky-1.4.6/docs/developer/hyperion/system-tests.rst

@@ -0,0 +1,20 @@
+System Tests
+============
+
+The system tests are run by a project hosted in a GitLab private repository, `Hyperion System Testing`_.
+
+This contains a ``.gitlab-ci`` pipeline that defines a job that runs the tests.
+ 
+System Test Images
+------------------
+
+The system tests require a number of container images to run:
+
+   * The test runner image
+   * An ISPyB MariaDB database server image
+   * An ExpEye image
+
+It is expected that these images should need to change only infrequently and builds are triggered
+manually as needed - see the Hyperion System Testing project for how to rebuild them and how to trigger the tests. 
+
+.. _`Hyperion System Testing`: https://gitlab.diamond.ac.uk/MX-GDA/hyperion-system-testing

{mx_bluesky-1.4.4/helmchart → mx_bluesky-1.4.6/helmcharts/hyperion}/templates/deployment.yaml

@@ -14,13 +14,13 @@ spec:
     spec:
       securityContext:
         # gda2
-        runAsUser: {{  .Values.hyperion.runAsUser }}
-        runAsGroup: {{ .Values.hyperion.runAsGroup }}
-        supplementalGroups: {{ .Values.hyperion.supplementalGroups }}
+        runAsUser: {{  .Values.application.runAsUser }}
+        runAsGroup: {{ .Values.application.runAsGroup }}
+        supplementalGroups: {{ .Values.application.supplementalGroups }}
       volumes:
         - name: dls-sw-bl
           hostPath:
-            path: "/dls_sw/{{ .Values.hyperion.beamline }}"
+            path: "/dls_sw/{{ .Values.application.beamline }}"
             type: Directory
         - name: dls-sw-apps
           hostPath:
@@ -33,15 +33,15 @@ spec:
         # Bind some source folders for easier debugging        
         - name: src
           hostPath:
-            path: "{{ .Values.hyperion.projectDir }}/src"
+            path: "{{ .Values.application.projectDir }}/src"
             type: Directory
         - name: tests
           hostPath:
-            path: "{{ .Values.hyperion.projectDir }}/tests"
+            path: "{{ .Values.application.projectDir }}/tests"
             type: Directory
         - name: utility-scripts
           hostPath:
-            path: "{{ .Values.hyperion.projectDir }}/utility_scripts"
+            path: "{{ .Values.application.projectDir }}/utility_scripts"
             type: Directory
         - name: dodal
           hostPath:
@@ -50,14 +50,14 @@ spec:
         - name: logs
           hostPath:
             type: Directory
-            path: "{{ .Values.hyperion.logDir }}"
+            path: "{{ .Values.application.logDir }}"
         - name: data
           hostPath:
             type: Directory
-            path: "{{ .Values.hyperion.dataDir }}"
+            path: "{{ .Values.application.dataDir }}"
       containers:
       - name: hyperion
-        image: {{ .Values.hyperion.imageRepository}}/mx-bluesky:{{ .Values.hyperion.appVersion }}
+        image: {{ .Values.application.imageRepository}}/mx-bluesky:{{ .Values.application.appVersion }}
         securityContext:
           capabilities:
             # Required for hostNetwork 
@@ -103,30 +103,29 @@ spec:
             memory: "1Gi"
         ports:
           - name: hyperion-api
-            containerPort: {{ .Values.hyperion.containerPort }}
+            containerPort: {{ .Values.application.containerPort }}
             protocol: TCP
         env:
           - name: LOG_DIR
             value: /var/log/bluesky
           - name: BEAMLINE
-            value: "{{ .Values.hyperion.beamline }}"
-          {{- if not .Values.hyperion.dev }}
+            value: "{{ .Values.application.beamline }}"
+          {{- if not .Values.application.dev }}
           - name: ZOCALO_GO_USER
             value: "gda2"
           - name: ZOCALO_GO_HOSTNAME
-            value: "{{ .Values.hyperion.beamline }}-control"
+            value: "{{ .Values.application.beamline }}-control"
           - name: ZOCALO_CONFIG
             value: "/dls_sw/apps/zocalo/live/configuration.yaml"
           - name: ISPYB_CONFIG_PATH
-            value: "/dls_sw/dasc/mariadb/credentials/ispyb-hyperion-{{ .Values.hyperion.beamline }}.cfg"
-        args: [ "--external-callbacks" ]
+            value: "/dls_sw/dasc/mariadb/credentials/ispyb-hyperion-{{ .Values.application.beamline }}.cfg"
           {{- end }}
         readinessProbe:
           exec:
             command: [ "/app/hyperion/utility_scripts/docker/healthcheck.sh" ]
           periodSeconds: 5
         volumeMounts:
-          - mountPath: "/dls_sw/{{ .Values.hyperion.beamline }}"
+          - mountPath: "/dls_sw/{{ .Values.application.beamline }}"
             name: dls-sw-bl
             readOnly: true
             mountPropagation: HostToContainer
@@ -148,6 +147,6 @@ spec:
             name: dodal
           - mountPath: "/var/log/bluesky"
             name: logs
-          - mountPath: "/dls/{{ .Values.hyperion.beamline }}/data"
+          - mountPath: "/dls/{{ .Values.application.beamline }}/data"
             name: data
       hostNetwork: true

{mx_bluesky-1.4.4/helmchart → mx_bluesky-1.4.6/helmcharts/hyperion}/templates/ingress.yaml

@@ -1,4 +1,4 @@
-{{- if not .Values.hyperion.dev }}
+{{- if not .Values.application.dev }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -7,9 +7,9 @@ spec:
   ingressClassName: nginx
   tls:
   - hosts:
-    - {{ .Values.hyperion.externalHostname }}
+    - {{ .Values.application.externalHostname }}
   rules:
-  - host: {{ .Values.hyperion.externalHostname }}
+  - host: {{ .Values.application.externalHostname }}
     http:
       paths:
       - path: /
@@ -18,6 +18,6 @@ spec:
           service:
             name: hyperion-svc # this must match the name of the service you want to target
             port:
-              number: {{ .Values.hyperion.containerPort }}
+              number: {{ .Values.application.containerPort }}
   {{- end }}
   

{mx_bluesky-1.4.4/helmchart → mx_bluesky-1.4.6/helmcharts/hyperion}/templates/service.yaml

@@ -3,15 +3,15 @@ kind: Service
 metadata:
   name: hyperion-svc
 spec:
-  {{- if .Values.hyperion.dev }}
+  {{- if .Values.application.dev }}
   type: LoadBalancer
   {{- else }}
   type: ClusterIP
   {{- end }}
   ports:
     - name: hyperion-api
-      port: {{ .Values.hyperion.servicePort }}
+      port: {{ .Values.application.servicePort }}
       protocol: TCP
-      targetPort: {{ .Values.hyperion.containerPort }}
+      targetPort: {{ .Values.application.containerPort }}
   selector:
     app: hyperion

{mx_bluesky-1.4.4/helmchart → mx_bluesky-1.4.6/helmcharts/hyperion}/values.yaml

@@ -1,4 +1,4 @@
-hyperion:
+application:
   containerPort: 5005
   servicePort: 80
   imageRepository: ghcr.io/diamondlightsource

mx_bluesky-1.4.6/helmcharts/redis-to-murko/Chart.yaml

@@ -0,0 +1,6 @@
+apiVersion: v2
+name: redis-to-murko
+description: Redis to murko server
+type: application
+# version of the chart
+version: 0.0.1

mx_bluesky-1.4.6/helmcharts/redis-to-murko/templates/deployment.yaml

@@ -0,0 +1,73 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Values.application.name }}-deployment
+spec:
+  selector:
+    matchLabels:
+      app: {{ .Values.application.name }}
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.application.name }}
+        project: murko
+    spec:
+      securityContext:
+        runAsUser: {{  .Values.application.runAsUser }}
+        runAsGroup: {{ .Values.application.runAsGroup }}
+        supplementalGroups: {{ .Values.application.supplementalGroups }}
+      volumes:
+        - name: dls-sw-bl
+          hostPath:
+            path: "/dls_sw/{{ .Values.application.beamline }}"
+            type: Directory
+        # Bind some source folders for easier debugging        
+        - name: src
+          hostPath:
+            path: "{{ .Values.application.projectDir }}/src"
+            type: Directory
+        - name: tests
+          hostPath:
+            path: "{{ .Values.application.projectDir }}/tests"
+            type: Directory
+        - name: utility-scripts
+          hostPath:
+            path: "{{ .Values.application.projectDir }}/utility_scripts"
+            type: Directory
+        - name: dodal
+          hostPath:
+            path: "{{ .Values.dodal.projectDir | clean }}"
+            type: Directory
+      containers:
+      - name: {{ .Values.application.name }}
+        image: {{ .Values.application.imageRepository}}/mx-bluesky:{{ .Values.application.appVersion }}    
+        command: ["redis_to_murko"]      
+        resources:
+          limits:
+            cpu: "1"
+            memory: "1Gi"
+        env:
+          - name: LOG_DIR
+            value: /var/log/bluesky
+          - name: BEAMLINE
+            value: "{{ .Values.application.beamline }}"
+          - name: VALKEY_PASSWORD
+            valueFrom:
+             secretKeyRef:
+               name: valkey-secret
+               key: requirepass
+        volumeMounts:
+          - mountPath: "/dls_sw/{{ .Values.application.beamline }}"
+            name: dls-sw-bl
+            readOnly: true
+            mountPropagation: HostToContainer
+          - mountPath: "/app/hyperion/src"
+            name: src
+          - mountPath: "/app/hyperion/tests"
+            name: tests
+          - mountPath: "/app/hyperion/utility_scripts"
+            name: utility-scripts
+          - mountPath: "/app/dodal"
+            name: dodal
+      hostNetwork: false

mx_bluesky-1.4.6/helmcharts/redis-to-murko/values.yaml

@@ -0,0 +1,17 @@
+podSecurityContext: {}
+
+application:
+  name: redis-to-murko
+  imageRepository: ghcr.io/diamondlightsource
+  beamline: i04
+  # i03-hyperion user and group
+  runAsUser: 36101
+  runAsGroup: 36101
+  supplementalGroups: []
+  # These should be overridden at install time
+  projectDir: SET_ON_INSTALL
+  appVersion: SET_ON_INSTALL
+dodal:
+  projectDir: SET_ON_INSTALL
+service:
+  type: NodePort

{mx_bluesky-1.4.4 → mx_bluesky-1.4.6}/pyproject.toml

@@ -18,6 +18,7 @@ dependencies = [
     #
     "annotated_types",
     "caproto",
+    "confluent-kafka==2.8.0",
     "fastapi[all]",
     "flask-restful",
     "ispyb",
@@ -44,9 +45,9 @@ dependencies = [
     "blueapi >= 0.5.0",
     "daq-config-server >= 0.1.1",
     "ophyd == 1.9.0",
-    "ophyd-async >= 0.8a5",
+    "ophyd-async >= 0.9.0a2",
     "bluesky >= 1.13",
-    "dls-dodal == 1.39.0",
+    "dls-dodal == 1.41.0",
 ]
 
 
@@ -71,7 +72,7 @@ dev = [
     "plantweb",
     "pre-commit",
     "pydata-sphinx-theme>=0.12",
-    "pyright",
+    "pyright==1.1.394",          # See https://github.com/DiamondLightSource/mx-bluesky/issues/875
     "pytest-asyncio",
     "pytest-cov",
     "pytest-random-order",
@@ -94,6 +95,7 @@ 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]
 GitHub = "https://github.com/DiamondLightSource/mx-bluesky"
@@ -119,9 +121,10 @@ markers = [
     "dlstbx: marks tests as requiring dlstbx (deselect with '-m \"not dlstbx\"')",
     "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",
 ]
 addopts = """
-    --tb=native -vv --doctest-modules --doctest-glob="*.rst"
+    --tb=native -vv --doctest-modules --doctest-glob="*.rst" --durations=10
     """
 # https://iscinumpy.gitlab.io/post/bound-version-constraints/#watch-for-warnings
 filterwarnings = [
@@ -147,6 +150,9 @@ filterwarnings = [
     "ignore:.*custom tp_new.*:DeprecationWarning",
     # Ignore warning about deprecated throw() call https://github.com/bluesky/bluesky/issues/1817
     "ignore:.*signature of throw\\(\\) is deprecated.*:DeprecationWarning",
+    # 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",
 ]
 # Doctest python code in docs, python code in src docstrings, test functions in tests
 testpaths = "docs src tests/unit_tests"
@@ -165,10 +171,12 @@ legacy_tox_ini = """
 [tox]
 skipsdist=True
 
-[testenv:{pre-commit,type-checking,tests,docs}]
+[testenv:{pre-commit,type-checking,tests,docs,systemtests}]
 # Don't create a virtualenv for the command, requires tox-direct plugin
 direct = True
 passenv = *
+setenv =
+    systemtests: DODAL_TEST_MODE=true
 allowlist_externals =
     pytest
     pre-commit
@@ -180,6 +188,7 @@ commands =
     type-checking: pyright src tests {posargs}
     tests: pytest --cov=mx_bluesky --cov-report term --cov-report xml:cov.xml {posargs}
     docs: sphinx-{posargs:build -EW --keep-going} -T docs build/html
+    systemtests: pytest --junit-xml=systemtests_output.xml -m system_test tests/system_tests
 commands_pre =
     docs: /usr/bin/bash -c "{toxinidir}/utility_scripts/generate_plantuml.py > \
         docs/developer/hyperion/reference/param_hierarchy.puml"
@@ -189,14 +198,15 @@ commands_pre =
 src = ["src", "tests"]
 line-length = 88
 lint.select = [
-    "B",   # flake8-bugbear - https://docs.astral.sh/ruff/rules/#flake8-bugbear-b
-    "C4",  # flake8-comprehensions - https://docs.astral.sh/ruff/rules/#flake8-comprehensions-c4
-    "E",   # pycodestyle errors - https://docs.astral.sh/ruff/rules/#error-e
-    "F",   # pyflakes rules - https://docs.astral.sh/ruff/rules/#pyflakes-f
-    "W",   # pycodestyle warnings - https://docs.astral.sh/ruff/rules/#warning-w
-    "I",   # isort - https://docs.astral.sh/ruff/rules/#isort-i
-    "UP",  # pyupgrade - https://docs.astral.sh/ruff/rules/#pyupgrade-up
-    "SLF", # self - https://docs.astral.sh/ruff/settings/#lintflake8-self
+    "B",     # flake8-bugbear - https://docs.astral.sh/ruff/rules/#flake8-bugbear-b
+    "C4",    # flake8-comprehensions - https://docs.astral.sh/ruff/rules/#flake8-comprehensions-c4
+    "E",     # pycodestyle errors - https://docs.astral.sh/ruff/rules/#error-e
+    "F",     # pyflakes rules - https://docs.astral.sh/ruff/rules/#pyflakes-f
+    "W",     # pycodestyle warnings - https://docs.astral.sh/ruff/rules/#warning-w
+    "I",     # isort - https://docs.astral.sh/ruff/rules/#isort-i
+    "UP",    # pyupgrade - https://docs.astral.sh/ruff/rules/#pyupgrade-up
+    "SLF",   # self - https://docs.astral.sh/ruff/settings/#lintflake8-self
+    "PT012", # flake8-pytest-style rules - https://docs.astral.sh/ruff/rules/pytest-raises-with-multiple-statements/#pytest-raises-with-multiple-statements-pt012
 ]
 lint.extend-ignore = [
     "E501", # Line too long

{mx_bluesky-1.4.4 → mx_bluesky-1.4.6}/run_hyperion.sh

@@ -5,7 +5,6 @@ START=1
 SKIP_STARTUP_CONNECTION=false
 VERBOSE_EVENT_LOGGING=false
 IN_DEV=false
-EXTERNAL_CALLBACK_SERVICE=false
 
 for option in "$@"; do
     case $option in
@@ -28,9 +27,6 @@ for option in "$@"; do
         --verbose-event-logging)
             VERBOSE_EVENT_LOGGING=true
             ;;
-        --external-callbacks)
-            EXTERNAL_CALLBACK_SERVICE=true
-            ;;
 
         --help|--info|--h)
         
@@ -119,11 +115,9 @@ if [[ $START == 1 ]]; then
 
     #Add future arguments here
     declare -A h_only_args=(        ["SKIP_STARTUP_CONNECTION"]="$SKIP_STARTUP_CONNECTION"
-                                    ["VERBOSE_EVENT_LOGGING"]="$VERBOSE_EVENT_LOGGING"
-                                    ["EXTERNAL_CALLBACK_SERVICE"]="$EXTERNAL_CALLBACK_SERVICE" )
+                                    ["VERBOSE_EVENT_LOGGING"]="$VERBOSE_EVENT_LOGGING" )
     declare -A h_only_arg_strings=( ["SKIP_STARTUP_CONNECTION"]="--skip-startup-connection"
-                                    ["VERBOSE_EVENT_LOGGING"]="--verbose-event-logging"
-                                    ["EXTERNAL_CALLBACK_SERVICE"]="--external-callbacks")
+                                    ["VERBOSE_EVENT_LOGGING"]="--verbose-event-logging" )
 
     declare -A h_and_cb_args=( ["IN_DEV"]="$IN_DEV" )
     declare -A h_and_cb_arg_strings=( ["IN_DEV"]="--dev" )
@@ -146,9 +140,7 @@ if [[ $START == 1 ]]; then
 
     unset PYEPICS_LIBCA
     hyperion `echo $h_commands;`>$start_log_path  2>&1 &
-    if [ $EXTERNAL_CALLBACK_SERVICE == true ]; then
-        hyperion-callbacks `echo $cb_commands;`>$callback_start_log_path 2>&1 &
-    fi
+    hyperion-callbacks `echo $cb_commands;`>$callback_start_log_path 2>&1 &
     echo "$(date) Waiting for Hyperion to start"
 
     for i in {1..30}

{mx_bluesky-1.4.4 → mx_bluesky-1.4.6}/src/mx_bluesky/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.4'
-__version_tuple__ = version_tuple = (1, 4, 4)
+__version__ = version = '1.4.6'
+__version_tuple__ = version_tuple = (1, 4, 6)

{mx_bluesky-1.4.4 → mx_bluesky-1.4.6}/src/mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py

@@ -156,8 +156,15 @@ class RedisListener:
             sample_id = data["sample_id"]
 
             # Images are put in redis as raw jpeg bytes, murko needs numpy arrays
-            raw_image = self.redis_client.hget(f"murko:{sample_id}:raw", uuid)
-            assert isinstance(raw_image, bytes)
+            image_key = f"murko:{sample_id}:raw"
+            raw_image = self.redis_client.hget(image_key, uuid)
+
+            if not isinstance(raw_image, bytes):
+                LOGGER.warning(
+                    f"Image at {image_key}:{uuid} is {raw_image}, expected bytes. Ignoring the data"
+                )
+                return
+
             image = Image.open(io.BytesIO(raw_image))
             image = np.asarray(image)
 
@@ -173,6 +180,10 @@ class RedisListener:
             self._get_and_handle_message()
 
 
-if __name__ == "__main__":
+def main():
     client = RedisListener()
     client.listen_for_image_data_forever()
+
+
+if __name__ == "__main__":
+    main()

{mx_bluesky-1.4.4 → mx_bluesky-1.4.6}/src/mx_bluesky/beamlines/i04/thawing_plan.py

@@ -24,21 +24,17 @@ def thaw_and_stream_to_redis(
     oav: OAV = inject("oav"),
     oav_to_redis_forwarder: OAVToRedisForwarder = inject("oav_to_redis_forwarder"),
 ) -> MsgGenerator:
-    zoom_percentage = yield from bps.rd(oav.zoom_controller.percentage)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    zoom_percentage = yield from bps.rd(oav.zoom_controller.percentage)
     sample_id = yield from bps.rd(robot.sample_id)
 
     sample_id = int(sample_id)
-    zoom_level_before_thawing = yield from bps.rd(oav.zoom_controller.level)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    zoom_level_before_thawing = yield from bps.rd(oav.zoom_controller.level)
 
-    yield from bps.mv(oav.zoom_controller.level, "1.0x")  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.mv(oav.zoom_controller.level, "1.0x")
 
     def switch_forwarder_to_ROI() -> MsgGenerator:
         yield from bps.complete(oav_to_redis_forwarder, wait=True)
-        yield from bps.mv(
-            # See: https://github.com/bluesky/bluesky/issues/1809
-            oav_to_redis_forwarder.selected_source,  # type: ignore
-            Source.ROI.value,  # type: ignore
-        )
+        yield from bps.mv(oav_to_redis_forwarder.selected_source, Source.ROI.value)
         yield from bps.kickoff(oav_to_redis_forwarder, wait=True)
 
     microns_per_pixel_x = yield from bps.rd(oav.microns_per_pixel_x)
@@ -59,10 +55,10 @@ def thaw_and_stream_to_redis(
     )
     def _thaw_and_stream_to_redis():
         yield from bps.mv(
-            oav_to_redis_forwarder.sample_id,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-            sample_id,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-            oav_to_redis_forwarder.selected_source,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-            Source.FULL_SCREEN.value,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+            oav_to_redis_forwarder.sample_id,
+            sample_id,
+            oav_to_redis_forwarder.selected_source,
+            Source.FULL_SCREEN.value,
         )
 
         yield from bps.kickoff(oav_to_redis_forwarder, wait=True)
@@ -74,7 +70,7 @@ def thaw_and_stream_to_redis(
         yield from bps.complete(oav_to_redis_forwarder)
 
     def cleanup():
-        yield from bps.mv(oav.zoom_controller.level, zoom_level_before_thawing)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        yield from bps.mv(oav.zoom_controller.level, zoom_level_before_thawing)
 
     yield from bpp.contingency_wrapper(
         _thaw_and_stream_to_redis(),

{mx_bluesky-1.4.4 → mx_bluesky-1.4.6}/src/mx_bluesky/beamlines/i24/serial/__init__.py

@@ -1,3 +1,11 @@
+from mx_bluesky.beamlines.i24.serial.web_gui_plans.general_plans import (
+    gui_gonio_move_on_click,
+    gui_move_detector,
+    gui_set_parameters,
+    gui_sleep,
+    gui_stage_move_on_click,
+)
+
 from .extruder.i24ssx_Extruder_Collect_py3v2 import (
     enter_hutch,
     initialise_extruder,
@@ -43,4 +51,10 @@ __all__ = [
     "pumpprobe_calc",
     "setup_collection_logs",
     "clean_up_log_config_at_end",
+    # GUI plans
+    "gui_stage_move_on_click",
+    "gui_gonio_move_on_click",
+    "gui_sleep",
+    "gui_move_detector",
+    "gui_set_parameters",
 ]

{mx_bluesky-1.4.4 → mx_bluesky-1.4.6}/src/mx_bluesky/beamlines/i24/serial/dcid.py

@@ -213,7 +213,9 @@ class DCID:
                 "transmission": transmission,
                 "visit": self.parameters.visit.name,
                 "wavelength": beam_settings.wavelength_in_a,
-                "group": {"experimentType": self.parameters.ispyb_experiment_type},
+                "group": {
+                    "experimentType": self.parameters.ispyb_experiment_type.value
+                },
                 "xBeam": xbeam,
                 "yBeam": ybeam,
                 "ssx": {

{mx_bluesky-1.4.4 → mx_bluesky-1.4.6}/src/mx_bluesky/beamlines/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py

@@ -138,7 +138,7 @@ def enter_hutch(
     detector_stage: DetectorMotion = inject("detector_motion"),
 ) -> MsgGenerator:
     """Move the detector stage before entering hutch."""
-    yield from bps.mv(detector_stage.z, SAFE_DET_Z)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.mv(detector_stage.z, SAFE_DET_Z)
     SSX_LOGGER.debug("Detector moved.")