seleniumbase 4.32.1__py3-none-any.whl → 4.32.3__py3-none-any.whl

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.32.1"
+__version__ = "4.32.3"

seleniumbase/core/browser_launcher.py

@@ -549,7 +549,7 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp = types.SimpleNamespace()
     CDPM = sb_cdp.CDPMethods(loop, page, driver)
     cdp.get = CDPM.get
-    cdp.open = CDPM.get
+    cdp.open = CDPM.open
     cdp.reload = CDPM.reload
     cdp.refresh = CDPM.refresh
     cdp.add_handler = CDPM.add_handler
@@ -590,6 +590,7 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.medimize = CDPM.medimize
     cdp.set_window_rect = CDPM.set_window_rect
     cdp.reset_window_size = CDPM.reset_window_size
+    cdp.set_locale = CDPM.set_locale
     cdp.set_attributes = CDPM.set_attributes
     cdp.internalize_links = CDPM.internalize_links
     cdp.get_window = CDPM.get_window
@@ -2179,8 +2180,13 @@ def _set_chrome_options(
             or IS_LINUX  # switches to Xvfb (non-headless)
         )
     ):
+        chrome_options.add_argument("--no-pings")
         chrome_options.add_argument("--disable-popup-blocking")
-        chrome_options.add_argument("--homepage=chrome://new-tab-page/")
+        chrome_options.add_argument("--homepage=chrome://version/")
+        chrome_options.add_argument("--animation-duration-scale=0")
+        chrome_options.add_argument("--wm-window-animations-disabled")
+        chrome_options.add_argument("--enable-privacy-sandbox-ads-apis")
+        chrome_options.add_argument("--disable-background-timer-throttling")
         # Skip remaining options that trigger anti-bot services
         return chrome_options
     chrome_options.add_argument("--test-type")
@@ -4523,6 +4529,7 @@ def get_local_driver(
                                     and uc_chrome_version
                                     and uc_chrome_version >= 117
                                     and (headless or headless2)
+                                    and chromium_arg != "decoy"
                                 ):
                                     from seleniumbase.console_scripts import (
                                         sb_install

seleniumbase/core/sb_cdp.py

@@ -76,13 +76,21 @@ class CDPMethods():
 
     def get(self, url):
         url = shared_utils.fix_url_as_needed(url)
-        self.page = self.loop.run_until_complete(self.driver.cdp_base.get(url))
+        driver = self.driver
+        if hasattr(driver, "cdp_base"):
+            driver = driver.cdp_base
+        self.page = self.loop.run_until_complete(driver.get(url))
         url_protocol = url.split(":")[0]
         safe_url = True
         if url_protocol not in ["about", "data", "chrome"]:
             safe_url = False
         if not safe_url:
             time.sleep(constants.UC.CDP_MODE_OPEN_WAIT)
+        self.__slow_mode_pause_if_set()
+        self.loop.run_until_complete(self.page.wait())
+
+    def open(self, url):
+        self.get(url)
 
     def reload(self, ignore_cache=True, script_to_evaluate_on_load=None):
         self.loop.run_until_complete(
@@ -111,18 +119,28 @@ class CDPMethods():
         with the closest text-length to the text being searched for."""
         self.__add_light_pause()
         selector = self.__convert_to_css_if_xpath(selector)
+        early_failure = False
         if (":contains(" in selector):
             tag_name = selector.split(":contains(")[0].split(" ")[-1]
             text = selector.split(":contains(")[1].split(")")[0][1:-1]
             with suppress(Exception):
                 self.loop.run_until_complete(
-                    self.page.select(tag_name, timeout=3)
+                    self.page.select(tag_name, timeout=timeout)
                 )
-                self.loop.run_until_complete(self.page.find(text, timeout=3))
-            element = self.find_elements_by_text(text, tag_name=tag_name)[0]
-            return self.__add_sync_methods(element)
+                self.loop.run_until_complete(
+                    self.page.find(text, timeout=timeout)
+                )
+            elements = []
+            with suppress(Exception):
+                elements = self.find_elements_by_text(text, tag_name=tag_name)
+            if elements:
+                return self.__add_sync_methods(elements[0])
+            else:
+                early_failure = True
         failure = False
         try:
+            if early_failure:
+                raise Exception("Failed!")
             element = self.loop.run_until_complete(
                 self.page.find(
                     selector, best_match=best_match, timeout=timeout
@@ -230,9 +248,11 @@ class CDPMethods():
         )
 
     def __click(self, element):
-        return (
+        result = (
             self.loop.run_until_complete(element.click_async())
         )
+        self.loop.run_until_complete(self.page.wait())
+        return result
 
     def __flash(self, element):
         return (
@@ -250,9 +270,11 @@ class CDPMethods():
         )
 
     def __mouse_click(self, element):
-        return (
+        result = (
             self.loop.run_until_complete(element.mouse_click_async())
         )
+        self.loop.run_until_complete(self.page.wait())
+        return result
 
     def __mouse_drag(self, element, destination):
         return (
@@ -353,33 +375,51 @@ class CDPMethods():
 
     def tile_windows(self, windows=None, max_columns=0):
         """Tile windows and return the grid of tiled windows."""
+        driver = self.driver
+        if hasattr(driver, "cdp_base"):
+            driver = driver.cdp_base
         return self.loop.run_until_complete(
-            self.driver.cdp_base.tile_windows(windows, max_columns)
+            driver.tile_windows(windows, max_columns)
         )
 
     def get_all_cookies(self, *args, **kwargs):
+        driver = self.driver
+        if hasattr(driver, "cdp_base"):
+            driver = driver.cdp_base
         return self.loop.run_until_complete(
-            self.driver.cdp_base.cookies.get_all(*args, **kwargs)
+            driver.cookies.get_all(*args, **kwargs)
         )
 
     def set_all_cookies(self, *args, **kwargs):
+        driver = self.driver
+        if hasattr(driver, "cdp_base"):
+            driver = driver.cdp_base
         return self.loop.run_until_complete(
-            self.driver.cdp_base.cookies.set_all(*args, **kwargs)
+            driver.cookies.set_all(*args, **kwargs)
         )
 
     def save_cookies(self, *args, **kwargs):
+        driver = self.driver
+        if hasattr(driver, "cdp_base"):
+            driver = driver.cdp_base
         return self.loop.run_until_complete(
-            self.driver.cdp_base.cookies.save(*args, **kwargs)
+            driver.cookies.save(*args, **kwargs)
         )
 
     def load_cookies(self, *args, **kwargs):
+        driver = self.driver
+        if hasattr(driver, "cdp_base"):
+            driver = driver.cdp_base
         return self.loop.run_until_complete(
-            self.driver.cdp_base.cookies.load(*args, **kwargs)
+            driver.cookies.load(*args, **kwargs)
         )
 
     def clear_cookies(self, *args, **kwargs):
+        driver = self.driver
+        if hasattr(driver, "cdp_base"):
+            driver = driver.cdp_base
         return self.loop.run_until_complete(
-            self.driver.cdp_base.cookies.clear(*args, **kwargs)
+            driver.cookies.clear(*args, **kwargs)
         )
 
     def sleep(self, seconds):
@@ -408,17 +448,20 @@ class CDPMethods():
         self.__add_light_pause()
         element.click()
         self.__slow_mode_pause_if_set()
+        self.loop.run_until_complete(self.page.wait())
 
     def click_active_element(self):
         self.loop.run_until_complete(
             self.page.evaluate("document.activeElement.click()")
         )
         self.__slow_mode_pause_if_set()
+        self.loop.run_until_complete(self.page.wait())
 
     def click_if_visible(self, selector):
         if self.is_element_visible(selector):
             self.find_element(selector).click()
             self.__slow_mode_pause_if_set()
+            self.loop.run_until_complete(self.page.wait())
 
     def mouse_click(self, selector, timeout=settings.SMALL_TIMEOUT):
         """(Attempt simulating a mouse click)"""
@@ -427,6 +470,7 @@ class CDPMethods():
         self.__add_light_pause()
         element.mouse_click()
         self.__slow_mode_pause_if_set()
+        self.loop.run_until_complete(self.page.wait())
 
     def nested_click(self, parent_selector, selector):
         """
@@ -436,6 +480,7 @@ class CDPMethods():
         element = self.find_element(parent_selector)
         element.query_selector(selector).mouse_click()
         self.__slow_mode_pause_if_set()
+        self.loop.run_until_complete(self.page.wait())
 
     def get_nested_element(self, parent_selector, selector):
         """(Can be used to find an element inside an iframe)"""
@@ -483,6 +528,7 @@ class CDPMethods():
             text = text[:-1] + "\r\n"
         element.send_keys(text)
         self.__slow_mode_pause_if_set()
+        self.loop.run_until_complete(self.page.wait())
 
     def press_keys(self, selector, text, timeout=settings.SMALL_TIMEOUT):
         """Similar to send_keys(), but presses keys at human speed."""
@@ -499,6 +545,7 @@ class CDPMethods():
             element.send_keys("\r\n")
             time.sleep(0.0375)
         self.__slow_mode_pause_if_set()
+        self.loop.run_until_complete(self.page.wait())
 
     def type(self, selector, text, timeout=settings.SMALL_TIMEOUT):
         """Similar to send_keys(), but clears the text field first."""
@@ -510,6 +557,7 @@ class CDPMethods():
             text = text[:-1] + "\r\n"
         element.send_keys(text)
         self.__slow_mode_pause_if_set()
+        self.loop.run_until_complete(self.page.wait())
 
     def evaluate(self, expression):
         """Run a JavaScript expression and return the result."""
@@ -760,6 +808,10 @@ class CDPMethods():
             )
         )
 
