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

pico_ioc/__init__.py

@@ -17,18 +17,13 @@ from .api import (
     factory,
     provides,
     Qualifier,
-    qualifier,
-    on_missing,
-    primary,
-    conditional,
-    lazy,
     configuration,
     configure,
     cleanup,
-    scope,
     ConfigSource,
     EnvSource,
     FileSource,
+    FlatDictSource,
     init,
     configured,
 )
@@ -61,15 +56,9 @@ __all__ = [
     "factory",
     "provides",
     "Qualifier",
-    "qualifier",
-    "on_missing",
-    "primary",
-    "conditional",
-    "lazy",
     "configuration",
     "configure",
     "cleanup",
-    "scope",
     "ScopeProtocol",
     "ContextVarScope",
     "ScopeManager",
@@ -88,6 +77,7 @@ __all__ = [
     "EnvSource",
     "FileSource",
     "ConfigSource",
+    "FlatDictSource",
     "init",
     "configured",
     "EventBus",
@@ -102,3 +92,4 @@ __all__ = [
     "Discriminator",
 ]
 
+

pico_ioc/_version.py

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

pico_ioc/aop.py

@@ -1,6 +1,7 @@
 # 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
 
@@ -73,7 +74,7 @@ def health(fn):
     return fn
 
 class UnifiedComponentProxy:
-    __slots__ = ("_target", "_creator", "_container", "_cache")
+    __slots__ = ("_target", "_creator", "_container", "_cache", "_lock")
     def __init__(self, *, container: Any, target: Any = None, object_creator: Callable[[], Any] | None = None):
         if container is None:
             raise ValueError("UnifiedComponentProxy requires a non-null container")
@@ -83,19 +84,44 @@ class UnifiedComponentProxy:
         object.__setattr__(self, "_target", target)
         object.__setattr__(self, "_creator", object_creator)
         object.__setattr__(self, "_cache", {})
-    
+        object.__setattr__(self, "_lock", threading.RLock())
+
+    def __getstate__(self):
+        o = self._get_real_object()
+        try:
+            data = pickle.dumps(o)
+        except Exception as e:
+            raise SerializationError(f"Proxy target is not serializable: {e}")
+        return {"data": data}
+
+    def __setstate__(self, state):
+        object.__setattr__(self, "_container", None)
+        object.__setattr__(self, "_creator", None)
+        object.__setattr__(self, "_cache", {})
+        object.__setattr__(self, "_lock", threading.RLock())
+        try:
+            obj = pickle.loads(state["data"])
+        except Exception as e:
+            raise SerializationError(f"Failed to restore proxy: {e}")
+        object.__setattr__(self, "_target", obj)
+        
     def _get_real_object(self) -> Any:
         tgt = object.__getattribute__(self, "_target")
         if tgt is not None:
             return tgt
-        creator = object.__getattribute__(self, "_creator")
-        if not callable(creator):
-            raise TypeError("UnifiedComponentProxy object_creator must be callable")
-        tgt = creator()
-        if tgt is None:
-            raise RuntimeError("UnifiedComponentProxy object_creator returned None")
-        object.__setattr__(self, "_target", tgt)
-        return tgt
+        lock = object.__getattribute__(self, "_lock")
+        with lock:
+            tgt = object.__getattribute__(self, "_target")
+            if tgt is not None:
+                return tgt
+            creator = object.__getattribute__(self, "_creator")
+            if not callable(creator):
+                raise TypeError("UnifiedComponentProxy object_creator must be callable")
+            tgt = creator()
+            if tgt is None:
+                raise RuntimeError("UnifiedComponentProxy object_creator returned None")
+            object.__setattr__(self, "_target", tgt)
+            return tgt
     
     def _scope_signature(self) -> Tuple[Any, ...]:
         container = object.__getattribute__(self, "_container")
@@ -122,7 +148,6 @@ class UnifiedComponentProxy:
         original_func = bound
         if hasattr(bound, '__func__'):
             original_func = bound.__func__
-
         if inspect.iscoroutinefunction(original_func):
             async def aw(*args, **kwargs):
                 ctx = MethodCtx(
@@ -170,16 +195,25 @@ class UnifiedComponentProxy:
         interceptors_cls = _gather_interceptors_for_method(type(target), name)
         if not interceptors_cls:
             return attr
-        cache: Dict[str, Tuple[Tuple[Any, ...], Callable[..., Any], Tuple[type, ...]]] = object.__getattribute__(self, "_cache")
-        cur_sig = self._scope_signature()
-        cached = cache.get(name)
-        if cached is not None:
-            sig, wrapped, cls_tuple = cached
-            if sig == cur_sig and cls_tuple == interceptors_cls:
-                return wrapped
-        sig, wrapped, cls_tuple = self._build_wrapped(name, attr, interceptors_cls)
-        cache[name] = (sig, wrapped, cls_tuple)
-        return wrapped
+
+        lock = object.__getattribute__(self, "_lock")
+        with lock:
+            cache: Dict[str, Tuple[Tuple[Any, ...], Callable[..., Any], Tuple[type, ...]]] = object.__getattribute__(self, "_cache")
+            cur_sig = self._scope_signature()
+            cached = cache.get(name)
+            if cached is not None:
+                sig, wrapped, cls_tuple = cached
+                if sig == cur_sig and cls_tuple == interceptors_cls:
+                    return wrapped
+                    
+            cached = cache.get(name)
+            if cached is not None:
+                sig, wrapped, cls_tuple = cached
+                if sig == cur_sig and cls_tuple == interceptors_cls:
+                    return wrapped
+            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)