seleniumbase 4.33.4__py3-none-any.whl → 4.34.2__py3-none-any.whl

seleniumbase/fixtures/constants.py

@@ -400,6 +400,7 @@ class ValidBinaries:
         "google-chrome-beta",
         "google-chrome-dev",
         "google-chrome-unstable",
+        "chrome-headless-shell",
         "brave-browser",
         "brave-browser-stable",
         "brave",
@@ -418,6 +419,7 @@ class ValidBinaries:
         "Google Chrome",
         "Chromium",
         "Google Chrome for Testing",
+        "chrome-headless-shell",
         "Google Chrome Beta",
         "Google Chrome Dev",
         "Brave Browser",
@@ -429,6 +431,7 @@ class ValidBinaries:
     valid_chrome_binaries_on_windows = [
         "chrome.exe",
         "chromium.exe",
+        "chrome-headless-shell.exe",
         "brave.exe",
         "opera.exe",
     ]

seleniumbase/fixtures/js_utils.py

@@ -1188,6 +1188,8 @@ def highlight_with_jquery_2(driver, message, selector, o_bs, msg_dur):
 def get_active_element_css(driver):
     from seleniumbase.js_code import active_css_js
 
+    if shared_utils.is_cdp_swap_needed(driver):
+        return driver.cdp.get_active_element_css()
     return execute_script(driver, active_css_js.get_active_element_css)
 
 

seleniumbase/fixtures/page_actions.py

@@ -1342,7 +1342,8 @@ def save_page_source(driver, name, folder=None):
     """
     from seleniumbase.core import log_helper
 
-    _reconnect_if_disconnected(driver)
+    if not __is_cdp_swap_needed(driver):
+        _reconnect_if_disconnected(driver)  # If disconnected without CDP
     if not name.endswith(".html"):
         name = name + ".html"
     if folder:
@@ -1353,7 +1354,11 @@ def save_page_source(driver, name, folder=None):
         html_file_path = os.path.join(file_path, name)
     else:
         html_file_path = name
-    page_source = driver.page_source
+    page_source = None
+    if __is_cdp_swap_needed(driver):
+        page_source = driver.cdp.get_page_source()
+    else:
+        page_source = driver.page_source
     html_file = codecs.open(html_file_path, "w+", "utf-8")
     rendered_source = log_helper.get_html_source_with_base_href(
         driver, page_source

seleniumbase/fixtures/shared_utils.py

@@ -1,6 +1,7 @@
 """Shared utility methods"""
 import colorama
 import os
+import pathlib
 import platform
 import sys
 import time
@@ -128,6 +129,30 @@ def is_chrome_130_or_newer(self, binary_location=None):
     return False
 
 
+def make_dir_files_writable(dir_path):
+    # Make all files in the given directory writable.
+    for file_path in pathlib.Path(dir_path).glob("*"):
+        if file_path.is_file():
+            mode = os.stat(file_path).st_mode
+            mode |= (mode & 0o444) >> 1  # copy R bits to W
+            with suppress(Exception):
+                os.chmod(file_path, mode)
+
+
+def make_writable(file_path):
+    # Set permissions to: "If you can read it, you can write it."
+    mode = os.stat(file_path).st_mode
+    mode |= (mode & 0o444) >> 1  # copy R bits to W
+    os.chmod(file_path, mode)
+
+
+def make_executable(file_path):
+    # Set permissions to: "If you can read it, you can execute it."
+    mode = os.stat(file_path).st_mode
+    mode |= (mode & 0o444) >> 2  # copy R bits to X
+    os.chmod(file_path, mode)
+
+
 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

@@ -530,6 +530,34 @@ def Driver(
                 break
             count += 1
     user_agent = agent
+    found_bl = None
+    if binary_location is None and "--binary-location" in arg_join:
+        count = 0
+        for arg in sys_argv:
+            if arg.startswith("--binary-location="):
+                found_bl = arg.split("--binary-location=")[1]
+                break
+            elif arg == "--binary-location" and len(sys_argv) > count + 1:
+                found_bl = sys_argv[count + 1]
+                if found_bl.startswith("-"):
+                    found_bl = None
+                break
+            count += 1
+        if found_bl:
+            binary_location = found_bl
+    if binary_location is None and "--bl=" in arg_join:
+        for arg in sys_argv:
+            if arg.startswith("--bl="):
+                binary_location = arg.split("--bl=")[1]
+                break
+    if (
+        binary_location
+        and binary_location.lower() == "chs"
+        and browser == "chrome"
+    ):
+        headless = True
+        headless1 = False
+        headless2 = False
     recorder_mode = False
     if recorder_ext:
         recorder_mode = True

seleniumbase/plugins/pytest_plugin.py

@@ -656,6 +656,7 @@ def pytest_addoption(parser):
     parser.addoption(
         "--binary_location",
         "--binary-location",
+        "--bl",
         action="store",
         dest="binary_location",
         default=None,
@@ -1371,6 +1372,7 @@ def pytest_addoption(parser):
 
     arg_join = " ".join(sys_argv)
     sb_config._browser_shortcut = None
+    sb_config._vd_list = []
 
     # SeleniumBase does not support pytest-timeout due to hanging browsers.
     for arg in sys_argv:
@@ -1573,6 +1575,14 @@ def pytest_configure(config):
     sb_config.extension_dir = config.getoption("extension_dir")
     sb_config.disable_features = config.getoption("disable_features")
     sb_config.binary_location = config.getoption("binary_location")
+    if (
+        sb_config.binary_location
+        and sb_config.binary_location.lower() == "chs"
+        and sb_config.browser == "chrome"
+    ):
+        sb_config.headless = True
+        sb_config.headless1 = False
+        sb_config.headless2 = False
     sb_config.driver_version = config.getoption("driver_version")
     sb_config.page_load_strategy = config.getoption("page_load_strategy")
     sb_config.with_testing_base = config.getoption("with_testing_base")
@@ -1709,6 +1719,7 @@ def pytest_configure(config):
     sb_config._saved_dashboard_pie = None  # Copy of pie chart for html report
     sb_config._dash_final_summary = None  # Dash status to add to html report
     sb_config._html_report_name = None  # The name of the pytest html report
+    sb_config._html_report_copy = None  # The copy of the pytest html report
 
     arg_join = " ".join(sys_argv)
     if (
@@ -1742,6 +1753,7 @@ def pytest_configure(config):
         if sb_config.dashboard:
             if sb_config._html_report_name == "dashboard.html":
                 sb_config._dash_is_html_report = True
+        sb_config._html_report_copy = "last_report.html"
 
     # Recorder Mode does not support multi-threaded / multi-process runs.
     if sb_config.recorder_mode and sb_config._multithreaded:
@@ -2015,6 +2027,13 @@ def pytest_runtest_teardown(item):
                 hasattr(self, "_xvfb_display")
                 and self._xvfb_display
                 and hasattr(self._xvfb_display, "stop")
+                and (
+                    not hasattr(sb_config, "reuse_session")
+                    or (
+                        hasattr(sb_config, "reuse_session")
+                        and not sb_config.reuse_session
+                    )
+                )
             ):
                 self.headless_active = False
                 sb_config.headless_active = False
@@ -2024,6 +2043,13 @@ def pytest_runtest_teardown(item):
                 hasattr(sb_config, "_virtual_display")
                 and sb_config._virtual_display
                 and hasattr(sb_config._virtual_display, "stop")
+                and (
+                    not hasattr(sb_config, "reuse_session")
+                    or (
+                        hasattr(sb_config, "reuse_session")
+                        and not sb_config.reuse_session
+                    )
+                )
             ):
                 sb_config._virtual_display.stop()
                 sb_config._virtual_display = None
@@ -2137,10 +2163,28 @@ def _perform_pytest_unconfigure_(config):
             except Exception:
                 pass
         sb_config.shared_driver = None
+        with suppress(Exception):
+            if (
+                hasattr(sb_config, "_virtual_display")
+                and sb_config._virtual_display
+                and hasattr(sb_config._virtual_display, "stop")
+            ):
+                sb_config._virtual_display.stop()
+                sb_config._virtual_display = None
+                sb_config.headless_active = False
+            if hasattr(sb_config, "_vd_list") and sb_config._vd_list:
+                if isinstance(sb_config._vd_list, list):
+                    for display in sb_config._vd_list:
+                        if display:
+                            with suppress(Exception):
+                                display.stop()
     if hasattr(sb_config, "log_path") and sb_config.item_count > 0:
         log_helper.archive_logs_if_set(
             constants.Logs.LATEST + "/", sb_config.archive_logs
         )
+        if os.path.exists("./assets/"):  # Used by pytest-html reports
+            with suppress(Exception):
+                shared_utils.make_dir_files_writable("./assets/")
     log_helper.clear_empty_logs()
     # Dashboard post-processing: Disable time-based refresh and stamp complete
     if not hasattr(sb_config, "dashboard") or not sb_config.dashboard:
@@ -2151,6 +2195,10 @@ def _perform_pytest_unconfigure_(config):
             html_report_path = os.path.join(
                 abs_path, sb_config._html_report_name
             )
+        if sb_config._html_report_copy:
+            html_report_path_copy = os.path.join(
+                abs_path, sb_config._html_report_copy
+            )
         if (
             sb_config._using_html_report
             and html_report_path
@@ -2184,6 +2232,9 @@ def _perform_pytest_unconfigure_(config):
             the_html_r = the_html_r.replace(
                 ph_link, "%s and %s" % (sb_link, ph_link)
             )
+            the_html_r = the_html_r.replace(
+                "findAll('.collapsible", "//findAll('.collapsible"
+            )
             the_html_r = the_html_r.replace(
                 "mediaName.innerText", "//mediaName.innerText"
             )
@@ -2201,6 +2252,31 @@ def _perform_pytest_unconfigure_(config):
             )
             with open(html_report_path, "w", encoding="utf-8") as f:
                 f.write(the_html_r)  # Finalize the HTML report
+            with suppress(Exception):
+                shared_utils.make_writable(html_report_path)
+            with open(html_report_path_copy, "w", encoding="utf-8") as f:
+                f.write(the_html_r)  # Finalize the HTML report copy
+            with suppress(Exception):
+                shared_utils.make_writable(html_report_path_copy)
+            assets_style = "./assets/style.css"
+            if os.path.exists(assets_style):
+                html_style = None
+                with open(assets_style, "r", encoding="utf-8") as f:
+                    html_style = f.read()
+                if html_style:
+                    html_style = html_style.replace("top: -50px;", "top: 2px;")
+                    html_style = html_style.replace("+ 50px)", "+ 40px)")
+                    html_style = html_style.replace("ht: 240px;", "ht: 228px;")
+                    html_style = html_style.replace(
+                        "- 80px);", "- 80px);\n  margin-bottom: -42px;"
+                    )
+                    html_style = html_style.replace(".collapsible", ".oldc")
+                    html_style = html_style.replace(" (hide details)", "")
+                    html_style = html_style.replace(" (show details)", "")
+                with open(assets_style, "w", encoding="utf-8") as f:
+                    f.write(html_style)
+                with suppress(Exception):
+                    shared_utils.make_writable(assets_style)
         # Done with "pytest_unconfigure" unless using the Dashboard
         return
     stamp = ""
@@ -2282,12 +2358,37 @@ def _perform_pytest_unconfigure_(config):
                 )
             with open(dashboard_path, "w", encoding="utf-8") as f:
                 f.write(the_html_d)  # Finalize the dashboard
+            with suppress(Exception):
+                shared_utils.make_writable(dashboard_path)
+            assets_style = "./assets/style.css"
+            if os.path.exists(assets_style):
+                html_style = None
+                with open(assets_style, "r", encoding="utf-8") as f:
+                    html_style = f.read()
+                if html_style:
+                    html_style = html_style.replace("top: -50px;", "top: 2px;")
+                    html_style = html_style.replace("+ 50px)", "+ 40px)")
+                    html_style = html_style.replace("ht: 240px;", "ht: 228px;")
+                    html_style = html_style.replace(
+                        "- 80px);", "- 80px);\n  margin-bottom: -42px;"
+                    )
+                    html_style = html_style.replace(".collapsible", ".oldc")
+                    html_style = html_style.replace(" (hide details)", "")
+                    html_style = html_style.replace(" (show details)", "")
+                with open(assets_style, "w", encoding="utf-8") as f:
+                    f.write(html_style)
+                with suppress(Exception):
+                    shared_utils.make_writable(assets_style)
             # Part 2: Appending a pytest html report with dashboard data
             html_report_path = None
             if sb_config._html_report_name:
                 html_report_path = os.path.join(
                     abs_path, sb_config._html_report_name
                 )
+            if sb_config._html_report_copy:
+                html_report_path_copy = os.path.join(
+                    abs_path, sb_config._html_report_copy
+                )
             if (
                 sb_config._using_html_report
                 and html_report_path
@@ -2341,6 +2442,9 @@ def _perform_pytest_unconfigure_(config):
                 the_html_r = the_html_r.replace(
                     ph_link, "%s and %s" % (sb_link, ph_link)
                 )
+                the_html_r = the_html_r.replace(
+                    "findAll('.collapsible", "//findAll('.collapsible"
+                )
                 the_html_r = the_html_r.replace(
                     "mediaName.innerText", "//mediaName.innerText"
                 )
@@ -2358,6 +2462,12 @@ def _perform_pytest_unconfigure_(config):
                 )
                 with open(html_report_path, "w", encoding="utf-8") as f:
                     f.write(the_html_r)  # Finalize the HTML report
+                with suppress(Exception):
+                    shared_utils.make_writable(html_report_path)
+                with open(html_report_path_copy, "w", encoding="utf-8") as f:
+                    f.write(the_html_r)  # Finalize the HTML report copy
+                with suppress(Exception):
+                    shared_utils.make_writable(html_report_path_copy)
     except KeyboardInterrupt:
         pass
     except Exception:

seleniumbase/plugins/sb_manager.py

@@ -568,6 +568,34 @@ def SB(
                 break
             count += 1
     user_agent = agent
+    found_bl = None
+    if binary_location is None and "--binary-location" in arg_join:
+        count = 0
+        for arg in sys_argv:
+            if arg.startswith("--binary-location="):
+                found_bl = arg.split("--binary-location=")[1]
+                break
+            elif arg == "--binary-location" and len(sys_argv) > count + 1:
+                found_bl = sys_argv[count + 1]
+                if found_bl.startswith("-"):
+                    found_bl = None
+                break
+            count += 1
+        if found_bl:
+            binary_location = found_bl
+    if binary_location is None and "--bl=" in arg_join:
+        for arg in sys_argv:
+            if arg.startswith("--bl="):
+                binary_location = arg.split("--bl=")[1]
+                break
+    if (
+        binary_location
+        and binary_location.lower() == "chs"
+        and browser == "chrome"
+    ):
+        headless = True
+        headless1 = False
+        headless2 = False
     recorder_mode = False
     if recorder_ext:
         recorder_mode = True
@@ -1256,6 +1284,19 @@ def SB(
             print(traceback.format_exc().strip())
             if test and not test_passed:
                 print("********** ERROR: The test AND the tearDown() FAILED!")
+        if (
+            hasattr(sb_config, "_virtual_display")
+            and sb_config._virtual_display
+            and hasattr(sb_config._virtual_display, "stop")
+        ):
+            try:
+                sb_config._virtual_display.stop()
+                sb_config._virtual_display = None
+                sb_config.headless_active = False
+            except AttributeError:
+                pass
+            except Exception:
+                pass
         end_time = time.time()
         run_time = end_time - start_time
         sb_config = sb_config_backup

seleniumbase/plugins/selenium_plugin.py

@@ -397,6 +397,7 @@ class SeleniumBrowser(Plugin):
         parser.addoption(
             "--binary_location",
             "--binary-location",
+            "--bl",
             action="store",
             dest="binary_location",
             default=None,
@@ -1202,6 +1203,14 @@ class SeleniumBrowser(Plugin):
         test.test.extension_dir = self.options.extension_dir
         test.test.disable_features = self.options.disable_features
         test.test.binary_location = self.options.binary_location
+        if (
+            test.test.binary_location
+            and test.test.binary_location.lower() == "chs"
+            and test.test.browser == "chrome"
+        ):
+            test.test.headless = True
+            test.test.headless1 = False
+            test.test.headless2 = False
         test.test.driver_version = self.options.driver_version
         test.test.page_load_strategy = self.options.page_load_strategy
         test.test.chromium_arg = self.options.chromium_arg

seleniumbase/undetected/cdp_driver/_contradict.py

@@ -31,12 +31,12 @@ class ContraDict(dict):
 
     def __init__(self, *args, **kwargs):
         super().__init__()
-        silent = kwargs.pop("silent", False)
+        # silent = kwargs.pop("silent", False)
         _ = dict(*args, **kwargs)
 
         super().__setattr__("__dict__", self)
         for k, v in _.items():
-            _check_key(k, self, False, silent)
+            _check_key(k, self, False, True)
             super().__setitem__(k, _wrap(self.__class__, v))
 
     def __setitem__(self, key, value):
@@ -90,7 +90,7 @@ _warning_names_message = """\n\
 
 
 def _check_key(
-    key: str, mapping: _Mapping, boolean: bool = False, silent=False
+    key: str, mapping: _Mapping, boolean: bool = False, silent=True
 ):
     """Checks `key` and warns if needed.
     :param key:

seleniumbase/undetected/cdp_driver/browser.py

@@ -10,6 +10,7 @@ import pathlib
 import pickle
 import re
 import shutil
+import time
 import urllib.parse
 import urllib.request
 import warnings
@@ -30,8 +31,6 @@ def get_registered_instances():
 
 
 def deconstruct_browser():
-    import time
-
     for _ in __registered__instances__:
         if not _.stopped:
             _.stop()
@@ -117,8 +116,13 @@ class Browser:
                 port=port,
                 **kwargs,
             )
-        instance = cls(config)
-        await instance.start()
+        try:
+            instance = cls(config)
+            await instance.start()
+        except Exception:
+            time.sleep(0.15)
+            instance = cls(config)
+            await instance.start()
         return instance
 
     def __init__(self, config: Config, **kwargs):
@@ -379,8 +383,6 @@ class Browser:
                     --------------------------------
                     Failed to connect to the browser
                     --------------------------------
-                    Possibly because you are running as "root".
-                    If so, you may need to use no_sandbox=True.
                     """
                 )
             )

