Merge branch 'master' into ps_flaky_tests_fixes_round_2

Author: petyaslavova

docs/advanced_features.rst

@@ -384,13 +384,13 @@ run_in_thread.
 
 A PubSub object adheres to the same encoding semantics as the client
 instance it was created from. Any channel or pattern that's unicode will
-be encoded using the charset specified on the client before being sent
+be encoded using the encoding specified on the client before being sent
 to Redis. If the client's decode_responses flag is set the False (the
 default), the 'channel', 'pattern' and 'data' values in message
 dictionaries will be byte strings (str on Python 2, bytes on Python 3).
 If the client's decode_responses is True, then the 'channel', 'pattern'
 and 'data' values will be automatically decoded to unicode strings using
-the client's charset.
+the client's encoding.
 
 PubSub objects remember what channels and patterns they are subscribed
 to. In the event of a disconnection such as a network error or timeout,

doctests/home_json.py

@@ -10,7 +10,7 @@
 import redis.commands.search.aggregation as aggregations
 import redis.commands.search.reducers as reducers
 from redis.commands.search.field import TextField, NumericField, TagField
-from redis.commands.search.indexDefinition import IndexDefinition, IndexType
+from redis.commands.search.index_definition import IndexDefinition, IndexType
 from redis.commands.search.query import Query
 import redis.exceptions
 # STEP_END
@@ -25,7 +25,12 @@
 except redis.exceptions.ResponseError:
     pass
 
-r.delete("user:1", "user:2", "user:3")
+try:
+    r.ft("hash-idx:users").dropindex(True)
+except redis.exceptions.ResponseError:
+    pass
+
+r.delete("user:1", "user:2", "user:3", "huser:1", "huser:2", "huser:3")
 # REMOVE_END
 # STEP_START create_data
 user1 = {
@@ -134,4 +139,50 @@
 )
 # REMOVE_END
 
+# STEP_START make_hash_index
+hashSchema = (
+    TextField("name"),
+    TagField("city"),
+    NumericField("age")
+)
+
+hashIndexCreated = r.ft("hash-idx:users").create_index(
+    hashSchema,
+    definition=IndexDefinition(
+        prefix=["huser:"], index_type=IndexType.HASH
+    )
+)
+# STEP_END
+# REMOVE_START
+assert hashIndexCreated
+# REMOVE_END
+
+# STEP_START add_hash_data
+huser1Set = r.hset("huser:1", mapping=user1)
+huser2Set = r.hset("huser:2", mapping=user2)
+huser3Set = r.hset("huser:3", mapping=user3)
+# STEP_END
+# REMOVE_START
+assert huser1Set
+assert huser2Set
+assert huser3Set
+# REMOVE_END
+
+# STEP_START query1_hash
+findPaulHashResult = r.ft("hash-idx:users").search(
+    Query("Paul @age:[30 40]")
+)
+
+print(findPaulHashResult)
+# >>> Result{1 total, docs: [Document {'id': 'huser:3',
+# >>>   'payload': None, 'name': 'Paul Zamir', ...
+# STEP_END
+# REMOVE_START
+assert str(findPaulHashResult) == (
+    "Result{1 total, docs: [Document " +
+    "{'id': 'huser:3', 'payload': None, 'name': 'Paul Zamir', " +
+    "'email': '[email protected]', 'age': '35', 'city': 'Tel Aviv'}]}"
+)
+# REMOVE_END
+
 r.close()

doctests/query_agg.py

@@ -6,7 +6,7 @@
 from redis.commands.search import Search
 from redis.commands.search.aggregation import AggregateRequest
 from redis.commands.search.field import NumericField, TagField
-from redis.commands.search.indexDefinition import IndexDefinition, IndexType
+from redis.commands.search.index_definition import IndexDefinition, IndexType
 import redis.commands.search.reducers as reducers
 
 r = redis.Redis(decode_responses=True)

doctests/query_combined.py

@@ -6,7 +6,7 @@
 import warnings
 from redis.commands.json.path import Path
 from redis.commands.search.field import NumericField, TagField, TextField, VectorField
-from redis.commands.search.indexDefinition import IndexDefinition, IndexType
+from redis.commands.search.index_definition import IndexDefinition, IndexType
 from redis.commands.search.query import Query
 from sentence_transformers import  SentenceTransformer
 

doctests/query_em.py

@@ -4,7 +4,7 @@
 import redis
 from redis.commands.json.path import Path
 from redis.commands.search.field import TextField, NumericField, TagField
-from redis.commands.search.indexDefinition import IndexDefinition, IndexType
+from redis.commands.search.index_definition import IndexDefinition, IndexType
 from redis.commands.search.query import NumericFilter, Query
 
 r = redis.Redis(decode_responses=True)

doctests/query_ft.py

@@ -5,7 +5,7 @@
 import redis
 from redis.commands.json.path import Path
 from redis.commands.search.field import TextField, NumericField, TagField
-from redis.commands.search.indexDefinition import IndexDefinition, IndexType
+from redis.commands.search.index_definition import IndexDefinition, IndexType
 from redis.commands.search.query import NumericFilter, Query
 
 r = redis.Redis(decode_responses=True)

doctests/query_geo.py

@@ -5,7 +5,7 @@
 import redis
 from redis.commands.json.path import Path
 from redis.commands.search.field import GeoField, GeoShapeField
-from redis.commands.search.indexDefinition import IndexDefinition, IndexType
+from redis.commands.search.index_definition import IndexDefinition, IndexType
 from redis.commands.search.query import Query
 
 r = redis.Redis(decode_responses=True)

doctests/query_range.py

@@ -5,7 +5,7 @@
 import redis
 from redis.commands.json.path import Path
 from redis.commands.search.field import TextField, NumericField, TagField
-from redis.commands.search.indexDefinition import IndexDefinition, IndexType
+from redis.commands.search.index_definition import IndexDefinition, IndexType
 from redis.commands.search.query import NumericFilter, Query
 
 r = redis.Redis(decode_responses=True)

doctests/search_quickstart.py

@@ -10,7 +10,7 @@
 import redis.commands.search.reducers as reducers
 from redis.commands.json.path import Path
 from redis.commands.search.field import NumericField, TagField, TextField
-from redis.commands.search.indexDefinition import IndexDefinition, IndexType
+from redis.commands.search.index_definition import IndexDefinition, IndexType
 from redis.commands.search.query import Query
 
 # HIDE_END

doctests/search_vss.py

@@ -20,7 +20,7 @@
     TextField,
     VectorField,
 )
-from redis.commands.search.indexDefinition import IndexDefinition, IndexType
+from redis.commands.search.index_definition import IndexDefinition, IndexType
 from redis.commands.search.query import Query
 from sentence_transformers import SentenceTransformer
 

redis/client.py

@@ -2,7 +2,6 @@
 import re
 import threading
 import time
-import warnings
 from itertools import chain
 from typing import (
     TYPE_CHECKING,
@@ -203,8 +202,6 @@ def __init__(
         unix_socket_path: Optional[str] = None,
         encoding: str = "utf-8",
         encoding_errors: str = "strict",
-        charset: Optional[str] = None,
-        errors: Optional[str] = None,
         decode_responses: bool = False,
         retry_on_timeout: bool = False,
         retry_on_error: Optional[List[Type[Exception]]] = None,
@@ -256,20 +253,6 @@ def __init__(
         else:
             self._event_dispatcher = event_dispatcher
         if not connection_pool:
-            if charset is not None:
-                warnings.warn(
-                    DeprecationWarning(
-                        '"charset" is deprecated. Use "encoding" instead'
-                    )
-                )
-                encoding = charset
-            if errors is not None:
-                warnings.warn(
-                    DeprecationWarning(
-                        '"errors" is deprecated. Use "encoding_errors" instead'
-                    )
-                )
-                encoding_errors = errors
             if not retry_on_error:
                 retry_on_error = []
             if retry_on_timeout is True:

redis/cluster.py

@@ -142,7 +142,6 @@ def parse_cluster_myshardid(resp, **options):
 SLOT_ID = "slot-id"
 
 REDIS_ALLOWED_KEYS = (
-    "charset",
     "connection_class",
     "connection_pool",
     "connection_pool_class",
@@ -152,7 +151,6 @@ def parse_cluster_myshardid(resp, **options):
     "decode_responses",
     "encoding",
     "encoding_errors",
-    "errors",
     "host",
     "lib_name",
     "lib_version",

redis/commands/search/commands.py

@@ -23,7 +23,6 @@
 SEARCH_CMD = "FT.SEARCH"
 ADD_CMD = "FT.ADD"
 ADDHASH_CMD = "FT.ADDHASH"
-DROP_CMD = "FT.DROP"
 DROPINDEX_CMD = "FT.DROPINDEX"
 EXPLAIN_CMD = "FT.EXPLAIN"
 EXPLAINCLI_CMD = "FT.EXPLAINCLI"
@@ -35,7 +34,6 @@
 DICT_ADD_CMD = "FT.DICTADD"
 DICT_DEL_CMD = "FT.DICTDEL"
 DICT_DUMP_CMD = "FT.DICTDUMP"
-GET_CMD = "FT.GET"
 MGET_CMD = "FT.MGET"
 CONFIG_CMD = "FT.CONFIG"
 TAGVALS_CMD = "FT.TAGVALS"
@@ -406,6 +404,7 @@ def add_document_hash(self, doc_id, score=1.0, language=None, replace=False):
             doc_id, conn=None, score=score, language=language, replace=replace
         )
 
+    @deprecated_function(version="2.0.0", reason="deprecated since redisearch 2.0")
     def delete_document(self, doc_id, conn=None, delete_actual_document=False):
         """
         Delete a document from index
@@ -440,6 +439,7 @@ def load_document(self, id):
 
         return Document(id=id, **fields)
 
+    @deprecated_function(version="2.0.0", reason="deprecated since redisearch 2.0")
     def get(self, *ids):
         """
         Returns the full contents of multiple documents.