wcp-library 1.1.0__tar.gz → 1.1.2__tar.gz

{wcp_library-1.1.0 → wcp_library-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wcp-library
-Version: 1.1.0
+Version: 1.1.2
 Summary: Common utilites for internal development at WCP
 Home-page: https://github.com/Whitecap-DNA/WCP-Library
 Author: Mitch-Petersen
@@ -32,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.1.0 → wcp_library-1.1.2}/README.md

@@ -7,7 +7,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.1.0 → wcp_library-1.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wcp-library"
-version = "1.1.0"
+version = "1.1.2"
 description = "Common utilites for internal development at WCP"
 authors = ["Mitch-Petersen <mitch.petersen@wcap.ca>"]
 readme = "README.md"

{wcp_library-1.1.0 → wcp_library-1.1.2}/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:
         """

{wcp_library-1.1.0 → wcp_library-1.1.2}/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-1.1.0 → wcp_library-1.1.2}/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-1.1.0 → wcp_library-1.1.2}/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-1.1.0 → wcp_library-1.1.2}/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-1.1.0 → wcp_library-1.1.2}/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: