wcp-library 1.5.4__tar.gz → 1.5.7__tar.gz

{wcp_library-1.5.4 → wcp_library-1.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: wcp-library
-Version: 1.5.4
+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.4 → wcp_library-1.5.7}/pyproject.toml

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

wcp_library-1.5.7/wcp_library/sql/__init__.py

@@ -0,0 +1,68 @@
+import asyncio
+import logging
+from functools import wraps
+from time import sleep
+
+import oracledb
+import psycopg
+
+logger = logging.getLogger(__name__)
+
+
+def retry(f: callable) -> callable:
+    """
+    Decorator to retry a function
+
+    :param f: function
+    :return: function
+    """
+
+    @wraps(f)
+    def wrapper(self, *args, **kwargs):
+        self._retry_count = 0
+        while True:
+            try:
+                return f(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:
+                        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
+
+
+def async_retry(f: callable) -> callable:
+    """
+    Decorator to retry a function
+
+    :param f: function
+    :return: function
+    """
+
+    @wraps(f)
+    async def wrapper(self, *args, **kwargs):
+        self._retry_count = 0
+        while True:
+            try:
+                return await f(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:
+                        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-1.5.4 → wcp_library-1.5.7}/wcp_library/sql/postgres.py

@@ -62,7 +62,8 @@ async def _async_connect_warehouse(username: str, password: str, hostname: str,
         conninfo=conninfo,
         min_size=min_connections,
         max_size=max_connections,
-        kwargs={"options": "-c datestyle=ISO,YMD"}
+        kwargs={"options": "-c datestyle=ISO,YMD"},
+        open=False
     )
     return session_pool
 

wcp_library-1.5.4/wcp_library/sql/__init__.py

@@ -1,63 +0,0 @@
-import asyncio
-import logging
-from functools import wraps
-from time import sleep
-
-import oracledb
-import psycopg
-
-logger = logging.getLogger(__name__)
-
-
-def retry(f: callable) -> callable:
-    """
-    Decorator to retry a function
-
-    :param f: function
-    :return: function
-    """
-
-    @wraps(f)
-    def wrapper(self, *args, **kwargs):
-        self._retry_count = 0
-        while True:
-            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
-    return wrapper
-
-
-def async_retry(f: callable) -> callable:
-    """
-    Decorator to retry a function
-
-    :param f: function
-    :return: function
-    """
-
-    @wraps(f)
-    async def wrapper(self, *args, **kwargs):
-        self._retry_count = 0
-        while True:
-            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)
-                else:
-                    raise e
-    return wrapper