seleniumbase 4.44.1__tar.gz → 4.44.2__tar.gz

{seleniumbase-4.44.1/seleniumbase.egg-info → seleniumbase-4.44.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seleniumbase
-Version: 4.44.1
+Version: 4.44.2
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz

{seleniumbase-4.44.1 → seleniumbase-4.44.2}/seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.44.1"
+__version__ = "4.44.2"

{seleniumbase-4.44.1 → seleniumbase-4.44.2}/seleniumbase/core/browser_launcher.py

@@ -764,6 +764,7 @@ def uc_open_with_cdp_mode(driver, url=None, **kwargs):
     cdp.click_active_element = CDPM.click_active_element
     cdp.click_if_visible = CDPM.click_if_visible
     cdp.click_visible_elements = CDPM.click_visible_elements
+    cdp.click_with_offset = CDPM.click_with_offset
     cdp.mouse_click = CDPM.mouse_click
     cdp.get_parent = CDPM.get_parent
     cdp.remove_element = CDPM.remove_element
@@ -793,11 +794,13 @@ def uc_open_with_cdp_mode(driver, url=None, **kwargs):
     cdp.set_attributes = CDPM.set_attributes
     cdp.is_attribute_present = CDPM.is_attribute_present
     cdp.is_online = CDPM.is_online
+    cdp.solve_captcha = CDPM.solve_captcha
     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.gui_click_with_offset = CDPM.gui_click_with_offset
     cdp.gui_click_captcha = CDPM.gui_click_captcha
     cdp.gui_drag_drop_points = CDPM.gui_drag_drop_points
     cdp.gui_drag_and_drop = CDPM.gui_drag_and_drop

{seleniumbase-4.44.1 → seleniumbase-4.44.2}/seleniumbase/core/sb_cdp.py

@@ -64,6 +64,11 @@ class CDPMethods():
         )
         element.highlight_overlay = lambda: self.__highlight_overlay(element)
         element.mouse_click = lambda: self.__mouse_click(element)
+        element.click_with_offset = (
+            lambda *args, **kwargs: self.__mouse_click_with_offset_async(
+                element, *args, **kwargs
+            )
+        )
         element.mouse_drag = (
             lambda destination: self.__mouse_drag(element, destination)
         )
@@ -447,6 +452,15 @@ class CDPMethods():
         self.loop.run_until_complete(self.page.wait())
         return result
 
+    def __mouse_click_with_offset_async(self, element, *args, **kwargs):
+        result = (
+            self.loop.run_until_complete(
+                element.mouse_click_with_offset_async(*args, **kwargs)
+            )
+        )
+        self.loop.run_until_complete(self.page.wait())
+        return result
+
     def __mouse_drag(self, element, destination):
         return (
             self.loop.run_until_complete(element.mouse_drag_async(destination))
@@ -689,10 +703,16 @@ class CDPMethods():
         self.__slow_mode_pause_if_set()
         element = self.find_element(selector, timeout=timeout)
         element.scroll_into_view()
-        if element.tag_name == "div" or element.tag_name == "input":
-            element.mouse_click()  # Simulated click (not PyAutoGUI)
+        tag_name = element.tag_name
+        if tag_name:
+            tag_name = tag_name.lower().strip()
+        if (
+            tag_name in ["a", "button", "canvas", "div", "input", "li", "span"]
+            and "contains(" not in selector
+        ):
+            element.mouse_click()  # Simulated click (NOT PyAutoGUI)
         else:
-            element.click()
+            element.click()  # Standard CDP click
         self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.wait())
 
@@ -738,7 +758,7 @@ class CDPMethods():
                     element.scroll_into_view()
                     element.click()
                     click_count += 1
-                    time.sleep(0.042)
+                    time.sleep(0.044)
                     self.__slow_mode_pause_if_set()
                     self.loop.run_until_complete(self.page.wait())
             except Exception:
@@ -1757,11 +1777,32 @@ class CDPMethods():
         self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.wait())
 
-    def _on_a_cf_turnstile_page(self):
-        time.sleep(0.042)
-        source = self.get_page_source()
+    def gui_click_with_offset(
+        self, selector, x, y, timeframe=0.25, center=False
+    ):
+        """Click an element at an {X,Y}-offset location.
+        {0,0} is the top-left corner of the element.
+        If center==True, {0,0} becomes the center of the element.
+        The timeframe is the time spent moving the mouse."""
+        if center:
+            px, py = self.get_gui_element_center(selector)
+            self.gui_click_x_y(px + x, py + y, timeframe=timeframe)
+        else:
+            element_rect = self.get_gui_element_rect(selector)
+            px = element_rect["x"]
+            py = element_rect["y"]
+            self.gui_click_x_y(px + x, py + y, timeframe=timeframe)
+
+    def click_with_offset(self, selector, x, y, center=False):
+        element = self.find_element(selector)
+        element.scroll_into_view()
+        element.click_with_offset(x=x, y=y, center=center)
+        self.__slow_mode_pause_if_set()
+        self.loop.run_until_complete(self.page.wait())
+
+    def _on_a_cf_turnstile_page(self, source=None):
         if not source or len(source) < 400:
-            time.sleep(0.22)
+            time.sleep(0.2)
             source = self.get_page_source()
         if (
             'data-callback="onCaptchaSuccess"' in source
@@ -1773,20 +1814,21 @@ class CDPMethods():
             return True
         return False
 
-    def _on_a_g_recaptcha_page(self):
-        time.sleep(0.042)
-        source = self.get_page_source()
+    def _on_a_g_recaptcha_page(self, source=None):
         if not source or len(source) < 400:
-            time.sleep(0.22)
+            time.sleep(0.2)
             source = self.get_page_source()
         if (
             'id="recaptcha-token"' in source
             or 'title="reCAPTCHA"' in source
         ):
             return True
+        elif "/recaptcha/api.js" in source:
+            time.sleep(1.6)  # Still loading
+            return True
         return False
 
-    def __gui_click_recaptcha(self):
+    def __gui_click_recaptcha(self, use_cdp=False):
         selector = None
         if self.is_element_visible('iframe[title="reCAPTCHA"]'):
             selector = 'iframe[title="reCAPTCHA"]'
@@ -1797,19 +1839,39 @@ class CDPMethods():
             element_rect = self.get_gui_element_rect(selector, timeout=1)
             e_x = element_rect["x"]
             e_y = element_rect["y"]
-            x = e_x + 29
-            y = e_y + 35
+            x_offset = 26
+            y_offset = 35
+            if shared_utils.is_windows():
+                x_offset = 29
+            x = e_x + x_offset
+            y = e_y + y_offset
             sb_config._saved_cf_x_y = (x, y)
             time.sleep(0.08)
-            self.gui_click_x_y(x, y)
+            if use_cdp:
+                self.sleep(0.03)
+                gui_lock = FileLock(constants.MultiBrowser.PYAUTOGUILOCK)
+                with gui_lock:  # Prevent issues with multiple processes
+                    self.bring_active_window_to_front()
+                    time.sleep(0.056)
+                    self.click_with_offset(selector, x_offset, y_offset)
+                    time.sleep(0.056)
+            else:
+                self.gui_click_x_y(x, y)
+
+    def solve_captcha(self):
+        self.__click_captcha(use_cdp=True)
 
     def gui_click_captcha(self):
-        if self._on_a_cf_turnstile_page():
-            pass
-        elif self._on_a_g_recaptcha_page():
-            self.__gui_click_recaptcha()
+        self.__click_captcha(use_cdp=False)
+
+    def __click_captcha(self, use_cdp=False):
+        """Uses PyAutoGUI unless use_cdp == True"""
+        self.sleep(0.056)
+        source = self.get_page_source()
+        if self._on_a_g_recaptcha_page(source):
+            self.__gui_click_recaptcha(use_cdp)
             return
-        else:
+        elif not self._on_a_cf_turnstile_page(source):
             return
         selector = None
         if (
@@ -1970,14 +2032,24 @@ class CDPMethods():
             element_rect = self.get_gui_element_rect(selector, timeout=1)
             e_x = element_rect["x"]
             e_y = element_rect["y"]
-            x = e_x + 32
-            if not shared_utils.is_windows():
-                y = e_y + 32
-            else:
-                y = e_y + 28
+            x_offset = 32
+            y_offset = 32
+            if shared_utils.is_windows():
+                y_offset = 28
+            x = e_x + x_offset
+            y = e_y + y_offset
             sb_config._saved_cf_x_y = (x, y)
             time.sleep(0.08)
-            self.gui_click_x_y(x, y)
+            if use_cdp:
+                self.sleep(0.03)
+                gui_lock = FileLock(constants.MultiBrowser.PYAUTOGUILOCK)
+                with gui_lock:  # Prevent issues with multiple processes
+                    self.bring_active_window_to_front()
+                    time.sleep(0.056)
+                    self.click_with_offset(selector, x_offset, y_offset)
+                    time.sleep(0.056)
+            else:
+                self.gui_click_x_y(x, y)
 
     def __gui_drag_drop(self, x1, y1, x2, y2, timeframe=0.25, uc_lock=False):
         self.__install_pyautogui_if_missing()

{seleniumbase-4.44.1 → seleniumbase-4.44.2}/seleniumbase/fixtures/base_case.py

@@ -5008,6 +5008,9 @@ class BaseCase(unittest.TestCase):
             self.get_new_driver(undetectable=True)
             self.driver.uc_open_with_cdp_mode(url, **kwargs)
         self.cdp = self.driver.cdp
+        if hasattr(self.cdp, "solve_captcha"):
+            self.solve_captcha = self.cdp.solve_captcha
+        self.undetectable = True
 
     def activate_recorder(self):
         """Activate Recorder Mode on the current tab/window.
@@ -11452,6 +11455,7 @@ class BaseCase(unittest.TestCase):
         if cdp_swap_needed:
             if not self.cdp:
                 self.cdp = self.driver.cdp
+                self.undetectable = True
             return True
         else:
             return False
@@ -13970,6 +13974,9 @@ class BaseCase(unittest.TestCase):
         timeout=None,
         center=None,
     ):
+        if self.__is_cdp_swap_needed():
+            self.cdp.click_with_offset(selector, x, y, center=center)
+            return
         self.wait_for_ready_state_complete()
         if self.__needs_minimum_wait():
             time.sleep(0.14)

{seleniumbase-4.44.1 → seleniumbase-4.44.2}/seleniumbase/undetected/cdp_driver/connection.py

@@ -7,7 +7,6 @@ import json
 import logging
 import sys
 import types
-from asyncio import iscoroutine, iscoroutinefunction
 from typing import (
     Optional,
     Generator,
@@ -666,8 +665,8 @@ class Listener:
                     for callback in callbacks:
                         try:
                             if (
-                                iscoroutinefunction(callback)
-                                or iscoroutine(callback)
+                                inspect.iscoroutinefunction(callback)
+                                or inspect.iscoroutine(callback)
                             ):
                                 try:
                                     await callback(event, self.connection)

{seleniumbase-4.44.1 → seleniumbase-4.44.2}/seleniumbase/undetected/cdp_driver/element.py

@@ -484,17 +484,14 @@ class Element:
         buttons: typing.Optional[int] = 1,
         modifiers: typing.Optional[int] = 0,
         hold: bool = False,
-        _until_event: typing.Optional[type] = None,
     ):
         """
         Native click (on element).
-        Note: This likely does not work at the moment. Use click() instead.
         :param button: str (default = "left")
         :param buttons: which button (default 1 = left)
         :param modifiers: *(Optional)*
                 Bit field representing pressed modifier keys.
                 Alt=1, Ctrl=2, Meta/Command=4, Shift=8 (default: 0).
-        :param _until_event: Internal. Event to wait for before returning.
         """
         try:
             center = (await self.get_position_async()).center
@@ -505,6 +502,7 @@ class Element:
             return
         logger.debug("Clicking on location: %.2f, %.2f" % center)
         await asyncio.gather(
+            self.flash_async(0.25),
             self._tab.send(
                 cdp.input_.dispatch_mouse_event(
                     "mousePressed",
@@ -528,10 +526,66 @@ class Element:
                 )
             ),
         )
+
+    async def mouse_click_with_offset_async(
+        self,
+        x: typing.Union[float, int],
+        y: typing.Union[float, int],
+        center: bool = False,
+        button: str = "left",
+        buttons: typing.Optional[int] = 1,
+        modifiers: typing.Optional[int] = 0,
+    ):
+        x_offset = int(x)
+        y_offset = int(y)
         try:
-            await self.flash_async()
-        except BaseException:
-            pass
+            position = (await self.get_position_async())
+            width = position.width
+            height = position.height
+            x_pos = position.left
+            y_pos = position.top
+            center_pos = (await self.get_position_async()).center
+        except AttributeError:
+            return
+        if not center_pos:
+            logger.warning("Could not calculate box model for %s", self)
+            return
+        if center:
+            x_pos = center_pos[0]
+            y_pos = center_pos[1]
+            width = 0
+            height = 0
+            logger.debug("Clicking on location: %.2f, %.2f" % center_pos)
+        else:
+            logger.debug("Clicking on location: %.2f, %.2f" % (x_pos, y_pos))
+        await asyncio.gather(
+            self.flash_async(
+                x_offset=x_offset - int(width / 2),
+                y_offset=y_offset - int(height / 2),
+            ),
+            self._tab.send(
+                cdp.input_.dispatch_mouse_event(
+                    "mousePressed",
+                    x=x_pos + x_offset,
+                    y=y_pos + y_offset,
+                    modifiers=modifiers,
+                    button=cdp.input_.MouseButton(button),
+                    buttons=buttons,
+                    click_count=1,
+                )
+            ),
+            self._tab.send(
+                cdp.input_.dispatch_mouse_event(
+                    "mouseReleased",
+                    x=x_pos + x_offset,
+                    y=y_pos + y_offset,
+                    modifiers=modifiers,
+                    button=cdp.input_.MouseButton(button),
+                    buttons=buttons,
+                    click_count=1,
+                )
+            ),
+        )
 
     async def mouse_move_async(self):
         """
@@ -664,7 +718,7 @@ class Element:
             return
         # await self.apply("""(el) => el.scrollIntoView(false)""")
 
-    async def clear_input_async(self, _until_event: type = None):
+    async def clear_input_async(self):
         """Clears an input field."""
         try:
             await self.apply('function (element) { element.value = "" } ')
@@ -952,18 +1006,21 @@ class Element:
             .replace("  ", "")
             .replace("\n", "")
         )
-        arguments = [cdp.runtime.CallArgument(
-            object_id=self._remote_object.object_id
-        )]
-        await self._tab.send(
-            cdp.runtime.call_function_on(
-                script,
-                object_id=self._remote_object.object_id,
-                arguments=arguments,
-                await_promise=True,
-                user_gesture=True,
+        try:
+            arguments = [cdp.runtime.CallArgument(
+                object_id=self._remote_object.object_id
+            )]
+            await self._tab.send(
+                cdp.runtime.call_function_on(
+                    script,
+                    object_id=self._remote_object.object_id,
+                    arguments=arguments,
+                    await_promise=True,
+                    user_gesture=True,
+                )
             )
-        )
+        except Exception:
+            pass
 
     async def highlight_overlay_async(self):
         """

{seleniumbase-4.44.1 → seleniumbase-4.44.2/seleniumbase.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seleniumbase
-Version: 4.44.1
+Version: 4.44.2
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz