Skip to content
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.

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

fix: Use an async client for Redis cache #4231

Merged
merged 2 commits into from
Oct 21, 2024
Merged
Changes from all commits
Commits
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
32 changes: 11 additions & 21 deletions src/backend/base/langflow/services/cache/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def __init__(self, host="localhost", port=6379, db=0, url=None, expiration_time=
cached item expires. Default is 1 hour.
"""
try:
import redis
from redis.asyncio import StrictRedis
except ImportError as exc:
msg = (
"RedisCache requires the redis-py package."
Expand All @@ -209,9 +209,9 @@ def __init__(self, host="localhost", port=6379, db=0, url=None, expiration_time=
" Please report any issues to our GitHub repository."
)
if url:
self._client = redis.StrictRedis.from_url(url)
self._client = StrictRedis.from_url(url)
else:
self._client = redis.StrictRedis(host=host, port=port, db=db)
self._client = StrictRedis(host=host, port=port, db=db)
self.expiration_time = expiration_time

# check connection
Expand All @@ -220,7 +220,7 @@ def is_connected(self):
import redis

try:
self._client.ping()
asyncio.run(self._client.ping())
except redis.exceptions.ConnectionError:
logger.exception("RedisCache could not connect to the Redis server")
return False
Expand All @@ -230,14 +230,14 @@ def is_connected(self):
async def get(self, key, lock=None):
if key is None:
return None
value = self._client.get(str(key))
value = await self._client.get(str(key))
return pickle.loads(value) if value else None

@override
async def set(self, key, value, lock=None):
try:
if pickled := pickle.dumps(value):
result = self._client.setex(str(key), self.expiration_time, pickled)
result = await self._client.setex(str(key), self.expiration_time, pickled)
if not result:
msg = "RedisCache could not set the value."
raise ValueError(msg)
Expand Down Expand Up @@ -267,28 +267,18 @@ async def upsert(self, key, value, lock=None):

@override
async def delete(self, key, lock=None):
self._client.delete(key)
await self._client.delete(key)

@override
async def clear(self, lock=None):
"""Clear all items from the cache."""
self._client.flushdb()
await self._client.flushdb()

def __contains__(self, key):
"""Check if the key is in the cache."""
return False if key is None else self._client.exists(str(key))

async def __getitem__(self, key):
"""Retrieve an item from the cache using the square bracket notation."""
return self.get(key)

async def __setitem__(self, key, value):
"""Add an item to the cache using the square bracket notation."""
self.set(key, value)

async def __delitem__(self, key):
"""Remove an item from the cache using the square bracket notation."""
self.delete(key)
if key is None:
return False
return asyncio.run(self._client.exists(str(key)))

def __repr__(self):
"""Return a string representation of the RedisCache instance."""
Expand Down
Loading