Merge branch 'main' into configure_config_server

Author: rtuck99

src/mx_bluesky/beamlines/i24/serial/fixed_target/ft_utils.py

@@ -6,7 +6,7 @@
 New ones may be added if needed in the future.
 """
 
-from enum import Enum, IntEnum
+from enum import IntEnum, StrEnum
 
 
 class MappingType(IntEnum):
@@ -51,7 +51,7 @@ def __str__(self) -> str:
         return self.name
 
 
-class Fiducials(str, Enum):
+class Fiducials(StrEnum):
     origin = "origin"
     zero = "zero"
     fid1 = "f1"

tests/unit_tests/beamlines/aithre_lasershaping/test_beamline_safe.py

@@ -42,9 +42,11 @@ def locate_pv(_):
     msgs = sim_run_engine.simulate_plan(set_beamline_safe_on_robot(robot, aithre_gonio))
     assert_message_and_return_remaining(
         msgs,
-        lambda msg: msg.command == "set"
-        and msg.obj.name == "robot-set_beamline_safe"
-        and msg.args[0] == "No",
+        lambda msg: (
+            msg.command == "set"
+            and msg.obj.name == "robot-set_beamline_safe"
+            and msg.args[0] == "No"
+        ),
     )
 
 
@@ -57,9 +59,11 @@ async def test_beamline_safe_reads_safe_correctly(
 
     assert_message_and_return_remaining(
         msgs,
-        lambda msg: msg.command == "set"
-        and msg.obj.name == "robot-set_beamline_safe"
-        and msg.args[0] == "On",
+        lambda msg: (
+            msg.command == "set"
+            and msg.obj.name == "robot-set_beamline_safe"
+            and msg.args[0] == "On"
+        ),
     )
 
 
@@ -72,10 +76,12 @@ async def test_go_to_zero_gives_expected_result(
     for name in ["omega", "x", "y", "z", "sampy", "sampz"]:
         msgs = assert_message_and_return_remaining(
             msgs,
-            lambda msg: msg.command == "set"
-            and msg.obj.name == f"goniometer-{name}"
-            and msg.args[0] == 0
-            and msg.kwargs["group"] == "move_to_zero",
+            lambda msg: (
+                msg.command == "set"
+                and msg.obj.name == f"goniometer-{name}"
+                and msg.args[0] == 0
+                and msg.kwargs["group"] == "move_to_zero"
+            ),
         )
     if wait:
         assert_message_and_return_remaining(

tests/unit_tests/beamlines/aithre_lasershaping/test_check_goniometer_performance.py

@@ -11,13 +11,17 @@ def test_goniometer_omega_performance_check(
     assert len(msgs) == 132
     msgs = assert_message_and_return_remaining(
         msgs,
-        lambda msg: msg.command == "set"
-        and msg.obj.name == "goniometer-omega-velocity"
-        and msg.args[0] == 5,
+        lambda msg: (
+            msg.command == "set"
+            and msg.obj.name == "goniometer-omega-velocity"
+            and msg.args[0] == 5
+        ),
     )
     msgs = assert_message_and_return_remaining(
         msgs,
-        lambda msg: msg.command == "set"
-        and msg.obj.name == "goniometer-omega"
-        and msg.args[0] == 300,
+        lambda msg: (
+            msg.command == "set"
+            and msg.obj.name == "goniometer-omega"
+            and msg.args[0] == 300
+        ),
     )

tests/unit_tests/beamlines/aithre_lasershaping/test_goniometer_controls.py

@@ -22,9 +22,11 @@ def test_goniometer_relative_rotation(
     msgs = sim_run_engine.simulate_plan(rotate_goniometer_relative(15, aithre_gonio))
     assert_message_and_return_remaining(
         msgs,
-        lambda msg: msg.command == "set"
-        and msg.obj.name == "goniometer-omega"
-        and msg.args[0] == 15,
+        lambda msg: (
+            msg.command == "set"
+            and msg.obj.name == "goniometer-omega"
+            and msg.args[0] == 15
+        ),
     )
 
 
@@ -34,9 +36,11 @@ def test_change_goniometer_turn_speed(
     msgs = sim_run_engine.simulate_plan(change_goniometer_turn_speed(40, aithre_gonio))
     assert_message_and_return_remaining(
         msgs,
-        lambda msg: msg.command == "set"
-        and msg.obj.name == "goniometer-omega-velocity"
-        and msg.args[0] == 40,
+        lambda msg: (
+            msg.command == "set"
+            and msg.obj.name == "goniometer-omega-velocity"
+            and msg.args[0] == 40
+        ),
     )
 
 

tests/unit_tests/beamlines/i04/callbacks/test_murko_callback.py

@@ -2,6 +2,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+import redis.exceptions
 from event_model import Event
 
 from mx_bluesky.beamlines.i04.callbacks.murko_callback import (
@@ -291,8 +292,10 @@ def test_if_redis_connection_fails_then_there_is_no_error(
     callback.stop(doc)  # type: ignore
 
 
-def test_warning_is_logged_if_redis_connection_fails(caplog):
-    callback = MurkoCallback("", "")
+@patch("mx_bluesky.beamlines.i04.callbacks.murko_callback.StrictRedis")
+def test_warning_is_logged_if_redis_connection_fails(mock_redis: MagicMock, caplog):
+    mock_redis.return_value.ping.side_effect = redis.exceptions.ConnectionError()
+    callback = MurkoCallback("ubuntu.com", "")
     doc = {}
     callback.start(doc)  # type: ignore
     log_message = caplog.records[-1]

tests/unit_tests/beamlines/i04/test_i04_grid_detect_then_xray_centre_plan.py

@@ -153,9 +153,11 @@ def test_get_ready_for_oav_and_close_shutter_closes_shutter_and_calls_setup_for_
     )
     msgs = assert_message_and_return_remaining(
         msgs,
-        predicate=lambda msg: msg.command == "set"
-        and msg.obj.name == "detector_motion-shutter"
-        and msg.args[0] == 0,
+        predicate=lambda msg: (
+            msg.command == "set"
+            and msg.obj.name == "detector_motion-shutter"
+            and msg.args[0] == 0
+        ),
     )
     msgs = assert_message_and_return_remaining(
         msgs, predicate=lambda msg: msg.command == "wait"
@@ -264,9 +266,11 @@ def test_i04_default_grid_detect_and_xray_centre_sets_transmission_triggers_xbpm
 
     msgs = assert_message_and_return_remaining(
         msgs,
-        lambda msg: msg.command == "set"
-        and msg.obj.name == "attenuator"
-        and msg.args == (desired_transmission,),
+        lambda msg: (
+            msg.command == "set"
+            and msg.obj.name == "attenuator"
+            and msg.args == (desired_transmission,)
+        ),
     )
 
     msgs = assert_message_and_return_remaining(
@@ -275,14 +279,16 @@ def test_i04_default_grid_detect_and_xray_centre_sets_transmission_triggers_xbpm
     )
     msgs = assert_message_and_return_remaining(
         msgs,
-        lambda msg: msg.command == "open_run"
-        and msg.run == PlanNameConstants.GRIDSCAN_OUTER,
+        lambda msg: (
+            msg.command == "open_run" and msg.run == PlanNameConstants.GRIDSCAN_OUTER
+        ),
     )
 
     msgs = assert_message_and_return_remaining(
         msgs,
-        lambda msg: msg.command == "close_run"
-        and msg.run == PlanNameConstants.GRIDSCAN_OUTER,
+        lambda msg: (
+            msg.command == "close_run" and msg.run == PlanNameConstants.GRIDSCAN_OUTER
+        ),
     )
 
     mock_pause_feedback.assert_not_called()
@@ -544,9 +550,11 @@ def test_grid_detect_then_xrc_stages_and_unstages_zocalo_and_gets_results(
 
     msgs = assert_message_and_return_remaining(
         msgs,
-        predicate=lambda msg: msg.command == "stage"
-        and msg.obj.name == "zocalo"
-        and msg.kwargs["group"] == ZOCALO_STAGE_GROUP,
+        predicate=lambda msg: (
+            msg.command == "stage"
+            and msg.obj.name == "zocalo"
+            and msg.kwargs["group"] == ZOCALO_STAGE_GROUP
+        ),
     )
 
     msgs = assert_message_and_return_remaining(