cachekit 0.10.1__tar.gz → 0.11.1__tar.gz

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

@@ -271,7 +271,7 @@ dependencies = [
 
 [[package]]
 name = "cachekit-rs"
-version = "0.10.1"
+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.10.1 → cachekit-0.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cachekit
-Version: 0.10.1
+Version: 0.11.1
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -26,15 +26,16 @@ Requires-Dist: tenacity>=8.0.0
 Requires-Dist: prometheus-client>=0.22.1
 Requires-Dist: psutil>=7.0.0
 Requires-Dist: blake3>=1.0.5
-Requires-Dist: msgpack>=1.1.2
-Requires-Dist: orjson>=3.9.0
+Requires-Dist: msgpack>=1.2.1
 Requires-Dist: xxhash>=3.5.0
 Requires-Dist: httpx[http2]>=0.28.1
 Requires-Dist: numpy>=2.0.2 ; extra == 'data'
 Requires-Dist: pandas>=1.3.0 ; extra == 'data'
 Requires-Dist: pyarrow>=21.0.0 ; extra == 'data'
+Requires-Dist: orjson>=3.9.0 ; extra == 'json'
 Requires-Dist: pymemcache>=4.0.0 ; extra == 'memcached'
 Provides-Extra: data
+Provides-Extra: json
 Provides-Extra: memcached
 License-File: LICENSE
 Summary: Production-ready Redis caching for Python with intelligent reliability features and Rust-powered performance
@@ -302,7 +303,7 @@ def test_cached_function():
 | Serializer | Speed | Use Case |
 |:-----------|:-----:|:---------|
 | **StandardSerializer** | ★★★★☆ | General Python types, NumPy, Pandas |
-| **OrjsonSerializer** | ★★★★★ | JSON APIs (2-5x faster than stdlib) |
+| **OrjsonSerializer** | ★★★★★ | JSON APIs (2-5x faster than stdlib) — requires `cachekit[json]` |
 | **ArrowSerializer** | ★★★★★ | Large DataFrames (6-23x faster for 10K+ rows) |
 | **EncryptionWrapper** | ★★★★☆ | Wraps any serializer with AES-256-GCM |
 

{cachekit-0.10.1 → cachekit-0.11.1}/README.md

@@ -249,7 +249,7 @@ def test_cached_function():
 | Serializer | Speed | Use Case |
 |:-----------|:-----:|:---------|
 | **StandardSerializer** | ★★★★☆ | General Python types, NumPy, Pandas |
-| **OrjsonSerializer** | ★★★★★ | JSON APIs (2-5x faster than stdlib) |
+| **OrjsonSerializer** | ★★★★★ | JSON APIs (2-5x faster than stdlib) — requires `cachekit[json]` |
 | **ArrowSerializer** | ★★★★★ | Large DataFrames (6-23x faster for 10K+ rows) |
 | **EncryptionWrapper** | ★★★★☆ | Wraps any serializer with AES-256-GCM |
 

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

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "cachekit"
-version = "0.10.1"
+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"}
@@ -64,8 +64,7 @@ dependencies = [
     "psutil>=7.0.0",
     # Serialization and hashing
     "blake3>=1.0.5",
-    "msgpack>=1.1.2",
-    "orjson>=3.9.0",
+    "msgpack>=1.2.1",
     "xxhash>=3.5.0",
     # HTTP client for SaaS backend (cachekit.io)
     "httpx[http2]>=0.28.1",
@@ -78,6 +77,10 @@ data = [
     "pandas>=1.3.0",
     "pyarrow>=21.0.0",
 ]
+json = [
+    # OrjsonSerializer (serializer="orjson") — fast JSON via orjson
+    "orjson>=3.9.0",
+]
 memcached = [
     "pymemcache>=4.0.0",
 ]
@@ -228,6 +231,9 @@ dev = [
     "numpy>=2.0.2",
     "pandas>=1.3.0",
     "pyarrow>=21.0.0",
+    # OrjsonSerializer support — now the [json] optional extra; kept here so the
+    # orjson tests, doctests, and markdown-docs still resolve it in dev/CI.
+    "orjson>=3.9.0",
     "pytest-xdist>=3.8.0",
     "time-machine>=2.19.0",
 ]

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

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

{cachekit-0.10.1 → cachekit-0.11.1}/rust/README.md

@@ -249,7 +249,7 @@ def test_cached_function():
 | Serializer | Speed | Use Case |
 |:-----------|:-----:|:---------|
 | **StandardSerializer** | ★★★★☆ | General Python types, NumPy, Pandas |
-| **OrjsonSerializer** | ★★★★★ | JSON APIs (2-5x faster than stdlib) |
+| **OrjsonSerializer** | ★★★★★ | JSON APIs (2-5x faster than stdlib) — requires `cachekit[json]` |
 | **ArrowSerializer** | ★★★★★ | Large DataFrames (6-23x faster for 10K+ rows) |
 | **EncryptionWrapper** | ★★★★☆ | Wraps any serializer with AES-256-GCM |
 

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

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

{cachekit-0.10.1 → 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.10.1 → 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.10.1 → cachekit-0.11.1}/src/cachekit/serializers/__init__.py

@@ -15,11 +15,11 @@ from .base import (
     SerializerProtocol,
 )
 from .encryption_wrapper import EncryptionWrapper
-from .orjson_serializer import OrjsonSerializer
 from .standard_serializer import StandardSerializer
 
 if TYPE_CHECKING:
     from .arrow_serializer import ArrowSerializer
+    from .orjson_serializer import OrjsonSerializer
 
 logger = logging.getLogger(__name__)
 
@@ -37,6 +37,20 @@ def _get_arrow_serializer() -> type:
     return _ArrowSerializer
 
 
+# Lazy import for optional OrjsonSerializer (requires orjson from [json] extra)
+_OrjsonSerializer: type | None = None
+
+
+def _get_orjson_serializer() -> type:
+    """Lazy-load OrjsonSerializer. Raises ImportError if orjson not installed."""
+    global _OrjsonSerializer
+    if _OrjsonSerializer is None:
+        from .orjson_serializer import OrjsonSerializer
+
+        _OrjsonSerializer = OrjsonSerializer
+    return _OrjsonSerializer
+
+
 # Validate ByteStorage works correctly
 test_storage = ByteStorage("msgpack")
 test_data = b"test validation data"
@@ -57,7 +71,7 @@ SERIALIZER_REGISTRY = {
     "default": StandardSerializer,  # Language-agnostic MessagePack for multi-language caches
     "std": StandardSerializer,  # Explicit StandardSerializer alias
     "arrow": None,  # Lazy-loaded: requires pyarrow from [data] extra
-    "orjson": OrjsonSerializer,
+    "orjson": None,  # Lazy-loaded: requires orjson from [json] extra
     "encrypted": EncryptionWrapper,  # StandardSerializer + AES-256-GCM encryption
 }
 
@@ -116,9 +130,11 @@ def get_serializer(name: str, enable_integrity_checking: bool = True) -> Seriali
                 f"@cache(serializer=MySerializer())"
             )
 
-        # Get serializer class (lazy-load arrow if needed)
+        # Get serializer class (lazy-load optional serializers if needed)
         if name == "arrow":
             serializer_class = _get_arrow_serializer()
+        elif name == "orjson":
+            serializer_class = _get_orjson_serializer()
         else:
             serializer_class = SERIALIZER_REGISTRY[name]
 
@@ -177,9 +193,15 @@ def get_serializer_info() -> dict[str, dict[str, Any]]:
             if hasattr(instance, "get_info"):
                 info[name].update(instance.get_info())  # type: ignore[attr-defined]
         except ImportError as e:
+            # Optional serializer whose backing dependency (pyarrow / orjson) is absent.
+            optional_modules = {
+                "arrow": ("ArrowSerializer", "cachekit.serializers.arrow_serializer"),
+                "orjson": ("OrjsonSerializer", "cachekit.serializers.orjson_serializer"),
+            }
+            cls, module = optional_modules.get(name, ("Unknown", "unknown"))
             info[name] = {
-                "class": "ArrowSerializer" if name == "arrow" else "Unknown",
-                "module": "cachekit.serializers.arrow_serializer",
+                "class": cls,
+                "module": module,
                 "available": False,
                 "error": str(e),
             }
@@ -194,9 +216,11 @@ def get_serializer_info() -> dict[str, dict[str, Any]]:
 
 
 def __getattr__(name: str) -> Any:
-    """Lazy attribute access for optional ArrowSerializer."""
+    """Lazy attribute access for optional ArrowSerializer / OrjsonSerializer."""
     if name == "ArrowSerializer":
         return _get_arrow_serializer()
+    if name == "OrjsonSerializer":
+        return _get_orjson_serializer()
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
 
 

{cachekit-0.10.1 → 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())

{cachekit-0.10.1 → cachekit-0.11.1}/src/cachekit/serializers/orjson_serializer.py

@@ -14,7 +14,12 @@ from __future__ import annotations
 
 from typing import Any, ClassVar
 
-import orjson
+# Required dependency: orjson (fail-fast with install hint when the [json] extra is absent)
+try:
+    import orjson
+except ImportError as e:  # pragma: no cover - only reachable without the [json] extra (behavior tested via subprocess)
+    raise ImportError("orjson is not installed. OrjsonSerializer requires the [json] extra: pip install 'cachekit[json]'") from e
+
 import xxhash
 
 from .base import SerializationError, SerializationFormat, SerializationMetadata