cachu 0.2.4__tar.gz → 0.2.5__tar.gz

{cachu-0.2.4 → cachu-0.2.5}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.4
 Name: cachu
-Version: 0.2.4
+Version: 0.2.5
 Summary: Flexible caching library with sync and async support for memory, file (SQLite), and Redis backends
 Author: bissli
 License-Expression: 0BSD
 Project-URL: Repository, https://github.com/bissli/cachu.git
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: dogpile.cache
 Requires-Dist: func-timeout
 Provides-Extra: async
 Requires-Dist: aiosqlite; extra == "async"

{cachu-0.2.4 → cachu-0.2.5}/pyproject.toml

@@ -1,26 +1,25 @@
 [project]
 name = "cachu"
-version = "0.2.4"
+version = "0.2.5"
 description = "Flexible caching library with sync and async support for memory, file (SQLite), and Redis backends"
 readme = "README.md"
 license = "0BSD"
 authors = [{ name = "bissli" }]
 requires-python = ">=3.10"
 dependencies = [
-    "dogpile.cache",
-    "func-timeout",
+  "func-timeout",
 ]
 
 [project.optional-dependencies]
 async = ["aiosqlite"]
 redis = ["redis>=4.2.0"]
 test = [
-    "pytest",
-    "pytest-asyncio",
-    "pytest-mock",
-    "redis>=4.2.0",
-    "testcontainers[redis]",
-    "aiosqlite",
+  "pytest",
+  "pytest-asyncio",
+  "pytest-mock",
+  "redis>=4.2.0",
+  "testcontainers[redis]",
+  "aiosqlite",
 ]
 
 [project.urls]

{cachu-0.2.4 → cachu-0.2.5}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.4
+current_version = 0.2.5
 commit = True
 tag = True
 

{cachu-0.2.4 → cachu-0.2.5}/src/cachu/__init__.py

@@ -1,12 +1,12 @@
 """Flexible caching library with support for memory, file, and Redis backends.
 """
-__version__ = '0.2.4'
+__version__ = '0.2.5'
 
-from .backends import AsyncBackend, Backend
+from .backends import Backend
 from .backends.redis import get_redis_client
 from .config import configure, disable, enable, get_all_configs, get_config
 from .config import is_disabled
-from .decorator import async_cache, cache, clear_async_backends
+from .decorator import aget_backend, cache, clear_async_backends
 from .decorator import get_async_backend, get_async_cache_info, get_backend
 from .operations import async_cache_clear, async_cache_delete, async_cache_get
 from .operations import async_cache_info, async_cache_set, cache_clear
@@ -26,10 +26,9 @@ __all__ = [
     'cache_clear',
     'cache_info',
     'get_backend',
+    'aget_backend',
     'get_redis_client',
     'Backend',
-    'AsyncBackend',
-    'async_cache',
     'async_cache_get',
     'async_cache_set',
     'async_cache_delete',

cachu-0.2.5/src/cachu/backends/__init__.py

@@ -0,0 +1,112 @@
+"""Cache backend implementations.
+"""
+from abc import ABC, abstractmethod
+from collections.abc import AsyncIterator, Iterator
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from ..mutex import AsyncCacheMutex, CacheMutex
+
+NO_VALUE = object()
+
+
+class Backend(ABC):
+    """Abstract base class for cache backends with both sync and async interfaces.
+    """
+
+    # ===== Sync interface =====
+
+    @abstractmethod
+    def get(self, key: str) -> Any:
+        """Get value by key. Returns NO_VALUE if not found.
+        """
+
+    @abstractmethod
+    def get_with_metadata(self, key: str) -> tuple[Any, float | None]:
+        """Get value and creation timestamp. Returns (NO_VALUE, None) if not found.
+        """
+
+    @abstractmethod
+    def set(self, key: str, value: Any, ttl: int) -> None:
+        """Set value with TTL in seconds.
+        """
+
+    @abstractmethod
+    def delete(self, key: str) -> None:
+        """Delete value by key.
+        """
+
+    @abstractmethod
+    def clear(self, pattern: str | None = None) -> int:
+        """Clear entries matching pattern. Returns count of cleared entries.
+        """
+
+    @abstractmethod
+    def keys(self, pattern: str | None = None) -> Iterator[str]:
+        """Iterate over keys matching pattern.
+        """
+
+    @abstractmethod
+    def count(self, pattern: str | None = None) -> int:
+        """Count keys matching pattern.
+        """
+
+    @abstractmethod
+    def get_mutex(self, key: str) -> 'CacheMutex':
+        """Get a mutex for dogpile prevention on the given key.
+        """
+
+    # ===== Async interface =====
+
+    @abstractmethod
+    async def aget(self, key: str) -> Any:
+        """Async get value by key. Returns NO_VALUE if not found.
+        """
+
+    @abstractmethod
+    async def aget_with_metadata(self, key: str) -> tuple[Any, float | None]:
+        """Async get value and creation timestamp. Returns (NO_VALUE, None) if not found.
+        """
+
+    @abstractmethod
+    async def aset(self, key: str, value: Any, ttl: int) -> None:
+        """Async set value with TTL in seconds.
+        """
+
+    @abstractmethod
+    async def adelete(self, key: str) -> None:
+        """Async delete value by key.
+        """
+
+    @abstractmethod
+    async def aclear(self, pattern: str | None = None) -> int:
+        """Async clear entries matching pattern. Returns count of cleared entries.
+        """
+
+    @abstractmethod
+    def akeys(self, pattern: str | None = None) -> AsyncIterator[str]:
+        """Async iterate over keys matching pattern.
+        """
+
+    @abstractmethod
+    async def acount(self, pattern: str | None = None) -> int:
+        """Async count keys matching pattern.
+        """
+
+    @abstractmethod
+    def get_async_mutex(self, key: str) -> 'AsyncCacheMutex':
+        """Get an async mutex for dogpile prevention on the given key.
+        """
+
+    # ===== Lifecycle =====
+
+    def close(self) -> None:
+        """Close the backend and release resources.
+        """
+
+    async def aclose(self) -> None:
+        """Async close the backend and release resources.
+        """
+
+
+__all__ = ['Backend', 'NO_VALUE']

cachu-0.2.5/src/cachu/backends/memory.py

@@ -0,0 +1,204 @@
+"""Memory cache backend implementation.
+"""
+import asyncio
+import fnmatch
+import pickle
+import threading
+import time
+from collections.abc import AsyncIterator, Iterator
+from typing import Any
+
+from ..mutex import AsyncioMutex, CacheMutex, ThreadingMutex
+from . import NO_VALUE, Backend
+
+
+class MemoryBackend(Backend):
+    """Thread-safe in-memory cache backend with both sync and async interfaces.
+    """
+
+    def __init__(self) -> None:
+        self._cache: dict[str, tuple[bytes, float, float]] = {}
+        self._sync_lock = threading.RLock()
+        self._async_lock: asyncio.Lock | None = None
+
+    def _get_async_lock(self) -> asyncio.Lock:
+        """Lazy-create async lock (must be called from async context).
+        """
+        if self._async_lock is None:
+            self._async_lock = asyncio.Lock()
+        return self._async_lock
+
+    # ===== Core logic (no locking) =====
+
+    def _do_get(self, key: str) -> tuple[Any, float | None]:
+        """Get value and metadata without locking.
+        """
+        entry = self._cache.get(key)
+        if entry is None:
+            return NO_VALUE, None
+
+        pickled_value, created_at, expires_at = entry
+        if time.time() > expires_at:
+            del self._cache[key]
+            return NO_VALUE, None
+
+        return pickle.loads(pickled_value), created_at
+
+    def _do_set(self, key: str, value: Any, ttl: int) -> None:
+        """Set value without locking.
+        """
+        now = time.time()
+        pickled_value = pickle.dumps(value)
+        self._cache[key] = (pickled_value, now, now + ttl)
+
+    def _do_delete(self, key: str) -> None:
+        """Delete value without locking.
+        """
+        self._cache.pop(key, None)
+
+    def _do_clear(self, pattern: str | None = None) -> int:
+        """Clear entries matching pattern without locking.
+        """
+        if pattern is None:
+            count = len(self._cache)
+            self._cache.clear()
+            return count
+
+        keys_to_delete = [k for k in self._cache if fnmatch.fnmatch(k, pattern)]
+        for key in keys_to_delete:
+            del self._cache[key]
+        return len(keys_to_delete)
+
+    def _do_keys(self, pattern: str | None = None) -> list[str]:
+        """Get keys matching pattern without locking (returns snapshot).
+        """
+        now = time.time()
+        result = []
+        keys_to_delete = []
+
+        for key, entry in list(self._cache.items()):
+            _, _, expires_at = entry
+            if now > expires_at:
+                keys_to_delete.append(key)
+                continue
+            if pattern is None or fnmatch.fnmatch(key, pattern):
+                result.append(key)
+
+        for key in keys_to_delete:
+            self._cache.pop(key, None)
+
+        return result
+
+    # ===== Sync interface =====
+
+    def get(self, key: str) -> Any:
+        """Get value by key. Returns NO_VALUE if not found or expired.
+        """
+        with self._sync_lock:
+            value, _ = self._do_get(key)
+            return value
+
+    def get_with_metadata(self, key: str) -> tuple[Any, float | None]:
+        """Get value and creation timestamp. Returns (NO_VALUE, None) if not found.
+        """
+        with self._sync_lock:
+            return self._do_get(key)
+
+    def set(self, key: str, value: Any, ttl: int) -> None:
+        """Set value with TTL in seconds.
+        """
+        with self._sync_lock:
+            self._do_set(key, value, ttl)
+
+    def delete(self, key: str) -> None:
+        """Delete value by key.
+        """
+        with self._sync_lock:
+            self._do_delete(key)
+
+    def clear(self, pattern: str | None = None) -> int:
+        """Clear entries matching pattern. Returns count of cleared entries.
+        """
+        with self._sync_lock:
+            return self._do_clear(pattern)
+
+    def keys(self, pattern: str | None = None) -> Iterator[str]:
+        """Iterate over keys matching pattern.
+        """
+        with self._sync_lock:
+            all_keys = self._do_keys(pattern)
+        yield from all_keys
+
+    def count(self, pattern: str | None = None) -> int:
+        """Count keys matching pattern.
+        """
+        with self._sync_lock:
+            return len(self._do_keys(pattern))
+
+    def get_mutex(self, key: str) -> CacheMutex:
+        """Get a mutex for dogpile prevention on the given key.
+        """
+        return ThreadingMutex(f'memory:{key}')
+
+    # ===== Async interface =====
+
+    async def aget(self, key: str) -> Any:
+        """Async get value by key. Returns NO_VALUE if not found or expired.
+        """
+        async with self._get_async_lock():
+            value, _ = self._do_get(key)
+            return value
+
+    async def aget_with_metadata(self, key: str) -> tuple[Any, float | None]:
+        """Async get value and creation timestamp. Returns (NO_VALUE, None) if not found.
+        """
+        async with self._get_async_lock():
+            return self._do_get(key)
+
+    async def aset(self, key: str, value: Any, ttl: int) -> None:
+        """Async set value with TTL in seconds.
+        """
+        async with self._get_async_lock():
+            self._do_set(key, value, ttl)
+
+    async def adelete(self, key: str) -> None:
+        """Async delete value by key.
+        """
+        async with self._get_async_lock():
+            self._do_delete(key)
+
+    async def aclear(self, pattern: str | None = None) -> int:
+        """Async clear entries matching pattern. Returns count of cleared entries.
+        """
+        async with self._get_async_lock():
+            return self._do_clear(pattern)
+
+    async def akeys(self, pattern: str | None = None) -> AsyncIterator[str]:
+        """Async iterate over keys matching pattern.
+        """
+        async with self._get_async_lock():
+            all_keys = self._do_keys(pattern)
+
+        for key in all_keys:
+            yield key
+
+    async def acount(self, pattern: str | None = None) -> int:
+        """Async count keys matching pattern.
+        """
+        async with self._get_async_lock():
+            return len(self._do_keys(pattern))
+
+    def get_async_mutex(self, key: str) -> AsyncioMutex:
+        """Get an async mutex for dogpile prevention on the given key.
+        """
+        return AsyncioMutex(f'memory:{key}')
+
+    # ===== Lifecycle =====
+
+    def close(self) -> None:
+        """Close the backend (no-op for memory backend).
+        """
+
+    async def aclose(self) -> None:
+        """Async close the backend (no-op for memory backend).
+        """

{cachu-0.2.4 → cachu-0.2.5}/src/cachu/backends/redis.py

@@ -6,7 +6,8 @@ import time
 from collections.abc import AsyncIterator, Iterator
 from typing import TYPE_CHECKING, Any
 
-from . import NO_VALUE, AsyncBackend, Backend
+from ..mutex import AsyncCacheMutex, AsyncRedisMutex, CacheMutex, RedisMutex
+from . import NO_VALUE, Backend
 
 if TYPE_CHECKING:
     import redis
@@ -25,7 +26,7 @@ def _get_redis_module() -> Any:
         return redis
     except ImportError as e:
         raise RuntimeError(
-            "Redis support requires the 'redis' package. Install with: pip install cache[redis]"
+            "Redis support requires the 'redis' package. Install with: pip install cachu[redis]"
         ) from e
 
 
@@ -42,16 +43,6 @@ def _get_async_redis_module() -> Any:
         ) from e
 
 
-async def get_async_redis_client(url: str) -> 'aioredis.Redis':
-    """Create an async Redis client from URL.
-
-    Args:
-        url: Redis URL (e.g., 'redis://localhost:6379/0')
-    """
-    aioredis = _get_async_redis_module()
-    return aioredis.from_url(url)
-
-
 def get_redis_client(url: str) -> 'redis.Redis':
     """Create a Redis client from URL.
 
@@ -79,20 +70,32 @@ def _unpack_value(data: bytes) -> tuple[Any, float]:
 
 
 class RedisBackend(Backend):
-    """Redis cache backend.
+    """Unified Redis cache backend with both sync and async interfaces.
     """
 
-    def __init__(self, url: str) -> None:
+    def __init__(self, url: str, lock_timeout: float = 10.0) -> None:
         self._url = url
-        self._client: redis.Redis | None = None
+        self._lock_timeout = lock_timeout
+        self._sync_client: redis.Redis | None = None
+        self._async_client: aioredis.Redis | None = None
 
     @property
     def client(self) -> 'redis.Redis':
-        """Lazy-load Redis client.
+        """Lazy-load sync Redis client.
+        """
+        if self._sync_client is None:
+            self._sync_client = get_redis_client(self._url)
+        return self._sync_client
+
+    def _get_async_client(self) -> 'aioredis.Redis':
+        """Lazy-load async Redis client (from_url is NOT async).
         """
-        if self._client is None:
-            self._client = get_redis_client(self._url)
-        return self._client
+        if self._async_client is None:
+            aioredis = _get_async_redis_module()
+            self._async_client = aioredis.from_url(self._url)
+        return self._async_client
+
+    # ===== Sync interface =====
 
     def get(self, key: str) -> Any:
         """Get value by key. Returns NO_VALUE if not found.
@@ -148,67 +151,51 @@ class RedisBackend(Backend):
         """
         return sum(1 for _ in self.keys(pattern))
 
-    def close(self) -> None:
-        """Close the Redis connection.
+    def get_mutex(self, key: str) -> CacheMutex:
+        """Get a mutex for dogpile prevention on the given key.
         """
-        if self._client is not None:
-            self._client.close()
-            self._client = None
-
-
-class AsyncRedisBackend(AsyncBackend):
-    """Async Redis cache backend using redis.asyncio.
-    """
+        return RedisMutex(self.client, f'lock:{key}', self._lock_timeout)
 
-    def __init__(self, url: str) -> None:
-        self._url = url
-        self._client: aioredis.Redis | None = None
-
-    async def _get_client(self) -> 'aioredis.Redis':
-        """Lazy-load async Redis client.
-        """
-        if self._client is None:
-            self._client = await get_async_redis_client(self._url)
-        return self._client
+    # ===== Async interface =====
 
-    async def get(self, key: str) -> Any:
-        """Get value by key. Returns NO_VALUE if not found.
+    async def aget(self, key: str) -> Any:
+        """Async get value by key. Returns NO_VALUE if not found.
         """
-        client = await self._get_client()
+        client = self._get_async_client()
         data = await client.get(key)
         if data is None:
             return NO_VALUE
         value, _ = _unpack_value(data)
         return value
 
-    async def get_with_metadata(self, key: str) -> tuple[Any, float | None]:
-        """Get value and creation timestamp. Returns (NO_VALUE, None) if not found.
+    async def aget_with_metadata(self, key: str) -> tuple[Any, float | None]:
+        """Async get value and creation timestamp. Returns (NO_VALUE, None) if not found.
         """
-        client = await self._get_client()
+        client = self._get_async_client()
         data = await client.get(key)
         if data is None:
             return NO_VALUE, None
         value, created_at = _unpack_value(data)
         return value, created_at
 
-    async def set(self, key: str, value: Any, ttl: int) -> None:
-        """Set value with TTL in seconds.
+    async def aset(self, key: str, value: Any, ttl: int) -> None:
+        """Async set value with TTL in seconds.
         """
-        client = await self._get_client()
+        client = self._get_async_client()
         now = time.time()
         packed = _pack_value(value, now)
         await client.setex(key, ttl, packed)
 
-    async def delete(self, key: str) -> None:
-        """Delete value by key.
+    async def adelete(self, key: str) -> None:
+        """Async delete value by key.
         """
-        client = await self._get_client()
+        client = self._get_async_client()
         await client.delete(key)
 
-    async def clear(self, pattern: str | None = None) -> int:
-        """Clear entries matching pattern. Returns count of cleared entries.
+    async def aclear(self, pattern: str | None = None) -> int:
+        """Async clear entries matching pattern. Returns count of cleared entries.
         """
-        client = await self._get_client()
+        client = self._get_async_client()
         if pattern is None:
             pattern = '*'
 
@@ -218,25 +205,59 @@ class AsyncRedisBackend(AsyncBackend):
             count += 1
         return count
 
-    async def keys(self, pattern: str | None = None) -> AsyncIterator[str]:
-        """Iterate over keys matching pattern.
+    async def akeys(self, pattern: str | None = None) -> AsyncIterator[str]:
+        """Async iterate over keys matching pattern.
         """
-        client = await self._get_client()
+        client = self._get_async_client()
         redis_pattern = pattern or '*'
         async for key in client.scan_iter(match=redis_pattern):
             yield key.decode() if isinstance(key, bytes) else key
 
-    async def count(self, pattern: str | None = None) -> int:
-        """Count keys matching pattern.
+    async def acount(self, pattern: str | None = None) -> int:
+        """Async count keys matching pattern.
         """
         count = 0
-        async for _ in self.keys(pattern):
+        async for _ in self.akeys(pattern):
             count += 1
         return count
 
-    async def close(self) -> None:
-        """Close the Redis connection.
+    def get_async_mutex(self, key: str) -> AsyncCacheMutex:
+        """Get an async mutex for dogpile prevention on the given key.
+        """
+        return AsyncRedisMutex(self._get_async_client(), f'lock:{key}', self._lock_timeout)
+
+    # ===== Lifecycle =====
+
+    def _close_sync_client(self) -> None:
+        """Close sync client if open.
+        """
+        if self._sync_client is not None:
+            client = self._sync_client
+            self._sync_client = None
+            client.close()
+
+    def _close_async_client_sync(self) -> None:
+        """Forcefully close async client from sync context.
+        """
+        if self._async_client is not None:
+            client = self._async_client
+            self._async_client = None
+            try:
+                client.close()
+            except Exception:
+                pass
+
+    def close(self) -> None:
+        """Close all backend resources from sync context.
+        """
+        self._close_sync_client()
+        self._close_async_client_sync()
+
+    async def aclose(self) -> None:
+        """Close all backend resources from async context.
         """
-        if self._client is not None:
-            await self._client.close()
-            self._client = None
+        if self._async_client is not None:
+            client = self._async_client
+            self._async_client = None
+            await client.aclose()
+        self._close_sync_client()