olca 0.2.33__tar.gz → 0.2.35__tar.gz

{olca-0.2.33 → olca-0.2.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: olca
-Version: 0.2.33
+Version: 0.2.35
 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.33 → olca-0.2.35}/olca/fusewill_cli.py

@@ -1,3 +1,4 @@
+from ast import alias
 import os
 import sys
 sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
@@ -12,7 +13,8 @@ from fusewill_utils import (
     get_trace_by_id,
     open_trace_in_browser,
     print_traces,
-    print_trace
+    print_trace,
+    list_traces_by_score  # Ensure the updated function is imported
 )
 import dotenv
 import json
@@ -30,24 +32,24 @@ def get_single_char_input():
     return ch
 
 def main():
-    parser = argparse.ArgumentParser(description="Langfuse CLI Wrapper")
+    parser = argparse.ArgumentParser(description="FuseWill Langfuse CLI Wrapper")
     subparsers = parser.add_subparsers(dest="command", help="Available commands")
 
     # list_traces command
     parser_list = subparsers.add_parser('list_traces', help='List traces',aliases=['lt'])
-    parser_list.add_argument('--limit', type=int, default=100, help='Number of traces to fetch')
+    parser_list.add_argument('-L','--limit', type=int, default=100, help='Number of traces to fetch')
     parser_list.add_argument('--output_dir', type=str, default='../output/traces', help='Directory to save traces')
     parser_list.add_argument('-C','--comments',  action='store_true', help='Show comments from the traces', default=False)
     parser_list.add_argument('-W','--browse-interact', action='store_true', help='Ask user to open each trace in browser')
 
     # create_dataset command
-    parser_create_dataset = subparsers.add_parser('create_dataset', help='Create a new dataset')
+    parser_create_dataset = subparsers.add_parser('create_dataset', help='Create a new dataset',aliases=['cd'])
     parser_create_dataset.add_argument('name', help='Name of the dataset')
-    parser_create_dataset.add_argument('--description', default='', help='Description of the dataset')
-    parser_create_dataset.add_argument('--metadata', type=str, default='{}', help='Metadata in JSON format')
+    parser_create_dataset.add_argument('-D','--description', default='', help='Description of the dataset')
+    parser_create_dataset.add_argument('-M','--metadata', type=str, default='{}', help='Metadata in JSON format')
 
     # create_prompt command
-    parser_create_prompt = subparsers.add_parser('create_prompt', help='Create a new prompt')
+    parser_create_prompt = subparsers.add_parser('create_prompt', help='Create a new prompt',aliases=['cp'])
     parser_create_prompt.add_argument('name', help='Name of the prompt')
     parser_create_prompt.add_argument('prompt_text', help='Prompt text')
     parser_create_prompt.add_argument('--model_name', default='gpt-4o-mini', help='Model name')
@@ -56,7 +58,7 @@ def main():
     parser_create_prompt.add_argument('--supported_languages', nargs='*', default=[], help='Supported languages')
 
     # update_prompt command
-    parser_update_prompt = subparsers.add_parser('update_prompt', help='Update an existing prompt')
+    parser_update_prompt = subparsers.add_parser('update_prompt', help='Update an existing prompt',aliases=['up'])
     parser_update_prompt.add_argument('name', help='Name of the prompt')
     parser_update_prompt.add_argument('new_prompt_text', help='New prompt text')
 
@@ -65,11 +67,11 @@ def main():
     parser_delete_dataset.add_argument('name', help='Name of the dataset')
 
     # get_trace_by_id command
-    parser_get_trace = subparsers.add_parser('get_trace_by_id', help='Get a trace by ID')
+    parser_get_trace = subparsers.add_parser('get_trace_by_id', help='Get a trace by ID',aliases=['gt'])
     parser_get_trace.add_argument('trace_id', help='Trace ID')
 
     # new_score command
-    parser_new_score = subparsers.add_parser('new_score', help='Create a new score')
+    parser_new_score = subparsers.add_parser('new_score', help='Create a new score',aliases=['ns'])
     parser_new_score.add_argument('name', help='Score name')
     parser_new_score.add_argument('data_type', help='Data type of the score')
     parser_new_score.add_argument('--description', default='', help='Description of the score')
@@ -84,11 +86,11 @@ def main():
     parser_add_score.add_argument('--comment', default='', help='Comment for the score')
 
     # list_traces_by_score command
