interrupts - multiagent - do not emit AfterNodeCallEvent on interrupt (#1539)

Author: pgrayy

src/strands/multiagent/graph.py

@@ -1005,7 +1005,8 @@ async def _execute_node(self, node: GraphNode, invocation_state: dict[str, Any])
             raise
 
         finally:
-            await self.hooks.invoke_callbacks_async(AfterNodeCallEvent(self, node.node_id, invocation_state))
+            if node.execution_status != Status.INTERRUPTED:
+                await self.hooks.invoke_callbacks_async(AfterNodeCallEvent(self, node.node_id, invocation_state))
 
     def _accumulate_metrics(self, node_result: NodeResult) -> None:
         """Accumulate metrics from a node result."""

src/strands/multiagent/swarm.py

@@ -782,9 +782,10 @@ async def _execute_swarm(self, invocation_state: dict[str, Any]) -> AsyncIterato
                     break
 
                 finally:
-                    await self.hooks.invoke_callbacks_async(
-                        AfterNodeCallEvent(self, current_node.node_id, invocation_state)
-                    )
+                    if self.state.completion_status != Status.INTERRUPTED:
+                        await self.hooks.invoke_callbacks_async(
+                            AfterNodeCallEvent(self, current_node.node_id, invocation_state)
+                        )
 
                 logger.debug("node=<%s> | node execution completed", current_node.node_id)
 

tests/strands/multiagent/conftest.py

@@ -1,15 +1,22 @@
 import pytest
 
-from strands.hooks import BeforeNodeCallEvent, HookProvider
+from strands.hooks import AfterNodeCallEvent, BeforeNodeCallEvent, HookProvider
 
 
 @pytest.fixture
 def interrupt_hook():
     class Hook(HookProvider):
+        def __init__(self):
+            self.after_count = 0
+
         def register_hooks(self, registry):
             registry.add_callback(BeforeNodeCallEvent, self.interrupt)
+            registry.add_callback(AfterNodeCallEvent, self.cleanup)
 
         def interrupt(self, event):
             return event.interrupt("test_name", reason="test_reason")
 
+        def cleanup(self, event):
+            self.after_count += 1
+
     return Hook()

tests/strands/multiagent/test_graph.py

@@ -2126,6 +2126,10 @@ def test_graph_interrupt_on_before_node_call_event(interrupt_hook):
     ]
     assert tru_interrupts == exp_interrupts
 
+    tru_after_count = interrupt_hook.after_count
+    exp_after_count = 0
+    assert tru_after_count == exp_after_count
+
     interrupt = multiagent_result.interrupts[0]
     responses = [
         {
@@ -2152,4 +2156,8 @@ def test_graph_interrupt_on_before_node_call_event(interrupt_hook):
     exp_message = "Task completed"
     assert tru_message == exp_message
 
+    tru_after_count = interrupt_hook.after_count
+    exp_after_count = 1
+    assert tru_after_count == exp_after_count
+
     assert multiagent_result.execution_time >= first_execution_time

tests/strands/multiagent/test_swarm.py

@@ -1259,6 +1259,10 @@ def test_swarm_interrupt_on_before_node_call_event(interrupt_hook):
     ]
     assert tru_interrupts == exp_interrupts
 
+    tru_after_count = interrupt_hook.after_count
+    exp_after_count = 0
+    assert tru_after_count == exp_after_count
+
     interrupt = multiagent_result.interrupts[0]
     responses = [
         {
@@ -1281,6 +1285,10 @@ def test_swarm_interrupt_on_before_node_call_event(interrupt_hook):
     exp_message = "Task completed"
     assert tru_message == exp_message
 
+    tru_after_count = interrupt_hook.after_count
+    exp_after_count = 1
+    assert tru_after_count == exp_after_count
+
     assert multiagent_result.execution_time >= first_execution_time