Fix tests for latest bluesky

.github/workflows/_tox.yml

@@ -6,7 +6,6 @@ on:
         description: What to run under tox
         required: true
 
-
 jobs:
   run:
     runs-on: "ubuntu-latest"

.github/workflows/ci.yml

@@ -5,11 +5,10 @@ on:
     branches:
       - main
     tags:
-      - '*'
+      - "*"
   pull_request:
 
 jobs:
-
   lint:
     uses: ./.github/workflows/_tox.yml
     with:
@@ -28,7 +27,7 @@ jobs:
 
   dist:
     uses: ./.github/workflows/_dist.yml
-  
+
   release:
     needs: [dist, test]
     if: github.ref_type == 'tag'

pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
     "deepdiff",
     "heliotrapi >= v0.3.3",
     "ophyd-async[ca,pva] >=0.21.2",
-    "bluesky == 1.15.1",
+    "bluesky >= 1.16.0",
     "daq-config-server >= 1.5.3",
     "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@main",
 ]
@@ -42,6 +42,7 @@ requires-python = ">=3.11"
 dev = [
     "pre-commit",
     "pyright",
+    "pyright[nodejs]",
     "pytest",
     "pytest-cov",
     "ruff",

tests/unit_tests/i15_1/test_centre_sample.py

@@ -129,15 +129,18 @@ def test_centre_sample_plan_makes_expected_calls(
     )
     msgs = assert_message_and_return_remaining(
         msgs,
-        predicate=lambda msg: msg.command == "read" and msg.obj.name == "robot",
-    )
-    msgs = assert_message_and_return_remaining(
-        msgs,
-        predicate=lambda msg: msg.command == "read" and msg.obj.name == "xtal",
-    )
-    msgs = assert_message_and_return_remaining(
-        msgs,
-        predicate=lambda msg: msg.command == "read" and msg.obj.name == "tth",
+        predicate=lambda msg: (
+            msg.command == "read"
+            and msg.obj is common_collection_devices.robot
+            and msg.args
+            == (
+                common_collection_devices.xtal,
+                common_collection_devices.tth,
+                common_collection_devices.fast_attenuator,
+                common_collection_devices.slow_attenuator,
+                common_collection_devices.hexapod,
+            )
+        ),
     )
     msgs = assert_message_and_return_remaining(
         msgs,
@@ -206,15 +209,18 @@ def test_centre_sample_plan_makes_expected_calls(
     )
     msgs = assert_message_and_return_remaining(
         msgs,
-        predicate=lambda msg: msg.command == "read" and msg.obj.name == "robot",
-    )
-    msgs = assert_message_and_return_remaining(
-        msgs,
-        predicate=lambda msg: msg.command == "read" and msg.obj.name == "xtal",
-    )
-    msgs = assert_message_and_return_remaining(
-        msgs,
-        predicate=lambda msg: msg.command == "read" and msg.obj.name == "tth",
+        predicate=lambda msg: (
+            msg.command == "read"
+            and msg.obj is common_collection_devices.robot
+            and msg.args
+            == (
+                common_collection_devices.xtal,
+                common_collection_devices.tth,
+                common_collection_devices.fast_attenuator,
+                common_collection_devices.slow_attenuator,
+                common_collection_devices.hexapod,
+            )
+        ),
     )
     msgs = assert_message_and_return_remaining(
         msgs,

tests/unit_tests/i15_1/test_static_collection.py

@@ -124,28 +124,19 @@ def test_static_collection_plan_makes_expected_calls(
             msg.command == "declare_stream" and msg.kwargs["name"] == "baseline"
         ),
     )
-    msgs = assert_message_and_return_remaining(
-        msgs,
-        predicate=lambda msg: msg.command == "read" and msg.obj.name == "robot",
-    )
-    msgs = assert_message_and_return_remaining(
-        msgs,
-        predicate=lambda msg: msg.command == "read" and msg.obj.name == "xtal",
-    )
-    msgs = assert_message_and_return_remaining(
-        msgs,
-        predicate=lambda msg: msg.command == "read" and msg.obj.name == "tth",
-    )
-    msgs = assert_message_and_return_remaining(
-        msgs,
-        predicate=lambda msg: (
-            msg.command == "read" and msg.obj.name == "fast_attenuator"
-        ),
-    )
     msgs = assert_message_and_return_remaining(
         msgs,
         predicate=lambda msg: (
-            msg.command == "read" and msg.obj.name == "slow_attenuator"
+            msg.command == "read"
+            and msg.obj is common_collection_devices.robot
+            and msg.args
+            == (
+                common_collection_devices.xtal,
+                common_collection_devices.tth,
+                common_collection_devices.fast_attenuator,
+                common_collection_devices.slow_attenuator,
+                common_collection_devices.hexapod,
+            )
         ),
     )
     msgs = assert_message_and_return_remaining(
@@ -200,15 +191,18 @@ def test_static_collection_plan_makes_expected_calls(
     )
     msgs = assert_message_and_return_remaining(
         msgs,
-        predicate=lambda msg: msg.command == "read" and msg.obj.name == "robot",
-    )
-    msgs = assert_message_and_return_remaining(
-        msgs,
-        predicate=lambda msg: msg.command == "read" and msg.obj.name == "xtal",
-    )
-    msgs = assert_message_and_return_remaining(
-        msgs,
-        predicate=lambda msg: msg.command == "read" and msg.obj.name == "tth",
+        predicate=lambda msg: (
+            msg.command == "read"
+            and msg.obj is common_collection_devices.robot
+            and msg.args
+            == (
+                common_collection_devices.xtal,
+                common_collection_devices.tth,
+                common_collection_devices.fast_attenuator,
+                common_collection_devices.slow_attenuator,
+                common_collection_devices.hexapod,
+            )
+        ),
     )
     msgs = assert_message_and_return_remaining(
         msgs,