Fix Closing dependency resolution
#711
Open
Conversation
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 was referenced May 22, 2023
Allow Closing to detect dependent resources passed as kwargs too ets-labs#636
jazzthief
commented
May 24, 2023
| nested_service = providers.Factory(NestedService, factory_service) | ||
|
|
||
|
|
||
| class ContainerSingleton(containers.DeclarativeContainer): |
There was a problem hiding this comment.
Added another container to cover a case where a resource is not at the end of the dependency graph. A Singleton provider type is arbitrary - its type doesn't play any role in injections, just needed something for a Resource to depend on.
federinik
reviewed
May 24, 2023
| @@ -92,6 +92,7 @@ def test_function_dependency_kwargs(factory: FactoryService = Closing[Provide["f | |||
| return factory | |||
|
|
|||
|
|
|||
| @inject | |||
There was a problem hiding this comment.
Oops, that's on me :D Sorry, bad merge
|
I have in mind a few potential test cases that could be added: when there are no resources in the dependency graph; and when there are several different resources. |
| if not isinstance(arg, providers.Provider) or not hasattr(arg, "args"): | ||
| continue | ||
|
|
||
| if not arg.args and isinstance(arg, providers.Resource): | ||
| if isinstance(arg, providers.Resource): | ||
| return {str(id(arg)): arg} |
There was a problem hiding this comment.
Hello @jazzthief. Fix not working for several Resources. Maybe something like this?
Suggested change
| return {str(id(arg)): arg} | |
| closing_deps |= {str(id(arg)): arg} |
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.
Fix issues found when using
Closingto implement per-function scope forResources.Closingdoes not resolve nested dependecies #702: e.g. when aFactorydepends on anotherFactorydependent on aResourceResourcewhen it is the last element in the dependency graph