olca 0.2.60__tar.gz → 0.2.62__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: olca
-Version: 0.2.60
+Version: 0.2.62
 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
@@ -361,11 +361,13 @@ Requires-Dist: requests
 Requires-Dist: markdown
 Requires-Dist: langchain
 Requires-Dist: langchain-openai
+Requires-Dist: langchain-ollama
 Requires-Dist: langchain-experimental
 Requires-Dist: click
 Requires-Dist: langgraph
 Requires-Dist: langfuse
 Requires-Dist: pytz
+Requires-Dist: google.generativeai
 
 # oLCa
 

{olca-0.2.60 → olca-0.2.62}/olca/fusewill_cli.py

@@ -120,6 +120,37 @@ def main():
     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')
 
+    # list_sessions command
+    parser_list_sessions = subparsers.add_parser('list_sessions', help='List sessions', aliases=['lss'])
+    parser_list_sessions.add_argument('-L','--limit', type=int, default=100, help='Number of sessions to fetch')
+    parser_list_sessions.add_argument('--start_date', type=str, help='Start date in ISO format (e.g., 2024-01-01)')
+    parser_list_sessions.add_argument('--end_date', type=str, help='End date in ISO format (e.g., 2024-12-31)')
+    parser_list_sessions.add_argument('--format', choices=['json','csv'], default='json', help='Output format (json or csv)')
+    parser_list_sessions.add_argument('-o','--output', type=str, help='Optional output file path')
+
+    # get_session command
+    parser_get_session = subparsers.add_parser('get_session', help='Get a session by ID', aliases=['gsess'])
+    parser_get_session.add_argument('session_id', help='Session ID')
+    parser_get_session.add_argument('-o','--output', type=str, help='Output file path (JSON or CSV)')
+
+    # get_media command
+    parser_get_media = subparsers.add_parser('get_media', help='Retrieve media details')
+    parser_get_media.add_argument('media_id', help='Media ID')
+
+    # get_upload_url command
+    parser_upload_url = subparsers.add_parser('get_upload_url', help='Get a presigned upload URL')
+    parser_upload_url.add_argument('trace_id', help='Trace ID')
+    parser_upload_url.add_argument('--content_type', required=True, help='Content-Type of the media')
+    parser_upload_url.add_argument('--content_length', type=int, required=True, help='Size of the media in bytes')
+
+    # get_daily_metrics command
+    parser_daily_metrics = subparsers.add_parser('get_daily_metrics', help='Fetch daily metrics', aliases=['gdm'])
+    parser_daily_metrics.add_argument('--trace_name', type=str, help='Optional trace name filter')
+    parser_daily_metrics.add_argument('--user_id', type=str, help='Optional user ID filter')
+    parser_daily_metrics.add_argument('--tags', nargs='*', help='Optional tags for filtering')
+    parser_daily_metrics.add_argument('--from_timestamp', type=str, help='Start date in ISO format')
+    parser_daily_metrics.add_argument('--to_timestamp', type=str, help='End date in ISO format')
+
     args = parser.parse_args()
 
     if args.command == 'list_traces' or args.command == 'lt':
@@ -241,6 +272,71 @@ def main():
         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)
+    elif args.command == 'list_sessions' or args.command == 'lss':
+        sessions = fu.list_sessions(
+            limit=args.limit,
+            start_date=args.start_date,
+            end_date=args.end_date
+        )
+
+        if not sessions:
+            print("No sessions found.")
+        else:
+            if not args.output:
+                # Print to standard output
+                for s in sessions:
+                    print(s)
+            else:
+                # Ensure output file extension matches --format
+                output_path = args.output
+                if not output_path.endswith(f".{args.format}"):
+                    output_path += f".{args.format}"
+
+                if args.format == 'csv':
+                    import csv
+                    with open(output_path, 'w', newline='') as f:
+                        writer = csv.DictWriter(f, fieldnames=sessions[0].keys())
+                        writer.writeheader()
+                        for s in sessions:
+                            writer.writerow(s)
+                else:  # default to JSON
+                    import json
+                    with open(output_path, 'w') as f:
+                        json.dump(sessions, f, indent=2)
+
+                print(f"Sessions written to {os.path.realpath(output_path)}")
+    elif args.command == 'get_session' or args.command == 'gsess':
+        session = fu.get_session(args.session_id)
+        if session:
+            if args.output:
+                if args.output.endswith('.csv'):
+                    import csv
+                    with open(args.output, 'w', newline='') as f:
+                        writer = csv.DictWriter(f, fieldnames=session.keys())
+                        writer.writeheader()
+                        writer.writerow(session)
+                    print(f"Session written to {os.path.realpath(args.output)}")
+                else:
+                    import json
+                    with open(args.output, 'w') as f:
+                        json.dump(session, f, indent=2)
+                    print(f"Session written to {os.path.realpath(args.output)}")
+            else:
+                print(session)
+        else:
+            print(f"No session found for ID {args.session_id}")
+    elif args.command == 'get_media':
+        fu.get_media(args.media_id)
+    elif args.command == 'get_upload_url':
+        fu.get_upload_url(args.trace_id, args.content_type, args.content_length)
+    elif args.command == 'get_daily_metrics' or args.command == 'gdm':
+        fu.get_daily_metrics(
+            trace_name=args.trace_name,
+            user_id=args.user_id,
+            tags=args.tags,
+            from_timestamp=args.from_timestamp,
+            to_timestamp=args.to_timestamp
+        )
     else:
         parser.print_help()
         exit(1)

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

@@ -299,7 +299,7 @@ def export_traces(format='json', output_path=None, start_date=None, end_date=Non
             # 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')
+            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:
@@ -337,4 +337,81 @@ def import_traces(format='json', input_path=None):
             )
         print(f"Imported {len(data)} traces from {input_path}")
     except Exception as e:
-        print(f"Error importing traces: {e}")
+        print(f"Error importing traces: {e}")
+
+def list_sessions(limit=100, start_date=None, end_date=None):
+    """
+    List all sessions with optional date filtering.
+    Retrieves multiple pages so we don't miss older sessions.
+    """
+    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/sessions"
+    sessions = []
+    page = 1
+    while True:
+        params = {
+            "page": page,
+            "limit": limit
+        }
+        if start_date:
+            params["fromTimestamp"] = datetime.datetime.fromisoformat(start_date).isoformat() + 'Z'
+        if end_date:
+            params["toTimestamp"] = datetime.datetime.fromisoformat(end_date).isoformat() + 'Z'
+        
+        try:
+            response = requests.get(url, auth=(public_key, secret_key), params=params)
+            response.raise_for_status()
+            data = response.json()
+        except Exception as e:
+            print(f"Error retrieving sessions: {e}")
+            break
+        
+        if "data" not in data or len(data["data"]) == 0:
+            break
+        
+        sessions.extend(data["data"])
+        if len(data["data"]) < limit:
+            break
+        page += 1
+    
+    return sessions
+
+def get_session(session_id):
+    """
+    Get details of a specific session including its traces.
+    """
+    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/sessions/{session_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 session {session_id}: {e}")
+        return None
+
+def get_upload_url(trace_id, content_type, content_length):
+    """
+    Get a presigned URL for media upload.
+    """
+    # TODO: Implement API call to POST /media
+    pass
+
+def get_media(media_id):
+    """
+    Retrieve media record details.
+    """
+    # TODO: Implement API call to GET /media/{mediaId}
+    pass
+
+def get_daily_metrics(trace_name=None, user_id=None, tags=None, from_timestamp=None, to_timestamp=None):
+    """
+    Get daily metrics with optional filtering.
+    """
+    # TODO: Implement API call to GET /metrics/daily with query params
+    pass

{olca-0.2.60 → olca-0.2.62}/olca/olcacli.py

@@ -1,6 +1,7 @@
 #%%
 import os
-from click import prompt
+import sys
+sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
 import dotenv
 from langchain import hub
 import argparse
@@ -55,7 +56,7 @@ dotenv.load_dotenv()
 # First we initialize the model we want to use.
 from json import load
 from langchain_openai import ChatOpenAI,OpenAI
-from langchain.agents import AgentExecutor, create_react_agent
+#from langchain.agents import AgentExecutor, create_react_agent
 
 from langchain_community.agent_toolkits.load_tools import load_tools
 
@@ -153,6 +154,18 @@ def _parse_args():
     parser.add_argument("-y", "--yes", action="store_true", help="Accept the new file olca.yml")
     return parser.parse_args()
 
+def parse_model_uri(uri: str):
+    # Example: "ollama://llama2@localhost"
+    if "://" not in uri:
+        return "openai", uri, None  # default provider is openai
+    provider, rest = uri.split("://", 1)
+    host = None
+    if "@" in rest:
+        base_model, host = rest.split("@", 1)
+    else:
+        base_model = rest
+    return provider, base_model, host
+
 def main():
     args = _parse_args()
     olca_config_file = 'olca.yml'
@@ -217,20 +230,34 @@ def main():
     system_instructions = config.get('system_instructions', '')
     user_input = config.get('user_input', '')
     default_model_id = "gpt-4o-mini"
-    model_name = config.get('model_name', default_model_id)
     recursion_limit = config.get('recursion_limit', 15)
     disable_system_append = _parse_args().disable_system_append
-    
     # Use the system_instructions and user_input in your CLI logic
+    model_name = config.get('model_name', default_model_id)
+    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)
+        
+    elif provider == "openai":
+        from langchain_openai import ChatOpenAI
+        model = ChatOpenAI(model=base_model, temperature=0)
+    else:
+        # default fallback
+        from langchain_openai import ChatOpenAI
+        model = ChatOpenAI(model=model_name, temperature=0)
+
     print("System Instructions:", system_instructions)
     print("User Input:", user_input)
-    print("Model Name:", model_name)
     print("Recursion Limit:", recursion_limit)
     print("Trace:", tracing_enabled)
+    print("Model Name:", model_name)
     
-    model = ChatOpenAI(model=model_name, temperature=0)
     selected_tools = ["terminal"]
     
+    disable_system_append = _parse_args().disable_system_append
+    
     human_switch = args.human
     #look in olca_config.yaml for human: true
     if "human" in config:
@@ -240,6 +267,7 @@ def main():
         selected_tools.append("human")
     
     if args.math:
+        from langchain_openai import OpenAI
         math_llm = OpenAI()
         selected_tools.append("llm-math")
         if human_switch:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: olca
-Version: 0.2.60
+Version: 0.2.62
 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
@@ -361,11 +361,13 @@ Requires-Dist: requests
 Requires-Dist: markdown
 Requires-Dist: langchain
 Requires-Dist: langchain-openai
+Requires-Dist: langchain-ollama
 Requires-Dist: langchain-experimental
 Requires-Dist: click
 Requires-Dist: langgraph
 Requires-Dist: langfuse
 Requires-Dist: pytz
+Requires-Dist: google.generativeai
 
 # oLCa
 

{olca-0.2.60 → olca-0.2.62}/olca.egg-info/requires.txt

@@ -8,8 +8,10 @@ requests
 markdown
 langchain
 langchain-openai
+langchain-ollama
 langchain-experimental
 click
 langgraph
 langfuse
 pytz
+google.generativeai

{olca-0.2.60 → olca-0.2.62}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "olca"
-version = "0.2.60"
+version = "0.2.62"
 
 description = "A Python package for experimental usage of Langchain and Human-in-the-Loop"
 readme = "README.md"
@@ -27,11 +27,13 @@ dependencies = [
     "markdown",
     "langchain",
     "langchain-openai",
+    "langchain-ollama",
     "langchain-experimental",
     "click",
     "langgraph",
     "langfuse",
     "pytz",
+    "google.generativeai",
 ]
 classifiers = [
     "Programming Language :: Python :: 3",

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

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