parsagon 0.10.21__tar.gz → 0.10.22__tar.gz

{parsagon-0.10.21 → parsagon-0.10.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: parsagon
-Version: 0.10.21
+Version: 0.10.22
 Summary: Allows you to create browser automations with natural language
 Author-email: Sandy Suh <sandy@parsagon.io>
 Project-URL: Homepage, https://parsagon.io

{parsagon-0.10.21 → parsagon-0.10.22}/pyproject.toml

@@ -16,7 +16,7 @@ line-length = 120
 
 [project]
 name = "parsagon"
-version = "0.10.21"
+version = "0.10.22"
 description = "Allows you to create browser automations with natural language"
 readme = "README.md"
 requires-python = ">=3.8"

{parsagon-0.10.21 → parsagon-0.10.22}/src/parsagon/api.py

@@ -192,11 +192,19 @@ def get_pipeline_code(pipeline_name, variables, headless):
         )
 
 
-def create_pipeline_run(pipeline_id, variables):
+def create_pipeline_run(pipeline_id, variables, is_local):
     return _api_call(
         httpx.post,
         f"/pipelines/{pipeline_id}/runs/",
-        json={"variables": variables},
+        json={"variables": variables, "is_local": is_local},
+    )
+
+
+def update_pipeline_run(run_id, data):
+    return _api_call(
+        httpx.patch,
+        f"/pipelines/runs/{run_id}/",
+        json=data,
     )
 
 

{parsagon-0.10.21 → parsagon-0.10.22}/src/parsagon/exceptions.py

@@ -24,3 +24,8 @@ class ProgramNotFoundException(ParsagonException):
 
     def to_string(self, verbose):
         return f"A program with name {self.program} does not exist."
+
+
+class RunFailedException(ParsagonException):
+    """Raised when a run fails."""
+    pass

{parsagon-0.10.21 → parsagon-0.10.22}/src/parsagon/main.py

@@ -1,9 +1,11 @@
 import argparse
+import datetime
 import json
 import logging
 import logging.config
 import psutil
 import time
+import traceback
 
 from halo import Halo
 from tqdm import tqdm
@@ -15,14 +17,14 @@ from parsagon.api import (
     create_custom_function,
     add_examples_to_custom_function,
     create_pipeline_run,
+    update_pipeline_run,
     get_pipeline,
     get_pipelines,
     get_pipeline_code,
     get_run,
     poll_data,
-    APIException,
 )
-from parsagon.exceptions import ParsagonException
+from parsagon.exceptions import ParsagonException, APIException, RunFailedException
 from parsagon.executor import Executor, custom_functions_to_descriptions
 from parsagon.secrets import extract_secrets
 from parsagon.settings import get_api_key, get_settings, clear_settings, save_setting, get_logging_config
@@ -140,6 +142,11 @@ def get_args():
         action="store_true",
         help="run the program in the cloud",
     )
+    parser_run.add_argument(
+        "--output_log",
+        action="store_true",
+        help="output log data from the run",
+    )
     parser_run.set_defaults(func=run)
 
     # Delete
@@ -186,6 +193,8 @@ def main():
 
 
 def create(task=None, program_name=None, headless=False, infer=False, verbose=False):
+    configure_logging(verbose)
+
     if task:
         logger.info("Launched with task description:\n%s", task)
     else:
@@ -246,6 +255,8 @@ def create(task=None, program_name=None, headless=False, infer=False, verbose=Fa
 
 
 def update(program_name, variables={}, headless=False, infer=False, replace=False, verbose=False):
+    configure_logging(verbose)
+
     pipeline = get_pipeline(program_name)
     abridged_program = pipeline["abridged_sketch"]
     # Make the program runnable
@@ -277,8 +288,7 @@ def update(program_name, variables={}, headless=False, infer=False, replace=Fals
             add_examples_to_custom_function(pipeline_id, call_id, custom_function, replace)
         logger.info(f"Saved.")
     except Exception as e:
-        print(e)
-        logger.info(f"An error occurred while saving the program. The program was not updated.")
+        logger.error(f"An error occurred while saving the program. The program was not updated.")
 
 
 def detail(program_name=None, verbose=False):
@@ -292,96 +302,165 @@ def detail(program_name=None, verbose=False):
         )
 
 
-def run(program_name, variables={}, headless=False, remote=False, verbose=False):
+def run(program_name, variables={}, headless=False, remote=False, output_log=False, verbose=False):
     """
     Executes pipeline code
     """
+    configure_logging(verbose)
+
     if headless and remote:
         raise ParsagonException("Cannot run a program remotely in headless mode")
 
+    logger.info("Preparing to run program %s", program_name)
+    pipeline_id = get_pipeline(program_name)["id"]
+
     if remote:
-        pipeline_id = get_pipeline(program_name)["id"]
-        result = create_pipeline_run(pipeline_id, variables)
+        result = create_pipeline_run(pipeline_id, variables, False)
         with Halo(text="Program running remotely...", spinner="dots"):
             while True:
                 run = get_run(result["id"])
                 status = run["status"]
+
+                if output_log and status in ("FINISHED", "ERROR"):
+                    return {k: v for k, v in run.items() if k in ("output", "status", "log", "warnings", "error")}
+
                 if status == "FINISHED":
+                    if verbose:
+                        logger.info(run["log"])
+                        for warning in run["warnings"]:
+                            logger.warning(warning)
                     logger.info("Program finished running.")
                     return run["output"]
                 elif status == "ERROR":
                     raise ParsagonException(f"Program failed to run: {run['error']}")
                 elif status == "CANCELED":
                     raise ParsagonException("Program execution was canceled")
+
                 time.sleep(5)
 
-    logger.info("Preparing to run program %s", program_name)
+    run = create_pipeline_run(pipeline_id, variables, True)
     code = get_pipeline_code(program_name, variables, headless)["code"]
+    start_time = datetime.datetime.now(datetime.timezone.utc).isoformat()
+    run_data = {"start_time": start_time}
 
     logger.info("Running program...")
     globals_locals = {"PARSAGON_API_KEY": get_api_key()}
     try:
         exec(code, globals_locals, globals_locals)
+        run_data["status"] = "FINISHED"
+    except:
+        run_data["status"] = "ERROR"
+        run_data["error"] = str(traceback.format_exc())
+        if not output_log:
+            raise
     finally:
+        end_time = datetime.datetime.now(datetime.timezone.utc).isoformat()
+        run_data["end_time"] = end_time
         if "driver" in globals_locals:
             globals_locals["driver"].quit()
         if "display" in globals_locals:
             globals_locals["display"].stop()
+        if "parsagon_log" in globals_locals:
+            run_data["log"] = "\n".join(globals_locals["parsagon_log"])
+            logger.info(run_data["log"])
+        if "parsagon_warnings" in globals_locals:
+            run_data["warnings"] = globals_locals["parsagon_warnings"]
         for proc in psutil.process_iter():
             try:
                 if proc.name() == "chromedriver":
                     proc.kill()
             except psutil.NoSuchProcess:
                 continue
+        run = update_pipeline_run(run["id"], run_data)
     logger.info("Done.")
+    if output_log:
+        if "error" not in run_data:
+            run["output"] = globals_locals["output"]
+        return {k: v for k, v in run.items() if k in ("output", "status", "log", "warnings", "error")}
     return globals_locals["output"]
 
 
-def batch_runs(batch_name, program_name, runs=[], headless=False, ignore_errors=False, error_value=None):
+def batch_runs(batch_name, program_name, runs=[], headless=False, ignore_errors=False, error_value=None, rerun_warnings=False, rerun_warning_types=[], rerun_errors=False, verbose=False):
+    configure_logging(verbose)
+
     save_file = f"{batch_name}.json"
     try:
         with open(save_file) as f:
-            results = json.load(f)
+            outputs = json.load(f)
     except FileNotFoundError:
-        results = []
-    num_initial_results = len(results)
+        outputs = []
+    metadata_file = f"{batch_name}_metadata.json"
+    try:
+        with open(metadata_file) as f:
+            metadata = json.load(f)
+    except FileNotFoundError:
+        metadata = []
+
+    num_initial_results = len(outputs)
     pbar = tqdm(runs)
     default_desc = f'Running program "{program_name}"'
     pbar.set_description(default_desc)
     error = None
-    error_variables = None
+    variables = None
     try:
         for i, variables in enumerate(pbar):
             if i < num_initial_results:
-                continue
+                if rerun_errors and metadata[i]["status"] == "ERROR":
+                    pass
+                elif rerun_warnings and metadata[i]["warnings"]:
+                    if not rerun_warning_types or any(warning["type"] in rerun_warning_types for warning in metadata[i]["warnings"]):
+                        pass
+                    else:
+                        continue
+                else:
+                    continue
             for j in range(3):
-                try:
-                    results.append(run(program_name, variables, headless))
+                result = run(program_name, variables, headless, output_log=True)
+                if result["status"] != "ERROR":
+                    output = result.pop("output")
+                    if i < num_initial_results:
+                        outputs[i] = output
+                        metadata[i] = result
+                    else:
+                        outputs.append(output)
+                        metadata.append(result)
                     break
-                except Exception as e:
-                    error = e
-                    error_variables = variables
+                else:
+                    error = result["error"].strip().split("\n")[-1]
                     if j < 2:
-                        pbar.set_description(f"An error occurred: {e} - Waiting 60s before retrying (Attempt {j+2}/3)")
+                        pbar.set_description(f"An error occurred: {error} - Waiting 60s before retrying (Attempt {j+2}/3)")
                         time.sleep(60)
                         pbar.set_description(default_desc)
                         error = None
-                        error_variables = None
                         continue
                     else:
                         if ignore_errors:
                             error = None
-                            error_variables = None
-                            results.append(error_value)
+                            if i < num_initial_results:
+                                outputs[i] = error_value
+                            else:
+                                outputs.append(error_value)
                             break
                         else:
-                            raise
+                            raise RunFailedException
+    except RunFailedException:
+        logger.error(f"Unresolvable error occurred on run with variables {variables}: {error} - Data has been saved to {save_file}. Rerun your command to resume.")
     except Exception as e:
-        logger.error(f"Unresolvable error occurred on run with variables {error_variables}: {error} - Data has been saved to {save_file}. Rerun your command to resume.")
+        error = str(e)
+        logger.error(f"Unresolvable error occurred while looping over runs: {error} - Data has been saved to {save_file}. Rerun your command to resume.")
     finally:
         with open(save_file, "w") as f:
-            json.dump(results, f)
-    return None if error else results
+            json.dump(outputs, f)
+        with open(metadata_file, "w") as f:
+            json.dump(metadata, f)
+    num_warnings = 0
+    num_runs_with_warnings = 0
+    for m in metadata:
+        if m["warnings"]:
+            num_warnings += len(m["warnings"])
+            num_runs_with_warnings += 1
+    logger.info(f"\nSummary: {len(outputs)} runs made; {num_warnings} warnings encountered across {num_runs_with_warnings} runs. See {metadata_file} for logs.\n")
+    return None if error else outputs
 
 
 def delete(program_name, verbose=False, confirm_with_user=False):

{parsagon-0.10.21 → parsagon-0.10.22}/src/parsagon/secrets.py

@@ -1,14 +1,15 @@
+import ast
 import re
 
 
 def extract_secrets(task):
     secrets = {}
-    matches = list(re.finditer(r'\{\s*(?P<var>[A-Za-z_]+)\s*:\s*"(?P<value>([^"]|\\")*)"\}', task))
+    matches = list(re.finditer(r'\{\s*(?P<var>[A-Za-z_]+)\s*:\s*(?P<value>"([^"]|\\")*")\}', task))
     for match in matches:
         var_name = match.group("var")
         if not var_name.startswith("SECRET"):
             continue
         new_match = re.sub(r'\{([A-Za-z_]+):\s*"([^"]|\\")*"\}', '{\\1: "******"}', match.group(0))
         task = task.replace(match.group(0), new_match)
-        secrets[match.group(1)] = match.group(2)
+        secrets[match.group(1)] = ast.literal_eval(match.group(2))
     return task, secrets

{parsagon-0.10.21 → parsagon-0.10.22}/src/parsagon/tests/test_secrets.py

@@ -9,7 +9,7 @@ def test_non_secrets_are_not_extracted():
     """
     task = 'Go to https://example.com. Type {username: "myusername"} in the username field'
     task, secrets = extract_secrets(task)
-    assert len(secrets) == 0
+    assert secrets == {}
     assert task == 'Go to https://example.com. Type {username: "myusername"} in the username field'
 
 
@@ -19,7 +19,7 @@ def test_secret_is_extracted():
     """
     task = 'Go to https://example.com. Type {SECRET_PASSWORD: "mypassword"} in the password field'
     task, secrets = extract_secrets(task)
-    assert len(secrets) == 1
+    assert secrets == {"SECRET_PASSWORD": "mypassword"}
     assert task == 'Go to https://example.com. Type {SECRET_PASSWORD: "******"} in the password field'
 
 
@@ -29,7 +29,7 @@ def test_secret_with_quotes_is_extracted():
     """
     task = 'Go to https://example.com. Type {SECRET_PASSWORD: "mypassword\\"?!1"} in the password field'
     task, secrets = extract_secrets(task)
-    assert len(secrets) == 1
+    assert secrets == {"SECRET_PASSWORD": 'mypassword"?!1'}
     assert task == 'Go to https://example.com. Type {SECRET_PASSWORD: "******"} in the password field'
 
 
@@ -39,7 +39,7 @@ def test_multiple_secrets_are_extracted():
     """
     task = 'Go to https://example.com. Type {SECRET_PASSWORD: "mypassword"} in the password field. Type {SECRET_ADDRESS: "myaddress"} in the address field'
     task, secrets = extract_secrets(task)
-    assert len(secrets) == 2
+    assert secrets == {"SECRET_PASSWORD": "mypassword", "SECRET_ADDRESS": "myaddress"}
     assert task == 'Go to https://example.com. Type {SECRET_PASSWORD: "******"} in the password field. Type {SECRET_ADDRESS: "******"} in the address field'
 
 
@@ -49,5 +49,5 @@ def test_secrets_mixed_with_non_secrets_are_extracted():
     """
     task = 'Go to https://example.com. Type {USERNAME: "myusername"} in the username field. Type {SECRET_PASSWORD: "mypassword"} in the password field. Type {SECRET_ADDRESS: "myaddress"} in the address field'
     task, secrets = extract_secrets(task)
-    assert len(secrets) == 2
+    assert secrets == {"SECRET_PASSWORD": "mypassword", "SECRET_ADDRESS": "myaddress"}
     assert task == 'Go to https://example.com. Type {USERNAME: "myusername"} in the username field. Type {SECRET_PASSWORD: "******"} in the password field. Type {SECRET_ADDRESS: "******"} in the address field'

{parsagon-0.10.21 → parsagon-0.10.22}/src/parsagon.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: parsagon
-Version: 0.10.21
+Version: 0.10.22
 Summary: Allows you to create browser automations with natural language
 Author-email: Sandy Suh <sandy@parsagon.io>
 Project-URL: Homepage, https://parsagon.io