maisaedu-utilities-prefect 1.2.58__tar.gz → 1.2.60__tar.gz

{maisaedu_utilities_prefect-1.2.58 → maisaedu_utilities_prefect-1.2.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maisaedu_utilities_prefect
-Version: 1.2.58
+Version: 1.2.60
 Summary: Utilities for interaction with Prefect, for +A Education
 Home-page: UNKNOWN
 Author: A+ Educação

{maisaedu_utilities_prefect-1.2.58 → maisaedu_utilities_prefect-1.2.60}/maisaedu_utilities_prefect/database/athena.py

@@ -5,10 +5,11 @@ import pandas as pd
 from botocore.exceptions import ClientError
 
 def aws_client_factory(
-    aws_access_key: str,
-    aws_secret_key: str,
+    aws_access_key: str = None,
+    aws_secret_key: str = None,
     aws_region: str = 'us-east-1',
-    type: str = 'athena'
+    type: str = 'athena',
+    profile_name: str = None
 ):
     """
     Factory function to create and return initialized AWS Athena and S3 clients.
@@ -30,11 +31,17 @@ def aws_client_factory(
         Initialized AWS client for Athena or S3 based on the type specified.
     """
 
-    session = boto3.Session(
-        aws_access_key_id=aws_access_key,
-        aws_secret_access_key=aws_secret_key,
-        region_name=aws_region
-    )
+    if aws_access_key is not None and aws_secret_key is not None:
+        session = boto3.Session(
+            aws_access_key_id=aws_access_key,
+            aws_secret_access_key=aws_secret_key,
+            region_name=aws_region
+        )
+    elif profile_name is not None:
+        session = boto3.Session(profile_name=profile_name, region_name=aws_region)
+    else:
+        session = boto3.Session(region_name=aws_region)
+
     if type == 'athena':
         return session.client('athena')
     elif type == 's3':

{maisaedu_utilities_prefect-1.2.58 → maisaedu_utilities_prefect-1.2.60}/maisaedu_utilities_prefect/hubspot/email_events.py

@@ -2,8 +2,7 @@ import requests
 import json
 import urllib
 import time
-import prefect
-
+from retry import retry
 
 def get_events(
     api_key,
@@ -43,6 +42,15 @@ def get_events(
     return response_dict
 
 
+@retry(tries=5, delay=30)
+def get_data(api_key, app_private_token, start_timestamp, end_timestamp, offset, limit):
+    resp = get_events(
+            api_key, app_private_token, start_timestamp, end_timestamp, offset, limit
+        )
+
+    return resp["events"], resp['hasMore'], resp['offset']
+
+
 def get_all_email_events(
     api_key, app_private_token, start_timestamp=None, end_timestamp=None, limit=1000
 ):
@@ -50,32 +58,8 @@ def get_all_email_events(
     has_more = True
     attempts = 0
     while has_more:
-        resp = get_events(
-            api_key, app_private_token, start_timestamp, end_timestamp, offset, limit
-        )
-
-        try:
-            if "hasMore" in resp and "offset" in resp:
-                attempts = 0
-                has_more = resp["hasMore"]
-                offset = resp["offset"]
+            events, has_more, offset = get_data(api_key, app_private_token, start_timestamp, end_timestamp, offset, limit)
 
-                yield resp["events"]
-            else:
-                attempts += 1
-                if attempts > 3:
-                    has_more = False
-        except Exception as e:
-            if (
-                isinstance(e, TypeError)
-                and "errorType" in e
-                and e["errorType"] == "RATE_LIMIT"
-            ):
-                print(e)
-                print(resp)
-                time.sleep(10)
-            else:
-                prefect.get_run_logger().error("Failed")
-                prefect.get_run_logger().error(e)
-                prefect.get_run_logger().error(resp)
-                raise e
+            yield events
+            if has_more:
+                offset = offset

{maisaedu_utilities_prefect-1.2.58 → maisaedu_utilities_prefect-1.2.60}/maisaedu_utilities_prefect.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maisaedu-utilities-prefect
-Version: 1.2.58
+Version: 1.2.60
 Summary: Utilities for interaction with Prefect, for +A Education
 Home-page: UNKNOWN
 Author: A+ Educação

{maisaedu_utilities_prefect-1.2.58 → maisaedu_utilities_prefect-1.2.60}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="maisaedu_utilities_prefect",
-    version="1.2.58",
+    version="1.2.60",
     description="Utilities for interaction with Prefect, for +A Education",
     license="MIT License",
     author="A+ Educação",