parsagon 0.10.16__py3-none-any.whl → 0.10.20__py3-none-any.whl

parsagon/executor.py

@@ -1,3 +1,4 @@
+from collections import defaultdict
 import copy
 import json
 import logging
@@ -9,6 +10,8 @@ from urllib.parse import urljoin
 import lxml.html
 from pyvirtualdisplay import Display
 import undetected_chromedriver as uc
+from selenium import webdriver
+from selenium.webdriver.chrome.service import Service as ChromeService
 from selenium.webdriver.chrome.options import Options
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.by import By
@@ -59,15 +62,20 @@ class Executor:
     Executes code produced by GPT with the proper context.  Records custom_function usage along the way.
     """
 
-    def __init__(self, headless=False, infer=False):
+    def __init__(self, headless=False, infer=False, use_uc=False):
         self.headless = headless
         if self.headless:
             self.display = Display(visible=False, size=(1280, 1050)).start()
-        chrome_options = uc.ChromeOptions()
-        chrome_options.add_argument("--start-maximized")
-        driver_exec_path = ChromeDriverManager().install()
-        self.driver = uc.Chrome(driver_executable_path=driver_exec_path, options=chrome_options)
-        self.max_elem_id = 0
+        driver_executable_path = ChromeDriverManager().install()
+        if use_uc:
+            chrome_options = uc.ChromeOptions()
+            chrome_options.add_argument("--start-maximized")
+            self.driver = uc.Chrome(driver_executable_path=driver_executable_path, options=chrome_options)
+        else:
+            chrome_options = webdriver.ChromeOptions()
+            chrome_options.add_argument("--start-maximized")
+            self.driver = webdriver.Chrome(service=ChromeService(driver_executable_path), options=chrome_options)
+        self.max_elem_ids = defaultdict(int)
         self.execution_context = {
             "custom_assert": self.custom_assert,
             "goto": self.goto,
@@ -128,13 +136,12 @@ class Executor:
         Adds node IDs to elements on the current page that don't already have IDs.
         """
         logger.debug("  Marking HTML...")
-        self.max_elem_id = self.driver.execute_script(
-            "let elemIdx = 0; for (const node of document.all) { elemIdx = Math.max(elemIdx, parseInt(node.getAttribute('data-psgn-id') ?? 0)); } return elemIdx"
-        )
-        self.max_elem_id = self.driver.execute_script(
-            f"let elemIdx = {self.max_elem_id}; "
+        max_elem_id = self.max_elem_ids[self.driver.current_window_handle]
+        max_elem_id = self.driver.execute_script(
+            f"let elemIdx = {max_elem_id}; "
             + "for (const node of document.all) { if (node.hasAttribute('data-psgn-id')) { continue; } node.setAttribute('data-psgn-id', elemIdx); elemIdx++; } return elemIdx;"
         )
+        self.max_elem_ids[self.driver.current_window_handle] = max_elem_id
         self.driver.execute_script(
             "for (const image of document.images) { image.setAttribute('data-psgn-width', image.parentElement.offsetWidth ?? -1); image.setAttribute('data-psgn-height', image.parentElement.offsetHeight ?? -1); }"
         )
@@ -187,7 +194,8 @@ class Executor:
             elem.text = ""
 
         # Remove invisible elements
-        for elem_id in range(self.max_elem_id):
+        max_elem_id = self.max_elem_ids[self.driver.current_window_handle]
+        for elem_id in range(max_elem_id):
             try:
                 lxml_elem = root.xpath(f'//*[@data-psgn-id="{elem_id}"]')[0]
                 selenium_elem = driver.find_elements(By.XPATH, f'//*[@data-psgn-id="{elem_id}"]')[0]
@@ -212,6 +220,10 @@ class Executor:
         while user_input != "N/A" and not selected_node_ids and not user_input.startswith("XPATH:") and not user_input.startswith("CSS:"):
             user_input = input('Please click an element or type "N/A": ')
             selected_node_ids = self.get_selected_node_ids()
+        self.highlights_cleanup()
+        if user_input == "N/A":
+            return None, None, None, None
+
         css_selector = None
         xpath_selector = None
         if user_input.startswith("CSS:"):
@@ -221,12 +233,8 @@ class Executor:
             xpath_selector = user_input[6:].strip()
             selected_node_ids = self.get_selected_node_ids(xpath_selector=xpath_selector)
 
-        self.highlights_cleanup()
-        if user_input == "N/A":
-            return None, None, None, None
-        else:
-            elem_id = selected_node_ids[0]
-            elem = self._id_to_elem(elem_id)
+        elem_id = selected_node_ids[0] if selected_node_ids else None
+        elem = self._id_to_elem(elem_id) if selected_node_ids else None
         return elem, elem_id, css_selector, xpath_selector
 
     def get_elem_by_description(self, description, elem_type):
@@ -552,7 +560,10 @@ class Executor:
         finally:
             self.driver.quit()
             for proc in psutil.process_iter():
-                if proc.name() == "chromedriver":
-                    proc.kill()
+                try:
+                    if proc.name() == "chromedriver":
+                        proc.kill()
+                except psutil.NoSuchProcess:
+                    continue
             if self.headless:
                 self.display.stop()

parsagon/highlights.js

@@ -128,14 +128,24 @@ function hasValidData(element, dataType) {
     return true;
 }
 
-function makeVisible(element) {
-    const rects = element.getClientRects();
-    if (rects.length) {
-        const rect = rects[0];
-        if (rect.width * rect.height === 0) {
-            element.style.display = 'block';
+function makeVisible(elements) {
+
+    let elemsToDisplayBlock = [];
+    for (let element of elements) {
+        const rects = element.getClientRects();
+        if (rects.length) {
+            const rect = rects[0];
+            if (rect.width * rect.height === 0) {
+                elemsToDisplayBlock.push(element);
+            }
         }
     }
+
+    requestAnimationFrame(() => {
+        for (let elem of elemsToDisplayBlock) {
+            elem.style.display = 'block';
+        }
+    })
 }
 
 const DUMMY_FRAGMENT = document.createDocumentFragment()
@@ -241,28 +251,45 @@ function removeTargetStoredCSS(element) {
     element.style.removeProperty('position');
     element.classList.remove(TARGET_STORED_CLASSNAME);
     if (element.classList.contains(AUTOCOMPLETE_CLASSNAME)) {
-        addAutocompleteCSS(element);
+        addAutocompleteCSS([element]);
     } else if (element.classList.contains(MOUSE_VISITED_CLASSNAME)) {
         addMouseVisitedCSS(element);
     }
 };
-function addAutocompleteCSS(element) {
-    if (!element.classList.contains(TARGET_STORED_CLASSNAME)) {
-        element.style.setProperty(
-            'outline',
-            '3px solid rgb(255, 177, 255)',
-            'important'
-        );
-        element.style.setProperty('outline-offset', '-3px', 'important');
-        if (
-            window.getComputedStyle(element)
-                .position === 'static'
-        ) {
-            element.style.setProperty('position', 'relative', 'important');
+function addAutocompleteCSS(elements) {
+    let setOutlineElements = [];
+    let makeStaticElements = [];
+    for (const element of elements) {
+        if (!element.classList.contains(TARGET_STORED_CLASSNAME)) {
+            setOutlineElements.push(element);
+            if (
+                window.getComputedStyle(element)
+                    .position === 'static'
+            ) {
+                makeStaticElements.push(element);
+            }
         }
     }
-    element.classList.add(AUTOCOMPLETE_CLASSNAME);
+
+    // Perform batch writes
+    requestAnimationFrame(() => {
+        for (const element of setOutlineElements) {
+                element.style.setProperty(
+                'outline',
+                '3px solid rgb(255, 177, 255)',
+                'important'
+            );
+            element.style.setProperty('outline-offset', '-3px', 'important');
+        }
+        for (const element of makeStaticElements) {
+            element.style.setProperty('position', 'relative', 'important');
+        }
+        for (const element of elements) {
+            element.classList.add(AUTOCOMPLETE_CLASSNAME);
+        }
+    });
 };
+
 function removeAutocompleteCSS(element) {
     element.style.removeProperty('outline');
     element.style.removeProperty('outline-offset');
@@ -300,13 +327,13 @@ function addAutocompletes() {
             document.querySelectorAll(
                 cssSelector
             );
-        for (const elem of similarElems) {
-            if (elem.classList.contains(TARGET_STORED_CLASSNAME)) {
-                continue;
-            }
-            makeVisible(elem);
-            addAutocompleteCSS(elem);
-        }
+
+        // Set to similarElems where elem.classList.contains(TARGET_STORED_CLASSNAME) === false
+        const elemsToMakeVisibleAndAddAutocompleteCSS = Array.from(similarElems).filter((elem) => {
+            return !elem.classList.contains(TARGET_STORED_CLASSNAME);
+        });
+        makeVisible(elemsToMakeVisibleAndAddAutocompleteCSS);
+        addAutocompleteCSS(elemsToMakeVisibleAndAddAutocompleteCSS);
     }
 };
 
@@ -496,7 +523,7 @@ function handleMouseMove(e) {
         return;
     }
 
-    makeVisible(srcElement);
+    makeVisible([srcElement]);
 
     addMouseVisitedCSS(srcElement);
     window.prevDOM = srcElement;

parsagon/main.py

@@ -325,8 +325,11 @@ def run(program_name, variables={}, headless=False, remote=False, verbose=False)
         if "display" in globals_locals:
             globals_locals["display"].stop()
         for proc in psutil.process_iter():
-            if proc.name() == "chromedriver":
-                proc.kill()
+            try:
+                if proc.name() == "chromedriver":
+                    proc.kill()
+            except psutil.NoSuchProcess:
+                continue
     logger.info("Done.")
     return globals_locals["output"]
 
@@ -359,6 +362,8 @@ def batch_runs(batch_name, program_name, runs=[], headless=False, ignore_errors=
                         pbar.set_description(f"An error occurred: {e} - 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:

{parsagon-0.10.16.dist-info → parsagon-0.10.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: parsagon
-Version: 0.10.16
+Version: 0.10.20
 Summary: Allows you to create browser automations with natural language
 Author-email: Sandy Suh <sandy@parsagon.io>
 Project-URL: Homepage, https://parsagon.io
@@ -17,8 +17,8 @@ Requires-Dist: tqdm ==4.66.1
 Requires-Dist: PyVirtualDisplay ==3.0
 Requires-Dist: selenium-wire ==5.1.0
 Requires-Dist: cssselect ==1.1.0
-Requires-Dist: undetected-chromedriver ==3.5.2
-Requires-Dist: webdriver-manager ==4.0.0
+Requires-Dist: undetected-chromedriver ==3.5.3
+Requires-Dist: webdriver-manager ==4.0.1
 Requires-Dist: jsonpath-ng ==1.5.3
 Requires-Dist: simplejson ==3.19.1
 Provides-Extra: dev
@@ -75,6 +75,9 @@ parsagon.create('Go to https://www.google.com/. Type "the meaning of life" into
 # Run a program
 parsagon.run("My program")
 
+# Run a program multiple times
+parsagon.batch_runs("My batch name", "My program", runs=[{"variable_name": "value1"}, {"variable_name": "value2"}, ...])
+
 # List your programs
 parsagon.detail()
 

{parsagon-0.10.16.dist-info → parsagon-0.10.20.dist-info}/RECORD

@@ -2,9 +2,9 @@ parsagon/__init__.py,sha256=n4-wiFVVuyW_KOJeNiycggAg9BTa5bbBIVpD_DkdOO4,125
 parsagon/api.py,sha256=eJULOzTyWqA4Mio7tH9PszwTrZyxRBI0uO9t1h3R7rw,6634
 parsagon/custom_function.py,sha256=oEj28qItaHUnsvLIHD7kg5QL3J3aO6rW6xKKP-H-Drs,770
 parsagon/exceptions.py,sha256=NYpFaSLZplBTv9fov_1LKPzDPIqb7Ffe7IunnjntxvA,819
-parsagon/executor.py,sha256=BRfmdYrr-HQUwlXRDePpclkKqjR9pc48MgtJhPpEBuM,22209
-parsagon/highlights.js,sha256=bm8OcDMgSMUJw_b_pJ-qN0W2fS-JnGZR14LQrPnIf1U,15690
-parsagon/main.py,sha256=jcXbKY3h3ZSvQOX7SRDC_fl3VqDu4N_Zbi8jdn2hQN0,14561
+parsagon/executor.py,sha256=e_e9p5eLvf7wYHk1BNJf0j_qt0H17BfivPb8CoOKMHE,22791
+parsagon/highlights.js,sha256=2UDfUApblU9xtGgTLCq4X7rHRV0wcqDSSFZPmJS6fJg,16643
+parsagon/main.py,sha256=yQbIzqJ7Ea6XZJ3Eolx2lTh7Di87qPJvDI0WRNeoX14,14736
 parsagon/settings.py,sha256=s5_MsDMFM5tB8U8tfHaFnKibCoEqPnAu8b_ueg07Ftw,2947
 parsagon/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 parsagon/tests/api_mocks.py,sha256=M8xhiyPa1dI8Vx-odDk7ETopfFAfcjfAf-ApmSqgvfw,3127
@@ -13,8 +13,8 @@ parsagon/tests/conftest.py,sha256=KMlHohc0QT77HzumraIojzKeqroyxarnaT6naJDNvEc,42
 parsagon/tests/test_executor.py,sha256=n3cmh84r74siSeJqUeAIwjjnNzDVPEdxcvYAeJ4hNX8,645
 parsagon/tests/test_invalid_args.py,sha256=kOjMpbZvviR1CwvXReteZMxBvuhq_rOv5Tm1muBSzNk,676
 parsagon/tests/test_pipeline_operations.py,sha256=TpBKCuRA8LHYWx3PD_k9mYCSsA_9SZjrOX-rS4mE8XE,1089
-parsagon-0.10.16.dist-info/METADATA,sha256=RuxfEuUUmyQUOTPjmckDOTlpI9phRtVDc_lIxlPvidU,2257
-parsagon-0.10.16.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-parsagon-0.10.16.dist-info/entry_points.txt,sha256=I1UlPUb4oY2k9idkI8kvdkEcrjKGRSOl5pMbA6uu6kw,48
-parsagon-0.10.16.dist-info/top_level.txt,sha256=ih5uYQzW4qjhRKppys-WiHLIbXVZ99YdqDcfAtlcQwk,9
-parsagon-0.10.16.dist-info/RECORD,,
+parsagon-0.10.20.dist-info/METADATA,sha256=vA0gDtSRv8FeLScDZJHTNQjSgBw2MaAetLcrDJ9bIaw,2410
+parsagon-0.10.20.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+parsagon-0.10.20.dist-info/entry_points.txt,sha256=I1UlPUb4oY2k9idkI8kvdkEcrjKGRSOl5pMbA6uu6kw,48
+parsagon-0.10.20.dist-info/top_level.txt,sha256=ih5uYQzW4qjhRKppys-WiHLIbXVZ99YdqDcfAtlcQwk,9
+parsagon-0.10.20.dist-info/RECORD,,