Merge pull request #800 from neo4j-contrib/798-async-iterating-over-n…

…odes-is-not-working

Fix async node iterator

neomodel/async_/match.py

@@ -785,8 +785,11 @@ async def _execute(self, lazy=False):
         # It seems that certain calls are only supposed to be focusing to the first
         # result item returned (?)
         if results and len(results[0]) == 1:
-            return [n[0] for n in results]
-        return results
+            for n in results:
+                yield n[0]
+        else:
+            for result in results:
+                yield result
 
 
 class AsyncBaseSet:
@@ -806,12 +809,15 @@ async def all(self, lazy=False):
         :rtype: list
         """
         ast = await self.query_cls(self).build_ast()
-        return await ast._execute(lazy)
+        results = [
+            node async for node in ast._execute(lazy)
+        ]  # Collect all nodes asynchronously
+        return results
 
     async def __aiter__(self):
         ast = await self.query_cls(self).build_ast()
-        async for i in await ast._execute():
-            yield i
+        async for item in ast._execute():
+            yield item
 
     async def get_len(self):
         ast = await self.query_cls(self).build_ast()
@@ -862,8 +868,8 @@ async def get_item(self, key):
             self.limit = 1
 
             ast = await self.query_cls(self).build_ast()
-            _items = ast._execute()
-            return _items[0]
+            _first_item = [node async for node in ast._execute()][0]
+            return _first_item
 
         return None
 
@@ -911,7 +917,8 @@ async def _get(self, limit=None, lazy=False, **kwargs):
         if limit:
             self.limit = limit
         ast = await self.query_cls(self).build_ast()
-        return await ast._execute(lazy)
+        results = [node async for node in ast._execute(lazy)]
+        return results
 
     async def get(self, lazy=False, **kwargs):
         """

neomodel/sync_/match.py

@@ -781,8 +781,11 @@ def _execute(self, lazy=False):
         # It seems that certain calls are only supposed to be focusing to the first
         # result item returned (?)
         if results and len(results[0]) == 1:
-            return [n[0] for n in results]
-        return results
+            for n in results:
+                yield n[0]
+        else:
+            for result in results:
+                yield result
 
 
 class BaseSet:
@@ -802,12 +805,15 @@ def all(self, lazy=False):
         :rtype: list
         """
         ast = self.query_cls(self).build_ast()
-        return ast._execute(lazy)
+        results = [
+            node for node in ast._execute(lazy)
+        ]  # Collect all nodes asynchronously
+        return results
 
     def __iter__(self):
         ast = self.query_cls(self).build_ast()
-        for i in ast._execute():
-            yield i
+        for item in ast._execute():
+            yield item
 
     def __len__(self):
         ast = self.query_cls(self).build_ast()
@@ -858,8 +864,8 @@ def __getitem__(self, key):
             self.limit = 1
 
             ast = self.query_cls(self).build_ast()
-            _items = ast._execute()
-            return _items[0]
+            _first_item = [node for node in ast._execute()][0]
+            return _first_item
 
         return None
 
@@ -907,7 +913,8 @@ def _get(self, limit=None, lazy=False, **kwargs):
         if limit:
             self.limit = limit
         ast = self.query_cls(self).build_ast()
-        return ast._execute(lazy)
+        results = [node for node in ast._execute(lazy)]
+        return results
 
     def get(self, lazy=False, **kwargs):
         """

test/async_/test_match_api.py

@@ -63,7 +63,7 @@ async def test_filter_exclude_via_labels():
     node_set = AsyncNodeSet(Coffee)
     qb = await AsyncQueryBuilder(node_set).build_ast()
 
-    results = await qb._execute()
+    results = [node async for node in qb._execute()]
 
     assert "(coffee:Coffee)" in qb._ast.match
     assert qb._ast.result_class
@@ -76,7 +76,7 @@ async def test_filter_exclude_via_labels():
     node_set = node_set.filter(price__gt=2).exclude(price__gt=6, name="Java")
     qb = await AsyncQueryBuilder(node_set).build_ast()
 
-    results = await qb._execute()
+    results = [node async for node in qb._execute()]
     assert "(coffee:Coffee)" in qb._ast.match
     assert "NOT" in qb._ast.where[0]
     assert len(results) == 1
@@ -91,15 +91,15 @@ async def test_simple_has_via_label():
 
     ns = AsyncNodeSet(Coffee).has(suppliers=True)
     qb = await AsyncQueryBuilder(ns).build_ast()
-    results = await qb._execute()
+    results = [node async for node in qb._execute()]
     assert "COFFEE SUPPLIERS" in qb._ast.where[0]
     assert len(results) == 1
     assert results[0].name == "Nescafe"
 
     await Coffee(name="nespresso", price=99).save()
     ns = AsyncNodeSet(Coffee).has(suppliers=False)
     qb = await AsyncQueryBuilder(ns).build_ast()
-    results = await qb._execute()
+    results = [node async for node in qb._execute()]
     assert len(results) > 0
     assert "NOT" in qb._ast.where[0]
 
@@ -129,7 +129,7 @@ async def test_simple_traverse_with_filter():
     )
 
     _ast = await qb.build_ast()
