olca 0.2.31__tar.gz → 0.2.33__tar.gz

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

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

@@ -9,20 +9,36 @@ from fusewill_utils import (
     create_prompt,
     update_prompt,
     delete_dataset,
-    get_trace_by_id
+    get_trace_by_id,
+    open_trace_in_browser,
+    print_traces,
+    print_trace
 )
 import dotenv
 import json
+import sys, termios, tty
 #dotenv.load_dotenv()
 
+def get_single_char_input():
+    fd = sys.stdin.fileno()
+    old_settings = termios.tcgetattr(fd)
+    try:
+        tty.setraw(fd)
+        ch = sys.stdin.read(1)
+    finally:
+        termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
+    return ch
+
 def main():
     parser = argparse.ArgumentParser(description="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')
+    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('--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')
@@ -76,8 +92,29 @@ def main():
 
     args = parser.parse_args()
 
-    if args.command == 'list_traces':
-        list_traces(limit=args.limit, output_dir=args.output_dir)
+    if args.command == 'list_traces' or args.command == 'lt':
+        show_comments_flag = args.comments if args.comments else False
+        traces = list_traces(
+            limit=args.limit, 
+            output_dir=args.output_dir
+        )
+        if not args.browse_interact:
+            print_traces(traces, show_comments=show_comments_flag)
+        else:
+            for trace in traces.data:
+                print_trace(trace, show_comments=show_comments_flag)
+                print("Open this trace in browser (Y/N/Q)? ", end='', flush=True)
+                try:
+                    resp = get_single_char_input().lower()
+                except KeyboardInterrupt:
+                    print("\nExiting.")
+                    sys.exit(0)
+                print(resp)  # Echo the character
+                if resp == 'y':
+                    open_trace_in_browser(trace.id)
+                elif resp == 'q':
+                    print("Quitting.")
+                    break
     elif args.command == 'create_dataset':
         metadata = json.loads(args.metadata)
         create_dataset(name=args.name, description=args.description, metadata=metadata)
@@ -121,6 +158,7 @@ def main():
             print(f"Trace ID: {trace.id}, Name: {trace.name}")
     else:
         parser.print_help()
+        exit(1)
 
 if __name__ == '__main__':
     main()

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

@@ -2,12 +2,13 @@ import os
 import sys
 import json
 import dotenv
+import webbrowser
 
 # Load .env from the current working directory
 dotenv.load_dotenv(dotenv_path=os.path.join(os.getcwd(), ".env"))
 
 # Try loading from home directory if variables are still not set
-if not os.environ.get("LANGFUSE_PUBLIC_KEY") or not os.environ.get("LANGFUSE_SECRET_KEY"):
+if not os.environ.get("LANGFUSE_PUBLIC_KEY") or not os.environ.get("LANGFUSE_SECRET_KEY") or not os.environ.get("LANGFUSE_HOST"):
     dotenv.load_dotenv(dotenv_path=os.path.expanduser("~/.env"))
 
 # Final check before exiting
@@ -16,6 +17,8 @@ if not os.environ.get("LANGFUSE_PUBLIC_KEY"):
     missing_vars.append("LANGFUSE_PUBLIC_KEY")
 if not os.environ.get("LANGFUSE_SECRET_KEY"):
     missing_vars.append("LANGFUSE_SECRET_KEY")
+if not os.environ.get("LANGFUSE_HOST"):
+    missing_vars.append("LANGFUSE_HOST")
 
 if missing_vars:
     print(f"Error: {', '.join(missing_vars)} not found.")
@@ -28,17 +31,49 @@ sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
 import json
 
 import dotenv
+_DEBUG_=False
+if _DEBUG_:
+    print(os.environ.get("LANGFUSE_PUBLIC_KEY"))
+    print(os.environ.get("LANGFUSE_SECRET_KEY"))
+    print(os.environ.get("LANGFUSE_HOST"))
 
-langfuse = Langfuse()
+langfuse = Langfuse(
+    public_key=os.environ.get("LANGFUSE_PUBLIC_KEY"),
+    secret_key=os.environ.get("LANGFUSE_SECRET_KEY"),
+    host=os.environ.get("LANGFUSE_HOST")
+)
 
-def list_traces(limit=100, output_dir="../output/traces"):
+def open_trace_in_browser(trace_id):
+    base_url = os.environ.get("LANGFUSE_HOST")
+    project_id = os.environ.get("LANGFUSE_PROJECT_ID")
+    if not base_url or not project_id:
+        print("Missing LANGFUSE_HOST or LANGFUSE_PROJECT_ID")
+        return
+    full_url = f"{base_url}/project/{project_id}/traces/{trace_id}"
+    print(f"Opening {full_url}")
+    webbrowser.open(full_url)
+
+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.scores:
+        print("<Scores>")
+        for score in trace.scores:
+            print(f"{score}")
+        print("</Scores>")
+    if show_comments and hasattr(trace, "comments"):
+        print(f"<Comments>\n{trace.comments}\n</Comments>")
+    print("</Trace>")
+
+def print_traces(traces, show_comments=False):
+    for trace in traces.data:
+        print_trace(trace, show_comments)
+
+def list_traces(limit=100, output_dir="../output/traces", show_comments=False):
     traces = langfuse.get_traces(limit=limit)
     os.makedirs(output_dir, exist_ok=True)
-    for trace in traces.data:
-        print(f"-----Trace ID: {trace.id}--Name: {trace.name}----------")
-        print(f"<output>{trace.output}</output>")
-        print(f"<Metadata>{trace.metadata}</Metadata>")
-        print("---")
     return traces
 
 def list_traces_by_score(score_name, min_value=None, max_value=None, limit=100):
@@ -62,11 +97,16 @@ def add_score_to_a_trace(trace_id, generation_id, name, value, data_type="NUMERI
         comment=comment
     )
 
-def create_score(name, data_type, description=""):
-    langfuse.create_score(
+def create_score(name, data_type, description="", possible_values=None, min_value=None, max_value=None):
+    langfuse.score(
         name=name,
+        value="",  # Provide a placeholder value
         data_type=data_type,
-        description=description
+        description=description,
+        # For categorical:
+        **({"possible_values": possible_values} if data_type == "CATEGORICAL" and possible_values else {}),
+        # For numeric:
+        **({"min_value": min_value, "max_value": max_value} if data_type == "NUMERIC" and min_value is not None and max_value is not None else {})
     )
 
 def score_exists(name):

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

@@ -177,11 +177,11 @@ def main():
         if args.yes:
             pass
         else:
-            generate_config_example()
+            initialize_config_file()
             return
     
     if not os.path.exists(olca_config_file):
-        generate_config_example()
+        initialize_config_file()
         return
 
     config = load_config(olca_config_file)
@@ -269,6 +269,9 @@ def main():
         else:
             tools = load_tools(    selected_tools,    allow_dangerous_tools=True)
     
+    if human_switch:
+        user_input = user_input + " Dont forget to USE THE HUMAN-IN-THE-LOOP TOOL"
+        system_instructions= system_instructions + ". Use the human-in-the-loop tool"
     
     # Define the graph
     graph = create_react_agent(model, tools=tools)
@@ -297,7 +300,7 @@ def setup_required_directories(system_instructions, user_input):
         #We dont want to stop the program if it could not create the extra directories but we want to ensure common olca directories exist
         ensure_directories_exist()
 
-def generate_config_example():
+def initialize_config_file():
     try:
         default_system_instructions = "You are interacting using the human tool addressing carefully what the user is asking."
         default_user_input = "Interact with me to write a story using the 3 act structure that we will save in ./story/ - Make sure you interact with me and wont quit."

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

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

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

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

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