Merge 49ae900 into sapling-pr-archive-rm-openai

rm-openai · web-flow · commit abea28a8b8bb · 2025-04-07T17:51:27.000-04:00
diff --git a/tests/mcp/test_mcp_util.py b/tests/mcp/test_mcp_util.py
@@ -64,7 +64,10 @@ async def test_get_all_function_tools():
 
     for idx, tool in enumerate(tools):
         assert isinstance(tool, FunctionTool)
-        assert tool.params_json_schema == schemas[idx]
+        if schemas[idx] == {}:
+            assert tool.params_json_schema == snapshot({"properties": {}})
+        else:
+            assert tool.params_json_schema == schemas[idx]
         assert tool.name == names[idx]
 
     # Also make sure it works with strict schemas
@@ -168,10 +171,7 @@ async def test_agent_convert_schemas_true():
 
     # Checks that additionalProperties is set to False
     assert bar_tool.params_json_schema == snapshot(
-        {
-            "type": "object",
-            "additionalProperties": {"type": "string"},
-        }
+        {"type": "object", "additionalProperties": {"type": "string"}, "properties": {}}
     )
     assert bar_tool.strict_json_schema is False, "bar_tool should not be strict"
 
@@ -221,7 +221,9 @@ async def test_agent_convert_schemas_false():
     assert foo_tool.params_json_schema == strict_schema
     assert foo_tool.strict_json_schema is False, "Shouldn't be converted unless specified"
 
-    assert bar_tool.params_json_schema == non_strict_schema
+    assert bar_tool.params_json_schema == snapshot(
+        {"type": "object", "additionalProperties": {"type": "string"}, "properties": {}}
+    )
     assert bar_tool.strict_json_schema is False
 
     assert baz_tool.params_json_schema == possible_to_convert_schema
@@ -256,7 +258,9 @@ async def test_agent_convert_schemas_unset():
     assert foo_tool.params_json_schema == strict_schema
     assert foo_tool.strict_json_schema is False, "Shouldn't be converted unless specified"
 
-    assert bar_tool.params_json_schema == non_strict_schema
+    assert bar_tool.params_json_schema == snapshot(
+        {"type": "object", "additionalProperties": {"type": "string"}, "properties": {}}
+    )
     assert bar_tool.strict_json_schema is False
 
     assert baz_tool.params_json_schema == possible_to_convert_schema
