Skip to content

Commit

Permalink
Override passed kw args when autowiring; Fixes #12
Browse files Browse the repository at this point in the history
  • Loading branch information
maldoinc committed Dec 21, 2023
1 parent 1440cf5 commit fc5a4c2
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
14 changes: 14 additions & 0 deletions test/test_container.py
Original file line number Diff line number Diff line change
Expand Up @@ -519,3 +519,17 @@ def bar(self):
self.container.get(Foo).bar()

self.assertIsInstance(self.container.get(Foo), Foo)

async def test_container_overrides_already_passed_keyword_args(self):
self.container.params.put("foo", "Foo")

@self.container.autowire
def sync_inner(name: Annotated[str, Wire(param="foo")]):
self.assertEqual(name, "Foo")

@self.container.autowire
async def async_inner(name: Annotated[str, Wire(param="foo")]):
self.assertEqual(name, "Foo")

sync_inner(name="Ignored")
await async_inner(name="Ignored")
4 changes: 2 additions & 2 deletions wireup/ioc/dependency_container.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,13 @@ def autowire(self, fn: AnyCallable) -> AnyCallable:

@functools.wraps(fn)
async def async_inner(*args: Any, **kwargs: Any) -> Any:
return await fn(*args, **kwargs, **self.__callable_get_params_to_inject(fn))
return await fn(*args, **{**kwargs, **self.__callable_get_params_to_inject(fn)})

return async_inner

@functools.wraps(fn)
def sync_inner(*args: Any, **kwargs: Any) -> Any:
return fn(*args, **kwargs, **self.__callable_get_params_to_inject(fn))
return fn(*args, **{**kwargs, **self.__callable_get_params_to_inject(fn)})

return sync_inner

Expand Down

0 comments on commit fc5a4c2

Please sign in to comment.