seleniumbase 4.28.3__tar.gz → 4.28.4__tar.gz

{seleniumbase-4.28.3 → seleniumbase-4.28.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.28.3
+Version: 4.28.4
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -63,11 +63,11 @@ Requires-Dist: pip>=24.1.1; python_version >= "3.8"
 Requires-Dist: packaging>=24.0; python_version < "3.8"
 Requires-Dist: packaging>=24.1; python_version >= "3.8"
 Requires-Dist: setuptools>=68.0.0; python_version < "3.8"
-Requires-Dist: setuptools>=70.1.1; python_version >= "3.8"
+Requires-Dist: setuptools>=70.2.0; python_version >= "3.8"
 Requires-Dist: wheel>=0.42.0; python_version < "3.8"
 Requires-Dist: wheel>=0.43.0; python_version >= "3.8"
 Requires-Dist: attrs>=23.2.0
-Requires-Dist: certifi>=2024.6.2
+Requires-Dist: certifi>=2024.7.4
 Requires-Dist: exceptiongroup>=1.2.1
 Requires-Dist: filelock>=3.12.2; python_version < "3.8"
 Requires-Dist: filelock>=3.15.4; python_version >= "3.8"
@@ -89,7 +89,7 @@ Requires-Dist: sniffio==1.3.1
 Requires-Dist: h11==0.14.0
 Requires-Dist: outcome==1.3.0.post0
 Requires-Dist: trio==0.22.2; python_version < "3.8"
-Requires-Dist: trio==0.25.1; python_version >= "3.8"
+Requires-Dist: trio==0.26.0; python_version >= "3.8"
 Requires-Dist: trio-websocket==0.11.1
 Requires-Dist: wsproto==1.2.0
 Requires-Dist: websocket-client==1.8.0; python_version >= "3.8"
@@ -162,11 +162,11 @@ Requires-Dist: cffi==1.16.0; python_version >= "3.8" and extra == "pdfminer"
 Requires-Dist: pycparser==2.22; extra == "pdfminer"
 Provides-Extra: pillow
 Requires-Dist: Pillow==9.5.0; python_version < "3.8" and extra == "pillow"
-Requires-Dist: Pillow>=10.3.0; python_version >= "3.8" and extra == "pillow"
+Requires-Dist: Pillow>=10.4.0; python_version >= "3.8" and extra == "pillow"
 Provides-Extra: pip-system-certs
 Requires-Dist: pip-system-certs==4.0; platform_system == "Windows" and extra == "pip-system-certs"
 Provides-Extra: proxy
-Requires-Dist: proxy.py==2.4.4; extra == "proxy"
+Requires-Dist: proxy.py==2.4.3; extra == "proxy"
 Provides-Extra: psutil
 Requires-Dist: psutil==5.9.8; extra == "psutil"
 Provides-Extra: pyautogui

{seleniumbase-4.28.3 → seleniumbase-4.28.4}/examples/raw_uc_mode.py

@@ -3,9 +3,8 @@ from seleniumbase import SB
 
 with SB(uc=True, test=True) as sb:
     url = "https://gitlab.com/users/sign_in"
-    sb.driver.uc_open_with_reconnect(url, 3)
-    if not sb.is_text_visible("Username", '[for="user_login"]'):
-        sb.driver.uc_open_with_reconnect(url, 4)
+    sb.uc_open_with_reconnect(url, 4)
+    sb.uc_gui_click_cf()
     sb.assert_text("Username", '[for="user_login"]', timeout=3)
     sb.assert_element('label[for="user_login"]')
     sb.highlight('button:contains("Sign in")')

{seleniumbase-4.28.3 → seleniumbase-4.28.4}/help_docs/method_summary.md

@@ -223,10 +223,22 @@ self.execute_async_script(script, timeout=None)
 
 self.safe_execute_script(script, *args, **kwargs)
 
+self.get_gui_element_rect(selector, by="css selector")
+
+self.get_gui_element_center(selector, by="css selector")
+
+self.get_window_rect()
+
+self.get_window_size()
+
+self.get_window_position()
+
 self.set_window_rect(x, y, width, height)
 
 self.set_window_size(width, height)
 
+self.set_window_position(x, y)
+
 self.maximize_window()
 
 self.switch_to_frame(frame="iframe", timeout=None)
@@ -1062,6 +1074,10 @@ driver.uc_gui_press_keys(keys)  # Use PyAutoGUI to press a list of keys
 
 driver.uc_gui_write(text)  # Similar to uc_gui_press_keys(), but faster
 
+driver.uc_gui_click_x_y(x, y, timeframe=0.25)  # PyAutoGUI click screen
+
+driver.uc_gui_click_cf(frame="iframe", retry=False, blind=False)  # (*)
+
 driver.uc_gui_handle_cf(frame="iframe")  # PyAutoGUI click CF Turnstile
 
 driver.uc_switch_to_frame(frame="iframe")  # Stealthy switch_to_frame()

{seleniumbase-4.28.3 → seleniumbase-4.28.4}/mkdocs_build/requirements.txt

@@ -20,7 +20,7 @@ lxml==5.2.2
 pyquery==2.0.0
 readtime==3.0.0
 mkdocs==1.6.0
-mkdocs-material==9.5.27
+mkdocs-material==9.5.28
 mkdocs-exclude-search==0.6.6
 mkdocs-simple-hooks==0.1.5
 mkdocs-material-extensions==1.3.1

{seleniumbase-4.28.3 → seleniumbase-4.28.4}/requirements.txt

@@ -3,11 +3,11 @@ pip>=24.1.1;python_version>="3.8"
 packaging>=24.0;python_version<"3.8"
 packaging>=24.1;python_version>="3.8"
 setuptools>=68.0.0;python_version<"3.8"
-setuptools>=70.1.1;python_version>="3.8"
+setuptools>=70.2.0;python_version>="3.8"
 wheel>=0.42.0;python_version<"3.8"
 wheel>=0.43.0;python_version>="3.8"
 attrs>=23.2.0
-certifi>=2024.6.2
+certifi>=2024.7.4
 exceptiongroup>=1.2.1
 filelock>=3.12.2;python_version<"3.8"
 filelock>=3.15.4;python_version>="3.8"
@@ -29,7 +29,7 @@ sniffio==1.3.1
 h11==0.14.0
 outcome==1.3.0.post0
 trio==0.22.2;python_version<"3.8"
-trio==0.25.1;python_version>="3.8"
+trio==0.26.0;python_version>="3.8"
 trio-websocket==0.11.1
 wsproto==1.2.0
 websocket-client==1.8.0;python_version>="3.8"

{seleniumbase-4.28.3 → seleniumbase-4.28.4}/seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.28.3"
+__version__ = "4.28.4"

{seleniumbase-4.28.3 → seleniumbase-4.28.4}/seleniumbase/core/browser_launcher.py

@@ -649,12 +649,144 @@ def uc_gui_write(driver, text):
         pyautogui.write(text)
 
 
-def uc_gui_handle_cf(driver, frame="iframe"):
+def get_gui_element_position(driver, selector):
+    element = driver.wait_for_element_present(selector, timeout=3)
+    element_rect = element.rect
+    window_rect = driver.get_window_rect()
+    window_bottom_y = window_rect["y"] + window_rect["height"]
+    viewport_height = driver.execute_script("return window.innerHeight;")
+    viewport_x = window_rect["x"] + element_rect["x"]
+    viewport_y = window_bottom_y - viewport_height + element_rect["y"]
+    return (viewport_x, viewport_y)
+
+
+def uc_gui_click_x_y(driver, x, y, timeframe=0.25, uc_lock=True):
+    install_pyautogui_if_missing(driver)
+    import pyautogui
+    pyautogui = get_configured_pyautogui(pyautogui)
+    screen_width, screen_height = pyautogui.size()
+    if x > screen_width or y > screen_height:
+        raise Exception(
+            "PyAutoGUI cannot click on point (%s, %s)"
+            " outside screen. (Width: %s, Height: %s)"
+            % (x, y, screen_width, screen_height)
+        )
+    if uc_lock:
+        gui_lock = fasteners.InterProcessLock(
+            constants.MultiBrowser.PYAUTOGUILOCK
+        )
+        with gui_lock:  # Prevent issues with multiple processes
+            pyautogui.moveTo(x, y, timeframe, pyautogui.easeOutQuad)
+            if timeframe >= 0.25:
+                time.sleep(0.0555)  # Wait if moving at human-speed
+            if "--debug" in sys.argv:
+                print(" <DEBUG> pyautogui.click(%s, %s)" % (x, y))
+            pyautogui.click(x=x, y=y)
+    else:
+        # Called from a method where the gui_lock is already active
+        pyautogui.moveTo(x, y, timeframe, pyautogui.easeOutQuad)
+        if timeframe >= 0.25:
+            time.sleep(0.0555)  # Wait if moving at human-speed
+        if "--debug" in sys.argv:
+            print(" <DEBUG> pyautogui.click(%s, %s)" % (x, y))
+        pyautogui.click(x=x, y=y)
+
+
+def on_a_cf_turnstile_page(driver):
     source = driver.get_page_source()
     if (
-        "//challenges.cloudflare.com" not in source
-        and 'aria-label="Cloudflare"' not in source
+        "//challenges.cloudflare.com" in source
+        or 'aria-label="Cloudflare"' in source
     ):
+        return True
+    return False
+
+
+def uc_gui_click_cf(driver, frame="iframe", retry=False, blind=False):
+    if not on_a_cf_turnstile_page(driver):
+        return
+    install_pyautogui_if_missing(driver)
+    import pyautogui
+    pyautogui = get_configured_pyautogui(pyautogui)
+    x = None
+    y = None
+    gui_lock = fasteners.InterProcessLock(
+        constants.MultiBrowser.PYAUTOGUILOCK
+    )
+    with gui_lock:  # Prevent issues with multiple processes
+        needs_switch = False
+        is_in_frame = js_utils.is_in_frame(driver)
+        if is_in_frame and driver.is_element_present("#challenge-stage"):
+            driver.switch_to.parent_frame()
+            needs_switch = True
+            is_in_frame = js_utils.is_in_frame(driver)
+        if not is_in_frame:
+            # Make sure the window is on top
+            page_actions.switch_to_window(
+                driver, driver.current_window_handle, 2, uc_lock=False
+            )
+        if not is_in_frame or needs_switch:
+            # Currently not in frame (or nested frame outside CF one)
+            try:
+                i_x, i_y = get_gui_element_position(driver, "iframe")
+                driver.switch_to_frame(frame)
+            except Exception:
+                if driver.is_element_present("iframe"):
+                    i_x, i_y = get_gui_element_position(driver, "iframe")
+                    driver.switch_to_frame("iframe")
+                else:
+                    return
+        try:
+            selector = "span"
+            element = driver.wait_for_element_present(selector, timeout=2.5)
+            x = i_x + element.rect["x"] + int(element.rect["width"] / 2) + 1
+            y = i_y + element.rect["y"] + int(element.rect["height"] / 2) + 1
+            driver.switch_to.default_content()
+        except Exception:
+            try:
+                driver.switch_to.default_content()
+            except Exception:
+                return
+        driver.disconnect()
+        try:
+            if x and y:
+                sb_config._saved_cf_x_y = (x, y)
+                uc_gui_click_x_y(driver, x, y, timeframe=0.842, uc_lock=False)
+        except Exception:
+            pass
+    reconnect_time = (float(constants.UC.RECONNECT_TIME) / 2.0) + 0.5
+    if IS_LINUX:
+        reconnect_time = constants.UC.RECONNECT_TIME
+    if not x or not y:
+        reconnect_time = 1  # Make it quick (it already failed)
+    driver.reconnect(reconnect_time)
+    if blind:
+        retry = True
+    if retry and x and y and on_a_cf_turnstile_page(driver):
+        with gui_lock:  # Prevent issues with multiple processes
+            # Make sure the window is on top
+            page_actions.switch_to_window(
+                driver, driver.current_window_handle, 2, uc_lock=False
+            )
+            driver.switch_to_frame("iframe")
+            if driver.is_element_visible("#success-icon"):
+                driver.switch_to.parent_frame()
+                return
+            if blind:
+                driver.uc_open_with_disconnect(driver.current_url, 3.8)
+                uc_gui_click_x_y(driver, x, y, timeframe=1.05, uc_lock=False)
+            else:
+                driver.uc_open_with_reconnect(driver.current_url, 3.8)
+                if on_a_cf_turnstile_page(driver):
+                    driver.disconnect()
+                    uc_gui_click_x_y(
+                        driver, x, y, timeframe=1.05, uc_lock=False
+                    )
+        driver.reconnect(reconnect_time)
+
+
+def uc_gui_handle_cf(driver, frame="iframe"):
+    if not on_a_cf_turnstile_page(driver):
         return
     install_pyautogui_if_missing(driver)
     import pyautogui
@@ -696,6 +828,8 @@ def uc_gui_handle_cf(driver, frame="iframe"):
         except Exception:
             pass
     reconnect_time = (float(constants.UC.RECONNECT_TIME) / 2.0) + 0.5
+    if IS_LINUX:
+        reconnect_time = constants.UC.RECONNECT_TIME
     driver.reconnect(reconnect_time)
 
 
@@ -4027,6 +4161,16 @@ def get_local_driver(
                             driver, *args, **kwargs
                         )
                     )
+                    driver.uc_gui_click_x_y = (
+                        lambda *args, **kwargs: uc_gui_click_x_y(
+                            driver, *args, **kwargs
+                        )
+                    )
+                    driver.uc_gui_click_cf = (
+                        lambda *args, **kwargs: uc_gui_click_cf(
+                            driver, *args, **kwargs
+                        )
+                    )
                     driver.uc_gui_handle_cf = (
                         lambda *args, **kwargs: uc_gui_handle_cf(
                             driver, *args, **kwargs

{seleniumbase-4.28.3 → seleniumbase-4.28.4}/seleniumbase/fixtures/base_case.py

@@ -3393,23 +3393,85 @@ class BaseCase(unittest.TestCase):
             self.activate_jquery()
         return self.driver.execute_script(script, *args, **kwargs)
 
+    def get_gui_element_rect(self, selector, by="css selector"):
+        """Very similar to element.rect, but the x, y coordinates are
+        relative to the entire screen, rather than the browser window.
+        This is specifically for PyAutoGUI actions on the full screen.
+        (Note: There may be complications if iframes are involved.)"""
+        element = self.wait_for_element_present(selector, by=by, timeout=1)
+        element_rect = element.rect
+        e_width = element_rect["width"]
+        e_height = element_rect["height"]
+        i_x = 0
+        i_y = 0
+        iframe_switch = False
+        if self.__is_in_frame():
+            self.switch_to_parent_frame()
+            if self.__is_in_frame():
+                raise Exception("Nested iframes breaks get_gui_element_rect!")
+            iframe_switch = True
+            iframe = self.wait_for_element_present("iframe", timeout=1)
+            i_x = iframe.rect["x"]
+            i_y = iframe.rect["y"]
+        window_rect = self.get_window_rect()
+        w_bottom_y = window_rect["y"] + window_rect["height"]
+        viewport_height = self.execute_script("return window.innerHeight;")
+        x = math.ceil(window_rect["x"] + i_x + element_rect["x"])
+        y = math.ceil(w_bottom_y - viewport_height + i_y + element_rect["y"])
+        if iframe_switch:
+            self.switch_to_frame()
+            if not self.is_element_present(selector, by=by):
+                self.switch_to_parent_frame()
+        return ({"height": e_height, "width": e_width, "x": x, "y": y})
+
+    def get_gui_element_center(self, selector, by="css selector"):
+        """Returns the x, y coordinates of the element's center based
+        on the entire GUI / screen, rather than on the browser window.
+        This is specifically for PyAutoGUI actions on the full screen.
+        (Note: There may be complications if iframes are involved.)"""
+        element_rect = self.get_gui_element_rect(selector, by=by)
+        x = int(element_rect["x"]) + int(element_rect["width"] / 2) + 1
+        y = int(element_rect["y"]) + int(element_rect["height"] / 2) + 1
+        return (x, y)
+
+    def get_window_rect(self):
+        self.__check_scope()
+        self._check_browser()
+        return self.driver.get_window_rect()
+
+    def get_window_size(self):
+        self.__check_scope()
+        self._check_browser()
+        return self.driver.get_window_size()
+
+    def get_window_position(self):
+        self.__check_scope()
+        self._check_browser()
+        return self.driver.get_window_position()
+
     def set_window_rect(self, x, y, width, height):
         self.__check_scope()
         self._check_browser()
         self.driver.set_window_rect(x, y, width, height)
-        self.__demo_mode_pause_if_active()
+        self.__demo_mode_pause_if_active(tiny=True)
 
     def set_window_size(self, width, height):
         self.__check_scope()
         self._check_browser()
         self.driver.set_window_size(width, height)
-        self.__demo_mode_pause_if_active()
+        self.__demo_mode_pause_if_active(tiny=True)
+
+    def set_window_position(self, x, y):
+        self.__check_scope()
+        self._check_browser()
+        self.driver.set_window_position(x, y)
+        self.__demo_mode_pause_if_active(tiny=True)
 
     def maximize_window(self):
         self.__check_scope()
         self._check_browser()
         self.driver.maximize_window()
-        self.__demo_mode_pause_if_active()
+        self.__demo_mode_pause_if_active(tiny=True)
 
     def switch_to_frame(self, frame="iframe", timeout=None):
         """Wait for an iframe to appear, and switch to it. This should be
@@ -4178,6 +4240,10 @@ class BaseCase(unittest.TestCase):
                 self.uc_gui_press_keys = new_driver.uc_gui_press_keys
             if hasattr(new_driver, "uc_gui_write"):
                 self.uc_gui_write = new_driver.uc_gui_write
+            if hasattr(new_driver, "uc_gui_click_x_y"):
+                self.uc_gui_click_x_y = new_driver.uc_gui_click_x_y
+            if hasattr(new_driver, "uc_gui_click_cf"):
+                self.uc_gui_click_cf = new_driver.uc_gui_click_cf
             if hasattr(new_driver, "uc_gui_handle_cf"):
                 self.uc_gui_handle_cf = new_driver.uc_gui_handle_cf
             if hasattr(new_driver, "uc_switch_to_frame"):

{seleniumbase-4.28.3 → seleniumbase-4.28.4}/seleniumbase.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.28.3
+Version: 4.28.4
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -63,11 +63,11 @@ Requires-Dist: pip>=24.1.1; python_version >= "3.8"
 Requires-Dist: packaging>=24.0; python_version < "3.8"
 Requires-Dist: packaging>=24.1; python_version >= "3.8"
 Requires-Dist: setuptools>=68.0.0; python_version < "3.8"
-Requires-Dist: setuptools>=70.1.1; python_version >= "3.8"
+Requires-Dist: setuptools>=70.2.0; python_version >= "3.8"
 Requires-Dist: wheel>=0.42.0; python_version < "3.8"
 Requires-Dist: wheel>=0.43.0; python_version >= "3.8"
 Requires-Dist: attrs>=23.2.0
-Requires-Dist: certifi>=2024.6.2
+Requires-Dist: certifi>=2024.7.4
 Requires-Dist: exceptiongroup>=1.2.1
 Requires-Dist: filelock>=3.12.2; python_version < "3.8"
 Requires-Dist: filelock>=3.15.4; python_version >= "3.8"
@@ -89,7 +89,7 @@ Requires-Dist: sniffio==1.3.1
 Requires-Dist: h11==0.14.0
 Requires-Dist: outcome==1.3.0.post0
 Requires-Dist: trio==0.22.2; python_version < "3.8"
-Requires-Dist: trio==0.25.1; python_version >= "3.8"
+Requires-Dist: trio==0.26.0; python_version >= "3.8"
 Requires-Dist: trio-websocket==0.11.1
 Requires-Dist: wsproto==1.2.0
 Requires-Dist: websocket-client==1.8.0; python_version >= "3.8"
@@ -162,11 +162,11 @@ Requires-Dist: cffi==1.16.0; python_version >= "3.8" and extra == "pdfminer"
 Requires-Dist: pycparser==2.22; extra == "pdfminer"
 Provides-Extra: pillow
 Requires-Dist: Pillow==9.5.0; python_version < "3.8" and extra == "pillow"
-Requires-Dist: Pillow>=10.3.0; python_version >= "3.8" and extra == "pillow"
+Requires-Dist: Pillow>=10.4.0; python_version >= "3.8" and extra == "pillow"
 Provides-Extra: pip-system-certs
 Requires-Dist: pip-system-certs==4.0; platform_system == "Windows" and extra == "pip-system-certs"
 Provides-Extra: proxy
-Requires-Dist: proxy.py==2.4.4; extra == "proxy"
+Requires-Dist: proxy.py==2.4.3; extra == "proxy"
 Provides-Extra: psutil
 Requires-Dist: psutil==5.9.8; extra == "psutil"
 Provides-Extra: pyautogui

{seleniumbase-4.28.3 → seleniumbase-4.28.4}/seleniumbase.egg-info/requires.txt

@@ -1,5 +1,5 @@
 attrs>=23.2.0
-certifi>=2024.6.2
+certifi>=2024.7.4
 exceptiongroup>=1.2.1
 parse>=1.20.2
 parse-type>=0.6.2
@@ -67,12 +67,12 @@ urllib3<2.3.0,>=1.26.18
 [:python_version >= "3.8"]
 pip>=24.1.1
 packaging>=24.1
-setuptools>=70.1.1
+setuptools>=70.2.0
 wheel>=0.43.0
 filelock>=3.15.4
 platformdirs>=4.2.2
 typing-extensions>=4.12.2
-trio==0.25.1
+trio==0.26.0
 websocket-client==1.8.0
 selenium==4.22.0
 execnet==2.1.1
@@ -140,7 +140,7 @@ cryptography==42.0.8
 Pillow==9.5.0
 
 [pillow:python_version >= "3.8"]
-Pillow>=10.3.0
+Pillow>=10.4.0
 
 [pip-system-certs]
 
@@ -148,7 +148,7 @@ Pillow>=10.3.0
 pip-system-certs==4.0
 
 [proxy]
-proxy.py==2.4.4
+proxy.py==2.4.3
 
 [psutil]
 psutil==5.9.8

{seleniumbase-4.28.3 → seleniumbase-4.28.4}/setup.py

@@ -151,11 +151,11 @@ setup(
         'packaging>=24.0;python_version<"3.8"',
         'packaging>=24.1;python_version>="3.8"',
         'setuptools>=68.0.0;python_version<"3.8"',
-        'setuptools>=70.1.1;python_version>="3.8"',
+        'setuptools>=70.2.0;python_version>="3.8"',
         'wheel>=0.42.0;python_version<"3.8"',
         'wheel>=0.43.0;python_version>="3.8"',
         'attrs>=23.2.0',
-        "certifi>=2024.6.2",
+        "certifi>=2024.7.4",
         "exceptiongroup>=1.2.1",
         'filelock>=3.12.2;python_version<"3.8"',
         'filelock>=3.15.4;python_version>="3.8"',
@@ -177,7 +177,7 @@ setup(
         'h11==0.14.0',
         'outcome==1.3.0.post0',
         'trio==0.22.2;python_version<"3.8"',
-        'trio==0.25.1;python_version>="3.8"',
+        'trio==0.26.0;python_version>="3.8"',
         'trio-websocket==0.11.1',
         'wsproto==1.2.0',
         'websocket-client==1.8.0;python_version>="3.8"',
@@ -270,7 +270,7 @@ setup(
         # (An optional library for image-processing.)
         "pillow": [
             'Pillow==9.5.0;python_version<"3.8"',
-            'Pillow>=10.3.0;python_version>="3.8"',
+            'Pillow>=10.4.0;python_version>="3.8"',
         ],
         # pip install -e .[pip-system-certs]
         # (If you see [SSL: CERTIFICATE_VERIFY_FAILED], then get this.)
@@ -282,7 +282,7 @@ setup(
         # Usage: proxy
         # (That starts a proxy server on "127.0.0.1:8899".)
         "proxy": [
-            "proxy.py==2.4.4",
+            "proxy.py==2.4.3",  # 2.4.4 did not have "Listening on ..."
         ],
         # pip install -e .[psutil]
         "psutil": [