-    parser_list_by_score = subparsers.add_parser('list_traces_by_score', help='List traces by score')
+    parser_list_by_score = subparsers.add_parser('list_traces_by_score', help='List traces by score', aliases=['ltbs','lbys','lts'])
     parser_list_by_score.add_argument('score_name', help='Score name')
     parser_list_by_score.add_argument('--min_value', type=float, help='Minimum score value')
     parser_list_by_score.add_argument('--max_value', type=float, help='Maximum score value')
-    parser_list_by_score.add_argument('--limit', type=int, default=100, help='Number of traces to fetch')
+    parser_list_by_score.add_argument('-L','--limit', type=int, default=100, help='Number of traces to fetch')
 
     args = parser.parse_args()
 
@@ -115,7 +117,7 @@ def main():
                 elif resp == 'q':
                     print("Quitting.")
                     break
-    elif args.command == 'create_dataset':
+    elif args.command == 'create_dataset' or args.command == 'cd':
         metadata = json.loads(args.metadata)
         create_dataset(name=args.name, description=args.description, metadata=metadata)
     elif args.command == 'create_prompt':
@@ -127,16 +129,16 @@ def main():
             labels=args.labels,
             supported_languages=args.supported_languages
         )
-    elif args.command == 'update_prompt':
+    elif args.command == 'update_prompt' or args.command == 'up':
         update_prompt(name=args.name, new_prompt_text=args.new_prompt_text)
     elif args.command == 'delete_dataset':
         delete_dataset(name=args.name)
-    elif args.command == 'get_trace_by_id':
+    elif args.command == 'get_trace_by_id' or args.command == 'gt' :
         trace = get_trace_by_id(trace_id=args.trace_id)
         print(trace)
-    elif args.command == 'new_score':
+    elif args.command == 'new_score' or args.command == 'ns':
         fu.create_score(name=args.name, data_type=args.data_type, description=args.description)
-    elif args.command == 'add_score_to_trace':
+    elif args.command == 'add_score_to_trace' or args.command == 's2t':
         if not fu.score_exists(name=args.name):
             fu.create_score(name=args.name, data_type=args.data_type)
         fu.add_score_to_a_trace(
@@ -147,7 +149,7 @@ def main():
             data_type=args.data_type,
             comment=args.comment
         )
-    elif args.command == 'list_traces_by_score':
+    elif args.command == 'list_traces_by_score' or args.command == 'ltbs' or args.command == 'lbys' or args.command == 'lts':
         traces = fu.list_traces_by_score(
             score_name=args.score_name,
             min_value=args.min_value,
@@ -155,7 +157,8 @@ def main():
             limit=args.limit
         )
         for trace in traces:
-            print(f"Trace ID: {trace.id}, Name: {trace.name}")
+            print_trace(trace)
+            #print(f"Trace ID: {trace.id}, Name: {trace.name}")
     else:
         parser.print_help()
         exit(1)

{olca-0.2.33 → olca-0.2.35}/olca/fusewill_utils.py

@@ -3,6 +3,7 @@ import sys
 import json
 import dotenv
 import webbrowser
+import requests  # Add this import
 
 # Load .env from the current working directory
 dotenv.load_dotenv(dotenv_path=os.path.join(os.getcwd(), ".env"))
@@ -53,15 +54,32 @@ def open_trace_in_browser(trace_id):
     print(f"Opening {full_url}")
     webbrowser.open(full_url)
 
+def get_score_by_id(score_id):
+    """Retrieve score details by score ID."""
+    base_url = os.environ.get("LANGFUSE_HOST")
+    public_key = os.environ.get("LANGFUSE_PUBLIC_KEY")
+    secret_key = os.environ.get("LANGFUSE_SECRET_KEY")
+    url = f"{base_url}/api/public/scores/{score_id}"
+    try:
+        response = requests.get(url, auth=(public_key, secret_key))
+        response.raise_for_status()
+        return response.json()
+    except Exception as e:
+        print(f"Error retrieving score {score_id}: {e}")
+        return None
+
 def print_trace(trace, show_comments=False):
     print(f"<Trace \n\tat=\"{trace.createdAt}\" \n\tid=\"{trace.id}\" \n\tname=\"{trace.name}\" \n\tsession_id=\"{trace.session_id}\" \n\tprojectId=\"{trace.projectId}\" >")
     print(f"<Input><CDATA[[\n{trace.input}\n]]></Input>")
     print(f"<Output><CDATA[[\n{trace.output}\n]]></Output>")
-    print(f"<Metadata>{trace.metadata}</Metadata>")
+    if trace.metadata:
+        print(f"<Metadata>{trace.metadata}</Metadata>")
     if trace.scores:
         print("<Scores>")
