wcp-library 1.6.5__tar.gz → 1.6.7__tar.gz

{wcp_library-1.6.5 → wcp_library-1.6.7}/PKG-INFO

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

{wcp_library-1.6.5 → wcp_library-1.6.7}/pyproject.toml

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

{wcp_library-1.6.5 → wcp_library-1.6.7}/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.5 → wcp_library-1.6.7}/wcp_library/sql/__init__.py

@@ -25,8 +25,10 @@ def retry(func: callable) -> callable:
                 return func(self, *args, **kwargs)
             except (oracledb.OperationalError, oracledb.DatabaseError, psycopg.OperationalError) as e:
                 if isinstance(e, (oracledb.OperationalError, oracledb.DatabaseError, psycopg.OperationalError, psycopg.DatabaseError)):
-                    error_obj, = e.args
-                    if error_obj.full_code in self.retry_error_codes and self._retry_count < self.retry_limit:
+                    (error_obj,) = e.args
+                    if isinstance(error_obj, str):
+                        raise e
+                    elif error_obj.full_code in self.retry_error_codes and self._retry_count < self.retry_limit:
                         self._retry_count += 1
                         logger.debug("Oracle connection error")
                         logger.debug(error_obj.message)
@@ -55,7 +57,9 @@ def async_retry(func: callable) -> callable:
             except (oracledb.OperationalError, oracledb.DatabaseError, psycopg.OperationalError) as e:
                 if isinstance(e, (oracledb.OperationalError, oracledb.DatabaseError, psycopg.OperationalError, psycopg.DatabaseError)):
                     error_obj, = e.args
-                    if error_obj.full_code in self.retry_error_codes and self._retry_count < self.retry_limit:
+                    if isinstance(error_obj, str):
+                        raise e
+                    elif error_obj.full_code in self.retry_error_codes and self._retry_count < self.retry_limit:
                         self._retry_count += 1
                         logger.debug(f"{self._db_service} connection error")
                         logger.debug(error_obj.message)

{wcp_library-1.6.5 → wcp_library-1.6.7}/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: