-
Notifications
You must be signed in to change notification settings - Fork 54
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
Add WithProtocols
marker
#276
Open
IvanKirpichnikov
wants to merge
5
commits into
reagento:develop
Choose a base branch
from
IvanKirpichnikov:with_protocols
base: develop
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 all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
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
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
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
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 @@ | ||
__all__ = ["WithProtocols"] | ||
|
||
from typing import TYPE_CHECKING, TypeVar | ||
|
||
from dishka._adaptix.common import TypeHint | ||
from dishka._adaptix.type_tools import is_protocol, strip_alias | ||
from dishka.entities.provides_marker import ProvideMultiple | ||
from dishka.entities.with_parents import ParentsResolver | ||
from dishka.text_rendering import get_name | ||
|
||
|
||
def get_parents_protocols(type_hint: TypeHint) -> list[TypeHint]: | ||
parents = ParentsResolver().get_parents(type_hint) | ||
new_parents = [ | ||
parent for parent in parents | ||
if is_protocol(strip_alias(parent)) | ||
] | ||
if new_parents: | ||
return new_parents | ||
|
||
name = get_name(type_hint, include_module=False) | ||
error_msg = ( | ||
f"Not a single parent of the protocol was found in {name}.\n" | ||
"Hint:\n" | ||
f" * Maybe you meant just {name}, not WithProtocols[{name}]\n" | ||
) | ||
if len(parents) > 1: | ||
error_msg += f" * Perhaps you meant WithParents[{name}]?" | ||
raise ValueError(error_msg) | ||
|
||
|
||
T = TypeVar("T") | ||
if TYPE_CHECKING: | ||
from typing import Union | ||
WithProtocols = Union[T, T] # noqa: UP007,PYI016 | ||
else: | ||
class WithProtocols: | ||
def __class_getitem__(cls, item: TypeHint) -> TypeHint: | ||
parents = get_parents_protocols(item) | ||
if len(parents) > 1: | ||
return ProvideMultiple(parents) | ||
return parents[0] |
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,38 @@ | ||
from typing import Protocol | ||
|
||
import pytest | ||
|
||
from dishka import Provider, Scope, WithProtocols, make_container | ||
from dishka.exceptions import NoFactoryError | ||
|
||
|
||
class AProtocol(Protocol): | ||
pass | ||
|
||
|
||
class BProtocol(Protocol): | ||
pass | ||
|
||
|
||
class C(AProtocol, BProtocol): | ||
pass | ||
|
||
|
||
def test_get_parents_protocols() -> None: | ||
provider = Provider(scope=Scope.APP) | ||
provider.provide(C, provides=WithProtocols[C]) | ||
container = make_container(provider) | ||
|
||
assert ( | ||
container.get(BProtocol) | ||
is container.get(AProtocol) | ||
) | ||
|
||
|
||
def test_get_by_not_protocol() -> None: | ||
provider = Provider(scope=Scope.APP) | ||
provider.provide(C, provides=WithProtocols[C]) | ||
container = make_container(provider) | ||
|
||
with pytest.raises(NoFactoryError): | ||
container.get(C) |
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.
We need either another naming or another logic.
For
WithParents
we provide class itself together with parents. The same is expected here if we keep the prefixWith