wcp-library 1.6.4__tar.gz → 1.6.6__tar.gz

{wcp_library-1.6.4 → wcp_library-1.6.6}/PKG-INFO

@@ -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 → wcp_library-1.6.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "wcp-library"
-version = "1.6.4"
+version = "1.6.6"
 description = "Common utilites for internal development at WCP"
 authors = [{name="Mitch-Petersen", email="mitch.petersen@wcap.ca"}]
 readme = "README.md"

{wcp_library-1.6.4 → wcp_library-1.6.6}/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-1.6.4 → wcp_library-1.6.6}/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-1.6.4 → wcp_library-1.6.6}/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: