fix(tools): normalise MCP object schemas without properties#2095
Closed
sammcf wants to merge 1 commit into
Closed
Conversation
Contributor
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Normalises MCP tool input schemas that declare
{"type": "object"}without apropertiesfield before forwarding them to the LLM tool-calling API. This fixes a400 Bad Requestfrom OpenAI when an MCP server exposes a bare object schema, such as Crawl4AI'sasktool:The normalisation is applied in both MCP tool discovery/registration and the MCP sampling callback when server-provided tools are forwarded to the model, which are the only two places I could find the MCP tool schema reaching the model.
Regression tests covering both paths included.
Type of Change
Changes Made
_normalize_mcp_input_schema()intools/mcp_tool.py[used USian spelling for codebase consistency ;p]tools/mcp_tool.pyto normalise bare object schemas before registrationtools/mcp_tool.pyto normalise server-provided tool schemas before forwarding them to the modeltests/tools/test_mcp_tool.pyfor MCP tool schemas with{"type": "object"}and nopropertiestests/tools/test_mcp_tool.pycovering the sampling callback path for server-provided tools with the same schema shapeHow to Test
properties.{"type": "object"}input schema and confirm the gateway no longer sends an OpenAI-invalid function schema for that tool.Checklist
Code
fix(scope):,feat(scope):, etc.)pytest tests/ -qand all tests passDocumentation & Housekeeping
docs/, docstrings) — or N/Acli-config.yaml.exampleif I added/changed config keys — or N/ACONTRIBUTING.mdorAGENTS.mdif I changed architecture or workflows — or N/A