diff --git a/libs/langgraph/langgraph/pregel/algo.py b/libs/langgraph/langgraph/pregel/algo.py index db56828f9..d4948a22e 100644 --- a/libs/langgraph/langgraph/pregel/algo.py +++ b/libs/langgraph/langgraph/pregel/algo.py @@ -655,13 +655,14 @@ def prepare_single_task( if checkpoint_null_version is None: return # If any of the channels read by this process were updated - if triggers := _triggers( + if _triggers( channels, checkpoint["channel_versions"], checkpoint["versions_seen"].get(name), checkpoint_null_version, proc, ): + triggers = tuple(sorted(proc.triggers)) try: val = next( _proc_input(proc, managed, channels, for_execution=for_execution) @@ -730,7 +731,10 @@ def prepare_single_task( channels, managed, PregelTaskWrites( - task_path[:3], name, writes, proc.triggers + task_path[:3], + name, + writes, + triggers, ), config, ), @@ -757,7 +761,7 @@ def prepare_single_task( ), }, ), - proc.triggers, + triggers, proc.retry_policy, None, task_id, diff --git a/libs/langgraph/tests/test_large_cases.py b/libs/langgraph/tests/test_large_cases.py index d6637f000..6616d4cbb 100644 --- a/libs/langgraph/tests/test_large_cases.py +++ b/libs/langgraph/tests/test_large_cases.py @@ -2483,7 +2483,7 @@ def test_prebuilt_tool_chat(snapshot: SnapshotAssertion) -> None: { "langgraph_step": 1, "langgraph_node": "agent", - "langgraph_triggers": ("start:agent",), + "langgraph_triggers": ("branch:to:agent", "start:agent", "tools"), "langgraph_path": (PULL, "agent"), "langgraph_checkpoint_ns": AnyStr("agent:"), "checkpoint_ns": AnyStr("agent:"), @@ -2542,7 +2542,7 @@ def test_prebuilt_tool_chat(snapshot: SnapshotAssertion) -> None: { "langgraph_step": 3, "langgraph_node": "agent", - "langgraph_triggers": ("tools",), + "langgraph_triggers": ("branch:to:agent", "start:agent", "tools"), "langgraph_path": (PULL, "agent"), "langgraph_checkpoint_ns": AnyStr("agent:"), "checkpoint_ns": AnyStr("agent:"), @@ -2585,7 +2585,7 @@ def test_prebuilt_tool_chat(snapshot: SnapshotAssertion) -> None: { "langgraph_step": 5, "langgraph_node": "agent", - "langgraph_triggers": ("tools",), + "langgraph_triggers": ("branch:to:agent", "start:agent", "tools"), "langgraph_path": (PULL, "agent"), "langgraph_checkpoint_ns": AnyStr("agent:"), "checkpoint_ns": AnyStr("agent:"), @@ -5501,7 +5501,10 @@ def test_in_one_fan_out_out_one_graph_state() -> None: "id": AnyStr(), "name": "rewrite_query", "input": {"query": "what is weather in sf", "docs": []}, - "triggers": ("start:rewrite_query",), + "triggers": ( + "branch:to:rewrite_query", + "start:rewrite_query", + ), }, }, ), @@ -5532,7 +5535,10 @@ def test_in_one_fan_out_out_one_graph_state() -> None: "id": AnyStr(), "name": "retriever_one", "input": {"query": "query: what is weather in sf", "docs": []}, - "triggers": ("rewrite_query",), + "triggers": ( + "branch:to:retriever_one", + "rewrite_query", + ), }, }, ), @@ -5546,7 +5552,10 @@ def test_in_one_fan_out_out_one_graph_state() -> None: "id": AnyStr(), "name": "retriever_two", "input": {"query": "query: what is weather in sf", "docs": []}, - "triggers": ("rewrite_query",), + "triggers": ( + "branch:to:retriever_two", + "rewrite_query", + ), }, }, ), @@ -5608,7 +5617,7 @@ def test_in_one_fan_out_out_one_graph_state() -> None: "query": "query: what is weather in sf", "docs": ["doc1", "doc2", "doc3", "doc4"], }, - "triggers": (AnyStr("retriever_"),), + "triggers": ("branch:to:qa", "retriever_one", "retriever_two"), }, }, ), @@ -6634,7 +6643,7 @@ def test_branch_then( "id": AnyStr(), "name": "prepare", "input": {"my_key": "value", "market": "DE"}, - "triggers": ("start:prepare",), + "triggers": ("branch:to:prepare", "start:prepare"), }, }, { @@ -6773,7 +6782,10 @@ def test_branch_then( "id": AnyStr(), "name": "finish", "input": {"my_key": "value prepared slow", "market": "DE"}, - "triggers": ("branch:prepare:condition::then",), + "triggers": ( + "branch:prepare:condition::then", + "branch:to:finish", + ), }, }, { @@ -7783,7 +7795,7 @@ def test_nested_graph_state( "langgraph_node": "inner", "langgraph_path": [PULL, "inner"], "langgraph_step": 2, - "langgraph_triggers": ["outer_1"], + "langgraph_triggers": ["branch:to:inner", "outer_1"], "langgraph_checkpoint_ns": AnyStr("inner:"), }, created_at=AnyStr(), @@ -7978,7 +7990,7 @@ def test_nested_graph_state( "langgraph_node": "inner", "langgraph_path": [PULL, "inner"], "langgraph_step": 2, - "langgraph_triggers": ["outer_1"], + "langgraph_triggers": ["branch:to:inner", "outer_1"], "langgraph_checkpoint_ns": AnyStr("inner:"), }, created_at=AnyStr(), @@ -8021,7 +8033,7 @@ def test_nested_graph_state( "langgraph_node": "inner", "langgraph_path": [PULL, "inner"], "langgraph_step": 2, - "langgraph_triggers": ["outer_1"], + "langgraph_triggers": ["branch:to:inner", "outer_1"], "langgraph_checkpoint_ns": AnyStr("inner:"), }, created_at=AnyStr(), @@ -8070,7 +8082,7 @@ def test_nested_graph_state( "langgraph_node": "inner", "langgraph_path": [PULL, "inner"], "langgraph_step": 2, - "langgraph_triggers": ["outer_1"], + "langgraph_triggers": ["branch:to:inner", "outer_1"], "langgraph_checkpoint_ns": AnyStr("inner:"), }, created_at=AnyStr(), @@ -8504,7 +8516,7 @@ def test_doubly_nested_graph_state( "langgraph_node": "child_1", "langgraph_path": [PULL, AnyStr("child_1")], "langgraph_step": 1, - "langgraph_triggers": [AnyStr("start:child_1")], + "langgraph_triggers": ["branch:to:child_1", AnyStr("start:child_1")], }, created_at=AnyStr(), parent_config=( @@ -8588,7 +8600,10 @@ def test_doubly_nested_graph_state( AnyStr("child_1"), ], "langgraph_step": 1, - "langgraph_triggers": [AnyStr("start:child_1")], + "langgraph_triggers": [ + "branch:to:child_1", + AnyStr("start:child_1"), + ], }, created_at=AnyStr(), parent_config=( @@ -8635,7 +8650,7 @@ def test_doubly_nested_graph_state( "langgraph_node": "child", "langgraph_path": [PULL, AnyStr("child")], "langgraph_step": 2, - "langgraph_triggers": [AnyStr("parent_1")], + "langgraph_triggers": ["branch:to:child", AnyStr("parent_1")], "langgraph_checkpoint_ns": AnyStr("child:"), }, created_at=AnyStr(), @@ -8931,7 +8946,7 @@ def test_doubly_nested_graph_state( "langgraph_node": "child", "langgraph_path": [PULL, AnyStr("child")], "langgraph_step": 2, - "langgraph_triggers": [AnyStr("parent_1")], + "langgraph_triggers": ["branch:to:child", AnyStr("parent_1")], "langgraph_checkpoint_ns": AnyStr("child:"), }, created_at=AnyStr(), @@ -8970,7 +8985,7 @@ def test_doubly_nested_graph_state( "langgraph_node": "child", "langgraph_path": [PULL, AnyStr("child")], "langgraph_step": 2, - "langgraph_triggers": [AnyStr("parent_1")], + "langgraph_triggers": ["branch:to:child", AnyStr("parent_1")], "langgraph_checkpoint_ns": AnyStr("child:"), }, created_at=AnyStr(), @@ -9022,7 +9037,7 @@ def test_doubly_nested_graph_state( "langgraph_node": "child", "langgraph_path": [PULL, AnyStr("child")], "langgraph_step": 2, - "langgraph_triggers": [AnyStr("parent_1")], + "langgraph_triggers": ["branch:to:child", AnyStr("parent_1")], "langgraph_checkpoint_ns": AnyStr("child:"), }, created_at=AnyStr(), @@ -9076,7 +9091,7 @@ def test_doubly_nested_graph_state( AnyStr("child_1"), ], "langgraph_step": 1, - "langgraph_triggers": [AnyStr("start:child_1")], + "langgraph_triggers": ["branch:to:child_1", AnyStr("start:child_1")], }, created_at=AnyStr(), parent_config={ @@ -9131,7 +9146,7 @@ def test_doubly_nested_graph_state( AnyStr("child_1"), ], "langgraph_step": 1, - "langgraph_triggers": [AnyStr("start:child_1")], + "langgraph_triggers": ["branch:to:child_1", AnyStr("start:child_1")], }, created_at=AnyStr(), parent_config={ @@ -9193,7 +9208,7 @@ def test_doubly_nested_graph_state( AnyStr("child_1"), ], "langgraph_step": 1, - "langgraph_triggers": [AnyStr("start:child_1")], + "langgraph_triggers": ["branch:to:child_1", AnyStr("start:child_1")], }, created_at=AnyStr(), parent_config={ @@ -9255,7 +9270,7 @@ def test_doubly_nested_graph_state( AnyStr("child_1"), ], "langgraph_step": 1, - "langgraph_triggers": [AnyStr("start:child_1")], + "langgraph_triggers": ["branch:to:child_1", AnyStr("start:child_1")], }, created_at=AnyStr(), parent_config=None, diff --git a/libs/langgraph/tests/test_large_cases_async.py b/libs/langgraph/tests/test_large_cases_async.py index 157e0e080..9fe7f2ac3 100644 --- a/libs/langgraph/tests/test_large_cases_async.py +++ b/libs/langgraph/tests/test_large_cases_async.py @@ -2300,7 +2300,11 @@ async def test_prebuilt_tool_chat() -> None: { "langgraph_step": 1, "langgraph_node": "agent", - "langgraph_triggers": ("start:agent",), + "langgraph_triggers": ( + "branch:to:agent", + "start:agent", + "tools", + ), "langgraph_path": ("__pregel_pull", "agent"), "langgraph_checkpoint_ns": AnyStr("agent:"), "checkpoint_ns": AnyStr("agent:"), @@ -2359,7 +2363,11 @@ async def test_prebuilt_tool_chat() -> None: { "langgraph_step": 3, "langgraph_node": "agent", - "langgraph_triggers": ("tools",), + "langgraph_triggers": ( + "branch:to:agent", + "start:agent", + "tools", + ), "langgraph_path": ("__pregel_pull", "agent"), "langgraph_checkpoint_ns": AnyStr("agent:"), "checkpoint_ns": AnyStr("agent:"), @@ -2402,7 +2410,11 @@ async def test_prebuilt_tool_chat() -> None: { "langgraph_step": 5, "langgraph_node": "agent", - "langgraph_triggers": ("tools",), + "langgraph_triggers": ( + "branch:to:agent", + "start:agent", + "tools", + ), "langgraph_path": ("__pregel_pull", "agent"), "langgraph_checkpoint_ns": AnyStr("agent:"), "checkpoint_ns": AnyStr("agent:"), @@ -3883,7 +3895,10 @@ async def test_in_one_fan_out_out_one_graph_state() -> None: "id": AnyStr(), "name": "rewrite_query", "input": {"query": "what is weather in sf", "docs": []}, - "triggers": ("start:rewrite_query",), + "triggers": ( + "branch:to:rewrite_query", + "start:rewrite_query", + ), }, }, ), @@ -3914,7 +3929,10 @@ async def test_in_one_fan_out_out_one_graph_state() -> None: "id": AnyStr(), "name": "retriever_one", "input": {"query": "query: what is weather in sf", "docs": []}, - "triggers": ("rewrite_query",), + "triggers": ( + "branch:to:retriever_one", + "rewrite_query", + ), }, }, ), @@ -3928,7 +3946,10 @@ async def test_in_one_fan_out_out_one_graph_state() -> None: "id": AnyStr(), "name": "retriever_two", "input": {"query": "query: what is weather in sf", "docs": []}, - "triggers": ("rewrite_query",), + "triggers": ( + "branch:to:retriever_two", + "rewrite_query", + ), }, }, ), @@ -3990,7 +4011,7 @@ async def test_in_one_fan_out_out_one_graph_state() -> None: "query": "query: what is weather in sf", "docs": ["doc1", "doc2", "doc3", "doc4"], }, - "triggers": (AnyStr("retriever_"),), + "triggers": ("branch:to:qa", "retriever_one", "retriever_two"), }, }, ), @@ -4465,7 +4486,10 @@ async def test_branch_then(checkpointer_name: str) -> None: "id": AnyStr(), "name": "prepare", "input": {"my_key": "value", "market": "DE"}, - "triggers": ("start:prepare",), + "triggers": ( + "branch:to:prepare", + "start:prepare", + ), }, }, { @@ -4609,7 +4633,10 @@ async def test_branch_then(checkpointer_name: str) -> None: "id": AnyStr(), "name": "finish", "input": {"my_key": "value prepared slow", "market": "DE"}, - "triggers": ("branch:prepare:condition::then",), + "triggers": ( + "branch:prepare:condition::then", + "branch:to:finish", + ), }, }, { @@ -4778,7 +4805,10 @@ async def test_branch_then(checkpointer_name: str) -> None: "id": AnyStr(), "name": "prepare", "input": {"my_key": "value", "market": "DE"}, - "triggers": ("start:prepare",), + "triggers": ( + "branch:to:prepare", + "start:prepare", + ), }, }, { @@ -5333,7 +5363,7 @@ async def test_nested_graph_state(checkpointer_name: str) -> None: "langgraph_node": "inner", "langgraph_path": [PULL, "inner"], "langgraph_step": 2, - "langgraph_triggers": ["outer_1"], + "langgraph_triggers": ["branch:to:inner", "outer_1"], "langgraph_checkpoint_ns": AnyStr("inner:"), }, created_at=AnyStr(), @@ -5530,7 +5560,7 @@ async def test_nested_graph_state(checkpointer_name: str) -> None: "langgraph_node": "inner", "langgraph_path": [PULL, "inner"], "langgraph_step": 2, - "langgraph_triggers": ["outer_1"], + "langgraph_triggers": ["branch:to:inner", "outer_1"], "langgraph_checkpoint_ns": AnyStr("inner:"), }, created_at=AnyStr(), @@ -5573,7 +5603,7 @@ async def test_nested_graph_state(checkpointer_name: str) -> None: "langgraph_node": "inner", "langgraph_path": [PULL, "inner"], "langgraph_step": 2, - "langgraph_triggers": ["outer_1"], + "langgraph_triggers": ["branch:to:inner", "outer_1"], "langgraph_checkpoint_ns": AnyStr("inner:"), }, created_at=AnyStr(), @@ -5622,7 +5652,7 @@ async def test_nested_graph_state(checkpointer_name: str) -> None: "langgraph_node": "inner", "langgraph_path": [PULL, "inner"], "langgraph_step": 2, - "langgraph_triggers": ["outer_1"], + "langgraph_triggers": ["branch:to:inner", "outer_1"], "langgraph_checkpoint_ns": AnyStr("inner:"), }, created_at=AnyStr(), @@ -6060,7 +6090,7 @@ async def test_doubly_nested_graph_state(checkpointer_name: str) -> None: "langgraph_node": "child_1", "langgraph_path": [PULL, AnyStr("child_1")], "langgraph_step": 1, - "langgraph_triggers": [AnyStr("start:child_1")], + "langgraph_triggers": ["branch:to:child_1", "start:child_1"], }, created_at=AnyStr(), parent_config=( @@ -6146,7 +6176,10 @@ async def test_doubly_nested_graph_state(checkpointer_name: str) -> None: AnyStr("child_1"), ], "langgraph_step": 1, - "langgraph_triggers": [AnyStr("start:child_1")], + "langgraph_triggers": [ + "branch:to:child_1", + "start:child_1", + ], }, created_at=AnyStr(), parent_config=( @@ -6195,7 +6228,10 @@ async def test_doubly_nested_graph_state(checkpointer_name: str) -> None: "langgraph_node": "child", "langgraph_path": [PULL, AnyStr("child")], "langgraph_step": 2, - "langgraph_triggers": [AnyStr("parent_1")], + "langgraph_triggers": [ + "branch:to:child", + AnyStr("parent_1"), + ], "langgraph_checkpoint_ns": AnyStr("child:"), }, created_at=AnyStr(), @@ -6493,7 +6529,7 @@ async def test_doubly_nested_graph_state(checkpointer_name: str) -> None: "langgraph_node": "child", "langgraph_path": [PULL, AnyStr("child")], "langgraph_step": 2, - "langgraph_triggers": [AnyStr("parent_1")], + "langgraph_triggers": ["branch:to:child", AnyStr("parent_1")], "langgraph_checkpoint_ns": AnyStr("child:"), }, created_at=AnyStr(), @@ -6532,7 +6568,7 @@ async def test_doubly_nested_graph_state(checkpointer_name: str) -> None: "langgraph_node": "child", "langgraph_path": [PULL, AnyStr("child")], "langgraph_step": 2, - "langgraph_triggers": [AnyStr("parent_1")], + "langgraph_triggers": ["branch:to:child", AnyStr("parent_1")], "langgraph_checkpoint_ns": AnyStr("child:"), }, created_at=AnyStr(), @@ -6584,7 +6620,7 @@ async def test_doubly_nested_graph_state(checkpointer_name: str) -> None: "langgraph_node": "child", "langgraph_path": [PULL, AnyStr("child")], "langgraph_step": 2, - "langgraph_triggers": [AnyStr("parent_1")], + "langgraph_triggers": ["branch:to:child", AnyStr("parent_1")], "langgraph_checkpoint_ns": AnyStr("child:"), }, created_at=AnyStr(), @@ -6642,7 +6678,10 @@ async def test_doubly_nested_graph_state(checkpointer_name: str) -> None: AnyStr("child_1"), ], "langgraph_step": 1, - "langgraph_triggers": [AnyStr("start:child_1")], + "langgraph_triggers": [ + "branch:to:child_1", + AnyStr("start:child_1"), + ], }, created_at=AnyStr(), parent_config={ @@ -6697,7 +6736,10 @@ async def test_doubly_nested_graph_state(checkpointer_name: str) -> None: AnyStr("child_1"), ], "langgraph_step": 1, - "langgraph_triggers": [AnyStr("start:child_1")], + "langgraph_triggers": [ + "branch:to:child_1", + AnyStr("start:child_1"), + ], }, created_at=AnyStr(), parent_config={ @@ -6759,7 +6801,10 @@ async def test_doubly_nested_graph_state(checkpointer_name: str) -> None: AnyStr("child_1"), ], "langgraph_step": 1, - "langgraph_triggers": [AnyStr("start:child_1")], + "langgraph_triggers": [ + "branch:to:child_1", + AnyStr("start:child_1"), + ], }, created_at=AnyStr(), parent_config={ @@ -6821,7 +6866,10 @@ async def test_doubly_nested_graph_state(checkpointer_name: str) -> None: AnyStr("child_1"), ], "langgraph_step": 1, - "langgraph_triggers": [AnyStr("start:child_1")], + "langgraph_triggers": [ + "branch:to:child_1", + AnyStr("start:child_1"), + ], }, created_at=AnyStr(), parent_config=None, diff --git a/libs/langgraph/tests/test_pregel.py b/libs/langgraph/tests/test_pregel.py index d8d51a8a0..d6b9f49bc 100644 --- a/libs/langgraph/tests/test_pregel.py +++ b/libs/langgraph/tests/test_pregel.py @@ -6925,7 +6925,10 @@ def test_tags_stream_mode_messages() -> None: { "langgraph_step": 1, "langgraph_node": "call_model", - "langgraph_triggers": ("start:call_model",), + "langgraph_triggers": ( + "branch:to:call_model", + "start:call_model", + ), "langgraph_path": ("__pregel_pull", "call_model"), "langgraph_checkpoint_ns": AnyStr("call_model:"), "checkpoint_ns": AnyStr("call_model:"), diff --git a/libs/langgraph/tests/test_pregel_async.py b/libs/langgraph/tests/test_pregel_async.py index 60cbd2547..5f130b631 100644 --- a/libs/langgraph/tests/test_pregel_async.py +++ b/libs/langgraph/tests/test_pregel_async.py @@ -7582,7 +7582,10 @@ async def test_tags_stream_mode_messages() -> None: { "langgraph_step": 1, "langgraph_node": "call_model", - "langgraph_triggers": ("start:call_model",), + "langgraph_triggers": ( + "branch:to:call_model", + "start:call_model", + ), "langgraph_path": ("__pregel_pull", "call_model"), "langgraph_checkpoint_ns": AnyStr("call_model:"), "checkpoint_ns": AnyStr("call_model:"),