olca 0.2.55__tar.gz → 0.2.57__tar.gz

{olca-0.2.55 → olca-0.2.57}/PKG-INFO

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

@@ -92,6 +92,20 @@ def main():
     parser_list_by_score.add_argument('--max_value', type=float, help='Maximum score value')
     parser_list_by_score.add_argument('-L','--limit', type=int, default=100, help='Number of traces to fetch')
 
+    # list_scores command
+    parser_list_scores = subparsers.add_parser('list_scores', help='List all scores', aliases=['ls'])
+    parser_list_scores.add_argument('-o', '--output', type=str, help='Output JSON file path')
+
+    # search_traces command
+    parser_search = subparsers.add_parser('search_traces', help='Search and filter traces with advanced options', aliases=['st'])
+    parser_search.add_argument('--start_date', type=str, help='Start date in ISO format (e.g., 2024-01-01)')
+    parser_search.add_argument('--end_date', type=str, help='End date in ISO format (e.g., 2024-12-31)')
+    parser_search.add_argument('--keywords', nargs='*', help='Keywords to search in input or output')
+    parser_search.add_argument('--tags', nargs='*', help='Tags to filter traces')
+    parser_search.add_argument('--metadata', nargs='*', help='Metadata filters in key=value format')
+    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')
+
     args = parser.parse_args()
 
     if args.command == 'list_traces' or args.command == 'lt':
@@ -159,6 +173,52 @@ def main():
         for trace in traces:
             print_trace(trace)
             #print(f"Trace ID: {trace.id}, Name: {trace.name}")
+    elif args.command == 'list_scores' or args.command == 'ls':
+        scores = fu.list_scores()
+        if scores:
+            if args.output:
+                try:
+                    with open(args.output, 'w') as f:
+                        json.dump(scores, f, indent=2)
+                    print(f"Scores written to {os.path.realpath(args.output)}")
+                except Exception as e:
+                    print(f"Error writing to file {args.output}: {e}")
+            else:
+                print(json.dumps(scores, indent=2))
+        else:
+            print("No scores found.")
+    elif args.command == 'search_traces' or args.command == 'st':
+        metadata_filters = {}
+        if args.metadata:
+            for item in args.metadata:
+                if '=' in item:
+                    key, value = item.split('=', 1)
+                    metadata_filters[key] = value
+                else:
+                    print(f"Ignoring invalid metadata filter: {item}")
+
+        traces = fu.search_traces(
+            start_date=args.start_date,
+            end_date=args.end_date,
+            keywords=args.keywords,
+            tags=args.tags,
+            metadata_filters=metadata_filters,
+            limit=args.limit
+        )
+
+        if traces:
+            if args.output:
+                try:
+                    with open(args.output, 'w') as f:
+                        json.dump([trace.__dict__ for trace in traces], f, indent=2)
+                    print(f"Traces written to {os.path.realpath(args.output)}")
+                except Exception as e:
+                    print(f"Error writing to file {args.output}: {e}")
+            else:
+                for trace in traces:
+                    fu.print_trace(trace)
+        else:
+            print("No traces found matching the criteria.")
     else:
         parser.print_help()
         exit(1)

{olca-0.2.55 → olca-0.2.57}/olca/fusewill_utils.py

@@ -4,6 +4,8 @@ import json
 import dotenv
 import webbrowser
 import requests  # Add this import
+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"))
@@ -43,7 +45,7 @@ langfuse = Langfuse(
     secret_key=os.environ.get("LANGFUSE_SECRET_KEY"),
     host=os.environ.get("LANGFUSE_HOST")
 )
-
+    
 def open_trace_in_browser(trace_id):
     base_url = os.environ.get("LANGFUSE_HOST")
     project_id = os.environ.get("LANGFUSE_PROJECT_ID")
@@ -68,6 +70,20 @@ def get_score_by_id(score_id):
         print(f"Error retrieving score {score_id}: {e}")
         return None
 
+def list_scores():
+    """Retrieve all score configurations."""
+    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/score-configs"
+    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 scores: {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>")
@@ -157,7 +173,7 @@ def create_prompt(name, prompt_text, model_name, temperature, labels=None, suppo
         }
     )
 def get_prompt(name, label="production"):
-    return langfuse.get_prompt(name=name,label="production")
+    return langfuse.get_prompt(name=name,label=label)
   
 def update_prompt(name, new_prompt_text):
     prompt = langfuse.get_prompt(name=name)
@@ -168,4 +184,61 @@ def delete_dataset(name):
     dataset.delete()
 
 def get_trace_by_id(trace_id):
-    return langfuse.get_trace(trace_id)
+    return langfuse.get_trace(trace_id)
+
+def search_traces(
+    start_date=None,
+    end_date=None,
+    keywords=None,
+    tags=None,
+    metadata_filters=None,
+    limit=100
+):
+    """
+    Search and filter traces based on date range, keywords, tags, and metadata.
+
+    Parameters:
+        start_date (str): ISO format date string for the start of the date range.
+        end_date (str): ISO format date string for the end of the date range.
+        keywords (list): List of keywords to search in input or output.
+        tags (list): List of tags to filter traces.
+        metadata_filters (dict): Dictionary of metadata key-value pairs for filtering.
+        limit (int): Number of traces to fetch.
+
+    Returns:
+        list: Filtered list of traces.
+    """
+    try:
+        params = {}
+        if start_date:
+            from_timestamp = datetime.datetime.fromisoformat(start_date)
+            from_timestamp = from_timestamp.replace(tzinfo=pytz.UTC)
+            params['from_timestamp'] = from_timestamp
+        if end_date:
+            to_timestamp = datetime.datetime.fromisoformat(end_date)
+            to_timestamp = to_timestamp.replace(tzinfo=pytz.UTC)
+            params['to_timestamp'] = to_timestamp
+        if tags:
+            params['tags'] = tags
+        if metadata_filters:
+            for key, value in metadata_filters.items():
+                params[f'metadata.{key}'] = value
+
+        traces = langfuse.get_traces(limit=limit, **params)
+        if not traces:
+            return []
+
+        filtered_traces = traces.data
+
+        if keywords:
+            keyword_set = set(keyword.lower() for keyword in keywords)
+            filtered_traces = [
+                trace for trace in filtered_traces
+                if any(keyword in trace.input.lower() for keyword in keyword_set) or
+                   any(keyword in trace.output.lower() for keyword in keyword_set)
+            ]
+
+        return filtered_traces
+    except Exception as e:
+        print(f"Error searching traces: {e}")
+        return []

{olca-0.2.55 → olca-0.2.57}/olca/olcacli.py

@@ -8,49 +8,12 @@ import yaml
 from olca.utils import load_environment, initialize_langfuse
 from olca.tracing import TracingManager
 from olca.olcahelper import setup_required_directories, initialize_config_file
-import time
-import httpx
-from openai.error import APIConnectionError
+from prompts import SYSTEM_PROMPT_APPEND, HUMAN_APPEND_PROMPT
 
 #jgwill/olca1
 #olca1_prompt = hub.pull("jgwill/olca1") #Future use
 #https://smith.langchain.com/hub/jgwill/olca1
-SYSTEM_PROMPT_APPEND="""
-You do what is above and consider the following when doing the task:
----
-* Write or append instructions to ./.olca/instructions.txt on how to perform tasks (in terms of reflection and action steps. example: cli syntax to execute something).  You read that file to learn how to do your job if it exists (example: when you starts, you read this to know more on what you learned to do in previous iterations (as it might not be the first time you ran, this file will intruct you where we are.  You can also deduce this from the user message)).  You update it with what you learned and keep it up to date. You dont erase the content of the file but if what you find in it is not related to your task or is semantically the same, you clean the whole think so its clear. Dont output all these details you do this internally, no output to the stardard output.  You read it back from time to time to remember what you did, learned and how to make it and what the user wants.  
-* Produce a report in ./reports/report-olca-[TIMESTAMP].md
-* Report to the user if repeated errors are encountered if human tool is accessible (you interact, stating the errors and asking for instructions from the user (you never quit without the user explicitly stating to end the flow)).
-* Output the iteration number and plan to the standard output during each loop.
-* If you are given an issue_id, you commit the work to that issue and push your results (dont output the git push to the standard output).
-* Do not comment on your final results; just output them but keep logging your action steps you do internally (all reflection and action steps).
-* Dont modify the file: olca.yml 
-* If github issue related, dont checkout a branch except if asked otherwise. 
-* You dont checkout branches, I repeat, you dont checkout branches.
-* Generate your TIMESTAMP with the following command: date +'%Y%m%d%H%M%S' only once at the beginning of your script.
-* Make sure if you Switched to branch, you switch back to main before the end of your script.
-* Try to observe that you keep doing the same thing over and over again and stop right away if you see that (dont do that if you are developping a story)
-* Be quiet with trivial output in the terminal.
-* Write and update your plan in ./.olca/plan.md
-* You watch out for basic syntax errors with your args when executing echo commands. (example: Syntax error: Unterminated quoted string, make sure to escape your single and double quotes)
-----
-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).
-"""
 
