Hydrate multiple values in one call

Author: technige

neo4j/v1/api.py

@@ -33,8 +33,9 @@
 
 class ValueSystem(object):
 
-    def hydrate(self, obj):
-        pass
+    def hydrate(self, values):
+        """ Hydrate values from raw representations into client objects.
+        """
 
 
 class GraphDatabase(object):
@@ -358,12 +359,12 @@ def records(self):
         records = self._records
         while records:
             values = records.popleft()
-            yield zipper(keys, tuple(map(hydrate, values)))
+            yield zipper(keys, hydrate(values))
         while self.online():
             self.fetch()
             while records:
                 values = records.popleft()
-                yield zipper(keys, tuple(map(hydrate, values)))
+                yield zipper(keys, hydrate(values))
 
     def summary(self):
         """ Return the summary, buffering any remaining records.
@@ -399,12 +400,12 @@ def peek(self):
         records = self._records
         if records:
             values = records[0]
-            return zipper(keys, tuple(map(hydrate, values)))
+            return zipper(keys, hydrate(values))
         while not records and self.online():
             self.fetch()
             if records:
                 values = records[0]
-                return zipper(keys, tuple(map(hydrate, values)))
+                return zipper(keys, hydrate(values))
         return None
 
 

neo4j/v1/types.py

@@ -308,29 +308,30 @@ def end(self):
 
 class PackStreamValueSystem(ValueSystem):
 
-    def hydrate(self, obj):
-        """ Hydrate an object or a collection of nested objects by replacing
-        structures with entity instances.
-        """
-        if isinstance(obj, Structure):
-            signature, args = obj
-            if signature == b"N":
-                return Node.hydrate(*map(self.hydrate, args))
-            elif signature == b"R":
-                return Relationship.hydrate(*map(self.hydrate, args))
-            elif signature == b"r":
-                return UnboundRelationship.hydrate(*map(self.hydrate, args))
-            elif signature == b"P":
-                return Path.hydrate(*map(self.hydrate, args))
+    def hydrate(self, values):
+
+        def hydrate_(obj):
+            if isinstance(obj, Structure):
+                signature, args = obj
+                if signature == b"N":
+                    return Node.hydrate(*map(hydrate_, args))
+                elif signature == b"R":
+                    return Relationship.hydrate(*map(hydrate_, args))
+                elif signature == b"r":
+                    return UnboundRelationship.hydrate(*map(hydrate_, args))
+                elif signature == b"P":
+                    return Path.hydrate(*map(hydrate_, args))
+                else:
+                    # If we don't recognise the structure type, just return it as-is
+                    return obj
+            elif isinstance(obj, list):
+                return list(map(hydrate_, obj))
+            elif isinstance(obj, dict):
+                return {key: hydrate_(value) for key, value in obj.items()}
             else:
-                # If we don't recognise the structure type, just return it as-is
                 return obj
-        elif isinstance(obj, list):
-            return list(map(self.hydrate, obj))
-        elif isinstance(obj, dict):
-            return {key: self.hydrate(value) for key, value in obj.items()}
-        else:
-            return obj
+
+        return tuple(map(hydrate_, values))
 
 
 GraphDatabase.value_systems["packstream"] = PackStreamValueSystem()