wcp-library 1.1.8__tar.gz → 1.2.1__tar.gz

{wcp_library-1.1.8 → wcp_library-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wcp-library
-Version: 1.1.8
+Version: 1.2.1
 Summary: Common utilites for internal development at WCP
 Home-page: https://github.com/Whitecap-DNA/WCP-Library
 Author: Mitch-Petersen
@@ -20,6 +20,8 @@ Requires-Dist: psycopg-binary (>=3.2.3,<4.0.0)
 Requires-Dist: psycopg-pool (>=3.2.3,<4.0.0)
 Requires-Dist: pycryptodome (>=3.21.0,<4.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
+Requires-Dist: selenium (>=4.27.1,<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
 Project-URL: Repository, https://github.com/Whitecap-DNA/WCP-Library

{wcp_library-1.1.8 → wcp_library-1.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wcp-library"
-version = "1.1.8"
+version = "1.2.1"
 description = "Common utilites for internal development at WCP"
 authors = ["Mitch-Petersen <mitch.petersen@wcap.ca>"]
 readme = "README.md"
@@ -21,6 +21,8 @@ psycopg-binary = "^3.2.3"
 psycopg-pool = "^3.2.3"
 pycryptodome = "^3.21.0"
 requests = "^2.32.3"
+selenium = "^4.27.1"
+webdriver-manager = "^4.0.2"
 yarl = "^1.17.1"
 
 [build-system]

{wcp_library-1.1.8 → wcp_library-1.2.1}/wcp_library/async_sql/oracle.py

@@ -1,6 +1,7 @@
 import logging
 from typing import Optional
 
+import numpy as np
 import pandas as pd
 import oracledb
 from oracledb import AsyncConnectionPool
@@ -204,14 +205,17 @@ class AsyncOracleConnection(object):
             bindList.append(':' + column)
         bind = ', '.join(bindList)
 
-        main_dict = dfObj.to_dict('records')
         if remove_nan:
-            for val, item in enumerate(main_dict):
-                for sub_item, value in item.items():
-                    if pd.isna(value):
-                        main_dict[val][sub_item] = None
-                    else:
-                        main_dict[val][sub_item] = value
+            dfObj = dfObj.replace({np.nan: None})
+        main_dict = dfObj.to_dict('records')
+
+        # if remove_nan:
+        #     for val, item in enumerate(main_dict):
+        #         for sub_item, value in item.items():
+        #             if pd.isna(value):
+        #                 main_dict[val][sub_item] = None
+        #             else:
+        #                 main_dict[val][sub_item] = value
 
         query = """INSERT INTO {} ({}) VALUES ({})""".format(outputTableName, col, bind)
         await self.execute_many(query, main_dict)

{wcp_library-1.1.8 → wcp_library-1.2.1}/wcp_library/async_sql/postgres.py

@@ -1,6 +1,7 @@
 import logging
 from typing import Optional
 
+import numpy as np
 import pandas as pd
 from psycopg.sql import SQL
 from psycopg_pool import AsyncConnectionPool
@@ -187,14 +188,17 @@ class AsyncPostgresConnection(object):
             param_list.append(f"%({column})s")
         params = ', '.join(param_list)
 
-        main_dict = dfObj.to_dict('records')
         if remove_nan:
-            for val, item in enumerate(main_dict):
-                for sub_item, value in item.items():
-                    if pd.isna(value):
-                        main_dict[val][sub_item] = None
-                    else:
-                        main_dict[val][sub_item] = value
+            dfObj = dfObj.replace({np.nan: None})
+        main_dict = dfObj.to_dict('records')
+
+        # if remove_nan:
+        #     for val, item in enumerate(main_dict):
+        #         for sub_item, value in item.items():
+        #             if pd.isna(value):
+        #                 main_dict[val][sub_item] = None
+        #             else:
+        #                 main_dict[val][sub_item] = value
 
         query = """INSERT INTO {} ({}) VALUES ({})""".format(outputTableName, col, params)
         await self.execute_many(query, main_dict)

wcp_library-1.2.1/wcp_library/selenium_helper.py

@@ -0,0 +1,77 @@
+from pathlib import Path
+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.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):
+        self._headless = headless
+        self._download_path = 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)
+
+
+    def find_button_by_text(self, text: str) -> WebElement:
+        """
+        Find a button by its text
+
+        :param text:
+        :return button element:
+        """
+
+        buttons = self.driver.find_elements(By.TAG_NAME, 'Button')
+        for b in buttons:
+            if b.text == text:
+                return b
+
+        # If there is something weird with the button text, this should find it
+        for b in buttons:
+            if text in b.text:
+                return b
+
+    def find_span_by_text(self, text: str) -> WebElement:
+        """
+        Find a span by its text
+
+        :param text:
+        :return span element:
+        """
+
+        buttons = self.driver.find_elements(By.TAG_NAME, 'Span')
+        for b in buttons:
+            if b.text == text:
+                return b
+
+    def wait_until_element_visible(self, css_element: str, timeout: int = 30) -> None:
+        """
+        Wait until an element is visible
+
+        :param css_element:
+        :param timeout:
+        :return:
+        """
+
+        WebDriverWait(self.driver, timeout).until(expected_conditions.presence_of_element_located((By.CSS_SELECTOR, css_element)))

{wcp_library-1.1.8 → wcp_library-1.2.1}/wcp_library/sql/oracle.py

@@ -1,6 +1,7 @@
 import logging
 from typing import Optional
 
+import numpy as np
 import pandas as pd
 import oracledb
 from oracledb import ConnectionPool
@@ -208,14 +209,17 @@ class OracleConnection(object):
             bindList.append(':' + column)
         bind = ', '.join(bindList)
 
-        main_dict = dfObj.to_dict('records')
         if remove_nan:
-            for val, item in enumerate(main_dict):
-                for sub_item, value in item.items():
-                    if pd.isna(value):
-                        main_dict[val][sub_item] = None
-                    else:
-                        main_dict[val][sub_item] = value
+            dfObj = dfObj.replace({np.nan: None})
+        main_dict = dfObj.to_dict('records')
+
+        # if remove_nan:
+        #     for val, item in enumerate(main_dict):
+        #         for sub_item, value in item.items():
+        #             if pd.isna(value):
+        #                 main_dict[val][sub_item] = None
+        #             else:
+        #                 main_dict[val][sub_item] = value
 
         query = """INSERT INTO {} ({}) VALUES ({})""".format(outputTableName, col, bind)
         self.execute_many(query, main_dict)

{wcp_library-1.1.8 → wcp_library-1.2.1}/wcp_library/sql/postgres.py

@@ -1,6 +1,7 @@
 import logging
 from typing import Optional
 
+import numpy as np
 import pandas as pd
 from psycopg.sql import SQL
 from psycopg_pool import ConnectionPool
@@ -187,14 +188,17 @@ class PostgresConnection(object):
             param_list.append(f"%({column})s")
         params = ', '.join(param_list)
 
-        main_dict = dfObj.to_dict('records')
         if remove_nan:
-            for val, item in enumerate(main_dict):
-                for sub_item, value in item.items():
-                    if pd.isna(value):
-                        main_dict[val][sub_item] = None
-                    else:
-                        main_dict[val][sub_item] = value
+            dfObj = dfObj.replace({np.nan: None})
+        main_dict = dfObj.to_dict('records')
+
+        # if remove_nan:
+        #     for val, item in enumerate(main_dict):
+        #         for sub_item, value in item.items():
+        #             if pd.isna(value):
+        #                 main_dict[val][sub_item] = None
+        #             else:
+        #                 main_dict[val][sub_item] = value
 
         query = """INSERT INTO {} ({}) VALUES ({})""".format(outputTableName, col, params)
         self.execute_many(query, main_dict)