domaintools-api-test-upload 2.6.0__tar.gz → 2.6.2__tar.gz

{domaintools_api_test_upload-2.6.0/domaintools_api_test_upload.egg-info → domaintools_api_test_upload-2.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: domaintools-api-test-upload
-Version: 2.6.0
+Version: 2.6.2
 Summary: DomainTools Official Python API
 Author-email: DomainTools <integrations@domaintools.com>
 License: The MIT License (MIT)

domaintools_api_test_upload-2.6.2/VERSION

@@ -0,0 +1 @@
+2.6.2

{domaintools_api_test_upload-2.6.0 → domaintools_api_test_upload-2.6.2}/domaintools/_version.py

@@ -20,4 +20,4 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 """
 
-current = "2.6.0"
+current = "2.6.2"

{domaintools_api_test_upload-2.6.0 → domaintools_api_test_upload-2.6.2}/domaintools/api.py

@@ -112,8 +112,12 @@ class API(object):
 
         self._rest_api_url = rest_api_url
 
-    def _rate_limit(self):
+    def _rate_limit(self, product):
         """Pulls in and enforces the latest rate limits for the specified user"""
+        if product in RTTF_PRODUCTS_LIST:
+            self.limits_set = False
+            return
+
         self.limits_set = True
         for product in self.account_information():
             limit_minutes = product["per_minute_limit"] or None
@@ -130,7 +134,7 @@ class API(object):
         if product != "account-information" and self.rate_limit and not self.limits_set and not self.limits:
             always_sign_api_key_previous_value = self.always_sign_api_key
             header_authentication_previous_value = self.header_authentication
-            self._rate_limit()
+            self._rate_limit(product)
             # Reset always_sign_api_key and header_authentication to its original
             # User-set values as these might be affected when self.account_information() was executed
             self.always_sign_api_key = always_sign_api_key_previous_value

{domaintools_api_test_upload-2.6.0 → domaintools_api_test_upload-2.6.2}/domaintools/results.py

@@ -3,7 +3,6 @@
 Additionally, defines any custom result objects that may be used to enable more Pythonic interaction with endpoints.
 """
 
-import json
 import logging
 import httpx
 import time
@@ -15,7 +14,6 @@ except ImportError:  # pragma: no cover
 
 from itertools import zip_longest, chain
 from typing import Generator
-from httpx import Client
 
 from domaintools_async import AsyncResults as Results
 
@@ -210,7 +208,7 @@ class FeedsResults(Results):
 
     Highlevel process:
 
-    httpx stream -> yield each json line -> check status code -> yield back data to client
+    httpx stream -> check status code -> yield back data to client -> repeat if 206
 
     Returns the generator object for feeds results.
     """
@@ -242,36 +240,21 @@ class FeedsResults(Results):
                 yield {"status_ready": True}
 
                 for line in response.iter_lines():
-                    if line:
-                        yield line
+                    yield line
         except Exception as e:
             self.latest_feeds_status_code = 500
-            yield {"status_ready": True, "error": str(e)}
-            raise
+            raise e
 
     def _get_results(self) -> Generator:
         try:
-            wait_for = self._wait_time()
             feeds_generator = self._make_request()
-
             next(feeds_generator)  # to start the generator process
             self.setStatus(self.latest_feeds_status_code)  # set the status already
 
-            should_wait = (
-                wait_for
-                and wait_for > 0
-                and not (self.api.rate_limit and (self.product == "account-information"))
-            )
-            if should_wait:
-                log.info(f"Sleeping for {wait_for}s.")
-                time.sleep(wait_for)
-
             # yield the rest of the feeds
             yield from feeds_generator
         except Exception as e:
-            log.error(f"FATAL: Failed to start the feed generator in _make_request. Reason: {e}")
-            self.latest_feeds_status_code = 500
-            self.setStatus(500, reason_text=f"Reason: {e}")
+            self.setStatus(500, reason_text=e)
             return
 
     def data(self) -> Generator:
@@ -293,8 +276,7 @@ class FeedsResults(Results):
                     # Otherwise, we will have an infinite request if sessionID was not provided but the required data asked is more than the maximum (1 hour of data)
                     break
             except Exception as e:
-                self.latest_feeds_status_code = 500
-                self.setStatus(500, reason_text=f"Reason: {e}")
+                self.setStatus(500, reason_text=e)
                 break  # safely close the while loop if there's any error above
 
     def __str__(self):

{domaintools_api_test_upload-2.6.0 → domaintools_api_test_upload-2.6.2/domaintools_api_test_upload.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: domaintools-api-test-upload
-Version: 2.6.0
+Version: 2.6.2
 Summary: DomainTools Official Python API
 Author-email: DomainTools <integrations@domaintools.com>
 License: The MIT License (MIT)

domaintools_api_test_upload-2.6.0/VERSION

@@ -1 +0,0 @@
-2.6.0