Expose the statistics data as properties (#2)

Moved the ResultQuery class and exposed the statistics data as properties.
(Those changes in redisgraph-py and redis-graph will work also without the changes in the C code because it will retrieve the data as 0s)

Author: aweyl

redisgraph/client.py

@@ -1,14 +1,16 @@
-import redis
 import random
 import string
-from prettytable import PrettyTable
+
+from query_result import QueryResult
+
 
 def random_string(length=10):
     """
     Returns a random N chracter long string.
     """
     return ''.join(random.choice(string.lowercase) for x in range(length))
 
+
 class Node(object):
     """
     A node within the garph.
@@ -28,6 +30,7 @@ def __str__(self):
             label=self.label,
             properties=','.join(key+':'+str(val) for key, val in self.properties.iteritems()))
 
+
 class Edge(object):
     """
     An edge connecting two nodes.
@@ -56,35 +59,12 @@ def __str__(self):
                 relation=self.relation,
                 dest_alias=self.dest_node.alias)
 
+
 class Graph(object):
     """
     Graph, collection of nodes and edges.
     """
 
-    class QueryResult(object):
-        def __init__(self, result_set, statistics):
-            self.result_set = result_set
-            self.statistics = statistics
-
-        """Prints the data from the query response:
-           1. First row result_set contains the columns names. Thus the first row in PrettyTable
-              will contain the columns.
-           2. The row after that will contain the data returned, or 'No Data returned' if there is none.
-           3. Prints the statistics of the query.
-        """
-        def pretty_print(self):
-            tbl = PrettyTable(self.result_set[0])
-            for row in self.result_set[1:]:
-                tbl.add_row(row)
-
-            if len(self.result_set) == 1:
-                tbl.add_row(['No data returned.'])
-
-            print(str(tbl) + '\n')
-
-            for stat in self.statistics:
-                print(stat)
-
     def __init__(self, name, redis_con):
         """
         Create a new graph.
@@ -137,7 +117,7 @@ def query(self, q):
         data = response[0]
         statistics = response[1]
         result_set = [res.split(',') for res in data]
-        return self.QueryResult(result_set, statistics)
+        return QueryResult(result_set, statistics)
 
     def execution_plan(self, query):
         """

redisgraph/query_result.py

@@ -0,0 +1,72 @@
+from prettytable import PrettyTable
+
+
+class QueryResult(object):
+
+    LABELS_ADDED = 'Labels added'
+    NODES_CREATED = 'Nodes created'
+    PROPERTIES_SET = 'Properties set'
+    RELATIONSHIPS_CREATED = 'Relationships created'
+    INTERNAL_EXECUTION_TIME = 'internal execution time'
+
+    def __init__(self, result_set, statistics):
+        self.result_set = result_set
+        self.statistics = statistics
+        self.parsed_statistics = self._retrieve_data_from_statistics(statistics)
+
+
+    """Prints the data from the query response:
+       1. First row result_set contains the columns names. Thus the first row in PrettyTable
+          will contain the columns.
+       2. The row after that will contain the data returned, or 'No Data returned' if there is none.
+       3. Prints the statistics of the query.
+    """
+    def pretty_print(self):
+        tbl = PrettyTable(self.result_set[0])
+        for row in self.result_set[1:]:
+            tbl.add_row(row)
+
+        if len(self.result_set) == 1:
+            tbl.add_row(['No data returned.'])
+
+        print(str(tbl) + '\n')
+
+        for stat in self.statistics:
+            print(stat)
+
+    def _retrieve_data_from_statistics(self, statistics):
+        return {
+            self.LABELS_ADDED: self._get_value(self.LABELS_ADDED, statistics),
+            self.NODES_CREATED: self._get_value(self.NODES_CREATED, statistics),
+            self.PROPERTIES_SET: self._get_value(self.PROPERTIES_SET, statistics),
+            self.RELATIONSHIPS_CREATED: self._get_value(self.RELATIONSHIPS_CREATED, statistics),
+            self.INTERNAL_EXECUTION_TIME: self._get_value(self.INTERNAL_EXECUTION_TIME, statistics)
+        }
+
+    @staticmethod
+    def _get_value(prop, statistics):
+        for stat in statistics:
+            if prop in stat:
+                return float(stat.split(': ')[1].split(' ')[0])
+
+        return 0
+
+    @property
+    def labels_added(self):
+        return self.parsed_statistics[self.LABELS_ADDED]
+
+    @property
+    def nodes_created(self):
+        return self.parsed_statistics[self.NODES_CREATED]
+
+    @property
+    def properties_set(self):
+        return self.parsed_statistics[self.PROPERTIES_SET]
+
+    @property
+    def relationships_created(self):
+        return self.parsed_statistics[self.RELATIONSHIPS_CREATED]
+
+    @property
+    def run_time_ms(self):
+        return self.parsed_statistics[self.INTERNAL_EXECUTION_TIME]

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 setup(
     name='redisgraph',
-    version='0.4',
+    version='0.5',
 
     description='RedisGraph Python Client',
     url='https://github.com/swilly22/redisgraph-py',