Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/dependency_injector/providers.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -1311,9 +1311,9 @@ cdef class Callable(Provider):

:return: Reference ``self``
"""
self._kwargs += parse_named_injections(kwargs)
self._kwargs_len = len(self._kwargs)
return self
existing_kwargs = self.kwargs
existing_kwargs.update(kwargs)
return self.set_kwargs(**existing_kwargs)

def set_kwargs(self, **kwargs):
"""Set keyword argument injections.
Expand Down
27 changes: 27 additions & 0 deletions tests/unit/providers/async/test_factory_py36.py
Original file line number Diff line number Diff line change
Expand Up @@ -421,3 +421,30 @@ class ContainerWithAttributes(BaseContainer):
assert service2.client.resource2 is RESOURCE2

assert service1.client is not service2.client


@mark.asyncio
@mark.parametrize("provider_type", [providers.Callable, providers.Factory, providers.Singleton])
@mark.parametrize("call_kwargs, expected", [({}, 20), ({"extra": 3}, 20), ({"value": 30}, 30)])
async def test_add_kwargs_replaces_async_dependency(provider_type, call_kwargs, expected):
calls = []

async def original():
calls.append("original")
return 1

async def other():
return 2

provider = provider_type(
dict, value=providers.Callable(original), other=providers.Callable(other)
)
provider.add_kwargs(value=20)

result = await provider(**call_kwargs)

assert result["value"] == expected
assert result["other"] == 2
if "extra" in call_kwargs:
assert result["extra"] == 3
assert calls == []
10 changes: 10 additions & 0 deletions tests/unit/providers/callables/test_callable_py2_py3.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,3 +223,13 @@ def test_repr():
"<dependency_injector.providers."
"Callable({0}) at {1}>".format(repr(example), hex(id(provider)))
)


def test_add_kwargs_replaces_dependency():
calls = []
original = providers.Callable(lambda: calls.append("original"))
provider = providers.Callable(dict, value=original, other=2)
provider.add_kwargs(value=20)

assert provider() == {"value": 20, "other": 2}
assert calls == []