olca 0.2.20__tar.gz → 0.2.22__tar.gz

{olca-0.2.20 → olca-0.2.22}/PKG-INFO

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

@@ -52,6 +52,28 @@ def main():
     parser_get_trace = subparsers.add_parser('get_trace_by_id', help='Get a trace by ID')
     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.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')
+
+    # add_score_to_trace command
+    parser_add_score = subparsers.add_parser('add_score_to_trace', help='Add a score to a trace', aliases=['s2t'])
+    parser_add_score.add_argument('trace_id', help='Trace ID')
+    parser_add_score.add_argument('generation_id', help='Generation ID')
+    parser_add_score.add_argument('name', help='Score name')
+    parser_add_score.add_argument('value', help='Score value')
+    parser_add_score.add_argument('--data_type', default='NUMERIC', help='Data type of the score')
+    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.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')
+
     args = parser.parse_args()
 
     if args.command == 'list_traces':
@@ -75,6 +97,28 @@ def main():
     elif args.command == 'get_trace_by_id':
         trace = get_trace_by_id(trace_id=args.trace_id)
         print(trace)
+    elif args.command == 'new_score':
+        fu.create_score(name=args.name, data_type=args.data_type, description=args.description)
+    elif args.command == 'add_score_to_trace':
+        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(
+            trace_id=args.trace_id,
+            generation_id=args.generation_id,
+            name=args.name,
+            value=args.value,
+            data_type=args.data_type,
+            comment=args.comment
+        )
+    elif args.command == 'list_traces_by_score':
+        traces = fu.list_traces_by_score(
+            score_name=args.score_name,
+            min_value=args.min_value,
+            max_value=args.max_value,
+            limit=args.limit
+        )
+        for trace in traces:
+            print(f"Trace ID: {trace.id}, Name: {trace.name}")
     else:
         parser.print_help()
 

{olca-0.2.20 → olca-0.2.22}/olca/fusewill_utils.py

@@ -1,26 +1,34 @@
-from langfuse import Langfuse
 import os
 import sys
-sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
 import json
-
 import dotenv
 
-# Check if the variables are already set in the environment
+# 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"):
-    # Load from .env in current directory
-    dotenv.load_dotenv()
+    dotenv.load_dotenv(dotenv_path=os.path.expanduser("~/.env"))
 
-    # Check again
-    if not os.environ.get("LANGFUSE_PUBLIC_KEY") or not os.environ.get("LANGFUSE_SECRET_KEY"):
-        # Load from .env in home directory
-        dotenv.load_dotenv(dotenv_path=os.path.expanduser("~/.env"))
+# Final check before exiting
+missing_vars = []
+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")
 
-# Final check
-if not os.environ.get("LANGFUSE_PUBLIC_KEY") or not os.environ.get("LANGFUSE_SECRET_KEY"):
-    print("Error: LANGFUSE_PUBLIC_KEY and LANGFUSE_SECRET_KEY not found.")
+if missing_vars:
+    print(f"Error: {', '.join(missing_vars)} not found.")
     sys.exit(1)
 
+from langfuse import Langfuse
+import os
+import sys
+sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
+import json
+
+import dotenv
+
 langfuse = Langfuse()
 
 def list_traces(limit=100, output_dir="../output/traces"):
@@ -33,6 +41,17 @@ def list_traces(limit=100, output_dir="../output/traces"):
         print("---")
     return traces
 
+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):
+                    filtered_traces.append(trace)
+                    break
+    return filtered_traces
+
 def add_score_to_a_trace(trace_id, generation_id, name, value, data_type="NUMERIC", comment=""):
     langfuse.score(
         trace_id=trace_id,
@@ -43,6 +62,20 @@ 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(
+        name=name,
+        data_type=data_type,
+        description=description
+    )
+
+def score_exists(name):
+    scores = langfuse.get_scores()
+    for score in scores.data:
+        if score.name == name:
+            return True
+    return False
+
 def create_dataset(name, description="", metadata=None):
     langfuse.create_dataset(
         name=name,

{olca-0.2.20 → olca-0.2.22}/olca.egg-info/PKG-INFO

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

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

{olca-0.2.20 → olca-0.2.22}/setup.py

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