wcp-library 1.4.7__py3-none-any.whl → 1.5.2__py3-none-any.whl

wcp_library/{selenium_helper.py → selenium/_selenium_driver.py}

@@ -1,40 +1,20 @@
-from pathlib import Path
+from abc import ABC
+from dataclasses import field
 from typing import Optional
 
-from selenium import webdriver
 from selenium.webdriver.common.by import By
-from selenium.webdriver.chrome.service import Service
+from selenium.webdriver.remote.webelement import WebElement
 from selenium.webdriver.support import expected_conditions
 from selenium.webdriver.support.wait import WebDriverWait
-from selenium.webdriver.remote.webelement import WebElement
-from webdriver_manager.chrome import ChromeDriverManager
 
 
-class SeleniumHelper:
-    def __init__(self, headless: bool = False, download_path: Optional[Path] = None):
+class SeleniumDriver(ABC):
+    def __init__(self, headless: bool = True, download_path: str = None):
         self._headless = headless
         self._download_path = download_path
+        self.driver = field(init=False)
 
-        opt = webdriver.ChromeOptions()
-        opt.add_argument("--start-maximized")
-        if headless:
-            opt.add_argument('headless')
-
-        opt.page_load_strategy = 'eager'
-
-        experimental_options_dict = {"download.prompt_for_download": False,
-                                        "download.directory_upgrade": True,
-                                        "safebrowsing.enabled": True}
-        if download_path:
-            experimental_options_dict["download.default_directory"] = str(download_path)
-
-        opt.add_experimental_option("prefs", experimental_options_dict)
-        opt.timeouts = {'implicit': 5000}
-
-        self.driver = webdriver.Chrome(service=Service(ChromeDriverManager().install()), options=opt)
-
-
-    def find_button_by_text(self, text: str) -> WebElement:
+    def find_button_by_text(self, text: str) -> WebElement | None:
         """
         Find a button by its text
 
@@ -52,7 +32,7 @@ class SeleniumHelper:
             if text in b.text:
                 return b
 
-    def find_span_by_text(self, text: str) -> WebElement:
+    def find_span_by_text(self, text: str) -> WebElement | None:
         """
         Find a span by its text
 
@@ -105,4 +85,4 @@ class SeleniumHelper:
         if css_element:
             WebDriverWait(self.driver, timeout).until(expected_conditions.element_to_be_clickable((By.CSS_SELECTOR, css_element)))
         elif link_text:
-            WebDriverWait(self.driver, timeout).until(expected_conditions.element_to_be_clickable((By.LINK_TEXT, link_text)))
+            WebDriverWait(self.driver, timeout).until(expected_conditions.element_to_be_clickable((By.LINK_TEXT, link_text)))

wcp_library/selenium/selenium_helper.py

@@ -0,0 +1,53 @@
+from pathlib import Path
+from typing import Optional
+
+from get_gecko_driver import GetGeckoDriver
+from selenium import webdriver
+from selenium.webdriver.chrome.service import Service
+from webdriver_manager.chrome import ChromeDriverManager
+
+from wcp_library.selenium._selenium_driver import SeleniumDriver
+
+
+class ChromeSeleniumHelper(SeleniumDriver):
+    def __init__(self, headless: bool = False, download_path: Optional[Path] = None):
+        super().__init__(headless, download_path)
+
+        opt = webdriver.ChromeOptions()
+        opt.add_argument("--start-maximized")
+        if headless:
+            opt.add_argument('headless')
+
+        opt.page_load_strategy = 'eager'
+
+        experimental_options_dict = {"download.prompt_for_download": False,
+                                        "download.directory_upgrade": True,
+                                        "safebrowsing.enabled": True}
+        if download_path:
+            experimental_options_dict["download.default_directory"] = str(download_path)
+
+        opt.add_experimental_option("prefs", experimental_options_dict)
+        opt.timeouts = {'implicit': 5000}
+
+        self.driver = webdriver.Chrome(service=Service(ChromeDriverManager().install()), options=opt)
+
+
+class FirefoxSeleniumHelper(SeleniumDriver):
+    def __init__(self, headless: bool = False, download_path: Optional[Path] = None):
+        super().__init__(headless, download_path)
+
+        opt = webdriver.FirefoxOptions()
+        opt.add_argument("--start-maximized")
+        if headless:
+            opt.add_argument('--headless')
+
+        opt.page_load_strategy = 'eager'
+
+        if download_path:
+            opt.set_preference("browser.download.folderList", 2)
+            opt.set_preference("browser.download.dir", str(download_path))
+            opt.set_preference("browser.helperApps.neverAsk.saveToDisk", "application/octet-stream")
+
+        get_driver = GetGeckoDriver()
+        get_driver.install()
+        self.driver = webdriver.Firefox(options=opt)

