wcp-library 1.4.6__tar.gz → 1.5.1__tar.gz

{wcp_library-1.4.6 → wcp_library-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: wcp-library
-Version: 1.4.6
+Version: 1.5.1
 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.6 → wcp_library-1.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wcp-library"
-version = "1.4.6"
+version = "1.5.1"
 description = "Common utilites for internal development at WCP"
 authors = ["Mitch-Petersen <mitch.petersen@wcap.ca>"]
 readme = "README.md"
@@ -12,6 +12,7 @@ packages = [{include = "wcp_library"}]
 python = "^3.12"
 aiohttp = "^3.10.10"
 ftputil = "^5.1.0"
+get-gecko-driver = "^1.4"
 oracledb = "^2.5.0"
 pandas = "^2.2.3"
 paramiko = "^3.5.0"
@@ -20,11 +21,11 @@ psycopg = "^3.2.3"
 psycopg-binary = "^3.2.3"
 psycopg-pool = "^3.2.3"
 pycryptodome = "^3.21.0"
+pytz = "^2024.2"
 requests = "^2.32.3"
-selenium = "^4.27.1"
+selenium = "^4.31.0"
 webdriver-manager = "^4.0.2"
 yarl = "^1.17.1"
-pytz = "^2024.2"
 
 [build-system]
 requires = ["poetry-core"]

wcp_library-1.4.6/wcp_library/selenium_helper.py → wcp_library-1.5.1/wcp_library/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-1.5.1/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.6 → wcp_library-1.5.1}/wcp_library/sql/__init__.py

@@ -23,7 +23,7 @@ def retry(f: callable) -> callable:
         while True:
             try:
                 return f(self, *args, **kwargs)
-            except (oracledb.OperationalError, psycopg.OperationalError) as e:
+            except (oracledb.OperationalError, oracledb.DatabaseError, psycopg.OperationalError) as e:
                 error_obj, = e.args
                 if error_obj.full_code in self.retry_error_codes and self._retry_count < self.retry_limit:
                     self._retry_count += 1
@@ -50,7 +50,7 @@ def async_retry(f: callable) -> callable:
         while True:
             try:
                 return await f(self, *args, **kwargs)
-            except (oracledb.OperationalError, psycopg.OperationalError) as e:
+            except (oracledb.OperationalError, oracledb.DatabaseError, psycopg.OperationalError) as e:
                 error_obj, = e.args
                 if error_obj.full_code in self.retry_error_codes and self._retry_count < self.retry_limit:
                     self._retry_count += 1