mixinv2 0.3.0.post58.dev0__tar.gz → 0.3.0.post65.dev0__tar.gz

{mixinv2-0.3.0.post58.dev0 → mixinv2-0.3.0.post65.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mixinv2
-Version: 0.3.0.post58.dev0
+Version: 0.3.0.post65.dev0
 Summary: A dependency injection framework with pytest-fixture syntax, plus a configuration language for declarative programming
 Project-URL: Repository, https://github.com/Atry/MIXINv2
 Author-email: "Yang, Bo" <yang-bo@yang-bo.com>

{mixinv2-0.3.0.post58.dev0 → mixinv2-0.3.0.post65.dev0}/src/mixinv2/__init__.py

@@ -44,6 +44,7 @@ from mixinv2._core import public as public
 from mixinv2._core import resource as resource
 from mixinv2._core import scope as scope
 from mixinv2._core import Bottom as Bottom
+from mixinv2._core import fixpoint_cached_property as fixpoint_cached_property
 from mixinv2._runtime import evaluate as evaluate
 
 if TYPE_CHECKING:

{mixinv2-0.3.0.post58.dev0 → mixinv2-0.3.0.post65.dev0}/src/mixinv2/_core.py

@@ -553,6 +553,7 @@ from typing import (
     Awaitable,
     Callable,
     ChainMap,
+    ClassVar,
     Collection,
     ContextManager,
     Final,
@@ -665,9 +666,6 @@ class Bottom(RecursionError):
         self.incomplete_result = incomplete_result
 
 
-_max_fixpoint_iterations_var: ContextVar[int] = ContextVar(
-    "_max_fixpoint_iterations_var", default=100
-)
 _FIXPOINT_SENTINEL = object()
 
 # Registry of attribute names that need clearing during fixpoint digest cycles.
@@ -706,8 +704,20 @@ class fixpoint_cached_property:
         @fixpoint_cached_property(bottom=lambda: defaultdict(set))
         def qualified_this(self):
             ...
+
+    The class-level ``max_fixpoint_iterations`` ContextVar controls the
+    maximum number of digest rounds.  ``0`` disables fixpoint iteration
+    and raises ``Bottom`` on reentry.  Default ``100`` iterates until
+    convergence or raises ``Bottom`` if not converged::
+
+        fixpoint_cached_property.max_fixpoint_iterations.set(0)   # single-pass
+        fixpoint_cached_property.max_fixpoint_iterations.set(100) # multi-pass (default)
     """
 
+    max_fixpoint_iterations: ClassVar[ContextVar[int]] = ContextVar(
+        "fixpoint_cached_property.max_fixpoint_iterations", default=100
+    )
+
     def __init__(
         self,
         func: Callable = None,
@@ -737,6 +747,10 @@ class fixpoint_cached_property:
             self.attrname = name
         _fixpoint_clearable_attrs.add(self.attrname)
 
+    @classmethod
+    def _get_max_iterations(cls) -> int:
+        return cls.max_fixpoint_iterations.get()
+
     def __get__(self, instance: object, owner: type = None) -> object:
         if instance is None:
             return self
@@ -745,7 +759,7 @@ class fixpoint_cached_property:
         cache = instance.__dict__
         value = cache.get(self.attrname)
         if value is not None:
-            max_iterations = _max_fixpoint_iterations_var.get()
+            max_iterations = self._get_max_iterations()
             if max_iterations == 0:
                 return value
             # Detect reentry: if this key is currently being computed
@@ -759,7 +773,7 @@ class fixpoint_cached_property:
                     context.add_participant(instance)
             return value
 
-        max_iterations = _max_fixpoint_iterations_var.get()
+        max_iterations = self._get_max_iterations()
         context = _fixpoint_context_var.get()
         instance_id = id(instance)
         key = (instance_id, self.attrname)
@@ -895,7 +909,7 @@ class _fixpoint_dependent_property:
         if value is not None:
             return value
 
-        if _max_fixpoint_iterations_var.get() > 0:
+        if fixpoint_cached_property.max_fixpoint_iterations.get() > 0:
             # Register as participant so clear_participant_caches can
             # invalidate this cached value between fixpoint iterations.
             context = _fixpoint_context_var.get()

{mixinv2-0.3.0.post58.dev0 → mixinv2-0.3.0.post65.dev0}/src/mixinv2/_runtime.py

@@ -34,7 +34,6 @@ from mixinv2._core import (
     HasDict,
     OuterSentinel,
     SymbolKind,
-    _max_fixpoint_iterations_var,
 )
 
 
@@ -639,7 +638,6 @@ class MultiplePatcher(Patcher[TPatch_co]):
 def evaluate(
     *namespaces: "ModuleType | ScopeDefinition",
     modules_public: bool = False,
-    max_fixpoint_iterations: int = 100,
 ) -> Scope:
     """
     Resolves a Scope from the given namespaces.
@@ -653,13 +651,15 @@ def evaluate(
     When multiple namespaces are provided, they are union-mounted at the root level.
     Resources from all namespaces are merged according to the merger election algorithm.
 
+    To control fixpoint iteration, set the class-level ContextVar before calling::
+
+        from mixinv2._core import fixpoint_cached_property
+        fixpoint_cached_property.max_fixpoint_iterations.set(0)   # single-pass
+        fixpoint_cached_property.max_fixpoint_iterations.set(100) # multi-pass (default)
+
     :param namespaces: Modules or namespace definitions (decorated with @scope) to resolve.
     :param modules_public: If True, modules are marked as public, making their submodules
         accessible via attribute access. Defaults to False (private by default).
-    :param max_fixpoint_iterations: Maximum number of fixpoint iterations for
-        resolving cyclic dependencies.  ``0`` disables fixpoint iteration and
-        raises ``Bottom`` on reentry.  Default ``100`` iterates until convergence
-        or raises ``Bottom`` if not converged.
     :return: The root Scope.
 
     Example::
@@ -667,7 +667,6 @@ def evaluate(
         root = evaluate(MyNamespace)
         root = evaluate(Base, Override)  # Union mount
         root = evaluate(my_package, modules_public=True)  # Make modules accessible
-        root = evaluate(MyNamespace, max_fixpoint_iterations=0)  # No fixpoint iteration
 
     """
     from dataclasses import replace
@@ -682,44 +681,36 @@ def evaluate(
     )
 
     assert namespaces, "evaluate() requires at least one namespace"
-    if max_fixpoint_iterations < 0:
-        raise ValueError(
-            f"max_fixpoint_iterations must be non-negative, got {max_fixpoint_iterations}"
-        )
 
-    token = _max_fixpoint_iterations_var.set(max_fixpoint_iterations)
-    try:
-        def to_scope_definition(
-            namespace: ModuleType | ScopeDefinition,
-        ) -> ScopeDefinition:
-            if isinstance(namespace, ScopeDefinition):
-                return namespace
-            if isinstance(namespace, ModuleType):
-                definition = _parse_package(namespace)
-                if modules_public:
-                    return replace(definition, is_public=True)
-                return definition
-            assert_never(namespace)
-
-        definitions = tuple(to_scope_definition(namespace) for namespace in namespaces)
-
-        root_symbol = MixinSymbol(origin=definitions)
-
-        # Create a synthetic root Mixin to enable lexical scope navigation
-        # This is needed so that children of the root scope can navigate up
-        # to find parent scope dependencies (via get_mixin)
-        root_mixin = Mixin(
-            symbol=root_symbol,
-            outer=OuterSentinel.ROOT,
-            kwargs=KwargsSentinel.STATIC,  # Root is always static
-        )
+    def to_scope_definition(
+        namespace: ModuleType | ScopeDefinition,
+    ) -> ScopeDefinition:
+        if isinstance(namespace, ScopeDefinition):
+            return namespace
+        if isinstance(namespace, ModuleType):
+            definition = _parse_package(namespace)
+            if modules_public:
+                return replace(definition, is_public=True)
+            return definition
+        assert_never(namespace)
+
+    definitions = tuple(to_scope_definition(namespace) for namespace in namespaces)
+
+    root_symbol = MixinSymbol(origin=definitions)
+
+    # Create a synthetic root Mixin to enable lexical scope navigation
+    # This is needed so that children of the root scope can navigate up
+    # to find parent scope dependencies (via get_mixin)
+    root_mixin = Mixin(
+        symbol=root_symbol,
+        outer=OuterSentinel.ROOT,
+        kwargs=KwargsSentinel.STATIC,  # Root is always static
+    )
 
-        # Evaluate the root mixin to get the Scope
-        result = root_mixin.evaluated
-        assert isinstance(result, Scope)
-        return result
-    finally:
-        _max_fixpoint_iterations_var.reset(token)
+    # Evaluate the root mixin to get the Scope
+    result = root_mixin.evaluated
+    assert isinstance(result, Scope)
+    return result
 
 
 # Re-export types needed by TYPE_CHECKING imports