seleniumbase 4.29.7__py3-none-any.whl → 4.29.9__py3-none-any.whl

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.29.7"
+__version__ = "4.29.9"

seleniumbase/core/browser_launcher.py

@@ -12,6 +12,7 @@ import warnings
 from selenium import webdriver
 from selenium.common.exceptions import ElementClickInterceptedException
 from selenium.common.exceptions import InvalidSessionIdException
+from selenium.common.exceptions import SessionNotCreatedException
 from selenium.webdriver.chrome.service import Service as ChromeService
 from selenium.webdriver.common.options import ArgOptions
 from selenium.webdriver.common.service import utils as service_utils
@@ -718,7 +719,44 @@ def _uc_gui_click_x_y(driver, x, y, timeframe=0.25, uc_lock=False):
 
 
 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)
+    gui_lock = fasteners.InterProcessLock(
+        constants.MultiBrowser.PYAUTOGUILOCK
+    )
+    with gui_lock:  # Prevent issues with multiple processes
+        install_pyautogui_if_missing(driver)
+        import pyautogui
+        pyautogui = get_configured_pyautogui(pyautogui)
+        if IS_WINDOWS:
+            width_ratio = 1.0
+            window_rect = driver.get_window_rect()
+            width = window_rect["width"]
+            height = window_rect["height"]
+            win_x = window_rect["x"]
+            win_y = window_rect["y"]
+            if (
+                hasattr(sb_config, "_saved_width_ratio")
+                and sb_config._saved_width_ratio
+            ):
+                width_ratio = sb_config._saved_width_ratio
+            else:
+                scr_width = pyautogui.size().width
+                driver.maximize_window()
+                win_width = driver.get_window_size()["width"]
+                width_ratio = round(float(scr_width) / float(win_width), 2)
+                width_ratio += 0.01
+                if width_ratio < 0.45 or width_ratio > 2.55:
+                    width_ratio = 1.01
+                sb_config._saved_width_ratio = width_ratio
+            driver.minimize_window()
+            driver.set_window_rect(win_x, win_y, width, height)
+            x = x * width_ratio
+            y = y * width_ratio
+            _uc_gui_click_x_y(driver, x, y, timeframe=timeframe, uc_lock=False)
+            return
+        page_actions.switch_to_window(
+            driver, driver.current_window_handle, 2, uc_lock=False
+        )
+        _uc_gui_click_x_y(driver, x, y, timeframe=timeframe, uc_lock=False)
 
 
 def _on_a_cf_turnstile_page(driver):
@@ -804,6 +842,7 @@ def _uc_gui_click_captcha(
             width_ratio = round(float(scr_width) / float(win_width), 2) + 0.01
             if width_ratio < 0.45 or width_ratio > 2.55:
                 width_ratio = 1.01
+            sb_config._saved_width_ratio = width_ratio
             driver.minimize_window()
             driver.set_window_rect(win_x, win_y, width, height)
         if ctype == "cf_t":
@@ -900,8 +939,8 @@ def _uc_gui_click_captcha(
                 y = i_y + element.rect["y"] + int(element.rect["height"] / 2)
                 y += 1
             else:
-                x = i_x + 34
-                y = i_y + 34
+                x = (i_x + 34) * width_ratio
+                y = (i_y + 34) * width_ratio
             driver.switch_to.default_content()
         except Exception:
             try:
@@ -4239,11 +4278,11 @@ def get_local_driver(
                                     driver.quit()
                             except Exception:
                                 pass
+                            uc_path = None
+                            if os.path.exists(LOCAL_UC_DRIVER):
+                                uc_path = LOCAL_UC_DRIVER
+                                uc_path = os.path.realpath(uc_path)
                             try:
-                                uc_path = None
-                                if os.path.exists(LOCAL_UC_DRIVER):
-                                    uc_path = LOCAL_UC_DRIVER
-                                    uc_path = os.path.realpath(uc_path)
                                 driver = undetected.Chrome(
                                     options=chrome_options,
                                     user_data_dir=user_data_dir,
@@ -4260,6 +4299,19 @@ def get_local_driver(
                                     mac_certificate_error = True
                                 else:
                                     raise
+                            except SessionNotCreatedException:
+                                time.sleep(0.2)
+                                driver = undetected.Chrome(
+                                    options=chrome_options,
+                                    user_data_dir=user_data_dir,
+                                    driver_executable_path=uc_path,
+                                    browser_executable_path=b_path,
+                                    enable_cdp_events=cdp_events,
+                                    headless=False,  # Xvfb needed!
+                                    version_main=uc_chrome_version,
+                                    use_subprocess=True,  # Always!
+                                )
+                                uc_activated = True
                             if mac_certificate_error:
                                 cf_lock_path = (
                                     constants.MultiBrowser.CERT_FIXING_LOCK

seleniumbase/plugins/driver_manager.py

@@ -303,28 +303,44 @@ def Driver(
                 proxy_string = proxy_string[1:-1]
     c_a = chromium_arg
     if c_a is None and "--chromium-arg" in arg_join:
-        if "--chromium-arg=" in arg_join:
-            c_a = arg_join.split("--chromium-arg=")[1].split(" ")[0]
-        elif "--chromium-arg " in arg_join:
-            c_a = arg_join.split("--chromium-arg ")[1].split(" ")[0]
-        if c_a:
-            if c_a.startswith('"') and c_a.endswith('"'):
-                c_a = c_a[1:-1]
-            elif c_a.startswith("'") and c_a.endswith("'"):
-                c_a = c_a[1:-1]
+        count = 0
+        for arg in sys_argv:
+            if arg.startswith("--chromium-arg="):
+                c_a = arg.split("--chromium-arg=")[1]
+                break
+            elif arg == "--chromium-arg" and len(sys_argv) > count + 1:
+                c_a = sys_argv[count + 1]
+                if c_a.startswith("-"):
+                    c_a = None
+                break
+            count += 1
     chromium_arg = c_a
     d_f = disable_features
     if d_f is None and "--disable-features" in arg_join:
-        if "--disable-features=" in arg_join:
-            d_f = arg_join.split("--disable-features=")[1].split(" ")[0]
-        elif "--disable-features " in arg_join:
-            d_f = arg_join.split("--disable-features ")[1].split(" ")[0]
-        if d_f:
-            if d_f.startswith('"') and d_f.endswith('"'):
-                d_f = d_f[1:-1]
-            elif c_a.startswith("'") and d_f.endswith("'"):
-                d_f = d_f[1:-1]
+        count = 0
+        for arg in sys_argv:
+            if arg.startswith("--disable-features="):
+                d_f = arg.split("--disable-features=")[1]
+                break
+            elif arg == "--disable-features" and len(sys_argv) > count + 1:
+                d_f = sys_argv[count + 1]
+                if d_f.startswith("-"):
+                    d_f = None
+                break
+            count += 1
     disable_features = d_f
+    if agent is None and "--agent" in arg_join:
+        count = 0
+        for arg in sys_argv:
+            if arg.startswith("--agent="):
+                agent = arg.split("--agent=")[1]
+                break
+            elif arg == "--agent" and len(sys_argv) > count + 1:
+                agent = sys_argv[count + 1]
+                if agent.startswith("-"):
+                    agent = None
+                break
+            count += 1
     user_agent = agent
     recorder_mode = False
     if recorder_ext:
@@ -535,15 +551,30 @@ def Driver(
             host_resolver_rules = (
                 arg_join.split("--host_resolver_rules=")[1].split('"')[0]
             )
-    if driver_version is None:
-        if "--driver-version=" in arg_join:
-            driver_version = (
-                arg_join.split("--driver-version=")[1].split(" ")[0]
-            )
-        elif "--driver_version=" in arg_join:
-            driver_version = (
-                arg_join.split("--driver_version=")[1].split(" ")[0]
-            )
+    if driver_version is None and "--driver-version" in arg_join:
+        count = 0
+        for arg in sys_argv:
+            if arg.startswith("--driver-version="):
+                driver_version = arg.split("--driver-version=")[1]
+                break
+            elif arg == "--driver-version" and len(sys_argv) > count + 1:
+                driver_version = sys_argv[count + 1]
+                if driver_version.startswith("-"):
+                    driver_version = None
+                break
+            count += 1
+    if driver_version is None and "--driver_version" in arg_join:
+        count = 0
+        for arg in sys_argv:
+            if arg.startswith("--driver_version="):
+                driver_version = arg.split("--driver_version=")[1]
+                break
+            elif arg == "--driver_version" and len(sys_argv) > count + 1:
+                driver_version = sys_argv[count + 1]
+                if driver_version.startswith("-"):
+                    driver_version = None
+                break
+            count += 1
     browser_name = browser
 
     # Launch a web browser

seleniumbase/plugins/sb_manager.py

@@ -337,28 +337,44 @@ def SB(
                 proxy_string = proxy_string[1:-1]
     c_a = chromium_arg
     if c_a is None and "--chromium-arg" in arg_join:
-        if "--chromium-arg=" in arg_join:
-            c_a = arg_join.split("--chromium-arg=")[1].split(" ")[0]
-        elif "--chromium-arg " in arg_join:
-            c_a = arg_join.split("--chromium-arg ")[1].split(" ")[0]
-        if c_a:
-            if c_a.startswith('"') and c_a.endswith('"'):
-                c_a = c_a[1:-1]
-            elif c_a.startswith("'") and c_a.endswith("'"):
-                c_a = c_a[1:-1]
+        count = 0
+        for arg in sys_argv:
+            if arg.startswith("--chromium-arg="):
+                c_a = arg.split("--chromium-arg=")[1]
+                break
+            elif arg == "--chromium-arg" and len(sys_argv) > count + 1:
+                c_a = sys_argv[count + 1]
+                if c_a.startswith("-"):
+                    c_a = None
+                break
+            count += 1
     chromium_arg = c_a
     d_f = disable_features
     if d_f is None and "--disable-features" in arg_join:
-        if "--disable-features=" in arg_join:
-            d_f = arg_join.split("--disable-features=")[1].split(" ")[0]
-        elif "--disable-features " in arg_join:
-            d_f = arg_join.split("--disable-features ")[1].split(" ")[0]
-        if d_f:
-            if d_f.startswith('"') and d_f.endswith('"'):
-                d_f = d_f[1:-1]
-            elif c_a.startswith("'") and d_f.endswith("'"):
-                d_f = d_f[1:-1]
+        count = 0
+        for arg in sys_argv:
+            if arg.startswith("--disable-features="):
+                d_f = arg.split("--disable-features=")[1]
+                break
+            elif arg == "--disable-features" and len(sys_argv) > count + 1:
+                d_f = sys_argv[count + 1]
+                if d_f.startswith("-"):
+                    d_f = None
+                break
+            count += 1
     disable_features = d_f
+    if agent is None and "--agent" in arg_join:
+        count = 0
+        for arg in sys_argv:
+            if arg.startswith("--agent="):
+                agent = arg.split("--agent=")[1]
+                break
+            elif arg == "--agent" and len(sys_argv) > count + 1:
+                agent = sys_argv[count + 1]
+                if agent.startswith("-"):
+                    agent = None
+                break
+            count += 1
     user_agent = agent
     recorder_mode = False
     if recorder_ext:
@@ -679,15 +695,30 @@ def SB(
             host_resolver_rules = (
                 arg_join.split("--host_resolver_rules=")[1].split('"')[0]
             )
-    if driver_version is None:
-        if "--driver-version=" in arg_join:
-            driver_version = (
-                arg_join.split("--driver-version=")[1].split(" ")[0]
-            )
-        elif "--driver_version=" in arg_join:
-            driver_version = (
-                arg_join.split("--driver_version=")[1].split(" ")[0]
-            )
+    if driver_version is None and "--driver-version" in arg_join:
+        count = 0
+        for arg in sys_argv:
+            if arg.startswith("--driver-version="):
+                driver_version = arg.split("--driver-version=")[1]
+                break
+            elif arg == "--driver-version" and len(sys_argv) > count + 1:
+                driver_version = sys_argv[count + 1]
+                if driver_version.startswith("-"):
+                    driver_version = None
+                break
+            count += 1
+    if driver_version is None and "--driver_version" in arg_join:
+        count = 0
+        for arg in sys_argv:
+            if arg.startswith("--driver_version="):
+                driver_version = arg.split("--driver_version=")[1]
+                break
+            elif arg == "--driver_version" and len(sys_argv) > count + 1:
+                driver_version = sys_argv[count + 1]
+                if driver_version.startswith("-"):
+                    driver_version = None
+                break
+            count += 1
     if highlights is not None:
         try:
             highlights = int(highlights)

{seleniumbase-4.29.7.dist-info → seleniumbase-4.29.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.29.7
+Version: 4.29.9
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -86,7 +86,7 @@ Requires-Dist: sbvirtualdisplay ==1.3.0
 Requires-Dist: behave ==1.2.6
 Requires-Dist: beautifulsoup4 ==4.12.3
 Requires-Dist: tabcompleter ==1.3.3
-Requires-Dist: pdbp ==1.5.3
+Requires-Dist: pdbp ==1.5.4
 Requires-Dist: colorama ==0.4.6
 Requires-Dist: pyotp ==2.9.0
 Requires-Dist: mdurl ==0.1.2
@@ -121,7 +121,7 @@ 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: pyyaml >=6.0.2 ; python_version >= "3.8"
-Requires-Dist: trio ==0.26.1 ; python_version >= "3.8"
+Requires-Dist: trio ==0.26.2 ; python_version >= "3.8"
 Requires-Dist: websocket-client ==1.8.0 ; python_version >= "3.8"
 Requires-Dist: selenium ==4.23.1 ; python_version >= "3.8"
 Requires-Dist: execnet ==2.1.1 ; python_version >= "3.8"
@@ -242,7 +242,7 @@ Requires-Dist: pyasn1 ==0.6.0 ; (python_version >= "3.8") and extra == 'selenium
 
 📚 Learn from [**over 200 examples** in the **SeleniumBase/examples/** folder](https://github.com/seleniumbase/SeleniumBase/tree/master/examples).
 
-👤 Note that <span translate="no">SeleniumBase</span> <a translate="no" href="https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/uc_mode.md">UC Mode / Stealth Mode has its own ReadMe</a>.
+👤 Note that <span translate="no">SeleniumBase</span> <a translate="no" href="https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/uc_mode.md"><b>UC Mode</b> (Stealth Mode) has its own ReadMe</a>.
 
 ℹ️ Scripts can be called via <code translate="no"><b>python</b></code>, although some <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/syntax_formats.md">Syntax Formats</a> expect <a href="https://docs.pytest.org/en/latest/how-to/usage.html" translate="no"><b>pytest</b></a> (a Python unit-testing framework included with SeleniumBase that can discover & collect tests automatically).
 

{seleniumbase-4.29.7.dist-info → seleniumbase-4.29.9.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=xXhadZnhxEp5mYq4VqumeQzgQ1C26cplLEmPM9Dt4oc,46
+seleniumbase/__version__.py,sha256=K7oWQM2Se1ae6tk-zeGpATgCw9BOdGfbwqaicuyDRvo,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=qEoFpcJYPLbiEZg7wzUEMJonwJxkwDCDhspWQQJrRrQ,195446
+seleniumbase/core/browser_launcher.py,sha256=_Oms_vw4OHofMFyXxKDDX_PD1sdabHGdIrebGHUoC9s,197939
 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
@@ -92,11 +92,11 @@ seleniumbase/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 seleniumbase/plugins/base_plugin.py,sha256=o_-IraDNgsMEJQv1HsmS5ZcTvYOXiQ4NpxryG2m9c2A,14970
 seleniumbase/plugins/basic_test_info.py,sha256=8ov6n417gPbqqvrlT4zrch7l2XcRt-GF2ny6rR9AMWk,2108
 seleniumbase/plugins/db_reporting_plugin.py,sha256=En09qUCoojrk9-vbcnsoHdSELoGmag2GDIyu3jTiJas,7331
-seleniumbase/plugins/driver_manager.py,sha256=x879oEkmHJnWQAaLCoppGya-YDh5_aoKVWXcBSer-do,23406
+seleniumbase/plugins/driver_manager.py,sha256=dBwltG0AMj3uMFq6s40MWKaGyaLyh-f38rqoWVBcRQE,24491
 seleniumbase/plugins/page_source.py,sha256=loTnXxOj4kxEukuTZEiGyvKBhY3KDVDMnNlHHheTBDE,1889
 seleniumbase/plugins/pytest_plugin.py,sha256=ObITovmkwpAcwXNxF6qTHRzERPA7_ntAmbxPRTefj1M,94999
 seleniumbase/plugins/s3_logging_plugin.py,sha256=WDfertQgGOW_SRJpFMaekYD6vBVW9VO62POtXXy2HCM,2319
-seleniumbase/plugins/sb_manager.py,sha256=8vNps3MTcS9XFG5hLYfkIAUI8BpVS7qtww0KpJC1UL4,41329
+seleniumbase/plugins/sb_manager.py,sha256=j-yOiwyeDYbXrgRUiW92zMx0qHYqisF1bUCglG0MXvA,42414
 seleniumbase/plugins/screen_shots.py,sha256=1hrXw-hzuZ1BR6Yh7AyWX2ABnvnP73-RCbwdz958gj4,1127
 seleniumbase/plugins/selenium_plugin.py,sha256=FESjalW8mdboLB_B59j8EeY6IvmEIbp_BY9cPTxJsM4,55122
 seleniumbase/resources/ReadMe.md,sha256=uminnO5_Uv-UZDKcc9a9s9kxisaYUps-H98Fp5PJcaU,2124
@@ -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.29.7.dist-info/LICENSE,sha256=odSYtWibXBnQ1gBg6CnDZ82n8kLF_if5-2nbqnEyD8k,1085
-seleniumbase-4.29.7.dist-info/METADATA,sha256=vgxxfAPDMNrMD90fsEBq87Q6mpf402FcjMfbjzfGPgo,85776
-seleniumbase-4.29.7.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-seleniumbase-4.29.7.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
-seleniumbase-4.29.7.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
-seleniumbase-4.29.7.dist-info/RECORD,,
+seleniumbase-4.29.9.dist-info/LICENSE,sha256=odSYtWibXBnQ1gBg6CnDZ82n8kLF_if5-2nbqnEyD8k,1085
+seleniumbase-4.29.9.dist-info/METADATA,sha256=_HNAOVVpaQQplvd0Heva3qVY5QO-u9llC9LNB6oVF9E,85783
+seleniumbase-4.29.9.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+seleniumbase-4.29.9.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
+seleniumbase-4.29.9.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
+seleniumbase-4.29.9.dist-info/RECORD,,