edri 2025.11.1rc2__py3-none-any.whl → 2025.11.1rc4__py3-none-any.whl

edri/api/broker.py

@@ -21,8 +21,8 @@ from edri.dataclass.response import ResponseStatus, Response
 from edri.events.api import group, manage, client
 from edri.events.edri.router import HealthCheck, Subscribe
 from edri.utility import Storage
-from edri.utility.validation import StringValidation, IntegerValidation, FloatValidation, DateValidation, \
-    TimeValidation, DateTimeValidation
+from edri.utility.validation import StringValidator, IntegerValidator, FloatValidator, DateValidator, \
+    TimeValidator, DateTimeValidator
 
 
 class TrieNode:
@@ -391,12 +391,12 @@ class Broker(ManagerBase):
 
         def extract_parameters_response(event_cls: Type[Event]) -> tuple[dict[str, Any], dict[str, Any]]:
             VALIDATION_MAP: dict[type, tuple[str, type]] = {
-                StringValidation: ("string", StringValidation.__bases__[0]),
-                IntegerValidation: ("integer", IntegerValidation.__bases__[0]),
-                FloatValidation: ("float", FloatValidation.__bases__[0]),
-                DateValidation: ("date", DateValidation.__bases__[0]),
-                TimeValidation: ("time", TimeValidation.__bases__[0]),
-                DateTimeValidation: ("datetime", DateTimeValidation.__bases__[0]),
+                StringValidator: ("string", StringValidator.__bases__[0]),
+                IntegerValidator: ("integer", IntegerValidator.__bases__[0]),
+                FloatValidator: ("float", FloatValidator.__bases__[0]),
+                DateValidator: ("date", DateValidator.__bases__[0]),
+                TimeValidator: ("time", TimeValidator.__bases__[0]),
+                DateTimeValidator: ("datetime", DateTimeValidator.__bases__[0]),
             }
 
             def resolve_validation(field_type: Injection) -> tuple[str | None, dict[str, Any]]:

edri/api/dataclass/api_event.py

@@ -3,7 +3,7 @@ from enum import Enum
 from http import HTTPMethod
 from inspect import isclass
 from logging import getLogger
-from types import NoneType, UnionType
+from types import NoneType, UnionType, GenericAlias
 from typing import Type, get_origin, get_args
 from uuid import UUID
 
@@ -14,7 +14,9 @@ from edri.api.dataclass.file import File
 from edri.api.extensions.url_prefix import PrefixBase
 from edri.config.constant import ApiType
 from edri.dataclass.event import EventHandlingType, _event, Event
+from edri.dataclass.injection import Injection
 from edri.utility.function import camel2snake
+from edri.utility.validation import ListValidator
 
 
 @dataclass
@@ -109,6 +111,13 @@ def api(cls=None, /, *, init=True, repr=True, eq=True, order=False,
                         raise TypeError(f"{item_args[0]} cannot be used as a type for API event")
                 elif item_type not in allowed_types and not hasattr(field.type, "fromisoformat"):
                     raise TypeError(f"{field.type} cannot be used as a type for API event")
+            elif isinstance(field.type, Injection):
+                for validator in field.type.classes:
+                    if validator == ListValidator:
+                        raise TypeError(
+                            "ListValidation must be used as ListValidation[T], "
+                            "e.g. ListValidation[Any] or ListValidation[inject(...)]."
+                        )
 
         http_method = method or dataclass.method
         if http_method is None:

edri/api/handlers/base_handler.py

@@ -1,8 +1,9 @@
 from abc import ABC, abstractmethod
 from dataclasses import fields, MISSING
+from inspect import signature
 from logging import getLogger
-from types import UnionType, NoneType
-from typing import Callable, Type, get_origin, Union, get_args, Any, TypedDict, Literal, TypeAliasType
+from types import UnionType, NoneType, GenericAlias
+from typing import Callable, Type, get_origin, Union, get_args, Any, TypedDict, Literal, TypeAliasType, Iterable
 from urllib.parse import parse_qs, unquote
 
 from edri.dataclass.directive import ResponseDirective
@@ -71,7 +72,6 @@ class BaseHandler[T: ResponseDirective](ABC):
     def create_event(self, event_constructor: Type[Event]) -> Event:
         self.insert_default_parameters(event_constructor)
         self.check_parameters(event_constructor)
-        # noinspection PyArgumentList
         event = event_constructor(**self.parameters)
         event._timing.stamp(self.__class__.__name__, "Created")
         return event
@@ -79,73 +79,228 @@ class BaseHandler[T: ResponseDirective](ABC):
     def convert_type(self, value: Any, annotation: type) -> Any:
         """
         Validates and converts input values to the specified annotation type,
-        supporting basic types, Optional, and lists with type annotations.
+        supporting:
+          - basic types
+          - Optional / Union / |
+          - list / tuple / dict with type args
+          - Literal
+          - list-like subclasses (e.g. ListValidation[int])
+          - Injection of validation classes (e.g. Injection((ListValidation[int],), {...}))
+        """
+        annotation = self._normalize_annotation(annotation)
 
-        Parameters:
-            value: The input value to be validated and converted.
-            annotation: The target type annotation for the conversion.
+        # Any
+        if annotation is Any:
+            return value
 
-        Returns:
-            The converted value if conversion is successful.
+        # Injection (chain of validation classes)
+        if isinstance(annotation, Injection):
+            return self._convert_injection(value, annotation)
 
-        Raises:
-            TypeError: If the value cannot be converted to the specified type.
-        """
+        # Unions / Optional
+        if self._is_union(annotation):
+            return self._convert_union(value, annotation)
+
+        origin = get_origin(annotation)
+
+        # Generics: list, tuple, dict, Literal, ListValidation[int], ...
+        if origin is not None:
+            return self._convert_generic(value, annotation, origin)
+
+        # Non-generic simple types (including bare ListValidation, bool, etc.)
+        return self._convert_simple(value, annotation)
+
+    def _normalize_annotation(self, annotation: type) -> type:
+        """Unwrap TypeAliasType and other simple normalizations."""
         if isinstance(annotation, TypeAliasType):
-            annotation = annotation.__value__
-        if get_origin(annotation) or isinstance(annotation, UnionType):
-            if isinstance(annotation, UnionType) or get_origin(annotation) == Union:
-                annotations = get_args(annotation)
-                if value is None:
-                    if NoneType in annotations:
-                        return None
-                    else:
-                        raise TypeError(f"Value '{value}' cannot be converted to type {annotation}")
-                for annotation in annotations:
-                    try:
-                        return self.convert_type(value, annotation)
-                    except TypeError:
-                        continue
+            return annotation.__value__
+        return annotation
+
+    def _is_union(self, annotation: type) -> bool:
+        """Check if annotation is a Union / Optional / | type."""
+        return isinstance(annotation, UnionType) or get_origin(annotation) is Union
+
+    def _convert_injection(self, value: Any, injection: Injection) -> Any:
+        """
+        Run all validation classes in an Injection.
+
+        Each `cls` in `injection.classes` is:
+          - either a plain validation class (e.g. ListValidation),
+          - or a GenericAlias like ListValidation[int].
+
+        For list-like generics (e.g. ListValidation[int]) we:
+          - convert each element of `value` using the inner type (int here),
+          - then instantiate the validation class with filtered params.
+        """
+        try:
+            for cls in injection.classes:
+                # Determine underlying class and optional inner type
+                item_type = None
+
+                if isinstance(cls, GenericAlias):
+                    origin = get_origin(cls)  # e.g. ListValidation
+                    args = get_args(cls)  # e.g. (int,)
+                    target_cls = origin
+
+                    # list-like validation class: ListValidation[int], MyListValidator[str], ...
+                    if issubclass(origin, list) and args:
+                        item_type = args[0]
                 else:
-                    raise TypeError(f"Value '{value}' cannot be converted to type {annotation}")
-            elif get_origin(annotation) == list and isinstance(value, list):
-                if len(get_args(annotation)) != 1:
-                    raise TypeError("Type of list item must be specified")
-                return [self.convert_type(value, get_args(annotation)[0]) for value in value]
-            elif get_origin(annotation) == tuple and isinstance(value, tuple):
-                return tuple(self.convert_type(v, a) for v, a in zip(value, get_args(annotation)))
-            elif get_origin(annotation) == Literal and isinstance(value, str) and value in get_args(annotation):
-                return value
-            elif get_origin(annotation) == dict and isinstance(value, dict):
-                a_args = get_args(annotation)
-                return {self.convert_type(k, a_args[0]): self.convert_type(v, a_args[1]) for k, v in value.items()}
-            else:
-                raise TypeError(f"Value '{value}' cannot be converted to type {annotation}")
-        else:
-            if annotation is Any:
-                return value
-            elif isinstance(annotation, Injection):
-                try:
-                    for validator in annotation:
-                        value = validator(value)
-                    return value
-                except ValueError:
-                    raise TypeError(f"Value '{value}' cannot be converted to type {annotation}")
-            elif isinstance(value, annotation):
+                    target_cls = cls
+
+                # Filter parameters to those that target_cls.__init__ actually accepts
+                sig = signature(target_cls)
+                param_names = [
+                    p.name for p in sig.parameters.values()
+                    if p.name != "self"
+                ]
+                filtered_params = {
+                    k: v for k, v in injection.parameters.items()
+                    if k in param_names
+                }
+
+                # If this is a list-like validator with an inner type -> convert elements first
+                if item_type is not None:
+                    if (not isinstance(value, Iterable)) or isinstance(value, (str, bytes)):
+                        raise TypeError(
+                            f"Value '{value}' is not a valid iterable for validator {cls}"
+                        )
+
+                    converted_items = [
+                        self.convert_type(item, item_type) for item in value
+                    ]
+                    value = target_cls(converted_items, **filtered_params)
+                else:
+                    # Any other validation class: just feed the (possibly already converted) value
+                    value = target_cls(value, **filtered_params)
+
+            return value
+
+        except ValueError:
+            # Your original contract: map validator ValueError -> TypeError
+            raise TypeError(f"Value '{value}' cannot be converted to type {injection}")
+
+    def _convert_union(self, value: Any, annotation: type) -> Any:
+        """Handle Union/Optional annotations."""
+        annotations = get_args(annotation)
+
+        # Handle Optional[...] where None is allowed
+        if value is None:
+            if NoneType in annotations:
+                return None
+            raise TypeError(f"Value '{value}' cannot be converted to type {annotation}")
+
+        # Try each type in the Union
+        last_error: Exception | None = None
+        for ann in annotations:
+            try:
+                return self.convert_type(value, ann)
+            except TypeError as e:
+                last_error = e
+                continue
+
+        raise TypeError(f"Value '{value}' cannot be converted to type {annotation}") from last_error
+
+    def _convert_generic(self, value: Any, annotation: type, origin: type) -> Any:
+        """
+        Handle generics like:
+          - list[T] and list-like subclasses (ListValidation[T])
+          - tuple[X, Y, ...]
+          - dict[K, V]
+          - Literal[...]
+        """
+        args = get_args(annotation)
+
+        # list[T] and list-like subclasses (e.g. ListValidation[int])
+        if isinstance(origin, type) and issubclass(origin, list):
+            if not isinstance(value, Iterable) or isinstance(value, (str, bytes)):
+                raise TypeError(f"Value '{value}' is not a valid iterable for type {annotation}")
+
+            item_type = args[0] if args else Any
+            converted_items = [self.convert_type(item, item_type) for item in value]
+
+            if origin is list:
+                return converted_items
+
+            # Subclass of list, e.g. ListValidation[int]
+            try:
+                return origin(converted_items)
+            except Exception as e:
+                raise TypeError(
+                    f"Value '{value}' cannot be converted to list-like type {annotation}"
+                ) from e
+
+        # ---- tuple[X, Y, ...] ----
+        if origin is tuple:
+            if not isinstance(value, tuple):
+                raise TypeError(f"Value '{value}' is not a tuple for type {annotation}")
+            return tuple(self.convert_type(v, a) for v, a in zip(value, args))
+
+        # ---- dict[K, V] ----
+        if origin is dict:
+            if not isinstance(value, dict):
+                raise TypeError(f"Value '{value}' is not a dict for type {annotation}")
+            if len(args) != 2:
+                raise TypeError("Key and value types for dict must be specified")
+            key_type, value_type = args
+            return {
+                self.convert_type(k, key_type): self.convert_type(v, value_type)
+                for k, v in value.items()
+            }
+
+        # ---- Literal["a", "b", ...] ----
+        if origin is Literal:
+            literal_values = args
+            if value in literal_values:
                 return value
-            elif isinstance(value, str) and value.lower() == "false" and annotation == bool:
-                return False
+            raise TypeError(
+                f"Value '{value}' is not one of the allowed Literal values {literal_values}"
+            )
+
+        # Unknown generic
+        raise TypeError(f"Value '{value}' cannot be converted to type {annotation}")
+
+    def _convert_simple(self, value: Any, annotation: type) -> Any:
+        """
+        Handle non-generic types: bool, dataclasses, custom classes,
+        and bare list subclasses like ListValidation.
+        """
+        # Already correct type
+        if isinstance(value, annotation):
+            return value
+
+        # Support bare list-like subclasses (e.g. annotation is ListValidation without [T])
+        try:
+            is_list_subclass = isinstance(annotation, type) and issubclass(annotation, list)
+        except TypeError:
+            is_list_subclass = False
+
+        if is_list_subclass and not isinstance(value, (str, bytes)) and isinstance(value, Iterable):
             try:
                 return annotation(value)
-            except Exception:
-                if hasattr(annotation, "fromisoformat"):
-                    try:
-                        return annotation.fromisoformat(value)
-                    except Exception:
-                        raise TypeError(
-                            "Value '%s' cannot be converted from isoformat to type %s" % (value, annotation))
-                else:
-                    raise TypeError(f"Value '{value}' cannot be converted to type {annotation}")
+            except Exception as e:
+                raise TypeError(
+                    f"Value '{value}' cannot be converted to list-like type {annotation}"
+                ) from e
+
+        # Special case: string "false" -> False for bool
+        if isinstance(value, str) and value.lower() == "false" and annotation is bool:
+            return False
+
+        # Normal constructor-based conversion
+        try:
+            return annotation(value)
+        except Exception:
+            # Try fromisoformat if available (e.g., datetime, date)
+            if hasattr(annotation, "fromisoformat"):
+                try:
+                    return annotation.fromisoformat(value)
+                except Exception:
+                    raise TypeError(
+                        "Value '%s' cannot be converted from isoformat to type %s"
+                        % (value, annotation)
+                    )
+            raise TypeError(f"Value '{value}' cannot be converted to type {annotation}")
 
     @abstractmethod
     def handle_directives(self, directives: list[ResponseDirective]) -> ...:

edri/api/handlers/http_handler.py

@@ -29,14 +29,16 @@ from edri.config.setting import MAX_BODY_SIZE, ASSETS_PATH, UPLOAD_FILES_PREFIX,
     CORS_MAX_AGE, UPLOAD_FILES_PATH
 from edri.dataclass.directive import HTTPResponseDirective, ResponseDirective
 from edri.dataclass.directive.base import InternalServerErrorResponseDirective, UnauthorizedResponseDirective
-from edri.dataclass.directive.http import CookieResponseDirective, AccessDeniedResponseDirective, NotFoundResponseDirective, \
-    ConflictResponseDirective, HeaderResponseDirective, UnprocessableContentResponseDirective, BadRequestResponseDirective
+from edri.dataclass.directive.http import CookieResponseDirective, AccessDeniedResponseDirective, \
+    NotFoundResponseDirective, \
+    ConflictResponseDirective, HeaderResponseDirective, UnprocessableContentResponseDirective, \
+    BadRequestResponseDirective, NotModifiedResponseDirective
 from edri.dataclass.event import Event
 from edri.dataclass.injection import Injection
 from edri.utility import NormalizedDefaultDict
 from edri.utility.function import camel2snake
 from edri.utility.shared_memory_pipe import SharedMemoryPipe
-from edri.utility.validation import StringValidation
+from edri.utility.validation import StringValidator
 
 
 class EventTypesExtensionsDict(TypedDict):
@@ -194,7 +196,7 @@ class URLNode:
                             raise TypeError("All classes in 'inject' must have the same base class when used as URL parameters.")
                         break  # Only check the first valid base class regex
 
-            if vot is StringValidation:
+            if vot is StringValidator:
                 regex = type_.parameters.get("regex", None)
                 if regex is not None:
                     regex_function = lambda name, _: rf"^(?P<{escape(name)}>{sub(r'^\^(.*)\$$', r'\1', regex.pattern)})$"
@@ -271,6 +273,9 @@ class HTTPHandler[T: HTTPResponseDirective](BaseHandler, ABC):
         },
         BadRequestResponseDirective: {
             "status": HTTPStatus.BAD_REQUEST,
+        },
+        NotModifiedResponseDirective: {
+            "status": HTTPStatus.NOT_MODIFIED,
         }
     }
 
@@ -716,6 +721,23 @@ class HTTPHandler[T: HTTPResponseDirective](BaseHandler, ABC):
                     })
         except Exception as e:
             self.logger.error(e, exc_info=e)
+
+    async def response_headers(self, status: HTTPStatus, *args, **kwargs: Unpack[ResponseKW]):
+        headers = kwargs["headers"]
+        if headers is None:
+            headers = NormalizedDefaultDict(list)
+        await self.send({
+            'type': 'http.response.start',
+            'status': status,
+            'headers': self.get_headers_binary(headers),
+        })
+
+        await self.send({
+            'type': 'http.response.body',
+            'body': b"",
+            'more_body': False
+        })
+
     def get_event_constructors(self) -> tuple[dict[HTTPMethod, Type[Event]], dict[str, Any]]:
         return self.url_root.find_methods(self.scope["path"].lower())
 

edri/api/listener.py

@@ -270,6 +270,8 @@ class Listener(Process):
                     await handler.response_file(event_response, headers=headers)
                 else:
                     await handler.response(status, event_response, headers=headers)
+            elif status.is_redirection:
+                await handler.response_headers(status, headers=headers)
             else:
                 await handler.response_error(status, event_response, headers=headers)
             self.unregister(pipe, event._api)

edri/dataclass/directive/http.py

@@ -65,3 +65,7 @@ class UnprocessableContentResponseDirective(HTTPResponseDirective):
 @dataclass
 class BadRequestResponseDirective(HTTPResponseDirective):
     message: str | None = None
+
+@dataclass
+class NotModifiedResponseDirective(HTTPResponseDirective):
+    pass

edri/dataclass/injection.py

@@ -1,5 +1,6 @@
 from inspect import signature
-from typing import Any, Type
+from types import GenericAlias
+from typing import Any, Type, get_origin
 
 
 class Injection:
@@ -32,7 +33,10 @@ class Injection:
         # Create the callable on demand when iterating
         for cls in self.classes:
             # Get the signature of the __init__ method of the class
-            sig = signature(cls)
+            if isinstance(cls, GenericAlias):
+                sig = signature(get_origin(cls))
+            else:
+                sig = signature(cls)
             # Extract parameter names from the signature
             param_names: list[str] = [param.name for param in sig.parameters.values() if param.name != 'self']
 

edri/utility/validation.py

@@ -1,9 +1,9 @@
 from datetime import date, datetime, time
 from re import Pattern
-from typing import Self
+from typing import Self, Iterable, Any
 
 
-class StringValidation(str):
+class StringValidator(str):
     """
     A string type that performs validation on initialization.
 
@@ -21,7 +21,7 @@ class StringValidation(str):
                     or its length is outside the allowed bounds.
 
     Example:
-        >>> StringValidation("hello", minimum_length=3, maximum_length=10)
+        >>> StringValidator("hello", minimum_length=3, maximum_length=10)
         'hello'
     """
 
@@ -49,7 +49,7 @@ class StringValidation(str):
         return (v[:max_len] + "…") if len(v) > max_len else v
 
 
-class IntegerValidation(int):
+class IntegerValidator(int):
     """
     An integer type that performs validation on initialization.
 
@@ -65,7 +65,7 @@ class IntegerValidation(int):
         ValueError: If the value is less than `minimum` or greater than `maximum`.
 
     Example:
-        >>> IntegerValidation(5, minimum=1, maximum=10)
+        >>> IntegerValidator(5, minimum=1, maximum=10)
         5
     """
 
@@ -78,7 +78,7 @@ class IntegerValidation(int):
         return value
 
 
-class FloatValidation(float):
+class FloatValidator(float):
     """
     A float type that performs validation on initialization.
 
@@ -94,7 +94,7 @@ class FloatValidation(float):
         ValueError: If the value is less than `minimum` or greater than `maximum`.
 
     Example:
-        >>> FloatValidation(3.14, minimum=1.0, maximum=5.0)
+        >>> FloatValidator(3.14, minimum=1.0, maximum=5.0)
         3.14
     """
 
@@ -107,7 +107,7 @@ class FloatValidation(float):
         return value
 
 
-class DateValidation(date):
+class DateValidator(date):
     """
     A date type that performs validation on initialization.
 
@@ -126,7 +126,7 @@ class DateValidation(date):
         ValueError: If the date is outside the allowed bounds.
 
     Example:
-        >>> DateValidation(2024, 3, 28, minimum_date=date(2024, 1, 1))
+        >>> DateValidator(2024, 3, 28, minimum_date=date(2024, 1, 1))
         datetime.date(2024, 3, 28)
     """
 
@@ -144,7 +144,7 @@ class DateValidation(date):
         return value
 
 
-class TimeValidation(time):
+class TimeValidator(time):
     """
     A time type that performs validation on initialization.
 
@@ -164,7 +164,7 @@ class TimeValidation(time):
         ValueError: If the time is outside the allowed bounds.
 
     Example:
-        >>> TimeValidation(12, 30, maximum_time=time(20, 0))
+        >>> TimeValidator(12, 30, maximum_time=time(20, 0))
         datetime.time(12, 30)
     """
 
@@ -182,7 +182,7 @@ class TimeValidation(time):
         return value
 
 
-class DateTimeValidation(datetime):
+class DateTimeValidator(datetime):
     """
     A datetime type that performs validation on initialization.
 
@@ -205,7 +205,7 @@ class DateTimeValidation(datetime):
         ValueError: If the datetime is outside the allowed bounds.
 
     Example:
-        >>> DateTimeValidation(2024, 3, 28, 15, 45,
+        >>> DateTimeValidator(2024, 3, 28, 15, 45,
         ...     minimum_datetime=datetime(2024, 3, 1))
         datetime.datetime(2024, 3, 28, 15, 45)
     """
@@ -222,3 +222,44 @@ class DateTimeValidation(datetime):
             raise ValueError(f"Datetime '{instance}' is later than maximum allowed '{maximum_datetime}'")
 
         return instance
+
+
+class ListValidator(list):
+    """
+    A list type that performs validation on initialization.
+
+    This class validates the list against optional constraints:
+    - Minimum allowed length.
+    - Maximum allowed length.
+
+    Args:
+        iterable (Iterable, optional): Values to initialize the list with.
+        minimum_length (int, optional): The smallest allowed list length.
+        maximum_length (int, optional): The largest allowed list length.
+
+    Raises:
+        ValueError: If the list length is outside the allowed bounds.
+
+    Example:
+        >>> ListValidator([1, 2, 3], minimum_length=2)
+        [1, 2, 3]
+        >>> ListValidator([1, 2, 3], maximum_length=2)
+        ValueError: List length '3' is greater than maximum allowed '2'
+    """
+
+    def __init__(self, iterable: Iterable[Any] = (), /, *, minimum_length: int | None = None,
+                maximum_length: int | None = None):
+
+        super().__init__(iterable)
+
+        length = len(self)
+
+        if minimum_length is not None and length < minimum_length:
+            raise ValueError(
+                f"List length '{length}' is smaller than minimum allowed '{minimum_length}'"
+            )
+
+        if maximum_length is not None and length > maximum_length:
+            raise ValueError(
+                f"List length '{length}' is greater than maximum allowed '{maximum_length}'"
+            )

{edri-2025.11.1rc2.dist-info → edri-2025.11.1rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edri
-Version: 2025.11.1rc2
+Version: 2025.11.1rc4
 Summary: Event Driven Routing Infrastructure
 Author: Marek Olšan
 Author-email: marek.olsan@gmail.com

{edri-2025.11.1rc2.dist-info → edri-2025.11.1rc4.dist-info}/RECORD

@@ -9,20 +9,20 @@ edri/abstract/worker/worker.py,sha256=JSTItljxBiCm_ljXctzTiKwb90Yk8Cy6EzZJTchtv9
 edri/abstract/worker/worker_process.py,sha256=QiNxOuwkMds0sV2MBLyp7bjrovm5xColC7I7TNcSO4s,1957
 edri/abstract/worker/worker_thread.py,sha256=xoMPuDn-hAkWk6kFY3Xf8mxOVP__5t7-x7f-b396-8M,2176
 edri/api/__init__.py,sha256=ZDxCpHKFGajJ1RwDpV7CzxLDUaKpozJRfOCv1OPv5ZY,142
-edri/api/broker.py,sha256=6O-B2Io7WF9KPXJCXsCzcyxpwjieIx5vqR06cSEi1oI,37276
-edri/api/listener.py,sha256=QaBlrlWH8j5OsD0mFMeTd95eP2nq7J-B6FCPL9OtFac,20289
+edri/api/broker.py,sha256=I3z_bKbcTDnKXk82yteGEQmuxpqHgp5KrhQaJmk3US0,37258
+edri/api/listener.py,sha256=B2RgqQmCkcJOYWtTlYkyb2H7xCM233iNfsa5LG4qZZ0,20401
 edri/api/middleware.py,sha256=6_x55swthVDczT-fu_1ufY1cDsHTZ04jMx6J6xfjbsM,5483
 edri/api/dataclass/__init__.py,sha256=8Y-zcaJtzMdALnNG7M9jsCaB1qAJKM8Ld3h9MDajYjA,292
-edri/api/dataclass/api_event.py,sha256=NzS-BCw9DYy3QGlLJVDmL7RyJ0yH8stKcV_3io6sa3w,6085
+edri/api/dataclass/api_event.py,sha256=08edshexI9FxdebPIgTQMSQ4fEtGpAa3K_VYCmN1jFs,6587
 edri/api/dataclass/client.py,sha256=ctc2G4mXJR2wUSujANudT3LqxW7qxk_YkpM_TEXD0tM,216
 edri/api/dataclass/file.py,sha256=OJfJlrCTjSnzCF8yFVnxr8rGeL0l08WVMsXJx00S4qc,225
 edri/api/extensions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edri/api/extensions/url_extension.py,sha256=rZKumjR7J6pDTiSLIZf8IzxGgDZP7p2g0Kgs0USug_U,1971
 edri/api/extensions/url_prefix.py,sha256=kNI6g5ZlW0w-J_IMacYLco1EQvmTtMJyEkN6-SK1wC0,491
 edri/api/handlers/__init__.py,sha256=MI6OGDf1rM8jf_uCKK_JYeOGMts62CNy10BwwNlG0Tk,200
-edri/api/handlers/base_handler.py,sha256=iuVXOmWeCB1ZgLIpq_1QCtAvB7QL1NhPdx064NC2b50,7529
+edri/api/handlers/base_handler.py,sha256=aZN95tWX7hkmJ3D401c-JPfF2azjH0t1jJy_zsjPc_4,13113
 edri/api/handlers/html_handler.py,sha256=OprcTg1IQDI7eBK-_oHqA60P1H30LA9xIQpD7iV-Neg,7464
-edri/api/handlers/http_handler.py,sha256=Il16LpIMjSreUXohn4c2R79Bx9mKqz7a08LfTVvPwws,35567
+edri/api/handlers/http_handler.py,sha256=oTyVxbA0xgOLAyt2n4E5dRXrnfdVRpS8-GrXAe5SSeY,36219
 edri/api/handlers/rest_handler.py,sha256=GAG5lVTsRMCf9IUmYb_pokxyPcOfbnKZ2p3jxfy_-Dw,3300
 edri/api/handlers/websocket_handler.py,sha256=Dh2XannDuW0eFj5CEzf3owlGc1VTyQ8ehjpxYRrCYW8,8144
 edri/api/static_pages/documentation.j2,sha256=Fe7KLsbqp9P-pQYqG2z8rbhhGVDDFf3m6SQ2mc3PFG4,8934
@@ -36,12 +36,12 @@ edri/config/setting.py,sha256=-6_BDFM-RdxIenYhE1Ykm8uGL73YhYUYbdz5YmI08xo,1833
 edri/dataclass/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edri/dataclass/event.py,sha256=3XwbS_8Nst0V5D6vQ0FYhrX5rx6KfLGd3-9ba71xUMQ,9866
 edri/dataclass/health_checker.py,sha256=62H5wGUtOhql3acPwFtMhpGKPUTmFwWQ4hlqIn6tjfo,1784
-edri/dataclass/injection.py,sha256=3bZIGQLKzsO7zv2pD1Wq0Mc4NfwsZ--wHBcHZxfcIPU,3394
+edri/dataclass/injection.py,sha256=C-VzC64FNhMvnLxkGBhgc-Kma2vPIvnRUyPEpyIE-h8,3554
 edri/dataclass/response.py,sha256=VBMmVdna1IOKC5YGBXor6AayYOoiEYb9xx_RZ3bpKnw,3867
 edri/dataclass/directive/__init__.py,sha256=nfvsh1BmxhACW7Q8gnwy7y3l3_cI1P0k2WP0jV5RJhI,608
 edri/dataclass/directive/base.py,sha256=2ghQpv1bGcNHYEMA0nyWGumIplXBzj9cPQ34aJ7uVr0,296
 edri/dataclass/directive/html.py,sha256=UCuwksxt_Q9b1wha1DjEygJWAyq2Hdnir5zG9lGi8as,946
-edri/dataclass/directive/http.py,sha256=k4ZDHZSwr4TerA6s0xeV58qpyjk2mdInTlWymBVluGI,2536
+edri/dataclass/directive/http.py,sha256=6Y4LYlERcddg4UXVCFG3ry6PUwMpS1fAGL-WEM_1A3c,2616
 edri/events/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edri/events/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edri/events/api/client/__init__.py,sha256=6q7CJ4eLMAuz_EFIs7us-xDXudy0Z5DIHd0YCVtTeuo,170
@@ -112,7 +112,7 @@ edri/utility/queue.py,sha256=xBbeu1DT3Krdxni0YABk7gDZ5fLQL9eX-H3U-1jSqag,3628
 edri/utility/shared_memory_pipe.py,sha256=kmtd-1999s-cUVThxXVtw4N-rp_WgrHtl-h4hhEliXA,6396
 edri/utility/storage.py,sha256=AbZwtj8py0OBy3dM5C0fJ97uV88TERZO79heEmyE9Yk,3781
 edri/utility/transformation.py,sha256=4FeRNav-ifxuqgwq9ys3G5WtMzUAC3_2B3tnFhMENho,1450
-edri/utility/validation.py,sha256=bLFgfBLc_nu8tK3-imS2pLdd_IOh-uR7CHjV_r6QodY,8225
+edri/utility/validation.py,sha256=wDQb55CBB-I-KaevucmSWlevYAGxMJ8Pok0Ya3S8cLk,9609
 edri/utility/watcher.py,sha256=9nwU-h6B_QCd02-z-2-Hvf6huro8B9yVcZAepoFtXQ4,4623
 edri/utility/manager/__init__.py,sha256=bNyqET60wyq-QFmNwk52UKRweK5lYTDH_TF2UgS6enk,73
 edri/utility/manager/scheduler.py,sha256=3wRPph-FGNrVMN3TG7SvZ_PDW8mNK7UdM3PnjI_QTH8,11624
@@ -152,11 +152,11 @@ tests/utility/test_normalized_default_dict.py,sha256=Utd4EhN6uW6m3eBxz1hhUwRCOWq
 tests/utility/test_shared_memory_pipe.py,sha256=JVzr-h8rjjlB6Uk_OnUBAlRwD2X4e74VKHBKCOE8KFM,7308
 tests/utility/test_storage.py,sha256=DD7H-xk3kTuz3x2zuJuJyHDV4eJMYy5iEsHoPAAfjuQ,1349
 tests/utility/test_transformation.py,sha256=4IJFuP3tp3Bd4vH3ohwxLb8yy4m1teK-e7UJbxJzevc,2840
-tests/utility/test_validation.py,sha256=OEM9hGzlFoSvZdwf5_pyH-Xg9ISxw0QJFbgMaDP8jtQ,9154
+tests/utility/test_validation.py,sha256=wZcXjLrj3JheVLKnYKkkYfyC8CCpHVAw9Jn_uDnuEfk,9103
 tests/utility/manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/utility/manager/test_scheduler.py,sha256=sROffYvSOaWsYQxQGTy6l9Mn_qeNPRmJoXLVPKU3XNY,9153
 tests/utility/manager/test_store.py,sha256=xlo1JUsPLIhPJyQn7AXldAgWDo_O8ba2ns25TEaaGdQ,2821
-edri-2025.11.1rc2.dist-info/METADATA,sha256=Znv_9pH-YVrYGlhn9lN31KKpT-fSrrOkMj2sg4La034,8346
-edri-2025.11.1rc2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-edri-2025.11.1rc2.dist-info/top_level.txt,sha256=himES6JgPlx4Zt8aDrQEj2fxAd7IDD6MBOsiNZkzKHQ,11
-edri-2025.11.1rc2.dist-info/RECORD,,
+edri-2025.11.1rc4.dist-info/METADATA,sha256=4aYgoa2SpOfeR-2j9x26EOZBQ9Ca62T-E6u1Es76234,8346
+edri-2025.11.1rc4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+edri-2025.11.1rc4.dist-info/top_level.txt,sha256=himES6JgPlx4Zt8aDrQEj2fxAd7IDD6MBOsiNZkzKHQ,11
+edri-2025.11.1rc4.dist-info/RECORD,,

tests/utility/test_validation.py

@@ -2,44 +2,44 @@ import unittest
 from datetime import date, time, datetime
 from re import compile
 
-from edri.utility.validation import StringValidation, IntegerValidation, FloatValidation, DateValidation, TimeValidation, DateTimeValidation
+from edri.utility.validation import StringValidator, IntegerValidator, FloatValidator, DateValidator, TimeValidator, DateTimeValidator
 
 
 class TestStringValidation(unittest.TestCase):
     def test_valid_string(self):
-        value = StringValidation('hello', minimum_length=3, maximum_length=10)
+        value = StringValidator('hello', minimum_length=3, maximum_length=10)
         self.assertEqual(value, 'hello')
 
     def test_too_short_string(self):
         with self.assertRaises(ValueError) as cm:
-            StringValidation('hi', minimum_length=3)
+            StringValidator('hi', minimum_length=3)
         self.assertIn("too short", str(cm.exception))
 
     def test_too_long_string(self):
         with self.assertRaises(ValueError) as cm:
-            StringValidation('this is a long string', maximum_length=10)
+            StringValidator('this is a long string', maximum_length=10)
         self.assertIn("too long", str(cm.exception))
 
     def test_regex_match(self):
         pattern = compile(r'^[a-z]+$')
-        value = StringValidation('hello', regex=pattern)
+        value = StringValidator('hello', regex=pattern)
         self.assertEqual(value, 'hello')
 
     def test_regex_no_match(self):
         pattern = compile(r'^[a-z]+$')
         with self.assertRaises(ValueError) as cm:
-            StringValidation('Hello123', regex=pattern)
+            StringValidator('Hello123', regex=pattern)
         self.assertIn("not match", str(cm.exception))
 
     def test_all_constraints_pass(self):
         pattern = compile(r'^[a-z]+$')
-        value = StringValidation('hello', minimum_length=3, maximum_length=10, regex=pattern)
+        value = StringValidator('hello', minimum_length=3, maximum_length=10, regex=pattern)
         self.assertEqual(value, 'hello')
 
     def test_all_constraints_fail(self):
         pattern = compile(r'^[a-z]+$')
         with self.assertRaises(ValueError) as cm:
-            StringValidation('Hi', minimum_length=3, maximum_length=4, regex=pattern)
+            StringValidator('Hi', minimum_length=3, maximum_length=4, regex=pattern)
         self.assertTrue(
             any(msg in str(cm.exception) for msg in ["not match", "too short", "too long"])
         )
@@ -48,142 +48,142 @@ class TestStringValidation(unittest.TestCase):
 class TestIntegerValidation(unittest.TestCase):
     def test_valid_integer_no_constraints(self):
         # No constraints applied should return the number as-is.
-        value = IntegerValidation(10)
+        value = IntegerValidator(10)
         self.assertEqual(value, 10)
 
     def test_valid_integer_with_constraints(self):
         # Valid integer within the specified range.
-        value = IntegerValidation(5, minimum=1, maximum=10)
+        value = IntegerValidator(5, minimum=1, maximum=10)
         self.assertEqual(value, 5)
 
     def test_integer_below_minimum(self):
         # Should raise a ValueError because 0 is below the minimum of 1.
         with self.assertRaises(ValueError) as cm:
-            IntegerValidation(0, minimum=1)
+            IntegerValidator(0, minimum=1)
         self.assertIn("too small", str(cm.exception))
 
     def test_integer_above_maximum(self):
         # Should raise a ValueError because 11 is above the maximum of 10.
         with self.assertRaises(ValueError) as cm:
-            IntegerValidation(11, maximum=10)
+            IntegerValidator(11, maximum=10)
         self.assertIn("too big", str(cm.exception))
 
 
 class TestFloatValidation(unittest.TestCase):
     def test_valid_float_no_constraints(self):
         # No constraints applied should return the float as-is.
-        value = FloatValidation(3.14)
+        value = FloatValidator(3.14)
         self.assertEqual(value, 3.14)
 
     def test_valid_float_with_constraints(self):
         # Valid float within the specified range.
-        value = FloatValidation(3.14, minimum=1.0, maximum=5.0)
+        value = FloatValidator(3.14, minimum=1.0, maximum=5.0)
         self.assertEqual(value, 3.14)
 
     def test_float_below_minimum(self):
         # Should raise a ValueError because 0.5 is below the minimum of 1.0.
         with self.assertRaises(ValueError) as cm:
-            FloatValidation(0.5, minimum=1.0)
+            FloatValidator(0.5, minimum=1.0)
         self.assertIn("too small", str(cm.exception))
 
     def test_float_above_maximum(self):
         # Should raise a ValueError because 6.0 is above the maximum of 5.0.
         with self.assertRaises(ValueError) as cm:
-            FloatValidation(6.0, maximum=5.0)
+            FloatValidator(6.0, maximum=5.0)
         self.assertIn("too big", str(cm.exception))
 
 
 class TestDateValidation(unittest.TestCase):
 
     def test_valid_date_no_constraints(self):
-        d = DateValidation(2024, 3, 28)
+        d = DateValidator(2024, 3, 28)
         self.assertEqual(d, date(2024, 3, 28))
 
     def test_valid_date_within_constraints(self):
-        d = DateValidation(2024, 3, 28,
-                           minimum_date=date(2024, 1, 1),
-                           maximum_date=date(2024, 12, 31))
+        d = DateValidator(2024, 3, 28,
+                          minimum_date=date(2024, 1, 1),
+                          maximum_date=date(2024, 12, 31))
         self.assertEqual(d, date(2024, 3, 28))
 
     def test_date_equal_to_minimum(self):
-        d = DateValidation(2024, 1, 1, minimum_date=date(2024, 1, 1))
+        d = DateValidator(2024, 1, 1, minimum_date=date(2024, 1, 1))
         self.assertEqual(d, date(2024, 1, 1))
 
     def test_date_equal_to_maximum(self):
-        d = DateValidation(2024, 12, 31, maximum_date=date(2024, 12, 31))
+        d = DateValidator(2024, 12, 31, maximum_date=date(2024, 12, 31))
         self.assertEqual(d, date(2024, 12, 31))
 
     def test_date_below_minimum_raises(self):
         with self.assertRaises(ValueError) as context:
-            DateValidation(2023, 12, 31, minimum_date=date(2024, 1, 1))
+            DateValidator(2023, 12, 31, minimum_date=date(2024, 1, 1))
         self.assertIn("earlier than minimum allowed", str(context.exception))
 
     def test_date_above_maximum_raises(self):
         with self.assertRaises(ValueError) as context:
-            DateValidation(2025, 1, 1, maximum_date=date(2024, 12, 31))
+            DateValidator(2025, 1, 1, maximum_date=date(2024, 12, 31))
         self.assertIn("later than maximum allowed", str(context.exception))
 
     def test_invalid_date_raises(self):
         with self.assertRaises(ValueError):
-            DateValidation(2024, 2, 30)  # Invalid day in February
+            DateValidator(2024, 2, 30)  # Invalid day in February
 
 
 class TestTimeValidation(unittest.TestCase):
 
     def test_valid_time_no_constraints(self):
-        t = TimeValidation(12, 30)
+        t = TimeValidator(12, 30)
         self.assertEqual(t, time(12, 30))
 
     def test_valid_time_within_constraints(self):
-        t = TimeValidation(14, 45,
-                           minimum_time=time(12, 0),
-                           maximum_time=time(20, 0))
+        t = TimeValidator(14, 45,
+                          minimum_time=time(12, 0),
+                          maximum_time=time(20, 0))
         self.assertEqual(t, time(14, 45))
 
     def test_time_equal_to_minimum(self):
-        t = TimeValidation(8, 0, minimum_time=time(8, 0))
+        t = TimeValidator(8, 0, minimum_time=time(8, 0))
         self.assertEqual(t, time(8, 0))
 
     def test_time_equal_to_maximum(self):
-        t = TimeValidation(22, 0, maximum_time=time(22, 0))
+        t = TimeValidator(22, 0, maximum_time=time(22, 0))
         self.assertEqual(t, time(22, 0))
 
     def test_time_below_minimum_raises(self):
         with self.assertRaises(ValueError) as context:
-            TimeValidation(6, 59, minimum_time=time(7, 0))
+            TimeValidator(6, 59, minimum_time=time(7, 0))
         self.assertIn("earlier than minimum allowed", str(context.exception))
 
     def test_time_above_maximum_raises(self):
         with self.assertRaises(ValueError) as context:
-            TimeValidation(23, 1, maximum_time=time(23, 0))
+            TimeValidator(23, 1, maximum_time=time(23, 0))
         self.assertIn("later than maximum allowed", str(context.exception))
 
     def test_time_with_seconds_and_microseconds(self):
-        t = TimeValidation(10, 15, 30, 500000)
+        t = TimeValidator(10, 15, 30, 500000)
         self.assertEqual(t, time(10, 15, 30, 500000))
 
     def test_time_with_timezone(self):
         tz = time(0, 0).tzinfo  # no tzinfo set, just testing the arg
-        t = TimeValidation(10, 0, 0, 0, tz)
+        t = TimeValidator(10, 0, 0, 0, tz)
         self.assertEqual(t, time(10, 0))
 
     def test_invalid_hour_raises(self):
         with self.assertRaises(ValueError):
-            TimeValidation(25, 0)  # hour out of range
+            TimeValidator(25, 0)  # hour out of range
 
     def test_invalid_minute_raises(self):
         with self.assertRaises(ValueError):
-            TimeValidation(12, 60)  # minute out of range
+            TimeValidator(12, 60)  # minute out of range
 
 
 class TestDateTimeValidation(unittest.TestCase):
 
     def test_valid_datetime_no_constraints(self):
-        dt = DateTimeValidation(2024, 3, 28, 15, 30)
+        dt = DateTimeValidator(2024, 3, 28, 15, 30)
         self.assertEqual(dt, datetime(2024, 3, 28, 15, 30))
 
     def test_valid_datetime_within_constraints(self):
-        dt = DateTimeValidation(
+        dt = DateTimeValidator(
             2024, 3, 28, 12, 0,
             minimum_datetime=datetime(2024, 3, 1, 0, 0),
             maximum_datetime=datetime(2024, 12, 31, 23, 59)
@@ -191,14 +191,14 @@ class TestDateTimeValidation(unittest.TestCase):
         self.assertEqual(dt, datetime(2024, 3, 28, 12, 0))
 
     def test_datetime_equal_to_minimum(self):
-        dt = DateTimeValidation(
+        dt = DateTimeValidator(
             2024, 3, 1, 0, 0,
             minimum_datetime=datetime(2024, 3, 1, 0, 0)
         )
         self.assertEqual(dt, datetime(2024, 3, 1, 0, 0))
 
     def test_datetime_equal_to_maximum(self):
-        dt = DateTimeValidation(
+        dt = DateTimeValidator(
             2024, 12, 31, 23, 59,
             maximum_datetime=datetime(2024, 12, 31, 23, 59)
         )
@@ -206,7 +206,7 @@ class TestDateTimeValidation(unittest.TestCase):
 
     def test_datetime_below_minimum_raises(self):
         with self.assertRaises(ValueError) as context:
-            DateTimeValidation(
+            DateTimeValidator(
                 2024, 2, 29, 23, 59,
                 minimum_datetime=datetime(2024, 3, 1)
             )
@@ -214,21 +214,21 @@ class TestDateTimeValidation(unittest.TestCase):
 
     def test_datetime_above_maximum_raises(self):
         with self.assertRaises(ValueError) as context:
-            DateTimeValidation(
+            DateTimeValidator(
                 2025, 1, 1, 0, 0,
                 maximum_datetime=datetime(2024, 12, 31, 23, 59)
             )
         self.assertIn("later than maximum allowed", str(context.exception))
 
     def test_datetime_with_seconds_and_microseconds(self):
-        dt = DateTimeValidation(2024, 3, 28, 12, 45, 30, 999999)
+        dt = DateTimeValidator(2024, 3, 28, 12, 45, 30, 999999)
         self.assertEqual(dt, datetime(2024, 3, 28, 12, 45, 30, 999999))
 
     def test_invalid_datetime_raises(self):
         with self.assertRaises(ValueError):
-            DateTimeValidation(2024, 2, 30, 12, 0)  # Invalid date
+            DateTimeValidator(2024, 2, 30, 12, 0)  # Invalid date
 
     def test_timezone_argument_is_applied(self):
         tz = datetime.now().astimezone().tzinfo
-        dt = DateTimeValidation(2024, 3, 28, 10, 0, 0, 0, tz)
+        dt = DateTimeValidator(2024, 3, 28, 10, 0, 0, 0, tz)
         self.assertEqual(dt.tzinfo, tz)