Use get_type_hints() in function_schema()
#3693
Draft
Conversation
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
Viicos
commented
Dec 10, 2025
Comment on lines
+129
to
+120
| if index == 0 and takes_ctx is None: | ||
| takes_ctx = p.annotation is not sig.empty and _is_call_ctx(type_hints[name]) |
Member
Author
There was a problem hiding this comment.
Instead of using _takes_ctx(), do the logic here. This avoids computing the type hints twice.
Viicos
commented
Dec 10, 2025
|
|
||
|
|
||
| def _takes_ctx(callable_obj: TargetCallable[P, R]) -> TypeIs[WithCtx[P, R]]: | ||
| def _takes_ctx(callable_obj: TargetCallable[P, R]) -> TypeIs[WithCtx[P, R]]: # pyright: ignore[reportUnusedFunction] |
Member
Author
There was a problem hiding this comment.
Still used in one other place in Pydantic AI, will see how this can be cleaned up in a future PR.
Docs Preview
|
Viicos
force-pushed
the
vp/fix-function-schema
branch
from
777fbe7 to
13fd648
Compare
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 #3685.
Todo still: update tests in https://github.com/pydantic/pydantic-ai/blob/main/tests/test_function_schema.py to generate the whole function schema to test the actual logic. The issue is that when
function_schema()relied on_takes_ctx()previous to this PR, the logic to unwrap the original function differed:_takes_ctx()unwrapped a whole bunch of possible wrappers (properties, classmethods, partial, even classes having a__call__()), which is not the case with_typing_extra.get_function_type_hints()(which only unwrapped partials).To maintain backwards compatibility, I kept the the partial unwrapping, and will see what needs to be taken into account when updating such tests.
This is a first step in removing usage of this private Pydantic utility, I will then do follow up PRs.