domaintools-api-test-upload 2.7.3__tar.gz → 2.7.5__tar.gz

{domaintools_api_test_upload-2.7.3/domaintools_api_test_upload.egg-info → domaintools_api_test_upload-2.7.5}/PKG-INFO

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

domaintools_api_test_upload-2.7.5/VERSION

@@ -0,0 +1 @@
+2.7.5

{domaintools_api_test_upload-2.7.3 → domaintools_api_test_upload-2.7.5}/domaintools/api.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta, timezone
 from hashlib import sha1, sha256
 from hmac import new as hmac
-from importlib import resources
+from pathlib import Path
 from typing import Union
 
 import re
@@ -113,9 +113,10 @@ class API(object):
             raise Exception("Proxy URL must be a string. For example: '127.0.0.1:8888'")
 
     def _initialize_specs(self):
+        package_root = Path(__file__).parent
         for spec_name, file_path in SPECS_MAPPING.items():
+            specs_file_path = f"{package_root}/specs/{file_path}"
             try:
-                specs_file_path = resources.files("domaintools.specs").joinpath(file_path)
                 with open(specs_file_path, "r", encoding="utf-8") as f:
                     spec_content = yaml.safe_load(f)
                 if not spec_content:
@@ -127,11 +128,7 @@ class API(object):
                 print(f"Error loading {specs_file_path}: {e}")
 
     def _get_ssl_default_context(self, verify_ssl: Union[str, bool]):
-        return (
-            ssl.create_default_context(cafile=verify_ssl)
-            if isinstance(verify_ssl, str)
-            else verify_ssl
-        )
+        return ssl.create_default_context(cafile=verify_ssl) if isinstance(verify_ssl, str) else verify_ssl
 
     def _build_api_url(self, api_url=None, api_port=None):
         """Build the API url based on the given url and port. Defaults to `https://api.domaintools.com`"""
@@ -159,18 +156,11 @@ class API(object):
             hours = limit_hours and 3600 / float(limit_hours)
             minutes = limit_minutes and 60 / float(limit_minutes)
 
-            self.limits[product["id"]] = {
-                "interval": timedelta(seconds=minutes or hours or default)
-            }
+            self.limits[product["id"]] = {"interval": timedelta(seconds=minutes or hours or default)}
 
     def _results(self, product, path, cls=Results, **kwargs):
         """Returns _results for the specified API path with the specified **kwargs parameters"""
-        if (
-            product != "account-information"
-            and self.rate_limit
-            and not self.limits_set
-            and not self.limits
-        ):
+        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)
@@ -214,9 +204,7 @@ class API(object):
             else:
                 raise ValueError(
                     "Invalid value '{0}' for 'key_sign_hash'. "
-                    "Values available are {1}".format(
-                        self.key_sign_hash, ",".join(AVAILABLE_KEY_SIGN_HASHES)
-                    )
+                    "Values available are {1}".format(self.key_sign_hash, ",".join(AVAILABLE_KEY_SIGN_HASHES))
                 )
 
             parameters["timestamp"] = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
@@ -228,9 +216,7 @@ class API(object):
 
     def account_information(self, **kwargs):
         """Provides a snapshot of your accounts current API usage"""
-        return self._results(
-            "account-information", "/v1/account", items_path=("products",), **kwargs
-        )
+        return self._results("account-information", "/v1/account", items_path=("products",), **kwargs)
 
     def available_api_calls(self):
         """Provides a list of api calls that you can use based on your account information."""
@@ -433,9 +419,7 @@ class API(object):
 
     def reverse_ip(self, domain=None, limit=None, **kwargs):
         """Pass in a domain name."""
-        return self._results(
-            "reverse-ip", "/v1/{0}/reverse-ip".format(domain), limit=limit, **kwargs
-        )
+        return self._results("reverse-ip", "/v1/{0}/reverse-ip".format(domain), limit=limit, **kwargs)
 
     def host_domains(self, ip=None, limit=None, **kwargs):
         """Pass in an IP address."""
@@ -609,12 +593,8 @@ class API(object):
         younger_than_date = kwargs.pop("younger_than_date", {}) or None
         older_than_date = kwargs.pop("older_than_date", {}) or None
         updated_after = kwargs.pop("updated_after", {}) or None
-        include_domains_with_missing_field = (
-            kwargs.pop("include_domains_with_missing_field", {}) or None
-        )
-        exclude_domains_with_missing_field = (
-            kwargs.pop("exclude_domains_with_missing_field", {}) or None
-        )
+        include_domains_with_missing_field = kwargs.pop("include_domains_with_missing_field", {}) or None
+        exclude_domains_with_missing_field = kwargs.pop("exclude_domains_with_missing_field", {}) or None
 
         filtered_results = DTResultFilter(result_set=results).by(
             [
@@ -676,7 +656,7 @@ class API(object):
         create_date=None,
         active=None,
         search_hash=None,
-        risk_score=None,
+        risk_score_threshold=None,
         younger_than_date=None,
         older_than_date=None,
         updated_after=None,
@@ -731,7 +711,7 @@ class API(object):
 
         filtered_results = DTResultFilter(result_set=results).by(
             [
-                filter_by_riskscore(threshold=risk_score),
+                filter_by_riskscore(threshold=risk_score_threshold),
                 filter_by_expire_date(date=younger_than_date, lookup_type="before"),
                 filter_by_expire_date(date=older_than_date, lookup_type="after"),
                 filter_by_date_updated_after(date=updated_after),

{domaintools_api_test_upload-2.7.3 → domaintools_api_test_upload-2.7.5}/domaintools/decorators.py

@@ -51,9 +51,7 @@ def api_endpoint(spec_name: str, path: str, methods: Union[str, List[str]]):
 
             if "domains" in arguments.keys():
                 domains = arguments.pop("domains")
-                arguments["domain"] = (
-                    ",".join(domains) if isinstance(domains, (list, tuple)) else domains
-                )
+                arguments["domain"] = ",".join(domains) if isinstance(domains, (list, tuple)) else domains
 
             if spec:
                 # Determine which HTTP method is currently being executed.
@@ -61,6 +59,8 @@ def api_endpoint(spec_name: str, path: str, methods: Union[str, List[str]]):
                 # Otherwise, default to the first method defined in the decorator.
                 current_method = kwargs.get("method", normalized_methods[0])
 
+                filtered_arguments = {k: v for k, v in arguments.items() if v is not None}
+
                 # Run Validation
                 # This will raise a ValueError and stop execution if validation fails.
                 try:
@@ -68,7 +68,7 @@ def api_endpoint(spec_name: str, path: str, methods: Union[str, List[str]]):
                         spec=spec,
                         path=path,
                         method=current_method,
-                        parameters=arguments,
+                        parameters=filtered_arguments,
                     )
                 except ValueError as e:
                     print(f"[Validation Error] {e}")

{domaintools_api_test_upload-2.7.3 → domaintools_api_test_upload-2.7.5/domaintools_api_test_upload.egg-info}/PKG-INFO

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

{domaintools_api_test_upload-2.7.3 → domaintools_api_test_upload-2.7.5}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "domaintools_api_test_upload"
+name = "domaintools-api-test-upload"
 dependencies = [
     "httpx==0.28.1",
     "pyyaml",

{domaintools_api_test_upload-2.7.3 → domaintools_api_test_upload-2.7.5}/tests/test_api.py

@@ -143,7 +143,6 @@ def test_name_server_monitor():
 def test_parsed_whois():
     api_call = api.parsed_whois("google.com")
     with api_call as result:
-        assert "registrant" in result
         assert "registration" in result
         assert "name_servers" in result
         assert "whois" in result
@@ -476,7 +475,7 @@ def test_iris_detect_watched_domains():
     detect_results = api.iris_detect_watched_domains(
         monitor_id="nAwmQg2pqg", sort=["risk_score"], order="desc"
     )
-    assert len(detect_results["watchlist_domains"]) == 3
+    assert len(detect_results["watchlist_domains"]) == 5
 
     detect_results = api.iris_detect_watched_domains(escalation_types="blocked")
     assert detect_results["count"] == 1

{domaintools_api_test_upload-2.7.3 → domaintools_api_test_upload-2.7.5}/tests/test_decorators.py

@@ -217,3 +217,35 @@ class TestApiEndpointDecorator:
             call_kwargs = mock_validate.call_args[1]
 
             assert call_kwargs.get("parameters") == {"name": "test-name"}
+
+    def test_none_arguments_are_filtered_before_validation(self, mock_client):
+        """
+        Test that parameters with None values are excluded from the arguments
+        passed to the validator.
+        """
+
+        @api_endpoint(spec_name="v1", path="/users", methods="POST")
+        def create_user(name=None, status=None):
+            return "Success"
+
+        with patch("domaintools.request_validator.RequestValidator.validate") as mock_validate:
+            create_user(mock_client, name="Alice", status=None)
+
+            call_kwargs = mock_validate.call_args[1]
+            assert call_kwargs.get("parameters") == {"name": "Alice"}
+            assert "status" not in call_kwargs.get("parameters", {})
+
+    def test_all_none_arguments_passes_empty_parameters(self, mock_client):
+        """
+        Test that when all arguments are None, an empty dict is passed to the validator.
+        """
+
+        @api_endpoint(spec_name="v1", path="/users", methods="POST")
+        def create_user(name=None, body=None):
+            return "Success"
+
+        with patch("domaintools.request_validator.RequestValidator.validate") as mock_validate:
+            create_user(mock_client, name=None, body=None)
+
+            call_kwargs = mock_validate.call_args[1]
+            assert call_kwargs.get("parameters") == {}

{domaintools_api_test_upload-2.7.3 → domaintools_api_test_upload-2.7.5}/tests/test_filters.py

@@ -16,20 +16,17 @@ class DTFiltersTest(unittest.TestCase):
         domaintools_iris_result = iris_investigate_data.domaintools()
         int_chase_iris_result = iris_investigate_data.int_chase()
 
-        test_results = {
-            "results": domaintools_iris_result["results"]
-            + int_chase_iris_result["results"]
-        }
+        test_results = {"results": domaintools_iris_result["results"] + int_chase_iris_result["results"]}
 
         self.dt_res_filter = DTResultFilter(result_set=test_results)
 
     def test_filter_by_riskscore(self):
         """Test domaintools filter by riskcore"""
-        risk_score = 69
+        risk_score_threshold = 69
 
         result = self.dt_res_filter.by(
             [
-                filter_by_riskscore(threshold=risk_score),
+                filter_by_riskscore(threshold=risk_score_threshold),
             ]
         )
 
@@ -77,9 +74,7 @@ class DTFiltersTest(unittest.TestCase):
 
         results = self.dt_res_filter.by(
             [
-                filter_by_field(
-                    field=include_domains_with_missing_field, filter_type="include"
-                ),
+                filter_by_field(field=include_domains_with_missing_field, filter_type="include"),
             ]
         )
 
@@ -90,9 +85,7 @@ class DTFiltersTest(unittest.TestCase):
 
         results = self.dt_res_filter.by(
             [
-                filter_by_field(
-                    field=exclude_domains_with_missing_field, filter_type="exclude"
-                ),
+                filter_by_field(field=exclude_domains_with_missing_field, filter_type="exclude"),
             ]
         )
 

domaintools_api_test_upload-2.7.3/VERSION

@@ -1 +0,0 @@
-2.7.3