-HUMAN_APPEND_PROMPT = """
-* Utilize the 'human' tool for interactions as directed.
-* Communicate clearly and simply, avoiding exaggeration.
-Example Interaction:
-<example>
-'==============================================
-{ PURPOSE_OF_THE_MESSAGE_SHORT }
-==============================================
-{ CURRENT_STATUS_OR_MESSAGE_CONTENT }
-==============================================
-{ PROMPT_FOR_USER_INPUT_SHORT } :
-</example>
-REMEMBER: Never ask to brainstorm (NEVER USE THAT WORD)
-"""
 def get_input() -> str:
     print("----------------------")
     contents = []
@@ -308,19 +271,7 @@ def main():
         graph_config = {"callbacks": callbacks} if callbacks else {}
         if recursion_limit:
             graph_config["recursion_limit"] = recursion_limit
-        
-        retry_attempts = 3
-        for attempt in range(retry_attempts):
-            try:
-                print_stream(graph.stream(inputs, config=graph_config))
-                break
-            except (httpx.ConnectError, APIConnectionError) as e:
-                if attempt < retry_attempts - 1:
-                    print(f"Network error encountered: {e}. Retrying in 5 seconds...")
-                    time.sleep(5)
-                else:
-                    print("Failed to connect after multiple attempts. Exiting.")
-                    raise e
+        print_stream(graph.stream(inputs, config=graph_config))
     except GraphRecursionError as e:
         print("Recursion limit reached. Please increase the 'recursion_limit' in the olca_config.yaml file.")
         print("For troubleshooting, visit: https://python.langchain.com/docs/troubleshooting/errors/GRAPH_RECURSION_LIMIT")

olca-0.2.57/olca/prompts.py

@@ -0,0 +1,38 @@
+# Create a new file "prompts.py" to store the prompt-related constants.
+
+SYSTEM_PROMPT_APPEND = """
+You do what is above and consider the following when doing the task:
+---
+* Write or append instructions to ./.olca/instructions.txt on how to perform tasks (in terms of reflection and action steps. example: cli syntax to execute something).  You read that file to learn how to do your job if it exists (example: when you starts, you read this to know more on what you learned to do in previous iterations (as it might not be the first time you ran, this file will intruct you where we are.  You can also deduce this from the user message)).  You update it with what you learned and keep it up to date. You dont erase the content of the file but if what you find in it is not related to your task or is semantically the same, you clean the whole think so its clear. Dont output all these details you do this internally, no output to the stardard output.  You read it back from time to time to remember what you did, learned and how to make it and what the user wants.  
+* Produce a report in ./reports/report-olca-[TIMESTAMP].md
+* Report to the user if repeated errors are encountered if human tool is accessible (you interact, stating the errors and asking for instructions from the user (you never quit without the user explicitly stating to end the flow)).
+* Output the iteration number and plan to the standard output during each loop.
+* If you are given an issue_id, you commit the work to that issue and push your results (dont output the git push to the standard output).
+* Do not comment on your final results; just output them but keep logging your action steps you do internally (all reflection and action steps).
+* Dont modify the file: olca.yml 
+* If github issue related, dont checkout a branch except if asked otherwise. 
+* You dont checkout branches, I repeat, you dont checkout branches.
+* Generate your TIMESTAMP with the following command: date +'%Y%m%d%H%M%S' only once at the beginning of your script.
+* Make sure if you Switched to branch, you switch back to main before the end of your script.
+* Try to observe that you keep doing the same thing over and over again and stop right away if you see that (dont do that if you are developping a story)
+* Be quiet with trivial output in the terminal.
+* Write and update your plan in ./.olca/plan.md
+* You watch out for basic syntax errors with your args when executing echo commands. (example: Syntax error: Unterminated quoted string, make sure to escape your single and double quotes)
+----
+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).
+"""
+
+HUMAN_APPEND_PROMPT = """
+* Utilize the 'human' tool for interactions as directed.
+* Communicate clearly and simply, avoiding exaggeration.
+Example Interaction:
+<example>
+'==============================================
+{ PURPOSE_OF_THE_MESSAGE_SHORT }
+==============================================
+{ CURRENT_STATUS_OR_MESSAGE_CONTENT }
+==============================================
+{ PROMPT_FOR_USER_INPUT_SHORT } :
+</example>
+REMEMBER: Never ask to brainstorm (NEVER USE THAT WORD)
+"""

{olca-0.2.55 → olca-0.2.57}/olca.egg-info/PKG-INFO

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

@@ -7,6 +7,7 @@ olca/fusewill_cli.py
 olca/fusewill_utils.py
 olca/olcacli.py
 olca/olcahelper.py
+olca/prompts.py
 olca/tracing.py
 olca/utils.py
 olca.egg-info/PKG-INFO

{olca-0.2.55 → olca-0.2.57}/pyproject.toml

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

{olca-0.2.55 → olca-0.2.57}/setup.py

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