maisaedu-utilities-prefect 1.2.59__tar.gz → 1.2.61__tar.gz

{maisaedu_utilities_prefect-1.2.59 → maisaedu_utilities_prefect-1.2.61}/PKG-INFO

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

{maisaedu_utilities_prefect-1.2.59 → maisaedu_utilities_prefect-1.2.61}/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.59 → maisaedu_utilities_prefect-1.2.61}/maisaedu_utilities_prefect/hubspot/form_submission_events.py

@@ -1,8 +1,8 @@
-import prefect
 import requests
 import json
 import urllib
 from time import sleep
+from retry import retry
 
 
 def get_hubspot_form_submission_events(
@@ -43,40 +43,40 @@ def get_hubspot_form_submission_events(
         print(e)
 
 
+@retry(tries=5, delay=30)
+def get_data(hapikey, app_private_token, occurred_after, occurred_before, after, limit):
+    resp = get_hubspot_form_submission_events(
+            hapikey, app_private_token, occurred_after, occurred_before, after, limit
+        )
+
+    if "results" in resp:
+        if len(resp["results"]) == 0:
+            has_more = False
+        else:
+            has_more = True
+
+    if "paging" in resp:
+        if "next" in resp["paging"]:
+          if "after" in resp["paging"]["next"]:
+            after = resp["paging"]["next"]["after"]
+          else:
+            after = None
+        else:
+            after = None
+    else:
+        after = None
+
+    return resp["results"], has_more, after
+
+
 def get_form_submission_events(
-        hapikey, app_private_token, occurred_after, occurred_before=None, limit=100
+    hapikey, app_private_token, occurred_after, occurred_before=None, limit=100
 ):
     after = None
     has_more = True
-    attempts = 0
     while has_more:
-        response = get_hubspot_form_submission_events(
-            hapikey, app_private_token, occurred_after, occurred_before, after, limit
-        )
+            results, has_more, after = get_data(hapikey, app_private_token, occurred_after, occurred_before, after, limit)
 
-        try:
-            if "results" in response:
-                attempts = 0
-                yield response["results"]
-                if "paging" not in response:
-                    has_more = False
-                else:
-                    after = response["paging"]["next"]["after"]
-            else:
-                attempts += 1
-                if attempts > 2:
-                    has_more = False
-        except TypeError as e:
-            print("Erro de tipo encontrado:", e)
-            print(response)
-            sleep(10)
-        except Exception as e:
-            if "errorType" in e and e["errorType"] == "RATE_LIMIT":
-                print(e)
-                print(response)
-                sleep(10)
-            else:
-                prefect.get_run_logger().error("Failed")
-                prefect.get_run_logger().error(e)
-                prefect.get_run_logger().error(response)
-                raise e
+            yield results
+            if has_more:
+                after = after

{maisaedu_utilities_prefect-1.2.59 → maisaedu_utilities_prefect-1.2.61}/maisaedu_utilities_prefect.egg-info/PKG-INFO

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

{maisaedu_utilities_prefect-1.2.59 → maisaedu_utilities_prefect-1.2.61}/setup.py

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