-    results = await _ast._execute()
+    results = [node async for node in qb._execute()]
 
     assert qb._ast.lookup
     assert qb._ast.match
@@ -148,7 +148,7 @@ async def test_double_traverse():
     ns = AsyncNodeSet(AsyncNodeSet(source=nescafe).suppliers.match()).coffees.match()
     qb = await AsyncQueryBuilder(ns).build_ast()
 
-    results = await qb._execute()
+    results = [node async for node in qb._execute()]
     assert len(results) == 2
     assert results[0].name == "Decafe"
     assert results[1].name == "Nescafe plus"
@@ -589,3 +589,36 @@ async def test_in_filter_with_array_property():
     assert arabica not in await Species.nodes.filter(
         tags__in=no_match
     ), "Species found by tags with not match tags given"
+
+
+@mark_async_test
+async def test_async_iterator():
+    n = 10
+    if AsyncUtil.is_async_code:
+        for c in await Coffee.nodes:
+            await c.delete()
+
+        for i in range(n):
+            await Coffee(name=f"xxx_{i}", price=i).save()
+
+        nodes = await Coffee.nodes
+        # assert that nodes was created
+        assert isinstance(nodes, list)
+        assert all(isinstance(i, Coffee) for i in nodes)
+        assert len(nodes) == n
+
+        counter = 0
+        async for node in Coffee.nodes:
+            assert isinstance(node, Coffee)
+            counter += 1
+
+        # assert that generator runs loop above
+        assert counter == n
+
+        counter = 0
+        for node in await Coffee.nodes:
+            assert isinstance(node, Coffee)
+            counter += 1
+
+        # assert that generator runs loop above
+        assert counter == n

test/sync_/test_match_api.py

@@ -56,7 +56,7 @@ def test_filter_exclude_via_labels():
     node_set = NodeSet(Coffee)
     qb = QueryBuilder(node_set).build_ast()
 
-    results = qb._execute()
+    results = [node for node in qb._execute()]
 
     assert "(coffee:Coffee)" in qb._ast.match
     assert qb._ast.result_class
@@ -69,7 +69,7 @@ def test_filter_exclude_via_labels():
     node_set = node_set.filter(price__gt=2).exclude(price__gt=6, name="Java")
     qb = QueryBuilder(node_set).build_ast()
 
-    results = qb._execute()
+    results = [node for node in qb._execute()]
     assert "(coffee:Coffee)" in qb._ast.match
     assert "NOT" in qb._ast.where[0]
     assert len(results) == 1
@@ -84,15 +84,15 @@ def test_simple_has_via_label():
 
     ns = NodeSet(Coffee).has(suppliers=True)
     qb = QueryBuilder(ns).build_ast()
-    results = qb._execute()
+    results = [node for node in qb._execute()]
     assert "COFFEE SUPPLIERS" in qb._ast.where[0]
     assert len(results) == 1
     assert results[0].name == "Nescafe"
 
     Coffee(name="nespresso", price=99).save()
     ns = NodeSet(Coffee).has(suppliers=False)
     qb = QueryBuilder(ns).build_ast()
-    results = qb._execute()
+    results = [node for node in qb._execute()]
     assert len(results) > 0
     assert "NOT" in qb._ast.where[0]
 
@@ -120,7 +120,7 @@ def test_simple_traverse_with_filter():
     qb = QueryBuilder(NodeSet(source=nescafe).suppliers.match(since__lt=datetime.now()))
 
     _ast = qb.build_ast()
-    results = _ast._execute()
+    results = [node for node in qb._execute()]
 
     assert qb._ast.lookup
     assert qb._ast.match
@@ -139,7 +139,7 @@ def test_double_traverse():
     ns = NodeSet(NodeSet(source=nescafe).suppliers.match()).coffees.match()
     qb = QueryBuilder(ns).build_ast()
 
-    results = qb._execute()
+    results = [node for node in qb._execute()]
     assert len(results) == 2
     assert results[0].name == "Decafe"
     assert results[1].name == "Nescafe plus"
@@ -578,3 +578,36 @@ def test_in_filter_with_array_property():
     assert arabica not in Species.nodes.filter(
         tags__in=no_match
     ), "Species found by tags with not match tags given"
+
+
+@mark_sync_test
+def test_async_iterator():
+    n = 10
+    if Util.is_async_code:
+        for c in Coffee.nodes:
+            c.delete()
+
+        for i in range(n):
+            Coffee(name=f"xxx_{i}", price=i).save()
+
+        nodes = Coffee.nodes
+        # assert that nodes was created
+        assert isinstance(nodes, list)
+        assert all(isinstance(i, Coffee) for i in nodes)
+        assert len(nodes) == n
+
+        counter = 0
+        for node in Coffee.nodes:
+            assert isinstance(node, Coffee)
+            counter += 1
+
+        # assert that generator runs loop above
+        assert counter == n
+
+        counter = 0
+        for node in Coffee.nodes:
+            assert isinstance(node, Coffee)
+            counter += 1
+
+        # assert that generator runs loop above
+        assert counter == n