Updated callbacks to include required arguments

Author: vladvildanov

redis/_parsers/helpers.py

@@ -3,7 +3,7 @@
 from redis.utils import str_if_bytes
 
 
-def timestamp_to_datetime(response):
+def timestamp_to_datetime(response, **options):
     "Converts a unix timestamp to a Python datetime object"
     if not response:
         return None
@@ -14,7 +14,7 @@ def timestamp_to_datetime(response):
     return datetime.datetime.fromtimestamp(response)
 
 
-def parse_debug_object(response):
+def parse_debug_object(response, **options):
     "Parse the results of Redis's DEBUG OBJECT command into a Python dict"
     # The 'type' of the object is the first item in the response, but isn't
     # prefixed with a name
@@ -32,7 +32,7 @@ def parse_debug_object(response):
     return response
 
 
-def parse_info(response):
+def parse_info(response, **options):
     """Parse the result of Redis's INFO command into a Python dict"""
     info = {}
     response = str_if_bytes(response)
@@ -121,7 +121,7 @@ def parse_memory_stats(response, **kwargs):
 }
 
 
-def parse_sentinel_state(item):
+def parse_sentinel_state(item, **options):
     result = pairs_to_dict_typed(item, SENTINEL_STATE_TYPES)
     flags = set(result["flags"].split(","))
     for name, flag in (
@@ -137,11 +137,11 @@ def parse_sentinel_state(item):
     return result
 
 
-def parse_sentinel_master(response):
+def parse_sentinel_master(response, **options):
     return parse_sentinel_state(map(str_if_bytes, response))
 
 
-def parse_sentinel_state_resp3(response):
+def parse_sentinel_state_resp3(response, **options):
     result = {}
     for key in response:
         try:
@@ -154,27 +154,27 @@ def parse_sentinel_state_resp3(response):
     return result
 
 
-def parse_sentinel_masters(response):
+def parse_sentinel_masters(response, **options):
     result = {}
     for item in response:
         state = parse_sentinel_state(map(str_if_bytes, item))
         result[state["name"]] = state
     return result
 
 
-def parse_sentinel_masters_resp3(response):
+def parse_sentinel_masters_resp3(response, **options):
     return [parse_sentinel_state(master) for master in response]
 
 
-def parse_sentinel_slaves_and_sentinels(response):
+def parse_sentinel_slaves_and_sentinels(response, **options):
     return [parse_sentinel_state(map(str_if_bytes, item)) for item in response]
 
 
-def parse_sentinel_slaves_and_sentinels_resp3(response):
+def parse_sentinel_slaves_and_sentinels_resp3(response, **options):
     return [parse_sentinel_state_resp3(item) for item in response]
 
 
-def parse_sentinel_get_master(response):
+def parse_sentinel_get_master(response, **options):
     return response and (response[0], int(response[1])) or None
 
 
@@ -235,7 +235,7 @@ def sort_return_tuples(response, **options):
     return list(zip(*[response[i::n] for i in range(n)]))
 
 
-def parse_stream_list(response):
+def parse_stream_list(response, **options):
     if response is None:
         return None
     data = []
@@ -247,11 +247,11 @@ def parse_stream_list(response):
     return data
 
 
-def pairs_to_dict_with_str_keys(response):
+def pairs_to_dict_with_str_keys(response, **options):
     return pairs_to_dict(response, decode_keys=True)
 
 
-def parse_list_of_dicts(response):
+def parse_list_of_dicts(response, **options):
     return list(map(pairs_to_dict_with_str_keys, response))
 
 
@@ -299,13 +299,13 @@ def parse_xinfo_stream(response, **options):
     return data
 
 
-def parse_xread(response):
+def parse_xread(response, **options):
     if response is None:
         return []
     return [[r[0], parse_stream_list(r[1])] for r in response]
 
 
-def parse_xread_resp3(response):
+def parse_xread_resp3(response, **options):
     if response is None:
         return {}
     return {key: [parse_stream_list(value)] for key, value in response.items()}
@@ -323,12 +323,12 @@ def parse_xpending(response, **options):
     }
 
 
-def parse_xpending_range(response):
+def parse_xpending_range(response, **options):
     k = ("message_id", "consumer", "time_since_delivered", "times_delivered")
     return [dict(zip(k, r)) for r in response]
 
 
-def float_or_none(response):
+def float_or_none(response, **options):
     if response is None:
         return None
     return float(response)

redis/client.py

@@ -144,11 +144,15 @@ class initializer. In the case of conflicting arguments, querystring
         """
         single_connection_client = kwargs.pop("single_connection_client", False)
         use_cache = kwargs.pop("use_cache", False)
+        cache_ttl = kwargs.pop("cache_ttl", 300)
+        cache_size = kwargs.pop("cache_size", 128)
         connection_pool = ConnectionPool.from_url(url, **kwargs)
         client = cls(
             connection_pool=connection_pool,
             single_connection_client=single_connection_client,
-            use_cache=use_cache
+            use_cache=use_cache,
+            cache_ttl=cache_ttl,
+            cache_size=cache_size
         )
         client.auto_close_connection_pool = True
         return client

redis/commands/timeseries/utils.py

@@ -10,22 +10,22 @@ def parse_range(response, **kwargs):
     return [tuple((r[0], float(r[1]))) for r in response]
 
 
-def parse_m_range(response):
+def parse_m_range(response, **options):
     """Parse multi range response. Used by TS.MRANGE and TS.MREVRANGE."""
     res = []
     for item in response:
         res.append({nativestr(item[0]): [list_to_dict(item[1]), parse_range(item[2])]})
     return sorted(res, key=lambda d: list(d.keys()))
 
 
-def parse_get(response):
+def parse_get(response, **options):
     """Parse get response. Used by TS.GET."""
     if not response:
         return None
     return int(response[0]), float(response[1])
 
 
-def parse_m_get(response):
+def parse_m_get(response, **options):
     """Parse multi get response. Used by TS.MGET."""
     res = []
     for item in response: