seleniumbase 4.44.2__py3-none-any.whl → 4.45.10__py3-none-any.whl

seleniumbase/core/sb_cdp.py

@@ -1,7 +1,9 @@
 """Add CDP methods to extend the driver"""
 import asyncio
 import fasteners
+import mycdp
 import os
+import random
 import re
 import sys
 import time
@@ -14,6 +16,7 @@ from seleniumbase.fixtures import js_utils
 from seleniumbase.fixtures import page_utils
 from seleniumbase.fixtures import shared_utils
 from seleniumbase.undetected.cdp_driver import cdp_util
+from seleniumbase.undetected.cdp_driver import tab as cdp_tab
 
 
 class CDPMethods():
@@ -112,7 +115,18 @@ class CDPMethods():
         driver = self.driver
         if hasattr(driver, "cdp_base"):
             driver = driver.cdp_base
-        self.loop.run_until_complete(self.page.get(url, **kwargs))
+        load_timeout = 60.0
+        wait_timeout = 30.0
+        if hasattr(sb_config, "_cdp_proxy") and sb_config._cdp_proxy:
+            load_timeout = 90.0
+            wait_timeout = 45.0
+        try:
+            task = self.page.get(url, **kwargs)
+            self.loop.run_until_complete(
+                asyncio.wait_for(task, timeout=load_timeout)
+            )
+        except asyncio.TimeoutError:
+            print("Timeout loading %s" % url)
         url_protocol = url.split(":")[0]
         safe_url = True
         if url_protocol not in ["about", "data", "chrome"]:
@@ -124,7 +138,14 @@ class CDPMethods():
         else:
             time.sleep(0.012)
         self.__slow_mode_pause_if_set()
-        self.loop.run_until_complete(self.page.wait())
+        try:
+            self.loop.run_until_complete(
+                asyncio.wait_for(self.page.wait(), timeout=wait_timeout)
+            )
+        except asyncio.TimeoutError:
+            pass
+        except Exception:
+            pass
 
     def open(self, url, **kwargs):
         self.get(url, **kwargs)
@@ -143,6 +164,48 @@ class CDPMethods():
     def get_event_loop(self):
         return self.loop
 
+    def get_rd_host(self):
+        """Returns the remote-debugging host (likely 127.0.0.1)"""
+        driver = self.driver
+        if hasattr(driver, "cdp_base"):
+            driver = driver.cdp_base
+        return driver.config.host
+
+    def get_rd_port(self):
+        """Returns the remote-debugging port (commonly 9222)"""
+        driver = self.driver
+        if hasattr(driver, "cdp_base"):
+            driver = driver.cdp_base
+        return driver.config.port
+
+    def get_rd_url(self):
+        """Returns the remote-debugging URL, which is used for
+        allowing the Playwright integration to launch stealthy,
+        and also applies nest-asyncio for nested event loops so
+        that SeleniumBase methods can be called from Playwright
+        without encountering event loop error messages such as:
+        Cannot run the event loop while another loop is running.
+        Also sets an environment variable to hide this warning:
+        Deprecation: "url.parse() behavior is not standardized".
+        (github.com/microsoft/playwright-python/issues/3016)"""
+        import nest_asyncio
+        nest_asyncio.apply()
+        os.environ["NODE_NO_WARNINGS"] = "1"
+        driver = self.driver
+        if hasattr(driver, "cdp_base"):
+            driver = driver.cdp_base
+        host = driver.config.host
+        port = driver.config.port
+        return f"http://{host}:{port}"
+
+    def get_endpoint_url(self):
+        """Same as get_rd_url(), which returns the remote-debugging URL."""
+        return self.get_rd_url()
+
+    def get_port(self):
+        """Same as get_rd_port(), which returns the remote-debugging port."""
+        return self.get_rd_port()
+
     def add_handler(self, event, handler):
         self.page.add_handler(event, handler)
 
@@ -479,7 +542,7 @@ class CDPMethods():
             text = text[:-1]
         for key in text:
             element.send_keys(key)
-            time.sleep(0.044)
+            time.sleep(float(0.042 + (random.random() / 110.0)))
         if submit:
             element.send_keys("\r\n")
             time.sleep(0.044)
@@ -707,10 +770,15 @@ class CDPMethods():
         if tag_name:
             tag_name = tag_name.lower().strip()
         if (
-            tag_name in ["a", "button", "canvas", "div", "input", "li", "span"]
+            tag_name in [
+                "a", "button", "canvas", "div", "input", "li", "span", "label"
+            ]
             and "contains(" not in selector
         ):
-            element.mouse_click()  # Simulated click (NOT PyAutoGUI)
+            try:
+                element.mouse_click()  # Simulated click (NOT PyAutoGUI)
+            except Exception:
+                element.click()  # Standard CDP click
         else:
             element.click()  # Standard CDP click
         self.__slow_mode_pause_if_set()
@@ -938,7 +1006,7 @@ class CDPMethods():
             text = text.replace("\n", "\r")
         for key in text:
             element.send_keys(key)
-            time.sleep(0.044)
+            time.sleep(float(0.042 + (random.random() / 110.0)))
         if submit:
             element.send_keys("\r\n")
             time.sleep(0.044)
@@ -1120,10 +1188,74 @@ class CDPMethods():
     def switch_to_newest_window(self):
         self.switch_to_tab(-1)
 
-    def open_new_tab(self, url=None, switch_to=True):
+    def open_new_tab(self, url=None, switch_to=True, **kwargs):
+        driver = self.driver
         if not isinstance(url, str):
             url = "about:blank"
-        self.loop.run_until_complete(self.page.get(url, new_tab=True))
+        if hasattr(driver, "cdp_base"):
+            try:
+                self.loop.run_until_complete(
+                    self.page.get(url, new_tab=True, **kwargs)
+                )
+            except Exception:
+                original_targets = self.loop.run_until_complete(
+                    self.page.send(mycdp.target.get_targets())
+                )
+                tab_url = driver.cdp_base.tabs[0].websocket_url
+                if not self.driver.is_connected():
+                    self.driver.connect()
+                self.driver.open_new_tab()
+                targets = self.loop.run_until_complete(
+                    self.page.send(mycdp.target.get_targets())
+                )
+                new_targets = []
+                for target in targets:
+                    if target not in original_targets:
+                        new_targets.append(target)
+                if new_targets:
+                    found_target = new_targets[0]
+                    t_str = str(new_targets[0])
+                    target_id = (
+                        t_str.split("target_id=TargetID('")[-1].split("')")[0]
+                    )
+                    pre_tab_url = tab_url.split("/page/")[0] + "/page/"
+                    new_tab_url = pre_tab_url + target_id
+                    new_tab = cdp_tab.Tab(
+                        new_tab_url, found_target, driver.cdp_base
+                    )
+                    driver.cdp_base.targets.append(new_tab)
+                    driver.cdp_base.tabs.append(new_tab)
+                    self.driver.disconnect()
+                    self.switch_to_newest_tab()
+                    self.open(url)
+                    return
+                elif getattr(sb_config, "guest_mode", None):
+                    print("  open_new_tab() failed! (Known Guest Mode issue)")
+            if switch_to:
+                self.switch_to_newest_tab()
+            return
+
+        target_id = self.loop.run_until_complete(
+            self.page.send(mycdp.target.create_target(url))
+        )
+        if not target_id and getattr(sb_config, "guest_mode", None):
+            print("  open_new_tab() failed! (Known Guest Mode issue)")
+        found_target = None
+        targets = self.loop.run_until_complete(
+            self.page.send(mycdp.target.get_targets())
+        )
+        if target_id:
+            for target in targets:
+                if str(target_id) in str(target):
+                    found_target = target
+                    break
+        if found_target:
+            tab_url = driver.tabs[0].websocket_url
+            pre_tab_url = tab_url.split("/page/")[0] + "/page/"
+            new_tab_url = pre_tab_url + target_id
+            new_tab = cdp_tab.Tab(new_tab_url, found_target, driver)
+            driver.targets.append(new_tab)
+            driver.tabs.append(new_tab)
         if switch_to:
             self.switch_to_newest_tab()
 
@@ -1185,7 +1317,14 @@ class CDPMethods():
             self.page.evaluate("window.location.origin")
         )
 
-    def get_page_source(self):
+    def get_html(self, include_shadow_dom=True):
+        return self.get_page_source(
+            include_shadow_dom=include_shadow_dom
+        )
+
+    def get_page_source(self, include_shadow_dom=True):
+        if include_shadow_dom:
+            return self.find_element("html").get_html()
         try:
             source = self.loop.run_until_complete(
                 self.page.evaluate("document.documentElement.outerHTML")
@@ -1527,13 +1666,15 @@ class CDPMethods():
         css_selector = self.__convert_to_css_if_xpath(selector)
         css_selector = re.escape(css_selector)  # Add "\\" to special chars
         css_selector = js_utils.escape_quotes_if_needed(css_selector)
-        js_code = """var $elements = document.querySelectorAll('%s');
-                  var index = 0, length = $elements.length;
-                  for(; index < length; index++){
-                  $elements[index].setAttribute('%s','%s');}""" % (
-            css_selector,
-            attribute,
-            value,
+        js_code = (
+            """var $elements = document.querySelectorAll('%s');
+            var index = 0, length = $elements.length;
+            for(; index < length; index++){
+            $elements[index].setAttribute('%s','%s');}""" % (
+                css_selector,
+                attribute,
+                value,
+            )
         )
         with suppress(Exception):
             self.loop.run_until_complete(self.page.evaluate(js_code))
@@ -1692,7 +1833,7 @@ class CDPMethods():
             self.__make_sure_pyautogui_lock_is_writable()
             for key in keys:
                 pyautogui.press(key)
-                time.sleep(0.044)
+                time.sleep(float(0.042 + (random.random() / 110.0)))
         self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.sleep(0.025))
 
@@ -1796,6 +1937,16 @@ class CDPMethods():
     def click_with_offset(self, selector, x, y, center=False):
         element = self.find_element(selector)
         element.scroll_into_view()
+        if "--debug" in sys.argv:
+            displayed_selector = "`%s`" % selector
+            if '"' not in selector:
+                displayed_selector = '"%s"' % selector
+            elif "'" not in selector:
+                displayed_selector = "'%s'" % selector
+            print(
+                " <DEBUG> sb.click_with_offset(%s, %s, %s, center=%s)"
+                % (displayed_selector, x, y, center)
+            )
         element.click_with_offset(x=x, y=y, center=center)
         self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.wait())
@@ -1805,8 +1956,12 @@ class CDPMethods():
             time.sleep(0.2)
             source = self.get_page_source()
         if (
-            'data-callback="onCaptchaSuccess"' in source
-            or "/challenge-platform/scripts/" in source
+            (
+                'data-callback="onCaptchaSuccess"' in source
+                and 'title="reCAPTCHA"' not in source
+                and 'id="recaptcha-token"' not in source
+            )
+            or "/challenge-platform/h/b/" in source
             or 'id="challenge-widget-' in source
             or "challenges.cloudf" in source
             or "cf-turnstile-" in source
@@ -1814,17 +1969,28 @@ class CDPMethods():
             return True
         return False
 
-    def _on_a_g_recaptcha_page(self, source=None):
-        if not source or len(source) < 400:
-            time.sleep(0.2)
-            source = self.get_page_source()
+    def _on_a_g_recaptcha_page(self, *args, **kwargs):
+        time.sleep(0.4)  # reCAPTCHA may need a moment to appear
+        self.loop.run_until_complete(self.page.wait())
+        source = self.get_page_source()
         if (
-            'id="recaptcha-token"' in source
-            or 'title="reCAPTCHA"' in source
+            (
+                'id="recaptcha-token"' in source
+                or 'title="reCAPTCHA"' in source
+            )
+            and self.is_element_visible('iframe[title="reCAPTCHA"]')
         ):
+            try:
+                self.loop.run_until_complete(self.page.wait(0.1))
+            except Exception:
+                time.sleep(0.1)
             return True
-        elif "/recaptcha/api.js" in source:
+        elif "com/recaptcha/api.js" in source:
             time.sleep(1.6)  # Still loading
+            try:
+                self.loop.run_until_complete(self.page.wait(0.1))
+            except Exception:
+                time.sleep(0.1)
             return True
         return False
 
@@ -1834,8 +2000,10 @@ class CDPMethods():
             selector = 'iframe[title="reCAPTCHA"]'
         else:
             return
+        time.sleep(0.25)
+        self.loop.run_until_complete(self.page.wait())
+        time.sleep(0.25)
         with suppress(Exception):
-            time.sleep(0.08)
             element_rect = self.get_gui_element_rect(selector, timeout=1)
             e_x = element_rect["x"]
             e_y = element_rect["y"]
@@ -1861,51 +2029,41 @@ class CDPMethods():
     def solve_captcha(self):
         self.__click_captcha(use_cdp=True)
 
+    def click_captcha(self):
+        """Same as solve_captcha()"""
+        self.__click_captcha(use_cdp=True)
+
     def gui_click_captcha(self):
+        """Use PyAutoGUI to click the CAPTCHA"""
         self.__click_captcha(use_cdp=False)
 
     def __click_captcha(self, use_cdp=False):
         """Uses PyAutoGUI unless use_cdp == True"""
-        self.sleep(0.056)
+        self.sleep(0.075)
+        self.loop.run_until_complete(self.page.wait())
+        self.sleep(0.025)
         source = self.get_page_source()
-        if self._on_a_g_recaptcha_page(source):
+        if self._on_a_cf_turnstile_page(source):
+            pass
+        elif self._on_a_g_recaptcha_page(source):
             self.__gui_click_recaptcha(use_cdp)
             return
-        elif not self._on_a_cf_turnstile_page(source):
+        else:
             return
         selector = None
-        if (
-            self.is_element_present('[name*="cf-turnstile-"]')
-            and self.is_element_present("#challenge-form div > div")
-        ):
+        if self.is_element_present('[class="cf-turnstile"]'):
+            selector = '[class="cf-turnstile"]'
+        elif self.is_element_present("#challenge-form div > div"):
             selector = "#challenge-form div > div"
-        elif (
-            self.is_element_present('[name*="cf-turnstile-"]')
-            and self.is_element_present(
-                '[style="display: grid;"] div div'
-            )
-        ):
+        elif self.is_element_present('[style="display: grid;"] div div'):
             selector = '[style="display: grid;"] div div'
-        elif (
-            self.is_element_present('[name*="cf-turnstile-"]')
-            and self.is_element_present("[class*=spacer] + div div")
-        ):
+        elif self.is_element_present("[class*=spacer] + div div"):
             selector = '[class*=spacer] + div div'
-        elif (
-            self.is_element_present('[name*="cf-turnstile-"]')
-            and self.is_element_present(".spacer div:not([class])")
-        ):
+        elif self.is_element_present(".spacer div:not([class])"):
             selector = ".spacer div:not([class])"
-        elif (
-            self.is_element_present('script[src*="challenges.c"]')
-            and self.is_element_present(
-                '[data-testid*="challenge-"] div'
-            )
-        ):
+        elif self.is_element_present('[data-testid*="challenge-"] div'):
             selector = '[data-testid*="challenge-"] div'
-        elif self.is_element_present(
-            "div#turnstile-widget div:not([class])"
-        ):
+        elif self.is_element_present("div#turnstile-widget div:not([class])"):
             selector = "div#turnstile-widget div:not([class])"
         elif self.is_element_present("ngx-turnstile div:not([class])"):
             selector = "ngx-turnstile div:not([class])"
@@ -1913,22 +2071,12 @@ class CDPMethods():
             'form div:not([class]):has(input[name*="cf-turn"])'
         ):
             selector = 'form div:not([class]):has(input[name*="cf-turn"])'
-        elif (
-            self.is_element_present('[src*="/turnstile/"]')
-            and self.is_element_present("form div:not(:has(*))")
-        ):
+        elif self.is_element_present("form div:not(:has(*))"):
             selector = "form div:not(:has(*))"
-        elif (
-            self.is_element_present('[src*="/turnstile/"]')
-            and self.is_element_present(
-                "body > div#check > div:not([class])"
-            )
-        ):
+        elif self.is_element_present("body > div#check > div:not([class])"):
             selector = "body > div#check > div:not([class])"
         elif self.is_element_present(".cf-turnstile-wrapper"):
             selector = ".cf-turnstile-wrapper"
-        elif self.is_element_present('[class="cf-turnstile"]'):
-            selector = '[class="cf-turnstile"]'
         elif self.is_element_present(
             '[id*="turnstile"] div:not([class])'
         ):
@@ -1941,6 +2089,10 @@ class CDPMethods():
             '[data-callback="onCaptchaSuccess"]'
         ):
             selector = '[data-callback="onCaptchaSuccess"]'
