wcp-library 1.0.8__py3-none-any.whl → 1.1.2__py3-none-any.whl

wcp_library/async_sql/oracle.py

@@ -10,8 +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, min_connections: int,
-                            max_connections: int) -> 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
 
@@ -71,8 +71,8 @@ class AsyncOracleConnection(object):
 
         sid_or_service = self._database if self._database else self._sid
 
-        self._session_pool = await connect_warehouse(self._username, self._password, self._hostname, self._port,
-                                                     sid_or_service, self.min_connections, self.max_connections)
+        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:
         """
@@ -183,7 +183,7 @@ class AsyncOracleConnection(object):
                     await cursor.execute(query, packed_data)
                 else:
                     await cursor.execute(query)
-                rows = cursor.fetchall()
+                rows = await cursor.fetchall()
         return rows
 
     @retry

wcp_library/async_sql/postgres.py

@@ -10,8 +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, min_connections: int,
-                            max_connections: int) -> 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
 
@@ -66,8 +66,8 @@ class AsyncPostgresConnection(object):
         :return: None
         """
 
-        self._session_pool = await connect_warehouse(self._username, self._password, self._hostname, self._port,
-                                                     self._database, self.min_connections, self.max_connections)
+        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/emailing.py

@@ -7,7 +7,7 @@ from email.utils import formatdate
 from pathlib import Path
 
 
-def send_email(sender: str, recipients: list, subject: str, message=None):
+def send_email(sender: str, recipients: list, subject: str, message: str=None) -> None:
     """
     Function to send an email
 
@@ -32,7 +32,7 @@ def send_email(sender: str, recipients: list, subject: str, message=None):
     server.quit()
 
 
-def email_reporting(subject: str, message: str):
+def email_reporting(subject: str, message: str) -> None:
     """
     Function to email the reporting team from the Python email
 
@@ -55,7 +55,7 @@ def email_reporting(subject: str, message: str):
     server.quit()
 
 
-def email_with_attachments(sender: str, recipients: list, subject: str, message=None, attachments: list[Path]=None):
+def email_with_attachments(sender: str, recipients: list, subject: str, message: str=None, attachments: list[Path]=None) -> None:
     """
     Function to send an email with attachments
 

wcp_library/logging.py

@@ -4,7 +4,7 @@ import sys
 from wcp_library import application_path
 
 
-def create_log(level: int, iterations: int, project_name: str, mode: str = "w",
+def create_log(file_level: int, console_level: int, iterations: int, project_name: str, mode: str = "w",
                format: str = "%(asctime)s:%(levelname)s:%(module)s:%(filename)s:%(lineno)d:%(message)s"):
     """
     Create log file.
