Merge branch 'main' into feature/discount_conext_validation

Conflicts:
	src/viur/shop/modules/discount.py

Author: sveneberth

pyproject.toml

@@ -10,7 +10,8 @@ name = "viur-shop"
 dynamic = ["version"]
 dependencies = [
     "viur-toolkit>=0.2.0",
-    "viur-core>=3.7.0"
+    "viur-core>=3.7.0",
+    "cachetools>=5.0"
 ]
 requires-python = ">=3.11"
 authors = [

src/viur/shop/modules/discount.py

@@ -1,7 +1,7 @@
-import functools
 import io
 import typing as t  # noqa
 
+import cachetools
 from viur.core import db, errors
 from viur.core.prototypes import List
 from viur.core.skeleton import SkeletonInstance
@@ -224,7 +224,7 @@ def can_apply(
         return dv.is_fulfilled, dv
 
     @property
-    @functools.cache
+    @cachetools.cached(cache=cachetools.TTLCache(maxsize=1024, ttl=3600))
     def current_automatically_discounts(self) -> list[SkeletonInstance_T[DiscountSkel]]:
         query = self.viewSkel().all().filter("activate_automatically =", True)
         discounts = []

src/viur/shop/modules/discount_condition.py

@@ -1,14 +1,13 @@
-import functools
-import pprint
 import random
 import string
-import time
 import typing as t
 
+import cachetools
 from viur import toolkit
 from viur.core import current, db, tasks
 from viur.core.prototypes import List
 from viur.core.skeleton import SkeletonInstance
+
 from .abstract import ShopModuleAbstract
 from ..globals import SHOP_INSTANCE, SHOP_LOGGER
 from ..services import Event, on_event
@@ -24,11 +23,6 @@
 SUFFIX_LENGTH = 6
 
 
-def get_ttl_hash(seconds: int = 3600) -> int:
-    """Return the same value withing `seconds` time period"""
-    return round(time.time() / seconds)
-
-
 class DiscountCondition(ShopModuleAbstract, List):
     moduleName = "discount_condition"
     kindName = "{{viur_shop_modulename}}_discount_condition"
@@ -156,13 +150,9 @@ def generate_subcodes(self, parent_key: db.Key, prefix: str, amount: int):
     # --- Helpers  ------------------------------------------------------------
 
     @classmethod
-    def get_skel(cls, key: db.Key, expires: int = 3600) -> SkeletonInstance_T["DiscountConditionSkel"] | None:
-        return cls._get_skel(key, ttl_hash=get_ttl_hash(expires))
-
-    @staticmethod
-    @functools.lru_cache()
-    def _get_skel(key: db.Key, ttl_hash: int | None = None) -> SkeletonInstance_T["DiscountConditionSkel"] | None:
-        # logger.debug(f"_get_skel({key=}, {ttl_hash=})")
+    @cachetools.cached(cache=cachetools.TTLCache(maxsize=1024, ttl=3600))
+    def get_skel(cls, key: db.Key) -> SkeletonInstance_T["DiscountConditionSkel"] | None:
+        # logger.debug(f"get_skel({key=})")
         skel = SHOP_INSTANCE.get().discount_condition.viewSkel()
         if not skel.read(key):
             return None