add some check to make MYPY happy

Author: BeArchiTek

infrahub_sdk/ctl/repository.py

@@ -102,6 +102,8 @@ async def add(
             password=password,
         )
         await credential.save(allow_upsert=True)
+        if not credential.id:
+            raise ValueError("credential.id must be set before building the request")
         input_data["data"]["credential"] = {"id": credential.id}
 
     query = Mutation(

infrahub_sdk/node.py

@@ -1247,16 +1247,23 @@ async def save(
 
         if not isinstance(self._schema, GenericSchemaAPI):
             if "CoreGroup" in self._schema.inherit_from:
+                if self.id is None:
+                    raise UninitializedError("Cannot add related groups before the node has an ID")
                 await self._client.group_context.add_related_groups(
                     ids=[self.id], update_group_context=update_group_context
                 )
             else:
+                if self.id is None:
+                    raise UninitializedError("Cannot add related nodes before the node has an ID")
                 await self._client.group_context.add_related_nodes(
                     ids=[self.id], update_group_context=update_group_context
                 )
         else:
-            await self._client.group_context.add_related_nodes(ids=[self.id], update_group_context=update_group_context)
-
+            if self.id is None:
+                raise UninitializedError("Cannot add related nodes before the node has an ID")
+            await self._client.group_context.add_related_nodes(
+                ids=[self.id], update_group_context=update_group_context
+            )
         self._client.store.set(node=self)
 
     async def generate_query_data(
@@ -1441,7 +1448,7 @@ async def _process_mutation_result(
         self, mutation_name: str, response: dict[str, Any], timeout: int | None = None
     ) -> None:
         object_response: dict[str, Any] = response[mutation_name]["object"]
-        self.id = object_response["id"]
+        self.id = str(object_response["id"])
         self._existing = True
 
         for attr_name in self._attributes:
@@ -1775,10 +1782,19 @@ def save(
 
         if not isinstance(self._schema, GenericSchemaAPI):
             if "CoreGroup" in self._schema.inherit_from:
-                self._client.group_context.add_related_groups(ids=[self.id], update_group_context=update_group_context)
+                if self.id is None:
+                    raise UninitializedError("Cannot add related nodes before the node has an ID")
+                self._client.group_context.add_related_nodes(
+                    ids=[self.id], update_group_context=update_group_context
+                )
+
             else:
+                if self.id is None:
+                    raise UninitializedError("Cannot add related nodes before the node has an ID")
                 self._client.group_context.add_related_nodes(ids=[self.id], update_group_context=update_group_context)
         else:
+            if self.id is None:
+                raise UninitializedError("Cannot add related nodes before the node has an ID")
             self._client.group_context.add_related_nodes(ids=[self.id], update_group_context=update_group_context)
 
         self._client.store.set(node=self)
@@ -1964,7 +1980,7 @@ def _process_mutation_result(
         self, mutation_name: str, response: dict[str, Any], timeout: int | None = None
     ) -> None:
         object_response: dict[str, Any] = response[mutation_name]["object"]
-        self.id = object_response["id"]
+        self.id = str(object_response["id"])
         self._existing = True
 
         for attr_name in self._attributes:

infrahub_sdk/transfer/importer/json.py

@@ -65,7 +65,8 @@ async def import_data(self, import_directory: Path, branch: str) -> None:
             for graphql_data, kind in zip(table.column("graphql_json"), table.column("kind")):
                 node = await InfrahubNode.from_graphql(self.client, branch, ujson.loads(str(graphql_data)))
                 import_nodes_by_kind[str(kind)].append(node)
-                self.all_nodes[node.id] = node
+                if node.id:
+                    self.all_nodes[node.id] = node
 
         schema_batch = await self.client.create_batch()
         for kind in import_nodes_by_kind:
@@ -112,11 +113,11 @@ async def remove_and_store_optional_relationships(self) -> None:
             for relationship_name in self.optional_relationships_schemas_by_node_kind[node_kind].keys():
                 relationship_value = getattr(node, relationship_name)
                 if isinstance(relationship_value, RelationshipManager):
-                    if relationship_value.peer_ids:
+                    if relationship_value.peer_ids and node.id:
                         self.optional_relationships_by_node[node.id][relationship_name] = relationship_value
                         setattr(node, relationship_name, None)
                 elif isinstance(relationship_value, RelatedNode):
-                    if relationship_value.id:
+                    if relationship_value.id and node.id:
                         self.optional_relationships_by_node[node.id][relationship_name] = relationship_value
                         setattr(node, relationship_name, None)
 

poetry.lock

@@ -32,7 +32,8 @@ ujson = "^5"
 Jinja2 = { version = "^3", optional = true }
 numpy = [
     { version = "^1.24.2", optional = true, python = ">=3.9,<3.12" },
-    { version = "^1.26.2", optional = true, python = ">=3.12" },
+    { version = "^1.26.2", optional = true, python = "==3.12" },
+    { version = "^2.2.6", optional = true, python = ">=3.13" },
 ]
 pyarrow = { version = ">=14", optional = true }
 rich = { version = "^13", optional = true }