wcp-library 1.0.4__py3-none-any.whl → 1.0.6__py3-none-any.whl

wcp_library/__init__.py

@@ -11,4 +11,4 @@ if getattr(sys, 'frozen', False):
     application_path = sys.executable + '-'
     application_path = Path(application_path).parent
 else:
-    application_path = Path(os.path.dirname(os.path.abspath(__file__)))
+    application_path = Path(os.environ['VIRTUAL_ENV']).parent

wcp_library/async_sql/oracle.py

@@ -10,7 +10,8 @@ from wcp_library.async_sql import retry
 logger = logging.getLogger(__name__)
 
 
-async def connect_warehouse(username: str, password: str, hostname: str, port: int, database: str) -> AsyncConnectionPool:
+async def connect_warehouse(username: str, password: str, hostname: str, port: int, database: str, min_connections: int,
+                            max_connections: int) -> AsyncConnectionPool:
     """
     Create Warehouse Connection
 
@@ -19,6 +20,8 @@ async def connect_warehouse(username: str, password: str, hostname: str, port: i
     :param hostname: hostname
     :param port: port
     :param database: database
+    :param min_connections:
+    :param max_connections:
     :return: session_pool
     """
 
@@ -27,10 +30,9 @@ async def connect_warehouse(username: str, password: str, hostname: str, port: i
         user=username,
         password=password,
         dsn=dsn,
-        min=2,
-        max=5,
+        min=min_connections,
+        max=max_connections,
         increment=1,
-        threaded=True,
         encoding="UTF-8"
     )
     return session_pool
@@ -43,7 +45,7 @@ class AsyncOracleConnection(object):
     :return: None
     """
 
-    def __init__(self):
+    def __init__(self, min_connections: int = 2, max_connections: int = 5):
         self._db_service: str = "Oracle"
         self._username: Optional[str] = None
         self._password: Optional[str] = None
@@ -53,6 +55,9 @@ class AsyncOracleConnection(object):
         self._sid: Optional[str] = None
         self._session_pool: Optional[AsyncConnectionPool] = None
 
+        self.min_connections = min_connections
+        self.max_connections = max_connections
+
         self._retry_count = 0
         self.retry_limit = 50
         self.retry_error_codes = ['ORA-01033', 'DPY-6005', 'DPY-4011']
@@ -67,8 +72,8 @@ class AsyncOracleConnection(object):
 
         sid_or_service = self._database if self._database else self._sid
 
-        self._session_pool = connect_warehouse(self._username, self._password, self._hostname, self._port,
-                                               sid_or_service)
+        self._session_pool = await connect_warehouse(self._username, self._password, self._hostname, self._port,
+                                                     sid_or_service, self.min_connections, self.max_connections)
 
     async def set_user(self, credentials_dict: dict) -> None:
         """

wcp_library/async_sql/postgres.py

@@ -10,7 +10,8 @@ from wcp_library.async_sql import retry
 logger = logging.getLogger(__name__)
 
 
-async def connect_warehouse(username: str, password: str, hostname: str, port: int, database: str) -> AsyncConnectionPool:
+async def connect_warehouse(username: str, password: str, hostname: str, port: int, database: str, min_connections: int,
+                            max_connections: int) -> AsyncConnectionPool:
     """
     Create Warehouse Connection
 
@@ -19,6 +20,8 @@ async def connect_warehouse(username: str, password: str, hostname: str, port: i
     :param hostname: hostname
     :param port: port
     :param database: database
+    :param min_connections:
+    :param max_connections:
     :return: session_pool
     """
 
