seleniumbase 4.37.0__py3-none-any.whl → 4.37.2__py3-none-any.whl

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.37.0"
+__version__ = "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/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/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/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/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.dist-info → seleniumbase-4.37.2.dist-info}/METADATA

@@ -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.dist-info → seleniumbase-4.37.2.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=J_HDtEiBkGrN81ocR5L4AYXX49RgGi_q8-G86KRisyY,46
+seleniumbase/__version__.py,sha256=Vmyu1nrXKb5h1xNjtD4ZvuGS53Y5AVtMxP5LqAt56mM,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
@@ -36,7 +36,7 @@ seleniumbase/console_scripts/sb_print.py,sha256=tNy-bMDgwHJO3bZxMpmo9weSE8uhbH0C
 seleniumbase/console_scripts/sb_recorder.py,sha256=fnHb5-kh11Hit-E9Ha-e4QXzqLcZvtij6mb5qNd4B1Q,11032
 seleniumbase/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 seleniumbase/core/application_manager.py,sha256=e_0sjtI8cjY5BNyZj1QBR0j6_oCScxGmSXYEpcYwuZE,576
-seleniumbase/core/browser_launcher.py,sha256=03_IFgsO1jBqFF2NeUouL5iMK0DlpwbZY_OKuwW7iYA,239734
+seleniumbase/core/browser_launcher.py,sha256=H8CVjbO6M43op-sCNakek8NYBdZnc3FC1ekGtj-I6oI,239787
 seleniumbase/core/capabilities_parser.py,sha256=meIS2uHapTCq2ldfNAToC7r0cKmZDRXuYNKExM1GHDY,6038
 seleniumbase/core/colored_traceback.py,sha256=DrRWfg7XEnKcgY59Xj7Jdk09H-XqHYBSUpB-DiZt6iY,2020
 seleniumbase/core/create_db_tables.sql,sha256=VWPtrdiW_HQ6yETHjqTu-VIrTwvd8I8o1NfBeaVSHpU,972
@@ -50,7 +50,7 @@ seleniumbase/core/proxy_helper.py,sha256=4VkpMwavz0fx8wcOqJ_jyBT0HIXwcxmAcpd1gjJ
 seleniumbase/core/recorder_helper.py,sha256=fNGjbapXmEsht54x1o6Igk198QdnPxDDnjUOzQxNhNQ,25055
 seleniumbase/core/report_helper.py,sha256=AIl6Qava2yW1uSzbLpJBlPlYDz0KE-rVhogh8hsGWBo,12201
 seleniumbase/core/s3_manager.py,sha256=z_4qx2jI_gtK5r3niGXgEOBpfMUicUCOciowai50MP4,3529
-seleniumbase/core/sb_cdp.py,sha256=Wy1ypcFfN4V5dDUbwjw22K6zOE2HczPlN5BFdBhUl6E,85718
+seleniumbase/core/sb_cdp.py,sha256=L7b7kquCIh-pI7vjAi2pE9Z8WAMoTSP99M3zVKKYVSE,86412
 seleniumbase/core/sb_driver.py,sha256=yvTDRblBzG6bDX7XcLiAA6QcBelSJj_HHL_04lcfeeE,13760
 seleniumbase/core/session_helper.py,sha256=s9zD3PVZEWVzG2h81cCUskbNWLfdjC_LwwQjKptHCak,558
 seleniumbase/core/settings_parser.py,sha256=gqVohHVlE_5L5Cqe2L24uYrRzvoK-saX8E_Df7_-_3I,7609
@@ -65,7 +65,7 @@ seleniumbase/extensions/disable_csp.zip,sha256=5RvomXnm2PdivUVcxTV6jfvD8WhTEsQYH
 seleniumbase/extensions/recorder.zip,sha256=OOyzF-Ize2cSRu1CqhzSAq5vusI9hqLLd2OIApUHesI,11918
 seleniumbase/extensions/sbase_ext.zip,sha256=3s1N8zrVaMz8RQEOIoBzC3KDjtmHwVZRvVsX25Odr_s,8175
 seleniumbase/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-seleniumbase/fixtures/base_case.py,sha256=xkdMH172rqMbdW9Y7foBXrb5SxwpFAbwBmmi4Y4QuaU,725334
