Resolve .values() field types on annotated querysets#3232
Open
federicobond wants to merge 1 commit intotypeddjango:masterfrom
Open
Resolve .values() field types on annotated querysets#3232federicobond wants to merge 1 commit intotypeddjango:masterfrom
federicobond wants to merge 1 commit intotypeddjango:masterfrom
Conversation
federicobond
commented
Mar 28, 2026
|
|
||
| values_no_params = Blog.objects.annotate(foo=F('id')).values().get() | ||
| reveal_type(values_no_params) # N: Revealed type is "builtins.dict[builtins.str, Any]" | ||
| reveal_type(values_no_params) # N: Revealed type is "TypedDict({'id': builtins.int, 'num_posts': builtins.int, 'text': builtins.str, 'foo': Any})" |
Contributor
Author
There was a problem hiding this comment.
Should I remove these lines since type broadening no longer applies to .values() calls?
Member
There was a problem hiding this comment.
Sorry, I don't understand your question :)
Contributor
Author
There was a problem hiding this comment.
This test name is annotate_values_or_values_list_before_or_after_annotate_broadens_type, but with the latest changes, annotate no longer causes the type of .values() to widen to dict[builtins.str, Any].
Now this code is covered by the new test_values_on_with_annotations_queryset test.
Contributor
There was a problem hiding this comment.
we can probably remove it ye
sobolevn
reviewed
Mar 28, 2026
|
|
||
| values_no_params = Blog.objects.annotate(foo=F('id')).values().get() | ||
| reveal_type(values_no_params) # N: Revealed type is "builtins.dict[builtins.str, Any]" | ||
| reveal_type(values_no_params) # N: Revealed type is "TypedDict({'id': builtins.int, 'num_posts': builtins.int, 'text': builtins.str, 'foo': Any})" |
Member
There was a problem hiding this comment.
Sorry, I don't understand your question :)
Previously, extract_proper_type_queryset_values bailed out early for annotated models, returning dict[str, Any] instead of a precise TypedDict. Now it resolves annotation fields from the model's TypedDict type arg and model fields from Django's field metadata.
9eb8e04 to
041a3ab
Compare
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.
Previously,
extract_proper_type_queryset_valuesbailed out early for annotated models, returningdict[str, Any]instead of a precise TypedDict. Now it resolves annotation fields from the model's TypedDict type arg and model fields from Django's field metadata.I've been working on
values_listtoo but this changeset ended up quite neat that I didn't want to introduce more friction.