Make pyright happy

Author: rtuck99

src/mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py

@@ -261,7 +261,8 @@ def grid_detect_then_xray_centre_with_callbacks():
 
             try:
                 yield from get_results_and_move_to_xtal(
-                    composite,
+                    composite.gonio,
+                    composite.zocalo,
                     internal_params,
                     grid_scan_params,
                     flyscan_event_handler,

src/mx_bluesky/common/experiment_plans/change_aperture_then_move_plan.py

@@ -13,7 +13,6 @@
 )
 from mx_bluesky.common.parameters.components import WithSample
 from mx_bluesky.common.parameters.constants import PlanGroupCheckpointConstants
-from mx_bluesky.common.parameters.device_composites import FlyScanEssentialDevices
 from mx_bluesky.common.parameters.gridscan import (
     GridScanParams,
 )
@@ -39,15 +38,16 @@ def _get_xrc_results(
 
 
 def get_results_and_move_to_xtal(
-    composite: FlyScanEssentialDevices[Smargon],
+    gonio: Smargon,
+    zocalo: ZocaloResults,
     parameters: WithSample,
     grid_scan_params: GridScanParams,
     flyscan_event_handler: XRayCentreEventHandler,
 ):
     flyscan_results = yield from _get_xrc_results(
-        composite.zocalo, parameters, grid_scan_params, flyscan_event_handler
+        zocalo, parameters, grid_scan_params, flyscan_event_handler
     )
-    yield from move_to_xtal(flyscan_results[0], composite.gonio)
+    yield from move_to_xtal(flyscan_results[0], gonio)
 
 
 def change_aperture(

src/mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py

@@ -92,6 +92,7 @@ def activity_gated_start(self, doc: RunStart):
                 parameters.detector_params.detector_size_constants.det_size_pixels
             )
             shape = (parameters.num_images, det_size.width, det_size.height)
+            assert self.full_num_of_images
             self.writer = NexusWriter(
                 parameters,
                 parameters.detector_params,

tests/unit_tests/beamlines/i04/test_i04_grid_detect_then_xray_centre_plan.py

@@ -634,10 +634,10 @@ def test_detect_grid_and_do_gridscan_gives_params_specified_grid(
     )
     mock_get_results_and_move_to_xtal.assert_called_once()
     assert (
-        mock_get_results_and_move_to_xtal.call_args[0][1]
+        mock_get_results_and_move_to_xtal.call_args[0][2]
         == minimal_diffraction_expt_with_sample
     )
-    assert mock_get_results_and_move_to_xtal.call_args[0][2] == i04_grid_scan_params
+    assert mock_get_results_and_move_to_xtal.call_args[0][3] == i04_grid_scan_params
 
 
 @patch(