merged master

Author: chayim

.gitignore

@@ -15,3 +15,5 @@ env
 venv
 coverage.xml
 .venv
+*.xml
+.coverage*

redis/commands/helpers.py

@@ -35,9 +35,12 @@ def delist(x):
 
 
 def parse_to_list(response):
-    """Optimistally parse the response to a list.
-    """
+    """Optimistically parse the response to a list."""
     res = []
+
+    if response is None:
+        return res
+
     for item in response:
         try:
             res.append(int(item))
@@ -51,6 +54,40 @@ def parse_to_list(response):
     return res
 
 
+def parse_list_to_dict(response):
+    res = {}
+    for i in range(0, len(response), 2):
+        if isinstance(response[i], list):
+            res['Child iterators'].append(parse_list_to_dict(response[i]))
+        elif isinstance(response[i+1], list):
+            res['Child iterators'] = [parse_list_to_dict(response[i+1])]
+        else:
+            try:
+                res[response[i]] = float(response[i+1])
+            except (TypeError, ValueError):
+                res[response[i]] = response[i+1]
+    return res
+
+
+def parse_to_dict(response):
+    if response is None:
+        return {}
+
+    res = {}
+    for det in response:
+        if isinstance(det[1], list):
+            res[det[0]] = parse_list_to_dict(det[1])
+        else:
+            try:  # try to set the attribute. may be provided without value
+                try:  # try to convert the value to float
+                    res[det[0]] = float(det[1])
+                except (TypeError, ValueError):
+                    res[det[0]] = det[1]
+            except IndexError:
+                pass
+    return res
+
+
 def random_string(length=10):
     """
     Returns a random N character long string.

redis/commands/search/aggregation.py

@@ -345,12 +345,6 @@ def cursor(self, count=0, max_idle=0.0):
         self._cursor = args
         return self
 
-    def _limit_2_args(self, limit):
-        if limit[1]:
-            return ["LIMIT"] + [str(x) for x in limit]
-        else:
-            return []
-
     def build_args(self):
         # @foo:bar ...
         ret = [self._query]

redis/commands/search/commands.py

@@ -7,6 +7,7 @@
 from ._util import to_string
 from .aggregation import AggregateRequest, AggregateResult, Cursor
 from .suggestion import SuggestionParser
+from ..helpers import parse_to_dict
 
 NUMERIC = "NUMERIC"
 
@@ -20,6 +21,7 @@
 EXPLAINCLI_CMD = "FT.EXPLAINCLI"
 DEL_CMD = "FT.DEL"
 AGGREGATE_CMD = "FT.AGGREGATE"
+PROFILE_CMD = "FT.PROFILE"
 CURSOR_CMD = "FT.CURSOR"
 SPELLCHECK_CMD = "FT.SPELLCHECK"
 DICT_ADD_CMD = "FT.DICTADD"
@@ -382,11 +384,11 @@ def explain_cli(self, query):  # noqa
 
     def aggregate(self, query):
         """
-        Issue an aggregation query
+        Issue an aggregation query.
 
         ### Parameters
 
-        **query**: This can be either an `AggeregateRequest`, or a `Cursor`
+        **query**: This can be either an `AggregateRequest`, or a `Cursor`
 
         An `AggregateResult` object is returned. You can access the rows from
         its `rows` property, which will always yield the rows of the result.
@@ -401,6 +403,9 @@ def aggregate(self, query):
             raise ValueError("Bad query", query)
 
         raw = self.execute_command(*cmd)
+        return self._get_AggregateResult(raw, query, has_cursor)
+
+    def _get_AggregateResult(self, raw, query, has_cursor):
         if has_cursor:
             if isinstance(query, Cursor):
                 query.cid = raw[1]
@@ -418,8 +423,48 @@ def aggregate(self, query):
             schema = None
             rows = raw[1:]
 
-        res = AggregateResult(rows, cursor, schema)
-        return res
+        return AggregateResult(rows, cursor, schema)
+
+    def profile(self, query, limited=False):
+        """
+        Performs a search or aggregate command and collects performance
+        information.
+
+        ### Parameters
+
+        **query**: This can be either an `AggregateRequest`, `Query` or
+        string.
+        **limited**: If set to True, removes details of reader iterator.
+
+        """
+        st = time.time()
+        cmd = [PROFILE_CMD, self.index_name, ""]
+        if limited:
+            cmd.append("LIMITED")
+        cmd.append('QUERY')
+
+        if isinstance(query, AggregateRequest):
+            cmd[2] = "AGGREGATE"
+            cmd += query.build_args()
+        elif isinstance(query, Query):
+            cmd[2] = "SEARCH"
+            cmd += query.get_args()
+        else:
+            raise ValueError("Must provide AggregateRequest object or "
+                             "Query object.")
+
+        res = self.execute_command(*cmd)
+
+        if isinstance(query, AggregateRequest):
+            result = self._get_AggregateResult(res[0], query, query._cursor)
+        else:
+            result = Result(res[0],
+                            not query._no_content,
+                            duration=(time.time() - st) * 1000.0,
+                            has_payload=query._with_payloads,
+                            with_scores=query._with_scores,)
+
+        return result, parse_to_dict(res[1])
 
     def spellcheck(self, query, distance=None, include=None, exclude=None):
         """

tasks.py

@@ -47,15 +47,15 @@ def tests(c):
     with and without hiredis.
     """
     print("Starting Redis tests")
-    run("tox -e '{redis,cluster}'-'{plain,hiredis}'")
+    run("tox -e '{standalone,cluster}'-'{plain,hiredis}'")
 
 
 @task
-def redis_tests(c):
+def standalone_tests(c):
     """Run all Redis tests against the current python,
     with and without hiredis."""
     print("Starting Redis tests")
-    run("tox -e redis-'{hiredis}'")
+    run("tox -e standalone-'{hiredis}'")
 
 
 @task

tests/test_commands.py

@@ -3796,14 +3796,15 @@ def test_command_count(self, r):
         assert isinstance(res, int)
         assert res >= 100
 
+    @pytest.mark.onlynoncluster
     @skip_if_server_version_lt('2.8.13')
     def test_command_getkeys(self, r):
         res = r.command_getkeys('MSET', 'a', 'b', 'c', 'd', 'e', 'f')
-        assert res == [b'a', b'c', b'e']
+        assert res == ['a', 'c', 'e']
         res = r.command_getkeys('EVAL', '"not consulted"',
                                 '3', 'key1', 'key2', 'key3',
                                 'arg1', 'arg2', 'arg3', 'argN')
-        assert res == [b'key1', b'key2', b'key3']
+        assert res == ['key1', 'key2', 'key3']
 
     @skip_if_server_version_lt('2.8.13')
     def test_command(self, r):

tests/test_helpers.py

@@ -5,7 +5,8 @@
     nativestr,
     parse_to_list,
     quote_string,
-    random_string
+    random_string,
+    parse_to_dict
 )
 
 
@@ -19,11 +20,34 @@ def test_list_or_args():
 
 
 def test_parse_to_list():
+    assert parse_to_list(None) == []
     r = ["hello", b"my name", "45", "555.55", "is simon!", None]
     assert parse_to_list(r) == \
         ["hello", "my name", 45, 555.55, "is simon!", None]
 
 
+def test_parse_to_dict():
+    assert parse_to_dict(None) == {}
+    r = [['Some number', '1.0345'],
+         ['Some string', 'hello'],
+         ['Child iterators',
+          ['Time', '0.2089', 'Counter', 3, 'Child iterators',
+           ['Type', 'bar', 'Time', '0.0729', 'Counter', 3],
+           ['Type', 'barbar', 'Time', '0.058', 'Counter', 3]]]]
+    assert parse_to_dict(r) == {
+        'Child iterators': {
+            'Child iterators': [
+                {'Counter': 3.0, 'Time': 0.0729, 'Type': 'bar'},
+                {'Counter': 3.0, 'Time': 0.058, 'Type': 'barbar'}
+            ],
+            'Counter': 3.0,
+            'Time': 0.2089
+        },
+        'Some number': 1.0345,
+        'Some string': 'hello'
+    }
+
+
 def test_nativestr():
     assert nativestr('teststr') == 'teststr'
     assert nativestr(b'teststr') == 'teststr'