Skip to content

The agent engineering platform.

fix(langchain): preserve open MCP object arguments (#40414)

John Kennedyc01de7fed06b
diff --git a/libs/langchain_v1/langchain/mcp/tools.py b/libs/langchain_v1/langchain/mcp/tools.py
index 9464d5eaf9..ad0c6b0c65 100644
--- a/libs/langchain_v1/langchain/mcp/tools.py
+++ b/libs/langchain_v1/langchain/mcp/tools.py
@@ -209,6 +209,28 @@ def _tool_metadata(tool: Tool, client: Client[Any] | None) -> dict[str, Any] | N
return {"mcp": mcp} if mcp else None
+def _normalize_mcp_schema(schema: dict[str, Any]) -> dict[str, Any]:
+ """Keep open object arguments open during provider schema conversion."""
+ normalized = dict(schema)
+ properties = schema.get("properties")
+ if not isinstance(properties, dict):
+ return normalized
+ normalized["properties"] = dict(properties)
+ for name, value in properties.items():
+ if not isinstance(value, dict):
+ continue
+ types = value.get("type")
+ is_object = types == "object" or (isinstance(types, list) and "object" in types)
+ if (
+ is_object
+ and not value.get("properties")
+ and "additionalProperties" not in value
+ and "unevaluatedProperties" not in value
+ ):
+ normalized["properties"][name] = {**value, "additionalProperties": True}
+ return normalized
+
+
async def as_langchain_tool(
tool: Tool,
client: Client[Any] | ClientGroup,
@@ -274,7 +296,7 @@ async def as_langchain_tool(
return StructuredTool(
name=tool.name,
description=tool.description or "",
- args_schema=tool.input_schema,
+ args_schema=_normalize_mcp_schema(tool.input_schema),
coroutine=call_tool,
response_format="content_and_artifact",
metadata=_tool_metadata(tool, requesting_client),
diff --git a/libs/langchain_v1/tests/unit_tests/mcp/test_schema.py b/libs/langchain_v1/tests/unit_tests/mcp/test_schema.py
new file mode 100644
index 0000000000..0811bcd03c
--- /dev/null
+++ b/libs/langchain_v1/tests/unit_tests/mcp/test_schema.py
@@ -0,0 +1,53 @@
+"""Schema compatibility at the MCP tool conversion boundary."""
+
+from copy import deepcopy
+from typing import Any
+
+import pytest
+from fastmcp import Client, FastMCP
+from langchain_core.utils.function_calling import convert_to_openai_tool
+from mcp.types import Tool
+
+from langchain.mcp import as_langchain_tool
+from langchain.mcp.tools import _normalize_mcp_schema
+
+
+ "payload",
+ [
+ {"type": "object", "properties": {}},
+ {"type": "object"},
+ {"type": ["object", "null"], "properties": {}},
+ ],
+)
+async def test_open_payload_survives_provider_conversion(payload: dict[str, Any]) -> None:
+ schema = {
+ "type": "object",
+ "properties": {"payload": payload},
+ "required": ["payload"],
+ }
+ original = deepcopy(schema)
+ mcp_tool = Tool(name="call_operation", input_schema=schema)
+ server: FastMCP[None] = FastMCP("test")
+ client: Client[Any] = Client(server)
+ tool = await as_langchain_tool(mcp_tool, client)
+ parameters = convert_to_openai_tool(tool)["function"]["parameters"]
+ assert parameters["properties"]["payload"]["additionalProperties"] is True
+ assert parameters["properties"]["payload"]["type"] == payload["type"]
+ assert parameters["required"] == ["payload"]
+ assert mcp_tool.input_schema == original
+ assert schema == original
+
+
+ "constraint",
+ [
+ {"additionalProperties": False},
+ {"additionalProperties": {"type": "string"}},
+ {"unevaluatedProperties": False},
+ ],
+)
+def test_explicit_constraints_are_preserved(constraint: dict[str, Any]) -> None:
+ payload = {"type": "object", **constraint}
+ schema = {"type": "object", "properties": {"payload": payload}}
+ assert _normalize_mcp_schema(schema)["properties"]["payload"] == payload