dinkleberg 0.1.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

dinkleberg/dependency_configurator.py

@@ -1,3 +1,4 @@
+import abc
 import asyncio
 import inspect
 import logging
@@ -8,7 +9,7 @@ from typing import AsyncGenerator, Callable, overload, get_type_hints, Mapping,
 from .dependency import Dependency
 from .dependency_scope import DependencyScope
 from .descriptor import Descriptor, Lifetime
-from .typing import get_static_params, get_public_methods
+from .typing import get_static_params, get_public_methods, is_builtin_type
 
 logger = logging.getLogger(__name__)
 
@@ -60,7 +61,7 @@ class DependencyConfigurator(DependencyScope):
     def _add(self, lifetime: Lifetime, *, t: type = None, generator: Callable[..., AsyncGenerator] = None,
              callable: Callable = None):
         if generator is None and callable is None:
-            raise ValueError('Invalid dependency configuration.')
+            raise ValueError('Invalid dependency registration. Either generator or callable must be provided.')
         if t is None:
             t = self._infer_type(generator=generator, callable=callable)
         self._descriptors[t] = Descriptor(generator=generator, callable=callable, lifetime=lifetime)
@@ -103,6 +104,7 @@ class DependencyConfigurator(DependencyScope):
         return None
 
     # TODO circular dependency detection
+    # TODO singleton race condition prevention (async.Lock)
     async def resolve[T](self, t: type[T], **kwargs) -> T:
         self._raise_if_closed()
 
@@ -126,10 +128,15 @@ class DependencyConfigurator(DependencyScope):
             factory = descriptor['generator'] or descriptor['callable']
             deps = await self._resolve_deps(factory)
         else:
-            origin = get_origin(t)
-            if origin is not None:
+            if is_builtin_type(t):
+                raise ValueError(f'Cannot resolve built-in type {t} without explicit registration.')
+
+            if get_origin(t) is not None:
                 raise ValueError(f'Cannot resolve generic type {t} without explicit registration.')
 
+            if inspect.isabstract(t) or t is abc.ABC:
+                raise ValueError(f'Cannot resolve abstract class {t} without explicit registration.')
+
             is_generator = False
             lifetime = 'transient'
             factory = t
@@ -143,9 +150,21 @@ class DependencyConfigurator(DependencyScope):
                 raise RuntimeError(f'Generator {t} did not yield any value.')
 
             self._active_generators.append(generator)
+        elif asyncio.iscoroutinefunction(factory):
+            instance = await factory(**deps, **kwargs)
         else:
             instance = factory(**deps, **kwargs)
 
+        if isinstance(instance, AsyncGenerator):
+            try:
+                if is_generator:
+                    raise RuntimeError(f'Generator {t} yielded another generator. Nested generators are not supported.')
+                else:
+                    raise RuntimeError(
+                        f'Callable {t} returned a generator. This is most likely due to an invalid dependency registration.')
+            finally:
+                await instance.aclose()
+
         self._wrap_instance(instance)
 
         if lifetime == 'singleton':
@@ -164,8 +183,10 @@ class DependencyConfigurator(DependencyScope):
             if not param.annotation or param.annotation is inspect.Parameter.empty:
                 continue
 
+            if is_builtin_type(param.annotation):
+                continue
+
             # TODO handle more complex cases (e.g., Union, Optional, etc.)
-            # TODO handle native types (int, str, etc.)
             names.append(param.name)
             tasks.append(self.resolve(param.annotation))
 
@@ -196,7 +217,7 @@ class DependencyConfigurator(DependencyScope):
 
     # TODO handle __slots__
     def _wrap_instance(self, instance):
-        if getattr(instance, '__di_wrapped__', False):
+        if getattr(instance, '__dinkleberg__', False):
             return
 
         methods = get_public_methods(instance)
@@ -222,7 +243,7 @@ class DependencyConfigurator(DependencyScope):
                 raise NotImplementedError('Synchronous methods with Dependency() defaults are not supported.')
 
         try:
-            setattr(instance, '__di_wrapped__', True)
+            setattr(instance, '__dinkleberg__', True)
         except (AttributeError, TypeError):
             # Some objects (like those with __slots__) might not allow new attributes
             pass
@@ -284,3 +305,15 @@ class DependencyConfigurator(DependencyScope):
                          callable: Callable[..., I] = None):
         self._raise_if_closed()
         self._add('scoped', t=t, generator=generator, callable=callable)
+
+    @overload
+    def add_transient[I](self, *, callable: Callable[..., I]):
+        ...
+
+    @overload
+    def add_transient[T, I](self, *, t: type[T], callable: Callable[..., I]):
+        ...
+
+    def add_transient[T, I](self, *, t: type[T] = None, callable: Callable[..., I] = None):
+        self._raise_if_closed()
+        self._add('transient', t=t, callable=callable)

dinkleberg/typing.py

@@ -1,6 +1,11 @@
 import inspect
 from inspect import Parameter, signature
-from typing import Callable
+from typing import Callable, get_origin
+
+
+def is_builtin_type(t: type) -> bool:
+    origin = get_origin(t) or t
+    return getattr(origin, '__module__', None) in ('builtins', 'typing', 'types')
 
 
 def get_static_params(func: Callable) -> list[Parameter]:

{dinkleberg-0.1.0.dist-info → dinkleberg-0.2.1.dist-info}/METADATA

@@ -1,34 +1,34 @@
-Metadata-Version: 2.4
-Name: dinkleberg
-Version: 0.1.0
-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
-Project-URL: Repository, https://github.com/DavidVollmers/dinkleberg.git
-Project-URL: Issues, https://github.com/DavidVollmers/dinkleberg/issues
-Project-URL: Changelog, https://github.com/DavidVollmers/dinkleberg/blob/main/CHANGELOG.md
-Keywords: automation,dependency,package-management
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.13
-Description-Content-Type: text/markdown
-
-# dinkleberg
-
-> "And this is where I'd put my working dependencies... IF I HAD ANY!"
-
-**dinkleberg** is a lightweight Python utility designed to make dependency management less of a neighborhood feud. Built
-to work seamlessly in any project, it ensures your environment stays green—unlike the guy's next door.
-
-## Installation
-
-```bash
-pip install dinkleberg
-
-uv add dinkleberg
-```
+Metadata-Version: 2.4
+Name: dinkleberg
+Version: 0.2.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
+Project-URL: Repository, https://github.com/DavidVollmers/dinkleberg.git
+Project-URL: Issues, https://github.com/DavidVollmers/dinkleberg/issues
+Project-URL: Changelog, https://github.com/DavidVollmers/dinkleberg/blob/main/CHANGELOG.md
+Keywords: dependency,package-management,automation
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: >=3.13
+Description-Content-Type: text/markdown
+
+# dinkleberg
+
+> "And this is where I'd put my working dependencies... IF I HAD ANY!"
+
+**dinkleberg** is a lightweight Python utility designed to make dependency management less of a neighborhood feud. Built
+to work seamlessly in any project, it ensures your environment stays green—unlike the guy's next door.
+
+## Installation
+
+```bash
+pip install dinkleberg
+
+uv add dinkleberg
+```

dinkleberg-0.2.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+dinkleberg/__init__.py,sha256=HGu8mjYt-Fa0y9_aMtJZFYo3s9Yb0q5dmbMKtHrAV_k,217
+dinkleberg/dependency.py,sha256=YcGvuvhoBRxShgSRaznKyZg49GCgOWy_L8HD0sXAMYo,29
+dinkleberg/dependency_configurator.py,sha256=N0mF78B9HnCKPwhDo4DTt8aDGbLwKEPFqEfo5ZtrrxA,11877
+dinkleberg/dependency_scope.py,sha256=sufXjQ6F62ZfohItUnrV7Fvh8gSSc7a6orO6PXu19Vw,318
+dinkleberg/descriptor.py,sha256=mVI00K1M2m4Rl5ANatGMeB_HpzeFONoULwg0UmNxfQ0,313
+dinkleberg/typing.py,sha256=_T2plzKBU_GTMNazpU8bqKuqTvQotJPuWEHQH2dF76g,841
+dinkleberg-0.2.1.dist-info/METADATA,sha256=Mv6RezK3xmMBpnRY0DKkwXSxPnm6mTezMRcMWFMiNs8,1430
+dinkleberg-0.2.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dinkleberg-0.2.1.dist-info/top_level.txt,sha256=6TjbaJ_eyRzoxzz2r1Eu0hgYfxBBM2bOV3u_TJ8yjjw,11
+dinkleberg-0.2.1.dist-info/RECORD,,

{dinkleberg-0.1.0.dist-info → dinkleberg-0.2.1.dist-info}/WHEEL

@@ -1,4 +1,5 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.28.0
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
+

dinkleberg-0.2.1.dist-info/top_level.txt

@@ -0,0 +1 @@
+dinkleberg

dinkleberg-0.1.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-dinkleberg/__init__.py,sha256=HGu8mjYt-Fa0y9_aMtJZFYo3s9Yb0q5dmbMKtHrAV_k,217
-dinkleberg/dependency.py,sha256=YcGvuvhoBRxShgSRaznKyZg49GCgOWy_L8HD0sXAMYo,29
-dinkleberg/dependency_configurator.py,sha256=IeGSUUbaaxbcb1I6NcIqWyqGs0iWygVzjXzsj0VmOGg,10473
-dinkleberg/dependency_scope.py,sha256=sufXjQ6F62ZfohItUnrV7Fvh8gSSc7a6orO6PXu19Vw,318
-dinkleberg/descriptor.py,sha256=mVI00K1M2m4Rl5ANatGMeB_HpzeFONoULwg0UmNxfQ0,313
-dinkleberg/typing.py,sha256=9AGDNz_aQ8p7ToyJwkj2fg92o0L3-zXwZBEmoTNS1to,670
-dinkleberg-0.1.0.dist-info/METADATA,sha256=vU4SQ-0fafwgtOETUAtr_-zuPTEJX4Haesa4i8OT8L8,1396
-dinkleberg-0.1.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-dinkleberg-0.1.0.dist-info/RECORD,,