wcp-library 1.6.4__py3-none-any.whl → 1.6.6__py3-none-any.whl

wcp_library/__init__.py

@@ -42,24 +42,21 @@ def divide_chunks(list_obj: list, size: int) -> Generator:
 
 
 def retry(
-    exception: Type[Exception],
+    exceptions: tuple[Type[Exception]],
     max_attempts: Optional[int] = MAX_ATTEMPTS,
     delay: Optional[int] = DELAY,
     backoff: Optional[int] = BACKOFF,
     jitter: Optional[int] = JITTER,
 ) -> Callable:
-    """Decorator to retry a synchronous function on a specified exception with
-        exponential backoff and jitter.
-
-    Args:
-        exception (Type[Exception]): The exception type to catch and retry on.
-        max_attempts (int): Maximum number of retry attempts.
-        delay (int): Initial delay between retries (in seconds).
-        backoff (int): Multiplier to increase delay after each failure.
-        jitter (int): Maximum number of seconds to add randomly to each delay.
-
-    Returns:
-        Callable: The decorated function with retry logic.
+    """
+    Decorator to retry a synchronous function on a specified exception with exponential backoff and jitter.
+
+    :param exceptions: Tuple of exception types to catch and retry on.
+    :param max_attempts: Maximum number of retry attempts.
+    :param delay: Initial delay between retries (in seconds).
+    :param backoff: Multiplier to increase delay after each failure.
+    :param jitter: Maximum number of seconds to add randomly to each delay.
+    :return: The decorated function with retry logic.
     """
 
     def decorator(func: Callable) -> Callable:
@@ -70,7 +67,7 @@ def retry(
             for attempt in range(0, max_attempts):
                 try:
                     return func(*args, **kwargs)
-                except exception as error:
+                except exceptions as error:
                     if attempt == max_attempts:
                         logger.error("Retry failed after %d attempts.", max_attempts)
                         raise
@@ -90,24 +87,21 @@ def retry(
 
 
 def async_retry(
-    exception: Type[Exception],
+    exceptions: tuple[Type[Exception]],
     max_attempts: Optional[int] = MAX_ATTEMPTS,
     delay: Optional[int] = DELAY,
     backoff: Optional[int] = BACKOFF,
     jitter: Optional[int] = JITTER,
 ) -> Callable:
-    """Decorator to retry an async function on a specified exception
-        with exponential backoff and jitter.
-
-    Args:
-        exception (Type[Exception]): The exception type to catch and retry on.
-        max_attempts (int): Maximum number of retry attempts.
-        delay (int): Initial delay between retries (in seconds).
-        backoff (int): Multiplier to increase delay after each failure.
-        jitter (int): Maximum number of seconds to add randomly to each delay.
-
-    Returns:
-        Callable: The decorated async function with retry logic.
+    """
+    Decorator to retry an async function on a specified exception with exponential backoff and jitter.
+
+    :param exceptions: Tuple of exception types to catch and retry on.
+    :param max_attempts: Maximum number of retry attempts.
+    :param delay: Initial delay between retries (in seconds).
+    :param backoff: Multiplier to increase delay after each failure.
+    :param jitter: Maximum number of seconds to add randomly to each delay.
+    :return: The decorated async function with retry logic.
     """
 
     def decorator(func: Callable) -> Callable:
@@ -118,7 +112,7 @@ def async_retry(
             for attempt in range(0, max_attempts):
                 try:
                     return await func(*args, **kwargs)
-                except exception as error:
+                except exceptions as error:
                     if attempt == max_attempts:
                         logger.error("Retry failed after %d attempts.", max_attempts)
                         raise

wcp_library/ftp/ftp.py

@@ -17,7 +17,7 @@ class FTP:
 
         self._ftp_factory: ftputil.session.session_factory = ftputil.session.session_factory(port=self.port)
         self.ftp_connection: Optional[ftputil.FTPHost] = None if not (self._username and self._password) \
-            else ftputil.FTPHost(self.host, self._username, self._password, session_factory=self._ftp_factory)
+            else ftputil.FTPHost(self.host, self._username, self._password) #, session_factory=self._ftp_factory)
 
     def login(self, username: str, password: str) -> None:
         """

wcp_library/sql/oracle.py

@@ -9,6 +9,7 @@ from oracledb import ConnectionPool, AsyncConnectionPool, Connection, AsyncConne
 from wcp_library.sql import retry, async_retry
 
 logger = logging.getLogger(__name__)
+oracledb.defaults.fetch_lobs = False
 
 
 def _connect_warehouse(username: str, password: str, hostname: str, port: int, database: str, min_connections: int,
@@ -44,7 +45,7 @@ def _connect_warehouse(username: str, password: str, hostname: str, port: int, d
         connection = oracledb.connect(
             user=username,
             password=password,
-            dsn=oracledb.makedsn(hostname, port, sid=database)
+            dsn=oracledb.makedsn(hostname, port, service_name=database)
         )
         return connection
 
@@ -82,7 +83,7 @@ async def _async_connect_warehouse(username: str, password: str, hostname: str,
         connection = await oracledb.connect_async(
             user=username,
             password=password,
-            dsn=oracledb.makedsn(hostname, port, sid=database)
+            dsn=oracledb.makedsn(hostname, port, service_name=database)
         )
         return connection
 
@@ -113,7 +114,7 @@ class OracleConnection(object):
 
         self._retry_count = 0
         self.retry_limit = 50
-        self.retry_error_codes = ['ORA-01033', 'DPY-6005', 'DPY-4011', 'ORA-08103']
+        self.retry_error_codes = ['ORA-01033', 'DPY-6005', 'DPY-4011', 'ORA-08103', 'ORA-04021']
 
     @retry
     def _connect(self) -> None:
@@ -392,7 +393,7 @@ class AsyncOracleConnection(object):
 
         self._retry_count = 0
         self.retry_limit = 50
-        self.retry_error_codes = ['ORA-01033', 'DPY-6005', 'DPY-4011', 'ORA-08103']
+        self.retry_error_codes = ['ORA-01033', 'DPY-6005', 'DPY-4011', 'ORA-08103', 'ORA-04021']
 
     @async_retry
     async def _connect(self) -> None:

{wcp_library-1.6.4.dist-info → wcp_library-1.6.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: wcp-library
-Version: 1.6.4
+Version: 1.6.6
 Summary: Common utilites for internal development at WCP
 Author: Mitch-Petersen
 Author-email: mitch.petersen@wcap.ca

{wcp_library-1.6.4.dist-info → wcp_library-1.6.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-wcp_library/__init__.py,sha256=LYRBTbKUbnqHJooAKL2pzJykJ1wFwZfvqUM4LT0gCFo,4328
+wcp_library/__init__.py,sha256=kfv5jNFXKn_iHjGUOp_UDtqAFiogpVRcn4Tpmkho52o,4242
 wcp_library/browser_automation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wcp_library/browser_automation/browser.py,sha256=06xKu_lLifRzfj1TBlpZmKUeBoMqa7ye8kj0Aoy27uI,14551
 wcp_library/browser_automation/interactions.py,sha256=YTYyII81M9qoVU_iYXoF5vHCc1PSj60hStPU-nT-qyA,28941
@@ -12,7 +12,7 @@ wcp_library/credentials/oracle.py,sha256=OV02op95LNUT21cNDM4zDbD63C1ldiq--vYofDp
 wcp_library/credentials/postgres.py,sha256=B5qNPKYzuzOJZ5S4M3MCN4xUelvZ6AgyR6QJc4z0Cgo,2573
 wcp_library/emailing.py,sha256=g6g9ZHIMBq6fzUFEjhB54WnJOj0cZFVbjLsB29zAVlY,3135
 wcp_library/ftp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wcp_library/ftp/ftp.py,sha256=Zg8WMYfzUGnpqimLjtCuKyrtNGtv0Syupgi-rh_al00,3985
+wcp_library/ftp/ftp.py,sha256=_G_AGyhFAUFdO0idkIDZj2cCApF9dJSXGEHqGyvCHdg,3988
 wcp_library/ftp/sftp.py,sha256=hykXGLGdxe7DYAxFdTwjPjTEOYuIpSMyK3NOiTQNUK0,4176
 wcp_library/informatica.py,sha256=_g9lzSd-JLsY4e5_g6YcxQtOxP6fkg4sGfvNJaAN7jY,8123
 wcp_library/logging.py,sha256=e6gG7HFgUrMajUZs4Gs0atFfOJJmdmxN0GerfynNWlY,2061
@@ -20,9 +20,9 @@ wcp_library/selenium/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 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=f0JyVyFyUjueQ1XdVmCgmRjzkFENmFKl3BOzrvv3i1I,2422
-wcp_library/sql/oracle.py,sha256=GpqUn7srm4mGxeJAU06tHaMR37zxASSdMZJ3h8KTC-U,19240
+wcp_library/sql/oracle.py,sha256=hsZbnuCxEZuUdZ8Z4FVRjxAcIjkMNkHMzLEAiT51nQY,19321
 wcp_library/sql/postgres.py,sha256=cLOurfmad3WqJcE7FiSxUyzo_0patpfMcTfQAoiteuU,18525
 wcp_library/time.py,sha256=ktSzhK7SZnGPNXobFexnhFGQAcriLCJQKxnO0fed8fQ,1740
-wcp_library-1.6.4.dist-info/METADATA,sha256=AH0_KH7Y4RIA41vVgAtr897soW-s0UmaUYDV_g408mA,1393
-wcp_library-1.6.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-wcp_library-1.6.4.dist-info/RECORD,,
+wcp_library-1.6.6.dist-info/METADATA,sha256=it5SD45PMZplcIY5Zmh6EAR7dPmY74L7DF9Q4AupgUI,1393
+wcp_library-1.6.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+wcp_library-1.6.6.dist-info/RECORD,,