+        elif self.is_element_present(
+            "div:not([class]) > div:not([class])"
+        ):
+            selector = "div:not([class]) > div:not([class])"
         else:
             return
         if not selector:
@@ -2028,7 +2180,7 @@ class CDPMethods():
                 self.loop.run_until_complete(self.page.evaluate(script))
                 self.loop.run_until_complete(self.page.wait())
         with suppress(Exception):
-            time.sleep(0.08)
+            time.sleep(0.05)
             element_rect = self.get_gui_element_rect(selector, timeout=1)
             e_x = element_rect["x"]
             e_y = element_rect["y"]
@@ -2039,15 +2191,17 @@ class CDPMethods():
             x = e_x + x_offset
             y = e_y + y_offset
             sb_config._saved_cf_x_y = (x, y)
-            time.sleep(0.08)
+            time.sleep(0.05)
+            if hasattr(sb_config, "_cdp_proxy") and sb_config._cdp_proxy:
+                time.sleep(0.22)  # CAPTCHA may load slower with proxy
             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)
+                    time.sleep(0.05)
                     self.click_with_offset(selector, x_offset, y_offset)
-                    time.sleep(0.056)
+                    time.sleep(0.05)
             else:
                 self.gui_click_x_y(x, y)
 
@@ -2071,13 +2225,17 @@ class CDPMethods():
         if uc_lock:
             gui_lock = FileLock(constants.MultiBrowser.PYAUTOGUILOCK)
             with gui_lock:  # Prevent issues with multiple processes
+                if "--debug" in sys.argv:
+                    print(" <DEBUG> pyautogui.moveTo(%s, %s)" % (x1, y1))
                 pyautogui.moveTo(x1, y1, 0.25, pyautogui.easeOutQuad)
                 self.__add_light_pause()
                 if "--debug" in sys.argv:
-                    print(" <DEBUG> pyautogui.moveTo(%s, %s)" % (x1, y1))
+                    print(" <DEBUG> pyautogui.dragTo(%s, %s)" % (x2, y2))
                 pyautogui.dragTo(x2, y2, button="left", duration=timeframe)
         else:
             # Called from a method where the gui_lock is already active
+            if "--debug" in sys.argv:
+                print(" <DEBUG> pyautogui.moveTo(%s, %s)" % (x1, y1))
             pyautogui.moveTo(x1, y1, 0.25, pyautogui.easeOutQuad)
             self.__add_light_pause()
             if "--debug" in sys.argv:
@@ -2156,16 +2314,16 @@ class CDPMethods():
         if uc_lock:
             gui_lock = FileLock(constants.MultiBrowser.PYAUTOGUILOCK)
             with gui_lock:  # Prevent issues with multiple processes
-                pyautogui.moveTo(x, y, timeframe, pyautogui.easeOutQuad)
-                time.sleep(0.056)
                 if "--debug" in sys.argv:
                     print(" <DEBUG> pyautogui.moveTo(%s, %s)" % (x, y))
+                pyautogui.moveTo(x, y, timeframe, pyautogui.easeOutQuad)
+                time.sleep(0.056)
         else:
             # Called from a method where the gui_lock is already active
-            pyautogui.moveTo(x, y, timeframe, pyautogui.easeOutQuad)
-            time.sleep(0.056)
             if "--debug" in sys.argv:
                 print(" <DEBUG> pyautogui.moveTo(%s, %s)" % (x, y))
+            pyautogui.moveTo(x, y, timeframe, pyautogui.easeOutQuad)
+            time.sleep(0.056)
 
     def gui_hover_x_y(self, x, y, timeframe=0.25):
         gui_lock = FileLock(constants.MultiBrowser.PYAUTOGUILOCK)
@@ -2230,7 +2388,35 @@ class CDPMethods():
             self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.wait())
 
+    def hover_element(self, selector, timeframe=0.25):
+        element = self.select(selector)
+        gui_lock = FileLock(constants.MultiBrowser.PYAUTOGUILOCK)
+        with gui_lock:
+            self.bring_active_window_to_front()
+            self.sleep(0.02)
+            element.mouse_move()
+            self.sleep(timeframe)
+
+    def hover_and_click(self, hover_selector, click_selector):
+        if getattr(sb_config, "_cdp_mobile_mode", None):
+            self.select(click_selector).click()
+            return
+        hover_element = self.select(hover_selector)
+        gui_lock = FileLock(constants.MultiBrowser.PYAUTOGUILOCK)
+        with gui_lock:
+            self.bring_active_window_to_front()
+            self.sleep(0.02)
+            hover_element.mouse_move()
+            self.sleep(0.25)
+            try:
+                self.click(click_selector, timeout=0.5)
+            except Exception:
+                self.select(click_selector, timeout=2).click()
+
     def gui_hover_and_click(self, hover_selector, click_selector):
