pico-ioc 2.0.2__py3-none-any.whl → 2.0.4__py3-none-any.whl

pico_ioc/__init__.py

@@ -11,6 +11,7 @@ from .exceptions import (
     ValidationError,
     InvalidBindingError,
     EventBusClosedError,
+    AsyncResolutionError,
 )
 from .api import (
     component,
@@ -51,6 +52,7 @@ __all__ = [
     "SerializationError",
     "ValidationError",
     "InvalidBindingError",
+    "AsyncResolutionError",
     "EventBusClosedError",
     "component",
     "factory",

pico_ioc/_version.py

@@ -1 +1 @@
-__version__ = '2.0.2'
+__version__ = '2.0.4'

pico_ioc/api.py

@@ -409,14 +409,24 @@ def _resolve_args(callable_obj: Callable[..., Any], pico: "PicoContainer") -> Di
     try:
         for kind, name, data in plan:
             if kind == "key":
-                tracer.note_param(data if isinstance(data, (str, type)) else name, name)
-                kwargs[name] = pico.get(data)
+                primary_key = data
+                tracer.note_param(primary_key, name)
+                try:
+                    kwargs[name] = pico.get(primary_key)
+                except ProviderNotFoundError as first_error:
+                    if primary_key != name:
+                        try:
+                            kwargs[name] = pico.get(name)
+                        except ProviderNotFoundError:
+                            raise first_error from None
+                    else:
+                        raise first_error from None
             else:
                 vals = [pico.get(k) for k in data]
                 kwargs[name] = vals
     finally:
         tracer.restore_via(prev)
-    return kwargs
+    return kwargsresol
 
 def _needs_async_configure(obj: Any) -> bool:
     for _, m in inspect.getmembers(obj, predicate=inspect.ismethod):
@@ -574,7 +584,7 @@ class Registrar:
             deferred.attach(pico, locator)
         for key, md in list(self._metadata.items()):
             if md.lazy:
-                original = self._factory.get(key)
+                original = self._factory.get(key, origin='lazy')
                 def lazy_proxy_provider(_orig=original, _p=pico):
                     return UnifiedComponentProxy(container=_p, object_creator=_orig)
                 self._factory.bind(key, lazy_proxy_provider)

pico_ioc/container.py

@@ -4,7 +4,7 @@ import contextvars
 from typing import Any, Dict, List, Optional, Tuple, overload, Union
 from contextlib import contextmanager
 from .constants import LOGGER, PICO_META
-from .exceptions import CircularDependencyError, ComponentCreationError, ProviderNotFoundError
+from .exceptions import CircularDependencyError, ComponentCreationError, ProviderNotFoundError, AsyncResolutionError
 from .factory import ComponentFactory
 from .locator import ComponentLocator
 from .scope import ScopedCaches, ScopeManager
@@ -173,85 +173,88 @@ class PicoContainer:
                     return k
         return key
 
-    @overload
-    def get(self, key: type) -> Any: ...
-    @overload
-    def get(self, key: str) -> Any: ...
-    def get(self, key: KeyT) -> Any:
+    def _resolve_or_create_internal(self, key: KeyT) -> Tuple[Any, float, bool]:
         key = self._canonical_key(key)
         cache = self._cache_for(key)
         cached = cache.get(key)
         if cached is not None:
             self.context.cache_hit_count += 1
             for o in self._observers: o.on_cache_hit(key)
-            return cached
+            return cached, 0.0, True
+
         import time as _tm
         t0 = _tm.perf_counter()
         chain = list(_resolve_chain.get())
-        for k in chain:
-            if k == key:
+
+        for k_in_chain in chain:
+            if k_in_chain == key:
                 details = self._tracer.describe_cycle(tuple(chain), key, self._locator)
                 raise ComponentCreationError(key, CircularDependencyError(chain, key, details=details))
+
         token_chain = _resolve_chain.set(tuple(chain + [key]))
         token_container = self.activate()
         token_tracer = self._tracer.enter(key, via="provider")
+
+        requester = chain[-1] if chain else None
+        instance_or_awaitable = None
+
         try:
-            provider = self._factory.get(key)
+            provider = self._factory.get(key, origin=requester)
             try:
-                instance = provider()
+                instance_or_awaitable = provider()
             except ProviderNotFoundError as e:
                 raise
-            except Exception as e:
-                raise ComponentCreationError(key, e) from e
-            instance = self._maybe_wrap_with_aspects(key, instance)
-            cache.put(key, instance)
-            self.context.resolve_count += 1
+            except Exception as creation_error:
+                raise ComponentCreationError(key, creation_error) from creation_error
+
             took_ms = (_tm.perf_counter() - t0) * 1000
-            for o in self._observers: o.on_resolve(key, took_ms)
-            return instance
+            return instance_or_awaitable, took_ms, False
+
         finally:
             self._tracer.leave(token_tracer)
             _resolve_chain.reset(token_chain)
             self.deactivate(token_container)
+            
+    @overload
+    def get(self, key: type) -> Any: ...
+    @overload
+    def get(self, key: str) -> Any: ...
+    def get(self, key: KeyT) -> Any:
+        instance_or_awaitable, took_ms, was_cached = self._resolve_or_create_internal(key)
+
+        if was_cached:
+            return instance_or_awaitable
+
+        instance = instance_or_awaitable
+        if inspect.isawaitable(instance):
+            key_name = getattr(key, '__name__', str(key))
+            raise AsyncResolutionError(key)
+
+        final_instance = self._maybe_wrap_with_aspects(key, instance)
+        cache = self._cache_for(key)
+        cache.put(key, final_instance)
+        self.context.resolve_count += 1
+        for o in self._observers: o.on_resolve(key, took_ms)
+
+        return final_instance
 
     async def aget(self, key: KeyT) -> Any:
-        key = self._canonical_key(key)
+        instance_or_awaitable, took_ms, was_cached = self._resolve_or_create_internal(key)
+
+        if was_cached:
+            return instance_or_awaitable
+
+        instance = instance_or_awaitable
+        if inspect.isawaitable(instance_or_awaitable):
+            instance = await instance_or_awaitable
+
+        final_instance = self._maybe_wrap_with_aspects(key, instance)
         cache = self._cache_for(key)
-        cached = cache.get(key)
-        if cached is not None:
-            self.context.cache_hit_count += 1
-            for o in self._observers: o.on_cache_hit(key)
-            return cached
-        import time as _tm
-        t0 = _tm.perf_counter()
-        chain = list(_resolve_chain.get())
-        for k in chain:
-            if k == key:
-                details = self._tracer.describe_cycle(tuple(chain), key, self._locator)
-                raise ComponentCreationError(key, CircularDependencyError(chain, key, details=details))
-        token_chain = _resolve_chain.set(tuple(chain + [key]))
-        token_container = self.activate()
-        token_tracer = self._tracer.enter(key, via="provider")
-        try:
-            provider = self._factory.get(key)
-            try:
-                instance = provider()
-                if inspect.isawaitable(instance):
-                    instance = await instance
-            except ProviderNotFoundError as e:
-                raise
-            except Exception as e:
-                raise ComponentCreationError(key, e) from e
-            instance = self._maybe_wrap_with_aspects(key, instance)
-            cache.put(key, instance)
-            self.context.resolve_count += 1
-            took_ms = (_tm.perf_counter() - t0) * 1000
-            for o in self._observers: o.on_resolve(key, took_ms)
-            return instance
-        finally:
-            self._tracer.leave(token_tracer)
-            _resolve_chain.reset(token_chain)
-            self.deactivate(token_container)
+        cache.put(key, final_instance)
+        self.context.resolve_count += 1
+        for o in self._observers: o.on_resolve(key, took_ms)
+
+        return final_instance
 
     def _resolve_type_key(self, key: type):
         if not self._locator:

pico_ioc/exceptions.py

@@ -4,9 +4,15 @@ class PicoError(Exception):
     pass
 
 class ProviderNotFoundError(PicoError):
-    def __init__(self, key: Any):
-        super().__init__(f"Provider not found for key: {getattr(key, '__name__', key)}")
+    def __init__(self, key: Any, origin: Any | None = None):
+        key_name = getattr(key, '__name__', str(key))
+        origin_name = getattr(origin, '__name__', str(origin)) if origin else "init"
+        super().__init__(
+            f"Provider for key '{key_name}' not found "
+            f"(required by: '{origin_name}')"
+        )
         self.key = key
+        self.origin = origin
 
 class CircularDependencyError(PicoError):
     def __init__(self, chain: Iterable[Any], current: Any, details: str | None = None, hint: str | None = None):
@@ -51,6 +57,15 @@ class InvalidBindingError(ValidationError):
         super().__init__("Invalid bindings:\n" + "\n".join(f"- {e}" for e in errors))
         self.errors = errors
 
+class AsyncResolutionError(PicoError):
+    def __init__(self, key: Any):
+        key_name = getattr(key, '__name__', str(key))
+        super().__init__(
+            f"Synchronous get() received an awaitable for key '{key_name}'. "
+            "Use aget() instead."
+        )
+        self.key = key
+        
 class EventBusError(PicoError):
     def __init__(self, msg: str):
         super().__init__(msg)

pico_ioc/factory.py

@@ -28,9 +28,9 @@ class ComponentFactory:
         self._providers[key] = provider
     def has(self, key: KeyT) -> bool:
         return key in self._providers
-    def get(self, key: KeyT) -> Provider:
+    def get(self, key: KeyT, origin: KeyT) -> Provider:
         if key not in self._providers:
-            raise ProviderNotFoundError(key)
+            raise ProviderNotFoundError(key, origin)
         return self._providers[key]
 
 class DeferredProvider:

{pico_ioc-2.0.2.dist-info → pico_ioc-2.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pico-ioc
-Version: 2.0.2
+Version: 2.0.4
 Summary: A minimalist, zero-dependency Inversion of Control (IoC) container for Python.
 Author-email: David Perez Cabrera <dperezcabrera@gmail.com>
 License: MIT License

pico_ioc-2.0.4.dist-info/RECORD

@@ -0,0 +1,17 @@
+pico_ioc/__init__.py,sha256=x7Sg0i4P0aXN3L5WH9IoTkyELPk-NQBdaRq8GuoZqO4,2294
+pico_ioc/_version.py,sha256=YuAuFLBrpl-SUl_UsvW1U1NTjqnldfuD1xUmSLmtaRw,22
+pico_ioc/aop.py,sha256=prFSlZC6vJYUfTbkMvlSc1T9UvvdEHr94Z0HAvjZ1fg,12985
+pico_ioc/api.py,sha256=vcmdU_7HHlsHR50N6230ICICIO-AhQ6M0xs2AzYMVVk,47476
+pico_ioc/config_runtime.py,sha256=z1cHDb5PbM8PMLYRFf5c2dmze8V22xwEzpWcBhtmMpA,11950
+pico_ioc/constants.py,sha256=AhIt0ieDZ9Turxb_YbNzj11wUbBbzjKfWh1BDlSx2Nw,183
+pico_ioc/container.py,sha256=-0o3T2uiKCnYVHTXP4MnUnA-atNeITjz0CtvUc_rY_E,17237
+pico_ioc/event_bus.py,sha256=E8Qb8KZ6K1CuXSbMlG0MNPHkGoWlssLLPzHq1QYdADQ,8346
+pico_ioc/exceptions.py,sha256=PnIY60r8O-eYXEVk7XPghz-hHNx_012ZLw9ikDwQhqQ,3019
+pico_ioc/factory.py,sha256=RMJJrD91HJdb7R3C6y48Fnia7YRQnQuMuYTC2cIAm34,1579
+pico_ioc/locator.py,sha256=PBxZYO_xCOxG7aJZ0adDtINrJass_ZDNYmPD2O_oNqM,2401
+pico_ioc/scope.py,sha256=GDsDJWw7e5Vpiys-M4vQfKMJWSCiorRsT5cPo6z34Mk,5924
+pico_ioc-2.0.4.dist-info/licenses/LICENSE,sha256=N1_nOvHTM6BobYnOTNXiQkroDqCEi6EzfGBv8lWtyZ0,1077
+pico_ioc-2.0.4.dist-info/METADATA,sha256=tvJtJVxclklqQcQ9_k4cB4VPtsog2tWfngm_-z8TEa4,8741
+pico_ioc-2.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pico_ioc-2.0.4.dist-info/top_level.txt,sha256=_7_RLu616z_dtRw16impXn4Mw8IXe2J4BeX5912m5dQ,9
+pico_ioc-2.0.4.dist-info/RECORD,,

pico_ioc-2.0.2.dist-info/RECORD

@@ -1,17 +0,0 @@
-pico_ioc/__init__.py,sha256=mx1AVEZ-m0jntrWlMJGKQn_kaVVrKBY1NVYG8utT6yI,2240
-pico_ioc/_version.py,sha256=kumiGImhzOTlTrRM-6jDo2mNnVHGO_2vxtrhB0nzAiw,22
-pico_ioc/aop.py,sha256=prFSlZC6vJYUfTbkMvlSc1T9UvvdEHr94Z0HAvjZ1fg,12985
-pico_ioc/api.py,sha256=mVS-Y4amJ_k-GPy9RUldpHNWDcEvj5ZLkf5DimdMzB4,47045
-pico_ioc/config_runtime.py,sha256=z1cHDb5PbM8PMLYRFf5c2dmze8V22xwEzpWcBhtmMpA,11950
-pico_ioc/constants.py,sha256=AhIt0ieDZ9Turxb_YbNzj11wUbBbzjKfWh1BDlSx2Nw,183
-pico_ioc/container.py,sha256=5hLPwoVNY_PsN6XYbbZ6_j1I8IBnteCcahus1vCI_JY,17514
-pico_ioc/event_bus.py,sha256=E8Qb8KZ6K1CuXSbMlG0MNPHkGoWlssLLPzHq1QYdADQ,8346
-pico_ioc/exceptions.py,sha256=GT8flzyXeUWetguc8RRkB4p56waTXMdeNhSKQQ8rh4w,2468
-pico_ioc/factory.py,sha256=Q3aLwZ-MWbXKjm8unr871vlWSeVUDmzFQZ1mXzPkY5I,1557
-pico_ioc/locator.py,sha256=PBxZYO_xCOxG7aJZ0adDtINrJass_ZDNYmPD2O_oNqM,2401
-pico_ioc/scope.py,sha256=GDsDJWw7e5Vpiys-M4vQfKMJWSCiorRsT5cPo6z34Mk,5924
-pico_ioc-2.0.2.dist-info/licenses/LICENSE,sha256=N1_nOvHTM6BobYnOTNXiQkroDqCEi6EzfGBv8lWtyZ0,1077
-pico_ioc-2.0.2.dist-info/METADATA,sha256=lLkoQGYiIygMjZ9TauYNSZJjRHyGjuaE4e19oUJemx4,8741
-pico_ioc-2.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pico_ioc-2.0.2.dist-info/top_level.txt,sha256=_7_RLu616z_dtRw16impXn4Mw8IXe2J4BeX5912m5dQ,9
-pico_ioc-2.0.2.dist-info/RECORD,,