The agent engineering platform.
Python agentsaiai-agentsanthropicchatgptdeepagentsenterpriseframeworkgeminigenerative-ailangchainlanggraphllmmultiagentopen-sourceopenaipydanticpythonragtypescript
chore(langchain_v1): move tool node to tools namespace (#33132)
Eugene Yurtsev54ea62050b45
diff --git a/libs/langchain_v1/langchain/agents/__init__.py b/libs/langchain_v1/langchain/agents/__init__.pyindex 3545a18c90..ee0a7dfb49 100644--- a/libs/langchain_v1/langchain/agents/__init__.py+++ b/libs/langchain_v1/langchain/agents/__init__.py@@ -1,7 +1,7 @@"""langgraph.prebuilt exposes a higher-level API for creating and executing agents and tools."""from langchain.agents.react_agent import AgentState, create_agent-from langchain.agents.tool_node import ToolNode+from langchain.tools import ToolNode__all__ = ["AgentState",diff --git a/libs/langchain_v1/langchain/agents/middleware_agent.py b/libs/langchain_v1/langchain/agents/middleware_agent.pyindex 60d439eb1a..d8c285bd72 100644--- a/libs/langchain_v1/langchain/agents/middleware_agent.py+++ b/libs/langchain_v1/langchain/agents/middleware_agent.py@@ -33,8 +33,8 @@ from langchain.agents.structured_output import (StructuredOutputValidationError,ToolStrategy,)-from langchain.agents.tool_node import ToolNodefrom langchain.chat_models import init_chat_model+from langchain.tools import ToolNodeSTRUCTURED_OUTPUT_ERROR_TEMPLATE = "Error: {error}\n Please fix your mistakes."diff --git a/libs/langchain_v1/langchain/agents/react_agent.py b/libs/langchain_v1/langchain/agents/react_agent.pyindex 89680ee76f..dc45ac9019 100644--- a/libs/langchain_v1/langchain/agents/react_agent.py+++ b/libs/langchain_v1/langchain/agents/react_agent.py@@ -54,8 +54,8 @@ from langchain.agents.structured_output import (StructuredOutputValidationError,ToolStrategy,)-from langchain.agents.tool_node import ToolNodefrom langchain.chat_models import init_chat_model+from langchain.tools import ToolNodeif TYPE_CHECKING:from langchain_core.tools import BaseTooldiff --git a/libs/langchain_v1/langchain/tools/__init__.py b/libs/langchain_v1/langchain/tools/__init__.pyindex f4b2e7c149..8f1fa554f5 100644--- a/libs/langchain_v1/langchain/tools/__init__.py+++ b/libs/langchain_v1/langchain/tools/__init__.py@@ -8,10 +8,19 @@ from langchain_core.tools import (tool,)+from langchain.tools.tool_node import (+ InjectedState,+ InjectedStore,+ ToolNode,+)+__all__ = ["BaseTool",+ "InjectedState",+ "InjectedStore","InjectedToolArg","InjectedToolCallId","ToolException",+ "ToolNode","tool",]diff --git a/libs/langchain_v1/langchain/agents/tool_node.py b/libs/langchain_v1/langchain/tools/tool_node.pysimilarity index 99%rename from libs/langchain_v1/langchain/agents/tool_node.pyrename to libs/langchain_v1/langchain/tools/tool_node.pyindex dd018420d0..2dd437a158 100644--- a/libs/langchain_v1/langchain/agents/tool_node.py+++ b/libs/langchain_v1/langchain/tools/tool_node.py@@ -21,7 +21,7 @@ Key Components:Typical Usage:```pythonfrom langchain_core.tools import tool- from langchain.agents import ToolNode+ from langchain.tools import ToolNode@tool@@ -344,7 +344,7 @@ class ToolNode(RunnableCallable):Basic usage:```python- from langchain.agents import ToolNode+ from langchain.tools import ToolNodefrom langchain_core.tools import tool@tool@@ -359,7 +359,7 @@ class ToolNode(RunnableCallable):```pythonfrom typing_extensions import Annotated- from langgraph.agents.tool_node import InjectedState+ from langchain.tools import InjectedState@tooldef context_tool(query: str, state: Annotated[dict, InjectedState]) -> str:@@ -885,7 +885,8 @@ def tools_condition(```pythonfrom langgraph.graph import StateGraph- from langgraph.agents.tool_node import ToolNode, tools_condition+ from langchain.tools import ToolNode+ from langchain.tools.tool_node import tools_conditionfrom typing_extensions import TypedDict@@ -950,9 +951,7 @@ class InjectedState(InjectedToolArg):from typing_extensions import Annotated, TypedDictfrom langchain_core.messages import BaseMessage, AIMessage- from langchain_core.tools import tool-- from langgraph.agents.tool_node import InjectedState, ToolNode+ from langchain.tools import InjectedState, ToolNode, toolclass AgentState(TypedDict):@@ -1026,9 +1025,8 @@ class InjectedStore(InjectedToolArg):Example:```pythonfrom typing_extensions import Annotated- from langchain_core.tools import toolfrom langgraph.store.memory import InMemoryStore- from langgraph.agents.tool_node import InjectedStore, ToolNode+ from langchain.tools import InjectedStore, ToolNode, tool@tooldef save_preference(diff --git a/libs/langchain_v1/pyproject.toml b/libs/langchain_v1/pyproject.tomlindex 842ef12779..18d86abc44 100644--- a/libs/langchain_v1/pyproject.toml+++ b/libs/langchain_v1/pyproject.toml@@ -171,6 +171,16 @@ ignore-var-parameters = true # ignore missing documentation for *args and **kwa"N801", # class name should use CapWords convention]+"langchain/tools/tool_node.py" = [+ "ANN401", # we use Any right now, need to narrow+ "A002", # input is shadowing builtin+ "A001", # input is shadowing builtin+ "B904", # use from for exceptions+ "PLR2004", # magic values are fine for this case+ "C901", # too complex+ "TRY004", # type error exception+]+[tool.coverage.run]omit = ["tests/*"]diff --git a/libs/langchain_v1/tests/unit_tests/agents/test_middleware_agent.py b/libs/langchain_v1/tests/unit_tests/agents/test_middleware_agent.pyindex cd03be7a8d..d0ef45ba30 100644--- a/libs/langchain_v1/tests/unit_tests/agents/test_middleware_agent.py+++ b/libs/langchain_v1/tests/unit_tests/agents/test_middleware_agent.py@@ -21,7 +21,7 @@ from langchain_core.messages import (from langchain_core.tools import tool, InjectedToolCallIdfrom langchain.agents.middleware_agent import create_agent-from langchain.agents.tool_node import InjectedState+from langchain.tools import InjectedStatefrom langchain.agents.middleware.human_in_the_loop import (HumanInTheLoopMiddleware,ActionRequest,diff --git a/libs/langchain_v1/tests/unit_tests/agents/test_react_agent.py b/libs/langchain_v1/tests/unit_tests/agents/test_react_agent.pyindex 1b2dd9eeb4..ab3c453c09 100644--- a/libs/langchain_v1/tests/unit_tests/agents/test_react_agent.py+++ b/libs/langchain_v1/tests/unit_tests/agents/test_react_agent.py@@ -36,9 +36,11 @@ from langchain.agents import (create_agent,)from langchain.agents.react_agent import _validate_chat_history-from langchain.agents.tool_node import (+from langchain.tools import (InjectedState,InjectedStore,+)+from langchain.tools.tool_node import (_get_state_args,_infer_handled_types,)diff --git a/libs/langchain_v1/tests/unit_tests/agents/test_tool_node.py b/libs/langchain_v1/tests/unit_tests/agents/test_tool_node.pyindex e843788d13..fe9fdceb51 100644--- a/libs/langchain_v1/tests/unit_tests/agents/test_tool_node.py+++ b/libs/langchain_v1/tests/unit_tests/agents/test_tool_node.py@@ -35,13 +35,11 @@ from typing_extensions import TypedDictfrom langchain.agents import (ToolNode,)-from langchain.agents.tool_node import (- TOOL_CALL_ERROR_TEMPLATE,+from langchain.tools import (InjectedState,InjectedStore,- ToolInvocationError,- tools_condition,)+from langchain.tools.tool_node import TOOL_CALL_ERROR_TEMPLATE, ToolInvocationError, tools_conditionfrom .messages import _AnyIdHumanMessage, _AnyIdToolMessagefrom .model import FakeToolCallingModeldiff --git a/libs/langchain_v1/tests/unit_tests/tools/test_imports.py b/libs/langchain_v1/tests/unit_tests/tools/test_imports.pyindex 5ed7ffe950..79c7371e12 100644--- a/libs/langchain_v1/tests/unit_tests/tools/test_imports.py+++ b/libs/langchain_v1/tests/unit_tests/tools/test_imports.py@@ -2,9 +2,12 @@ from langchain import toolsEXPECTED_ALL = {"BaseTool",+ "InjectedState",+ "InjectedStore","InjectedToolArg","InjectedToolCallId","ToolException",+ "ToolNode","tool",}