seleniumbase 4.28.4__py3-none-any.whl → 4.28.5__py3-none-any.whl

seleniumbase/__version__.py

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

seleniumbase/core/browser_launcher.py

@@ -660,7 +660,7 @@ def get_gui_element_position(driver, selector):
     return (viewport_x, viewport_y)
 
 
-def uc_gui_click_x_y(driver, x, y, timeframe=0.25, uc_lock=True):
+def _uc_gui_click_x_y(driver, x, y, timeframe=0.25, uc_lock=False):
     install_pyautogui_if_missing(driver)
     import pyautogui
     pyautogui = get_configured_pyautogui(pyautogui)
@@ -678,7 +678,7 @@ def uc_gui_click_x_y(driver, x, y, timeframe=0.25, uc_lock=True):
         with gui_lock:  # Prevent issues with multiple processes
             pyautogui.moveTo(x, y, timeframe, pyautogui.easeOutQuad)
             if timeframe >= 0.25:
-                time.sleep(0.0555)  # Wait if moving at human-speed
+                time.sleep(0.056)  # 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)
@@ -686,30 +686,71 @@ def uc_gui_click_x_y(driver, x, y, timeframe=0.25, uc_lock=True):
         # Called from a method where the gui_lock is already active
         pyautogui.moveTo(x, y, timeframe, pyautogui.easeOutQuad)
         if timeframe >= 0.25:
-            time.sleep(0.0555)  # Wait if moving at human-speed
+            time.sleep(0.056)  # 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):
+def uc_gui_click_x_y(driver, x, y, timeframe=0.25):
+    _uc_gui_click_x_y(driver, x, y, timeframe=timeframe, uc_lock=True)
+
+
+def _on_a_cf_turnstile_page(driver):
     source = driver.get_page_source()
     if (
-        "//challenges.cloudflare.com" in source
-        or 'aria-label="Cloudflare"' in source
+        'data-callback="onCaptchaSuccess"' in source
+        or "cf-turnstile-wrapper" 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
+def _on_a_g_recaptcha_page(driver):
+    source = driver.get_page_source()
+    if (
+        'id="recaptcha-token"' in source
+        or 'title="reCAPTCHA"' in source
+    ):
+        return True
+    return False
+
+
+def _uc_gui_click_captcha(
+    driver,
+    frame="iframe",
+    retry=False,
+    blind=False,
+    ctype=None,
+):
+    _on_a_captcha_page = None
+    if ctype == "cf_t":
+        if not _on_a_cf_turnstile_page(driver):
+            return
+        else:
+            _on_a_captcha_page = _on_a_cf_turnstile_page
+    elif ctype == "g_rc":
+        if not _on_a_g_recaptcha_page(driver):
+            return
+        else:
+            _on_a_captcha_page = _on_a_g_recaptcha_page
+    else:
+        if _on_a_g_recaptcha_page(driver):
+            ctype = "g_rc"
+            _on_a_captcha_page = _on_a_g_recaptcha_page
+        elif _on_a_cf_turnstile_page(driver):
+            ctype = "cf_t"
+            _on_a_captcha_page = _on_a_cf_turnstile_page
+        else:
+            return
     install_pyautogui_if_missing(driver)
     import pyautogui
     pyautogui = get_configured_pyautogui(pyautogui)
+    i_x = None
+    i_y = None
     x = None
     y = None
+    visible_iframe = True
     gui_lock = fasteners.InterProcessLock(
         constants.MultiBrowser.PYAUTOGUILOCK
     )
@@ -725,22 +766,54 @@ def uc_gui_click_cf(driver, frame="iframe", retry=False, blind=False):
             page_actions.switch_to_window(
                 driver, driver.current_window_handle, 2, uc_lock=False
             )
+        if ctype == "cf_t":
+            if (
+                driver.is_element_present(".cf-turnstile-wrapper iframe")
+                or driver.is_element_present(
+                    '[data-callback="onCaptchaSuccess"] iframe'
+                )
+            ):
+                pass
+            else:
+                visible_iframe = False
+                if driver.is_element_present(".cf-turnstile-wrapper"):
+                    frame = ".cf-turnstile-wrapper"
+                elif driver.is_element_present(
+                    '[data-callback="onCaptchaSuccess"]'
+                ):
+                    frame = '[data-callback="onCaptchaSuccess"]'
+                else:
+                    return
         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)