{wcp_library-1.4.7.dist-info → wcp_library-1.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: wcp-library
-Version: 1.4.7
+Version: 1.5.2
 Summary: Common utilites for internal development at WCP
 Author: Mitch-Petersen
 Author-email: mitch.petersen@wcap.ca
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: aiohttp (>=3.10.10,<4.0.0)
 Requires-Dist: ftputil (>=5.1.0,<6.0.0)
+Requires-Dist: get-gecko-driver (>=1.4,<2.0)
 Requires-Dist: oracledb (>=2.5.0,<3.0.0)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
 Requires-Dist: paramiko (>=3.5.0,<4.0.0)
@@ -20,7 +21,7 @@ Requires-Dist: psycopg-pool (>=3.2.3,<4.0.0)
 Requires-Dist: pycryptodome (>=3.21.0,<4.0.0)
 Requires-Dist: pytz (>=2024.2,<2025.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
-Requires-Dist: selenium (>=4.27.1,<5.0.0)
+Requires-Dist: selenium (>=4.31.0,<5.0.0)
 Requires-Dist: webdriver-manager (>=4.0.2,<5.0.0)
 Requires-Dist: yarl (>=1.17.1,<2.0.0)
 Project-URL: Documentation, https://github.com/Whitecap-DNA/WCP-Library/wiki

{wcp_library-1.4.7.dist-info → wcp_library-1.5.2.dist-info}/RECORD

@@ -13,11 +13,13 @@ wcp_library/ftp/ftp.py,sha256=EpyW0J2QIGxP8zVGD4VarA0hi4C2XAPDPF-0j2sRdpI,4350
 wcp_library/ftp/sftp.py,sha256=hykXGLGdxe7DYAxFdTwjPjTEOYuIpSMyK3NOiTQNUK0,4176
 wcp_library/informatica.py,sha256=_g9lzSd-JLsY4e5_g6YcxQtOxP6fkg4sGfvNJaAN7jY,8123
 wcp_library/logging.py,sha256=e6gG7HFgUrMajUZs4Gs0atFfOJJmdmxN0GerfynNWlY,2061
-wcp_library/selenium_helper.py,sha256=w8YUC0pq7TkWiobc2ri4QR5fcHrrZgB5RAEfAdxZiuk,3780
+wcp_library/selenium/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wcp_library/selenium/_selenium_driver.py,sha256=Es83ISNryOVhYGDo_xrr8nCLsbnVBeXsaz1sRiz7kLI,2961
+wcp_library/selenium/selenium_helper.py,sha256=OJvC0RlblfMWhmjNxiY582yuzkDgjzFZMuRz_8to3PY,2000
 wcp_library/sql/__init__.py,sha256=ocKH9-1HPDF5OhUKkpby3uNvQ6RBt2YD81nwwS90PgE,1980
 wcp_library/sql/oracle.py,sha256=jcGoH2iGkgxW-RJV5FRf_CwNzilkxPN6_pJ27te5Qe0,15815
 wcp_library/sql/postgres.py,sha256=Kfj5kfNwLyhE6bZIcqj6tjpbiGSyAMErY_Kr9eGm-2Q,14814
 wcp_library/time.py,sha256=ktSzhK7SZnGPNXobFexnhFGQAcriLCJQKxnO0fed8fQ,1740
-wcp_library-1.4.7.dist-info/METADATA,sha256=RGM4LGpK-JwoauS4O45Cgi8yBM2Vehz_thSD46YvONY,1497
-wcp_library-1.4.7.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-wcp_library-1.4.7.dist-info/RECORD,,
+wcp_library-1.5.2.dist-info/METADATA,sha256=WTa7ysh6BYW1KR4y5JBpcX_njy8lFOVcC4_uPkfSvpA,1542
+wcp_library-1.5.2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+wcp_library-1.5.2.dist-info/RECORD,,

{wcp_library-1.4.7.dist-info → wcp_library-1.5.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.1
+Generator: poetry-core 2.1.2
 Root-Is-Purelib: true
 Tag: py3-none-any