@@ -26,8 +29,8 @@ async def connect_warehouse(username: str, password: str, hostname: str, port: i
 
     session_pool = AsyncConnectionPool(
         conninfo=url,
-        min_size=2,
-        max_size=5,
+        min_size=min_connections,
+        max_size=max_connections,
     )
     await session_pool.open()
     return session_pool
@@ -40,7 +43,7 @@ class AsyncPostgresConnection(object):
     :return: None
     """
 
-    def __init__(self):
+    def __init__(self, min_connections: int = 2, max_connections: int = 5):
         self._username: Optional[str] = None
         self._password: Optional[str] = None
         self._hostname: Optional[str] = None
@@ -48,6 +51,9 @@ class AsyncPostgresConnection(object):
         self._database: Optional[str] = None
         self._session_pool: Optional[AsyncConnectionPool] = None
 
+        self.min_connections = min_connections
+        self.max_connections = max_connections
+
         self._retry_count = 0
         self.retry_limit = 50
         self.retry_error_codes = ['08001', '08004']
@@ -60,7 +66,8 @@ class AsyncPostgresConnection(object):
         :return: None
         """
 
-        self._session_pool = await connect_warehouse(self._username, self._password, self._hostname, self._port, self._database)
+        self._session_pool = await connect_warehouse(self._username, self._password, self._hostname, self._port,
+                                                     self._database, self.min_connections, self.max_connections)
 
     async def set_user(self, credentials_dict: dict) -> None:
         """

wcp_library/sql/oracle.py

@@ -10,7 +10,8 @@ from wcp_library.sql import retry
 logger = logging.getLogger(__name__)
 
 
-def connect_warehouse(username: str, password: str, hostname: str, port: int, database: str) -> ConnectionPool:
+def connect_warehouse(username: str, password: str, hostname: str, port: int, database: str, min_connections: int,
+                            max_connections: int) -> ConnectionPool:
     """
     Create Warehouse Connection
 
@@ -19,6 +20,8 @@ def connect_warehouse(username: str, password: str, hostname: str, port: int, da
     :param hostname: hostname
     :param port: port
     :param database: database
+    :param min_connections:
+    :param max_connections:
     :return: session_pool
     """
 
@@ -27,8 +30,8 @@ def connect_warehouse(username: str, password: str, hostname: str, port: int, da
         user=username,
         password=password,
         dsn=dsn,
-        min=2,
-        max=5,
+        min=min_connections,
+        max=max_connections,
         increment=1,
         threaded=True,
         encoding="UTF-8"
@@ -43,7 +46,7 @@ class OracleConnection(object):
     :return: None
     """
 
-    def __init__(self):
+    def __init__(self, min_connections: int = 2, max_connections: int = 5):
         self._username: Optional[str] = None
         self._password: Optional[str] = None
         self._hostname: Optional[str] = None
@@ -52,6 +55,9 @@ class OracleConnection(object):
         self._sid: Optional[str] = None
         self._session_pool: Optional[ConnectionPool] = None
 
+        self.min_connections = min_connections
+        self.max_connections = max_connections
+
         self._retry_count = 0
         self.retry_limit = 50
         self.retry_error_codes = ['ORA-01033', 'DPY-6005', 'DPY-4011']
@@ -66,7 +72,8 @@ class OracleConnection(object):
 
         sid_or_service = self._database if self._database else self._sid
 
-        self._session_pool = connect_warehouse(self._username, self._password, self._hostname, self._port, sid_or_service)
+        self._session_pool = connect_warehouse(self._username, self._password, self._hostname, self._port,
+                                               sid_or_service, self.min_connections, self.max_connections)
 
     def set_user(self, credentials_dict: dict) -> None:
         """

wcp_library/sql/postgres.py

@@ -10,7 +10,8 @@ from wcp_library.sql import retry
 logger = logging.getLogger(__name__)
 
 
-def connect_warehouse(username: str, password: str, hostname: str, port: int, database: str) -> ConnectionPool:
+def connect_warehouse(username: str, password: str, hostname: str, port: int, database: str, min_connections: int,
+                            max_connections: int) -> ConnectionPool:
     """
     Create Warehouse Connection
 
@@ -19,6 +20,8 @@ def connect_warehouse(username: str, password: str, hostname: str, port: int, da
     :param hostname: hostname
     :param port: port
     :param database: database
+    :param min_connections:
+    :param max_connections:
     :return: session_pool
     """
 
@@ -26,8 +29,8 @@ def connect_warehouse(username: str, password: str, hostname: str, port: int, da
 
     session_pool = ConnectionPool(
         conninfo=url,
-        min_size=2,
-        max_size=5,
+        min_size=min_connections,
+        max_size=max_connections,
         open=True
     )
     return session_pool
@@ -40,7 +43,7 @@ class PostgresConnection(object):
     :return: None
     """
 
-    def __init__(self):
+    def __init__(self, min_connections: int = 2, max_connections: int = 5):
         self._username: Optional[str] = None
         self._password: Optional[str] = None
         self._hostname: Optional[str] = None
@@ -48,6 +51,9 @@ class PostgresConnection(object):
         self._database: Optional[str] = None
         self._session_pool: Optional[ConnectionPool] = None
 
+        self.min_connections = min_connections
+        self.max_connections = max_connections
+
         self._retry_count = 0
         self.retry_limit = 50
         self.retry_error_codes = ['08001', '08004']
@@ -60,7 +66,8 @@ class PostgresConnection(object):
         :return: None
         """
 
-        self._session_pool = connect_warehouse(self._username, self._password, self._hostname, self._port, self._database)
+        self._session_pool = connect_warehouse(self._username, self._password, self._hostname, self._port,
+                                               self._database, self.min_connections, self.max_connections)
 
     def set_user(self, credentials_dict: dict) -> None:
         """

{wcp_library-1.0.4.dist-info → wcp_library-1.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wcp-library
-Version: 1.0.4
+Version: 1.0.6
 Summary: Common utilites for internal development at WCP
 Home-page: https://github.com/Whitecap-DNA/WCP-Library
 Author: Mitch-Petersen

{wcp_library-1.0.4.dist-info → wcp_library-1.0.6.dist-info}/RECORD

@@ -1,11 +1,11 @@
-wcp_library/__init__.py,sha256=6K37HAqbOuim9T1s-C5GlYW9sQ2AuDKh5z_TlvHvy0U,337
+wcp_library/__init__.py,sha256=vgWnSAz9S7evUpt8lfZVBg2NWAn-wenaAaPcBnfJxxc,327
 wcp_library/async_credentials/__init__.py,sha256=ny6UitVV_xIecVzaWuHrJO9LpywBPke6u4C0F2wiM7o,1881
 wcp_library/async_credentials/api.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wcp_library/async_credentials/oracle.py,sha256=MvC7wsHnSyAyPGnRVlH0dvvW2xk5ap_IAByoHX4rUWY,5436
 wcp_library/async_credentials/postgres.py,sha256=3wjqtLH0Nc-U80iscYnz5DV-9M2X4IjPW51C5MI2_tI,5297
 wcp_library/async_sql/__init__.py,sha256=m4eWmUGYUEDomhhOp1ScB2uSIXFsNUNO589o5RwWdyM,1035
-wcp_library/async_sql/oracle.py,sha256=4Lg1F5FZV4xRz15CtjOt1EYA0kyl-JoHq3G3K6d0N80,7075
-wcp_library/async_sql/postgres.py,sha256=UQ5qLVV7__7qaft0237gq3E-sBupCf4zhU-cGX5Gln4,6193
+wcp_library/async_sql/oracle.py,sha256=cqEWyCgyvAD0gwMUlXOhnW2hI02IPJfjwyyhs06pri8,7411
+wcp_library/async_sql/postgres.py,sha256=7ehET1l42gKnsOcqeWLcXBEdYfvvA1qVfdG0QJv57Vk,6593
 wcp_library/credentials/__init__.py,sha256=HRmg7mqcATeclIz3lZQjSR4nmK6aY6MK9-QXEYZoFrw,1857
 wcp_library/credentials/api.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wcp_library/credentials/oracle.py,sha256=tinrog9TLW6jw7j8S-Ese_VHnhFcAoOPJpHsE0Xwx6M,5094
@@ -14,8 +14,8 @@ wcp_library/emailing.py,sha256=T8WXvMRA6cC0uRvyCw9yZcI-pAnCn0Gbn5B_ftRzEqA,2462
 wcp_library/informatica.py,sha256=IXZtk_9X1XLbOEwFrsyOwTgajQKvtXgANBHmuTOP3Kk,4064
 wcp_library/logging.py,sha256=h8p_Ezo_QPSIKrPxzIlNVXddU4IXHyp1_2NqVDirfuk,1958
 wcp_library/sql/__init__.py,sha256=CLlBEBrWVAwE79bUxuQiwikSrYH8m9QRYSJ2l0-ofsY,1003
-wcp_library/sql/oracle.py,sha256=wu9MEuIwfw9RP8pzjrnzvhSx--mjTjpXTJNLEIlKkGs,6891
-wcp_library/sql/postgres.py,sha256=rhRmxAwQI6LAu6Pk2Q3IGezo4BB1Ela7fvVfF1vRefc,6098
-wcp_library-1.0.4.dist-info/METADATA,sha256=2ZrZ8360iH2auuMJKvo3CEGh0uomS9fgl9E0EY4GnJE,1338
-wcp_library-1.0.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-wcp_library-1.0.4.dist-info/RECORD,,
+wcp_library/sql/oracle.py,sha256=ur91kgds11M7xiGlDNkodxu2P7M-crqK0toYJcOHgdo,7285
+wcp_library/sql/postgres.py,sha256=hIw9ckxV_iRqZA0rSCMmbG82iil8mY4g-ajtHYVIq3I,6492
+wcp_library-1.0.6.dist-info/METADATA,sha256=c0TbPZ1rbmadB7lQ2Jdc2tR-7b7bPjkRMrsgfkUISaE,1338
+wcp_library-1.0.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+wcp_library-1.0.6.dist-info/RECORD,,