+                i_x, i_y = get_gui_element_position(driver, frame)
+                if visible_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
+                if visible_iframe:
+                    if driver.is_element_present("iframe"):
+                        i_x, i_y = get_gui_element_position(driver, "iframe")
+                        driver.switch_to_frame("iframe")
+                    else:
+                        return
+            if not i_x or not i_y:
+                return
         try:
-            selector = "span"
-            element = driver.wait_for_element_present(selector, timeout=2.5)
-            x = i_x + element.rect["x"] + int(element.rect["width"] / 2) + 1
-            y = i_y + element.rect["y"] + int(element.rect["height"] / 2) + 1
+            if visible_iframe:
+                selector = "span"
+                if ctype == "g_rc":
+                    selector = "span.recaptcha-checkbox"
+                element = driver.wait_for_element_present(
+                    selector, timeout=2.5
+                )
+                x = i_x + element.rect["x"] + int(element.rect["width"] / 2)
+                x += 1
+                y = i_y + element.rect["y"] + int(element.rect["height"] / 2)
+                y += 1
+            else:
+                x = i_x + 34
+                y = i_y + 34
             driver.switch_to.default_content()
         except Exception:
             try:
@@ -751,46 +824,91 @@ def uc_gui_click_cf(driver, frame="iframe", retry=False, blind=False):
         try:
             if x and y:
                 sb_config._saved_cf_x_y = (x, y)
-                uc_gui_click_x_y(driver, x, y, timeframe=0.842, uc_lock=False)
+                _uc_gui_click_x_y(driver, x, y, timeframe=0.95)
         except Exception:
             pass
     reconnect_time = (float(constants.UC.RECONNECT_TIME) / 2.0) + 0.5
     if IS_LINUX:
-        reconnect_time = constants.UC.RECONNECT_TIME
+        reconnect_time = constants.UC.RECONNECT_TIME + 0.15
     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):
+    if retry and x and y and _on_a_captcha_page(driver):
         with gui_lock:  # Prevent issues with multiple processes
             # Make sure the window is on top
             page_actions.switch_to_window(
                 driver, driver.current_window_handle, 2, uc_lock=False
             )
-            driver.switch_to_frame("iframe")
-            if driver.is_element_visible("#success-icon"):
-                driver.switch_to.parent_frame()
+            if not driver.is_element_present("iframe"):
                 return
+            else:
+                try:
+                    driver.switch_to_frame(frame)
+                except Exception:
+                    try:
+                        driver.switch_to_frame("iframe")
+                    except Exception:
+                        return
+                checkbox_success = None
+                if ctype == "cf_t":
+                    checkbox_success = "#success-icon"
+                elif ctype == "g_rc":
+                    checkbox_success = "span.recaptcha-checkbox-checked"
+                else:
+                    return  # If this line is reached, ctype wasn't set
+                if driver.is_element_visible("#success-icon"):
+                    driver.switch_to.parent_frame(checkbox_success)
+                    return
             if blind:
                 driver.uc_open_with_disconnect(driver.current_url, 3.8)
-                uc_gui_click_x_y(driver, x, y, timeframe=1.05, uc_lock=False)
+                _uc_gui_click_x_y(driver, x, y, timeframe=1.05)
             else:
                 driver.uc_open_with_reconnect(driver.current_url, 3.8)
-                if on_a_cf_turnstile_page(driver):
+                if _on_a_captcha_page(driver):
                     driver.disconnect()
-                    uc_gui_click_x_y(
-                        driver, x, y, timeframe=1.05, uc_lock=False
-                    )
+                    _uc_gui_click_x_y(driver, x, y, timeframe=1.05)
         driver.reconnect(reconnect_time)
 
 
+def uc_gui_click_captcha(driver, frame="iframe", retry=False, blind=False):
+    _uc_gui_click_captcha(
+        driver,
+        frame=frame,
+        retry=retry,
+        blind=blind,
+        ctype=None,
+    )
+
+
+def uc_gui_click_rc(driver, frame="iframe", retry=False, blind=False):
+    _uc_gui_click_captcha(
+        driver,
+        frame=frame,
+        retry=retry,
+        blind=blind,
+        ctype="g_rc",
+    )
+
+
+def uc_gui_click_cf(driver, frame="iframe", retry=False, blind=False):
+    _uc_gui_click_captcha(
+        driver,
+        frame=frame,
+        retry=retry,
+        blind=blind,
+        ctype="cf_t",
+    )
+
+
 def uc_gui_handle_cf(driver, frame="iframe"):
-    if not on_a_cf_turnstile_page(driver):
+    if not _on_a_cf_turnstile_page(driver):
         return
     install_pyautogui_if_missing(driver)
     import pyautogui
     pyautogui = get_configured_pyautogui(pyautogui)
+    visible_iframe = True
     gui_lock = fasteners.InterProcessLock(
         constants.MultiBrowser.PYAUTOGUILOCK
     )
@@ -806,16 +924,46 @@ def uc_gui_handle_cf(driver, frame="iframe"):
             page_actions.switch_to_window(
                 driver, driver.current_window_handle, 2, uc_lock=False
             )
+        if (
+            driver.is_element_present(".cf-turnstile-wrapper iframe")
+            or driver.is_element_present(
+                '[data-callback="onCaptchaSuccess"] iframe'
+            )
+        ):
+            pass
+        else:
+            visible_iframe = False
+            if driver.is_element_present(".cf-turnstile-wrapper"):
+                frame = ".cf-turnstile-wrapper"
+            elif driver.is_element_present(
+                '[data-callback="onCaptchaSuccess"]'
+            ):
+                frame = '[data-callback="onCaptchaSuccess"]'
+            else:
+                return
         if not is_in_frame or needs_switch:
             # Currently not in frame (or nested frame outside CF one)
             try:
-                driver.switch_to_frame(frame)
+                if visible_iframe:
+                    driver.switch_to_frame(frame)
             except Exception:
-                if driver.is_element_present("iframe"):
-                    driver.switch_to_frame("iframe")
-                else:
-                    return
+                if visible_iframe:
+                    if driver.is_element_present("iframe"):
+                        driver.switch_to_frame("iframe")
+                    else:
+                        return
         try:
+            found_checkbox = False
+            for i in range(10):
+                pyautogui.press("\t")
+                time.sleep(0.02)
+                active_element_css = js_utils.get_active_element_css(driver)
+                if active_element_css == "div.cf-turnstile-wrapper":
+                    found_checkbox = True
+                    break
+                time.sleep(0.02)
+            if not found_checkbox:
+                return
             driver.execute_script('document.querySelector("input").focus()')
         except Exception:
             try:
@@ -829,7 +977,7 @@ def uc_gui_handle_cf(driver, frame="iframe"):
             pass
     reconnect_time = (float(constants.UC.RECONNECT_TIME) / 2.0) + 0.5
     if IS_LINUX:
-        reconnect_time = constants.UC.RECONNECT_TIME
+        reconnect_time = constants.UC.RECONNECT_TIME + 0.15
     driver.reconnect(reconnect_time)
 
 
@@ -4166,6 +4314,16 @@ def get_local_driver(
                             driver, *args, **kwargs
                         )
                     )
+                    driver.uc_gui_click_captcha = (
+                        lambda *args, **kwargs: uc_gui_click_captcha(
+                            driver, *args, **kwargs
+                        )
+                    )
+                    driver.uc_gui_click_rc = (
+                        lambda *args, **kwargs: uc_gui_click_rc(
+                            driver, *args, **kwargs
+                        )
+                    )
                     driver.uc_gui_click_cf = (
                         lambda *args, **kwargs: uc_gui_click_cf(
                             driver, *args, **kwargs

seleniumbase/fixtures/base_case.py

@@ -4242,6 +4242,10 @@ class BaseCase(unittest.TestCase):
                 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_captcha"):
+                self.uc_gui_click_captcha = new_driver.uc_gui_click_captcha
+            if hasattr(new_driver, "uc_gui_click_rc"):
+                self.uc_gui_click_rc = new_driver.uc_gui_click_rc
             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"):

{seleniumbase-4.28.4.dist-info → seleniumbase-4.28.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.28.4
+Version: 4.28.5
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -94,7 +94,7 @@ Requires-Dist: mdurl ==0.1.2
 Requires-Dist: rich ==13.7.1
 Requires-Dist: python-xlib ==0.33 ; platform_system == "Linux"
 Requires-Dist: pyreadline3 ==3.4.1 ; platform_system == "Windows"
-Requires-Dist: urllib3 <2,>=1.26.18 ; python_version < "3.10"
+Requires-Dist: urllib3 <2,>=1.26.19 ; python_version < "3.10"
 Requires-Dist: pip >=24.0 ; python_version < "3.8"
 Requires-Dist: packaging >=24.0 ; python_version < "3.8"
 Requires-Dist: setuptools >=68.0.0 ; python_version < "3.8"
@@ -112,8 +112,8 @@ Requires-Dist: pytest-xdist ==3.5.0 ; python_version < "3.8"
 Requires-Dist: soupsieve ==2.4.1 ; python_version < "3.8"
 Requires-Dist: pygments ==2.17.2 ; python_version < "3.8"
 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: urllib3 <2.3.0,>=1.26.19 ; python_version >= "3.10"
+Requires-Dist: pip >=24.1.2 ; python_version >= "3.8"
 Requires-Dist: packaging >=24.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"
@@ -157,7 +157,7 @@ Requires-Dist: pycparser ==2.22 ; extra == 'pdfminer'
 Requires-Dist: pdfminer.six ==20221105 ; (python_version < "3.8") and extra == 'pdfminer'
 Requires-Dist: cffi ==1.15.1 ; (python_version < "3.8") and extra == 'pdfminer'
 Requires-Dist: cryptography ==39.0.2 ; (python_version < "3.9") and extra == 'pdfminer'
-Requires-Dist: pdfminer.six ==20231228 ; (python_version >= "3.8") and extra == 'pdfminer'
+Requires-Dist: pdfminer.six ==20240706 ; (python_version >= "3.8") and extra == 'pdfminer'
 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
@@ -168,7 +168,7 @@ Requires-Dist: pip-system-certs ==4.0 ; (platform_system == "Windows") and extra
 Provides-Extra: proxy
 Requires-Dist: proxy.py ==2.4.3 ; extra == 'proxy'
 Provides-Extra: psutil
-Requires-Dist: psutil ==5.9.8 ; extra == 'psutil'
+Requires-Dist: psutil ==6.0.0 ; extra == 'psutil'
 Provides-Extra: pyautogui
 Requires-Dist: PyAutoGUI ==0.9.54 ; extra == 'pyautogui'
 Provides-Extra: selenium-stealth

{seleniumbase-4.28.4.dist-info → seleniumbase-4.28.5.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=GqsU2Pnospr9PDFlGL11hfJERXvsfTuOee7ww0lKDl8,46
+seleniumbase/__version__.py,sha256=fi9wVefZcn8xh6-DIKJewbq8lsrNyHHdHJOlTqp3mcE,46
 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=iARPYQoqT2qq4P6uVfyJL-cFwXmu0Cq0i6iK1PKuomA,182677
+seleniumbase/core/browser_launcher.py,sha256=J-YrGmQg3teXszuaR8j08kzgnRBVyMwyRQkCnzgg2bA,187662
 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=le9PvYxZzLnGPo-8CcF-RIeCQPv0LeuJGCEV5OIs63Q,701104
+seleniumbase/fixtures/base_case.py,sha256=oaWxRanC4KVZGrZ-DjrpFTCsBL3PENVWm5kl8_9JDx0,701361
 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.4.dist-info/LICENSE,sha256=odSYtWibXBnQ1gBg6CnDZ82n8kLF_if5-2nbqnEyD8k,1085
-seleniumbase-4.28.4.dist-info/METADATA,sha256=g7wyUzKeBoxVbKkiXW0sh8l_1ldNXCsbiIjs3hpX-lY,85546
-seleniumbase-4.28.4.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-seleniumbase-4.28.4.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
-seleniumbase-4.28.4.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
-seleniumbase-4.28.4.dist-info/RECORD,,
+seleniumbase-4.28.5.dist-info/LICENSE,sha256=odSYtWibXBnQ1gBg6CnDZ82n8kLF_if5-2nbqnEyD8k,1085
+seleniumbase-4.28.5.dist-info/METADATA,sha256=ZuuvKLP50pY2HsIkp70zhjApZYUe2FY_z9SefBEAF_8,85546
+seleniumbase-4.28.5.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+seleniumbase-4.28.5.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
+seleniumbase-4.28.5.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
+seleniumbase-4.28.5.dist-info/RECORD,,