Refactor internal store

Author: dgarros

infrahub_sdk/client.py

@@ -840,11 +840,11 @@ async def process_non_batch() -> tuple[list[InfrahubNode], list[InfrahubNode]]:
         if populate_store:
             for node in nodes:
                 if node.id:
-                    self.store.set(key=node.id, node=node)
+                    self.store.set(node=node)
             related_nodes = list(set(related_nodes))
             for node in related_nodes:
                 if node.id:
-                    self.store.set(key=node.id, node=node)
+                    self.store.set(node=node)
         return nodes
 
     def clone(self) -> InfrahubClient:
@@ -1997,11 +1997,11 @@ def process_non_batch() -> tuple[list[InfrahubNodeSync], list[InfrahubNodeSync]]
         if populate_store:
             for node in nodes:
                 if node.id:
-                    self.store.set(key=node.id, node=node)
+                    self.store.set(node=node)
             related_nodes = list(set(related_nodes))
             for node in related_nodes:
                 if node.id:
-                    self.store.set(key=node.id, node=node)
+                    self.store.set(node=node)
         return nodes
 
     @overload

infrahub_sdk/node.py

@@ -6,6 +6,8 @@
 from copy import copy
 from typing import TYPE_CHECKING, Any, Callable, Union, get_args
 
+import shortuuid
+
 from .constants import InfrahubClientMode
 from .exceptions import (
     Error,
@@ -43,6 +45,16 @@
     "calling generate is only supported for CoreArtifactDefinition nodes"
 )
 
+HFID_STR_SEPARATOR = "__"
+
+
+def parse_human_friendly_id(hfid: str) -> tuple[str | None, list[str]]:
+    """Parse a human friendly ID into a kind and an identifier."""
+    hfid_parts = hfid.split(HFID_STR_SEPARATOR)
+    if len(hfid_parts) == 1:
+        return None, hfid_parts
+    return hfid_parts[0], hfid_parts[1:]
+
 
 class Attribute:
     """Represents an attribute of a Node, including its schema, value, and properties."""
@@ -678,6 +690,11 @@ def __init__(self, schema: MainSchemaTypesAPI, branch: str, data: dict | None =
         self._branch = branch
         self._existing: bool = True
 
+        # Generate a unique ID only to be used inside the SDK
+        # The format if this ID is purposely different from the ID used by the API
+        # This is done to avoid confusion and potential conflicts between the IDs
+        self._internal_id = shortuuid.uuid()
+
         self.id = data.get("id", None) if isinstance(data, dict) else None
         self.display_label: str | None = data.get("display_label", None) if isinstance(data, dict) else None
         self.typename: str | None = data.get("__typename", schema.kind) if isinstance(data, dict) else schema.kind
@@ -694,6 +711,9 @@ def __init__(self, schema: MainSchemaTypesAPI, branch: str, data: dict | None =
         self._init_attributes(data)
         self._init_relationships(data)
 
+    def get_branch(self) -> str:
+        return self._branch
+
     def get_path_value(self, path: str) -> Any:
         path_parts = path.split("__")
         return_value = None

infrahub_sdk/protocols_base.py

@@ -144,7 +144,8 @@ class AnyAttributeOptional(Attribute):
 @runtime_checkable
 class CoreNodeBase(Protocol):
     _schema: MainSchemaTypes
-    id: str
+    _internal_id: str
+    id: str  # NOTE this is incorrect, should be str | None
     display_label: str | None
 
     @property
@@ -153,10 +154,14 @@ def hfid(self) -> list[str] | None: ...
     @property
     def hfid_str(self) -> str | None: ...
 
+    def get_human_friendly_id(self) -> list[str] | None: ...
+
     def get_human_friendly_id_as_string(self, include_kind: bool = False) -> str | None: ...
 
     def get_kind(self) -> str: ...
 
+    def get_branch(self) -> str: ...
+
     def is_ip_prefix(self) -> bool: ...
 
     def is_ip_address(self) -> bool: ...