olca 0.2.36__py3-none-any.whl → 0.2.38__py3-none-any.whl

olca/olcacli.py

@@ -5,6 +5,7 @@ import dotenv
 from langchain import hub
 import argparse
 import yaml
+import fusewill_utils as fu
 
 #jgwill/olca1
 #olca1_prompt = hub.pull("jgwill/olca1") #Future use
@@ -135,11 +136,19 @@ def extract_extra_directories_from_olca_config_system_and_user_input(system_inst
 
 def print_stream(stream):
     for s in stream:
-        message = s["messages"][-1]
-        if isinstance(message, tuple):
-            print(message)
-        else:
-            message.pretty_print()
+        try:
+            # Handle different response formats
+            if isinstance(s, dict) and "messages" in s:
+                message = s["messages"][-1]
+            else:
+                message = s
+                
+            if isinstance(message, tuple):
+                print(message)
+            else:
+                print(message.content)
+        except Exception as e:
+            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
@@ -168,10 +177,22 @@ 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'
     
+    # Load environment variables first
+    load_environment()
+    
     if args.init:
         if os.path.exists(olca_config_file):
             print("Error: Configuration file already exists. Cannot run 'olca init'.")
@@ -197,6 +218,14 @@ def main():
     if tracing_enabled and not callbacks:
         print("Warning: Tracing enabled but no handlers configured")
 
+    if tracing_enabled:
+        # Verify Langfuse configuration
+        if not all([os.getenv(key) for key in ["LANGFUSE_PUBLIC_KEY", "LANGFUSE_SECRET_KEY", "LANGFUSE_HOST"]]):
+            print("Warning: Langfuse environment variables missing")
+        # Verify LangSmith configuration
+        if not os.getenv("LANGCHAIN_API_KEY"):
+            print("Warning: LANGCHAIN_API_KEY not set")
+
     try:
             
         api_key_variable = "OPENAI_API_KEY"

olca/tracing.py

@@ -1,5 +1,6 @@
 import os
 from langfuse.callback import CallbackHandler as LangfuseCallbackHandler
+from langfuse import Langfuse
 
 class TracingManager:
     def __init__(self, config):
@@ -28,10 +29,16 @@ class TracingManager:
             os.environ["LANGCHAIN_TRACING_V2"] = "true"
 
     def _setup_langfuse(self):
-        if not (os.getenv("LANGFUSE_PUBLIC_KEY") and os.getenv("LANGFUSE_SECRET_KEY")):
-            print("Warning: LANGFUSE_PUBLIC_KEY/LANGFUSE_SECRET_KEY not set for Langfuse tracing")
+        required_vars = ["LANGFUSE_PUBLIC_KEY", "LANGFUSE_SECRET_KEY", "LANGFUSE_HOST"]
+        if not all(os.getenv(var) for var in required_vars):
+            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.36.dist-info → olca-0.2.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: olca
-Version: 0.2.36
+Version: 0.2.38
 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.dist-info/RECORD

@@ -0,0 +1,11 @@
+olca/__init__.py,sha256=3QyLLAys_KiiDIe-cfO_7QyY7di_qCaCS-sVziW2BOw,23
+olca/fusewill_cli.py,sha256=Gf8CaYs7Uo4NH8QfgRNYalpmSUo047p9rzdkvIABHi8,7872
+olca/fusewill_utils.py,sha256=IOIElqWCIsNzePlS1FZa5_35vySYLwbMUGW6UhNefIc,6065
+olca/olcacli.py,sha256=VXXGfUAxrWTI_EM-TRpDNo2Cop3MRZWgQfN_S0HJwNc,15777
+olca/tracing.py,sha256=OexV2i7d7-tLN9XYTL9D9gGh0y0uYcfQK7_eIDNX2Iw,1495
+olca-0.2.38.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+olca-0.2.38.dist-info/METADATA,sha256=YHvmI1c0vXi6yjFquHAWj1ZKBSuOMcHTJOBZiUQz100,25311
+olca-0.2.38.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+olca-0.2.38.dist-info/entry_points.txt,sha256=AhP5FMv6vnOq9C76V_vxRVIO50smnZXG4RIY47oD2_U,103
+olca-0.2.38.dist-info/top_level.txt,sha256=bGDtAReS-xlS0F6MM-DyD0IQUqjNdWmgemnM3vNtrpI,5
+olca-0.2.38.dist-info/RECORD,,

olca-0.2.36.dist-info/RECORD

@@ -1,11 +0,0 @@
-olca/__init__.py,sha256=3QyLLAys_KiiDIe-cfO_7QyY7di_qCaCS-sVziW2BOw,23
-olca/fusewill_cli.py,sha256=Gf8CaYs7Uo4NH8QfgRNYalpmSUo047p9rzdkvIABHi8,7872
-olca/fusewill_utils.py,sha256=IOIElqWCIsNzePlS1FZa5_35vySYLwbMUGW6UhNefIc,6065
-olca/olcacli.py,sha256=MBWanmGn1vWiy0S2lhe_dJc7u-B14n3ywA7lEP4qttM,14578
-olca/tracing.py,sha256=A6K9K_mhCPS1_NncFv2-7hbeMkqfKT3XgUCERusbIYE,1248
-olca-0.2.36.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-olca-0.2.36.dist-info/METADATA,sha256=ovFeWWj5Xn2It7PqskYfvDNCSW0MjjO9bTKhb3y8DyY,25311
-olca-0.2.36.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-olca-0.2.36.dist-info/entry_points.txt,sha256=AhP5FMv6vnOq9C76V_vxRVIO50smnZXG4RIY47oD2_U,103
-olca-0.2.36.dist-info/top_level.txt,sha256=bGDtAReS-xlS0F6MM-DyD0IQUqjNdWmgemnM3vNtrpI,5
-olca-0.2.36.dist-info/RECORD,,