wcp-library 1.5.3__py3-none-any.whl → 1.5.7__py3-none-any.whl

wcp_library/sql/__init__.py

@@ -24,15 +24,17 @@ def retry(f: callable) -> callable:
             try:
                 return f(self, *args, **kwargs)
             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
-                    logger.debug("Oracle connection error")
-                    logger.debug(error_obj.message)
-                    logger.info("Waiting 5 minutes before retrying Oracle connection")
-                    sleep(300)
-                else:
-                    raise 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:
+                        self._retry_count += 1
+                        logger.debug("Oracle connection error")
+                        logger.debug(error_obj.message)
+                        logger.info("Waiting 5 minutes before retrying Oracle connection")
+                        sleep(300)
+                    else:
+                        raise e
+                raise e
     return wrapper
 
 
@@ -51,13 +53,16 @@ def async_retry(f: callable) -> callable:
             try:
                 return await f(self, *args, **kwargs)
             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
-                    logger.debug(f"{self._db_service} connection error")
-                    logger.debug(error_obj.message)
-                    logger.info("Waiting 5 minutes before retrying Oracle connection")
-                    await asyncio.sleep(300)
+                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:
+                        self._retry_count += 1
+                        logger.debug(f"{self._db_service} connection error")
+                        logger.debug(error_obj.message)
+                        logger.info("Waiting 5 minutes before retrying Oracle connection")
+                        await asyncio.sleep(300)
+                    else:
+                        raise e
                 else:
                     raise e
     return wrapper

wcp_library/sql/postgres.py

@@ -34,6 +34,7 @@ def _connect_warehouse(username: str, password: str, hostname: str, port: int, d
         conninfo=conninfo,
         min_size=min_connections,
         max_size=max_connections,
+        kwargs={'options': '-c datestyle=ISO,YMD'},
         open=True
     )
     return session_pool
@@ -60,7 +61,9 @@ async def _async_connect_warehouse(username: str, password: str, hostname: str,
     session_pool = AsyncConnectionPool(
         conninfo=conninfo,
         min_size=min_connections,
-        max_size=max_connections
+        max_size=max_connections,
+        kwargs={"options": "-c datestyle=ISO,YMD"},
+        open=False
     )
     return session_pool
 

{wcp_library-1.5.3.dist-info → wcp_library-1.5.7.dist-info}/METADATA

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

{wcp_library-1.5.3.dist-info → wcp_library-1.5.7.dist-info}/RECORD

@@ -16,10 +16,10 @@ wcp_library/logging.py,sha256=e6gG7HFgUrMajUZs4Gs0atFfOJJmdmxN0GerfynNWlY,2061
 wcp_library/selenium/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=ocKH9-1HPDF5OhUKkpby3uNvQ6RBt2YD81nwwS90PgE,1980
+wcp_library/sql/__init__.py,sha256=y8piBAFI-fkERf7EFND9_QW9h07x611Ts34oCw8SxWk,2398
 wcp_library/sql/oracle.py,sha256=jcGoH2iGkgxW-RJV5FRf_CwNzilkxPN6_pJ27te5Qe0,15815
-wcp_library/sql/postgres.py,sha256=Kfj5kfNwLyhE6bZIcqj6tjpbiGSyAMErY_Kr9eGm-2Q,14814
+wcp_library/sql/postgres.py,sha256=lPcsmX0ejEgCRmNKWL9Wp_7R8sop5_KcWmpLieTGT1I,14938
 wcp_library/time.py,sha256=ktSzhK7SZnGPNXobFexnhFGQAcriLCJQKxnO0fed8fQ,1740
-wcp_library-1.5.3.dist-info/METADATA,sha256=uzFALds71R1BdBU0rvUf9CBgbcUSJadWvl4IqN-Vfd4,1393
-wcp_library-1.5.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-wcp_library-1.5.3.dist-info/RECORD,,
+wcp_library-1.5.7.dist-info/METADATA,sha256=PI070ZPfRL_G02UHH2nJu2Nd5wA_RbOb3_szlGZF940,1393
+wcp_library-1.5.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+wcp_library-1.5.7.dist-info/RECORD,,