meta-memcache 2.1.0__tar.gz → 2.2.0__tar.gz

{meta_memcache-2.1.0/src/meta_memcache.egg-info → meta_memcache-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meta-memcache
-Version: 2.1.0
+Version: 2.2.0
 Summary: Modern, pure python, memcache client with support for new meta commands.
 Author-email: Guillermo Perez <bisho@revenuecat.com>
 License: MIT License
@@ -11,7 +11,7 @@ License-File: LICENSE
 Requires-Dist: uhashring<3,>=2.3
 Requires-Dist: marisa-trie<1.3,>=1.2.1
 Requires-Dist: zstandard<0.26,>=0.25.0
-Requires-Dist: meta-memcache-socket<0.3.0,>=0.2.0
+Requires-Dist: meta-memcache-socket<0.4.0,>=0.3.0
 Provides-Extra: metrics
 Requires-Dist: prometheus-client>=0.17.1; extra == "metrics"
 Dynamic: license-file

{meta_memcache-2.1.0 → meta_memcache-2.2.0}/pyproject.toml

@@ -3,12 +3,12 @@ dependencies = [
     "uhashring >= 2.3, < 3",
     "marisa-trie >= 1.2.1, < 1.3",
     "zstandard >= 0.25.0, < 0.26",
-    "meta-memcache-socket >= 0.2.0, < 0.3.0",
+    "meta-memcache-socket >= 0.3.0, < 0.4.0",
 ]
 authors = [{ name = "Guillermo Perez", email = "bisho@revenuecat.com" }]
 license = { text = "MIT License" }
 name = "meta-memcache"
-version = "2.1.0"
+version = "2.2.0"
 description = "Modern, pure python, memcache client with support for new meta commands."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -39,3 +39,11 @@ line-length = 88
 [tool.ruff.lint.per-file-ignores]
 "tests/*.py" = ["E731"]
 "src/meta_memcache/__init__.py" = ["F401"]
+
+[dependency-groups]
+dev = [
+    "prometheus-client>=0.24.1",
+    "pytest>=9.0.2",
+    "pytest-cov>=7.1.0",
+    "pytest-mock>=3.15.1",
+]

{meta_memcache-2.1.0 → meta_memcache-2.2.0}/src/meta_memcache/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 
 from meta_memcache.cache_client import CacheClient
 from meta_memcache.configuration import (

{meta_memcache-2.1.0 → meta_memcache-2.2.0}/src/meta_memcache/commands/high_level_commands.py

@@ -77,6 +77,8 @@ class HighLevelCommandMixinWithMetaCommands(
         no_reply: bool = False,
         cas_token: Optional[int] = None,
         return_value: bool = False,
+        initial_value: Optional[int] = None,
+        initial_ttl: Optional[int] = None,
     ) -> RequestFlags: ...  # pragma: no cover
 
 
@@ -95,15 +97,17 @@ class HighLevelCommandsMixin:
         Write a value using the specified `set_mode`
         """
         key = key if isinstance(key, Key) else Key(key)
-        flags = RequestFlags(cache_ttl=ttl)
-        if no_reply:
-            flags.no_reply = True
-        if cas_token is not None:
-            flags.cas_token = cas_token
-            if stale_policy and stale_policy.mark_stale_on_cas_mismatch:
-                flags.mark_stale = True
-        if set_mode != SetMode.SET:
-            flags.mode = set_mode.value
+        flags = RequestFlags(
+            cache_ttl=ttl,
+            no_reply=no_reply,
+            cas_token=cas_token,
+            mark_stale=bool(
+                cas_token is not None
+                and stale_policy
+                and stale_policy.mark_stale_on_cas_mismatch
+            ),
+            mode=set_mode.value if set_mode != SetMode.SET else None,
+        )
 
         result = self.meta_set(
             key=key,
@@ -141,9 +145,8 @@ class HighLevelCommandsMixin:
         flags = RequestFlags(
             cache_ttl=ttl,
             mode=SetMode.ADD.value,
+            no_reply=no_reply,
         )
-        if no_reply:
-            flags.no_reply = True
 
         result = self.meta_set(
             key=key,
@@ -169,14 +172,17 @@ class HighLevelCommandsMixin:
         it exists or not, use invalidate() instead.
         """
         key = key if isinstance(key, Key) else Key(key)
-        flags = RequestFlags()
-        if no_reply:
-            flags.no_reply = True
-        if cas_token is not None:
-            flags.cas_token = cas_token
-        if stale_policy and stale_policy.mark_stale_on_deletion_ttl > 0:
-            flags.mark_stale = True
-            flags.cache_ttl = stale_policy.mark_stale_on_deletion_ttl
+        _stale_ttl = (
+            stale_policy.mark_stale_on_deletion_ttl
+            if stale_policy and stale_policy.mark_stale_on_deletion_ttl > 0
+            else None
+        )
+        flags = RequestFlags(
+            no_reply=no_reply,
+            cas_token=cas_token,
+            mark_stale=_stale_ttl is not None,
+            cache_ttl=_stale_ttl,
+        )
 
         result = self.meta_delete(key=key, flags=flags)
 
@@ -193,14 +199,17 @@ class HighLevelCommandsMixin:
         Returns true of the key deleted or it didn't exist anyway
         """
         key = key if isinstance(key, Key) else Key(key)
-        flags = RequestFlags()
-        if no_reply:
-            flags.no_reply = True
-        if cas_token is not None:
-            flags.cas_token = cas_token
-        if stale_policy and stale_policy.mark_stale_on_deletion_ttl > 0:
-            flags.mark_stale = True
-            flags.cache_ttl = stale_policy.mark_stale_on_deletion_ttl
+        _stale_ttl = (
+            stale_policy.mark_stale_on_deletion_ttl
+            if stale_policy and stale_policy.mark_stale_on_deletion_ttl > 0
+            else None
+        )
+        flags = RequestFlags(
+            no_reply=no_reply,
+            cas_token=cas_token,
+            mark_stale=_stale_ttl is not None,
+            cache_ttl=_stale_ttl,
+        )
 
         result = self.meta_delete(key=key, flags=flags)
 
@@ -216,9 +225,7 @@ class HighLevelCommandsMixin:
         Modify the TTL of a key without retrieving the value
         """
         key = key if isinstance(key, Key) else Key(key)
-        flags = RequestFlags(cache_ttl=ttl)
-        if no_reply:
-            flags.no_reply = True
+        flags = RequestFlags(cache_ttl=ttl, no_reply=no_reply)
         result = self.meta_get(key, flags=flags)
 
         return isinstance(result, Success)
@@ -344,14 +351,11 @@ class HighLevelCommandsMixin:
         recache_policy: Optional[RecachePolicy] = None,
         return_cas_token: bool = False,
     ) -> Dict[Key, Optional[Value]]:
-        if return_cas_token:
-            flags = DEFAULT_GET_CAS_FLAGS.copy()
-        else:
-            flags = DEFAULT_GET_FLAGS.copy()
-        if recache_policy:
-            flags.recache_ttl = recache_policy.ttl
-        if touch_ttl is not None and touch_ttl >= 0:
-            flags.cache_ttl = touch_ttl
+        base = DEFAULT_GET_CAS_FLAGS if return_cas_token else DEFAULT_GET_FLAGS
+        flags = base.replace(
+            recache_ttl=recache_policy.ttl if recache_policy else None,
+            cache_ttl=touch_ttl if touch_ttl is not None and touch_ttl >= 0 else None,
+        )
 
         results = self.meta_multiget(
             keys=[key if isinstance(key, Key) else Key(key) for key in keys],
@@ -389,16 +393,12 @@ class HighLevelCommandsMixin:
         return_cas_token: bool = False,
     ) -> Optional[Value]:
         key = key if isinstance(key, Key) else Key(key)
-        if return_cas_token:
-            flags = DEFAULT_GET_CAS_FLAGS.copy()
-        else:
-            flags = DEFAULT_GET_FLAGS.copy()
-        if lease_policy:
-            flags.vivify_on_miss_ttl = lease_policy.ttl
-        if recache_policy:
-            flags.recache_ttl = recache_policy.ttl
-        if touch_ttl is not None and touch_ttl >= 0:
-            flags.cache_ttl = touch_ttl
+        base = DEFAULT_GET_CAS_FLAGS if return_cas_token else DEFAULT_GET_FLAGS
+        flags = base.replace(
+            vivify_on_miss_ttl=lease_policy.ttl if lease_policy else None,
+            recache_ttl=recache_policy.ttl if recache_policy else None,
+            cache_ttl=touch_ttl if touch_ttl is not None and touch_ttl >= 0 else None,
+        )
 
         result = self.meta_get(key, flags=flags)
         return self._process_get_result(key, result)
@@ -478,22 +478,19 @@ class HighLevelCommandsMixin:
         no_reply: bool = False,
         cas_token: Optional[int] = None,
         return_value: bool = False,
+        initial_value: Optional[int] = None,
+        initial_ttl: Optional[int] = None,
     ) -> RequestFlags:
