IDEV-1996: Add code improvements.

Author: jbabac

domaintools/api.py

@@ -19,7 +19,7 @@
     filter_by_field,
     DTResultFilter,
 )
-from domaintools.utils import validate_feeds_required_parameters
+from domaintools.utils import validate_feeds_parameters
 
 
 AVAILABLE_KEY_SIGN_HASHES = ["sha1", "sha256", "md5"]
@@ -1091,7 +1091,7 @@ def nad(self, **kwargs):
 
     def domainrdap(self, **kwargs):
         """Returns changes to global domain registration information, populated by the Registration Data Access Protocol (RDAP)"""
-        validate_feeds_required_parameters(kwargs)
+        validate_feeds_parameters(kwargs)
         endpoint = kwargs.pop("endpoint", Endpoint.FEED.value)
         source = ENDPOINT_TO_SOURCE_MAP.get(endpoint)
 
@@ -1104,10 +1104,11 @@ def domainrdap(self, **kwargs):
 
     def domaindiscovery(self, **kwargs):
         """Returns new domains as they are either discovered in domain registration information, observed by our global sensor network, or reported by trusted third parties"""
-        validate_feeds_required_parameters(kwargs)
+        validate_feeds_parameters(kwargs)
         endpoint = kwargs.pop("endpoint", Endpoint.FEED.value)
         source = ENDPOINT_TO_SOURCE_MAP.get(endpoint)
         if endpoint == Endpoint.DOWNLOAD.value or kwargs.get("output_format", OutputFormat.JSONL.value) != OutputFormat.CSV.value:
+            # headers param is allowed only in Feed API and CSV format
             kwargs.pop("headers", None)
 
         return self._results(

domaintools/cli/commands/feeds.py

@@ -6,7 +6,7 @@
 from domaintools.cli.api import DTCLICommand
 from domaintools.cli.utils import get_cli_helptext_by_name
 from domaintools.cli import constants as c
-from domaintools.constants import Endpoint
+from domaintools.constants import Endpoint, OutputFormat
 
 
 @dt_cli.command(
@@ -226,7 +226,7 @@ def feeds_domaindiscovery(
         "jsonl",
         "-f",
         "--format",
-        help="Output format in {'jsonl'}",
+        help=f"Output format in [{OutputFormat.JSONL.value}, {OutputFormat.CSV.value}]",
         callback=DTCLICommand.validate_feeds_format_input,
     ),
     endpoint: str = typer.Option(

domaintools/utils.py

@@ -1,7 +1,8 @@
 from datetime import datetime
-
 from typing import Optional
 
+from domaintools.constants import Endpoint, OutputFormat
+
 import re
 
 
@@ -182,9 +183,13 @@ def get_feeds_products_list():
     ]
 
 
-def validate_feeds_required_parameters(params):
+def validate_feeds_parameters(params):
     sessionID = params.get("sessionID")
     after = params.get("after")
     before = params.get("before")
     if not (sessionID or after or before):
         raise ValueError("sessionID or after or before must be defined")
+
+    format = params.get("output_format")
+    if params.get("endpoint") == Endpoint.DOWNLOAD.value and format == OutputFormat.CSV.value:
+        raise ValueError(f"{format} format is not available in {Endpoint.DOWNLOAD.value} API.")