-
-
Notifications
You must be signed in to change notification settings - Fork 457
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fallback to checking kwargs of function call when looking for arguments of a call #2044
Open
md384
wants to merge
6
commits into
typeddjango:master
Choose a base branch
from
md384:m.get_call_argument_by_name_kwargs
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
5ae8419
Fallback to checking kwargs of function call when looking for argumen…
md384 5cd6f20
Test for querysets
md384 8b15253
Add back comment
md384 31f6740
Remove unused Self import
md384 94858d7
Avoid index errors
md384 f35b7f0
Add some documentation
md384 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
42 changes: 42 additions & 0 deletions
42
tests/typecheck/managers/querysets/test_custom_queryset.yml
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
- case: test_custom_queryset_with_passthrough_values_list | ||
main: | | ||
from typing import Any, TypeVar, Self | ||
from django.db.models.base import Model | ||
from django.db.models.query import QuerySet | ||
from myapp.models import MyUser | ||
|
||
_Model = TypeVar("_Model", bound=Model, covariant=True) | ||
|
||
class CustomQuerySet(QuerySet[_Model]): | ||
def values_list(self, *args: Any, **kwargs: Any) -> QuerySet[_Model]: | ||
return super().values_list(*args, **kwargs) | ||
|
||
qs = CustomQuerySet[MyUser](model=MyUser) | ||
|
||
# checking that the CustomQuerySet returns same types as MyUser's qs when using "flat" and "named" args which use | ||
# "get_call_argument_by_name" helper function in plugin | ||
reveal_type(MyUser.objects.values_list('name').get()) # N: Revealed type is "Tuple[builtins.str]" | ||
reveal_type(qs.values_list('name').get()) # N: Revealed type is "Tuple[builtins.str]" | ||
|
||
reveal_type(MyUser.objects.values_list('name', flat=True).get()) # N: Revealed type is "builtins.str" | ||
reveal_type(qs.values_list('name', flat=True).get()) # N: Revealed type is "builtins.str" | ||
|
||
reveal_type(MyUser.objects.values_list('name', named=True).get()) # N: Revealed type is "Tuple[builtins.str, fallback=main.Row]" | ||
reveal_type(qs.values_list('name', named=True).get()) # N: Revealed type is "Tuple[builtins.str, fallback=main.Row1]" | ||
|
||
reveal_type(MyUser.objects.values_list('name', flat=True, named=True).get()) | ||
reveal_type(qs.values_list('name', flat=True, named=True).get()) | ||
out: | | ||
main:25: error: 'flat' and 'named' can't be used together [misc] | ||
main:25: note: Revealed type is "Any" | ||
main:26: error: 'flat' and 'named' can't be used together [misc] | ||
main:26: note: Revealed type is "Any" | ||
installed_apps: | ||
- myapp | ||
files: | ||
- path: myapp/__init__.py | ||
- path: myapp/models.py | ||
content: | | ||
from django.db import models | ||
class MyUser(models.Model): | ||
name = models.CharField(max_length=100) |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
stupid question: what will happen if we do
kwargs.pop('flat'); super().values_list(*args, flat=True, **kwargs)
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
flat=True
doesn't change the return type of theget
call in the tests. This seems like a separate bug and is beyond my knowledge of mypy or mypy plugins -there doesn't seem to be anything usable in the context.