Merge branch 'develop' into get-all-mod

frappe/utils/redis_wrapper.py

@@ -4,11 +4,26 @@ import pickle
 import re
 
 import redis
+from redis.commands.search import Search
 
 import frappe
 from frappe.utils import cstr
 
 
+class RedisearchWrapper(Search):
+	def sugadd(self, key, *suggestions, **kwargs):
+		return super().sugadd(self.client.make_key(key), *suggestions, **kwargs)
+
+	def suglen(self, key):
+		return super().suglen(self.client.make_key(key))
+
+	def sugdel(self, key, string):
+		return super().sugdel(self.client.make_key(key), string)
+
+	def sugget(self, key, *args, **kwargs):
+		return super().sugget(self.client.make_key(key), *args, **kwargs)
+
+
 class RedisWrapper(redis.Redis):
 	"""Redis client that will automatically prefix conf.db_name"""
 
@@ -148,7 +163,16 @@ class RedisWrapper(redis.Redis):
 	def ltrim(self, key, start, stop):
 		return super().ltrim(self.make_key(key), start, stop)
 
-	def hset(self, name: str, key: str, value, shared: bool = False, cache_locally: bool = True):
+	def hset(
+		self,
+		name: str,
+		key: str,
+		value,
+		shared: bool = False,
+		cache_locally: bool = True,
+		*args,
+		**kwargs,
+	):
 		if key is None:
 			return
 
@@ -160,7 +184,7 @@ class RedisWrapper(redis.Redis):
 
 		# set in redis
 		try:
-			super().hset(_name, key, pickle.dumps(value))
+			super().hset(_name, key, pickle.dumps(value), *args, **kwargs)
 		except redis.exceptions.ConnectionError:
 			pass
 
@@ -248,3 +272,6 @@ class RedisWrapper(redis.Redis):
 	def smembers(self, name):
 		"""Return all members of the set"""
 		return super().smembers(self.make_key(name))
+
+	def ft(self, index_name="idx"):
+		return RedisearchWrapper(client=self, index_name=self.make_key(index_name))

pyproject.toml

@@ -54,7 +54,7 @@ dependencies = [
     "python-dateutil~=2.8.1",
     "pytz==2022.1",
     "rauth~=0.7.3",
-    "redis~=3.5.3",
+    "redis~=4.3.4",
     "hiredis~=2.0.0",
     "requests-oauthlib~=1.3.0",
     "requests~=2.27.1",