setech 1.8.4__tar.gz → 1.8.5__tar.gz

{setech-1.8.4 → setech-1.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: setech
-Version: 1.8.4
+Version: 1.8.5
 Summary: Setech utilities
 Keywords: api-client,logging,setech,utility,utils
 Author: Eriks Karls

{setech-1.8.4 → setech-1.8.5}/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "uv-build>=0.11.18,<0.12", "wheel" ]
 
 [project]
 name = "setech"
-version = "1.8.4"
+version = "1.8.5"
 description = "Setech utilities"
 readme = "README.md"
 keywords = [ "api-client", "logging", "setech", "utility", "utils" ]

{setech-1.8.4 → setech-1.8.5}/src/setech/django/validators.py

@@ -3,7 +3,7 @@ from django.core.exceptions import ValidationError
 from django.core.files import File
 from django.core.validators import FileExtensionValidator, get_available_image_extensions
 
-from setech.domain_mx_validator import mx_cache
+from setech.domain_mx_validator import MxLookupError, mx_cache
 from setech.utils import validate_phone_number, validate_ssn
 
 __all__ = [
@@ -30,9 +30,19 @@ def django_phone_number_validator(phone_number: str) -> None:
 
 
 def django_validate_email_mx_domain(value: str) -> None:
-    domain_part = value.rsplit("@", 1)[-1]
+    domain_part = value.rsplit("@", 1)[-1].lower()
 
-    if not mx_cache.check_domain(domain_part):
+    try:
+        has_mx = mx_cache.check_domain(domain_part)
+    except MxLookupError:
         raise ValidationError(
-            "%(domain)s cannot receive emails!", params={"domain": domain_part}, code="invalid_email_domain"
+            "MX records lookup for %(domain)s failed!",
+            params={"domain": domain_part},
+            code="mx_lookup_failed",
+        ) from None
+    if not has_mx:
+        raise ValidationError(
+            "%(domain)s cannot receive emails!",
+            params={"domain": domain_part},
+            code="invalid_email_domain",
         )

{setech-1.8.4 → setech-1.8.5}/src/setech/domain_mx_validator/__init__.py

@@ -5,10 +5,11 @@ try:
 except ImportError:
     raise ImportError("setech.domain_mx_validator requires DNS. Install it with: pip install setech[dns]") from None
 
+from .base import MxLookupError
 from .memory import MemoryCache
 from .redis import RedisCache
 
-__all__ = ["mx_cache"]
+__all__ = ["MxLookupError", "mx_cache"]
 
 
 mx_cache: MemoryCache | RedisCache

{setech-1.8.4 → setech-1.8.5}/src/setech/domain_mx_validator/base.py

@@ -5,6 +5,15 @@ from abc import ABC, abstractmethod
 import dns.exception
 import dns.resolver
 
+NO_MX_DNS_ERRORS = (
+    dns.resolver.NXDOMAIN,
+    dns.resolver.NoAnswer,
+)
+
+
+class MxLookupError(Exception):
+    """The MX lookup could not be completed; the domain may still be valid."""
+
 
 class BaseDomainCache(ABC):
     logger: logging.Logger
@@ -21,9 +30,12 @@ class BaseDomainCache(ABC):
         try:
             self.logger.info("Looking up records for %s", domain)
             res = dns.resolver.resolve(domain, "MX")
-        except dns.exception.DNSException as e:
-            self.logger.warning("No records found! %s", e)
+        except NO_MX_DNS_ERRORS as e:
+            self.logger.info("No MX records for '%s': %r", domain, e)
             return [], self.CACHE_TTL_MX_NOT_FOUND
+        except dns.exception.DNSException as e:
+            self.logger.warning("MX lookup for '%s' failed: %r", domain, e)
+            raise MxLookupError(domain) from e
         if not res.rrset:
             return [], self.CACHE_TTL_MX_NOT_FOUND
         self.logger.info("Found MX records for '%s'. %s", domain, res)

{setech-1.8.4 → setech-1.8.5}/src/setech/domain_mx_validator/memory.py

@@ -24,16 +24,16 @@ class MemoryCache(BaseDomainCache):
         self._cache_storage = {}
 
     def check_domain(self, domain: str) -> bool:
-        if self._get_cache_result(domain):
-            return True
+        if cached := self._get_cache_result(domain):
+            return bool(cached.records)
 
         records, ttl = self.lookup_mx_records(domain)
         self._cache_storage[domain] = MemoryItem(records=records, cached_at=datetime.now(), ttl=ttl)
         return bool(records)
 
-    def _get_cache_result(self, domain: str) -> bool:
+    def _get_cache_result(self, domain: str) -> MemoryItem | None:
         if cached_value := self._cache_storage.get(domain):
             if cached_value.is_valid:
-                return True
+                return cached_value
             self._cache_storage.pop(domain, None)
-        return False
+        return None