Pydantic 2.13.0 changed PydanticUserError's base class from TypeError to RuntimeError (pydantic/pydantic#12579). _try_create_model_and_schema was relying on except TypeError to catch PydanticInvalidForJsonSchema when a return type contains a field that can't be represented in JSON Schema (e.g. Callable). On pydantic 2.13.0 that exception now escapes, so registering such a tool crashes instead of falling back to unstructured output.

This adds PydanticUserError to the except tuple so the fallback works on all supported pydantic versions.

Motivation and Context

Without this, on pydantic 2.13.0:

class Config:
    name: str
    callback: Callable[[Any], Any] = lambda x: x

@server.tool()
def get_config() -> Config:  # raises PydanticInvalidForJsonSchema at decorator time
    ...

Previously this logged a message and continued with output_schema=None.

How Has This Been Tested?

Covered by the existing test_structured_output_unserializable_type_error, which fails on pydantic 2.13.0 without this change and passes with it. Verified locally on the locked pydantic version; CI will exercise both lowest-direct and the locked version.

Breaking Changes

None.

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)
• Documentation update

Checklist

• I have read the MCP Documentation
• My code follows the repository's style guidelines
• New and existing tests pass locally
• I have added appropriate error handling
• I have added or updated documentation as needed

Additional context

PydanticUserError is the parent of both PydanticInvalidForJsonSchema and PydanticSchemaGenerationError and has existed since pydantic 2.0, so catching it is correct regardless of which built-in exception it subclasses in a given pydantic release. TypeError is kept in the tuple to avoid changing behaviour for any other code path that might raise a plain TypeError here.

AI Disclaimer