cachekit 0.11.0__tar.gz → 0.11.1__tar.gz

{cachekit-0.11.0 → cachekit-0.11.1}/Cargo.lock

@@ -271,7 +271,7 @@ dependencies = [
 
 [[package]]
 name = "cachekit-rs"
-version = "0.11.0"
+version = "0.11.1"
 dependencies = [
  "cachekit-core",
  "criterion",
@@ -954,9 +954,9 @@ checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
 [[package]]
 name = "memmap2"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3"
+checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
 dependencies = [
  "libc",
 ]

{cachekit-0.11.0 → cachekit-0.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cachekit
-Version: 0.11.0
+Version: 0.11.1
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

{cachekit-0.11.0 → cachekit-0.11.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "cachekit"
-version = "0.11.0"
+version = "0.11.1"
 description = "Production-ready Redis caching for Python with intelligent reliability features and Rust-powered performance"
 readme = "README.md"
 license = {text = "MIT"}

{cachekit-0.11.0 → cachekit-0.11.1}/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cachekit-rs"
-version = "0.11.0"
+version = "0.11.1"
 edition = "2021"
 authors = ["cachekit Contributors"]
 description = "High-performance storage engine for caching with compression and encryption"

{cachekit-0.11.0 → cachekit-0.11.1}/src/cachekit/__init__.py

@@ -68,7 +68,7 @@ Example Usage:
     ```
 """
 
-__version__ = "0.11.0"
+__version__ = "0.11.1"
 
 from collections.abc import Callable
 from typing import Any, TypeVar

{cachekit-0.11.0 → cachekit-0.11.1}/src/cachekit/cache_handler.py

@@ -308,7 +308,7 @@ class CacheSerializationHandler:
             deployment_uuid: Optional deployment-specific UUID for single-tenant mode.
                             If not provided, uses env var or persistent file.
             master_key: Optional master key for encryption (hex-encoded). If not provided,
-                       reads from REDIS_CACHE_MASTER_KEY environment variable.
+                       reads from CACHEKIT_MASTER_KEY environment variable.
             enable_integrity_checking: Enable integrity checking (default: True)
                                       Uses xxHash3-64 (8 bytes) for all serializers.
                                       Set to False for @cache.minimal (speed-first, no checksums)

{cachekit-0.11.0 → cachekit-0.11.1}/src/cachekit/config/singleton.py

@@ -1,5 +1,6 @@
 """Thread-safe singleton pattern for global cachekit settings."""
 
+import os
 import threading
 from typing import Optional
 
@@ -43,9 +44,25 @@ def get_settings() -> CachekitConfig:
     """
     global _settings_instance
 
-    # Fast path - return cached instance without lock
-    if _settings_instance is not None:
-        return _settings_instance
+    # Fast path - snapshot the global once. A concurrent reset_settings() can null _settings_instance
+    # at any time, so the unlocked self-heal check below reads the snapshot, never the global, or it
+    # could dereference None between the not-None check and the .master_key access.
+    instance = _settings_instance
+    if instance is not None:
+        # Self-heal the keyless-then-key-set ordering trap (#195): if the config was first built
+        # before CACHEKIT_MASTER_KEY entered the environment (e.g. an import-time cache decorator
+        # evaluated before the app loaded its secrets), it froze master_key=None — encryption would
+        # then silently never activate. Re-read once the key appears, so it turns on without an
+        # explicit reset_settings(). Idempotent: after the rebuild master_key is set, so this never
+        # fires again (no per-call churn once a key is present).
+        if instance.master_key is None and os.environ.get("CACHEKIT_MASTER_KEY"):
+            with _settings_lock:
+                # Re-read the global under the lock: a peer may have rebuilt it (key now set) or
+                # reset_settings() may have cleared it (back to None). Rebuild only if still keyless.
+                if _settings_instance is None or _settings_instance.master_key is None:
+                    _settings_instance = CachekitConfig.from_env()
+                return _settings_instance
+        return instance
 
     # Slow path - create instance with lock
     with _settings_lock:

{cachekit-0.11.0 → cachekit-0.11.1}/src/cachekit/serializers/encryption_wrapper.py

@@ -128,7 +128,7 @@ class EncryptionWrapper:
             settings = get_settings()
             if not settings.master_key:
                 raise EncryptionError(
-                    "Master key required. Set REDIS_CACHE_MASTER_KEY environment variable or pass master_key parameter."
+                    "Master key required. Set CACHEKIT_MASTER_KEY environment variable or pass master_key parameter."
                 )
             try:
                 master_key = bytes.fromhex(settings.master_key.get_secret_value())