[#3607] PR feedback

src/openforms/validations/base.py

@@ -6,8 +6,9 @@
 
 from openforms.plugins.plugin import AbstractBasePlugin
 from openforms.submissions.models import Submission
+from openforms.typing import JSONValue
 
-T = TypeVar("T", default=str)
+T = TypeVar("T", bound=JSONValue, default=str)
 """A type variable representing the type of the value being validated by the plugin."""
 
 

src/openforms/validations/registry.py

@@ -12,12 +12,13 @@
 
 from openforms.plugins.registry import BaseRegistry
 from openforms.submissions.models import Submission
+from openforms.typing import JSONValue
 
 from .base import BasePlugin
 
 logger = logging.getLogger(__name__)
 
-T = TypeVar("T", default=str)
+T = TypeVar("T")
 
 
 @dataclasses.dataclass()
@@ -40,7 +41,7 @@ def _flat(it):
     return list(_flat(iterables))
 
 
-class Registry(BaseRegistry[BasePlugin[T]]):
+class Registry(BaseRegistry[BasePlugin[JSONValue]]):
     """
     A registry for the validations module plugins.
 
@@ -54,7 +55,7 @@ class Registry(BaseRegistry[BasePlugin[T]]):
 
     @elasticapm.capture_span("app.validations.validate")
     def validate(
-        self, plugin_id: str, value: T, submission: Submission
+        self, plugin_id: str, value: JSONValue, submission: Submission
     ) -> ValidationResult:
         try:
             validator = self._registry[plugin_id]
@@ -69,7 +70,7 @@ def validate(
                 ],
             )
 
-        if not getattr(validator, "is_enabled", True):
+        if not validator.is_enabled:
             return ValidationResult(
                 False,
                 messages=[

src/openforms/validations/validators/formats.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING
 
@@ -20,7 +22,7 @@ class PhoneNumberBaseValidator(ABC):
     error_message = _("Not a valid %(country)s phone number")
 
     @abstractmethod
-    def _parse_phonenumber(self, value: str) -> "PhoneNumber":
+    def _parse_phonenumber(self, value: str) -> PhoneNumber:
         pass
 
     def __call__(self, value: str, submission):
@@ -58,7 +60,7 @@ class InternationalPhoneNumberValidator(PhoneNumberBaseValidator, BasePlugin[str
     verbose_name = _("International phone number")
     for_components = ("phoneNumber",)
 
-    def _parse_phonenumber(self, value: str) -> "PhoneNumber":
+    def _parse_phonenumber(self, value: str) -> PhoneNumber:
         try:
             return phonenumbers.parse(value, self.country)
         except NumberParseException:
@@ -84,7 +86,7 @@ class DutchPhoneNumberValidator(PhoneNumberBaseValidator, BasePlugin[str]):
     verbose_name = _("Dutch phone number")
     for_components = ("phoneNumber",)
 
-    def _parse_phonenumber(self, value: str) -> "PhoneNumber":
+    def _parse_phonenumber(self, value: str) -> PhoneNumber:
         try:
             return phonenumbers.parse(value, self.country)
         except NumberParseException: