Temporary refactor

Author: vladvildanov

redis/cache.py

@@ -1,5 +1,6 @@
 from typing import Callable, TypeVar, Any, NoReturn, List, Union
 from typing import Optional
+from enum import Enum
 
 from cachetools import TTLCache, Cache, LRUCache
 from cachetools.keys import hashkey
@@ -9,6 +10,110 @@
 T = TypeVar('T')
 
 
+class EvictionPolicy(Enum):
+    LRU = "lru"
+    LFU = "lfu"
+    RANDOM = "random"
+
+
+class CacheConfiguration:
+    DEFAULT_EVICTION_POLICY = EvictionPolicy.LRU
+
+    DEFAULT_ALLOW_LIST = [
+        "BITCOUNT",
+        "BITFIELD_RO",
+        "BITPOS",
+        "EXISTS",
+        "GEODIST",
+        "GEOHASH",
+        "GEOPOS",
+        "GEORADIUSBYMEMBER_RO",
+        "GEORADIUS_RO",
+        "GEOSEARCH",
+        "GET",
+        "GETBIT",
+        "GETRANGE",
+        "HEXISTS",
+        "HGET",
+        "HGETALL",
+        "HKEYS",
+        "HLEN",
+        "HMGET",
+        "HSTRLEN",
+        "HVALS",
+        "JSON.ARRINDEX",
+        "JSON.ARRLEN",
+        "JSON.GET",
+        "JSON.MGET",
+        "JSON.OBJKEYS",
+        "JSON.OBJLEN",
+        "JSON.RESP",
+        "JSON.STRLEN",
+        "JSON.TYPE",
+        "LCS",
+        "LINDEX",
+        "LLEN",
+        "LPOS",
+        "LRANGE",
+        "MGET",
+        "SCARD",
+        "SDIFF",
+        "SINTER",
+        "SINTERCARD",
+        "SISMEMBER",
+        "SMEMBERS",
+        "SMISMEMBER",
+        "SORT_RO",
+        "STRLEN",
+        "SUBSTR",
+        "SUNION",
+        "TS.GET",
+        "TS.INFO",
+        "TS.RANGE",
+        "TS.REVRANGE",
+        "TYPE",
+        "XLEN",
+        "XPENDING",
+        "XRANGE",
+        "XREAD",
+        "XREVRANGE",
+        "ZCARD",
+        "ZCOUNT",
+        "ZDIFF",
+        "ZINTER",
+        "ZINTERCARD",
+        "ZLEXCOUNT",
+        "ZMSCORE",
+        "ZRANGE",
+        "ZRANGEBYLEX",
+        "ZRANGEBYSCORE",
+        "ZRANK",
+        "ZREVRANGE",
+        "ZREVRANGEBYLEX",
+        "ZREVRANGEBYSCORE",
+        "ZREVRANK",
+        "ZSCORE",
+        "ZUNION",
+    ]
+
+    def __init__(self, **kwargs):
+        self._max_size = kwargs.get("cache_size", 10000)
+        self._ttl = kwargs.get("cache_ttl", 0)
+        self._eviction_policy = kwargs.get("eviction_policy", self.DEFAULT_EVICTION_POLICY)
+
+    def get_ttl(self) -> int:
+        return self._ttl
+
+    def get_eviction_policy(self) -> EvictionPolicy:
+        return self._eviction_policy
+
+    def is_exceeds_max_size(self, count: int) -> bool:
+        return count > self._max_size
+
+    def is_allowed_to_cache(self, command: str) -> bool:
+        return command in self.DEFAULT_ALLOW_LIST
+
+
 def ensure_string(key):
     if isinstance(key, bytes):
         return key.decode('utf-8')
@@ -118,7 +223,7 @@ def _on_connect(self, conn):
         conn._parser.set_invalidation_push_handler(self._cache_invalidation_process)
 
     def _cache_invalidation_process(
-        self, data: List[Union[str, Optional[List[str]]]]
+            self, data: List[Union[str, Optional[List[str]]]]
     ) -> None:
         """
         Invalidate (delete) all redis commands associated with a specific key.

redis/client.py

@@ -311,6 +311,15 @@ def __init__(
                             "ssl_ciphers": ssl_ciphers,
                         }
                     )
+                if use_cache and protocol in [3, "3"]:
+                    kwargs.update(
+                        {
+                            "use_cache": use_cache,
+                            "cache": cache,
+                            "cache_size": cache_size,
+                            "cache_ttl": cache_ttl,
+                        }
+                    )
             connection_pool = ConnectionPool(**kwargs)
             self.auto_close_connection_pool = True
         else:
@@ -320,7 +329,6 @@ def __init__(
 
         if use_cache and self.connection_pool.get_protocol() not in [3, "3"]:
             raise RedisError("Client caching is only supported with RESP version 3")
-        CacheMixin.__init__(self, use_cache, self.connection_pool, cache, cache_size, cache_ttl)
 
         self.connection = None
         if single_connection_client:
@@ -535,7 +543,7 @@ def _send_command_parse_response(self, conn, command_name, *args, **options):
         """
         Send a command and parse the response
         """
-        conn.send_command(*args)
+        conn.send_command(*args, **options)
         return self.parse_response(conn, command_name, **options)
 
     def _disconnect_raise(self, conn, error):
@@ -553,8 +561,6 @@ def _disconnect_raise(self, conn, error):
 
     # COMMAND EXECUTION AND PROTOCOL PARSING
     def execute_command(self, *args, **options):
-        if self.use_cache:
-            return self.cached_call(self._execute_command, *args, **options)
         return self._execute_command(*args, **options)
 
     def _execute_command(self, *args, **options):