seleniumbase 4.37.5__py3-none-any.whl → 4.37.7__py3-none-any.whl

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.37.5"
+__version__ = "4.37.7"

seleniumbase/undetected/__init__.py

@@ -402,7 +402,8 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
 
     def add_cdp_listener(self, event_name, callback):
         if (
-            self.reactor
+            hasattr(self, "reactor")
+            and self.reactor
             and self.reactor is not None
             and isinstance(self.reactor, Reactor)
         ):
@@ -411,7 +412,11 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
         return False
 
     def clear_cdp_listeners(self):
-        if self.reactor and isinstance(self.reactor, Reactor):
+        if (
+            hasattr(self, "reactor")
+            and self.reactor
+            and isinstance(self.reactor, Reactor)
+        ):
             self.reactor.handlers.clear()
 
     def window_new(self, url=None):
@@ -581,7 +586,11 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
                 finally:
                     with suppress(Exception):
                         self.service._terminate_process()
-        if self.reactor and hasattr(self.reactor, "event"):
+        if (
+            hasattr(self, "reactor")
+            and self.reactor
+            and hasattr(self.reactor, "event")
+        ):
             logger.debug("Shutting down Reactor")
             with suppress(Exception):
                 self.reactor.event.set()

seleniumbase/undetected/cdp_driver/browser.py

@@ -287,10 +287,63 @@ class Browser:
             connection: tab.Tab = next(
                 filter(lambda item: item.type_ == "page", self.targets)
             )
-            # Use the tab to navigate to new url
             if hasattr(sb_config, "_cdp_locale") and sb_config._cdp_locale:
                 await connection.send(cdp.page.navigate("about:blank"))
-                await connection.set_locale(sb_config._cdp_locale)
+                if (
+                    hasattr(sb_config, "_cdp_user_agent")
+                    and sb_config._cdp_user_agent
+                ):
+                    pass
+                elif (
+                    hasattr(sb_config, "_cdp_platform")
+                    and sb_config._cdp_platform
+                ):
+                    pass
+                else:
+                    await connection.set_locale(sb_config._cdp_locale)
+            if hasattr(sb_config, "_cdp_timezone") and sb_config._cdp_timezone:
+                await connection.send(cdp.page.navigate("about:blank"))
+                await connection.set_timezone(sb_config._cdp_timezone)
+            if (
+                hasattr(sb_config, "_cdp_user_agent")
+                and sb_config._cdp_user_agent
+            ):
+                await connection.send(cdp.page.navigate("about:blank"))
+                if hasattr(sb_config, "_cdp_locale") and sb_config._cdp_locale:
+                    _cdp_platform = None
+                    if (
+                        hasattr(sb_config, "_cdp_platform")
+                        and sb_config._cdp_platform
+                    ):
+                        _cdp_platform = sb_config._cdp_platform
+                    await connection.set_user_agent(
+                        sb_config._cdp_user_agent,
+                        sb_config._cdp_locale,
+                        _cdp_platform,
+                    )
+                else:
+                    await connection.set_user_agent(sb_config._cdp_user_agent)
+            elif (
+                hasattr(sb_config, "_cdp_platform") and sb_config._cdp_platform
+            ):
+                await connection.send(cdp.page.navigate("about:blank"))
+                if hasattr(sb_config, "_cdp_locale") and sb_config._cdp_locale:
+                    _cdp_platform = sb_config._cdp_platform
+                    await connection.set_user_agent(
+                        accept_language=sb_config._cdp_locale,
+                        platform=_cdp_platform,
+                    )
+                else:
+                    await connection.set_user_agent(
+                        platform=sb_config._cdp_platform
+                    )
+            if (
+                hasattr(sb_config, "_cdp_geolocation")
+                and sb_config._cdp_geolocation
+            ):
+                await connection.send(cdp.page.navigate("about:blank"))
+                await connection.set_geolocation(sb_config._cdp_geolocation)
+            # Use the tab to navigate to new url
             frame_id, loader_id, *_ = await connection.send(
                 cdp.page.navigate(url)
             )

seleniumbase/undetected/cdp_driver/cdp_util.py

@@ -10,8 +10,10 @@ import types
 import typing
 from contextlib import suppress
 from seleniumbase import config as sb_config
+from seleniumbase import extensions
 from seleniumbase.config import settings
 from seleniumbase.core import detect_b_ver
+from seleniumbase.core import download_helper
 from seleniumbase.core import proxy_helper
 from seleniumbase.fixtures import constants
 from seleniumbase.fixtures import shared_utils
@@ -25,7 +27,10 @@ import mycdp as cdp
 
 logger = logging.getLogger(__name__)
 IS_LINUX = shared_utils.is_linux()
+DOWNLOADS_FOLDER = download_helper.get_downloads_folder()
 PROXY_DIR_LOCK = proxy_helper.PROXY_DIR_LOCK
+EXTENSIONS_DIR = os.path.dirname(os.path.realpath(extensions.__file__))
+AD_BLOCK_ZIP_PATH = os.path.join(EXTENSIONS_DIR, "ad_block.zip")
 T = typing.TypeVar("T")
 
 
@@ -168,6 +173,19 @@ def __add_chrome_ext_dir(extension_dir, dir_path):
     return extension_dir
 
 
+def __unzip_to_new_folder(zip_file, folder):
+    proxy_dir_lock = fasteners.InterProcessLock(PROXY_DIR_LOCK)
+    with proxy_dir_lock:
+        with suppress(Exception):
+            shared_utils.make_writable(PROXY_DIR_LOCK)
+        if not os.path.exists(folder):
+            import zipfile
+            zip_ref = zipfile.ZipFile(zip_file, "r")
+            os.makedirs(folder)
+            zip_ref.extractall(folder)
+            zip_ref.close()
+
+
 def __add_chrome_proxy_extension(
     extension_dir,
     proxy_string,
@@ -231,6 +249,7 @@ async def start(
     browser_executable_path: Optional[PathLike] = None,
     browser_args: Optional[List[str]] = None,
     xvfb_metrics: Optional[List[str]] = None,  # "Width,Height" for Linux
+    ad_block: Optional[bool] = False,
     sandbox: Optional[bool] = True,
     lang: Optional[str] = None,  # Set the Language Locale Code
     host: Optional[str] = None,  # Chrome remote-debugging-host
@@ -238,7 +257,10 @@ async def start(
     xvfb: Optional[int] = None,  # Use a special virtual display on Linux
     headed: Optional[bool] = None,  # Override default Xvfb mode on Linux
     expert: Optional[bool] = None,  # Open up closed Shadow-root elements
+    agent: Optional[str] = None,  # Set the user-agent string
     proxy: Optional[str] = None,  # "host:port" or "user:pass@host:port"
+    tzone: Optional[str] = None,  # Eg "America/New_York", "Asia/Kolkata"
+    geoloc: Optional[list | tuple] = None,  # Eg (48.87645, 2.26340)
     extension_dir: Optional[str] = None,  # Chrome extension directory
     **kwargs: Optional[dict],
 ) -> Browser:
@@ -296,6 +318,13 @@ async def start(
                 proxy_user,
                 proxy_pass,
             )
+    if ad_block:
+        incognito = False
+        guest = False
+        ad_block_zip = AD_BLOCK_ZIP_PATH
+        ad_block_dir = os.path.join(DOWNLOADS_FOLDER, "ad_block")
+        __unzip_to_new_folder(ad_block_zip, ad_block_dir)
+        extension_dir = __add_chrome_ext_dir(extension_dir, ad_block_dir)
     if not config:
         config = Config(
             user_data_dir,
@@ -329,6 +358,26 @@ async def start(
         sb_config._cdp_locale = kwargs["locale_code"]
     else:
         sb_config._cdp_locale = None
+    if tzone:
+        sb_config._cdp_timezone = tzone
+    elif "timezone" in kwargs:
+        sb_config._cdp_timezone = kwargs["timezone"]
+    else:
+        sb_config._cdp_timezone = None
+    if geoloc:
+        sb_config._cdp_geolocation = geoloc
+    elif "geolocation" in kwargs:
+        sb_config._cdp_geolocation = kwargs["geolocation"]
+    else:
+        sb_config._cdp_geolocation = None
+    if agent:
+        sb_config._cdp_user_agent = agent
+    elif "user_agent" in kwargs:
+        sb_config._cdp_user_agent = kwargs["user_agent"]
+    else:
+        sb_config._cdp_user_agent = None
+    if "platform" in kwargs:
+        sb_config._cdp_platform = kwargs["platform"]
     return driver
 
 

seleniumbase/undetected/cdp_driver/connection.py

@@ -292,9 +292,6 @@ class Connection(metaclass=CantTouchThis):
         Closes the websocket connection. Shouldn't be called manually by users.
         """
         if self.websocket and self.websocket.state is not State.CLOSED:
-            if self.listener and self.listener.running:
-                self.listener.cancel()
-                self.enabled_domains.clear()
             try:
                 await self.websocket.close()
             except Exception:
@@ -302,6 +299,9 @@ class Connection(metaclass=CantTouchThis):
                     "\n❌ Error closing websocket connection to %s",
                     self.websocket_url
                 )
+            if self.listener and self.listener.running:
+                self.listener.cancel()
+                self.enabled_domains.clear()
             logger.debug(
                 "\n❌ Closed websocket connection to %s", self.websocket_url
             )
@@ -348,7 +348,37 @@ class Connection(metaclass=CantTouchThis):
 
     async def set_locale(self, locale: Optional[str] = None):
         """Sets the Language Locale code via set_user_agent_override."""
-        await self.send(cdp.network.set_user_agent_override("", locale))
+        await self.set_user_agent(user_agent="", accept_language=locale)
+
+    async def set_timezone(self, timezone: Optional[str] = None):
+        """Sets the Timezone via set_timezone_override."""
+        await self.send(cdp.emulation.set_timezone_override(timezone))
+
+    async def set_user_agent(
+        self,
+        user_agent: Optional[str] = "",
+        accept_language: Optional[str] = None,
+        platform: Optional[str] = None,  # navigator.platform
+    ):
+        """Sets the User Agent via set_user_agent_override."""
+        if not user_agent:
+            user_agent = ""
+        await self.send(cdp.network.set_user_agent_override(
+            user_agent=user_agent,
+            accept_language=accept_language,
+            platform=platform,
+        ))
+
+    async def set_geolocation(self, geolocation: Optional[tuple] = None):
+        """Sets the User Agent via set_geolocation_override."""
+        await self.send(cdp.browser.grant_permissions(
+            permissions=["geolocation"],
+        ))
+        await self.send(cdp.emulation.set_geolocation_override(
+            latitude=geolocation[0],
+            longitude=geolocation[1],
+            accuracy=100,
+        ))
 
     def __getattr__(self, item):
         """:meta private:"""
@@ -549,8 +579,7 @@ class Listener:
             except asyncio.TimeoutError:
                 self.idle.set()
                 # Pause for a moment.
-                # await asyncio.sleep(self.time_before_considered_idle / 10)
-                await asyncio.sleep(0.015)
+                await asyncio.sleep(self.time_before_considered_idle / 10)
                 continue
             except (Exception,) as e:
                 logger.debug(

{seleniumbase-4.37.5.dist-info → seleniumbase-4.37.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seleniumbase
-Version: 4.37.5
+Version: 4.37.7
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -62,7 +62,7 @@ License-File: LICENSE
 Requires-Dist: pip>=25.0.1
 Requires-Dist: packaging>=25.0
 Requires-Dist: setuptools~=70.2; python_version < "3.10"
-Requires-Dist: setuptools>=79.0.0; python_version >= "3.10"
+Requires-Dist: setuptools>=79.0.1; python_version >= "3.10"
 Requires-Dist: wheel>=0.45.1
 Requires-Dist: attrs>=25.3.0
 Requires-Dist: certifi>=2025.1.31
@@ -72,7 +72,7 @@ Requires-Dist: websockets>=15.0.1; python_version >= "3.9"
 Requires-Dist: filelock~=3.16.1; python_version < "3.9"
 Requires-Dist: filelock>=3.18.0; python_version >= "3.9"
 Requires-Dist: fasteners>=0.19
-Requires-Dist: mycdp>=1.1.1
+Requires-Dist: mycdp>=1.2.0
 Requires-Dist: pynose>=1.5.4
 Requires-Dist: platformdirs>=4.3.6; python_version < "3.9"
 Requires-Dist: platformdirs>=4.3.7; python_version >= "3.9"
@@ -97,7 +97,7 @@ Requires-Dist: urllib3<2,>=1.26.20; python_version < "3.10"
 Requires-Dist: urllib3<2.5.0,>=1.26.20; python_version >= "3.10"
 Requires-Dist: requests==2.32.3
 Requires-Dist: sniffio==1.3.1
-Requires-Dist: h11==0.14.0
+Requires-Dist: h11==0.16.0
 Requires-Dist: outcome==1.3.0.post0
 Requires-Dist: trio==0.27.0; python_version < "3.9"
 Requires-Dist: trio==0.30.0; python_version >= "3.9"

{seleniumbase-4.37.5.dist-info → seleniumbase-4.37.7.dist-info}/RECORD

@@ -3,7 +3,7 @@ sbase/__main__.py,sha256=G0bVB1-DM4PGwQ1KyOupaWCs4ePbChZNNWuX2htim5U,647
 sbase/steps.py,sha256=_WvAjydKqZfTdnZW9LPKkRty-g-lfdUPmLqnZj6ulcs,43013
 seleniumbase/__init__.py,sha256=JFEY9P5QJqsa1M6ghzLMH2eIPQyh85iglCaQwg8Y8z4,2498
 seleniumbase/__main__.py,sha256=dn1p6dgCchmcH1zzTzzQvFwwdQQqnTGH6ULV9m4hv24,654
-seleniumbase/__version__.py,sha256=EdOfmZ-Mk9HJpcoyHvSLoCXg-QkbXXcMFikUwtu_L7k,46
+seleniumbase/__version__.py,sha256=ZU4HNYoq3elduI1j6IgiPolitwipkaMBnUux0Mq5m68,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=qQF85LoohJBfrPK5ZcPi50v-pWtOrC9qcN1B3Ki_3tY,59401
@@ -106,7 +106,7 @@ seleniumbase/translate/portuguese.py,sha256=x3P4qxp56UiI41GoaL7JbUvFRYsgXU1EKjTg
 seleniumbase/translate/russian.py,sha256=TyN9n0b4GRWDEYnHRGw1rfNAscdDmP3F3Y3aySM3C7s,27978
 seleniumbase/translate/spanish.py,sha256=hh3xgW1Pq122SHYVvJAxFaXhFrjniOVncVbJbfWqOUM,25528
 seleniumbase/translate/translator.py,sha256=wPhZH6e5NhmebYL1kP2eGxUcVy1gfTb6XCH8ATEPpxE,49238
-seleniumbase/undetected/__init__.py,sha256=5TPgl94SdYCLMRqINx0P4BSfRuJZdCh6hGDl54EOZ9g,26738
+seleniumbase/undetected/__init__.py,sha256=95SyFC9vLCHhtT13TIgC2-eIcTiIQNLNvIf70FxyphU,26942
 seleniumbase/undetected/cdp.py,sha256=G6nLStm1l8PmZlKIyMnFcYMV7HD5kiGb-9BaqPjVP3I,5497
 seleniumbase/undetected/dprocess.py,sha256=83EV8ZHJWHG1TSUv9JNClBhdgiBXlkCc6mJ--HsoP3k,1681
 seleniumbase/undetected/options.py,sha256=BoNuwhrG7oOvuLvTwkvsWCF36pMkS1tHCG-XpP4_EkI,3001
@@ -115,10 +115,10 @@ seleniumbase/undetected/reactor.py,sha256=NropaXcO54pzmDq6quR27qPJxab6636H7LRAaq
 seleniumbase/undetected/webelement.py,sha256=OOpUYbEiOG52KsYYyuDW9tYLdA2SMnukvwQHUdPVn9E,1389
 seleniumbase/undetected/cdp_driver/__init__.py,sha256=Ga9alwuaZZy4_XOShc0HjgFnNqpPdrcbjAicz5gE7a4,215
 seleniumbase/undetected/cdp_driver/_contradict.py,sha256=lP4b0h5quAy573ETn_TBbYV889cL1AuPLVInpJ0ZkiU,3183
-seleniumbase/undetected/cdp_driver/browser.py,sha256=c-9EWqpD2ZtpDg8edMuw9hYa6GuyOP1qxorNjtsWe1U,30457
-seleniumbase/undetected/cdp_driver/cdp_util.py,sha256=oKUEHx220PEFvHLW4dz18i4j1Q6HPTdkKx9QOKAVZ3I,21821
+seleniumbase/undetected/cdp_driver/browser.py,sha256=5nlLQE58JvwooyUVAXQMosr6C-vj2iSpzyldnLZCnLM,32914
+seleniumbase/undetected/cdp_driver/cdp_util.py,sha256=MhiRNf49G_Ee6JkslES-WegTfY2U4uSS3hTNP-GlcGc,23807
 seleniumbase/undetected/cdp_driver/config.py,sha256=t8KV1Vqa5SQRBq3-gjkHHmj9h85AplAM01asO3AWufs,12507
-seleniumbase/undetected/cdp_driver/connection.py,sha256=06yJHDAnQnkxooZDBAJJfPz2Fjn6IIg0eUSbCJ_9JLw,23467
+seleniumbase/undetected/cdp_driver/connection.py,sha256=jccGcDt-TqgknvMNQYpRbhrSMC_74tYs-9YH1NK5UGU,24572
 seleniumbase/undetected/cdp_driver/element.py,sha256=FIC6v7OmumLCT-_vIc3H4oju_oBbaLpWJUJIKm2c_q4,40467
 seleniumbase/undetected/cdp_driver/tab.py,sha256=bxkCFKDejQ1xKsX3740RvvrYfC4OBv1mlQ4yWJM6As4,52260
 seleniumbase/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -135,9 +135,9 @@ seleniumbase/utilities/selenium_grid/start-grid-hub.bat,sha256=Ftq-GrAKRYH2ssDPr
 seleniumbase/utilities/selenium_grid/start-grid-hub.sh,sha256=KADv0RUHONLL2_I443QFK8PryBpDmKn5Gy0s4o0vDSM,106
 seleniumbase/utilities/selenium_ide/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/utilities/selenium_ide/convert_ide.py,sha256=pZFnqEJQEKZPyNFjkLD29s2HPQgCrWW9XJWpCPhWOoM,31691
-seleniumbase-4.37.5.dist-info/licenses/LICENSE,sha256=BRblZsX7HyPUjQmYTiyWr_e9tzWvmR3R4SFclM2R3W0,1085
-seleniumbase-4.37.5.dist-info/METADATA,sha256=pcoo_2CkyWe5W9TU8X5XQfP81T8h2JGVQDhIqh9XCyE,86879
-seleniumbase-4.37.5.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-seleniumbase-4.37.5.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
-seleniumbase-4.37.5.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
-seleniumbase-4.37.5.dist-info/RECORD,,
+seleniumbase-4.37.7.dist-info/licenses/LICENSE,sha256=BRblZsX7HyPUjQmYTiyWr_e9tzWvmR3R4SFclM2R3W0,1085
+seleniumbase-4.37.7.dist-info/METADATA,sha256=62USFVvtKAkiB_nfh6y_ms0lcAW1cl-DQyy-oU2j_qs,86879
+seleniumbase-4.37.7.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+seleniumbase-4.37.7.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
+seleniumbase-4.37.7.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
+seleniumbase-4.37.7.dist-info/RECORD,,

{seleniumbase-4.37.5.dist-info → seleniumbase-4.37.7.dist-info}/WHEEL

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