+    def set_locale(self, locale):
+        """(Settings will take effect on the next page load)"""
+        self.loop.run_until_complete(self.page.set_locale(locale))
+
     def set_attributes(self, selector, attribute, value):
         """This method uses JavaScript to set/update a common attribute.
         All matching selectors from querySelectorAll() are used.

seleniumbase/fixtures/base_case.py

@@ -4090,6 +4090,90 @@ class BaseCase(unittest.TestCase):
                 "Browser: {%s} is not a valid browser option. "
                 "Valid options = {%s}" % (browser, valid_browsers)
             )
+        # Fix Chrome-130 issues by creating a user-data-dir in advance
+        if (
+            undetectable
+            and (
+                not user_data_dir
+                or not os.path.exists(user_data_dir)
+                or not any(os.scandir(user_data_dir))
+            )
+            and self.browser == "chrome"
+            and shared_utils.is_chrome_130_or_newer(binary_location)
+        ):
+            import tempfile
+            if not user_data_dir:
+                user_data_dir = os.path.normpath(tempfile.mkdtemp())
+            self.user_data_dir = user_data_dir
+            sb_config.user_data_dir = user_data_dir
+            try:
+                decoy_driver = browser_launcher.get_driver(
+                    browser_name=browser_name,
+                    headless=False,
+                    locale_code=locale_code,
+                    use_grid=use_grid,
+                    protocol=protocol,
+                    servername=servername,
+                    port=port,
+                    proxy_string=proxy_string,
+                    proxy_bypass_list=proxy_bypass_list,
+                    proxy_pac_url=proxy_pac_url,
+                    multi_proxy=multi_proxy,
+                    user_agent=user_agent,
+                    cap_file=cap_file,
+                    cap_string=cap_string,
+                    recorder_ext=recorder_ext,
+                    disable_cookies=disable_cookies,
+                    disable_js=disable_js,
+                    disable_csp=disable_csp,
+                    enable_ws=enable_ws,
+                    enable_sync=enable_sync,
+                    use_auto_ext=use_auto_ext,
+                    undetectable=undetectable,
+                    uc_cdp_events=uc_cdp_events,
+                    uc_subprocess=uc_subprocess,
+                    log_cdp_events=log_cdp_events,
+                    no_sandbox=no_sandbox,
+                    disable_gpu=disable_gpu,
+                    headless1=False,
+                    headless2=True,
+                    incognito=incognito,
+                    guest_mode=guest_mode,
+                    dark_mode=dark_mode,
+                    devtools=devtools,
+                    remote_debug=remote_debug,
+                    enable_3d_apis=enable_3d_apis,
+                    swiftshader=swiftshader,
+                    ad_block_on=ad_block_on,
+                    host_resolver_rules=host_resolver_rules,
+                    block_images=block_images,
+                    do_not_track=do_not_track,
+                    chromium_arg="decoy",
+                    firefox_arg=firefox_arg,
+                    firefox_pref=firefox_pref,
+                    user_data_dir=user_data_dir,
+                    extension_zip=None,
+                    extension_dir=None,
+                    disable_features=disable_features,
+                    binary_location=binary_location,
+                    driver_version=driver_version,
+                    page_load_strategy=page_load_strategy,
+                    use_wire=use_wire,
+                    external_pdf=external_pdf,
+                    test_id=test_id,
+                    mobile_emulator=is_mobile,
+                    device_width=d_width,
+                    device_height=d_height,
+                    device_pixel_ratio=d_p_r,
+                    browser=browser_name,
+                )
+                time.sleep(0.2)
+            except Exception:
+                pass
+            finally:
+                with suppress(Exception):
+                    decoy_driver.quit()
+                    time.sleep(0.1)
         # Launch a web browser
         new_driver = browser_launcher.get_driver(
             browser_name=browser_name,
@@ -4431,13 +4515,31 @@ class BaseCase(unittest.TestCase):
         cookies_file.writelines(json_cookies)
         cookies_file.close()
 
-    def load_cookies(self, name="cookies.txt"):
-        """Loads the page cookies from the "saved_cookies" folder."""
+    def load_cookies(self, name="cookies.txt", expiry=False):
+        """
+        Loads the page cookies from the "saved_cookies" folder.
+        Usage for setting expiry:
+        If expiry == 0 or False: Delete "expiry".
+        If expiry == -1 (or < 0): Do not modify "expiry".
+        If expiry > 0: Set "expiry" to expiry minutes in the future.
+        If expiry == True: Set "expiry" to 24 hours in the future.
+        """
         cookies = self.get_saved_cookies(name)
         self.wait_for_ready_state_complete()
+        origin = self.get_origin()
+        trim_origin = origin.split("://")[-1]
         for cookie in cookies:
-            if "expiry" in cookie:
+            if "domain" in cookie:
+                if cookie["domain"] not in origin:
+                    cookie["domain"] = trim_origin
+            if "expiry" in cookie and (not expiry or expiry == 0):
                 del cookie["expiry"]
+            elif isinstance(expiry, (int, float)) and expiry < 0:
+                pass
+            elif isinstance(expiry, (int, float)) and expiry > 0:
+                cookie["expiry"] = int(time.time()) + int(expiry * 60.0)
+            elif expiry:
+                cookie["expiry"] = int(time.time()) + 86400
             self.driver.add_cookie(cookie)
 
     def delete_all_cookies(self):
@@ -4498,18 +4600,57 @@ class BaseCase(unittest.TestCase):
     def get_cookies(self):
         return self.driver.get_cookies()
 
-    def add_cookie(self, cookie_dict):
+    def add_cookie(self, cookie_dict, expiry=False):
         """Usage examples:
         self.add_cookie({'name': 'foo', 'value': 'bar'})
         self.add_cookie({'name': 'foo', 'value': 'bar', 'path': '/'})
         self.add_cookie({'name': 'foo', 'value': 'bar', 'secure': True})
         self.add_cookie({'name': 'foo', 'value': 'bar', 'sameSite': 'Strict'})
+        Usage for setting expiry:
+        If expiry == 0 or False: Delete "expiry".
+        If expiry == -1 (or < 0): Do not modify "expiry".
+        If expiry > 0: Set "expiry" to expiry minutes in the future.
+        If expiry == True: Set "expiry" to 24 hours in the future.
         """
+        cookie = cookie_dict
+        if "domain" in cookie:
+            origin = self.get_origin()
+            trim_origin = origin.split("://")[-1]
+            if cookie["domain"] not in origin:
+                cookie["domain"] = trim_origin
+        if "expiry" in cookie and (not expiry or expiry == 0):
+            del cookie["expiry"]
+        elif isinstance(expiry, (int, float)) and expiry < 0:
+            pass
+        elif isinstance(expiry, (int, float)) and expiry > 0:
+            cookie["expiry"] = int(time.time()) + int(expiry * 60.0)
+        elif expiry:
+            cookie["expiry"] = int(time.time()) + 86400
         self.driver.add_cookie(cookie_dict)
 
-    def add_cookies(self, cookies):
-        for cookie_dict in cookies:
-            self.driver.add_cookie(cookie_dict)
+    def add_cookies(self, cookies, expiry=False):
+        """
+        Usage for setting expiry:
+        If expiry == 0 or False: Delete "expiry".
+        If expiry == -1 (or < 0): Do not modify "expiry".
+        If expiry > 0: Set "expiry" to expiry minutes in the future.
+        If expiry == True: Set "expiry" to 24 hours in the future.
+        """
+        origin = self.get_origin()
+        trim_origin = origin.split("://")[-1]
+        for cookie in cookies:
+            if "domain" in cookie:
+                if cookie["domain"] not in origin:
+                    cookie["domain"] = trim_origin
+            if "expiry" in cookie and (not expiry or expiry == 0):
+                del cookie["expiry"]
+            elif isinstance(expiry, (int, float)) and expiry < 0:
+                pass
+            elif isinstance(expiry, (int, float)) and expiry > 0:
+                cookie["expiry"] = int(time.time()) + int(expiry * 60.0)
+            elif expiry:
+                cookie["expiry"] = int(time.time()) + 86400
+            self.driver.add_cookie(cookie)
 
     def __set_esc_skip(self):
         if hasattr(self, "esc_end") and self.esc_end:
@@ -4656,30 +4797,6 @@ class BaseCase(unittest.TestCase):
         if hasattr(self.driver, "_is_using_uc") and self.driver._is_using_uc:
             self.driver.uc_open_with_cdp_mode(url)
         else:
-            # Fix Chrome-130 issues by creating a user-data-dir in advance
-            if (
-                (
-                    not self.user_data_dir
-                    or not os.path.exists(self.user_data_dir)
-                )
-                and self.browser == "chrome"
-            ):
-                import tempfile
-                user_data_dir = os.path.normpath(tempfile.mkdtemp())
-                self.user_data_dir = user_data_dir
-                sb_config.user_data_dir = user_data_dir
-                try:
-                    driver = self.get_new_driver(
-                        user_data_dir=user_data_dir,
-                        undetectable=True,
-                        headless2=True,
-                    )
-                    time.sleep(0.555)
-                except Exception:
-                    pass
-                finally:
-                    with suppress(Exception):
-                        driver.quit()
             self.get_new_driver(undetectable=True)
             self.driver.uc_open_with_cdp_mode(url)
         self.cdp = self.driver.cdp
@@ -14941,31 +15058,6 @@ class BaseCase(unittest.TestCase):
                         self.__js_start_time = int(time.time() * 1000.0)
         else:
             # Launch WebDriver for both pytest and pynose
-
-            # Fix Chrome-130 issues by creating a user-data-dir in advance
-            if (
-                self.undetectable
-                and (
-                    not self.user_data_dir
-                    or not os.path.exists(self.user_data_dir)
-                )
-                and self.browser == "chrome"
-            ):
-                import tempfile
-                user_data_dir = os.path.normpath(tempfile.mkdtemp())
-                self.user_data_dir = user_data_dir
-                sb_config.user_data_dir = user_data_dir
-                try:
-                    driver = self.get_new_driver(
-                        user_data_dir=user_data_dir,
-                        headless2=True,
-                    )
-                    time.sleep(0.555)
-                except Exception:
-                    pass
-                finally:
-                    with suppress(Exception):
-                        driver.quit()
             self.driver = self.get_new_driver(
                 browser=self.browser,
                 headless=self.headless,

seleniumbase/fixtures/shared_utils.py

@@ -4,6 +4,7 @@ import os
 import platform
 import sys
 import time
+from contextlib import suppress
 from seleniumbase import config as sb_config
 from seleniumbase.fixtures import constants
 
@@ -99,6 +100,23 @@ def is_cdp_swap_needed(driver):
     )
 
 
+def is_chrome_130_or_newer(self, binary_location=None):
+    from seleniumbase.core import detect_b_ver
+
+    """Due to changes in Chrome-130, UC Mode freezes at start-up
+    unless the user-data-dir already exists and is populated."""
+    with suppress(Exception):
+        if not binary_location:
+            ver = detect_b_ver.get_browser_version_from_os("google-chrome")
+        else:
+            ver = detect_b_ver.get_browser_version_from_binary(
+                binary_location
+            )
+        if ver and len(ver) > 3 and int(ver.split(".")[0]) >= 130:
+            return True
+    return False
+
+
 def format_exc(exception, message):
     """Formats an exception message to make the output cleaner."""
     from selenium.common.exceptions import ElementNotVisibleException

seleniumbase/plugins/driver_manager.py

@@ -233,6 +233,7 @@ def Driver(
     wire (bool):  Shortcut / Duplicate of "use_wire".
     pls (str):  Shortcut / Duplicate of "page_load_strategy".
     """
+    from contextlib import suppress
     from seleniumbase import config as sb_config
     from seleniumbase.config import settings
     from seleniumbase.fixtures import constants
@@ -792,12 +793,22 @@ def Driver(
     from seleniumbase.core import browser_launcher
 
     # Fix Chrome-130 issues by creating a user-data-dir in advance
-    if undetectable and not user_data_dir and browser == "chrome":
+    if (
+        undetectable
+        and (
+            not user_data_dir
+            or not os.path.exists(user_data_dir)
+            or not any(os.scandir(user_data_dir))
+        )
+        and browser == "chrome"
+        and shared_utils.is_chrome_130_or_newer(binary_location)
+    ):
         import tempfile
         import time
-        user_data_dir = (
-            os.path.normpath(tempfile.mkdtemp())
-        )
+        if not user_data_dir:
+            user_data_dir = (
+                os.path.normpath(tempfile.mkdtemp())
+            )
         try:
             decoy_driver = browser_launcher.get_driver(
                 browser_name=browser_name,
@@ -840,12 +851,12 @@ def Driver(
                 host_resolver_rules=host_resolver_rules,
                 block_images=block_images,
                 do_not_track=do_not_track,
-                chromium_arg=chromium_arg,
+                chromium_arg="decoy",
                 firefox_arg=firefox_arg,
                 firefox_pref=firefox_pref,
                 user_data_dir=user_data_dir,
-                extension_zip=extension_zip,
-                extension_dir=extension_dir,
+                extension_zip=None,
+                extension_dir=None,
                 disable_features=disable_features,
                 binary_location=binary_location,
                 driver_version=driver_version,
@@ -859,14 +870,13 @@ def Driver(
                 device_pixel_ratio=d_p_r,
                 browser=browser_name,
             )
-            time.sleep(0.555)
+            time.sleep(0.2)
         except Exception:
             pass
         finally:
-            try:
+            with suppress(Exception):
                 decoy_driver.quit()
-            except Exception:
-                pass
+                time.sleep(0.1)
 
     driver = browser_launcher.get_driver(
         browser_name=browser_name,

seleniumbase/plugins/sb_manager.py

@@ -1212,30 +1212,6 @@ def SB(
         if not sb_config.multi_proxy:
             proxy_helper.remove_proxy_zip_if_present()
     start_time = time.time()
-    saved_headless2 = headless2
-
-    # Fix Chrome-130 issues by creating a user-data-dir in advance
-    if undetectable and not user_data_dir and browser == "chrome":
-        import tempfile
-        user_data_dir = (
-            os.path.normpath(tempfile.mkdtemp())
-        )
-        sb.user_data_dir = user_data_dir
-        sb_config.user_data_dir = user_data_dir
-        try:
-            decoy = sb
-            decoy.headless2 = True
-            decoy.setUp()
-            decoy.sleep(0.555)
-        except Exception:
-            pass
-        finally:
-            try:
-                decoy.tearDown()
-            except Exception:
-                pass
-            sb.headless2 = saved_headless2
-
     sb.setUp()
     test_passed = True  # This can change later
     teardown_exception = None

seleniumbase/undetected/cdp_driver/__init__.py

@@ -0,0 +1 @@
+from seleniumbase.undetected.cdp_driver import cdp_util  # noqa