Skip to content

Building AI agents, atomically

fix: resolve non-object MCP schema definitions as value types

liangzhechen655fb23ab64fa88
diff --git a/atomic-agents/atomic_agents/connectors/mcp/schema_transformer.py b/atomic-agents/atomic_agents/connectors/mcp/schema_transformer.py
index ad8cad8..91eb850 100644
--- a/atomic-agents/atomic_agents/connectors/mcp/schema_transformer.py
+++ b/atomic-agents/atomic_agents/connectors/mcp/schema_transformer.py
@@ -27,7 +27,7 @@ class SchemaTransformer:
@staticmethod
def _resolve_ref(ref_path: str, root_schema: Dict[str, Any], model_cache: Dict[str, Type]) -> Type:
- """Resolve a $ref to a Pydantic model."""
+ """Resolve a $ref to its Pydantic-compatible value type."""
# Extract ref name from path like "#/$defs/MyObject" or "#/definitions/ANode"
# JSON Pointer decodes ~1 before ~0 so a literal ~1 is not decoded twice.
ref_name = ref_path.split("/")[-1].replace("~1", "/").replace("~0", "~")
@@ -39,11 +39,13 @@ class SchemaTransformer:
defs = root_schema.get("$defs", root_schema.get("definitions", {}))
if ref_name in defs:
ref_schema = defs[ref_name]
- # Create model for the referenced schema
- model_name = ref_schema.get("title", ref_name)
# Avoid infinite recursion by adding placeholder first
model_cache[ref_name] = Any
- model = SchemaTransformer._create_nested_model(ref_schema, model_name, root_schema, model_cache)
+ if ref_schema.get("type") == "object" or "properties" in ref_schema:
+ model_name = ref_schema.get("title", ref_name)
+ model = SchemaTransformer._create_nested_model(ref_schema, model_name, root_schema, model_cache)
+ else:
+ model, _ = SchemaTransformer.json_to_pydantic_field(ref_schema, True, root_schema, model_cache)
model_cache[ref_name] = model
return model
diff --git a/atomic-agents/tests/connectors/mcp/test_non_object_refs.py b/atomic-agents/tests/connectors/mcp/test_non_object_refs.py
new file mode 100644
index 0000000..ee2c063
--- /dev/null
+++ b/atomic-agents/tests/connectors/mcp/test_non_object_refs.py
@@ -0,0 +1,45 @@
+import pytest
+from pydantic import ValidationError
+
+from atomic_agents.connectors.mcp import SchemaTransformer
+
+
[email protected]("definitions_key", ["$defs", "definitions"])
+ "definition, valid, invalid",
+ [
+ ({"type": "string"}, "query", {}),
+ ({"type": "integer"}, 42, {}),
+ ({"type": "array", "items": {"type": "integer"}}, [1, 2], ["invalid"]),
+ ({"anyOf": [{"type": "string"}, {"type": "null"}]}, None, {}),
+ ],
+)
+def test_non_object_definitions_preserve_their_value_type(definitions_key, definition, valid, invalid):
+ reference = {"$ref": f"#/{definitions_key}/Value"}
+ schema = {
+ "type": "object",
+ "properties": {"value": reference, "values": {"type": "array", "items": reference}},
+ "required": ["value", "values"],
+ definitions_key: {"Value": definition},
+ }
+ model = SchemaTransformer.create_model_from_schema(schema, "ValuesInput", "values")
+ instance = model(tool_name="values", value=valid, values=[valid])
+ assert instance.value == valid
+ assert instance.values == [valid]
+ with pytest.raises(ValidationError):
+ model(tool_name="values", value=invalid, values=[])
+ with pytest.raises(ValidationError):
+ model(tool_name="values", value=valid, values=[invalid])
+
+
+def test_definition_aliases_resolve_to_the_underlying_scalar():
+ schema = {
+ "type": "object",
+ "properties": {"value": {"$ref": "#/$defs/Alias"}},
+ "required": ["value"],
+ "$defs": {"Alias": {"$ref": "#/$defs/Value"}, "Value": {"type": "string"}},
+ }
+ model = SchemaTransformer.create_model_from_schema(schema, "AliasOutput", "alias", is_output_schema=True)
+ assert model(value="result").model_dump() == {"value": "result"}
+ with pytest.raises(ValidationError):
+ model(value={})