-        flags = RequestFlags(
+        return RequestFlags(
             ma_delta_value=abs(delta),
+            return_value=return_value,
+            no_reply=no_reply,
+            cache_ttl=refresh_ttl,
+            cas_token=cas_token,
+            mode=MA_MODE_DEC if delta < 0 else None,
+            ma_initial_value=abs(initial_value) if initial_value is not None else None,
+            vivify_on_miss_ttl=initial_ttl,
         )
-        if return_value:
-            flags.return_value = True
-        if no_reply:
-            flags.no_reply = True
-        if refresh_ttl is not None:
-            flags.cache_ttl = refresh_ttl
-        if cas_token is not None:
-            flags.cas_token = cas_token
-        if delta < 0:
-            flags.mode = MA_MODE_DEC
-
-        return flags
 
     def delta(
         self: HighLevelCommandMixinWithMetaCommands,
@@ -537,9 +534,9 @@ class HighLevelCommandsMixin:
             refresh_ttl=refresh_ttl,
             no_reply=no_reply,
             cas_token=cas_token,
+            initial_value=initial_value,
+            initial_ttl=initial_ttl,
         )
-        flags.ma_initial_value = abs(initial_value)
-        flags.vivify_on_miss_ttl = initial_ttl
         result = self.meta_arithmetic(key=key, flags=flags)
         return isinstance(result, Success)
 
@@ -588,9 +585,9 @@ class HighLevelCommandsMixin:
             delta=delta,
             refresh_ttl=refresh_ttl,
             cas_token=cas_token,
+            initial_value=initial_value,
+            initial_ttl=initial_ttl,
         )
