pico-ioc 2.1.0__py3-none-any.whl → 2.1.1__py3-none-any.whl

pico_ioc/__init__.py

@@ -29,7 +29,7 @@ from .factory import ComponentFactory, ProviderMetadata, DeferredProvider
 from .aop import MethodCtx, MethodInterceptor, intercepted_by, UnifiedComponentProxy, health, ContainerObserver
 from .container import PicoContainer
 from .event_bus import EventBus, ExecPolicy, ErrorPolicy, Event, subscribe, AutoSubscriberMixin
-from .config_runtime import JsonTreeSource, YamlTreeSource, DictSource, Discriminator
+from .config_runtime import JsonTreeSource, YamlTreeSource, DictSource, Discriminator, Value
 from .analysis import DependencyRequest, analyze_callable_dependencies
 
 __all__ = [
@@ -88,6 +88,7 @@ __all__ = [
     "YamlTreeSource",
     "DictSource",
     "Discriminator",
+    "Value",
     "DependencyRequest",
     "analyze_callable_dependencies",
 ]

pico_ioc/_version.py

@@ -1 +1 @@
-__version__ = '2.1.0'
+__version__ = '2.1.1'

pico_ioc/aop.py

@@ -1,8 +1,10 @@
+# src/pico_ioc/aop.py
+
 import inspect
 import pickle
 import threading
 from typing import Any, Callable, Dict, List, Tuple, Protocol, Union
-from .exceptions import SerializationError
+from .exceptions import SerializationError, AsyncResolutionError
 
 KeyT = Union[str, type]
 
@@ -119,9 +121,19 @@ class UnifiedComponentProxy:
             tgt = creator()
             if tgt is None:
                 raise RuntimeError("UnifiedComponentProxy object_creator returned None")
+
+            container = object.__getattribute__(self, "_container")
+            if container and hasattr(container, "_run_configure_methods"):
+                res = container._run_configure_methods(tgt)
+                if inspect.isawaitable(res):
+                    raise AsyncResolutionError(
+                        f"Lazy component {type(tgt).__name__} requires async "
+                        "@configure but was resolved via sync get()"
+                    )
+
             object.__setattr__(self, "_target", tgt)
             return tgt
-    
+        
     def _scope_signature(self) -> Tuple[Any, ...]:
         container = object.__getattribute__(self, "_container")
         target = object.__getattribute__(self, "_target")
@@ -138,7 +150,7 @@ class UnifiedComponentProxy:
                         return ()
                     return (container.scopes.get_id(sc),)
         return ()
-    
+        
     def _build_wrapped(self, name: str, bound: Callable[..., Any], interceptors_cls: Tuple[type, ...]):
         container = object.__getattribute__(self, "_container")
         interceptors = [container.get(cls) for cls in interceptors_cls]
@@ -182,11 +194,11 @@ class UnifiedComponentProxy:
                     raise RuntimeError(f"Async interceptor returned awaitable on sync method: {name}")
                 return res
             return sig, sw, interceptors_cls
-    
+        
     @property
     def __class__(self):
         return self._get_real_object().__class__
-    
+        
     def __getattr__(self, name: str) -> Any:
         target = self._get_real_object()
         attr = getattr(target, name)
@@ -211,7 +223,7 @@ class UnifiedComponentProxy:
             sig, wrapped, cls_tuple = self._build_wrapped(name, attr, interceptors_cls)
             cache[name] = (sig, wrapped, cls_tuple)
             return wrapped
-    
+        
     def __setattr__(self, name, value): setattr(self._get_real_object(), name, value)
     def __delattr__(self, name): delattr(self._get_real_object(), name)
     def __str__(self): return str(self._get_real_object())
@@ -275,4 +287,3 @@ class UnifiedComponentProxy:
             return (pickle.loads, (data,))
         except Exception as e:
             raise SerializationError(f"Proxy target is not serializable: {e}")
-

pico_ioc/api.py

@@ -1,8 +1,10 @@
+# src/pico_ioc/api.py
+
 import importlib
 import pkgutil
 import logging
 import inspect
-from typing import Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Union, Protocol
+from typing import Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Union
 from .exceptions import ConfigurationError, InvalidBindingError
 from .factory import ComponentFactory, ProviderMetadata
 from .locator import ComponentLocator
@@ -10,6 +12,7 @@ from .scope import ScopeManager, ScopedCaches
 from .container import PicoContainer
 from .decorators import component, factory, provides, Qualifier, configure, cleanup, configured
 from .config_builder import ContextConfig, configuration
+from .registrar import Registrar
 
 KeyT = Union[str, type]
 Provider = Callable[[], Any]
@@ -26,7 +29,6 @@ def _iter_input_modules(inputs: Union[Any, Iterable[Any]]) -> Iterable[Any]:
             mod = importlib.import_module(it)
         else:
             mod = it
-        
         if hasattr(mod, "__path__"):
             for sub in _scan_package(mod):
                 name = getattr(sub, "__name__", None)
@@ -49,28 +51,37 @@ def _normalize_override_provider(v: Any):
         return (lambda f=v: f()), False
     return (lambda inst=v: inst), False
 
-def init(modules: Union[Any, Iterable[Any]], *, profiles: Tuple[str, ...] = (), allowed_profiles: Optional[Iterable[str]] = None, environ: Optional[Dict[str, str]] = None, overrides: Optional[Dict[KeyT, Any]] = None, logger: Optional[logging.Logger] = None, config: Optional[ContextConfig] = None, custom_scopes: Optional[Dict[str, "ScopeProtocol"]] = None, validate_only: bool = False, container_id: Optional[str] = None, observers: Optional[List["ContainerObserver"]] = None,) -> PicoContainer:
-    from .registrar import Registrar
-
+def init(
+    modules: Union[Any, Iterable[Any]],
+    *,
+    profiles: Tuple[str, ...] = (),
+    allowed_profiles: Optional[Iterable[str]] = None,
+    environ: Optional[Dict[str, str]] = None,
+    overrides: Optional[Dict[KeyT, Any]] = None,
+    logger: Optional[logging.Logger] = None,
+    config: Optional[ContextConfig] = None,
+    custom_scopes: Optional[Iterable[str]] = None,
+    validate_only: bool = False,
+    container_id: Optional[str] = None,
+    observers: Optional[List["ContainerObserver"]] = None,
+) -> PicoContainer:
     active = tuple(p.strip() for p in profiles if p)
-    allowed_set = set(a.strip() for a in allowed_profiles) if allowed_profiles is not None else None
     
+    allowed_set = set(a.strip() for a in allowed_profiles) if allowed_profiles is not None else None
     if allowed_set is not None:
         unknown = set(active) - allowed_set
         if unknown:
             raise ConfigurationError(f"Unknown profiles: {sorted(unknown)}; allowed: {sorted(allowed_set)}")
-    
+            
     factory = ComponentFactory()
     caches = ScopedCaches()
     scopes = ScopeManager()
-    
     if custom_scopes:
-        for n, impl in custom_scopes.items():
-            scopes.register_scope(n, impl)
+        for name in custom_scopes:
+            scopes.register_scope(name)
             
     pico = PicoContainer(factory, caches, scopes, container_id=container_id, profiles=active, observers=observers or [])
     registrar = Registrar(factory, profiles=active, environ=environ, logger=logger, config=config)
-    
     for m in _iter_input_modules(modules):
         registrar.register_module(m)
         
@@ -79,8 +90,7 @@ def init(modules: Union[Any, Iterable[Any]], *, profiles: Tuple[str, ...] = (),
             prov, _ = _normalize_override_provider(v)
             factory.bind(k, prov)
             
-    registrar.finalize(overrides)
-    
+    registrar.finalize(overrides, pico_instance=pico)
     if validate_only:
         locator = registrar.locator()
         pico.attach_locator(locator)
@@ -91,13 +101,39 @@ def init(modules: Union[Any, Iterable[Any]], *, profiles: Tuple[str, ...] = (),
     registrar.attach_runtime(pico, locator)
     pico.attach_locator(locator)
     _fail_fast_cycle_check(pico)
+    
+    if not validate_only:
+        eager_singletons = []
+        for key, md in locator._metadata.items():
+            if md.scope == "singleton" and not md.lazy:
+                cache = pico._cache_for(key)
+                instance = cache.get(key)
+                if instance is None:
+                    instance = pico.get(key)
+                    eager_singletons.append(instance)
+                else:
+                    eager_singletons.append(instance)
+                    
+        configure_awaitables = []
+        for instance in eager_singletons:
+            res = pico._run_configure_methods(instance)
+            if inspect.isawaitable(res):
+                configure_awaitables.append(res)
+                
+        if configure_awaitables:
+            raise ConfigurationError(
+                "Sync init() found eagerly loaded singletons with async @configure methods. "
+                "This can be caused by an async __ainit__ or async @configure. "
+                "Use an async main function and await pico.aget() for those components, "
+                "or mark them as lazy=True."
+            )
+
     return pico
 
 def _find_cycle(graph: Dict[KeyT, Tuple[KeyT, ...]]) -> Optional[Tuple[KeyT, ...]]:
     temp: Set[KeyT] = set()
     perm: Set[KeyT] = set()
     stack: List[KeyT] = []
-    
     def visit(n: KeyT) -> Optional[Tuple[KeyT, ...]]:
         if n in perm:
             return None
@@ -107,20 +143,16 @@ def _find_cycle(graph: Dict[KeyT, Tuple[KeyT, ...]]) -> Optional[Tuple[KeyT, ...
                 return tuple(stack[idx:] + [n])
             except ValueError:
                 return tuple([n, n])
-                
         temp.add(n)
         stack.append(n)
-        
         for m in graph.get(n, ()):
             c = visit(m)
             if c:
                 return c
-                
         stack.pop()
         temp.remove(n)
         perm.add(n)
         return None
-        
     for node in graph.keys():
         c = visit(node)
         if c:

pico_ioc/config_builder.py

@@ -3,13 +3,9 @@ import json
 from dataclasses import dataclass
 from typing import Any, Optional, Protocol, Mapping, List, Tuple, Dict, Union
 
-from .config_runtime import TreeSource, DictSource, JsonTreeSource, YamlTreeSource
+from .config_runtime import TreeSource, DictSource, JsonTreeSource, YamlTreeSource, Value
 from .exceptions import ConfigurationError
 
-class Value:
-    def __init__(self, value: Any):
-        self.value = value
-
 class ConfigSource(Protocol):
     pass
 

pico_ioc/config_registrar.py

@@ -4,7 +4,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, Union, get_args,
 from .constants import PICO_INFRA, PICO_NAME, PICO_META
 from .exceptions import ConfigurationError
 from .factory import ProviderMetadata, DeferredProvider
-from .config_builder import ContextConfig, ConfigSource, FlatDictSource
+from .config_builder import ContextConfig, ConfigSource, FlatDictSource, Value
 from .config_runtime import ConfigResolver, TypeAdapterRegistry, ObjectGraphBuilder, TreeSource
 from .analysis import analyze_callable_dependencies, DependencyRequest
 
@@ -68,6 +68,22 @@ class ConfigurationManager:
             raise ConfigurationError(f"Configuration class {getattr(cls, '__name__', str(cls))} must be a dataclass")
         values: Dict[str, Any] = {}
         for f in fields(cls):
+            field_type = f.type
+            value_override = None
+            
+            if get_origin(field_type) is Annotated:
+                args = get_args(field_type)
+                field_type = args[0] if args else Any
+                metas = args[1:] if len(args) > 1 else ()
+                for m in metas:
+                    if isinstance(m, Value):
+                        value_override = m.value
+                        break
+            
+            if value_override is not None:
+                values[f.name] = value_override
+                continue
+            
             base_key = _upper_key(f.name)
             keys_to_try = []
             if prefix:
@@ -84,7 +100,7 @@ class ConfigurationManager:
                 if f.default is not MISSING or f.default_factory is not MISSING:
                     continue
                 raise ConfigurationError(f"Missing configuration key: {(prefix or '') + base_key}")
-            values[f.name] = _coerce(raw, f.type if isinstance(f.type, type) or get_origin(f.type) else str)
+            values[f.name] = _coerce(raw, field_type if isinstance(field_type, type) or get_origin(field_type) else str)
         return cls(**values)
     
     def _auto_detect_mapping(self, target_type: type) -> str:
@@ -159,7 +175,7 @@ class ConfigurationManager:
                 factory_method=None,
                 qualifiers=qset,
                 primary=True,
-                lazy=False,
+                lazy=bool(meta.get("lazy", False)),
                 infra="configured",
                 pico_name=prefix,
                 scope=sc,
@@ -180,7 +196,7 @@ class ConfigurationManager:
                 factory_method=None,
                 qualifiers=qset,
                 primary=True,
-                lazy=False,
+                lazy=bool(meta.get("lazy", False)),
                 infra="configured",
                 pico_name=prefix,
                 scope=sc,
@@ -217,3 +233,4 @@ class ConfigurationManager:
             prefix = md.pico_name or ""
             keys = [_upper_key(f.name) for f in fields(target_type)]
             return any(self._lookup_flat(prefix + k) is not None for k in keys)
+

pico_ioc/config_runtime.py

@@ -8,6 +8,10 @@ from typing import Any, Dict, Iterable, List, Mapping, Optional, Tuple, Union, g
 from .exceptions import ConfigurationError
 from .constants import PICO_META
 
+class Value:
+    def __init__(self, value: Any):
+        self.value = value
+
 class Discriminator:
     def __init__(self, name: str):
         self.name = name
@@ -160,8 +164,8 @@ class ObjectGraphBuilder:
         org = get_origin(t)
         
         if org is Annotated:
-            base, meta = self._split_annotated(t)
-            return self._build_discriminated(node, base, meta, path)
+            base, metas = self._split_annotated(t)
+            return self._build_discriminated(node, base, metas, path)
             
         if org in (list, List):
             elem_t = get_args(t)[0] if get_args(t) else Any
@@ -255,20 +259,42 @@ class ObjectGraphBuilder:
         
     def _build_discriminated(self, node: Any, base: Any, metas: Tuple[Any, ...], path: Tuple[str, ...]) -> Any:
         disc_name = None
+        disc_value = None
+        has_value = False
+
         for m in metas:
             if isinstance(m, Discriminator):
                 disc_name = m.name
-                break
-                
-        if disc_name and isinstance(node, dict) and disc_name in node:
-            if get_origin(base) is Union:
-                tn = str(node[disc_name])
-                for cand in get_args(base):
-                    if isinstance(cand, type) and getattr(cand, "__name__", "") == tn:
-                        cleaned = {k: v for k, v in node.items() if k != disc_name}
-                        return self._build(cleaned, cand, path)
-                raise ConfigurationError(f"Discriminator {disc_name} did not match at {'.'.join(path)}")
-                
+            if isinstance(m, Value):
+                disc_value = m.value
+                has_value = True
+
+        tn: Optional[str] = None
+
+        if disc_name and has_value:
+            tn = str(disc_value)
+        elif disc_name and isinstance(node, dict) and disc_name in node:
+            tn = str(node[disc_name])
+        
+        if tn is not None and get_origin(base) is Union:
+            for cand in get_args(base):
+                if isinstance(cand, type) and getattr(cand, "__name__", "") == tn:
+                    
+                    cleaned_node = {k: v for k, v in node.items() if k != disc_name}
+                    
+                    if has_value:
+                        cleaned_node[disc_name] = tn
+                    
+                    return self._build(cleaned_node, cand, path)
+            
+            raise ConfigurationError(
+                f"Discriminator value '{tn}' for field '{disc_name}' "
+                f"did not match any type in Union {base} at {'.'.join(path)}"
+            )
+
+        if has_value and not disc_name:
+             return disc_value
+             
         return self._build(node, base, path)
         
     def _coerce_prim(self, node: Any, t: type, path: Tuple[str, ...]) -> Any:

pico_ioc/container.py

@@ -1,10 +1,12 @@
+# src/pico_ioc/container.py
+
 import inspect
 import contextvars
 import functools
 from typing import Any, Dict, List, Optional, Tuple, overload, Union, Callable, Iterable, Set, get_args, get_origin, Annotated, Protocol, Mapping
 from contextlib import contextmanager
 from .constants import LOGGER, PICO_META
-from .exceptions import ComponentCreationError, ProviderNotFoundError, AsyncResolutionError
+from .exceptions import ComponentCreationError, ProviderNotFoundError, AsyncResolutionError, ConfigurationError
 from .factory import ComponentFactory, ProviderMetadata
 from .locator import ComponentLocator
 from .scope import ScopedCaches, ScopeManager
@@ -195,6 +197,26 @@ class PicoContainer:
         finally:
             self.deactivate(token_container)
             
+    def _run_configure_methods(self, instance: Any) -> Any:
+        if not _needs_async_configure(instance):
+            for m in _iter_configure_methods(instance):
+                configure_deps = analyze_callable_dependencies(m)
+                args = self._resolve_args(configure_deps)
+                res = m(**args)
+                if inspect.isawaitable(res):
+                    LOGGER.warning(f"Async configure method {m} called during sync get. Awaitable ignored.")
+            return instance
+
+        async def runner():
+            for m in _iter_configure_methods(instance):
+                configure_deps = analyze_callable_dependencies(m)
+                args = self._resolve_args(configure_deps)
+                r = m(**args)
+                if inspect.isawaitable(r):
+                    await r
+            return instance
+        return runner()
+
     @overload
     def get(self, key: type) -> Any: ...
     @overload
@@ -210,6 +232,14 @@ class PicoContainer:
             key_name = getattr(key, '__name__', str(key))
             raise AsyncResolutionError(key)
 
+        md = self._locator._metadata.get(key) if self._locator else None
+        scope = (md.scope if md else "singleton")
+        if scope != "singleton":
+            instance_or_awaitable_configured = self._run_configure_methods(instance)
+            if inspect.isawaitable(instance_or_awaitable_configured):
+                raise AsyncResolutionError(key)
+            instance = instance_or_awaitable_configured
+
         final_instance = self._maybe_wrap_with_aspects(key, instance)
         cache = self._cache_for(key)
         cache.put(key, final_instance)
@@ -228,6 +258,15 @@ class PicoContainer:
         if inspect.isawaitable(instance_or_awaitable):
             instance = await instance_or_awaitable
 
+        md = self._locator._metadata.get(key) if self._locator else None
+        scope = (md.scope if md else "singleton")
+        if scope != "singleton":
+            instance_or_awaitable_configured = self._run_configure_methods(instance)
+            if inspect.isawaitable(instance_or_awaitable_configured):
+                instance = await instance_or_awaitable_configured
+            else:
+                instance = instance_or_awaitable_configured
+
         final_instance = self._maybe_wrap_with_aspects(key, instance)
         cache = self._cache_for(key)
         cache.put(key, final_instance)
@@ -432,7 +471,7 @@ class PicoContainer:
             inst = cls(**deps)
         
         ainit = getattr(inst, "__ainit__", None)
-        has_async = (callable(ainit) and inspect.iscoroutinefunction(ainit)) or _needs_async_configure(inst)
+        has_async = (callable(ainit) and inspect.iscoroutinefunction(ainit))
         
         if has_async:
             async def runner():
@@ -446,39 +485,12 @@ class PicoContainer:
                     res = ainit(**kwargs)
                     if inspect.isawaitable(res):
                         await res
-                for m in _iter_configure_methods(inst):
-                    configure_deps = analyze_callable_dependencies(m)
-                    args = self._resolve_args(configure_deps)
-                    r = m(**args)
-                    if inspect.isawaitable(r):
-                        await r
                 return inst
             return runner()
             
-        for m in _iter_configure_methods(inst):
-            configure_deps = analyze_callable_dependencies(m)
-            args = self._resolve_args(configure_deps)
-            m(**args)
         return inst
 
     def build_method(self, fn: Callable[..., Any], locator: ComponentLocator, dependencies: Tuple[DependencyRequest, ...]) -> Any:
         deps = self._resolve_args(dependencies)
         obj = fn(**deps)
-        
-        has_async = _needs_async_configure(obj)
-        if has_async:
-            async def runner():
-                for m in _iter_configure_methods(obj):
-                    configure_deps = analyze_callable_dependencies(m)
-                    args = self._resolve_args(configure_deps)
-                    r = m(**args)
-                    if inspect.isawaitable(r):
-                        await r
-                return obj
-            return runner()
-            
-        for m in _iter_configure_methods(obj):
-            configure_deps = analyze_callable_dependencies(m)
-            args = self._resolve_args(configure_deps)
-            m(**args)
         return obj

pico_ioc/decorators.py

@@ -172,13 +172,14 @@ def cleanup(fn):
     m["cleanup"] = True
     return fn
 
-def configured(target: Any, *, prefix: str = "", mapping: str = "auto"):
+def configured(target: Any = "self", *, prefix: str = "", mapping: str = "auto", **kwargs):
     if mapping not in ("auto", "flat", "tree"):
         raise ValueError("mapping must be one of 'auto', 'flat', or 'tree'")
     def dec(cls):
         setattr(cls, PICO_INFRA, "configured")
         m = _meta_get(cls)
         m["configured"] = {"target": target, "prefix": prefix, "mapping": mapping}
+        _apply_common_metadata(cls, **kwargs)
         return cls
     return dec
 

pico_ioc/event_bus.py

@@ -1,4 +1,3 @@
-# src/pico_ioc/event_bus.py
 import asyncio
 import inspect
 import logging
@@ -151,29 +150,30 @@ class EventBus:
             self._worker_loop = None
 
     def post(self, event: Event) -> None:
-        if self._closed:
-            raise EventBusClosedError()
-        if self._queue is None:
-            raise EventBusError("Worker queue not initialized. Call start_worker().")
-        loop = self._worker_loop
-        if loop and loop.is_running():
-            try:
-                current_loop = asyncio.get_running_loop()
-                if current_loop is loop:
-                    try:
-                        self._queue.put_nowait(event)
-                        return
-                    except asyncio.QueueFull:
-                        raise EventBusQueueFullError()
-            except RuntimeError:
-                pass
-            try:
-                loop.call_soon_threadsafe(self._queue.put_nowait, event)
-                return
-            except asyncio.QueueFull:
-                raise EventBusQueueFullError()
-        else:
-            raise EventBusError("Worker queue not initialized or loop not running. Call start_worker().")
+        with self._lock:
+            if self._closed:
+                raise EventBusClosedError()
+            if self._queue is None:
+                raise EventBusError("Worker queue not initialized. Call start_worker().")
+            loop = self._worker_loop
+            if loop and loop.is_running():
+                try:
+                    current_loop = asyncio.get_running_loop()
+                    if current_loop is loop:
+                        try:
+                            self._queue.put_nowait(event)
+                            return
+                        except asyncio.QueueFull:
+                            raise EventBusQueueFullError()
+                except RuntimeError:
+                    pass
+                try:
+                    loop.call_soon_threadsafe(self._queue.put_nowait, event)
+                    return
+                except asyncio.QueueFull:
+                    raise EventBusQueueFullError()
+            else:
+                raise EventBusError("Worker queue not initialized or loop not running. Call start_worker().")
 
     async def aclose(self) -> None:
         await self.stop_worker()
@@ -220,4 +220,3 @@ class PicoEventBusProvider:
             loop.create_task(event_bus.aclose())
         else:
             asyncio.run(event_bus.aclose())
-

pico_ioc/locator.py

@@ -115,10 +115,6 @@ class ComponentLocator:
                 return k
         return None
 
-    def _compile_argplan_static(self, callable_obj):
-        raise NotImplementedError("This method is obsolete and replaced by analysis module")
-
-
     def dependency_keys_for_static(self, md: ProviderMetadata):
         deps: List[KeyT] = []
         for dep in md.dependencies:

pico_ioc/registrar.py

@@ -17,6 +17,7 @@ from .provider_selector import ProviderSelector
 from .dependency_validator import DependencyValidator
 from .component_scanner import ComponentScanner
 from .analysis import analyze_callable_dependencies, DependencyRequest
+from .container import PicoContainer
 
 KeyT = Union[str, type]
 Provider = Callable[[], Any]
@@ -133,7 +134,7 @@ class Registrar:
                 add("pico_name", md.pico_name, k)
 
 
-    def finalize(self, overrides: Optional[Dict[KeyT, Any]]) -> None:
+    def finalize(self, overrides: Optional[Dict[KeyT, Any]], *, pico_instance: PicoContainer) -> None:
         candidates, on_missing, deferred_providers, provides_functions = self._scanner.get_scan_results()
         self._deferred = deferred_providers
         self._provides_functions = provides_functions
@@ -142,6 +143,24 @@ class Registrar:
         for key, (provider, md) in winners.items():
             self._bind_if_absent(key, provider)
             self._metadata[key] = md
+            
+        if PicoContainer not in self._metadata:
+            self._factory.bind(PicoContainer, lambda: pico_instance)
+            self._metadata[PicoContainer] = ProviderMetadata(
+                key=PicoContainer,
+                provided_type=PicoContainer,
+                concrete_class=PicoContainer,
+                factory_class=None,
+                factory_method=None,
+                qualifiers=set(),
+                primary=True,
+                lazy=False,
+                infra="component",
+                pico_name="PicoContainer",
+                override=True,
+                scope="singleton",
+                dependencies=()
+            )
 
         self._promote_scopes()
         self._rebuild_indexes()

pico_ioc/scope.py

@@ -3,6 +3,7 @@ import contextvars
 import inspect
 from typing import Any, Dict, Optional, Tuple
 from collections import OrderedDict
+from .exceptions import ScopeError
 
 class ScopeProtocol:
     def get_id(self) -> Any | None: ...
@@ -42,16 +43,24 @@ class ScopeManager:
         self._scopes: Dict[str, ScopeProtocol] = {
             "request": ContextVarScope(contextvars.ContextVar("pico_request_id", default=None)),
             "session": ContextVarScope(contextvars.ContextVar("pico_session_id", default=None)),
+            "websocket": ContextVarScope(contextvars.ContextVar("pico_websocket_id", default=None)),
             "transaction": ContextVarScope(contextvars.ContextVar("pico_tx_id", default=None)),
         }
-    def register_scope(self, name: str, implementation: ScopeProtocol) -> None:
+
+    def register_scope(self, name: str) -> None:
         if not isinstance(name, str) or not name:
-            from .exceptions import ScopeError
             raise ScopeError("Scope name must be a non-empty string")
         if name in ("singleton", "prototype"):
-            from .exceptions import ScopeError
-            raise ScopeError("Cannot register or override reserved scopes: 'singleton' or 'prototype'")
+            raise ScopeError(f"Cannot register reserved scope: '{name}'")
+        if name in self._scopes:
+            return
+
+        var_name = f"pico_{name}_id"
+        context_var = contextvars.ContextVar(var_name, default=None)
+        implementation = ContextVarScope(context_var)
         self._scopes[name] = implementation
+        
+        
     def get_id(self, name: str) -> Any | None:
         if name in ("singleton", "prototype"):
             return None

{pico_ioc-2.1.0.dist-info → pico_ioc-2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pico-ioc
-Version: 2.1.0
+Version: 2.1.1
 Summary: A minimalist, zero-dependency Inversion of Control (IoC) container for Python.
 Author-email: David Perez Cabrera <dperezcabrera@gmail.com>
 License: MIT License
@@ -39,7 +39,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: yaml

pico_ioc-2.1.1.dist-info/RECORD

@@ -0,0 +1,25 @@
+pico_ioc/__init__.py,sha256=i25Obx7aH_Oy5b6yjjnCswDgni7InIjrGEcG6vLAw6I,2414
+pico_ioc/_version.py,sha256=Aht2295j8FswZ-nPYofCYr3fBZ6Uyf0thTfl5Oc2mWA,22
+pico_ioc/analysis.py,sha256=k49R-HcDyvpSNid8mxv7Fc6fPHnDu1C_b4HxrGLNF2g,2780
+pico_ioc/aop.py,sha256=XcyzsuKPrVPk1_Jad7Mn-qwoL1y0ZuVWwRZBA-CslJk,13301
+pico_ioc/api.py,sha256=0pcRFHzhDcX8ijd67xAsVrTejwXuJKz7kTKRUrIuX2s,6161
+pico_ioc/component_scanner.py,sha256=S-9XNxrgyq_JFdc4Uqn2bEb-HxafSgIWylIurxyN_UA,7955
+pico_ioc/config_builder.py,sha256=7kcYIq1Yrb46Tic7uLeaCDvLA-Sa_p1PIoGF00mivso,2848
+pico_ioc/config_registrar.py,sha256=34iNQY1TUEPTXbb-QV1T-c5VKAn18hBcNt5MLhzDSfY,8456
+pico_ioc/config_runtime.py,sha256=hiL1kCxhpjbfOdUaH71jMGNESDpWsaJkQXh7q1T71bg,12781
+pico_ioc/constants.py,sha256=AhIt0ieDZ9Turxb_YbNzj11wUbBbzjKfWh1BDlSx2Nw,183
+pico_ioc/container.py,sha256=gXgQT12ChpexbZALUfb0YYohlcRbUUeJ8-ltdR7xitc,18956
+pico_ioc/decorators.py,sha256=ru_YeqyJ3gbfb6M8WeJZlBxfcBBEuGDvxpHJGzU6FIs,6412
+pico_ioc/dependency_validator.py,sha256=BIR6pKntACiabF6CjNZ3m00RMnet9BPK1_9y1iCJ5KQ,4144
+pico_ioc/event_bus.py,sha256=nOL91JLYxap9kbb-HBGEhOVwtXN_bfI4q0mtSRZFlHk,8434
+pico_ioc/exceptions.py,sha256=FBuajj5g29hAGODt2tAWuy2sG5mQojdSddaqFzim-aY,2383
+pico_ioc/factory.py,sha256=oJXx_BYJuvV8oxYzs5I3gx9WM6uLYZ8GCc43gukNanc,1671
+pico_ioc/locator.py,sha256=4WN1qvXXW_LRInB2XJR8pTgIuJ8RyWBSpVo28HwtlL0,4737
+pico_ioc/provider_selector.py,sha256=pU7NbI5vifvUlJEjlRJmvveQUZVD47T24QmiP0CHRw0,1213
+pico_ioc/registrar.py,sha256=hIk48nXghTdA3WBljCbw2q8J_6F_hCk1ljSi4Pb8P3A,8368
+pico_ioc/scope.py,sha256=hOdTmjjfrRt8APXoS3lbTbSPxILi7flBXz_qpIkpoKw,6137
+pico_ioc-2.1.1.dist-info/licenses/LICENSE,sha256=N1_nOvHTM6BobYnOTNXiQkroDqCEi6EzfGBv8lWtyZ0,1077
+pico_ioc-2.1.1.dist-info/METADATA,sha256=deaBUX6MOzClrMVDDhk5siAh2W0QrtQI-w4n2ZI-gGI,10673
+pico_ioc-2.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pico_ioc-2.1.1.dist-info/top_level.txt,sha256=_7_RLu616z_dtRw16impXn4Mw8IXe2J4BeX5912m5dQ,9
+pico_ioc-2.1.1.dist-info/RECORD,,

pico_ioc-2.1.0.dist-info/RECORD

@@ -1,25 +0,0 @@
-pico_ioc/__init__.py,sha256=pxYvrunT9cFAXxGbow5TRlzRXDVvm4E7L6PT1UkPeUw,2394
-pico_ioc/_version.py,sha256=LbU43-7hsLmdXWI0wTAl3y6D3Tr7CbJiDOLXwl7clj8,22
-pico_ioc/analysis.py,sha256=k49R-HcDyvpSNid8mxv7Fc6fPHnDu1C_b4HxrGLNF2g,2780
-pico_ioc/aop.py,sha256=r8JCPsTTF1hmrQMtnj-_Lj99fIy5J97RAJjiR2LjVPQ,12769
-pico_ioc/api.py,sha256=tR0pm6YEnDTA62EIT_Cpw1EaPfdnBFY9Dvpc38ypP-o,5061
-pico_ioc/component_scanner.py,sha256=S-9XNxrgyq_JFdc4Uqn2bEb-HxafSgIWylIurxyN_UA,7955
-pico_ioc/config_builder.py,sha256=ROBvbnm2Zv8apRdtZJHtebp-2cOMiuENFyiqaX1T2Ik,2918
-pico_ioc/config_registrar.py,sha256=8Xpl-CNRFny3EIRlcNx6oMJQldXkj_jdaPbC17qk2Ec,7803
-pico_ioc/config_runtime.py,sha256=Q8jVFQ1b6h1ZOkdacm70u0Q7TlEiUGENFkG-YWRkBxA,12133
-pico_ioc/constants.py,sha256=AhIt0ieDZ9Turxb_YbNzj11wUbBbzjKfWh1BDlSx2Nw,183
-pico_ioc/container.py,sha256=1gRjHH5kq_lOlnGUh5QYA4vUHF3ScQpwXoT9PWiyJ2g,18352
-pico_ioc/decorators.py,sha256=qrx4oMjRmmgwqT4cdp6FxBoqex3L1yNGlCUxO865z14,6347
-pico_ioc/dependency_validator.py,sha256=BIR6pKntACiabF6CjNZ3m00RMnet9BPK1_9y1iCJ5KQ,4144
-pico_ioc/event_bus.py,sha256=E8Qb8KZ6K1CuXSbMlG0MNPHkGoWlssLLPzHq1QYdADQ,8346
-pico_ioc/exceptions.py,sha256=FBuajj5g29hAGODt2tAWuy2sG5mQojdSddaqFzim-aY,2383
-pico_ioc/factory.py,sha256=oJXx_BYJuvV8oxYzs5I3gx9WM6uLYZ8GCc43gukNanc,1671
-pico_ioc/locator.py,sha256=UDyXl3oSK-sZ8ouOlhsDM91shMP0atMxyMoQlaSYvfE,4885
-pico_ioc/provider_selector.py,sha256=pU7NbI5vifvUlJEjlRJmvveQUZVD47T24QmiP0CHRw0,1213
-pico_ioc/registrar.py,sha256=cexXFDsuxBwM8FvW7mwmuyqcTcOkSP6ELecwklcs0F4,7625
-pico_ioc/scope.py,sha256=GDsDJWw7e5Vpiys-M4vQfKMJWSCiorRsT5cPo6z34Mk,5924
-pico_ioc-2.1.0.dist-info/licenses/LICENSE,sha256=N1_nOvHTM6BobYnOTNXiQkroDqCEi6EzfGBv8lWtyZ0,1077
-pico_ioc-2.1.0.dist-info/METADATA,sha256=lYR54Lhdwmn5tDXol2M5ReJxBsXpdZ9bH0KrcYOlq2s,10672
-pico_ioc-2.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pico_ioc-2.1.0.dist-info/top_level.txt,sha256=_7_RLu616z_dtRw16impXn4Mw8IXe2J4BeX5912m5dQ,9
-pico_ioc-2.1.0.dist-info/RECORD,,