dinkleberg 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

dinkleberg/dependency_configurator.py

@@ -1,6 +1,7 @@
 import asyncio
 import inspect
 import logging
+from functools import wraps
 from inspect import Signature
 from types import MappingProxyType
 from typing import AsyncGenerator, Callable, overload, get_type_hints, Mapping, get_origin
@@ -135,9 +136,15 @@ class DependencyConfigurator(DependencyScope):
 
     # TODO circular dependency detection
     # TODO singleton race condition prevention (async.Lock)
-    async def resolve[T](self, t: type[T], **kwargs) -> T:
+    async def resolve[T](self, t: type[T] | Callable, **kwargs) -> T:
         self._raise_if_closed()
 
+        if not inspect.isclass(t):
+            if not inspect.isfunction(t):
+                raise ValueError(f'Cannot resolve type {t}. Only classes and functions are supported.')
+
+            return self._wrap_func(t)
+
         if t == DependencyScope:
             return self
 
@@ -249,6 +256,28 @@ class DependencyConfigurator(DependencyScope):
 
         return actual_kwargs
 
+    def _wrap_func(self, func: Callable):
+        signature = inspect.signature(func)
+
+        dep_params = MappingProxyType({
+            param_name: param
+            for param_name, param in signature.parameters.items()
+            if isinstance(param.default, Dependency)
+        })
+
+        if not dep_params:
+            return func
+
+        if not asyncio.iscoroutinefunction(func):
+            raise NotImplementedError('Synchronous functions with Dependency() defaults are not supported.')
+
+        @wraps(func)
+        async def wrapped_func(*args, **kwargs):
+            new_kwargs = await self._resolve_kwargs(signature, func.__name__, args, kwargs, dep_params)
+            return await func(*args, **new_kwargs)
+
+        return wrapped_func
+
     # TODO handle __slots__
     def _wrap_instance(self, instance):
         if getattr(instance, '__dinkleberg__', False):
@@ -256,25 +285,11 @@ class DependencyConfigurator(DependencyScope):
 
         methods = get_public_methods(instance)
         for name, value in methods:
-            signature = inspect.signature(value)
-
-            dep_params = MappingProxyType({
-                param_name: param
-                for param_name, param in signature.parameters.items()
-                if isinstance(param.default, Dependency)
-            })
-            if not dep_params:
-                continue
-
             instance_method = getattr(instance, name)
-            if asyncio.iscoroutinefunction(instance_method):
-                async def wrapped_method(*args, __m=instance_method, __s=signature, __n=name, __d=dep_params, **kwargs):
-                    new_kwargs = await self._resolve_kwargs(__s, __n, args, kwargs, __d)
-                    return await __m(*args, **new_kwargs)
 
-                setattr(instance, name, wrapped_method)
-            else:
-                raise NotImplementedError('Synchronous methods with Dependency() defaults are not supported.')
+            wrapped_method = self._wrap_func(instance_method)
+
+            setattr(instance, name, wrapped_method)
 
         try:
             setattr(instance, '__dinkleberg__', True)

{dinkleberg-0.3.0.dist-info → dinkleberg-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dinkleberg
-Version: 0.3.0
+Version: 0.3.1
 Summary: Your friendly neighbour when it comes to dependency management.
 Project-URL: Homepage, https://github.com/DavidVollmers/dinkleberg
 Project-URL: Documentation, https://github.com/DavidVollmers/dinkleberg/blob/main/libs/dinkleberg/README.md

{dinkleberg-0.3.0.dist-info → dinkleberg-0.3.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 dinkleberg/__init__.py,sha256=6gowHoL3xTWd2iyU09upgjXKUv_WWp6Tw1iqw2uz7Vc,192
-dinkleberg/dependency_configurator.py,sha256=vsXTHFUkhW5_bR95qFYOzaio-UwupIkS9qjPL2e8s4o,14356
+dinkleberg/dependency_configurator.py,sha256=gSuizzr28qwO9Q5Z1IYytxaIRB5dAAKiPKe3GozKUuk,14660
 dinkleberg/descriptor.py,sha256=ZtVwJihvCLugakHx201iX7Jm4A50Z0SzPu9zeHfD320,349
 dinkleberg/typing.py,sha256=qAdSQomntQfI4bSWc9X32DXGftuyj56WP7nG3Pia7ZE,942
 dinkleberg/fastapi/__init__.py,sha256=boj1ywpWhuuOjHLwdUha2EPBG2f1zbc374N35k1CJxk,352
-dinkleberg-0.3.0.dist-info/METADATA,sha256=sGBRFKAmbtQS1vc79a5tyotUivlciNlhZAbwYqSC1FQ,1555
-dinkleberg-0.3.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-dinkleberg-0.3.0.dist-info/top_level.txt,sha256=6TjbaJ_eyRzoxzz2r1Eu0hgYfxBBM2bOV3u_TJ8yjjw,11
-dinkleberg-0.3.0.dist-info/RECORD,,
+dinkleberg-0.3.1.dist-info/METADATA,sha256=zK12ZPnFptOjz9QiF8i13yqHnG2UtWz1qSMzUkzE8rQ,1555
+dinkleberg-0.3.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dinkleberg-0.3.1.dist-info/top_level.txt,sha256=6TjbaJ_eyRzoxzz2r1Eu0hgYfxBBM2bOV3u_TJ8yjjw,11
+dinkleberg-0.3.1.dist-info/RECORD,,