parsagon 0.14.7__tar.gz → 0.14.9__tar.gz

{parsagon-0.14.7 → parsagon-0.14.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: parsagon
-Version: 0.14.7
+Version: 0.14.9
 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.14.7 → parsagon-0.14.9}/pyproject.toml

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

{parsagon-0.14.7 → parsagon-0.14.9}/src/parsagon/executor.py

@@ -212,24 +212,36 @@ class Executor:
             elem.getparent().remove(elem)
 
         # Remove invisible elements
+        id_to_elem = {}
+        for elem in root.iter():
+            elem_id = elem.get("data-psgn-id")
+            if elem_id:
+                id_to_elem[elem_id] = elem
         visible_elem_ids = set(
             driver.execute_script(
-                "return Array.from(document.getElementsByTagName('*')).filter((elem) => { const style = getComputedStyle(elem); return style.opacity > 0.1 && style.display !== 'none' && style.visibility === 'visible' && elem.offsetWidth && elem.offsetHeight && elem.getClientRects().length }).map((elem) => elem.getAttribute('data-psgn-id'))"
+                "return Array.from(document.getElementsByTagName('*')).filter((elem) => { const style = getComputedStyle(elem); const rect = elem.getBoundingClientRect(); return style.opacity > 0.1 && style.display !== 'none' && style.visibility === 'visible' && elem.offsetWidth && elem.offsetHeight && elem.getClientRects().length && rect.right + window.scrollX >= 0 && rect.bottom + window.scrollY >= 0 }).map((elem) => elem.getAttribute('data-psgn-id'))"
             )
         )
         max_elem_id = self.max_elem_ids[self.driver.current_window_handle]
         with Progress() as progress:
             for elem_id in progress.track(range(max_elem_id), description="[green]Analyzing page"):
-                is_visible = str(elem_id) in visible_elem_ids
+                elem_id = str(elem_id)
+                is_visible = elem_id in visible_elem_ids
                 if not is_visible:
                     try:
                         lxml_elem = root.xpath(f'//*[@data-psgn-id="{elem_id}"]')[0]
+                        contains_visible = False
+                        for descendant in lxml_elem.iterdescendants():
+                            if descendant.get("data-psgn-id") in visible_elem_ids:
+                                contains_visible = True
+                                break
+                        if contains_visible:
+                            continue
                         parent = lxml_elem.getparent()
                         if parent is not None:
                             parent.remove(lxml_elem)
                     except IndexError:
                         continue
-
         return lxml.html.tostring(root).decode()
 
     def get_elem(self, description, elem_type):

{parsagon-0.14.7 → parsagon-0.14.9}/src/parsagon.egg-info/PKG-INFO

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