+seleniumbase/fixtures/base_case.py,sha256=tv65GtPheFm9T2B2VtGP8ooDRejOtyAizcICYw7I_GY,725685
 seleniumbase/fixtures/constants.py,sha256=WMrItuNyKq3XVJ64NluLIRc4gJCxDw8K8qXED0b9S2w,13752
 seleniumbase/fixtures/css_to_xpath.py,sha256=9ouDB1xl4MJ2os6JOgTIAyHKOQfuxtxvXC3O5hSnEKA,1954
 seleniumbase/fixtures/errors.py,sha256=KyxuEVx_e3MPhVrJfNIa_3ltMpbCFxfy_jxK8RFNTns,555
@@ -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=IjjcNzpv-NZVGQb1SL2BGAUFowwkhfjZ_1l1pKDsjYk,24871
+seleniumbase/undetected/__init__.py,sha256=xvbUlPJEF7nAkdy9bxca5W-ltX6cI38lMyJGwVetPPM,26230
 seleniumbase/undetected/cdp.py,sha256=RLpwZnhUvmK9tgXcZIBBQedwk2q7Jj_EXZkmzI8WUqk,4023
 seleniumbase/undetected/dprocess.py,sha256=83EV8ZHJWHG1TSUv9JNClBhdgiBXlkCc6mJ--HsoP3k,1681
 seleniumbase/undetected/options.py,sha256=BoNuwhrG7oOvuLvTwkvsWCF36pMkS1tHCG-XpP4_EkI,3001
@@ -116,7 +116,7 @@ seleniumbase/undetected/webelement.py,sha256=OOpUYbEiOG52KsYYyuDW9tYLdA2SMnukvwQ
 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=6-0-Dq_dFAOXQ5_a58i9y93zRqWUrjWoy6Pf_xBoveE,21648
+seleniumbase/undetected/cdp_driver/cdp_util.py,sha256=oKUEHx220PEFvHLW4dz18i4j1Q6HPTdkKx9QOKAVZ3I,21821
 seleniumbase/undetected/cdp_driver/config.py,sha256=t8KV1Vqa5SQRBq3-gjkHHmj9h85AplAM01asO3AWufs,12507
 seleniumbase/undetected/cdp_driver/connection.py,sha256=_ounWzQ1m3_t-zJVgOAU2RINiKphfJkw2Qbu-zIoHC0,23359
 seleniumbase/undetected/cdp_driver/element.py,sha256=FIC6v7OmumLCT-_vIc3H4oju_oBbaLpWJUJIKm2c_q4,40467
@@ -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.0.dist-info/licenses/LICENSE,sha256=BRblZsX7HyPUjQmYTiyWr_e9tzWvmR3R4SFclM2R3W0,1085
-seleniumbase-4.37.0.dist-info/METADATA,sha256=RIyY0AmFDly0qaqXpVaYwKSwYsa_-DL7PIkl_vQyyck,86879
-seleniumbase-4.37.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-seleniumbase-4.37.0.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
-seleniumbase-4.37.0.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
-seleniumbase-4.37.0.dist-info/RECORD,,
+seleniumbase-4.37.2.dist-info/licenses/LICENSE,sha256=BRblZsX7HyPUjQmYTiyWr_e9tzWvmR3R4SFclM2R3W0,1085
+seleniumbase-4.37.2.dist-info/METADATA,sha256=EccEGDheFz8nOIVDlmy7PSFeMeU6F6Uk6L-PJksB9dE,86879
+seleniumbase-4.37.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+seleniumbase-4.37.2.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
+seleniumbase-4.37.2.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
+seleniumbase-4.37.2.dist-info/RECORD,,