seleniumbase/undetected/cdp_driver/cdp_util.py

@@ -84,6 +84,9 @@ def __activate_virtual_display_as_needed(
                             "\nX11 display failed! Will use regular xvfb!"
                         )
                         __activate_standard_virtual_display()
+                    else:
+                        sb_config._virtual_display = _xvfb_display
+                        sb_config.headless_active = True
                 except Exception as e:
                     if hasattr(e, "msg"):
                         print("\n" + str(e.msg))

seleniumbase/undetected/cdp_driver/config.py

@@ -125,7 +125,6 @@ class Config:
             "--deny-permission-prompts",
             "--disable-infobars",
             "--disable-breakpad",
-            "--disable-component-update",
             "--disable-prompt-on-repost",
             "--disable-password-generation",
             "--disable-ipc-flooding-protection",

seleniumbase/undetected/cdp_driver/element.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 import asyncio
-import json
 import logging
 import pathlib
 import secrets
@@ -387,18 +386,16 @@ class Element:
 
     async def get_js_attributes_async(self):
         return ContraDict(
-            json.loads(
-                await self.apply(
-                    """
-            function (e) {
-                let o = {}
-                for(let k in e){
-                    o[k] = e[k]
+            await self.apply(
+                """
+                function (e) {
+                    let o = {}
+                    for(let k in e){
+                        o[k] = e[k]
+                    }
+                    return o
                 }
-                return JSON.stringify(o)
-            }
-            """
-                )
+                """
             )
         )
 
@@ -441,12 +438,15 @@ class Element:
                 )
             )
         )
-        if result and result[0]:
-            if return_by_value:
-                return result[0].value
-            return result[0]
-        elif result[1]:
-            return result[1]
+        try:
+            if result and result[0]:
+                if return_by_value:
+                    return result[0].value
+                return result[0]
+            elif result[1]:
+                return result[1]
+        except Exception:
+            return self
 
     async def get_position_async(self, abs=False) -> Position:
         if not self.parent or not self.object_id:
@@ -883,6 +883,8 @@ class Element:
         self,
         duration: typing.Union[float, int] = 0.5,
         color: typing.Optional[str] = "EE4488",
+        x_offset: typing.Union[float, int] = 0,
+        y_offset: typing.Union[float, int] = 0,
     ):
         """
         Displays for a short time a red dot on the element.
@@ -910,8 +912,8 @@ class Element:
             "width:8px;height:8px;border-radius:50%;background:#{};"
             "animation:show-pointer-ani {:.2f}s ease 1;"
         ).format(
-            pos.center[0] - 4,  # -4 to account for drawn circle itself (w,h)
-            pos.center[1] - 4,
+            pos.center[0] + x_offset - 4,  # -4 to account for the circle
+            pos.center[1] + y_offset - 4,  # -4 to account for the circle
             color,
             duration,
         )

seleniumbase/undetected/patcher.py

@@ -8,6 +8,8 @@ import sys
 import time
 import zipfile
 from contextlib import suppress
+from seleniumbase.console_scripts import sb_install
+from seleniumbase.fixtures import shared_utils
 
 logger = logging.getLogger(__name__)
 IS_POSIX = sys.platform.startswith(("darwin", "cygwin", "linux"))
@@ -106,7 +108,14 @@ class Patcher(object):
         release = self.fetch_release_number()
         self.version_main = release.split(".")[0]
         self.version_full = release
-        self.unzip_package(self.fetch_package())
+        if int(self.version_main) < 115:
+            self.unzip_package(self.fetch_package())
+        else:
+            sb_install.main(
+                override="chromedriver %s" % self.version_main,
+                intel_for_uc=shared_utils.is_arm_mac(),
+                force_uc=True,
+            )
         return self.patch()
 
     def patch(self):
@@ -121,6 +130,12 @@ class Patcher(object):
             path += "_%s" % self.version_main
         path = path.upper()
         logger.debug("Getting release number from %s" % path)
+        if self.version_main and int(self.version_main) > 114:
+            return (
+                sb_install.get_cft_latest_version_from_milestone(
+                    str(self.version_main)
+                )
+            )
         return urlopen(self.url_repo + path).read().decode()
 
     def fetch_package(self):
@@ -187,7 +202,7 @@ class Patcher(object):
         with io.open(executable_path, "rb") as fh:
             if re.search(
                 b"window.cdc_adoQpoasnfa76pfcZLmcfl_"
-                b"(Array|Promise|Symbol|Object|Proxy|JSON)",
+                b"(Array|Promise|Symbol|Object|Proxy|JSON|Window)",
                 fh.read()
             ):
                 return False
@@ -210,14 +225,14 @@ class Patcher(object):
             file_bin = fh.read()
             file_bin = re.sub(
                 b"window\\.cdc_[a-zA-Z0-9]{22}_"
-                b"(Array|Promise|Symbol|Object|Proxy|JSON)"
-                b" = window\\.(Array|Promise|Symbol|Object|Proxy|JSON);",
+                b"(Array|Promise|Symbol|Object|Proxy|JSON|Window) "
+                b"= window\\.(Array|Promise|Symbol|Object|Proxy|JSON|Window);",
                 gen_js_whitespaces,
                 file_bin,
             )
             file_bin = re.sub(
                 b"window\\.cdc_[a-zA-Z0-9]{22}_"
-                b"(Array|Promise|Symbol|Object|Proxy|JSON) \\|\\|",
+                b"(Array|Promise|Symbol|Object|Proxy|JSON|Window) \\|\\|",
                 gen_js_whitespaces,
                 file_bin,
             )

{seleniumbase-4.33.4.dist-info → seleniumbase-4.34.2.dist-info}/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2024 Michael Mintz
+Copyright (c) 2014-2025 Michael Mintz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal