Repository navigation
fix(pydantic): import restate.ext.pydantic without the pydantic-ai mcp extra - #257
Closed
pcbeingused333 wants to merge 3 commits into
Closed
pcbeingused333 wants to merge 3 commits into
pcbeingused333 wants to merge 3 commits into
Conversation
…p extra _toolset.py imported pydantic_ai.mcp at module level, so importing restate.ext.pydantic failed unless pydantic-ai-slim[mcp] was installed, although _agent.py already treats MCP support as optional. Move RestateMCPToolset into its own module that is only imported lazily.
|
All contributors have signed the CLA ✍️ ✅ |
Contributor
Author
|
I have read the CLA Document and I hereby sign the CLA |
Contributor
|
looks good thank you for your contribution. |
Contributor
|
@pullfrog review |
![pullfrog[bot]](https://avatars.githubusercontent.com/in/1768019?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
✅ No new issues found.
Reviewed changes
Reviewed the change that moves the MCP toolset wrapper out of _toolset.py, so restate.ext.pydantic can be imported without the pydantic-ai-slim[mcp] extra.
- MCP wrapper moved to
_mcp_toolset.py:RestateMCPToolset,RestateMCPGetToolsContextRunResult,RestateMCPToolRunResultand their serdes are moved over unchanged, and the top-levelfrom pydantic_ai.mcp import MCPToolsetgoes with them. - Lazy import updated: the guarded
try/except ImportErrorinRestateAgent.__init__'sset_contextnow imports from._mcp_toolset.pydantic_ai/mcp.pyre-raises a missingmcp/fastmcpasImportError, so the guard catches it. - Regression test:
tests/pydantic_ai_without_mcp.pysetssys.modules['pydantic_ai.mcp'] = Nonein a subprocess and imports the extension. On the base commit this fails, because_toolset.pyimportspydantic_ai.mcpat module level.
What I checked:
main(0d06f2c) still has the module-level import, so the fix is still needed.- Nothing else on
mainimportsRestateMCPToolsetor the MCP serdes from_toolset. - GitHub reports the PR as mergeable against current
main. - On the PR head, the new test passes, and
ruff check,ruff format --checkandpyrightonpython/restate/ext/pydantic/all pass.
claude-opus-5-5 ｜ 𝕏
# Conflicts: # python/restate/ext/pydantic/_toolset.py
igalshilman
requested changes
Nov 9, 2026
|
|
||
|
|
||
| def test_import_without_pydantic_ai_mcp(): | ||
| """restate.ext.pydantic must be importable without the pydantic-ai ``mcp`` extra.""" |
Contributor
There was a problem hiding this comment.
Lets remove this test please
| pytest.importorskip("pydantic_ai") | ||
|
|
||
|
|
||
| def test_import_without_pydantic_ai_mcp(): |
Contributor
There was a problem hiding this comment.
please remove this entire test.
Contributor
|
Merged with your authorship kept in #307 (the test left out, as the review asked). Thank you! |
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.
Fixes #221.
python/restate/ext/pydantic/_toolset.pyimportedpydantic_ai.mcp.MCPToolsetat module level.restate.ext.pydanticimports that module from__init__and_agent, so the whole extension failed to import unlesspydantic-ai-slim[mcp](fastmcp) was installed, even though_agent.pyalready importsMCPToolsetandRestateMCPToolsetlazily inside atry/except ImportErrorand thepydantic_aiextra only pinspydantic-ai-slim.RestateMCPToolsetand its two serde dataclasses now live in a new_mcp_toolset.py, which is only imported from that guarded block._toolset.pykeepsRestateContextRunToolSetunchanged. Nothing else importedRestateMCPToolsetfrom_toolset.This pull request was prepared with the assistance of an AI coding agent (Claude Code) and submitted by Alex Castillo, who is responsible for its content.