seleniumbase 4.33.0__py3-none-any.whl → 4.33.1__py3-none-any.whl

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.33.0"
+__version__ = "4.33.1"

seleniumbase/core/browser_launcher.py

@@ -612,6 +612,7 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.save_cookies = CDPM.save_cookies
     cdp.load_cookies = CDPM.load_cookies
     cdp.clear_cookies = CDPM.clear_cookies
+    cdp.sleep = CDPM.sleep
     cdp.bring_active_window_to_front = CDPM.bring_active_window_to_front
     cdp.bring_to_front = CDPM.bring_active_window_to_front
     cdp.get_active_element = CDPM.get_active_element
@@ -684,6 +685,7 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.select_if_unselected = CDPM.select_if_unselected
     cdp.unselect_if_selected = CDPM.unselect_if_selected
     cdp.is_checked = CDPM.is_checked
+    cdp.is_selected = CDPM.is_selected
     cdp.is_element_present = CDPM.is_element_present
     cdp.is_element_visible = CDPM.is_element_visible
     cdp.wait_for_element_visible = CDPM.wait_for_element_visible
@@ -699,6 +701,8 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.assert_url_contains = CDPM.assert_url_contains
     cdp.assert_text = CDPM.assert_text
     cdp.assert_exact_text = CDPM.assert_exact_text
+    cdp.assert_true = CDPM.assert_true
+    cdp.assert_false = CDPM.assert_false
     cdp.scroll_into_view = CDPM.scroll_into_view
     cdp.scroll_to_y = CDPM.scroll_to_y
     cdp.scroll_to_top = CDPM.scroll_to_top
@@ -1167,7 +1171,12 @@ def _uc_gui_click_captcha(
                     frame = "%s div" % frame
                 elif (
                     driver.is_element_present('[name*="cf-turnstile-"]')
-                    and driver.is_element_present('[class*=spacer] + div div')
+                    and driver.is_element_present("#challenge-form div > div")
+                ):
+                    frame = "#challenge-form div > div"
+                elif (
+                    driver.is_element_present('[name*="cf-turnstile-"]')
+                    and driver.is_element_present("[class*=spacer] + div div")
                 ):
                     frame = '[class*=spacer] + div div'
                 elif (
@@ -1240,8 +1249,8 @@ def _uc_gui_click_captcha(
                 return
         try:
             if ctype == "g_rc" and not driver.is_connected():
-                x = (i_x + 32) * width_ratio
-                y = (i_y + 34) * width_ratio
+                x = (i_x + 29) * width_ratio
+                y = (i_y + 35) * width_ratio
             elif visible_iframe:
                 selector = "span"
                 if ctype == "g_rc":
@@ -1256,8 +1265,8 @@ def _uc_gui_click_captcha(
                 y = i_y + element.rect["y"] + (element.rect["height"] / 2.0)
                 y += 0.5
             else:
-                x = (i_x + 34) * width_ratio
-                y = (i_y + 34) * width_ratio
+                x = (i_x + 32) * width_ratio
+                y = (i_y + 32) * width_ratio
             if driver.is_connected():
                 driver.switch_to.default_content()
         except Exception:
@@ -1497,6 +1506,7 @@ def _uc_gui_handle_captcha_(driver, frame="iframe", ctype=None):
                 tab_count += 1
                 time.sleep(0.027)
                 active_element_css = js_utils.get_active_element_css(driver)
+                print(active_element_css)
                 if (
                     active_element_css.startswith(selector)
                     or active_element_css.endswith(" > div" * 2)
@@ -1514,7 +1524,10 @@ def _uc_gui_handle_captcha_(driver, frame="iframe", ctype=None):
             except Exception:
                 return
         if (
-            driver.is_element_present(".footer .clearfix .ray-id")
+            (
+                driver.is_element_present(".footer .clearfix .ray-id")
+                or driver.is_element_present("script[data-cf-beacon]")
+            )
             and hasattr(sb_config, "_saved_cf_tab_count")
             and sb_config._saved_cf_tab_count
         ):

seleniumbase/core/sb_cdp.py

@@ -1681,6 +1681,14 @@ class CDPMethods():
             % (text, element.text_all, selector)
         )
 
+    def assert_true(self, expression):
+        if not expression:
+            raise AssertionError("%s is not true")
+
+    def assert_false(self, expression):
+        if expression:
+            raise AssertionError("%s is not false")
+
     def scroll_into_view(self, selector):
         self.find_element(selector).scroll_into_view()
         self.loop.run_until_complete(self.page.wait())

seleniumbase/undetected/cdp_driver/browser.py

@@ -6,8 +6,9 @@ import http.cookiejar
 import json
 import logging
 import os
-import pickle
 import pathlib
+import pickle
+import re
 import shutil
 import urllib.parse
 import urllib.request
@@ -644,7 +645,7 @@ class CookieJar:
         """
         connection = None
         for _tab in self._browser.tabs:
-            if _tab.closed:
+            if hasattr(_tab, "closed") and _tab.closed:
                 continue
             connection = _tab
             break
@@ -674,7 +675,7 @@ class CookieJar:
         """
         connection = None
         for _tab in self._browser.tabs:
-            if _tab.closed:
+            if hasattr(_tab, "closed") and _tab.closed:
                 continue
             connection = _tab
             break
@@ -698,13 +699,11 @@ class CookieJar:
                 - Contain "nowsecure"
         :type pattern: str
         """
-        import re
-
         pattern = re.compile(pattern)
         save_path = pathlib.Path(file).resolve()
         connection = None
         for _tab in self._browser.tabs:
-            if _tab.closed:
+            if hasattr(_tab, "closed") and _tab.closed:
                 continue
             connection = _tab
             break
@@ -746,15 +745,13 @@ class CookieJar:
                 - Contain "nowsecure"
         :type pattern: str
         """
-        import re
-
         pattern = re.compile(pattern)
         save_path = pathlib.Path(file).resolve()
         cookies = pickle.load(save_path.open("r+b"))
         included_cookies = []
         connection = None
         for _tab in self._browser.tabs:
-            if _tab.closed:
+            if hasattr(_tab, "closed") and _tab.closed:
                 continue
             connection = _tab
             break
@@ -779,7 +776,7 @@ class CookieJar:
         """
         connection = None
         for _tab in self._browser.tabs:
-            if _tab.closed:
+            if hasattr(_tab, "closed") and _tab.closed:
                 continue
             connection = _tab
             break

{seleniumbase-4.33.0.dist-info → seleniumbase-4.33.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.33.0
+Version: 4.33.1
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -146,7 +146,7 @@ Requires-Dist: mss==9.0.2; extra == "mss"
 Provides-Extra: pdfminer
 Requires-Dist: pdfminer.six==20240706; extra == "pdfminer"
 Requires-Dist: cryptography==39.0.2; python_version < "3.9" and extra == "pdfminer"
-Requires-Dist: cryptography==43.0.3; python_version >= "3.9" and extra == "pdfminer"
+Requires-Dist: cryptography==44.0.0; python_version >= "3.9" and extra == "pdfminer"
 Requires-Dist: cffi==1.17.1; extra == "pdfminer"
 Requires-Dist: pycparser==2.22; extra == "pdfminer"
 Provides-Extra: pillow

{seleniumbase-4.33.0.dist-info → seleniumbase-4.33.1.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=OtJh8nGKL4xtZpw8KPqmn7Q6R-86t4cWUDyVF5MbMTo,2398
 seleniumbase/__main__.py,sha256=dn1p6dgCchmcH1zzTzzQvFwwdQQqnTGH6ULV9m4hv24,654
-seleniumbase/__version__.py,sha256=QWcZHZxKcoTjnqMUASmFQCA91tzSUF4vP43yJf9hNSk,46
+seleniumbase/__version__.py,sha256=WinMHufazbTH89-Ykuh9u7jq8VeYFiM_Km5byqgexBc,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=-hza7Nx2U41mSObYiPMi48v3JlPh3sJO3yzP0kqZ1Gk,59174
@@ -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=GT7S15R_nxJJUesB693ST2F0kUMNn4FXrwiNBoXAKpE,220293
+seleniumbase/core/browser_launcher.py,sha256=TbUR5NkE4r34SFe5t_2R2uV8Br6NG8fihZOAZ2uZy3s,220834
 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=cXhu8ErK9Vjdm82RMaQj7hEq_yUWizSp6LyiD50
 seleniumbase/core/recorder_helper.py,sha256=fNGjbapXmEsht54x1o6Igk198QdnPxDDnjUOzQxNhNQ,25055
 seleniumbase/core/report_helper.py,sha256=AIl6Qava2yW1uSzbLpJBlPlYDz0KE-rVhogh8hsGWBo,12201
 seleniumbase/core/s3_manager.py,sha256=bkeI8I4y19ebWuQG1oEZV5qJbotC6eN8vin31OCNWJk,3521
-seleniumbase/core/sb_cdp.py,sha256=4H91tZw77A8capl7wsRjzkpD62H018AmzKSQpmxXp6k,66948
+seleniumbase/core/sb_cdp.py,sha256=tS1eVtNEaNy12lqWNREFptRm_ylOxqQIwICvGwojwuk,67182
 seleniumbase/core/sb_driver.py,sha256=NGa4adi8OAi2WFtFkEguXg3JCd1p-JuZweIpGNifEfU,13488
 seleniumbase/core/session_helper.py,sha256=s9zD3PVZEWVzG2h81cCUskbNWLfdjC_LwwQjKptHCak,558
 seleniumbase/core/settings_parser.py,sha256=KokVXpCiGZhJ-D4Bo-hizPz5r-iefzWoiTANu9zNaq4,7504
@@ -115,7 +115,7 @@ seleniumbase/undetected/reactor.py,sha256=NropaXcO54pzmDq6quR27qPJxab6636H7LRAaq
 seleniumbase/undetected/webelement.py,sha256=_s6evgUkdWJpwOnzX4qR9i796PoVbz3txlzHlOBJ4BE,1370
 seleniumbase/undetected/cdp_driver/__init__.py,sha256=c0TjMwPfVFyoqYOJ7PQ-Jln_L_dpN3ebHyaD-juQoM0,64
 seleniumbase/undetected/cdp_driver/_contradict.py,sha256=6thDYeoEGiC7Q3tXLgoD_AhxecCFnATzBSjNympyRHA,3184
-seleniumbase/undetected/cdp_driver/browser.py,sha256=mGmpWuR206yYJoBPTNslru8CbEpQuvvIHdjBylSkoKg,30020
+seleniumbase/undetected/cdp_driver/browser.py,sha256=n8GYspU7b0pfBT4AqhqY6IdGVOZ1FC4wJ5emIOl-khQ,30129
 seleniumbase/undetected/cdp_driver/cdp_util.py,sha256=YhtD2Tm6PLIy9VKbgk8lHdGniS3mObyX4yAC1aG0TgQ,16733
 seleniumbase/undetected/cdp_driver/config.py,sha256=Rjvde7V-XJ0ihZdTmOmHEVWSuDWm3SprQ3njg8SN3Go,12087
 seleniumbase/undetected/cdp_driver/connection.py,sha256=sOTUGjbUqKA2hPvDcRCdqw1VQjVGJs7mbgVvzS7ldtE,23360
@@ -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.33.0.dist-info/LICENSE,sha256=odSYtWibXBnQ1gBg6CnDZ82n8kLF_if5-2nbqnEyD8k,1085
-seleniumbase-4.33.0.dist-info/METADATA,sha256=vubW0bw2Oh3djh-PyVRyNtMR0qOqUWSzYo05-T_IE5w,86554
-seleniumbase-4.33.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-seleniumbase-4.33.0.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
-seleniumbase-4.33.0.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
-seleniumbase-4.33.0.dist-info/RECORD,,
+seleniumbase-4.33.1.dist-info/LICENSE,sha256=odSYtWibXBnQ1gBg6CnDZ82n8kLF_if5-2nbqnEyD8k,1085
+seleniumbase-4.33.1.dist-info/METADATA,sha256=Enu7xujlzc9XwoPVPstRzT_tCtGllzWM6NxKTLIkLbM,86554
+seleniumbase-4.33.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+seleniumbase-4.33.1.dist-info/entry_points.txt,sha256=CNrh2EKNaHYEhO6pP1RJyVLB99LkDDYX7TnUK8xfjqk,623
+seleniumbase-4.33.1.dist-info/top_level.txt,sha256=4N97aBOQ8ETCnDnokBsWb07lJfTaq3C1ZzYRxvLMxqU,19
+seleniumbase-4.33.1.dist-info/RECORD,,