olca 0.2.38__tar.gz → 0.2.40__tar.gz

{olca-0.2.38 → olca-0.2.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: olca
-Version: 0.2.38
+Version: 0.2.40
 Summary: A Python package for experimental usage of Langchain and Human-in-the-Loop
 Home-page: https://github.com/jgwill/olca
 Author: Jean GUillaume ISabelle

{olca-0.2.38 → olca-0.2.40}/olca/olcacli.py

@@ -5,7 +5,7 @@ import dotenv
 from langchain import hub
 import argparse
 import yaml
-import fusewill_utils as fu
+from olca.utils import load_environment, initialize_langfuse
 
 #jgwill/olca1
 #olca1_prompt = hub.pull("jgwill/olca1") #Future use
@@ -137,6 +137,10 @@ def extract_extra_directories_from_olca_config_system_and_user_input(system_inst
 def print_stream(stream):
     for s in stream:
         try:
+            # Skip Langfuse internal state messages
+            if isinstance(s, dict) and 'keep_alive' in s and 'states' in s:
+                continue
+                
             # Handle different response formats
             if isinstance(s, dict) and "messages" in s:
                 message = s["messages"][-1]
@@ -145,10 +149,16 @@ def print_stream(stream):
                 
             if isinstance(message, tuple):
                 print(message)
-            else:
+            elif hasattr(message, 'content'):
                 print(message.content)
+            else:
+                # Only print if it's not a system message
+                if not (isinstance(s, dict) and any(k in s for k in ['keep_alive', 'states'])):
+                    print(s)
         except Exception as e:
-            print(s)
+            # Only print if it's not a system message
+            if not (isinstance(s, dict) and any(k in s for k in ['keep_alive', 'states'])):
+                print(s)
 
 def prepare_input(user_input, system_instructions,append_prompt=True, human=False):
     appended_prompt = system_instructions + SYSTEM_PROMPT_APPEND if append_prompt else system_instructions
@@ -177,15 +187,6 @@ def _parse_args():
 
 from olca.tracing import TracingManager
 
-def load_environment():
-    # Load .env from current directory
-    dotenv.load_dotenv(dotenv_path=os.path.join(os.getcwd(), ".env"))
-    
-    # Try loading from home directory if keys are missing
-    if not all([os.getenv(key) for key in ["LANGFUSE_PUBLIC_KEY", "LANGFUSE_SECRET_KEY", "LANGFUSE_HOST", 
-                                          "LANGCHAIN_API_KEY", "OPENAI_API_KEY"]]):
-        dotenv.load_dotenv(dotenv_path=os.path.expanduser("~/.env"))
-
 def main():
     args = _parse_args()
     olca_config_file = 'olca.yml'
@@ -193,6 +194,9 @@ def main():
     # Load environment variables first
     load_environment()
     
+    # Initialize Langfuse if needed
+    langfuse = initialize_langfuse()
+    
     if args.init:
         if os.path.exists(olca_config_file):
             print("Error: Configuration file already exists. Cannot run 'olca init'.")

{olca-0.2.38 → olca-0.2.40}/olca/tracing.py

@@ -1,6 +1,7 @@
 import os
 from langfuse.callback import CallbackHandler as LangfuseCallbackHandler
 from langfuse import Langfuse
+from olca.utils import initialize_langfuse
 
 class TracingManager:
     def __init__(self, config):
@@ -29,16 +30,11 @@ class TracingManager:
             os.environ["LANGCHAIN_TRACING_V2"] = "true"
 
     def _setup_langfuse(self):
-        required_vars = ["LANGFUSE_PUBLIC_KEY", "LANGFUSE_SECRET_KEY", "LANGFUSE_HOST"]
-        if not all(os.getenv(var) for var in required_vars):
+        langfuse = initialize_langfuse()
+        if not langfuse:
             print("Warning: Missing Langfuse environment variables")
             return None
             
-        Langfuse(
-            public_key=os.getenv("LANGFUSE_PUBLIC_KEY"),
-            secret_key=os.getenv("LANGFUSE_SECRET_KEY"),
-            host=os.getenv("LANGFUSE_HOST")
-        )
         return LangfuseCallbackHandler()
 
     def get_callbacks(self):

olca-0.2.40/olca/utils.py

@@ -0,0 +1,24 @@
+import os
+import sys
+import dotenv
+import webbrowser
+from langfuse import Langfuse
+
+def load_environment():
+    dotenv.load_dotenv(dotenv_path=os.path.join(os.getcwd(), ".env"))
+    
+    # Try loading from home directory if variables are still not set
+    if not all([os.getenv(key) for key in ["LANGFUSE_PUBLIC_KEY", "LANGFUSE_SECRET_KEY", "LANGFUSE_HOST", 
+                                          "LANGCHAIN_API_KEY", "OPENAI_API_KEY"]]):
+        dotenv.load_dotenv(dotenv_path=os.path.expanduser("~/.env"))
+
+def initialize_langfuse():
+    required_vars = ["LANGFUSE_PUBLIC_KEY", "LANGFUSE_SECRET_KEY", "LANGFUSE_HOST"]
+    if not all(os.getenv(var) for var in required_vars):
+        return None
+    
+    return Langfuse(
+        public_key=os.getenv("LANGFUSE_PUBLIC_KEY"),
+        secret_key=os.getenv("LANGFUSE_SECRET_KEY"),
+        host=os.getenv("LANGFUSE_HOST")
+    )

{olca-0.2.38 → olca-0.2.40}/olca.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: olca
-Version: 0.2.38
+Version: 0.2.40
 Summary: A Python package for experimental usage of Langchain and Human-in-the-Loop
 Home-page: https://github.com/jgwill/olca
 Author: Jean GUillaume ISabelle

{olca-0.2.38 → olca-0.2.40}/olca.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ olca/fusewill_cli.py
 olca/fusewill_utils.py
 olca/olcacli.py
 olca/tracing.py
+olca/utils.py
 olca.egg-info/PKG-INFO
 olca.egg-info/SOURCES.txt
 olca.egg-info/dependency_links.txt

{olca-0.2.38 → olca-0.2.40}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "olca"
-version = "0.2.38"
+version = "0.2.40"
 
 description = "A Python package for experimental usage of Langchain and Human-in-the-Loop"
 readme = "README.md"

{olca-0.2.38 → olca-0.2.40}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='olca',
-    version = "0.2.38",
+    version = "0.2.40",
     author='Jean GUillaume ISabelle',
     author_email='jgi@jgwill.com',
     description='A Python package for experimenting with Langchain agent and interactivity in Terminal modalities.',