-        for score in trace.scores:
-            print(f"{score}")
+        for score_id in trace.scores:
+            score = get_score_by_id(score_id)
+            if score:
+                print(f"<Score name=\"{score['name']}\" value=\"{score['value']}\" data_type=\"{score['dataType']}\" />")
         print("</Scores>")
     if show_comments and hasattr(trace, "comments"):
         print(f"<Comments>\n{trace.comments}\n</Comments>")
@@ -80,9 +98,10 @@ def list_traces_by_score(score_name, min_value=None, max_value=None, limit=100):
     traces = langfuse.get_traces(limit=limit)
     filtered_traces = []
     for trace in traces.data:
-        for score in trace.scores:
-            if score.name == score_name:
-                if (min_value is None or score.value >= min_value) and (max_value is None or score.value <= max_value):
+        for score_id in trace.scores:
+            score = get_score_by_id(score_id)
+            if score and score.get('name') == score_name:
+                if (min_value is None or score.get('value') >= min_value) and (max_value is None or score.get('value') <= max_value):
                     filtered_traces.append(trace)
                     break
     return filtered_traces

{olca-0.2.33 → olca-0.2.35}/olca/olcacli.py

@@ -166,6 +166,8 @@ def _parse_args():
     parser.add_argument("-y", "--yes", action="store_true", help="Accept the new file olca.yml")
     return parser.parse_args()
 
+from olca.tracing import TracingManager
+
 def main():
     args = _parse_args()
     olca_config_file = 'olca.yml'
@@ -186,6 +188,10 @@ def main():
 
     config = load_config(olca_config_file)
     
+    # Initialize tracing
+    tracing_manager = TracingManager(config)
+    callbacks = tracing_manager.get_callbacks()
+    
     # Check for tracing flag in config and CLI
     tracing_enabled = config.get('tracing', False) or args.tracing or os.getenv("LANGCHAIN_TRACING_V2") == "true"
     if tracing_enabled:
@@ -286,7 +292,7 @@ def main():
     
 
     try:
-        print_stream(graph.stream(inputs, stream_mode="values"))
+        print_stream(graph.stream(inputs, config={"callbacks": callbacks} if callbacks else None))
     except GraphRecursionError as e:
         #print(f"Error: {e}")
         print("Recursion limit reached. Please increase the 'recursion_limit' in the olca_config.yaml file.")
@@ -317,7 +323,8 @@ def initialize_config_file():
             "recursion_limit": int(input("recursion_limit [12]: ") or default_recursion_limit),
             "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": input("tracing [true]: ").lower() in ["true", "yes", "y", "1", ""] or use_default_tracing,
+            "tracing_providers": ["langsmith", "langfuse"]
         }
         
         user_system_instructions = input(f"system_instructions [{default_system_instructions}]: ")

olca-0.2.35/olca/tracing.py

@@ -0,0 +1,46 @@
+import os
+from langfuse.callback import CallbackHandler as LangfuseCallbackHandler
+import langsmith
+
+class TracingManager:
+    def __init__(self, config):
+        self.config = config
+        self.handlers = []
+        self.initialize_tracing()
+
+    def initialize_tracing(self):
+        tracing_enabled = self.config.get('tracing', False)
+        providers = self.config.get('tracing_providers', ['langsmith'])
+
+        if not tracing_enabled:
+            return
+
+        if 'langsmith' in providers:
+            handler = self._setup_langsmith()
+            if handler:
+                self.handlers.append(handler)
+
+        if 'langfuse' in providers:
+            handler = self._setup_langfuse()
+            if handler:
+                self.handlers.append(handler)
+
+    def _setup_langsmith(self):
+        os.environ["LANGCHAIN_TRACING_V2"] = "true"
+        api_key = os.getenv("LANGCHAIN_API_KEY") or os.getenv("LANGSMITH_API_KEY")
+        
+        if not api_key:
+            print("Warning: LANGCHAIN_API_KEY/LANGSMITH_API_KEY not set for LangSmith tracing")
+            return None
+            
+        return langsmith.Client(api_key=api_key)
+
+    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")
+            return None
+            
+        return LangfuseCallbackHandler()
+
+    def get_callbacks(self):
+        return self.handlers if self.handlers else None

{olca-0.2.33 → olca-0.2.35}/olca.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: olca
-Version: 0.2.33
+Version: 0.2.35
 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.33 → olca-0.2.35}/olca.egg-info/SOURCES.txt

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

{olca-0.2.33 → olca-0.2.35}/pyproject.toml

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

{olca-0.2.33 → olca-0.2.35}/setup.py

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