parsagon 0.14.7__py3-none-any.whl → 0.14.9__py3-none-any.whl

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.dist-info → parsagon-0.14.9.dist-info}/METADATA

@@ -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.dist-info → parsagon-0.14.9.dist-info}/RECORD

@@ -5,7 +5,7 @@ parsagon/create.py,sha256=UiX6ffLPw2zF4atQxHFKBXpnlX05G1HHSn7Xi4K7tBM,3921
 parsagon/custom_function.py,sha256=oEj28qItaHUnsvLIHD7kg5QL3J3aO6rW6xKKP-H-Drs,770
 parsagon/edit.py,sha256=aLeAcp1hFHm29qh6do21cfYykK76CsHC4tc9Uh2_2bk,3006
 parsagon/exceptions.py,sha256=tG1vnpmUN1GdJ1GSpe1MaWH3zWmFLZCwtOfEGu8qPP0,910
-parsagon/executor.py,sha256=umsIkUtWxNU1VmO8DCFb0lUIZ7w_2LONfa5g34MuHGw,24130
+parsagon/executor.py,sha256=TWYYI5x708vArFNymSVQyql9JXui1yWquGqbt-ZThic,24829
 parsagon/gui_entry.py,sha256=bqG9K0CArXWWwDGoT8aV17YLNM8MfjSf6SJ_B3QbNeA,671
 parsagon/highlights.js,sha256=2UDfUApblU9xtGgTLCq4X7rHRV0wcqDSSFZPmJS6fJg,16643
 parsagon/main.py,sha256=3BskD1QPqDOfSwLGJBIn0-npNxRy5KZUtKIVNAKYwtA,9349
@@ -25,8 +25,8 @@ parsagon/tests/test_invalid_args.py,sha256=TAFdHGy92lUxjljPrtODOuEGVss6rn-F5GvEK
 parsagon/tests/test_pipeline_operations.py,sha256=aEwZNtIwOl9X7jdLDLB4YEdgMp7_x8PXCINAE7RT4NY,805
 parsagon/tests/test_print.py,sha256=BG7f55YDBoL0S7k291-so_Gje_hUAQOkB-jh-bEYsJY,198
 parsagon/tests/test_secrets.py,sha256=Ctsscl2tmMTZcFAy5dnyqUlgTov2UharZgLpbRCLdEg,2662
-parsagon-0.14.7.dist-info/METADATA,sha256=5GBklSqHzotEcLVAxGkAi5rkLFMyQd5_Kx3vvxK9NHQ,2431
-parsagon-0.14.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-parsagon-0.14.7.dist-info/entry_points.txt,sha256=I1UlPUb4oY2k9idkI8kvdkEcrjKGRSOl5pMbA6uu6kw,48
-parsagon-0.14.7.dist-info/top_level.txt,sha256=ih5uYQzW4qjhRKppys-WiHLIbXVZ99YdqDcfAtlcQwk,9
-parsagon-0.14.7.dist-info/RECORD,,
+parsagon-0.14.9.dist-info/METADATA,sha256=cCWaovcXkrBuJHPaVFSgZmLenY6sann8UB9aTFF4ZRg,2431
+parsagon-0.14.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+parsagon-0.14.9.dist-info/entry_points.txt,sha256=I1UlPUb4oY2k9idkI8kvdkEcrjKGRSOl5pMbA6uu6kw,48
+parsagon-0.14.9.dist-info/top_level.txt,sha256=ih5uYQzW4qjhRKppys-WiHLIbXVZ99YdqDcfAtlcQwk,9
+parsagon-0.14.9.dist-info/RECORD,,