fixed bugs and reformatted files

Author: patrickboateng

func_validator/__init__.py

@@ -2,5 +2,5 @@
 from ._func_arg_validator import validate_params
 from .validators import *
 
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __all__ = ["validate_params"] + validators.__all__

func_validator/validators/_core.py

@@ -36,11 +36,15 @@ def transform(self, **kwargs):
 
 class Validator(ABC):
 
-    def __init__(self, *, err_msg: Optional[str | ErrorMsg] = "") -> None:
-        if err_msg:
+    def __init__(self, *, err_msg: str | ErrorMsg = "") -> None:
+        if isinstance(err_msg, str):
             self.err_msg = ErrorMsg(err_msg)
-        else:
+        elif isinstance(err_msg, ErrorMsg):
             self.err_msg = err_msg
+        else:
+            raise ValidationError(
+                f"err_msg must be str or ErrorMsg, not {type(err_msg)}"
+            )
 
     @abstractmethod
     def __call__(self, *args, **kwargs) -> T: ...

func_validator/validators/collection_arg_validators.py

@@ -1,5 +1,5 @@
 from operator import contains
-from typing import Callable, Container, Iterable, Optional, Sized
+from typing import Callable, Container, Iterable, Sized
 
 from ._core import ErrorMsg, Number, T, ValidationError, Validator
 from .numeric_arg_validators import (
@@ -85,7 +85,7 @@ def __call__(self, arg_value: T, arg_name: str):
 
 class MustBeEmpty(Validator):
 
-    def __init__(self, *, err_msg: Optional[str] = None):
+    def __init__(self, *, err_msg: str = ""):
         """
         :param err_msg: Error message.
         """
@@ -102,7 +102,7 @@ def __call__(self, arg_value: Sized, arg_name: str, /):
 
 class MustBeNonEmpty(Validator):
 
-    def __init__(self, *, err_msg: Optional[str] = None):
+    def __init__(self, *, err_msg: str = ""):
         """
         :param err_msg: Error message.
         """
@@ -122,7 +122,7 @@ class MustHaveLengthEqual(Validator):
     value.
     """
 
-    def __init__(self, value: int, *, err_msg: Optional[str] = None):
+    def __init__(self, value: int, *, err_msg: str = ""):
         """
         :param value: The length of the iterable.
         :param err_msg: Error message.
@@ -143,7 +143,7 @@ class MustHaveLengthGreaterThan(Validator):
     value.
     """
 
-    def __init__(self, value: int, *, err_msg: Optional[str] = None):
+    def __init__(self, value: int, *, err_msg: str = ""):
         """
         :param value: The length of the iterable.
         :param err_msg: Error message.
@@ -164,7 +164,7 @@ class MustHaveLengthGreaterThanOrEqual(Validator):
     the specified value.
     """
 
-    def __init__(self, value: int, *, err_msg: Optional[str] = None):
+    def __init__(self, value: int, *, err_msg: str = ""):
         """
         :param value: The length of the iterable.
         :param err_msg: Error message
@@ -185,7 +185,7 @@ class MustHaveLengthLessThan(Validator):
     value.
     """
 
-    def __init__(self, value: int, *, err_msg: Optional[str] = None):
+    def __init__(self, value: int, *, err_msg: str = ""):
         """
         :param value: The length of the iterable.
         :param err_msg: Error message.
@@ -206,7 +206,7 @@ class MustHaveLengthLessThanOrEqual(Validator):
     the specified value.
     """
 
-    def __init__(self, value: int, *, err_msg: Optional[str] = None):
+    def __init__(self, value: int, *, err_msg: str = ""):
         """
         :param value: The length of the iterable.
         :param err_msg: Error message.
@@ -234,7 +234,7 @@ def __init__(
         max_value: int,
         min_inclusive: bool = True,
         max_inclusive: bool = True,
-        err_msg: Optional[str] = None,
+        err_msg: str = "",
     ):
         """
         :param min_value: The minimum value (inclusive or exclusive based
@@ -276,7 +276,7 @@ class MustHaveValuesGreaterThan(Validator):
     specified min_value.
     """
 
-    def __init__(self, min_value: Number, *, err_msg: Optional[str] = None):
+    def __init__(self, min_value: Number, *, err_msg: str = ""):
         """
         :param min_value: The minimum value the values in the iterable
                           should be greater than.
@@ -298,7 +298,7 @@ class MustHaveValuesGreaterThanOrEqual(Validator):
     equal to the specified min_value.
     """
 
-    def __init__(self, min_value: Number, *, err_msg: Optional[str] = None):
+    def __init__(self, min_value: Number, *, err_msg: str = ""):
         """
         :param min_value: The minimum value the values in the iterable
                           should be greater than or equal to.
@@ -320,7 +320,7 @@ class MustHaveValuesLessThan(Validator):
     specified max_value.
     """
 
-    def __init__(self, max_value: Number, *, err_msg: Optional[str] = None):
+    def __init__(self, max_value: Number, *, err_msg: str = ""):
         """
         :param max_value: The maximum value the values in the iterable
                           should be less than.
@@ -342,7 +342,7 @@ class MustHaveValuesLessThanOrEqual(Validator):
     equal to the specified max_value.
     """
 
-    def __init__(self, max_value: Number, *, err_msg: Optional[str] = None):
+    def __init__(self, max_value: Number, *, err_msg: str = ""):
         """
         :param max_value: The maximum value the values in the iterable
                           should be less than or equal to.
@@ -371,7 +371,7 @@ def __init__(
         max_value: Number,
         min_inclusive: bool = True,
         max_inclusive: bool = True,
-        err_msg: Optional[str] = None,
+        err_msg: str = "",
     ):
         """
         :param min_value: The minimum value (inclusive or exclusive based

func_validator/validators/datatype_arg_validators.py

@@ -1,4 +1,4 @@
-from typing import Optional, Type
+from typing import Type
 
 from ._core import ErrorMsg, T, ValidationError, Validator
 

func_validator/validators/dependent_argument_validator.py

@@ -1,4 +1,4 @@
-from typing import Optional, Type
+from typing import Type
 
 from ._core import T, ValidationError, Validator
 from .numeric_arg_validators import MustBeLessThan, MustBeTruthy
@@ -20,7 +20,7 @@ def __init__(
         *args: str,
         args_strategy: Type[Validator] = MustBeLessThan,
         kw_strategy: Type[Validator] = MustBeTruthy,
-        err_msg: Optional[str] = "",
+        err_msg: str = "",
         **kwargs: T,
     ):
         """

func_validator/validators/numeric_arg_validators.py

@@ -1,7 +1,7 @@
 import math
 from functools import partial
 from operator import eq, ge, gt, le, lt, ne
-from typing import Callable, Optional
+from typing import Callable
 
 from ._core import (
     OPERATOR_SYMBOLS,
@@ -189,10 +189,10 @@ def __call__(self, arg_value: Number, arg_name: str, /):
 # Comparison validation functions
 
 
-# TODO: Deprecate this and work on logic
+# TODO: Deprecate this and work on logic in MustBeProvided
 class MustBeTruthy(Validator):
 
-    def __init__(self, *, err_msg: str = None) -> None:
+    def __init__(self, *, err_msg: str = "") -> None:
         super().__init__(err_msg=err_msg)
 
     def __call__(self, arg_value: T, arg_name: str):

func_validator/validators/text_arg_validators.py

@@ -1,5 +1,5 @@
 import re
-from typing import Callable, Literal, Optional
+from typing import Callable, Literal
 
 from ._core import ErrorMsg, T, ValidationError, Validator