fix(_redis.py): allow all supported arguments for redis cluster

[Kakadus]

Title

Support password protected redis clusters

Relevant issues

Fixes #5552

Type

🐛 Bug Fix

Changes

• use cleanup_kwargs instead of custom kwarg filtering

[REQUIRED] Testing - Attach a screenshot of any new tests passing local

If UI changes, send a screenshot/GIF of working UI fixes

• adapted local test to include a password for redis cluster

[vercel]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
litellm	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 6, 2024 5:20am

[ishaan-jaff]

hi @Kakadus - I tried this and it failed for me locally - I was seeing this

_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

env_overrides = {'connection_pool': BlockingConnectionPool<Connection<host=localhost,port=6379,db=0>>}, redis_kwargs = {'connection_pool': BlockingConnectionPool<Connection<host=localhost,port=6379,db=0>>}
ClusterNode = <class 'redis.cluster.ClusterNode'>, cleanup_kwargs = <function cleanup_kwargs at 0x127e78a60>, cluster_kwargs = {'connection_pool': BlockingConnectionPool<Connection<host=localhost,port=6379,db=0>>}

    def get_redis_async_client(**env_overrides):
        redis_kwargs = _get_redis_client_logic(**env_overrides)
        if "url" in redis_kwargs and redis_kwargs["url"] is not None:
            args = _get_redis_url_kwargs(client=async_redis.Redis.from_url)
            url_kwargs = {}
            for arg in redis_kwargs:
                if arg in args:
                    url_kwargs[arg] = redis_kwargs[arg]
                else:
                    litellm.print_verbose(
                        "REDIS: ignoring argument: {}. Not an allowed async_redis.Redis.from_url arg.".format(
                            arg
                        )
                    )
            return async_redis.Redis.from_url(**url_kwargs)

        if "startup_nodes" in redis_kwargs:
            from redis.cluster import ClusterNode, cleanup_kwargs

            cluster_kwargs = cleanup_kwargs(**redis_kwargs)
            print("cluster_kwargs: ", cluster_kwargs)

            new_startup_nodes: List[ClusterNode] = []

            for item in redis_kwargs["startup_nodes"]:
                new_startup_nodes.append(ClusterNode(**item))
            redis_kwargs.pop("startup_nodes")
>           return async_redis.RedisCluster(
                startup_nodes=new_startup_nodes, **cluster_kwargs
            )
E           TypeError: RedisCluster.__init__() got an unexpected keyword argument 'connection_pool'

../_redis.py:206: TypeError
------------------------------------------------------------------------------------------------------------------ Captured log call ------------------------------------------------------------------------------------------------------------------
ERROR    asyncio:base_events.py:1729 Task exception was never retrieved
future: <Task finished name='Task-2' coro=<RedisCache.ping() done, defined at /Users/ishaanjaffer/Github/litellm/litellm/caching.py:852> exception=TypeError("RedisCluster.__init__() got an unexpected keyword argument 'connection_pool'")>
Traceback (most recent call last):
  File "/Users/ishaanjaffer/Github/litellm/litellm/caching.py", line 853, in ping
    _redis_client = self.init_async_client()
  File "/Users/ishaanjaffer/Github/litellm/litellm/caching.py", line 280, in init_async_client
    return get_redis_async_client(
  File "/Users/ishaanjaffer/Github/litellm/litellm/_redis.py", line 206, in get_redis_async_client
    return async_redis.RedisCluster(
TypeError: RedisCluster.__init__() got an unexpected keyword argument 'connection_pool'
==========================================================================================

[ishaan-jaff]

support for setting password is done here @Kakadus 9a9c0e4

[Kakadus]

I'm wondering why redis did not filter connection_pool... Thanks for fixing this so fast yourself!

[ishaan-jaff]

Hi @Kakadus , curious do you use LiteLLM today ? If so, I'd love to hop on a call and learn how we can improve LiteLLM for you and solve any pending issues

• my cal for your convenience: https://calendly.com/d/4mp-gd3-k5k/litellm-1-1-onboarding-chat
• my linkedin if you prefer DMs: https://www.linkedin.com/in/reffajnaahsi/