ets-labs/python-dependency-injector
1
1
Fork 0
mirror of https://github.com/ets-labs/python-dependency-injector.git synced 2024-11-25 19:14:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Process closings in any case

Browse Source
This commit is contained in:
Artem Ivanov 2023-11-28 13:19:17 +01:00
parent cc2304e46e
commit d001b2930e
No known key found for this signature in database
GPG Key ID: 9CDBF79098EC04A0
2 changed files with 1766 additions and 942 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1739
src/dependency_injector/_cwiring.c
View File

File diff suppressed because it is too large Load Diff

19
src/dependency_injector/_cwiring.pyx
View File

@ -25,8 +25,9 @@ def _get_sync_patched(fn, patched: PatchedCallable):
if arg_key not in kwargs or isinstance(kwargs[arg_key], _Marker): if arg_key not in kwargs or isinstance(kwargs[arg_key], _Marker):
to_inject[arg_key] = provider() to_inject[arg_key] = provider()
result = fn(*args, **to_inject) try:
return fn(*args, **to_inject)
finally:
if patched.closing: if patched.closing:
for arg_key, provider in patched.closing.items(): for arg_key, provider in patched.closing.items():
if arg_key in kwargs and not isinstance(kwargs[arg_key], _Marker): if arg_key in kwargs and not isinstance(kwargs[arg_key], _Marker):
@ -35,7 +36,6 @@ def _get_sync_patched(fn, patched: PatchedCallable):
continue continue
provider.shutdown() provider.shutdown()
return result
return _patched return _patched
@ -53,7 +53,7 @@ async def _async_inject(object fn, tuple args, dict kwargs, dict injections, dic
provide = provider() provide = provider()
if provider.is_async_mode_enabled(): if provider.is_async_mode_enabled():
to_inject_await.append((arg_key, provide)) to_inject_await.append((arg_key, provide))
elif _isawaitable(provide): elif _is_awaitable(provide):
to_inject_await.append((arg_key, provide)) to_inject_await.append((arg_key, provide))
else: else:
to_inject[arg_key] = provide to_inject[arg_key] = provide
@ -62,9 +62,9 @@ async def _async_inject(object fn, tuple args, dict kwargs, dict injections, dic
async_to_inject = await asyncio.gather(*(provide for _, provide in to_inject_await)) async_to_inject = await asyncio.gather(*(provide for _, provide in to_inject_await))
for provide, (injection, _) in zip(async_to_inject, to_inject_await): for provide, (injection, _) in zip(async_to_inject, to_inject_await):
to_inject[injection] = provide to_inject[injection] = provide
try:
result = await fn(*args, **to_inject) return await fn(*args, **to_inject)
finally:
if closings: if closings:
for arg_key, provider in closings.items(): for arg_key, provider in closings.items():
if arg_key in kwargs and isinstance(kwargs[arg_key], _Marker): if arg_key in kwargs and isinstance(kwargs[arg_key], _Marker):
@ -72,15 +72,14 @@ async def _async_inject(object fn, tuple args, dict kwargs, dict injections, dic
if not isinstance(provider, providers.Resource): if not isinstance(provider, providers.Resource):
continue continue
shutdown = provider.shutdown() shutdown = provider.shutdown()
if _isawaitable(shutdown): if _is_awaitable(shutdown):
to_close_await.append(shutdown) to_close_await.append(shutdown)
await asyncio.gather(*to_close_await) await asyncio.gather(*to_close_await)
return result
cdef bint _isawaitable(object instance): cdef bint _is_awaitable(object instance):
"""Return true if object can be passed to an ``await`` expression.""" """Return true if object can be passed to an ``await`` expression."""
return (isinstance(instance, types.CoroutineType) or return (isinstance(instance, types.CoroutineType) or
isinstance(instance, types.GeneratorType) and isinstance(instance, types.GeneratorType) and