vulcan-core 1.0.0__py3-none-any.whl → 1.1.0__py3-none-any.whl

vulcan_core/ast_utils.py

@@ -152,16 +152,35 @@ class ASTProcessor[T: Callable]:
             raise ASTProcessingError(msg)
 
         # The source includes the entire line of code (e.g., assignment and condition() call)
-        # We need to parse parentheses to extract just the lambda expression, handling any
-        # nested parentheses in the lambda's body correctly
+        # We need to extract just the lambda expression, handling nested structures correctly
         source = self.source[lambda_start:]
+
+        # Track depth of various brackets to ensure we don't split inside valid nested structures apart from trailing
+        # arguments within the condition() call
         paren_level = 0
+        bracket_level = 0
+        brace_level = 0
+
         for i, char in enumerate(source):
             if char == "(":
                 paren_level += 1
-            elif char == ")" and paren_level > 0:
-                paren_level -= 1
-            elif char == ")" and paren_level == 0:
+            elif char == ")":
+                if paren_level > 0:
+                    paren_level -= 1
+                elif paren_level == 0:  # End of expression in a function call
+                    return source[:i]
+            elif char == "[":
+                bracket_level += 1
+            elif char == "]":
+                if bracket_level > 0:
+                    bracket_level -= 1
+            elif char == "{":
+                brace_level += 1
+            elif char == "}":
+                if brace_level > 0:
+                    brace_level -= 1
+            # Only consider comma as a separator when not inside any brackets
+            elif char == "," and paren_level == 0 and bracket_level == 0 and brace_level == 0:
                 return source[:i]
 
         return source

vulcan_core/conditions.py

@@ -8,11 +8,11 @@ import re
 from abc import abstractmethod
 from dataclasses import dataclass, field
 from enum import Enum, auto
+from functools import lru_cache
 from string import Formatter
 from typing import TYPE_CHECKING
 
 from langchain.prompts import ChatPromptTemplate
-from langchain_openai import ChatOpenAI
 from pydantic import BaseModel, Field
 
 from vulcan_core.actions import ASTProcessor
@@ -22,6 +22,11 @@ if TYPE_CHECKING:  # pragma: no cover - not used at runtime
     from langchain_core.language_models import BaseChatModel
     from langchain_core.runnables import RunnableSerializable
 
+import importlib.util
+import logging
+
+logger = logging.getLogger(__name__)
+
 
 @dataclass(frozen=True, slots=True)
 class Expression(DeclaresFacts):
@@ -182,6 +187,7 @@ class LiteralFormatter(Formatter):
 @dataclass(frozen=True, slots=True)
 class AICondition(Condition):
     chain: RunnableSerializable
+    model: BaseChatModel
     system_template: str
     inquiry_template: str
     func: None = field(init=False, default=None)
@@ -238,13 +244,23 @@ def ai_condition(model: BaseChatModel, inquiry: str) -> AICondition:
     )
     structured_model = model.with_structured_output(BooleanDecision)
     chain = prompt_template | structured_model
-    return AICondition(chain=chain, system_template=system, inquiry_template=inquiry, facts=facts)
+    return AICondition(chain=chain, model=model, system_template=system, inquiry_template=inquiry, facts=facts)
 
 
-default_model = ChatOpenAI(model="gpt-4o-mini", temperature=0, max_tokens=100)  # type: ignore[call-arg] - pyright can't see the args for some reason
+@lru_cache(maxsize=1)
+def _detect_default_model() -> BaseChatModel:
+    # TODO: Expand this to detect other providers
+    if importlib.util.find_spec("langchain_openai"):
+        from langchain_openai import ChatOpenAI
+
+        logger.debug("Using OpenAI as the default LLM model provider.")
+        return ChatOpenAI(model="gpt-4o-mini", temperature=0, max_tokens=100)  # type: ignore[call-arg] - pyright can't see the args for some reason
+    else:
+        msg = "Unable to import a default LLM provider. Please install `vulcan_core` with the approriate extras package or specify your custom model explicitly."
+        raise ImportError(msg)
 
 
-def condition(func: ConditionCallable | str) -> Condition:
+def condition(func: ConditionCallable | str, model: BaseChatModel | None  = None) -> Condition:
     """
     Creates a Condition object from a lambda or function. It performs limited static analysis of the code to ensure
     proper usage and discover the facts/attributes accessed by the condition. This allows the rule engine to track
@@ -284,10 +300,14 @@ def condition(func: ConditionCallable | str) -> Condition:
     """
 
     if not isinstance(func, str):
+        # Logic condition assumed, ignore kwargs
         processed = ASTProcessor[ConditionCallable](func, condition, bool)
         return Condition(processed.facts, processed.func)
     else:
-        return ai_condition(default_model, func)
+        # AI condition assumed
+        if not model:
+            model = _detect_default_model()
+        return ai_condition(model, func)
 
 
 # TODO: Create a convenience function for creating OnFactChanged conditions

vulcan_core/models.py

@@ -258,3 +258,6 @@ class RetrieverAdapter(Similarity):
 
     def __len__(self) -> int:
         raise NotImplementedError
+
+    def __str__(self) -> str:
+        return f"RetrieverAdapter(search_type={self.store.search_type})"

{vulcan_core-1.0.0.dist-info → vulcan_core-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: vulcan-core
-Version: 1.0.0
+Version: 1.1.0
 Summary: AI-Hybrid Rules Engine for Logical Reasoning.
 License: Apache-2.0
 Keywords: rules,logic,reasoning,ai,artificial intelligence,RAG,LLM

vulcan_core-1.1.0.dist-info/RECORD

@@ -0,0 +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=dIJgiPaozUZ7ggY9_wksSWO0htG1rxaBJzGpWW3CmUU,12576
+vulcan_core/conditions.py,sha256=znFG9eaIib_iA36kOQJFXySisjgexbNqGUYAw3419c0,13198
+vulcan_core/engine.py,sha256=UtrfNkrokZazW_l3_zmwKyackJLON-mpGvnNmZyjBqM,9313
+vulcan_core/models.py,sha256=gFc5SOE_weoNPZo_kV_R95OYdeOp7L57rKlIwSAwqh4,8584
+vulcan_core/util.py,sha256=THlBzIO9zw7JiKGYB8PIan4oRjsGuNaZpx-lgCmUAVI,3419
+vulcan_core-1.1.0.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+vulcan_core-1.1.0.dist-info/METADATA,sha256=Hw2a87OIUInw-2wpPdXgXLNtx0Ra3r_82r4qsFFrBaI,4349
+vulcan_core-1.1.0.dist-info/NOTICE,sha256=UN1_Gd_Snmu8T62mxExNUdIF2o7DMdGu8bI8rKqhVnc,244
+vulcan_core-1.1.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+vulcan_core-1.1.0.dist-info/RECORD,,

vulcan_core-1.0.0.dist-info/RECORD

@@ -1,12 +0,0 @@
-vulcan_core/__init__.py,sha256=pjCnmbMjrsp672WXRQeOV0aSKUEoA_mj0o7q_ouMWs8,1057
-vulcan_core/actions.py,sha256=RO5w5X-drxtDY_mVv0xR2njasWkGPt1AZo9RXsBi8X0,917
-vulcan_core/ast_utils.py,sha256=eNFcgmUaAXfkMjNy8rF2LDHslqj-4l2bqiUns_80fXY,11818
-vulcan_core/conditions.py,sha256=3TuXSd7UNlpwQnPy-5YJ-6zNGNZcW7b4iMGzo3fzBQE,12423
-vulcan_core/engine.py,sha256=UtrfNkrokZazW_l3_zmwKyackJLON-mpGvnNmZyjBqM,9313
-vulcan_core/models.py,sha256=j9uA4MjzemN4BCVvifqAdFCanUguMeafhulr6GiI49Q,8480
-vulcan_core/util.py,sha256=THlBzIO9zw7JiKGYB8PIan4oRjsGuNaZpx-lgCmUAVI,3419
-vulcan_core-1.0.0.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-vulcan_core-1.0.0.dist-info/METADATA,sha256=q4hqsr_6-G5pCkPFMeZcpgJYn7iq5vAKDYtax9rx4Dk,4349
-vulcan_core-1.0.0.dist-info/NOTICE,sha256=UN1_Gd_Snmu8T62mxExNUdIF2o7DMdGu8bI8rKqhVnc,244
-vulcan_core-1.0.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-vulcan_core-1.0.0.dist-info/RECORD,,