Skip to content

Fix: enforce positive memory_max_entries for in-memory cache #9128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mshr-h wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −2
Open

Fix: enforce positive memory_max_entries for in-memory cache #9128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dspy/clients/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def configure_cache(
enable_memory_cache: bool | None = True,
disk_cache_dir: str | None = DISK_CACHE_DIR,
disk_size_limit_bytes: int | None = DISK_CACHE_LIMIT,
memory_max_entries: int | None = 1000000,
memory_max_entries: int = 1000000,
):
"""Configure the cache for DSPy.

Expand Down
4 changes: 3 additions & 1 deletion dspy/clients/cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def __init__(
enable_memory_cache: bool,
disk_cache_dir: str,
disk_size_limit_bytes: int | None = 1024 * 1024 * 10,
memory_max_entries: int | None = 1000000,
memory_max_entries: int = 1000000,
):
"""
Args:
Expand All @@ -43,6 +43,8 @@ def __init__(
self.enable_disk_cache = enable_disk_cache
self.enable_memory_cache = enable_memory_cache
if self.enable_memory_cache:
if memory_max_entries <= 0:
raise ValueError("memory_max_entries must be a positive integer")
self.memory_cache = LRUCache(maxsize=memory_max_entries)
else:
self.memory_cache = {}
Expand Down
10 changes: 10 additions & 0 deletions tests/clients/test_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ def test_initialization(tmp_path):
assert memory_cache.memory_cache.maxsize == 50
assert memory_cache.disk_cache == {}

# Test memory-only cache with invalid memory_max_entries
with pytest.raises(ValueError):
memory_cache = Cache(
enable_disk_cache=False,
enable_memory_cache=True,
disk_cache_dir="",
disk_size_limit_bytes=0,
memory_max_entries=-1,
)

# Test disk-only cache
disk_cache = Cache(
enable_disk_cache=True,
Expand Down