Fix MANY_OBJ_LIST_DICT

Author: dgarros

infrahub_sdk/spec/object.py

@@ -229,8 +229,6 @@ async def create_node(
                 continue
 
             if key in schema.relationship_names:
-                rel_schema = schema.get_relationship(name=key)
-
                 rel_info = await get_relationship_info(
                     client=client, schema=schema, key=key, value=value, branch=branch
                 )
@@ -291,17 +289,13 @@ async def create_node(
         client.log.info(f"Node: {display_label}")
 
         for rel in remaining_rels:
-            # identify what is the name of the relationship on the other side
-            rel_info = rels_info[rel]
-
-            if rel_schema.identifier is None:
-                raise ValueError("identifier must be defined")
-
             context = {}
+
+            # If there is a peer relationship, we add the node id to the context
+            rel_info = rels_info[rel]
             if rel_info.peer_rel:
                 context[rel_info.peer_rel.name] = node.id
 
-            # TODO need to account for the different format here
             await cls.create_related_nodes(
                 client=client,
                 rel_info=rel_info,
@@ -318,16 +312,18 @@ async def create_related_nodes(
         cls,
         client: InfrahubClient,
         rel_info: RelationshipInfo,
-        data: dict,
+        data: dict | list[dict],
         context: dict | None = None,
         branch: str | None = None,
         default_schema_kind: str | None = None,
     ) -> list[InfrahubNode]:
-        peer_schema = await client.schema.get(kind=rel_info.peer_kind, branch=branch)
-
         nodes: list[InfrahubNode] = []
+        context = context or {}
+
+        if isinstance(data, dict) and rel_info.format == RelationshipDataFormat.ONE_OBJ:
+            peer_kind = data.get("kind") or rel_info.peer_kind
+            peer_schema = await client.schema.get(kind=peer_kind, branch=branch)
 
-        if rel_info.format == RelationshipDataFormat.ONE_OBJ:
             node = await cls.create_node(
                 client=client,
                 schema=peer_schema,
@@ -338,8 +334,10 @@ async def create_related_nodes(
             )
             return [node]
 
-        if rel_info.format == RelationshipDataFormat.MANY_OBJ_DICT_LIST:
-            context = context or {}
+        if isinstance(data, dict) and rel_info.format == RelationshipDataFormat.MANY_OBJ_DICT_LIST:
+            peer_kind = data.get("kind") or rel_info.peer_kind
+            peer_schema = await client.schema.get(kind=peer_kind, branch=branch)
+
             for idx, peer_data in enumerate(data["data"]):
                 context["list_index"] = idx
                 if isinstance(peer_data, dict):
@@ -354,8 +352,13 @@ async def create_related_nodes(
                     nodes.append(node)
             return nodes
 
-        if rel_info.format == RelationshipDataFormat.MANY_OBJ_LIST_DICT:
-            for item in data:
+        if isinstance(data, list) and rel_info.format == RelationshipDataFormat.MANY_OBJ_LIST_DICT:
+            for idx, item in enumerate(data):
+                context["list_index"] = idx
+
+                peer_kind = item.get("kind") or rel_info.peer_kind
+                peer_schema = await client.schema.get(kind=peer_kind, branch=branch)
+
                 node = await cls.create_node(
                     client=client,
                     schema=peer_schema,
@@ -365,6 +368,7 @@ async def create_related_nodes(
                     default_schema_kind=default_schema_kind,
                 )
                 nodes.append(node)
+
             return nodes
 
         raise ValueError(

tests/fixtures/spec_objects/animal_person02.yml

@@ -8,18 +8,32 @@ spec:
       height: 180
       tags:
         data:
-          - name: Dog Lover # New node will be created if it doesn't exist
+          - name: Dog Lover
 
-      animals:  # Relationship of cardinality many that will create/update nodes as needed
-                # The owner of the dog will be automatically inserted as long as their is a bidirectional relationship
-                # between TestingPerson and TestingDog
+      animals:
         kind: TestingDog
         data:
           - name: Max
             weight: 25
             breed: Golden Retriever
             color: "#FFD700"
 
+    - name: Emily Parker
+      height: 165
+      animals:
+        - kind: TestingDog
+          data:
+            name: Max
+            weight: 25
+            breed: Golden Retriever
+            color: "#FFD700"
+        - kind: TestingCat
+          data:
+            name: Whiskers
+            weight: 10
+            breed: Siamese
+            color: "#FFD700"
+
     - name: Mike Johnson
       height: 175
       best_friends: # Relationship of cardinality many that referenced existing nodes based on their HFID

tests/integration/test_spec_object.py

@@ -89,13 +89,13 @@ async def test_load_persons02(self, client: InfrahubClient, branch_name: str, in
         await obj_file.validate_format(client=client, branch=branch_name)
 
         # Check that the nodes are not present in the database before loading the file
-        assert len(await client.all(kind=obj_file.spec.kind, branch=branch_name)) == 3
+        assert len(await client.all(kind=obj_file.spec.kind, branch=branch_name)) == 4
 
         await obj_file.process(client=client, branch=branch_name)
 
         persons = await client.all(kind=obj_file.spec.kind, branch=branch_name)
         person_by_name = {"__".join(person.get_human_friendly_id()): person for person in persons}
-        assert len(persons) == 5
+        assert len(persons) == 6
 
         # Validate that the best_friends relationship is correctly populated
         await person_by_name["Mike Johnson"].best_friends.fetch()
@@ -110,3 +110,8 @@ async def test_load_persons02(self, client: InfrahubClient, branch_name: str, in
         await person_by_name["Mike Johnson"].tags.fetch()
         tags_mike = [tag.hfid for tag in person_by_name["Mike Johnson"].tags.peers]
         assert sorted(tags_mike) == sorted([["Veterinarian"], ["Breeder"]])
+
+        # Validate that animals for Emily Parler have been correctly created
+        await person_by_name["Emily Parker"].animals.fetch()
+        animals_emily = [animal.display_label for animal in person_by_name["Emily Parker"].animals.peers]
+        assert sorted(animals_emily) == sorted(["Max Golden Retriever", "Whiskers Siamese #FFD700"])