olca 0.2.65__tar.gz → 0.2.71__tar.gz

{olca-0.2.65 → olca-0.2.71}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: olca
-Version: 0.2.65
+Version: 0.2.71
 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.65 → olca-0.2.71}/olca/oiv.py

@@ -76,7 +76,7 @@ def serialize_response_to_json_file(resp, filename):
     f.write(json_str)
     
 def serialize_response_to_markdown(o):
-    output=o["output"]["output"]
+    output=o["output"]
     string_md="# Output\n"
     #string_md+=f"## Model\n{o['model']}\n"
     #string_md+=f"## Prompt\n{o['prompt']['prompt']}\n"
@@ -99,7 +99,7 @@ def main():
     resp = ask_agent(input_request,tool_hub_tag=tool_hub_tag,chatbot_model=args.chatbot_model)
     outdir=os.path.join(os.getcwd(),"output")
     os.makedirs(outdir, exist_ok=True)
-    out_filename = f"{args.prefix}output-{tlid.get_minutes()}.json"
+    out_filename = f"{args.prefix}{tlid.get_minutes()}.json"
     outfile=os.path.join(outdir,out_filename)
     o={}
     prompt_dict = {

{olca-0.2.65 → olca-0.2.71}/olca/olcacli.py

@@ -161,9 +161,6 @@ def main():
     # Load environment variables first
     load_environment()
     
-    # Initialize Langfuse if needed
-    langfuse = initialize_langfuse(debug=True if args.debug else False)
-    
     if args.init:
         if os.path.exists(olca_config_file):
             print("Error: Configuration file already exists. Cannot run 'olca init'.")
@@ -179,6 +176,12 @@ def main():
         return
 
     config = load_config(olca_config_file)
+
+    tracing_providers = config.get('tracing_providers', [])
+    if 'langfuse' in tracing_providers:
+        langfuse = initialize_langfuse(debug=True if args.debug else False)
+    else:
+        langfuse = None
     
     # Initialize tracing
     tracing_manager = TracingManager(config)
@@ -225,8 +228,18 @@ def main():
     provider, base_model, host = parse_model_uri(model_name)
     
     if provider == "ollama":
-        from langchain_ollama import OllamaLLM
-        model = OllamaLLM(model=base_model, base_url=host if host else None)
+        import ollama
+        from langchain_ollama import ChatOllama
+        try:
+            ollama.Client(host=host if host else None).show(base_model)
+        except:
+            print(f"Model {base_model} not found, pulling it...")
+            pull_stream = ollama.Client(host=host if host else None).pull(base_model, stream=True)
+            for chunk in pull_stream:
+                pass
+            print(f"\nPulled {base_model}")
+
+        model = ChatOllama(model=base_model, host=host if host else None)
         
     elif provider == "openai":
         from langchain_openai import ChatOpenAI

{olca-0.2.65 → olca-0.2.71}/olca/olcahelper.py

@@ -43,9 +43,15 @@ def initialize_config_file():
             "temperature": float(input("temperature [0]: ") or default_temperature),
             "human": input("human [true]: ").lower() in ["true", "yes", "y", "1", ""] or use_default_human_input,
             "tracing": input("tracing [true]: ").lower() in ["true", "yes", "y", "1", ""] or use_default_tracing,
-            "tracing_providers": ["langsmith", "langfuse"]
         }
-        
+
+        tracing_providers = []
+        if input("Use langsmith for tracing? [Y/n]: ").lower() in ["y", "yes", ""]:
+            tracing_providers.append("langsmith")
+        if input("Use langfuse for tracing? [Y/n]: ").lower() in ["y", "yes", ""]:
+            tracing_providers.append("langfuse")
+        config["tracing_providers"] = tracing_providers
+
         user_system_instructions = input(f"system_instructions [{default_system_instructions}]: ")
         user_system_instructions = user_system_instructions or default_system_instructions
         user_system_instructions = user_system_instructions.replace("\n", " ").replace("\r", " ").replace("\t", " ")

{olca-0.2.65 → olca-0.2.71}/olca/tracing.py

@@ -1,6 +1,4 @@
 import os
-from langfuse.callback import CallbackHandler as LangfuseCallbackHandler
-from langfuse import Langfuse
 from olca.utils import initialize_langfuse
 import warnings
 
@@ -35,6 +33,8 @@ class TracingManager:
             os.environ["LANGCHAIN_TRACING_V2"] = "true"
 
     def _setup_langfuse(self):
+        from langfuse.callback import CallbackHandler as LangfuseCallbackHandler
+        from langfuse import Langfuse
         self.langfuse = initialize_langfuse()
         if not self.langfuse:
             print("Warning: Missing Langfuse environment variables")

{olca-0.2.65 → olca-0.2.71}/olca/utils.py

@@ -2,7 +2,6 @@ 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"))
@@ -13,6 +12,7 @@ def load_environment():
         dotenv.load_dotenv(dotenv_path=os.path.expanduser("~/.env"))
 
 def initialize_langfuse( debug=False):
+    from langfuse import Langfuse
     required_vars = ["LANGFUSE_PUBLIC_KEY", "LANGFUSE_SECRET_KEY", "LANGFUSE_HOST"]
     if not all(os.getenv(var) for var in required_vars):
         return None

{olca-0.2.65 → olca-0.2.71}/olca.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: olca
-Version: 0.2.65
+Version: 0.2.71
 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.65 → olca-0.2.71}/pyproject.toml

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

{olca-0.2.65 → olca-0.2.71}/setup.py

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