Merge pull request #102 from itk-dev-rpa/develop

2.11

Author: ghbm-itk

changelog.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.11.0] - 2025-03-24
+
+### Changed
+
+- Eflyt now using resilient browser for login to avoid stale elements
+
 ## [2.10.0] - 2025-03-20
 
 ### Changed
@@ -208,7 +214,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release
 
-[Unreleased]: https://github.com/itk-dev-rpa/ITK-dev-shared-components/compare/2.10.0...HEAD
+[Unreleased]: https://github.com/itk-dev-rpa/ITK-dev-shared-components/compare/2.11.0...HEAD
+[2.11.0]: https://github.com/itk-dev-rpa/ITK-dev-shared-components/releases/tag/2.11.0
 [2.10.0]: https://github.com/itk-dev-rpa/ITK-dev-shared-components/releases/tag/2.10.0
 [2.9.0]: https://github.com/itk-dev-rpa/ITK-dev-shared-components/releases/tag/2.9.0
 [2.8.1]: https://github.com/itk-dev-rpa/ITK-dev-shared-components/releases/tag/2.8.1

itk_dev_shared_components/eflyt/eflyt_login.py

@@ -1,10 +1,25 @@
 """Module for logging into Eflyt/Daedalus/Whatchamacallit using Selenium"""
+import time
+
 from selenium import webdriver
 from selenium.webdriver.common.by import By
-from selenium.common.exceptions import NoSuchElementException
+from selenium.webdriver.remote.webelement import WebElement
+from selenium.common.exceptions import NoSuchElementException, StaleElementReferenceException
+
+
+class ResilientBrowser(webdriver.Chrome):
+    """A webdriver.Chrome subclass that retries find_element if the element goes stale."""
+    def find_element(self, by=By.ID, value = None) -> WebElement:
+        element = super().find_element(by, value)
+        time.sleep(0.1)
+        try:
+            element.tag_name
+        except StaleElementReferenceException:
+            element = super().find_element(by, value)
+        return element
 
 
-def login(username: str, password: str) -> webdriver.Chrome:
+def login(username: str, password: str) -> ResilientBrowser:
     """Log into Eflyt using a password and username.
 
     Args:
@@ -13,8 +28,9 @@ def login(username: str, password: str) -> webdriver.Chrome:
     """
     chrome_options = webdriver.ChromeOptions()
     chrome_options.add_argument("--disable-search-engine-choice-screen")
-    browser = webdriver.Chrome(options=chrome_options)
+    browser = ResilientBrowser(options=chrome_options)
     browser.maximize_window()
+    browser.implicitly_wait(2)
 
     browser.get("https://notuskommunal.scandihealth.net/")
     browser.find_element(By.ID, "Login1_UserName").send_keys(username)

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itk_dev_shared_components"
-version = "2.10.0"
+version = "2.11.0"
 authors = [
   { name="ITK Development", email="[email protected]" },
 ]