fix: improve cardinality many relationship fetch (#476)

* fix: improve cardinality many relationship fetch

Signed-off-by: Fatih Acar <[email protected]>

Author: fatih-acar

infrahub_sdk/node/relationship.py

@@ -1,11 +1,14 @@
 from __future__ import annotations
 
+from collections import defaultdict
 from collections.abc import Iterable
 from typing import TYPE_CHECKING, Any
 
 from ..exceptions import (
+    Error,
     UninitializedError,
 )
+from ..types import Order
 from .constants import PROPERTIES_FLAG, PROPERTIES_OBJECT
 from .related_node import RelatedNode, RelatedNodeSync
 
@@ -156,8 +159,29 @@ async def fetch(self) -> None:
             self.peers = rm.peers
             self.initialized = True
 
+        ids_per_kind_map = defaultdict(list)
         for peer in self.peers:
-            await peer.fetch()  # type: ignore[misc]
+            if not peer.id or not peer.typename:
+                raise Error("Unable to fetch the peer, id and/or typename are not defined")
+            if peer.typename not in ids_per_kind_map:
+                ids_per_kind_map[peer.typename] = [peer.id]
+            else:
+                ids_per_kind_map[peer.typename].append(peer.id)
+
+        batch = await self.client.create_batch()
+        for kind, ids in ids_per_kind_map.items():
+            batch.add(
+                task=self.client.filters,
+                kind=kind,
+                ids=ids,
+                populate_store=True,
+                branch=self.branch,
+                parallel=True,
+                order=Order(disable=True),
+            )
+
+        async for _ in batch.execute():
+            pass
 
     def add(self, data: str | RelatedNode | dict) -> None:
         """Add a new peer to this relationship."""
@@ -261,8 +285,29 @@ def fetch(self) -> None:
             self.peers = rm.peers
             self.initialized = True
 
+        ids_per_kind_map = defaultdict(list)
         for peer in self.peers:
-            peer.fetch()
+            if not peer.id or not peer.typename:
+                raise Error("Unable to fetch the peer, id and/or typename are not defined")
+            if peer.typename not in ids_per_kind_map:
+                ids_per_kind_map[peer.typename] = [peer.id]
+            else:
+                ids_per_kind_map[peer.typename].append(peer.id)
+
+        batch = self.client.create_batch()
+        for kind, ids in ids_per_kind_map.items():
+            batch.add(
+                task=self.client.filters,
+                kind=kind,
+                ids=ids,
+                populate_store=True,
+                branch=self.branch,
+                parallel=True,
+                order=Order(disable=True),
+            )
+
+        for _ in batch.execute():
+            pass
 
     def add(self, data: str | RelatedNodeSync | dict) -> None:
         """Add a new peer to this relationship."""

tests/unit/sdk/test_node.py

@@ -1883,6 +1883,19 @@ async def test_node_fetch_relationship(
     )
 
     response2 = {
+        "data": {
+            "BuiltinTag": {
+                "count": 1,
+            }
+        }
+    }
+
+    httpx_mock.add_response(
+        method="POST",
+        json=response2,
+    )
+
+    response3 = {
         "data": {
             "BuiltinTag": {
                 "count": 1,
@@ -1895,7 +1908,7 @@ async def test_node_fetch_relationship(
 
     httpx_mock.add_response(
         method="POST",
-        json=response2,
+        json=response3,
         match_headers={"X-Infrahub-Tracker": "query-builtintag-page1"},
     )