-        flags.ma_initial_value = abs(initial_value)
-        flags.vivify_on_miss_ttl = initial_ttl
         result = self.meta_arithmetic(key=key, flags=flags)
         if isinstance(result, Value):
             if isinstance(result.value, str) and result.value.isnumeric():

{meta_memcache-2.1.0 → meta_memcache-2.2.0}/src/meta_memcache/executors/default.py

@@ -45,8 +45,10 @@ class DefaultExecutor:
         flags: Optional[RequestFlags],
     ) -> Tuple[Optional[bytes], RequestFlags]:
         encoded_value = self._serializer.serialize(key, value.value)
-        flags = flags if flags is not None else RequestFlags()
-        flags.client_flag = encoded_value.encoding_id
+        if flags is None:
+            flags = RequestFlags(client_flag=encoded_value.encoding_id)
+        else:
+            flags = flags.replace(client_flag=encoded_value.encoding_id)
         return encoded_value.data, flags
 
     def _is_a_write_failure(

{meta_memcache-2.1.0 → meta_memcache-2.2.0}/src/meta_memcache/routers/helpers.py

@@ -17,8 +17,10 @@ def adjust_flags_for_max_ttl(
     Override TTLs > than `max_ttl`
     """
     if flags:
-        flags.cache_ttl = _adjust_ttl(flags.cache_ttl, max_ttl)
-        flags.recache_ttl = _adjust_ttl(flags.recache_ttl, max_ttl)
-        flags.vivify_on_miss_ttl = _adjust_ttl(flags.vivify_on_miss_ttl, max_ttl)
+        flags = flags.replace(
+            cache_ttl=_adjust_ttl(flags.cache_ttl, max_ttl),
+            recache_ttl=_adjust_ttl(flags.recache_ttl, max_ttl),
+            vivify_on_miss_ttl=_adjust_ttl(flags.vivify_on_miss_ttl, max_ttl),
+        )
 
     return flags

{meta_memcache-2.1.0 → meta_memcache-2.2.0/src/meta_memcache.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meta-memcache
-Version: 2.1.0
+Version: 2.2.0
 Summary: Modern, pure python, memcache client with support for new meta commands.
 Author-email: Guillermo Perez <bisho@revenuecat.com>
 License: MIT License
@@ -11,7 +11,7 @@ License-File: LICENSE
 Requires-Dist: uhashring<3,>=2.3
 Requires-Dist: marisa-trie<1.3,>=1.2.1
 Requires-Dist: zstandard<0.26,>=0.25.0
-Requires-Dist: meta-memcache-socket<0.3.0,>=0.2.0
+Requires-Dist: meta-memcache-socket<0.4.0,>=0.3.0
 Provides-Extra: metrics
 Requires-Dist: prometheus-client>=0.17.1; extra == "metrics"
 Dynamic: license-file

{meta_memcache-2.1.0 → meta_memcache-2.2.0}/src/meta_memcache.egg-info/requires.txt

@@ -1,7 +1,7 @@
 uhashring<3,>=2.3
 marisa-trie<1.3,>=1.2.1
 zstandard<0.26,>=0.25.0
-meta-memcache-socket<0.3.0,>=0.2.0
+meta-memcache-socket<0.4.0,>=0.3.0
 
 [metrics]
 prometheus-client>=0.17.1