pymmcore-plus 0.13.3__tar.gz → 0.13.4__tar.gz

{pymmcore_plus-0.13.3 → pymmcore_plus-0.13.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymmcore-plus
-Version: 0.13.3
+Version: 0.13.4
 Summary: pymmcore superset providing improved APIs, event handling, and a pure python acquisition engine
 Project-URL: Source, https://github.com/pymmcore-plus/pymmcore-plus
 Project-URL: Tracker, https://github.com/pymmcore-plus/pymmcore-plus/issues
@@ -33,7 +33,7 @@ Requires-Dist: rich>=10.2.0
 Requires-Dist: tensorstore; python_version < '3.13'
 Requires-Dist: typer>=0.4.2
 Requires-Dist: typing-extensions
-Requires-Dist: useq-schema>=0.6.2
+Requires-Dist: useq-schema>=0.7.0
 Provides-Extra: cli
 Requires-Dist: rich>=10.2.0; extra == 'cli'
 Requires-Dist: typer>=0.4.2; extra == 'cli'

{pymmcore_plus-0.13.3 → pymmcore_plus-0.13.4}/pyproject.toml

@@ -40,7 +40,7 @@ dependencies = [
     "psygnal >=0.7",
     "pymmcore >=10.7.0.71.0",
     "typing-extensions",                    # not actually required at runtime
-    "useq-schema >=0.6.2",
+    "useq-schema >=0.7.0",
     "tensorstore; python_version < '3.13'",
     # cli requirements included by default for now
     "typer >=0.4.2",

{pymmcore_plus-0.13.3 → pymmcore_plus-0.13.4}/src/pymmcore_plus/mda/_engine.py

@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING, Literal, NamedTuple, cast
 
 import numpy as np
 import useq
-from useq import HardwareAutofocus, MDAEvent, MDASequence
+from useq import AcquireImage, HardwareAutofocus, MDAEvent, MDASequence
 
 from pymmcore_plus._logger import logger
 from pymmcore_plus._util import retry
@@ -195,6 +195,13 @@ class MDAEngine(PMDAEngine):
                 )
             return
 
+        # don't try to execute any other action types. Mostly, this is just
+        # CustomAction, which is a user-defined action that the engine doesn't know how
+        # to handle.  But may include other actions in the future, and this ensures
+        # backwards compatibility.
+        if not isinstance(action, (AcquireImage, type(None))):
+            return
+
         # if the autofocus was engaged at the start of the sequence AND autofocus action
         # did not fail, re-engage it. NOTE: we need to do that AFTER the runner calls
         # `setup_event`, so we can't do it inside the exec_event autofocus action above.

{pymmcore_plus-0.13.3 → pymmcore_plus-0.13.4}/tests/test_mda.py

@@ -490,3 +490,9 @@ def test_get_handlers(core: CMMCorePlus) -> None:
     # but they should have been available during start and finish events
     assert on_start_names == ["TensorStoreHandler"]
     assert on_finish_names == ["TensorStoreHandler"]
+
+
+def test_custom_action(core: CMMCorePlus) -> None:
+    """Make sure we can handle custom actions gracefully"""
+
+    core.mda.run([MDAEvent(action=useq.CustomAction())])