afgutils 1.2.0__tar.gz → 1.3.0__tar.gz

{afgutils-1.2.0 → afgutils-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: afgutils
-Version: 1.2.0
+Version: 1.3.0
 Summary: Shared support functions
 Author: Araz Heydarov
 Author-email: araz.heydarov@asiafinancegroup.com

{afgutils-1.2.0 → afgutils-1.3.0}/afgutils/s3.py

@@ -16,6 +16,19 @@ def save_to_s3(s3_key: str, content_body: str, aws_access_key_id=None,
 
 def get_from_s3(s3_key, filename: str = None, aws_access_key_id=None,
                 aws_secret_access_key=None, aws_region=None, s3_bucket=None, as_bytes: bool = False):
+    """
+    Downloads file from S3
+
+    Only s3_key is obligatory.
+
+    If AWS bucket, creds are ommited then LMS production bucket, creds are assumed.
+
+    as_bytes
+        False   saves file from S3 to filename, returns None
+
+        True    returns byte array instead of saving the file, filename is ignored
+    """
+
     s3_client = _get_s3_client(aws_access_key_id, aws_secret_access_key, aws_region)
     s3_bucket = s3_bucket or _getenv('s3_bucket_lms')
 

{afgutils-1.2.0 → afgutils-1.3.0}/afgutils/utils.py

@@ -24,6 +24,7 @@ from pandas import DataFrame
 import pyodbc
 from typing import Any
 from afgutils.db import DB
+from numpy import bool_
 
 
 # session_token_cookie_name = "uwtool_session_token"
@@ -109,7 +110,7 @@ def clear_mfv(mfv: dict) -> dict:
 
 
 def data_vector_to_sql_insert(data_vector: dict | DataFrame, insert_sql_tpl: str = None,
-                              existing_values: list = None) -> (list, str):
+                              existing_values: list = None) -> tuple[tuple, str]:
     """
     Returns data tuple and an SQL INSERT statement to be used in conjunction with DB.execute() function.
 
@@ -133,20 +134,26 @@ def data_vector_to_sql_insert(data_vector: dict | DataFrame, insert_sql_tpl: str
     to the number of keys in the data_vector
     """
 
-    column_names_insert_text = ""
+    # column_names_insert_text = ""
+    column_names_list=[]
     item_values = []
 
     # convert data vector into a list
     if isinstance(data_vector, DataFrame):
         for column_name in data_vector.columns.tolist():
-            column_names_insert_text = (column_names_insert_text + "," + column_name + "\r\n").replace(".",
-                                                                                                       "_")
-            item_values.append(data_vector.loc[0, column_name])
+            # column_names_insert_text = (column_names_insert_text + "," + column_name + "\n").replace(".",
+            #                                                                                            "_")
+            column_names_list.append(column_name.replace(".", "_"))
+            curr_item_value=data_vector.loc[0, column_name]
+            curr_item_value=bool(curr_item_value) if type(curr_item_value) is bool_ else curr_item_value
+            item_values.append(curr_item_value)
 
     elif type(data_vector) is dict:
-        # TODO: implement dictionary data_vector processing
-        raise NotImplementedError("data_vector_to_sql_insert: dictionary data_vector is not implemented yet")
-
+        # raise NotImplementedError("data_vector_to_sql_insert: dictionary data_vector is not implemented yet")
+        for column_name in data_vector:
+            # column_names_insert_text = (column_names_insert_text + "," + column_name + "\n").replace(".", "_")
+            column_names_list.append(column_name)
+            item_values.append(data_vector[column_name])
     else:
         raise TypeError("data_vector_to_sql_insert: data_vector must be a pandas.DataFrame or a dictionary")
 
@@ -162,9 +169,15 @@ def data_vector_to_sql_insert(data_vector: dict | DataFrame, insert_sql_tpl: str
     else:
         raise TypeError("data_vector_to_sql_insert: existing_values must be a list or None")
 
+    # prep strings
+    column_names_insert_text=", ".join(column_names_list)
+
+    placeholders_string= ', ?' * len(item_values)
+    placeholders_string = placeholders_string[1:]
+
     # generate SQL
     if type(insert_sql_tpl) is str:
-        result_sql = insert_sql_tpl.format(column_names_insert_text, f"{', ?' * len(item_values)}")
+        result_sql = insert_sql_tpl.format(column_names_insert_text, placeholders_string)
     elif insert_sql_tpl is None:
         result_sql = column_names_insert_text
     else:
@@ -208,7 +221,7 @@ parse_row_into_object = parse_dict_into_object  # added for legacy compatibility
 
 class AfgBaseMixin:
     """
-    Base class for all AFG objects; restricts operations on private and callabe attributes.
+    Base extension for all AFG objects; restricts operations on private and callabe attributes.
 
     __str__ ommits private and callable attributes
 

{afgutils-1.2.0 → afgutils-1.3.0}/afgutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: afgutils
-Version: 1.2.0
+Version: 1.3.0
 Summary: Shared support functions
 Author: Araz Heydarov
 Author-email: araz.heydarov@asiafinancegroup.com

{afgutils-1.2.0 → afgutils-1.3.0}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-VERSION = "1.2.0"
+VERSION = "1.3.0"
 DESCRIPTION = "Shared support functions"
 LONG_DESCRIPTION = "Shared support functions"