seleniumbase 4.32.7__tar.gz → 4.32.9__tar.gz

{seleniumbase-4.32.7/seleniumbase.egg-info → seleniumbase-4.32.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.32.7
+Version: 4.32.9
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -60,14 +60,15 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pip>=24.2
-Requires-Dist: packaging>=24.1
+Requires-Dist: packaging>=24.2
 Requires-Dist: setuptools~=70.2; python_version < "3.10"
 Requires-Dist: setuptools>=73.0.1; python_version >= "3.10"
-Requires-Dist: wheel>=0.44.0
+Requires-Dist: wheel>=0.45.0
 Requires-Dist: attrs>=24.2.0
 Requires-Dist: certifi>=2024.8.30
 Requires-Dist: exceptiongroup>=1.2.2
-Requires-Dist: websockets>=13.1
+Requires-Dist: websockets~=13.1; python_version < "3.9"
+Requires-Dist: websockets>=14.0; python_version >= "3.9"
 Requires-Dist: filelock>=3.16.1
 Requires-Dist: fasteners>=0.19
 Requires-Dist: mycdp>=1.0.1
@@ -83,7 +84,7 @@ Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: pygments>=2.18.0
 Requires-Dist: pyreadline3>=3.5.3; platform_system == "Windows"
 Requires-Dist: tabcompleter>=1.4.0
-Requires-Dist: pdbp>=1.6.0
+Requires-Dist: pdbp>=1.6.1
 Requires-Dist: idna==3.10
 Requires-Dist: chardet==5.2.0
 Requires-Dist: charset-normalizer==3.4.0

{seleniumbase-4.32.7 → seleniumbase-4.32.9}/requirements.txt

@@ -1,12 +1,13 @@
 pip>=24.2
-packaging>=24.1
+packaging>=24.2
 setuptools~=70.2;python_version<"3.10"
 setuptools>=73.0.1;python_version>="3.10"
-wheel>=0.44.0
+wheel>=0.45.0
 attrs>=24.2.0
 certifi>=2024.8.30
 exceptiongroup>=1.2.2
-websockets>=13.1
+websockets~=13.1;python_version<"3.9"
+websockets>=14.0;python_version>="3.9"
 filelock>=3.16.1
 fasteners>=0.19
 mycdp>=1.0.1
@@ -22,7 +23,7 @@ pyyaml>=6.0.2
 pygments>=2.18.0
 pyreadline3>=3.5.3;platform_system=="Windows"
 tabcompleter>=1.4.0
-pdbp>=1.6.0
+pdbp>=1.6.1
 idna==3.10
 chardet==5.2.0
 charset-normalizer==3.4.0

{seleniumbase-4.32.7 → seleniumbase-4.32.9}/seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.32.7"
+__version__ = "4.32.9"

{seleniumbase-4.32.7 → seleniumbase-4.32.9}/seleniumbase/core/browser_launcher.py

@@ -620,11 +620,15 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.reset_window_size = CDPM.reset_window_size
     cdp.set_locale = CDPM.set_locale
     cdp.set_attributes = CDPM.set_attributes
+    cdp.gui_press_key = CDPM.gui_press_key
+    cdp.gui_press_keys = CDPM.gui_press_keys
+    cdp.gui_write = CDPM.gui_write
     cdp.gui_click_x_y = CDPM.gui_click_x_y
     cdp.gui_click_element = CDPM.gui_click_element
     cdp.internalize_links = CDPM.internalize_links
     cdp.get_window = CDPM.get_window
     cdp.get_element_attributes = CDPM.get_element_attributes
+    cdp.get_element_attribute = CDPM.get_element_attribute
     cdp.get_element_html = CDPM.get_element_html
     cdp.get_element_rect = CDPM.get_element_rect
     cdp.get_element_size = CDPM.get_element_size
@@ -651,6 +655,11 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.focus = CDPM.focus
     cdp.highlight_overlay = CDPM.highlight_overlay
     cdp.get_window_position = CDPM.get_window_position
+    cdp.check_if_unchecked = CDPM.check_if_unchecked
+    cdp.uncheck_if_checked = CDPM.uncheck_if_checked
+    cdp.select_if_unselected = CDPM.select_if_unselected
+    cdp.unselect_if_selected = CDPM.unselect_if_selected
+    cdp.is_checked = CDPM.is_checked
     cdp.is_element_present = CDPM.is_element_present
     cdp.is_element_visible = CDPM.is_element_visible
     cdp.assert_element_present = CDPM.assert_element_present
@@ -715,6 +724,9 @@ def uc_click(
     timeout=settings.SMALL_TIMEOUT,
     reconnect_time=None,
 ):
+    if __is_cdp_swap_needed(driver):
+        driver.cdp.click(selector)
+        return
     with suppress(Exception):
         rct = float(by)  # Add shortcut: driver.uc_click(selector, RCT)
         if not reconnect_time:

{seleniumbase-4.32.7 → seleniumbase-4.32.9}/seleniumbase/core/sb_cdp.py

@@ -1,6 +1,5 @@
 """Add CDP methods to extend the driver"""
 import fasteners
-import math
 import os
 import re
 import sys
@@ -771,10 +770,12 @@ class CDPMethods():
         window_rect = self.get_window_rect()
         w_bottom_y = window_rect["y"] + window_rect["height"]
         viewport_height = window_rect["innerHeight"]
-        x = math.ceil(window_rect["x"] + element_rect["x"])
-        y = math.ceil(w_bottom_y - viewport_height + element_rect["y"])
+        x = window_rect["x"] + element_rect["x"]
+        y = w_bottom_y - viewport_height + element_rect["y"]
         y_scroll_offset = window_rect["pageYOffset"]
-        y = int(y - y_scroll_offset)
+        y = y - y_scroll_offset
+        x = x + window_rect["scrollX"]
+        y = y + window_rect["scrollY"]
         return ({"height": e_height, "width": e_width, "x": x, "y": y})
 
     def get_gui_element_center(self, selector):
@@ -804,6 +805,10 @@ class CDPMethods():
             )
         )
 
+    def get_element_attribute(self, selector, attribute):
+        attributes = self.get_element_attributes(selector)
+        return attributes[attribute]
+
     def get_element_html(self, selector):
         selector = self.__convert_to_css_if_xpath(selector)
         return self.loop.run_until_complete(
@@ -937,6 +942,45 @@ class CDPMethods():
                 )
         return pyautogui_copy
 
+    def gui_press_key(self, key):
+        self.__install_pyautogui_if_missing()
+        import pyautogui
+        pyautogui = self.__get_configured_pyautogui(pyautogui)
+        gui_lock = fasteners.InterProcessLock(
+            constants.MultiBrowser.PYAUTOGUILOCK
+        )
+        with gui_lock:
+            pyautogui.press(key)
+            time.sleep(0.0375)
+        self.__slow_mode_pause_if_set()
+        self.loop.run_until_complete(self.page.wait())
+
+    def gui_press_keys(self, keys):
+        self.__install_pyautogui_if_missing()
+        import pyautogui
+        pyautogui = self.__get_configured_pyautogui(pyautogui)
+        gui_lock = fasteners.InterProcessLock(
+            constants.MultiBrowser.PYAUTOGUILOCK
+        )
+        with gui_lock:
+            for key in keys:
+                pyautogui.press(key)
+                time.sleep(0.0375)
+        self.__slow_mode_pause_if_set()
+        self.loop.run_until_complete(self.page.wait())
+
+    def gui_write(self, text):
+        self.__install_pyautogui_if_missing()
+        import pyautogui
+        pyautogui = self.__get_configured_pyautogui(pyautogui)
+        gui_lock = fasteners.InterProcessLock(
+            constants.MultiBrowser.PYAUTOGUILOCK
+        )
+        with gui_lock:
+            pyautogui.write(text)
+        self.__slow_mode_pause_if_set()
+        self.loop.run_until_complete(self.page.wait())
+
     def __gui_click_x_y(self, x, y, timeframe=0.25, uc_lock=False):
         self.__install_pyautogui_if_missing()
         import pyautogui
@@ -1033,6 +1077,28 @@ class CDPMethods():
         This prevents those links from opening in a new tab."""
         self.set_attributes('[target="_blank"]', "target", "_self")
 
+    def is_checked(self, selector):
+        """Return True if checkbox (or radio button) is checked."""
+        self.find_element(selector, timeout=settings.SMALL_TIMEOUT)
+        return self.get_element_attribute(selector, "checked")
+
+    def is_selected(self, selector):
+        return self.is_checked(selector)
+
+    def check_if_unchecked(self, selector):
+        if not self.is_checked(selector):
+            self.click(selector)
+
+    def select_if_unselected(self, selector):
+        self.check_if_unchecked(selector)
+
+    def uncheck_if_checked(self, selector):
+        if self.is_checked(selector):
+            self.click(selector)
+
+    def unselect_if_selected(self, selector):
+        self.uncheck_if_checked(selector)
+
     def is_element_present(self, selector):
         try:
             self.select(selector, timeout=0.01)

{seleniumbase-4.32.7 → seleniumbase-4.32.9}/seleniumbase/fixtures/base_case.py

@@ -1884,6 +1884,8 @@ class BaseCase(unittest.TestCase):
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
         selector, by = self.__recalculate_selector(selector, by)
+        if self.__is_cdp_swap_needed():
+            return self.cdp.get_element_attribute(selector)
         self.wait_for_ready_state_complete()
         time.sleep(0.01)
         if self.__is_shadow_selector(selector):
@@ -2460,16 +2462,14 @@ class BaseCase(unittest.TestCase):
         if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
         selector, by = self.__recalculate_selector(selector, by)
+        if self.__is_cdp_swap_needed():
+            return self.cdp.is_checked(selector)
         kind = self.get_attribute(selector, "type", by=by, timeout=timeout)
         if kind != "checkbox" and kind != "radio":
             raise Exception("Expecting a checkbox or a radio button element!")
-        is_checked = self.get_attribute(
+        return self.get_attribute(
             selector, "checked", by=by, timeout=timeout, hard_fail=False
         )
-        if is_checked:
-            return True
-        else:  # (NoneType)
-            return False
 
     def is_selected(self, selector, by="css selector", timeout=None):
         """Same as is_checked()"""
@@ -2479,6 +2479,9 @@ class BaseCase(unittest.TestCase):
         """If a checkbox or radio button is not checked, will check it."""
         self.__check_scope()
         selector, by = self.__recalculate_selector(selector, by)
+        if self.__is_cdp_swap_needed():
+            self.cdp.check_if_unchecked(selector)
+            return
         if not self.is_checked(selector, by=by):
             if self.is_element_visible(selector, by=by):
                 self.click(selector, by=by)
@@ -2515,6 +2518,9 @@ class BaseCase(unittest.TestCase):
         """If a checkbox is checked, will uncheck it."""
         self.__check_scope()
         selector, by = self.__recalculate_selector(selector, by)
+        if self.__is_cdp_swap_needed():
+            self.cdp.uncheck_if_checked(selector)
+            return
         if self.is_checked(selector, by=by):
             if self.is_element_visible(selector, by=by):
                 self.click(selector, by=by)
@@ -6087,6 +6093,9 @@ class BaseCase(unittest.TestCase):
             timeout = settings.SMALL_TIMEOUT
         if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
+        if self.__is_cdp_swap_needed():
+            self.cdp.scroll_into_view(selector)
+            return
         if self.demo_mode or self.slow_mode:
             self.slow_scroll_to(selector, by=by, timeout=timeout)
             return

{seleniumbase-4.32.7 → seleniumbase-4.32.9}/seleniumbase/plugins/driver_manager.py

@@ -550,11 +550,7 @@ def Driver(
         or uc_sub
     ):
         undetectable = True
-    if (
-        (undetectable or undetected or uc)
-        and (uc_subprocess is None)
-        and (uc_sub is None)
-    ):
+    if undetectable or undetected or uc:
         uc_subprocess = True  # Use UC as a subprocess by default.
     elif (
         "--undetectable" in sys_argv

{seleniumbase-4.32.7 → seleniumbase-4.32.9}/seleniumbase/plugins/sb_manager.py

@@ -608,11 +608,7 @@ def SB(
         or uc_sub
     ):
         undetectable = True
-    if (
-        (undetectable or undetected or uc)
-        and (uc_subprocess is None)
-        and (uc_sub is None)
-    ):
+    if undetectable or undetected or uc:
         uc_subprocess = True  # Use UC as a subprocess by default.
     elif (
         "--undetectable" in sys_argv

{seleniumbase-4.32.7 → seleniumbase-4.32.9}/seleniumbase/undetected/cdp_driver/connection.py

@@ -18,6 +18,7 @@ from typing import (
     TypeVar,
 )
 import websockets
+from websockets.protocol import State
 from . import cdp_util as util
 import mycdp as cdp
 import mycdp.network
@@ -261,7 +262,7 @@ class Connection(metaclass=CantTouchThis):
         """
         Opens the websocket connection. Shouldn't be called manually by users.
         """
-        if not self.websocket or self.websocket.closed:
+        if not self.websocket or self.websocket.state is State.CLOSED:
             try:
                 self.websocket = await websockets.connect(
                     self.websocket_url,
@@ -288,7 +289,7 @@ class Connection(metaclass=CantTouchThis):
         """
         Closes the websocket connection. Shouldn't be called manually by users.
         """
-        if self.websocket and not self.websocket.closed:
+        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()
@@ -393,7 +394,7 @@ class Connection(metaclass=CantTouchThis):
             when multiple calls to connection.send() are made.
         """
         await self.aopen()
-        if not self.websocket or self.closed:
+        if not self.websocket or self.websocket.state is State.CLOSED:
             return
         if self._owner:
             browser = self._owner

{seleniumbase-4.32.7 → seleniumbase-4.32.9/seleniumbase.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.32.7
+Version: 4.32.9
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -60,14 +60,15 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pip>=24.2
-Requires-Dist: packaging>=24.1
+Requires-Dist: packaging>=24.2
 Requires-Dist: setuptools~=70.2; python_version < "3.10"
 Requires-Dist: setuptools>=73.0.1; python_version >= "3.10"
-Requires-Dist: wheel>=0.44.0
+Requires-Dist: wheel>=0.45.0
 Requires-Dist: attrs>=24.2.0
 Requires-Dist: certifi>=2024.8.30
 Requires-Dist: exceptiongroup>=1.2.2
-Requires-Dist: websockets>=13.1
+Requires-Dist: websockets~=13.1; python_version < "3.9"
+Requires-Dist: websockets>=14.0; python_version >= "3.9"
 Requires-Dist: filelock>=3.16.1
 Requires-Dist: fasteners>=0.19
 Requires-Dist: mycdp>=1.0.1
@@ -83,7 +84,7 @@ Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: pygments>=2.18.0
 Requires-Dist: pyreadline3>=3.5.3; platform_system == "Windows"
 Requires-Dist: tabcompleter>=1.4.0
-Requires-Dist: pdbp>=1.6.0
+Requires-Dist: pdbp>=1.6.1
 Requires-Dist: idna==3.10
 Requires-Dist: chardet==5.2.0
 Requires-Dist: charset-normalizer==3.4.0

{seleniumbase-4.32.7 → seleniumbase-4.32.9}/seleniumbase.egg-info/requires.txt

@@ -1,10 +1,9 @@
 pip>=24.2
-packaging>=24.1
-wheel>=0.44.0
+packaging>=24.2
+wheel>=0.45.0
 attrs>=24.2.0
 certifi>=2024.8.30
 exceptiongroup>=1.2.2
-websockets>=13.1
 filelock>=3.16.1
 fasteners>=0.19
 mycdp>=1.0.1
@@ -19,7 +18,7 @@ colorama>=0.4.6
 pyyaml>=6.0.2
 pygments>=2.18.0
 tabcompleter>=1.4.0
-pdbp>=1.6.0
+pdbp>=1.6.1
 idna==3.10
 chardet==5.2.0
 charset-normalizer==3.4.0
@@ -63,10 +62,16 @@ pyreadline3>=3.5.3
 setuptools~=70.2
 urllib3<2,>=1.26.20
 
+[:python_version < "3.9"]
+websockets~=13.1
+
 [:python_version >= "3.10"]
 setuptools>=73.0.1
 urllib3<2.3.0,>=1.26.20
 
+[:python_version >= "3.9"]
+websockets>=14.0
+
 [allure]
 allure-pytest>=2.13.5
 allure-python-commons>=2.13.5

{seleniumbase-4.32.7 → seleniumbase-4.32.9}/setup.py

@@ -148,14 +148,15 @@ setup(
     python_requires=">=3.8",
     install_requires=[
         'pip>=24.2',
-        'packaging>=24.1',
+        'packaging>=24.2',
         'setuptools~=70.2;python_version<"3.10"',  # Newer ones had issues
         'setuptools>=73.0.1;python_version>="3.10"',
-        'wheel>=0.44.0',
+        'wheel>=0.45.0',
         'attrs>=24.2.0',
         "certifi>=2024.8.30",
         "exceptiongroup>=1.2.2",
-        "websockets>=13.1",
+        'websockets~=13.1;python_version<"3.9"',
+        'websockets>=14.0;python_version>="3.9"',
         'filelock>=3.16.1',
         'fasteners>=0.19',
         "mycdp>=1.0.1",
@@ -171,7 +172,7 @@ setup(
         'pygments>=2.18.0',
         'pyreadline3>=3.5.3;platform_system=="Windows"',
         "tabcompleter>=1.4.0",
-        "pdbp>=1.6.0",
+        "pdbp>=1.6.1",
         "idna==3.10",
         'chardet==5.2.0',
         'charset-normalizer==3.4.0',