Skip to content

fix(langchain): revert conditional edge from tools to end (#33520) #33539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 16, 2025
Merged

fix(langchain): revert conditional edge from tools to end (#33520) #33539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fb8186
Revert "fix(langchain): conditional edge from tools to end (#33520)"
eyurtsev Oct 16, 2025
d35b16c
Merge branch 'master' into eugene/rbug_fix
eyurtsev Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions libs/langchain_v1/langchain/agents/factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,15 +1225,6 @@ async def amodel_node(state: AgentState, runtime: Runtime[ContextT]) -> dict[str
graph.add_edge(START, entry_node)
# add conditional edges only if tools exist
if tool_node is not None:
# Only include exit_node in destinations if any tool has return_direct=True
# or if there are structured output tools
tools_to_model_destinations = [loop_entry_node]
if (
any(tool.return_direct for tool in tool_node.tools_by_name.values())
or structured_output_tools
):
tools_to_model_destinations.append(exit_node)

graph.add_conditional_edges(
"tools",
_make_tools_to_model_edge(
Expand All @@ -1242,7 +1233,7 @@ async def amodel_node(state: AgentState, runtime: Runtime[ContextT]) -> dict[str
structured_output_tools=structured_output_tools,
end_destination=exit_node,
),
tools_to_model_destinations,
[loop_entry_node, exit_node],
)

# base destinations are tools and exit_node
Expand Down
7 changes: 7 additions & 0 deletions libs/langchain_v1/tests/unit_tests/agents/__snapshots__/test_middleware_agent.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
__start__ --> NoopZero\2ebefore_agent;
model -.-> NoopTwo\2eafter_agent;
model -.-> tools;
tools -.-> NoopTwo\2eafter_agent;
tools -.-> model;
NoopOne\2eafter_agent --> __end__;
classDef default fill:#f2f0ff,line-height:1.2
Expand Down Expand Up @@ -342,6 +343,7 @@
__start__ --> NoopSeven\2ebefore_model;
model --> NoopEight\2eafter_model;
tools -.-> NoopSeven\2ebefore_model;
tools -.-> __end__;
classDef default fill:#f2f0ff,line-height:1.2
classDef first fill-opacity:0
classDef last fill:#bfb6fc
Expand Down Expand Up @@ -374,6 +376,7 @@
__start__ --> NoopSeven\2ebefore_model;
model --> NoopEight\2eafter_model;
tools -.-> NoopSeven\2ebefore_model;
tools -.-> __end__;
classDef default fill:#f2f0ff,line-height:1.2
classDef first fill-opacity:0
classDef last fill:#bfb6fc
Expand Down Expand Up @@ -406,6 +409,7 @@
__start__ --> NoopSeven\2ebefore_model;
model --> NoopEight\2eafter_model;
tools -.-> NoopSeven\2ebefore_model;
tools -.-> __end__;
classDef default fill:#f2f0ff,line-height:1.2
classDef first fill-opacity:0
classDef last fill:#bfb6fc
Expand Down Expand Up @@ -438,6 +442,7 @@
__start__ --> NoopSeven\2ebefore_model;
model --> NoopEight\2eafter_model;
tools -.-> NoopSeven\2ebefore_model;
tools -.-> __end__;
classDef default fill:#f2f0ff,line-height:1.2
classDef first fill-opacity:0
classDef last fill:#bfb6fc
Expand Down Expand Up @@ -470,6 +475,7 @@
__start__ --> NoopSeven\2ebefore_model;
model --> NoopEight\2eafter_model;
tools -.-> NoopSeven\2ebefore_model;
tools -.-> __end__;
classDef default fill:#f2f0ff,line-height:1.2
classDef first fill-opacity:0
classDef last fill:#bfb6fc
Expand All @@ -491,6 +497,7 @@
__start__ --> model;
model -.-> __end__;
model -.-> tools;
tools -.-> __end__;
tools -.-> model;
classDef default fill:#f2f0ff,line-height:1.2
classDef first fill-opacity:0
Expand Down
69 changes: 0 additions & 69 deletions libs/langchain_v1/tests/unit_tests/agents/__snapshots__/test_return_direct_graph.ambr
View file
Open in desktop

This file was deleted.

73 changes: 0 additions & 73 deletions libs/langchain_v1/tests/unit_tests/agents/test_return_direct_graph.py
View file
Open in desktop

This file was deleted.