olca 0.2.59__tar.gz → 0.2.60__tar.gz

{olca-0.2.59 → olca-0.2.60}/PKG-INFO

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

@@ -14,7 +14,9 @@ from fusewill_utils import (
     open_trace_in_browser,
     print_traces,
     print_trace,
-    list_traces_by_score  # Ensure the updated function is imported
+    list_traces_by_score,  # Ensure the updated function is imported
+    export_traces,
+    import_traces
 )
 import dotenv
 import json
@@ -106,6 +108,18 @@ def main():
     parser_search.add_argument('-L', '--limit', type=int, default=100, help='Number of traces to fetch')
     parser_search.add_argument('-o', '--output', type=str, help='Output JSON file path')
 
+    # export_traces command
+    parser_export = subparsers.add_parser('export_traces', help='Export traces', aliases=['et'])
+    parser_export.add_argument('--format', choices=['json','csv'], default='json', help='Export format')
+    parser_export.add_argument('-o','--output', type=str, help='Output file path')
+    parser_export.add_argument('--start_date', type=str, help='Start date in ISO format (e.g., 2024-01-01)')
+    parser_export.add_argument('--end_date', type=str, help='End date in ISO format (e.g., 2024-12-31)')
+
+    # import_traces command
+    parser_import = subparsers.add_parser('import_traces', help='Import traces', aliases=['it'])
+    parser_import.add_argument('--format', choices=['json','csv'], default='json', help='Import format')
+    parser_import.add_argument('--input', type=str, required=True, help='Input file path to read from')
+
     args = parser.parse_args()
 
     if args.command == 'list_traces' or args.command == 'lt':
@@ -219,6 +233,14 @@ def main():
                     fu.print_trace(trace)
         else:
             print("No traces found matching the criteria.")
+    elif args.command == 'export_traces' or args.command == 'et':
+        output_path = args.output
+        if output_path:
+            if not output_path.endswith(f".{args.format}"):
+                output_path += f".{args.format}"
+        fu.export_traces(format=args.format, output_path=output_path, start_date=args.start_date, end_date=args.end_date)
+    elif args.command == 'import_traces' or args.command == 'it':
+        fu.import_traces(format=args.format, input_path=args.input)
     else:
         parser.print_help()
         exit(1)

{olca-0.2.59 → olca-0.2.60}/olca/fusewill_utils.py

@@ -8,11 +8,11 @@ import datetime  # Add this import
 import pytz      # Add this import
 
 # Load .env from the current working directory
-dotenv.load_dotenv(dotenv_path=os.path.join(os.getcwd(), ".env"))
+dotenv.load_dotenv(dotenv_path=os.path.join(os.getcwd(), ".env"), override=True)
 
 # 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") or not os.environ.get("LANGFUSE_HOST"):
-    dotenv.load_dotenv(dotenv_path=os.path.expanduser("~/.env"))
+    dotenv.load_dotenv(dotenv_path=os.path.expanduser("~/.env"), override=True)
 
 # Final check before exiting
 missing_vars = []
@@ -33,7 +33,6 @@ import sys
 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"))
@@ -43,7 +42,8 @@ if _DEBUG_:
 langfuse = Langfuse(
     public_key=os.environ.get("LANGFUSE_PUBLIC_KEY"),
     secret_key=os.environ.get("LANGFUSE_SECRET_KEY"),
-    host=os.environ.get("LANGFUSE_HOST")
+    host=os.environ.get("LANGFUSE_HOST"),
+    release=os.environ.get("LANGFUSE_RELEASE", None)
 )
     
 def open_trace_in_browser(trace_id):
@@ -241,4 +241,100 @@ def search_traces(
         return filtered_traces
     except Exception as e:
         print(f"Error searching traces: {e}")
-        return []
+        return []
+
+def fetch_all_traces(start_date=None, end_date=None):
+    all_traces = []
+    page = 1
+    chunk_size = 100
+    params = {}
+    if start_date:
+        params['from_timestamp'] = datetime.datetime.fromisoformat(start_date).replace(tzinfo=pytz.UTC)
+    if end_date:
+        params['to_timestamp'] = datetime.datetime.fromisoformat(end_date).replace(tzinfo=pytz.UTC)
+    
+    while True:
+        partial = langfuse.get_traces(limit=chunk_size, page=page, **params)
+        if not partial or not partial.data:
+            break
+        all_traces.extend(partial.data)
+        if len(partial.data) < chunk_size:
+            break
+        page += 1
+    return all_traces
+
+def export_traces(format='json', output_path=None, start_date=None, end_date=None):
+    """
+    Export traces to a given format (json or csv).
+    """
+    try:
+        all_traces = fetch_all_traces(start_date=start_date, end_date=end_date)
+        if not output_path:
+            output_path = f"./traces_export.{format}"
+
+        # Ensure the output directory exists
+        output_dir = os.path.dirname(output_path)
+        if output_dir and not os.path.exists(output_dir):
+            os.makedirs(output_dir)
+
+        if format == 'json':
+            with open(output_path, 'w') as f:
+                json.dump([t.__dict__ for t in all_traces], f, indent=2, default=str)
+        elif format == 'csv':
+            import csv
+            fieldnames = ['id', 'name', 'input', 'output', 'createdAt']
+            with open(output_path, 'w', newline='') as f:
+                writer = csv.DictWriter(f, fieldnames=fieldnames)
+                writer.writeheader()
+                for t in all_traces:
+                    writer.writerow({
+                        'id': t.id,
+                        'name': t.name,
+                        'input': t.input,
+                        'output': t.output,
+                        'createdAt': str(t.createdAt)
+                    })
+
+        if all_traces:
+            # Sort traces by createdAt to ensure the oldest date is first
+            all_traces.sort(key=lambda x: x.createdAt)
+            first_trace_date = datetime.datetime.fromisoformat(all_traces[0].createdAt.replace('Z', '+00:00')).strftime('%Y-%m-%d %H:%M:%S')
+            last_trace_date = datetime.datetime.fromisoformat(all_traces[-1].createdAt.replace('Z', '+00:00')).strftime('%Y-%m-%d %H:%M:%S')
+            print(f"Traces exported to {output_path}. Total traces exported: {len(all_traces)}")
+            print(f"Date range: {first_trace_date} to {last_trace_date}")
+        else:
+            print(f"Traces exported to {output_path}. Total traces exported: {len(all_traces)}")
+    except Exception as e:
+        print(f"Error exporting traces: {e}")
+
+def import_traces(format='json', input_path=None):
+    """
+    Import traces from a given file (json or csv) into Langfuse.
+    """
+    if not input_path:
+        print("No input file provided for importing traces.")
+        return
+
+    try:
+        if format == 'json':
+            with open(input_path, 'r') as f:
+                data = json.load(f)
+        elif format == 'csv':
+            import csv
+            data = []
+            with open(input_path, 'r', newline='') as f:
+                reader = csv.DictReader(f)
+                for row in reader:
+                    data.append(row)
+
+        # Create new traces in Langfuse from data
+        for item in data:
+            langfuse.create_trace(
+                name=item.get('name', 'Imported Trace'),
+                input=item.get('input', ''),
+                output=item.get('output', '')
+                # pass other fields as needed
+            )
+        print(f"Imported {len(data)} traces from {input_path}")
+    except Exception as e:
+        print(f"Error importing traces: {e}")

{olca-0.2.59 → olca-0.2.60}/olca/prompts.py

@@ -1,5 +1,8 @@
 # Create a new file "prompts.py" to store the prompt-related constants.
 
+
+#@STCGoal https://smith.langchain.com/hub/jgwill/olca_system_append
+SYSTEM_PROMPT_APPEND_hub_tag_name="jgwill/olca_system_append"
 SYSTEM_PROMPT_APPEND = """
 You do what is above and consider the following when doing the task:
 ---
@@ -22,6 +25,8 @@ You do what is above and consider the following when doing the task:
 REMEMBER: Dont introduce nor conclude, just output results. No comments. you  present in a coherent format without preambles or fluff. Never use the word "determination" and we never brainstorm (we conceptualize the result we want in the germination phase then transform it into vision by choice and work as assimilating the vision to until the last phase which is completing our work).
 """
 
+#@STCGoal https://smith.langchain.com/hub/jgwill/olca_human_append
+HUMAN_APPEND_PROMPT_hub_tag_name="jgwill/olca_human_append"
 HUMAN_APPEND_PROMPT = """
 * Utilize the 'human' tool for interactions as directed.
 * Communicate clearly and simply, avoiding exaggeration.

{olca-0.2.59 → olca-0.2.60}/olca.egg-info/PKG-INFO

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

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

{olca-0.2.59 → olca-0.2.60}/setup.py

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