seleniumbase 4.37.0__tar.gz → 4.37.2__tar.gz

{seleniumbase-4.37.0/seleniumbase.egg-info → seleniumbase-4.37.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seleniumbase
-Version: 4.37.0
+Version: 4.37.2
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -76,7 +76,7 @@ Requires-Dist: mycdp>=1.1.1
 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"
-Requires-Dist: typing-extensions>=4.13.1
+Requires-Dist: typing-extensions>=4.13.2
 Requires-Dist: sbvirtualdisplay>=1.4.0
 Requires-Dist: MarkupSafe==2.1.5; python_version < "3.9"
 Requires-Dist: MarkupSafe>=3.0.2; python_version >= "3.9"
@@ -94,7 +94,7 @@ Requires-Dist: idna==3.10
 Requires-Dist: chardet==5.2.0
 Requires-Dist: charset-normalizer==3.4.1
 Requires-Dist: urllib3<2,>=1.26.20; python_version < "3.10"
-Requires-Dist: urllib3<2.4.0,>=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

{seleniumbase-4.37.0 → seleniumbase-4.37.2}/requirements.txt

@@ -15,7 +15,7 @@ mycdp>=1.1.1
 pynose>=1.5.4
 platformdirs>=4.3.6;python_version<"3.9"
 platformdirs>=4.3.7;python_version>="3.9"
-typing-extensions>=4.13.1
+typing-extensions>=4.13.2
 sbvirtualdisplay>=1.4.0
 MarkupSafe==2.1.5;python_version<"3.9"
 MarkupSafe>=3.0.2;python_version>="3.9"
@@ -33,7 +33,7 @@ idna==3.10
 chardet==5.2.0
 charset-normalizer==3.4.1
 urllib3>=1.26.20,<2;python_version<"3.10"
-urllib3>=1.26.20,<2.4.0;python_version>="3.10"
+urllib3>=1.26.20,<2.5.0;python_version>="3.10"
 requests==2.32.3
 sniffio==1.3.1
 h11==0.14.0

{seleniumbase-4.37.0 → seleniumbase-4.37.2}/seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.37.0"
+__version__ = "4.37.2"

{seleniumbase-4.37.0 → seleniumbase-4.37.2}/seleniumbase/core/browser_launcher.py

@@ -682,6 +682,7 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.gui_click_element = CDPM.gui_click_element
     cdp.gui_drag_drop_points = CDPM.gui_drag_drop_points
     cdp.gui_drag_and_drop = CDPM.gui_drag_and_drop
+    cdp.gui_click_and_hold = CDPM.gui_click_and_hold
     cdp.gui_hover_x_y = CDPM.gui_hover_x_y
     cdp.gui_hover_element = CDPM.gui_hover_element
     cdp.gui_hover_and_click = CDPM.gui_hover_and_click

{seleniumbase-4.37.0 → seleniumbase-4.37.2}/seleniumbase/core/sb_cdp.py

@@ -1227,15 +1227,23 @@ class CDPMethods():
         if not timeout:
             timeout = settings.SMALL_TIMEOUT
         selector = self.__convert_to_css_if_xpath(selector)
-        self.select(selector, timeout=timeout)
+        element = self.select(selector, timeout=timeout)
         self.__add_light_pause()
-        coordinates = self.loop.run_until_complete(
-            self.page.js_dumps(
-                """document.querySelector"""
-                """('%s').getBoundingClientRect()"""
-                % js_utils.escape_quotes_if_needed(re.escape(selector))
+        coordinates = None
+        if ":contains(" in selector:
+            position = element.get_position()
+            x = position.x
+            y = position.y
+            width = position.width
+            height = position.height
+            coordinates = {"x": x, "y": y, "width": width, "height": height}
+        else:
+            coordinates = self.loop.run_until_complete(
+                self.page.js_dumps(
+                    """document.querySelector('%s').getBoundingClientRect()"""
+                    % js_utils.escape_quotes_if_needed(re.escape(selector))
+                )
             )
-        )
         return coordinates
 
     def get_element_size(self, selector, timeout=None):
@@ -1665,6 +1673,14 @@ class CDPMethods():
         self.__add_light_pause()
         self.gui_drag_drop_points(x1, y1, x2, y2, timeframe=timeframe)
 
+    def gui_click_and_hold(self, selector, timeframe=0.35):
+        """Use PyAutoGUI to click-and-hold a selector."""
+        self.__slow_mode_pause_if_set()
+        self.bring_active_window_to_front()
+        x, y = self.get_gui_element_center(selector)
+        self.__add_light_pause()
+        self.gui_drag_drop_points(x, y, x, y, timeframe=timeframe)
+
     def __gui_hover_x_y(self, x, y, timeframe=0.25, uc_lock=False):
         self.__install_pyautogui_if_missing()
         import pyautogui

{seleniumbase-4.37.0 → seleniumbase-4.37.2}/seleniumbase/fixtures/base_case.py

@@ -4871,6 +4871,13 @@ class BaseCase(unittest.TestCase):
 
     def activate_cdp_mode(self, url=None):
         if hasattr(self.driver, "_is_using_uc") and self.driver._is_using_uc:
+            if self.__is_cdp_swap_needed():
+                return  # CDP Mode is already active
+            if not self.is_connected():
+                self.driver.connect()
+            current_url = self.get_current_url()
+            if not current_url.startswith(("about", "data", "chrome")):
+                self.get_new_driver(undetectable=True)
             self.driver.uc_open_with_cdp_mode(url)
         else:
             self.get_new_driver(undetectable=True)

{seleniumbase-4.37.0 → seleniumbase-4.37.2}/seleniumbase/undetected/__init__.py

@@ -441,7 +441,13 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
             with suppress(Exception):
                 if self.service.is_connectable():
                     self.stop_client()
-                    self.service.stop()
+                    try:
+                        self.service.send_remote_shutdown_command()
+                    except TypeError:
+                        pass
+                    finally:
+                        with suppress(Exception):
+                            self.service._terminate_process()
             if isinstance(timeout, str):
                 if timeout.lower() == "breakpoint":
                     breakpoint()  # To continue:
@@ -466,7 +472,13 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
                         self.close()
                     if self.service.is_connectable():
                         self.stop_client()
-                        self.service.stop()
+                        try:
+                            self.service.send_remote_shutdown_command()
+                        except TypeError:
+                            pass
+                        finally:
+                            with suppress(Exception):
+                                self.service._terminate_process()
                     self.service.start()
                     self.start_session()
                     time.sleep(0.003)
@@ -482,7 +494,13 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
                 if self.service.is_connectable():
                     self.stop_client()
                     time.sleep(0.003)
-                    self.service.stop()
+                    try:
+                        self.service.send_remote_shutdown_command()
+                    except TypeError:
+                        pass
+                    finally:
+                        with suppress(Exception):
+                            self.service._terminate_process()
         self._is_connected = False
 
     def connect(self):
@@ -507,7 +525,13 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
                         self.close()
                     if self.service.is_connectable():
                         self.stop_client()
-                        self.service.stop()
+                        try:
+                            self.service.send_remote_shutdown_command()
+                        except TypeError:
+                            pass
+                        finally:
+                            with suppress(Exception):
+                                self.service._terminate_process()
                     self.service.start()
                     self.start_session()
                     time.sleep(0.003)
@@ -539,7 +563,13 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
             logger.debug("Stopping webdriver service")
             with suppress(Exception):
                 self.stop_client()
-                self.service.stop()
+                try:
+                    self.service.send_remote_shutdown_command()
+                except TypeError:
+                    pass
+                finally:
+                    with suppress(Exception):
+                        self.service._terminate_process()
         with suppress(Exception):
             if self.reactor and isinstance(self.reactor, Reactor):
                 logger.debug("Shutting down Reactor")

{seleniumbase-4.37.0 → seleniumbase-4.37.2}/seleniumbase/undetected/cdp_driver/cdp_util.py

@@ -406,7 +406,13 @@ async def create_from_driver(driver) -> Browser:
     browser = await start(conf)
     browser._process_pid = driver.browser_pid
     # Stop chromedriver binary
-    driver.service.stop()
+    try:
+        driver.service.send_remote_shutdown_command()
+    except TypeError:
+        pass
+    finally:
+        with suppress(Exception):
+            driver.service._terminate_process()
     driver.browser_pid = -1
     driver.user_data_dir = None
     return browser

{seleniumbase-4.37.0 → seleniumbase-4.37.2/seleniumbase.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seleniumbase
-Version: 4.37.0
+Version: 4.37.2
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -76,7 +76,7 @@ Requires-Dist: mycdp>=1.1.1
 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"
-Requires-Dist: typing-extensions>=4.13.1
+Requires-Dist: typing-extensions>=4.13.2
 Requires-Dist: sbvirtualdisplay>=1.4.0
 Requires-Dist: MarkupSafe==2.1.5; python_version < "3.9"
 Requires-Dist: MarkupSafe>=3.0.2; python_version >= "3.9"
@@ -94,7 +94,7 @@ Requires-Dist: idna==3.10
 Requires-Dist: chardet==5.2.0
 Requires-Dist: charset-normalizer==3.4.1
 Requires-Dist: urllib3<2,>=1.26.20; python_version < "3.10"
-Requires-Dist: urllib3<2.4.0,>=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

{seleniumbase-4.37.0 → seleniumbase-4.37.2}/seleniumbase.egg-info/requires.txt

@@ -7,7 +7,7 @@ exceptiongroup>=1.2.2
 fasteners>=0.19
 mycdp>=1.1.1
 pynose>=1.5.4
-typing-extensions>=4.13.1
+typing-extensions>=4.13.2
 sbvirtualdisplay>=1.4.0
 Jinja2>=3.1.6
 six>=1.17.0
@@ -68,7 +68,7 @@ pytest-rerunfailures==14.0
 
 [:python_version >= "3.10"]
 setuptools>=78.1.0
-urllib3<2.4.0,>=1.26.20
+urllib3<2.5.0,>=1.26.20
 
 [:python_version >= "3.9"]
 websockets>=15.0.1

{seleniumbase-4.37.0 → seleniumbase-4.37.2}/setup.py

@@ -164,7 +164,7 @@ setup(
         "pynose>=1.5.4",
         'platformdirs>=4.3.6;python_version<"3.9"',
         'platformdirs>=4.3.7;python_version>="3.9"',
-        'typing-extensions>=4.13.1',
+        'typing-extensions>=4.13.2',
         "sbvirtualdisplay>=1.4.0",
         'MarkupSafe==2.1.5;python_version<"3.9"',
         'MarkupSafe>=3.0.2;python_version>="3.9"',
@@ -182,7 +182,7 @@ setup(
         'chardet==5.2.0',
         'charset-normalizer==3.4.1',
         'urllib3>=1.26.20,<2;python_version<"3.10"',
-        'urllib3>=1.26.20,<2.4.0;python_version>="3.10"',
+        'urllib3>=1.26.20,<2.5.0;python_version>="3.10"',
         'requests==2.32.3',
         'sniffio==1.3.1',
         'h11==0.14.0',