chore(prebuilt): revert optional multiple nodes for tools (#5959)

libs/prebuilt/tests/test_react_agent.py

@@ -637,24 +637,14 @@ class AgentStateExtraKeyPydantic(AgentStatePydantic):
     foo: int
 
 
-@pytest.mark.parametrize("version", ["v1", "v2"])
+@pytest.mark.parametrize("version", REACT_TOOL_CALL_VERSIONS)
 @pytest.mark.parametrize(
     "state_schema", [AgentStateExtraKey, AgentStateExtraKeyPydantic]
 )
-@pytest.mark.parametrize(
-    "use_individual_tool_nodes",
-    [False, True],
-    ids=["single_tool_node", "node_per_tool"],
-)
 def test_create_react_agent_inject_vars(
-    version: Literal["v1", "v2"],
-    state_schema: StateSchemaType,
-    use_individual_tool_nodes: bool,
+    version: Literal["v1", "v2"], state_schema: StateSchemaType
 ) -> None:
     """Test that the agent can inject state and store into tool functions."""
-    if version == "v1" and use_individual_tool_nodes:
-        pytest.skip("v1 does not support individual tool nodes")
-
     store = InMemoryStore()
     namespace = ("test",)
     store.put(namespace, "test_key", {"bar": 3})
@@ -693,7 +683,6 @@ def test_create_react_agent_inject_vars(
         state_schema=state_schema,
         store=store,
         version=version,
-        use_individual_tool_nodes=use_individual_tool_nodes,
     )
     result = agent.invoke({"messages": [{"role": "user", "content": "hi"}], "foo": 2})
     assert result["messages"] == [
@@ -706,17 +695,7 @@ def test_create_react_agent_inject_vars(
 
 
 @pytest.mark.parametrize("version", REACT_TOOL_CALL_VERSIONS)
-@pytest.mark.parametrize(
-    "use_individual_tool_nodes",
-    [False, True],
-    ids=["single_tool_node", "node_per_tool"],
-)
-async def test_return_direct(
-    version: Literal["v1", "v2"], use_individual_tool_nodes: bool
-) -> None:
-    if version == "v1" and use_individual_tool_nodes:
-        pytest.skip("v1 does not support individual tool nodes")
-
+async def test_return_direct(version: str) -> None:
     @dec_tool(return_direct=True)
     def tool_return_direct(input: str) -> str:
         """A tool that returns directly."""
@@ -744,7 +723,6 @@ async def test_return_direct(
         model,
         [tool_return_direct, tool_normal],
         version=version,
-        use_individual_tool_nodes=use_individual_tool_nodes,
     )
 
     # Test direct return for tool_return_direct
@@ -838,27 +816,15 @@ def test__get_state_args() -> None:
 
 
 def test_inspect_react() -> None:
-    """Test that we can inspect the agent and its nodes."""
     model = FakeToolCallingModel(tool_calls=[])
     agent = create_react_agent(model, [])
     inspect.getclosurevars(agent.nodes["agent"].bound.func)
 
 
 @pytest.mark.parametrize("version", REACT_TOOL_CALL_VERSIONS)
-@pytest.mark.parametrize(
-    "use_individual_tool_nodes",
-    [False, True],
-    ids=["single_tool_node", "node_per_tool"],
-)
 def test_react_with_subgraph_tools(
-    sync_checkpointer: BaseCheckpointSaver,
-    version: Literal["v1", "v2"],
-    use_individual_tool_nodes: bool,
+    sync_checkpointer: BaseCheckpointSaver, version: Literal["v1", "v2"]
 ) -> None:
-    """Test React agent with subgraph tools."""
-    if version == "v1" and use_individual_tool_nodes:
-        pytest.skip("v1 does not support individual tool nodes")
-
     class State(TypedDict):
         a: int
         b: int
@@ -914,7 +880,6 @@ def test_react_with_subgraph_tools(
         tool_node,
         checkpointer=sync_checkpointer,
         version=version,
-        use_individual_tool_nodes=use_individual_tool_nodes,
     )
     result = agent.invoke(
         {"messages": [HumanMessage(content="What's 2 + 3 and 2 * 3?")]},
@@ -946,17 +911,8 @@ def test_react_with_subgraph_tools(
 
 
 @pytest.mark.parametrize("version", REACT_TOOL_CALL_VERSIONS)
-@pytest.mark.parametrize(
-    "use_individual_tool_nodes",
-    [False, True],
-    ids=["single_tool_node", "node_per_tool"],
-)
-def test_react_agent_subgraph_streaming_sync(
-    version: Literal["v1", "v2"], use_individual_tool_nodes: bool
-) -> None:
+def test_react_agent_subgraph_streaming_sync(version: Literal["v1", "v2"]) -> None:
     """Test React agent streaming when used as a subgraph node sync version"""
-    if version == "v1" and use_individual_tool_nodes:
-        pytest.skip("v1 does not support individual tool nodes")
 
     @dec_tool
     def get_weather(city: str) -> str:
@@ -976,7 +932,6 @@ def test_react_agent_subgraph_streaming_sync(
         tools=[get_weather],
         prompt="You are a helpful travel assistant.",
         version=version,
-        use_individual_tool_nodes=use_individual_tool_nodes,
     )
 
     # Create a subgraph that uses the React agent as a node