domaintools-api 2.8.0__tar.gz → 2.8.1__tar.gz

{domaintools_api-2.8.0/domaintools_api.egg-info → domaintools_api-2.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: domaintools_api
-Version: 2.8.0
+Version: 2.8.1
 Summary: DomainTools Official Python API
 Author-email: DomainTools <integrations@domaintools.com>
 License: The MIT License (MIT)

domaintools_api-2.8.1/VERSION

@@ -0,0 +1 @@
+2.8.1

{domaintools_api-2.8.0 → domaintools_api-2.8.1}/domaintools/_version.py

@@ -20,4 +20,4 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 """
 
-current = "2.8.0"
+current = "2.8.1"

{domaintools_api-2.8.0 → domaintools_api-2.8.1}/domaintools/api.py

@@ -34,6 +34,7 @@ from domaintools.filters import (
     filter_by_field,
     DTResultFilter,
 )
+from domaintools.exceptions import ServiceUnavailableException, ServiceException
 from domaintools.utils import validate_feeds_parameters
 
 
@@ -163,7 +164,12 @@ 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(product)
+            try:
+                self._rate_limit(product)
+            except (ServiceUnavailableException, ServiceException):
+                # If account_information fails (e.g. rate limited itself),
+                # skip client-side rate limiting and proceed with the original call.
+                self.limits_set = True
             # 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-2.8.0 → domaintools_api-2.8.1}/domaintools/base_results.py

@@ -140,7 +140,7 @@ class Results(MutableMapping, MutableSequence):
         wait_for = self._wait_time()
         if self.api.rate_limit and (wait_for is None or self.product == "account-information"):
             data = self._make_request()
-            if data.status_code == 503:  # pragma: no cover
+            if data.status_code == 503 and self.product != "account-information":  # pragma: no cover
                 sleeptime = 60
                 log.info(
                     "503 encountered for [%s] - sleeping [%s] seconds before retrying request.",

{domaintools_api-2.8.0 → domaintools_api-2.8.1/domaintools_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: domaintools_api
-Version: 2.8.0
+Version: 2.8.1
 Summary: DomainTools Official Python API
 Author-email: DomainTools <integrations@domaintools.com>
 License: The MIT License (MIT)

{domaintools_api-2.8.0 → domaintools_api-2.8.1}/domaintools_api.egg-info/SOURCES.txt

@@ -42,5 +42,6 @@ tests/test_cli.py
 tests/test_decorators.py
 tests/test_docstring_patcher.py
 tests/test_filters.py
+tests/test_iris_enrich_account_info.py
 tests/test_request_validator.py
 tests/test_utils.py

domaintools_api-2.8.1/tests/test_iris_enrich_account_info.py

@@ -0,0 +1,142 @@
+"""Test that iris_enrich only triggers account_information once per API instance."""
+
+from unittest.mock import patch, MagicMock
+
+from domaintools import API
+from domaintools.exceptions import ServiceUnavailableException
+
+
+def test_iris_enrich_does_not_repeat_account_info_call():
+    """Confirm account_information is fetched only once for multiple iris_enrich calls on same API instance."""
+    # Reset class-level state that may have been set by previous tests
+    API.limits = {}
+    API.limits_set = False
+
+    api = API("test_user", "test_key", rate_limit=True)
+
+    # Fake account info response
+    fake_account_data = {
+        "response": {
+            "products": [
+                {"id": "iris-enrich", "per_minute_limit": 10, "per_hour_limit": 100}
+            ]
+        }
+    }
+
+    # Fake iris-enrich response
+    fake_enrich_data = {
+        "response": {
+            "results": [{"domain": "google.com"}],
+            "results_count": 1,
+            "missing_domains": [],
+            "limit_exceeded": False,
+        }
+    }
+
+    call_log = []
+
+    with patch("domaintools.base_results.Client") as mock_client:
+        mock_session = MagicMock()
+        mock_client.return_value.__enter__ = MagicMock(return_value=mock_session)
+        mock_client.return_value.__exit__ = MagicMock(return_value=False)
+
+        def fake_get(url, **kwargs):
+            call_log.append(("GET", url))
+            resp = MagicMock()
+            resp.status_code = 200
+            if "/v1/account" in url:
+                resp.json.return_value = fake_account_data
+            return resp
+
+        def fake_post(url, **kwargs):
+            call_log.append(("POST", url))
+            resp = MagicMock()
+            resp.status_code = 200
+            resp.json.return_value = fake_enrich_data
+            return resp
+
+        mock_session.get.side_effect = fake_get
+        mock_session.post.side_effect = fake_post
+
+        # First call - should trigger account_information (GET /v1/account)
+        api.iris_enrich("google.com")
+        # Second call - should NOT trigger account_information again
+        api.iris_enrich("amazon.com")
+
+    # Count how many times /v1/account was called
+    account_calls = [c for c in call_log if "/v1/account" in c[1]]
+    enrich_calls = [c for c in call_log if "/v1/iris-enrich" in c[1]]
+
+    assert len(account_calls) == 1, (
+        f"Expected exactly 1 account_information call, got {len(account_calls)}. "
+        f"Full call log: {call_log}"
+    )
+    assert len(enrich_calls) == 2, (
+        f"Expected exactly 2 iris_enrich calls, got {len(enrich_calls)}. "
+        f"Full call log: {call_log}"
+    )
+
+
+def test_iris_enrich_succeeds_when_account_info_is_rate_limited():
+    """Verify that iris_enrich proceeds normally even if account_information returns a 503."""
+    # Reset class-level state that may have been set by previous tests
+    API.limits = {}
+    API.limits_set = False
+
+    api = API("test_user", "test_key", rate_limit=True)
+
+    # Fake iris-enrich response
+    fake_enrich_data = {
+        "response": {
+            "results": [{"domain": "google.com"}],
+            "results_count": 1,
+            "missing_domains": [],
+            "limit_exceeded": False,
+        }
+    }
+
+    call_log = []
+
+    with patch("domaintools.base_results.Client") as mock_client, \
+         patch("domaintools.base_results.time.sleep"):
+        mock_session = MagicMock()
+        mock_client.return_value.__enter__ = MagicMock(return_value=mock_session)
+        mock_client.return_value.__exit__ = MagicMock(return_value=False)
+
+        def fake_get(url, **kwargs):
+            call_log.append(("GET", url))
+            resp = MagicMock()
+            if "/v1/account" in url:
+                # Simulate a 503 rate limit on account_information
+                resp.status_code = 503
+                resp.json.return_value = {"error": {"message": "Rate limit exceeded"}}
+            else:
+                resp.status_code = 200
+                resp.json.return_value = {}
+            return resp
+
+        def fake_post(url, **kwargs):
+            call_log.append(("POST", url))
+            resp = MagicMock()
+            resp.status_code = 200
+            resp.json.return_value = fake_enrich_data
+            return resp
+
+        mock_session.get.side_effect = fake_get
+        mock_session.post.side_effect = fake_post
+
+        # This should NOT raise an exception despite account_info returning 503
+        result = api.iris_enrich("google.com")
+
+    # Verify the iris_enrich call succeeded
+    enrich_calls = [c for c in call_log if "/v1/iris-enrich" in c[1]]
+    assert len(enrich_calls) == 1, (
+        f"Expected 1 iris_enrich call, got {len(enrich_calls)}. Full call log: {call_log}"
+    )
+
+    # Verify limits_set was set to True so it won't retry account_info
+    assert api.limits_set is True
+
+    # Verify the result contains expected data
+    assert result["results_count"] == 1
+    assert result["results"][0]["domain"] == "google.com"

domaintools_api-2.8.0/VERSION

@@ -1 +0,0 @@
-2.8.0