@@ -13,7 +13,8 @@ def create_log(level: int, iterations: int, project_name: str, mode: str = "w",
 
     format help: https://docs.python.org/3/library/logging.html#logrecord-attributes
 
-    :param level: Logging level to output to log file.
+    :param file_level: Logging level to output to log file.
+    :param console_level: Logging level to output to console.
     :param iterations: Number of log files to keep.
     :param project_name: Name of the project. (Used as the log file name)
     :param mode: Mode to open the log file. (Default: "w")
@@ -33,12 +34,12 @@ def create_log(level: int, iterations: int, project_name: str, mode: str = "w",
 
     logging.basicConfig(
         filename=(application_path / (project_name + ".log")),
-        level=level,
+        level=file_level,
         format=format,
         filemode=mode
     )
 
-    MIN_LEVEL = logging.DEBUG
+    MIN_LEVEL = console_level
     stdout_hdlr = logging.StreamHandler(sys.stdout)
     stderr_hdlr = logging.StreamHandler(sys.stderr)
     stdout_hdlr.setLevel(MIN_LEVEL)
@@ -48,4 +49,4 @@ def create_log(level: int, iterations: int, project_name: str, mode: str = "w",
     rootLogger.addHandler(stdout_hdlr)
     rootLogger.addHandler(stderr_hdlr)
     logger = logging.getLogger(__name__)
-    logger.setLevel(logging.DEBUG)
+    logger.setLevel(console_level)

wcp_library/sql/oracle.py

@@ -10,8 +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, min_connections: int,
-                            max_connections: int) -> ConnectionPool:
+def _connect_warehouse(username: str, password: str, hostname: str, port: int, database: str, min_connections: int,
+                       max_connections: int) -> ConnectionPool:
     """
     Create Warehouse Connection
 
@@ -72,8 +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.min_connections, self.max_connections)
+        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,8 +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, min_connections: int,
-                            max_connections: int) -> ConnectionPool:
+def _connect_warehouse(username: str, password: str, hostname: str, port: int, database: str, min_connections: int,
+                       max_connections: int) -> ConnectionPool:
     """
     Create Warehouse Connection
 
@@ -66,7 +66,7 @@ class PostgresConnection(object):
         :return: None
         """
 
-        self._session_pool = connect_warehouse(self._username, self._password, self._hostname, self._port,
+        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.8.dist-info → wcp_library-1.1.2.dist-info}/METADATA

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: wcp-library
-Version: 1.0.8
+Version: 1.1.2
 Summary: Common utilites for internal development at WCP
 Home-page: https://github.com/Whitecap-DNA/WCP-Library
 Author: Mitch-Petersen
 Author-email: mitch.petersen@wcap.ca
-Requires-Python: >=3.11,<4.0
+Requires-Python: >=3.12,<4.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: aiohttp (>=3.10.10,<4.0.0)
@@ -33,7 +32,7 @@ Commonly used functions for the D&A team.
 `pip install WCP-Library`
 
 ## Usage
-See Wiki for more information.
+See [Wiki](https://github.com/Whitecap-DNA/WCP-Library/wiki/) for more information.
 
 ## Authors and acknowledgment
 Mitch Petersen

{wcp_library-1.0.8.dist-info → wcp_library-1.1.2.dist-info}/RECORD

@@ -4,18 +4,18 @@ wcp_library/async_credentials/api.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 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=XBGE6PPzZbLcHBJghxu3rkK9ZZ5Fp42Sm0-ZWSpzsWA,7392
-wcp_library/async_sql/postgres.py,sha256=7ehET1l42gKnsOcqeWLcXBEdYfvvA1qVfdG0QJv57Vk,6593
+wcp_library/async_sql/oracle.py,sha256=T4wLdX3sHQQOfDNqb35GM4wHFP5Vs5veB7iQtdCxPVM,7402
+wcp_library/async_sql/postgres.py,sha256=MGPv1ffUDn7oJX1ojviVD3N7jk8dtQERnbDateuwZJo,6597
 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
 wcp_library/credentials/postgres.py,sha256=Li-4nDMMxKGYh-hKhhL1r9M4wIc_TRgEgP1_UkEf-90,4955
-wcp_library/emailing.py,sha256=T8WXvMRA6cC0uRvyCw9yZcI-pAnCn0Gbn5B_ftRzEqA,2462
+wcp_library/emailing.py,sha256=xqNly6Tmj-pvwl5bdys3gauZFDd4SuWCQYzGFNemv2Q,2496
 wcp_library/informatica.py,sha256=IXZtk_9X1XLbOEwFrsyOwTgajQKvtXgANBHmuTOP3Kk,4064
-wcp_library/logging.py,sha256=h8p_Ezo_QPSIKrPxzIlNVXddU4IXHyp1_2NqVDirfuk,1958
+wcp_library/logging.py,sha256=cFaY7kHEV1DukNiIVIsckrS046vBQ3W9sbFDfP1tcPk,2056
 wcp_library/sql/__init__.py,sha256=CLlBEBrWVAwE79bUxuQiwikSrYH8m9QRYSJ2l0-ofsY,1003
-wcp_library/sql/oracle.py,sha256=ur91kgds11M7xiGlDNkodxu2P7M-crqK0toYJcOHgdo,7285
-wcp_library/sql/postgres.py,sha256=hIw9ckxV_iRqZA0rSCMmbG82iil8mY4g-ajtHYVIq3I,6492
-wcp_library-1.0.8.dist-info/METADATA,sha256=8p_UNTEOGEJgW_Sro62or-pXb2Z2DGjJOKf5wow8U4Q,1338
-wcp_library-1.0.8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-wcp_library-1.0.8.dist-info/RECORD,,
+wcp_library/sql/oracle.py,sha256=FeMvqLte26vNQlR1esdZAUICy9IqOuE0zTTrx245bhY,7283
+wcp_library/sql/postgres.py,sha256=I2iDQ13z_hbEfpFBliozLfsg8xUdSzEVqr12yyPSdh4,6489
+wcp_library-1.1.2.dist-info/METADATA,sha256=Ah_GPMl1nrjkQz8Qw_Zcka_FItObTpz2oAi4zktVRaE,1340
+wcp_library-1.1.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+wcp_library-1.1.2.dist-info/RECORD,,