cit-pydata 0.0.1.dev10__tar.gz → 0.0.2.dev2__tar.gz

{cit_pydata-0.0.1.dev10/src/cit_pydata.egg-info → cit_pydata-0.0.2.dev2}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: cit-pydata
-Version: 0.0.1.dev10
+Version: 0.0.2.dev2
 Summary: Python clients for commonly used api services including Salesforce, SQL, Marketo, Box, SFSync*, and JobLog*
-Author-email: Dionis Wang <dwang@eab.com>, Andrew Fitch <afitch@eab.com>
+Author-email: Dionis Wang <dwang@eab.com>, Andrew Fitch <afitch@eab.com>, Dagim Desta <ddesta@eab.com>
 Project-URL: Homepage, https://github.com/EAB-IT-DEV/cit-pydata
 Project-URL: Issues, https://github.com/EAB-IT-DEV/cit-pydata/issues
 Classifier: Programming Language :: Python :: 3

{cit_pydata-0.0.1.dev10 → cit_pydata-0.0.2.dev2}/pyproject.toml

@@ -4,9 +4,9 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cit-pydata"
-version = "0.0.1.dev10"
+version = "0.0.2.dev2"
 authors = [
-  { name="Dionis Wang", email="dwang@eab.com" },{ name="Andrew Fitch", email="afitch@eab.com" },
+  { name="Dionis Wang", email="dwang@eab.com" },{ name="Andrew Fitch", email="afitch@eab.com" },{ name="Dagim Desta", email="ddesta@eab.com" }
 ]
 description = "Python clients for commonly used api services including Salesforce, SQL, Marketo, Box, SFSync*, and JobLog*"
 readme = "README.md"

{cit_pydata-0.0.1.dev10 → cit_pydata-0.0.2.dev2}/src/cit_pydata/aws/api.py

@@ -13,10 +13,19 @@ def _get_boto_session(
     iam_user: str = None,
     path_to_env_file: str = None,
     region: str = None,
-    logger=util_api.get_logger(__name__, "info"),
+    logger=util_api.get_logger(__name__, "info")
 ):
+    if logger is None:
+        logger = util_api.get_logger(__name__, "info")
+
     if ON_AWS:
         return boto3.Session()
+    
+    if not environment or not iam_user:
+        logger.error(
+            "environment and iam_user are required when not running on AWS"
+        )
+        return None
 
     _environment_variable = environment + "_" + iam_user + "_" + "aws_access_key_id"
     aws_access_key_id = util_api.get_environment_variable(
@@ -71,7 +80,8 @@ class S3Client:
         log_level: Literal["info", "debug"] = "info",
     ):
         self.logger = util_api.get_logger(__name__, log_level)
-        environment = environment.lower()
+        if environment is not None:
+            environment = environment.lower()
 
         self.session = _get_boto_session(
             service="s3",
@@ -80,6 +90,10 @@ class S3Client:
             path_to_env_file=path_to_env_file,
             logger=self.logger,
         )
+        if self.session is None:
+            self.logger.error("Failed to initialize boto3 session")
+            self.client = None
+            return
         self.client = self.session.client("s3")
 
     def get_object_metadata(self, **kwargs):
@@ -150,6 +164,10 @@ class SSMClient:
             path_to_env_file=path_to_env_file,
             logger=self.logger,
         )
