Merge branch 'eugene/langchain_public_namespace' of github.com:langchain-ai/langchain into eugene/langchain_public_namespace

libs/langchain_v1/langchain/agents/__init__.py

@@ -1,10 +1,8 @@
 """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
 
 __all__ = [
     "AgentState",
-    "ToolNode",
     "create_agent",
 ]

libs/langchain_v1/langchain/agents/middleware_agent.py

@@ -33,7 +33,7 @@ from langchain.agents.structured_output import (
     StructuredOutputValidationError,
     ToolStrategy,
 )
-from langchain.agents.tool_node import ToolNode
+from langchain.tools import ToolNode
 from langchain.chat_models import init_chat_model
 
 STRUCTURED_OUTPUT_ERROR_TEMPLATE = "Error: {error}\n Please fix your mistakes."

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 ToolNode
 from langchain.chat_models import init_chat_model
+from langchain.tools import ToolNode
 
 if TYPE_CHECKING:
     from langchain_core.tools import BaseTool
@@ -66,7 +66,7 @@ if TYPE_CHECKING:
     from langchain.agents._internal._typing import (
         SyncOrAsync,
     )
-    from langchain.agents.types import AgentMiddleware
+    from langchain.agents.middleware import AgentMiddleware
 
 StructuredResponseT = TypeVar("StructuredResponseT", default=None)
 

libs/langchain_v1/langchain/tools/__init__.py

@@ -8,10 +8,6 @@ from langchain_core.tools import (
     tool,
 )
 
-__all__ = [
-    "BaseTool",
-    "InjectedToolArg",
-    "InjectedToolCallId",
-    "ToolException",
-    "tool",
-]
+from langchain.tools.tool_node import ToolNode
+
+__all__ = ["BaseTool", "InjectedToolArg", "InjectedToolCallId", "ToolException", "ToolNode", "tool"]

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/*"]
 

libs/langchain_v1/tests/unit_tests/tools/test_imports.py

@@ -6,6 +6,7 @@ EXPECTED_ALL = {
     "InjectedToolCallId",
     "ToolException",
     "tool",
+    "ToolNode",
 }