seleniumbase 4.28.3__py3-none-any.whl → 4.28.4a1__py3-none-any.whl

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.28.3"
+__version__ = "4.28.4a1"

seleniumbase/core/browser_launcher.py

@@ -649,12 +649,125 @@ def uc_gui_write(driver, text):
         pyautogui.write(text)
 
 
-def uc_gui_handle_cf(driver, frame="iframe"):
+def get_gui_element_position(driver, selector):
+    element = driver.wait_for_element_present(selector, timeout=3)
+    element_rect = element.rect
+    window_rect = driver.get_window_rect()
+    window_bottom_y = window_rect["y"] + window_rect["height"]
+    viewport_height = driver.execute_script("return window.innerHeight;")
+    viewport_x = window_rect["x"] + element_rect["x"]
+    viewport_y = window_bottom_y - viewport_height + element_rect["y"]
+    return (viewport_x, viewport_y)
+
+
+def uc_gui_click_x_y(driver, x, y, timeframe=0.25):
+    install_pyautogui_if_missing(driver)
+    import pyautogui
+    pyautogui = get_configured_pyautogui(pyautogui)
+    screen_width, screen_height = pyautogui.size()
+    if x > screen_width or y > screen_height:
+        raise Exception(
+            "PyAutoGUI cannot click on point (%s, %s)"
+            " outside screen. (Width: %s, Height: %s)"
+            % (x, y, screen_width, screen_height)
+        )
+    pyautogui.moveTo(x, y, timeframe, pyautogui.easeOutQuad)
+    if timeframe >= 0.25:
+        time.sleep(0.0555)  # Wait if moving at human-speed
+    if "--debug" in sys.argv:
+        print(" <DEBUG> pyautogui.click(%s, %s)" % (x, y))
+    pyautogui.click(x=x, y=y)
+
+
+def on_a_cf_turnstile_page(driver):
     source = driver.get_page_source()
     if (
-        "//challenges.cloudflare.com" not in source
-        and 'aria-label="Cloudflare"' not in source
+        "//challenges.cloudflare.com" in source
+        or 'aria-label="Cloudflare"' in source
     ):
+        return True
+    return False
+
+
+def uc_gui_click_cf(driver, frame="iframe", retry=False, blind=False):
+    if not on_a_cf_turnstile_page(driver):
+        return
+    install_pyautogui_if_missing(driver)
+    import pyautogui
+    pyautogui = get_configured_pyautogui(pyautogui)
+    x = None
+    y = None
+    gui_lock = fasteners.InterProcessLock(
+        constants.MultiBrowser.PYAUTOGUILOCK
+    )
+    with gui_lock:  # Prevent issues with multiple processes
+        needs_switch = False
+        is_in_frame = js_utils.is_in_frame(driver)
+        if is_in_frame and driver.is_element_present("#challenge-stage"):
+            driver.switch_to.parent_frame()
+            needs_switch = True
+            is_in_frame = js_utils.is_in_frame(driver)
+        if not is_in_frame:
+            # Make sure the window is on top
+            page_actions.switch_to_window(
+                driver, driver.current_window_handle, 2, uc_lock=False
+            )
+        if not is_in_frame or needs_switch:
+            # Currently not in frame (or nested frame outside CF one)
+            try:
+                i_x, i_y = get_gui_element_position(driver, "iframe")
+                driver.switch_to_frame(frame)
+            except Exception:
+                if driver.is_element_present("iframe"):
+                    i_x, i_y = get_gui_element_position(driver, "iframe")
+                    driver.switch_to_frame("iframe")
+                else:
+                    return
+        try:
+            selector = "span"
+            element = driver.wait_for_element_present(selector, timeout=2)
+            x = i_x + element.rect["x"] + int(element.rect["width"] / 2) + 1
+            y = i_y + element.rect["y"] + int(element.rect["height"] / 2) + 1
+            driver.switch_to.default_content()
+        except Exception:
+            try:
+                driver.switch_to.default_content()
+            except Exception:
+                return
+        driver.disconnect()
+        try:
+            if x and y:
+                sb_config._saved_cf_x_y = (x, y)
+                uc_gui_click_x_y(driver, x, y, timeframe=0.842)
+        except Exception:
+            pass
+    reconnect_time = (float(constants.UC.RECONNECT_TIME) / 2.0) + 0.5
+    if IS_LINUX:
+        reconnect_time = constants.UC.RECONNECT_TIME
+    if not x or not y:
+        reconnect_time = 1  # Make it quick (it already failed)
+    driver.reconnect(reconnect_time)
+    if blind:
+        retry = True
+    if retry and x and y and on_a_cf_turnstile_page(driver):
+        driver.switch_to_frame("iframe")
+        if driver.is_element_visible("#success-icon"):
+            driver.switch_to.parent_frame()
+            return
+        if blind:
+            driver.uc_open_with_disconnect(driver.current_url, 3.8)
+            uc_gui_click_x_y(driver, x, y, timeframe=1.05)
+            driver.reconnect(reconnect_time)
+        else:
+            driver.uc_open_with_reconnect(driver.current_url, 3.8)
+            if on_a_cf_turnstile_page(driver):
+                driver.disconnect()
+                uc_gui_click_x_y(driver, x, y, timeframe=1.05)
+                driver.reconnect(reconnect_time)
+
+
+def uc_gui_handle_cf(driver, frame="iframe"):
+    if not on_a_cf_turnstile_page(driver):
         return
     install_pyautogui_if_missing(driver)
     import pyautogui
@@ -696,6 +809,8 @@ def uc_gui_handle_cf(driver, frame="iframe"):
         except Exception:
             pass
     reconnect_time = (float(constants.UC.RECONNECT_TIME) / 2.0) + 0.5
+    if IS_LINUX:
+        reconnect_time = constants.UC.RECONNECT_TIME
     driver.reconnect(reconnect_time)
 
 
@@ -4027,6 +4142,16 @@ def get_local_driver(
                             driver, *args, **kwargs
                         )
                     )
+                    driver.uc_gui_click_x_y = (
+                        lambda *args, **kwargs: uc_gui_click_x_y(
+                            driver, *args, **kwargs
+                        )
+                    )
+                    driver.uc_gui_click_cf = (
+                        lambda *args, **kwargs: uc_gui_click_cf(
+                            driver, *args, **kwargs
+                        )
+                    )
                     driver.uc_gui_handle_cf = (
                         lambda *args, **kwargs: uc_gui_handle_cf(
                             driver, *args, **kwargs

seleniumbase/fixtures/base_case.py

@@ -3393,23 +3393,85 @@ class BaseCase(unittest.TestCase):
             self.activate_jquery()
         return self.driver.execute_script(script, *args, **kwargs)
 
+    def get_gui_element_rect(self, selector, by="css selector"):
+        """Very similar to element.rect, but the x, y coordinates are
+        relative to the entire screen, rather than the browser window.
+        This is specifically for PyAutoGUI actions on the full screen.
+        (Note: There may be complications if iframes are involved.)"""
+        element = self.wait_for_element_present(selector, by=by, timeout=1)
+        element_rect = element.rect
+        e_width = element_rect["width"]
+        e_height = element_rect["height"]
+        i_x = 0
+        i_y = 0
+        iframe_switch = False
+        if self.__is_in_frame():
+            self.switch_to_parent_frame()
+            if self.__is_in_frame():
+                raise Exception("Nested iframes breaks get_gui_element_rect!")
+            iframe_switch = True
+            iframe = self.wait_for_element_present("iframe", timeout=1)
+            i_x = iframe.rect["x"]
+            i_y = iframe.rect["y"]
+        window_rect = self.get_window_rect()
+        w_bottom_y = window_rect["y"] + window_rect["height"]
+        viewport_height = self.execute_script("return window.innerHeight;")
+        x = math.ceil(window_rect["x"] + i_x + element_rect["x"])
+        y = math.ceil(w_bottom_y - viewport_height + i_y + element_rect["y"])
+        if iframe_switch:
+            self.switch_to_frame()
+            if not self.is_element_present(selector, by=by):
+                self.switch_to_parent_frame()
+        return ({"height": e_height, "width": e_width, "x": x, "y": y})
+
+    def get_gui_element_center(self, selector, by="css selector"):
+        """Returns the x, y coordinates of the element's center based
+        on the entire GUI / screen, rather than on the browser window.
+        This is specifically for PyAutoGUI actions on the full screen.
+        (Note: There may be complications if iframes are involved.)"""
+        element_rect = self.get_gui_element_rect(selector, by=by)
+        x = int(element_rect["x"]) + int(element_rect["width"] / 2) + 1
+        y = int(element_rect["y"]) + int(element_rect["height"] / 2) + 1
+        return (x, y)
+
+    def get_window_rect(self):
+        self.__check_scope()
+        self._check_browser()
+        return self.driver.get_window_rect()
+
+    def get_window_size(self):
+        self.__check_scope()
+        self._check_browser()
+        return self.driver.get_window_size()
+
+    def get_window_position(self):
+        self.__check_scope()
+        self._check_browser()
+        return self.driver.get_window_position()
+
     def set_window_rect(self, x, y, width, height):
         self.__check_scope()
         self._check_browser()
         self.driver.set_window_rect(x, y, width, height)
-        self.__demo_mode_pause_if_active()
+        self.__demo_mode_pause_if_active(tiny=True)
 
     def set_window_size(self, width, height):
         self.__check_scope()
         self._check_browser()
         self.driver.set_window_size(width, height)
-        self.__demo_mode_pause_if_active()
+        self.__demo_mode_pause_if_active(tiny=True)
+
+    def set_window_position(self, x, y):
+        self.__check_scope()
+        self._check_browser()
+        self.driver.set_window_position(x, y)
+        self.__demo_mode_pause_if_active(tiny=True)
 
     def maximize_window(self):
         self.__check_scope()
         self._check_browser()
         self.driver.maximize_window()
-        self.__demo_mode_pause_if_active()
+        self.__demo_mode_pause_if_active(tiny=True)
 
     def switch_to_frame(self, frame="iframe", timeout=None):
         """Wait for an iframe to appear, and switch to it. This should be
@@ -4178,6 +4240,10 @@ class BaseCase(unittest.TestCase):
                 self.uc_gui_press_keys = new_driver.uc_gui_press_keys
             if hasattr(new_driver, "uc_gui_write"):
                 self.uc_gui_write = new_driver.uc_gui_write
+            if hasattr(new_driver, "uc_gui_click_x_y"):
+                self.uc_gui_click_x_y = new_driver.uc_gui_click_x_y
+            if hasattr(new_driver, "uc_gui_click_cf"):
+                self.uc_gui_click_cf = new_driver.uc_gui_click_cf
             if hasattr(new_driver, "uc_gui_handle_cf"):
                 self.uc_gui_handle_cf = new_driver.uc_gui_handle_cf
             if hasattr(new_driver, "uc_switch_to_frame"):

{seleniumbase-4.28.3.dist-info → seleniumbase-4.28.4a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.28.3
+Version: 4.28.4a1
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -59,7 +59,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: attrs >=23.2.0
-Requires-Dist: certifi >=2024.6.2
+Requires-Dist: certifi >=2024.7.4
 Requires-Dist: exceptiongroup >=1.2.1
 Requires-Dist: parse >=1.20.2
 Requires-Dist: parse-type >=0.6.2
@@ -115,12 +115,12 @@ Requires-Dist: markdown-it-py ==2.2.0 ; python_version < "3.8"
 Requires-Dist: urllib3 <2.3.0,>=1.26.18 ; python_version >= "3.10"
 Requires-Dist: pip >=24.1.1 ; python_version >= "3.8"
 Requires-Dist: packaging >=24.1 ; python_version >= "3.8"
-Requires-Dist: setuptools >=70.1.1 ; python_version >= "3.8"
+Requires-Dist: setuptools >=70.2.0 ; python_version >= "3.8"
 Requires-Dist: wheel >=0.43.0 ; python_version >= "3.8"
 Requires-Dist: filelock >=3.15.4 ; python_version >= "3.8"
 Requires-Dist: platformdirs >=4.2.2 ; python_version >= "3.8"
 Requires-Dist: typing-extensions >=4.12.2 ; python_version >= "3.8"
-Requires-Dist: trio ==0.25.1 ; python_version >= "3.8"
+Requires-Dist: trio ==0.26.0 ; python_version >= "3.8"
 Requires-Dist: websocket-client ==1.8.0 ; python_version >= "3.8"
 Requires-Dist: selenium ==4.22.0 ; python_version >= "3.8"
 Requires-Dist: execnet ==2.1.1 ; python_version >= "3.8"
@@ -162,11 +162,11 @@ Requires-Dist: cffi ==1.16.0 ; (python_version >= "3.8") and extra == 'pdfminer'
 Requires-Dist: cryptography ==42.0.8 ; (python_version >= "3.9") and extra == 'pdfminer'
 Provides-Extra: pillow
 Requires-Dist: Pillow ==9.5.0 ; (python_version < "3.8") and extra == 'pillow'
-Requires-Dist: Pillow >=10.3.0 ; (python_version >= "3.8") and extra == 'pillow'
+Requires-Dist: Pillow >=10.4.0 ; (python_version >= "3.8") and extra == 'pillow'
 Provides-Extra: pip-system-certs
 Requires-Dist: pip-system-certs ==4.0 ; (platform_system == "Windows") and extra == 'pip-system-certs'
 Provides-Extra: proxy
-Requires-Dist: proxy.py ==2.4.4 ; extra == 'proxy'
+Requires-Dist: proxy.py ==2.4.3 ; extra == 'proxy'
 Provides-Extra: psutil
 Requires-Dist: psutil ==5.9.8 ; extra == 'psutil'
 Provides-Extra: pyautogui

{seleniumbase-4.28.3.dist-info → seleniumbase-4.28.4a1.dist-info}/RECORD

@@ -5,7 +5,7 @@ sbase/steps.py,sha256=bKT_u5bJkKzYWEuAXi9NVVRYYxQRCM1_YJUrNFFRVPY,42865
 seleniumbase/ReadMe.md,sha256=4nEdto4d0Ch0Zneg0yAC-RBBdqRqPUP0SCo-ze_XDPM,3612
 seleniumbase/__init__.py,sha256=dgq30q6wGO2fJOVYemxC5hLxzv-of-MRn5P1YarBq5k,2263
 seleniumbase/__main__.py,sha256=dn1p6dgCchmcH1zzTzzQvFwwdQQqnTGH6ULV9m4hv24,654
-seleniumbase/__version__.py,sha256=cyJCmfXb8uOXpicHMTRrUVntEJqA05hh6lLNfWjF15Y,46
+seleniumbase/__version__.py,sha256=LuplWFkCnURG8S5Ug851xWuiai-6wpOHdyGC1D8NYQU,48
 seleniumbase/behave/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/behave/behave_helper.py,sha256=elkl8P9eLulRAioLstE9baYNM9N_PHBmAOcajX-pH_Y,24198
 seleniumbase/behave/behave_sb.py,sha256=q4uYZixZBf7VYWnQnEk2weTcyMy1X1faR3vyYvUzDiA,56406
@@ -40,7 +40,7 @@ seleniumbase/console_scripts/sb_print.py,sha256=yo641b_OdSE0GUauOyxk-QrNeIjYzbRY
 seleniumbase/console_scripts/sb_recorder.py,sha256=UQQhnAR18dbcC7ToDvj6TM2PIG5qBrNaekaM6kSK_E8,10970
 seleniumbase/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/core/application_manager.py,sha256=e_0sjtI8cjY5BNyZj1QBR0j6_oCScxGmSXYEpcYwuZE,576
-seleniumbase/core/browser_launcher.py,sha256=yfmykwla-bp3_4GuaqWU27iFqwlpK6SKAnUV-8E8PUE,176819
+seleniumbase/core/browser_launcher.py,sha256=hWxgwElRcGkrd70_T080Z9gPqrVypWn4UhXeoBSWq2s,181734
 seleniumbase/core/capabilities_parser.py,sha256=meIS2uHapTCq2ldfNAToC7r0cKmZDRXuYNKExM1GHDY,6038
 seleniumbase/core/colored_traceback.py,sha256=DrRWfg7XEnKcgY59Xj7Jdk09H-XqHYBSUpB-DiZt6iY,2020
 seleniumbase/core/create_db_tables.sql,sha256=VWPtrdiW_HQ6yETHjqTu-VIrTwvd8I8o1NfBeaVSHpU,972
@@ -70,7 +70,7 @@ seleniumbase/extensions/disable_csp.zip,sha256=YMifIIgEBiLrEFrS1sfW4Exh4br1V4oK1
 seleniumbase/extensions/recorder.zip,sha256=OOyzF-Ize2cSRu1CqhzSAq5vusI9hqLLd2OIApUHesI,11918
 seleniumbase/extensions/sbase_ext.zip,sha256=3s1N8zrVaMz8RQEOIoBzC3KDjtmHwVZRvVsX25Odr_s,8175
 seleniumbase/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-seleniumbase/fixtures/base_case.py,sha256=qCh7W-WPtmpnSUsyc6CbERE4AH415Hp7Ms33GnLw_xo,698095
+seleniumbase/fixtures/base_case.py,sha256=le9PvYxZzLnGPo-8CcF-RIeCQPv0LeuJGCEV5OIs63Q,701104
 seleniumbase/fixtures/constants.py,sha256=TapuGLdERtvZPGMblVXkNGybr8tj8FMtN3sbJ3ygyoc,13569
 seleniumbase/fixtures/css_to_xpath.py,sha256=9ouDB1xl4MJ2os6JOgTIAyHKOQfuxtxvXC3O5hSnEKA,1954
 seleniumbase/fixtures/errors.py,sha256=KyxuEVx_e3MPhVrJfNIa_3ltMpbCFxfy_jxK8RFNTns,555
@@ -137,9 +137,9 @@ seleniumbase/utilities/selenium_grid/start-grid-hub.sh,sha256=KADv0RUHONLL2_I443
 seleniumbase/utilities/selenium_ide/ReadMe.md,sha256=hznGeuMpkIimqMiZBW-4goIy2ltW4l8X9kb0YSPUQfE,4483
 seleniumbase/utilities/selenium_ide/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/utilities/selenium_ide/convert_ide.py,sha256=pZFnqEJQEKZPyNFjkLD29s2HPQgCrWW9XJWpCPhWOoM,31691
-seleniumbase-4.28.3.dist-info/LICENSE,sha256=odSYtWibXBnQ1gBg6CnDZ82n8kLF_if5-2nbqnEyD8k,1085
-seleniumbase-4.28.3.dist-info/METADATA,sha256=4WCGrn2N9VQ1B4bYngQH6pwVZVvrWZ0TUwKYK0yfWZw,85546
-seleniumbase-4.28.3.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-seleniumbase-4.28.3.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
-seleniumbase-4.28.3.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
-seleniumbase-4.28.3.dist-info/RECORD,,
+seleniumbase-4.28.4a1.dist-info/LICENSE,sha256=odSYtWibXBnQ1gBg6CnDZ82n8kLF_if5-2nbqnEyD8k,1085
+seleniumbase-4.28.4a1.dist-info/METADATA,sha256=ahzWYHH7Ma97Gr6ri4stnRZfA4voUMK5B0HI5VAXZsc,85548
+seleniumbase-4.28.4a1.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+seleniumbase-4.28.4a1.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
+seleniumbase-4.28.4a1.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
+seleniumbase-4.28.4a1.dist-info/RECORD,,

{seleniumbase-4.28.3.dist-info → seleniumbase-4.28.4a1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.1)
+Generator: setuptools (70.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any