edri 2025.11.1rc3__tar.gz → 2025.12.1__tar.gz

{edri-2025.11.1rc3 → edri-2025.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edri
-Version: 2025.11.1rc3
+Version: 2025.12.1
 Summary: Event Driven Routing Infrastructure
 Author: Marek Olšan
 Author-email: marek.olsan@gmail.com
@@ -26,6 +26,7 @@ Requires-Dist: watchdog>=6
 Requires-Dist: websockets>=14
 Requires-Dist: posix-ipc>=1.2.0
 Requires-Dist: markdown>=3.0
+Requires-Dist: pytz>=2024.1
 Provides-Extra: uvicorn
 Requires-Dist: uvicorn[standard]>=0.32.0; extra == "uvicorn"
 Provides-Extra: hypercorn

{edri-2025.11.1rc3 → edri-2025.12.1}/edri/abstract/__init__.py

@@ -2,9 +2,16 @@ from .manager.manager_base import ManagerBase
 from .manager.manager_priority_base import ManagerPriorityBase
 
 
-def request(func):
-    func.__purpose__ = "request"
-    return func
+def request(func=None, /, *, cache: str = None):
+    def wrapper(func):
+        func.__purpose__ = "request"
+        func.__cache__ = cache
+        return func
+
+    if func is None:
+        return wrapper
+
+    return wrapper(func)
 
 
 def response(func):

{edri-2025.11.1rc3 → edri-2025.12.1}/edri/abstract/manager/manager_base.py

@@ -1,7 +1,7 @@
 from abc import ABC, ABCMeta
 from copy import deepcopy
-from dataclasses import dataclass
 from datetime import datetime
+from http import HTTPMethod
 from importlib import invalidate_caches, import_module, reload
 from inspect import signature, Signature, ismethod, isfunction
 from logging import getLogger, Logger
@@ -12,16 +12,21 @@ from random import randint
 from time import sleep
 from traceback import format_exc
 from types import UnionType
-from typing import Optional, Type, Tuple, Callable, Union, Generic, TypeVar, Never, get_args, Iterable, get_origin
+from typing import Optional, Type, Tuple, Callable, Union, TypeVar, Never, get_args, Iterable, get_origin
 
 from edri.abstract.manager.worker import Worker
-from edri.abstract.worker import WorkerThread, WorkerProcess
+from edri.abstract.worker import WorkerProcess
+from edri.api.dataclass.api_event import api_events
+from edri.config.setting import API_CACHE_CONTROL, API_CACHE_HEADERS
+from edri.dataclass.directive.http import NotModifiedResponseDirective, HeaderResponseDirective
 from edri.dataclass.event import Event
 from edri.dataclass.health_checker import Status
+from edri.dataclass.response import ResponseStatus
 from edri.events.edri.group import Manager
 from edri.events.edri.manager import StreamCreate, StreamMessage, StreamClose, WorkerQuit, Restart
 from edri.events.edri.router import Subscribe, HealthCheck, UnsubscribeAll
 from edri.events.edri.store import Get
+from edri.utility.cache import Cache
 from edri.utility.storage import Storage
 
 T = TypeVar("T", bound=Event)
@@ -30,11 +35,23 @@ T = TypeVar("T", bound=Event)
 class ManagerBaseMeta(ABCMeta):
 
     def __new__(mcls, name, bases, namespace, /, **kwargs):
+        namespace["_cache_keys"] = dict()
+        namespace["_cache_methods"] = dict()
         for attr_name, attr_value in list(namespace.items()):
-            if callable(attr_value) and (
-                    purpose := getattr(attr_value, "__purpose__", None)):  # Check for the decorator's marker
+            if not callable(attr_value):
+                continue
+            if purpose := getattr(attr_value, "__purpose__", None):  # Check for the decorator's marker
                 if purpose == "request":
                     new_name = f"solve_req_{attr_name}"
+
+                    if cache := getattr(attr_value, "__cache__", None):
+                        namespace["_cache_keys"][attr_name] = cache
+                        event = signature(attr_value).parameters["event"].annotation
+                        for api_event in api_events:
+                            if api_event.event == event:
+                                break
+                        namespace["_cache_methods"][event] = api_event.method
+
                 elif purpose == "response":
                     new_name = f"solve_res_{attr_name}"
                 else:
@@ -109,6 +126,10 @@ class ManagerBase(ABC, Process, metaclass=ManagerBaseMeta):
         self._from_time = from_time
         self._store_get: Optional[Callable] = None
         self._exceptions: list[tuple[str, dict, Exception, str]] = []
+        self._cache: Cache
+        self._cache_vary = "Accept,Accept-Encoding"
+        if API_CACHE_HEADERS:
+            self._cache_vary += f",{API_CACHE_HEADERS}"
 
     def _subscribe(self) -> None:
         """
@@ -609,10 +630,25 @@ class ManagerBase(ABC, Process, metaclass=ManagerBaseMeta):
                 self.resolve_unknown(event)
             else:
                 had_response = event.has_response()
+                cache_key = self._cache_keys.get(resolver.__name__, None)
+                if cache_key:
+                    etag = self._cache.tag(cache_key)
+                    method = self._cache_methods[event.__class__]
+                    if etag and hasattr(event, "etag") and event.etag and etag in event.etag and method == HTTPMethod.GET:
+                        event.response.add_directive(NotModifiedResponseDirective())
+                        self.router_queue.put(event)
+                        return
                 resolver(event)
                 if not had_response and event.has_response() and event.response._changed:
                     if event._switch:
                         event._switch.received = False
+                    if cache_key and etag:
+                        if event.response.get_status() == ResponseStatus.OK and method in (HTTPMethod.POST, HTTPMethod.PUT, HTTPMethod.PATCH, HTTPMethod.DELETE):
+                            self._cache.renew(cache_key)
+                        else:
+                            event.response.add_directive(HeaderResponseDirective(name="ETag", value=etag))
+                            event.response.add_directive(HeaderResponseDirective(name="Cache-Control", value=API_CACHE_CONTROL))
+                            event.response.add_directive(HeaderResponseDirective(name="Vary", value=self._cache_vary))
                     self.router_queue.put(event)
 
     def get_pipes(self) -> set[Connection]:
@@ -828,7 +864,7 @@ class ManagerBase(ABC, Process, metaclass=ManagerBaseMeta):
         """
         Hook method called after the manager process starts. Can be overridden to perform initialization tasks.
         """
-        pass
+        self._cache = Cache()
 
     def quit(self) -> None:
         self.router_queue.close()

{edri-2025.11.1rc3 → edri-2025.12.1}/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-2025.11.1rc3 → edri-2025.12.1}/edri/api/dataclass/api_event.py

@@ -16,7 +16,7 @@ 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 ListValidation
+from edri.utility.validation import ListValidator
 
 
 @dataclass
@@ -113,7 +113,7 @@ def api(cls=None, /, *, init=True, repr=True, eq=True, order=False,
                     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 == ListValidation:
+                    if validator == ListValidator:
                         raise TypeError(
                             "ListValidation must be used as ListValidation[T], "
                             "e.g. ListValidation[Any] or ListValidation[inject(...)]."

{edri-2025.11.1rc3 → edri-2025.12.1}/edri/api/handlers/base_handler.py

@@ -72,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

{edri-2025.11.1rc3 → edri-2025.12.1}/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, ServiceUnavailableResponseDirective
 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,12 @@ class HTTPHandler[T: HTTPResponseDirective](BaseHandler, ABC):
         },
         BadRequestResponseDirective: {
             "status": HTTPStatus.BAD_REQUEST,
+        },
+        NotModifiedResponseDirective: {
+            "status": HTTPStatus.NOT_MODIFIED,
+        },
+        ServiceUnavailableResponseDirective: {
+            "status": HTTPStatus.SERVICE_UNAVAILABLE,
         }
     }
 
@@ -716,6 +724,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-2025.11.1rc3 → edri-2025.12.1}/edri/api/listener.py

@@ -147,7 +147,7 @@ class Listener(Process):
                 if isinstance(handler, HTMLHandler):
                     if await handler.response_assets(scope["path"]):
                         return
-                self.logger.debug("Unknown url %s", scope["path"])
+                self.logger.warning("Unknown url %s", scope["path"])
                 await handler.response_error(HTTPStatus.NOT_FOUND, {
                     "reasons": [{
                         "status_code": HTTPStatus.NOT_FOUND,
@@ -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-2025.11.1rc3 → edri-2025.12.1}/edri/config/setting.py

@@ -1,6 +1,8 @@
 from os import getenv
 from typing import Literal
 
+from pytz import timezone
+
 
 def getenv_bool(name: str, default: bool) -> bool:
     """Read an environment variable as a boolean, fallback to default if unset."""
@@ -13,9 +15,18 @@ ENVIRONMENT: Literal["development", "production"] = "production" if getenv("ENVI
 
 HEALTH_CHECK_TIMEOUT = int(getenv("EDRI_HEALTH_CHECK_TIMEOUT", 10))
 HEALTH_CHECK_FAILURE_LIMIT = int(getenv("EDRI_HEALTH_CHECK_FAILURE_LIMIT", 3))
+
+CORS_ORIGINS = getenv("EDRI_CORS_ORIGINS")
+CORS_HEADERS = getenv("EDRI_CORS_HEADERS")
+CORS_CREDENTIALS = bool(getenv("EDRI_CORS_CREDENTIALS", False))
+CORS_MAX_AGE = getenv("EDRI_CORS_MAX_AGE", None)
+
+TIMEZONE = timezone(getenv("EDRI_TIMEZONE", "UTC"))
 API_RESPONSE_TIMEOUT = int(getenv("EDRI_API_RESPONSE_TIMEOUT", 60))
 API_RESPONSE_WRAPPED = getenv_bool("EDRI_API_RESPONSE_WRAPPED", True)
 API_RESPONSE_TIMING = getenv_bool("EDRI_API_RESPONSE_TIMING", ENVIRONMENT == 'development')
+API_CACHE_CONTROL = getenv("EDRI_API_CACHE_CONTROL", "max-age=0, must-revalidate")
+API_CACHE_HEADERS = getenv("EDRI_API_CACHE_HEADERS", CORS_HEADERS)
 
 SWITCH_KEY_LENGTH = int(getenv("EDRI_SWITCH_KEY_LENGTH ", 8))
 SWITCH_HOST = getenv("EDRI_SWITCH_HOST", "localhost")
@@ -37,7 +48,4 @@ ASSETS_PATH = getenv("EDRI_ASSETS_PATH", "assets")
 MAX_BODY_SIZE = int(getenv("EDRI_MAX_BODY_SIZE", 4096 * 1024))
 CHUNK_SIZE = int(getenv("EDRI_CHUNK_SIZE", 256 * 1024))
 
-CORS_ORIGINS = getenv("EDRI_CORS_ORIGINS")
-CORS_HEADERS = getenv("EDRI_CORS_HEADERS")
-CORS_CREDENTIALS = bool(getenv("EDRI_CORS_CREDENTIALS", False))
-CORS_MAX_AGE = getenv("EDRI_CORS_MAX_AGE", None)
+

{edri-2025.11.1rc3 → edri-2025.12.1}/edri/dataclass/directive/http.py

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

edri-2025.12.1/edri/utility/cache.py

@@ -0,0 +1,19 @@
+from collections import defaultdict
+from datetime import datetime
+from pytz import timezone
+
+
+class Cache:
+    timezone = timezone("Europe/Prague")
+
+    def __init__(self):
+        self.last_modified = defaultdict(lambda: datetime.now(tz=self.timezone))
+
+    def last_change(self, key: str) -> datetime:
+        return self.last_modified[key]
+
+    def tag(self, key: str) -> str:
+        return f"{key}-{int(self.last_change(key).timestamp())}"
+
+    def renew(self, key: str) -> None:
+        self.last_modified[key] = datetime.now(tz=self.timezone)

{edri-2025.11.1rc3 → edri-2025.12.1}/edri/utility/validation.py

@@ -3,7 +3,7 @@ from re import Pattern
 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)
     """
@@ -224,7 +224,7 @@ class DateTimeValidation(datetime):
         return instance
 
 
-class ListValidation(list):
+class ListValidator(list):
     """
     A list type that performs validation on initialization.
 
@@ -241,9 +241,9 @@ class ListValidation(list):
         ValueError: If the list length is outside the allowed bounds.
 
     Example:
-        >>> ListValidation([1, 2, 3], minimum_length=2)
+        >>> ListValidator([1, 2, 3], minimum_length=2)
         [1, 2, 3]
-        >>> ListValidation([1, 2, 3], maximum_length=2)
+        >>> ListValidator([1, 2, 3], maximum_length=2)
         ValueError: List length '3' is greater than maximum allowed '2'
     """
 

{edri-2025.11.1rc3 → edri-2025.12.1}/edri.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edri
-Version: 2025.11.1rc3
+Version: 2025.12.1
 Summary: Event Driven Routing Infrastructure
 Author: Marek Olšan
 Author-email: marek.olsan@gmail.com
@@ -26,6 +26,7 @@ Requires-Dist: watchdog>=6
 Requires-Dist: websockets>=14
 Requires-Dist: posix-ipc>=1.2.0
 Requires-Dist: markdown>=3.0
+Requires-Dist: pytz>=2024.1
 Provides-Extra: uvicorn
 Requires-Dist: uvicorn[standard]>=0.32.0; extra == "uvicorn"
 Provides-Extra: hypercorn

{edri-2025.11.1rc3 → edri-2025.12.1}/edri.egg-info/SOURCES.txt

@@ -112,6 +112,7 @@ edri/switch/receiver.py
 edri/switch/sender.py
 edri/switch/switch.py
 edri/utility/__init__.py
+edri/utility/cache.py
 edri/utility/function.py
 edri/utility/json_encoder.py
 edri/utility/normalized_default_dict.py

{edri-2025.11.1rc3 → edri-2025.12.1}/edri.egg-info/requires.txt

@@ -8,6 +8,7 @@ watchdog>=6
 websockets>=14
 posix-ipc>=1.2.0
 markdown>=3.0
+pytz>=2024.1
 
 [dev]
 uvicorn>=0.32.0

{edri-2025.11.1rc3 → edri-2025.12.1}/setup.py

@@ -122,7 +122,7 @@ Whether you're building a real-time data processing system, a distributed servic
 
 setup(
     name='edri',
-    version='2025.11.01rc3',
+    version='2025.12.01',
     packages=find_packages(),
     description='Event Driven Routing Infrastructure',
     long_description=long_description,
@@ -140,7 +140,8 @@ setup(
         "watchdog>=6",
         "websockets>=14",
         "posix-ipc>=1.2.0",
-        "markdown>=3.0"
+        "markdown>=3.0",
+        "pytz>=2024.1",
     ],
     extras_require={
         "uvicorn": ["uvicorn[standard]>=0.32.0"],

{edri-2025.11.1rc3 → edri-2025.12.1}/tests/abstract/manager/test_manager_base.py

@@ -229,6 +229,7 @@ class TestManagerBase(unittest.TestCase):
         event_response = MagicMock(spec=Event)
         event_response._stream = None
         resolver = MagicMock(side_effect=add_response)
+        resolver.__name__ = "resolver"
 
         self.manager._requests[event.__class__] = resolver
         event.has_response.return_value = False