edri 2025.11.1rc4__py3-none-any.whl → 2025.12.1rc1__py3-none-any.whl

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/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
+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,7 @@ 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
 
     def _subscribe(self) -> None:
         """
@@ -609,10 +627,24 @@ 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))
                     self.router_queue.put(event)
 
     def get_pipes(self) -> set[Connection]:
@@ -828,7 +860,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/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,11 @@ 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))
+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")
 
 SWITCH_KEY_LENGTH = int(getenv("EDRI_SWITCH_KEY_LENGTH ", 8))
 SWITCH_HOST = getenv("EDRI_SWITCH_HOST", "localhost")

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.1rc4.dist-info → edri-2025.12.1rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edri
-Version: 2025.11.1rc4
+Version: 2025.12.1rc1
 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.1rc4.dist-info → edri-2025.12.1rc1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 edri/__init__.py,sha256=bBVs4ynkUzMRudKZyuRScpPmUZTIL1LDfIytZ_L7oKE,6257
-edri/abstract/__init__.py,sha256=u51dxLMk2DM1Ywb-DR0NgX918y5yiaSbmhTqP9Fp1TU,325
+edri/abstract/__init__.py,sha256=C6ew041GNVcQlfkE77kHeZ9Ts1rIaWRqqh3bKz7Kb1E,488
 edri/abstract/manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edri/abstract/manager/manager_base.py,sha256=aQ9UerJglo94mO6z1Xp0jy-t7KzeMMuFk1iM1ghvhCE,40194
+edri/abstract/manager/manager_base.py,sha256=jzz1C9CoK5g0eyMSFynOSyTdu9LFuU_WdmV0Q2uraUU,42097
 edri/abstract/manager/manager_priority_base.py,sha256=1bUGsIr6MUrCNsJsLNF_tYaiFDX5t8vK2794vdZumQo,8219
 edri/abstract/manager/worker.py,sha256=xMJMDQtcH-j8s37cUoMsF_ZrWS4elbU7vnjdKfAv0gM,403
 edri/abstract/worker/__init__.py,sha256=qcCF2MnReil9G9ojrr7I3hjMks-1tsap4yrYH5Vr07Q,164
@@ -32,7 +32,7 @@ edri/api/static_pages/status_400.j2,sha256=ArSvsNy9GG-Gbqt6fbRSqETmGV4aTJa3Zgwwt
 edri/api/static_pages/status_500.j2,sha256=39T6VeU_7m-6-RJyVsS48dD56Hp3ZcOeVC397T8GlsY,1468
 edri/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edri/config/constant.py,sha256=5angk0yL3LlMWShzt0D7TflK5d2yLj2HDWoVqCqSLbY,783
-edri/config/setting.py,sha256=-6_BDFM-RdxIenYhE1Ykm8uGL73YhYUYbdz5YmI08xo,1833
+edri/config/setting.py,sha256=f4mS9-KmWTlOgFYt5N7E509jM_gRqJ0MlOwS_C_pPPI,1995
 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
@@ -105,6 +105,7 @@ edri/switch/receiver.py,sha256=e2ugVM_DHWspVzHT5HBWajwo0YTexKeisqkXXEYscQ8,4240
 edri/switch/sender.py,sha256=xNXL6PeP9UMmMFr_Ol-cXJ5aYRVEWzx3GX1OchRbq-k,1173
 edri/switch/switch.py,sha256=ODxhUU5JQvdQRnw8idZIIW0EJc-DUzfdLdZGY_mwNdI,3388
 edri/utility/__init__.py,sha256=3ZpwOHlERrIru5wOGNtuhKb3kwvUFv5ALzP2CRyV6lg,136
+edri/utility/cache.py,sha256=fcKa-RDOq3_pMV0HO0s2iV8R2knjiyjNdFeu9N5lOpA,549
 edri/utility/function.py,sha256=xoW3SUjKbSgDvcArJskHh3wq_17kwMu3X362zbVU15c,6549
 edri/utility/json_encoder.py,sha256=2VZrVgUKFbkBRCX0V7lZEWiS1DzpFRn5LtJKx36zPaY,3952
 edri/utility/normalized_default_dict.py,sha256=EgzO-cdpekH3IkldGiD7nwj_2aTYIdGrlXvheEu6uNc,5011
@@ -121,7 +122,7 @@ tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_edri_init.py,sha256=CME8WwikVgbz3qyjalLauShMcCjERyDBjlFD98xZIgs,4209
 tests/abstract/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/abstract/manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/abstract/manager/test_manager_base.py,sha256=ogpWnrfJULSbMn-78ti3_Z8s5wKL_Vo5gOJ48t7Q_7U,16445
+tests/abstract/manager/test_manager_base.py,sha256=btKW00EmllyL_LFN7cp4I68vho8wNTEG-sF79ocksnc,16484
 tests/abstract/manager/test_manager_base_priority.py,sha256=-z4Y1zkOGXNk1ytGla1UeLQutrfXjeWaSNBBsN5gqQk,5869
 tests/abstract/worker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/abstract/worker/test_worker.py,sha256=4i2MuLSBaQh_wBMK5DEbx-k1F-rs15oRWzvQ_wktN8I,5298
@@ -156,7 +157,7 @@ tests/utility/test_validation.py,sha256=wZcXjLrj3JheVLKnYKkkYfyC8CCpHVAw9Jn_uDnu
 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.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,,
+edri-2025.12.1rc1.dist-info/METADATA,sha256=7cDoLUgm5GGkhfQcpY1FLw14TpnrQmPC1wNk-YGeugU,8374
+edri-2025.12.1rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+edri-2025.12.1rc1.dist-info/top_level.txt,sha256=himES6JgPlx4Zt8aDrQEj2fxAd7IDD6MBOsiNZkzKHQ,11
+edri-2025.12.1rc1.dist-info/RECORD,,

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