vulcan-core 1.1.2__py3-none-any.whl → 1.1.3__py3-none-any.whl

vulcan_core/ast_utils.py

@@ -5,6 +5,7 @@ import ast
 import inspect
 import re
 import textwrap
+import threading
 from ast import Attribute, Module, Name, NodeTransformer, NodeVisitor
 from collections.abc import Callable
 from dataclasses import dataclass, field
@@ -83,10 +84,11 @@ class AttributeTransformer(NodeTransformer):
         return node
 
 
-# Global index to cache and track lambda functions position in lambda source lines.
+# Global index to cache and track lambda function positions within the same source lines.
 # Tuple format: (source code, last processed index)
-# TODO: Note in documentation that thread safety is not guaranteed when loading the same ruleset.
-# TODO: Consider updating to use a thread-safe structure like threading.local() if needed.
+# TODO: Consider if a redesign is possible to have a single ASTProcessor handle the entire source line, perhaps eagerly
+# processing all lambdas found in the line before the correspondign `condition` call.
+_lambda_index_lock = threading.Lock()
 lambda_index: dict[Any, tuple[str, int | None]] = {}
 
 
@@ -111,21 +113,27 @@ class ASTProcessor[T: Callable]:
             try:
                 if self.is_lambda:
                     # As of Python 3.12, there is no way to determine to which lambda self.func refers in an
-                    # expression containing multiple lambdas. Therefore we use a global to track the index of each
+                    # expression containing multiple lambdas. Therefore we use a global dict to track the index of each
                     # lambda function encountered, as the order will correspond to the order of ASTProcessor
                     # invocations for that line. An additional benefit is that we can also use this as a cache to
                     # avoid re-reading the source code for lambda functions sharing the same line.
-                    key = self.func.__code__.co_filename + ":" + str(self.func.__code__.co_firstlineno)
-
-                    index = lambda_index.get(key)
-                    if index is None or index[1] is None:
-                        self.source = self._get_lambda_source()
-                        index = (self.source, 0)
-                        lambda_index[key] = index
-                    else:
-                        self.source = index[0]
-                        index = (self.source, index[1] + 1)
-                        lambda_index[key] = index
+                    #
+                    # The key for the index is a hash of the stack trace plus line number, which will be
+                    # unique for each call of a list of lambdas on the same line.
+                    frames = inspect.stack()[1:]  # Exclude current frame
+                    key = "".join(f"{f.filename}:{f.lineno}" for f in frames)
+
+                    # Use a lock to ensure thread safety when accessing the global lambda index
+                    with _lambda_index_lock:
+                        index = lambda_index.get(key)
+                        if index is None or index[1] is None:
+                            self.source = self._get_lambda_source()
+                            index = (self.source, 0)
+                            lambda_index[key] = index
+                        else:
+                            self.source = index[0]
+                            index = (self.source, index[1] + 1)
+                            lambda_index[key] = index
 
                     # Normalize the lambda source and extract the next lambda expression from the last index
                     self.source = self._normalize_lambda_source(self.source, index[1])

{vulcan_core-1.1.2.dist-info → vulcan_core-1.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: vulcan-core
-Version: 1.1.2
+Version: 1.1.3
 Summary: AI-Hybrid Rules Engine for Logical Reasoning.
 License: Apache-2.0
 Keywords: rules,logic,reasoning,ai,artificial intelligence,RAG,LLM
@@ -65,7 +65,7 @@ engine.rule(
 
 # Use computed logic for operations that must be correct:
 engine.rule(
-    when=condition(Apple.baking && lambda: Inventory.apples < 10),
+    when=condition(lambda: Apple.baking and Inventory.apples < 10),
     then=action(Order(apples=10)),
 )
 

{vulcan_core-1.1.2.dist-info → vulcan_core-1.1.3.dist-info}/RECORD

@@ -1,12 +1,12 @@
 vulcan_core/__init__.py,sha256=pjCnmbMjrsp672WXRQeOV0aSKUEoA_mj0o7q_ouMWs8,1057
 vulcan_core/actions.py,sha256=RO5w5X-drxtDY_mVv0xR2njasWkGPt1AZo9RXsBi8X0,917
-vulcan_core/ast_utils.py,sha256=cx_TLfWCfO8eH70H-v3G-SsAo0iGe4WIKSh6Sq9Z78Y,17183
+vulcan_core/ast_utils.py,sha256=PD3IKU4Cz5-BdIBoparIKh-YHJ4ik78FGBy3bXxZkmk,17700
 vulcan_core/conditions.py,sha256=ZK4plEO2dB7gq0esroEhL29naB_qAsoU4AVSv0rXClk,15670
 vulcan_core/engine.py,sha256=WjayTDEjKaIEVkkSZyDjdbu1Xy1XIvPewI83l6Sjo9g,9672
 vulcan_core/models.py,sha256=7um3u-rAy9gg2otTnZFGlKfHJKfsvGEosU3mGq_0jyg,8964
 vulcan_core/util.py,sha256=Uq5uWhrfWd8fNv6IeeTFZRGeLBAECPZUx63UjbbSMrA,3420
-vulcan_core-1.1.2.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-vulcan_core-1.1.2.dist-info/METADATA,sha256=4dWg7LcAq_L3l_JBptWUwKg_GG8kz6QjHgsCJHc1Xq0,4424
-vulcan_core-1.1.2.dist-info/NOTICE,sha256=UN1_Gd_Snmu8T62mxExNUdIF2o7DMdGu8bI8rKqhVnc,244
-vulcan_core-1.1.2.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-vulcan_core-1.1.2.dist-info/RECORD,,
+vulcan_core-1.1.3.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+vulcan_core-1.1.3.dist-info/METADATA,sha256=VD7h3KcJn2THORJ0g-IEz3kZdekwq3cDaLqGJpGc_N4,4425
+vulcan_core-1.1.3.dist-info/NOTICE,sha256=UN1_Gd_Snmu8T62mxExNUdIF2o7DMdGu8bI8rKqhVnc,244
+vulcan_core-1.1.3.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+vulcan_core-1.1.3.dist-info/RECORD,,