+        if self.session is None:
+            self.logger.error("Failed to initialize boto3 session")
+            self.client = None
+            return
         self.client = self.session.client("ssm")
 
     def get_parameter(

{cit_pydata-0.0.1.dev10 → cit_pydata-0.0.2.dev2}/src/cit_pydata/box/api.py

@@ -37,27 +37,16 @@ class BoxClient:
         if not self.client:
             self._get_client()
 
+        if filter_type not in ("file", "folder", None):
+            raise ValueError("filter_type must be 'file', 'folder', or None")
+
         item_id_dict = {}
         items = self.client.folder(folder_id=folder_id).get_items()
 
-        assert filter_type in ["file", "folder", None]
-        if filter_type == "file":
-            for item in items:
-                if item.type == filter_type:
-                    item_id_dict[item.id] = item
-        elif filter_type == "folder":
-            for item in items:
-                if item.type == filter_type:
-                    item_id_dict[item.id] = item
-        else:
-            for item in items:
-                item_id_dict[item.id] = item
-
         for item in items:
-            if item.type == filter_type:
-                item_id_dict[item.id] = {"name": item.name, "type": item.type}
-            else:
-                item_id_dict[item.id] = {"name": item.name, "type": item.type}
+            if filter_type is not None and item.type != filter_type:
+                continue
+            item_id_dict[item.id] = {"name": item.name, "type": item.type}
 
         return item_id_dict
 

{cit_pydata-0.0.1.dev10 → cit_pydata-0.0.2.dev2}/src/cit_pydata/sql/api.py

@@ -33,7 +33,6 @@ class SQLClient:
 
         self.logger = util_api.get_logger(__name__, "INFO") if not logger else logger
 
-        self.base_ssm_parameter_name = conn.get("base_ssm_parameter_name")
         self.sql_hostname = conn.get("sql_hostname", None)
         self.sql_instance = conn.get("sql_instance", None)
         self.sql_user = conn.get("sql_user", None)
@@ -59,8 +58,6 @@ class SQLClient:
         from urllib.parse import quote
 
         try:
-            _aws_environment = None
-            _aws_iam_user = None
             _aws_environment = util_api.get_environment_variable(
                 logger=self.logger, variable_name="aws_auth_environment"
             )
@@ -76,9 +73,10 @@ class SQLClient:
         except Exception as e:
             self.logger.exception(e)
 
+        base_ssm_parameter_name = "/eab-pydata/sql/"
         if self.sql_instance:
             sql_password_parameter_name = (
-                self.base_ssm_parameter_name
+                base_ssm_parameter_name
                 + self.sql_hostname
                 + "/"
                 + self.sql_instance
@@ -87,7 +85,7 @@ class SQLClient:
             )
         else:
             sql_password_parameter_name = (
-                self.base_ssm_parameter_name + self.sql_hostname + "/" + self.sql_user
+                base_ssm_parameter_name + self.sql_hostname + "/" + self.sql_user
             )
 
         sql_password = None
@@ -104,7 +102,7 @@ class SQLClient:
             self.logger.error(
                 f"SQL authentication credential does not exist for server '{self.sql_hostname}' and user '{self.sql_user}'"
             )
-            return
+            sys.exit(1)
 
         engine_connection_string = None
 
@@ -235,8 +233,10 @@ class SQLClient:
             self.logger.error(f"Query not supplied")
 
         return None
+        
+    from typing import Generator
 
-    def stream_dataframe_query(self, query: str, kwargs: dict) -> pd.DataFrame:
+    def stream_dataframe_query(self, query: str, kwargs: dict) -> Generator[pd.DataFrame, None, None]:
         """Returns Pandas DataFrame Iterator from SQL Query
         Arguments:
             query - A SQL Select statement

{cit_pydata-0.0.1.dev10 → cit_pydata-0.0.2.dev2}/src/cit_pydata/util/api.py

@@ -13,9 +13,12 @@ def encode_base64(value: str):
     """
     import base64
 
-    binary_value = value.encode("ascii")
+    if value is None:
+        raise ValueError("value must not be None")
+    else:
+        binary_value = value.encode("ascii")
 
-    return base64.b64encode(binary_value)
+    return base64.b64encode(binary_value).decode("ascii")
 
 
 def get_datetime_string():
@@ -125,6 +128,9 @@ def get_environment_variable(
     if not logger:
         logger = get_logger()
 
+    if not variable_name:
+        raise ValueError("variable_name must be provided")
+    
     if ON_AWS and variable_name.startswith("aws"):
         logger.info(
             f"Detected on AWS. Skipping retrieval of AWS .env variable {variable_name}"

{cit_pydata-0.0.1.dev10 → cit_pydata-0.0.2.dev2/src/cit_pydata.egg-info}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: cit-pydata
-Version: 0.0.1.dev10
+Version: 0.0.2.dev2
 Summary: Python clients for commonly used api services including Salesforce, SQL, Marketo, Box, SFSync*, and JobLog*
-Author-email: Dionis Wang <dwang@eab.com>, Andrew Fitch <afitch@eab.com>
+Author-email: Dionis Wang <dwang@eab.com>, Andrew Fitch <afitch@eab.com>, Dagim Desta <ddesta@eab.com>
 Project-URL: Homepage, https://github.com/EAB-IT-DEV/cit-pydata
 Project-URL: Issues, https://github.com/EAB-IT-DEV/cit-pydata/issues
 Classifier: Programming Language :: Python :: 3