Framework for orchestrating role-playing, autonomous AI agents. By fostering collaborative intelligence, CrewAI empowers agents to work together seamlessly, tackling complex tasks.
fix(flow): let a start step re-run on the events it listens to (#7922)
Gabe Milani19dd81148c3f
diff --git a/lib/crewai/src/crewai/flow/runtime/__init__.py b/lib/crewai/src/crewai/flow/runtime/__init__.pyindex 0f5bf791b..bc7812579 100644--- a/lib/crewai/src/crewai/flow/runtime/__init__.py+++ b/lib/crewai/src/crewai/flow/runtime/__init__.py@@ -569,11 +569,13 @@ class Flow(BaseModel, Generic[T], metaclass=FlowMeta):def _listener_methods(self,) -> Iterator[tuple[FlowMethodName, FlowMethodDefinition, FlowDefinitionCondition]]:- # (name, definition, condition) for every non-start method that listens.+ # (name, definition, condition) for every method that listens, start+ # methods included: `start: true` plus `listen` runs at kickoff and again+ # on each listen event (e.g. a review step re-drafting on request_changes).# Routers are included (they listen too); callers wanting only plain# listeners filter on definition.router.for method_name, method_definition in self._definition.methods.items():- if method_definition.listen is not None and not method_definition.is_start:+ if method_definition.listen is not None:yield (FlowMethodName(method_name),method_definition,@@ -3152,6 +3154,9 @@ class Flow(BaseModel, Generic[T], metaclass=FlowMeta):current_trigger = trigger_methodcurrent_result = result # Track the result to pass to each routercurrent_triggering_event_id = triggering_event_id+ # Methods already run per trigger, so a conditional start that also+ # listens to the same event is not run a second time below.+ ran_for_trigger: dict[str, set[FlowMethodName]] = {}while True:routers_triggered = self._find_triggered_methods(@@ -3159,6 +3164,9 @@ class Flow(BaseModel, Generic[T], metaclass=FlowMeta):)if not routers_triggered:break+ ran_for_trigger.setdefault(str(current_trigger), set()).update(+ routers_triggered+ )for router_name in routers_triggered:# For routers triggered by a router outcome, pass the HumanFeedbackResult@@ -3207,6 +3215,9 @@ class Flow(BaseModel, Generic[T], metaclass=FlowMeta):listeners_triggered = self._find_triggered_methods(current_trigger, router_only=False)+ ran_for_trigger.setdefault(str(current_trigger), set()).update(+ listeners_triggered+ )if listeners_triggered:listener_result = router_result_payloads.get(str(current_trigger), result@@ -3242,6 +3253,8 @@ class Flow(BaseModel, Generic[T], metaclass=FlowMeta):for method_name in self._start_method_names():if self._start_condition_triggered_by(method_name, current_trigger+ ) and method_name not in ran_for_trigger.get(+ str(current_trigger), set()):if method_name in self._completed_methods:# Cyclic re-execution: temporarily clear resumption flag so the method actually re-runsdiff --git a/lib/crewai/tests/test_flow_from_definition.py b/lib/crewai/tests/test_flow_from_definition.pyindex fd45fb8b5..1eea8fa7d 100644--- a/lib/crewai/tests/test_flow_from_definition.py+++ b/lib/crewai/tests/test_flow_from_definition.py@@ -4119,6 +4119,87 @@ def test_human_feedback_emit_exposes_feedback_in_outputs_after_resume():assert resumed.method_outputs[0] == "draft-content"+PENDING_REVISE_LOOP_YAML = f"""+schema: crewai.flow/v1+name: PendingReviseLoopFlow+persist:+ enabled: true+ persistence:+ persistence_type: DefinitionStoreBackend+ store: hitl-revise-loop+methods:+ draft:+ do:+ call: expression+ expr: "'draft-content'"+ start: true+ listen: request_changes+ human_feedback:+ message: "Review:"+ emit: [approved, request_changes]+ llm: gpt-4o-mini+ provider: {__name__}:PausingProvider+ publish:+ do:+ call: expression+ expr: "'published:' + outputs.draft.feedback"+ listen: approved+"""+++def test_start_step_listening_to_its_own_outcome_reruns_after_resume():+ definition = FlowDefinition.from_declaration(contents=PENDING_REVISE_LOOP_YAML)+ backend = DefinitionStoreBackend(store="hitl-revise-loop")+ pending = Flow.from_declaration(contents=definition).kickoff()+ assert isinstance(pending, HumanFeedbackPending)++ revising = Flow.from_pending(pending.context.flow_id, backend, definition=definition)+ with patch.object(revising, "_collapse_to_outcome", return_value="request_changes"):+ repaused = revising.resume("make it shorter")++ assert isinstance(repaused, HumanFeedbackPending)+ assert repaused.context.method_name == "draft"++ approving = Flow.from_pending(repaused.context.flow_id, backend, definition=definition)+ with patch.object(approving, "_collapse_to_outcome", return_value="approved"):+ result = approving.resume("ship it")++ assert result == "published:ship it"++[email protected]("router", [False, True])+def test_conditional_start_that_also_listens_runs_once_per_event(router):+ handler_routing = "router: true\n emit: [done]" if router else ""+ yaml_str = f"""+schema: crewai.flow/v1+name: ConditionalStartListenFlow+methods:+ seed:+ do:+ call: expression+ expr: "'x'"+ start: true+ route:+ do:+ call: expression+ expr: "'go'"+ listen: seed+ router: true+ emit: [go]+ handler:+ do:+ call: expression+ expr: "'done'"+ start: go+ listen: go+ {handler_routing}+"""+ flow = Flow.from_declaration(contents=yaml_str)+ flow.kickoff()++ assert flow._method_execution_counts["handler"] == 1++def test_flow_config_provider_fallback_from_declaration():yaml_str = f"""schema: crewai.flow/v1