+        if getattr(sb_config, "_cdp_mobile_mode", None):
+            self.select(click_selector).click()
+            return
         gui_lock = FileLock(constants.MultiBrowser.PYAUTOGUILOCK)
         with gui_lock:
             self.__make_sure_pyautogui_lock_is_writable()
@@ -2870,4 +3056,15 @@ class Chrome(CDPMethods):
         driver = cdp_util.start_sync(**kwargs)
         loop = asyncio.new_event_loop()
         page = loop.run_until_complete(driver.get(url))
+        wait_timeout = 30.0
+        if hasattr(sb_config, "_cdp_proxy") and sb_config._cdp_proxy:
+            wait_timeout = 45.0
+        try:
+            loop.run_until_complete(
+                asyncio.wait_for(page.wait(), timeout=wait_timeout)
+            )
+        except asyncio.TimeoutError:
+            pass
+        except Exception:
+            pass
         super().__init__(loop, page, driver)

seleniumbase/core/sb_driver.py

@@ -12,6 +12,10 @@ from seleniumbase.fixtures import shared_utils
 class DriverMethods(WebDriver):
     def __init__(self, driver):
         self.driver = driver
+        if hasattr(driver, "session_id"):
+            self.session_id = driver.session_id
+        if hasattr(driver, "command_executor"):
+            self.command_executor = driver.command_executor
 
     def __is_cdp_swap_needed(self):
         """If the driver is disconnected, use a CDP method when available."""
@@ -37,6 +41,36 @@ class DriverMethods(WebDriver):
             value, by = page_utils.swap_selector_and_by_if_reversed(value, by)
         return self.driver.default_find_elements(by=by, value=value)
 
+    def add_cookie(self, *args, **kwargs):
+        page_actions._reconnect_if_disconnected(self.driver)
+        self.driver.default_add_cookie(*args, **kwargs)
+
+    def get_cookie(self, *args, **kwargs):
+        page_actions._reconnect_if_disconnected(self.driver)
+        self.driver.default_get_cookie(*args, **kwargs)
+
+    def delete_cookie(self, *args, **kwargs):
+        page_actions._reconnect_if_disconnected(self.driver)
+        self.driver.default_delete_cookie(*args, **kwargs)
+
+    def back(self):
+        if self.__is_cdp_swap_needed():
+            self.driver.cdp.go_back()
+            return
+        self.driver.default_back()
+
+    def forward(self):
+        if self.__is_cdp_swap_needed():
+            self.driver.cdp.go_forward()
+            return
+        self.driver.default_forward()
+
+    def refresh(self, *args, **kwargs):
+        if self.__is_cdp_swap_needed():
+            self.driver.cdp.refresh(*args, **kwargs)
+            return
+        self.driver.default_refresh()
+
     def locator(self, selector, by=None):
         if not by:
             by = "css selector"
@@ -288,11 +322,8 @@ class DriverMethods(WebDriver):
                 selector = kwargs["selector"]
             else:
                 selector = args[0]
-            if ":contains(" not in selector:
-                self.driver.cdp.highlight(selector)
-                return
-            else:
-                self.driver.connect()
+            self.driver.cdp.highlight(selector)
+            return
         if "scroll" in kwargs:
             kwargs.pop("scroll")
         w_args = kwargs.copy()

seleniumbase/core/session_helper.py

@@ -3,10 +3,8 @@ from seleniumbase import config as sb_config
 
 def end_reused_class_session_as_needed():
     if (
-        hasattr(sb_config, "reuse_class_session")
-        and sb_config.reuse_class_session
-        and hasattr(sb_config, "shared_driver")
-        and sb_config.shared_driver
+        getattr(sb_config, "reuse_class_session", None)
+        and getattr(sb_config, "shared_driver", None)
     ):
         if (
             hasattr(sb_config.shared_driver, "service")