infrahub-server 1.6.2__py3-none-any.whl → 1.7.0__py3-none-any.whl

infrahub_sdk/enums.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class OrderDirection(str, Enum):
+    ASC = "ASC"
+    DESC = "DESC"

infrahub_sdk/graphql/renderers.py

@@ -7,6 +7,8 @@ from typing import Any
 
 from pydantic import BaseModel
 
+from infrahub_sdk.types import Order
+
 from .constants import VARIABLE_TYPE_MAPPING
 
 
@@ -53,6 +55,16 @@ def convert_to_graphql_as_string(value: Any, convert_enum: bool = False) -> str:
     if isinstance(value, list):
         values_as_string = [convert_to_graphql_as_string(value=item, convert_enum=convert_enum) for item in value]
         return "[" + ", ".join(values_as_string) + "]"
+    if isinstance(value, Order):
+        data = value.model_dump(exclude_none=True)
+        return (
+            "{ "
+            + ", ".join(
+                f"{key}: {convert_to_graphql_as_string(value=val, convert_enum=convert_enum)}"
+                for key, val in data.items()
+            )
+            + " }"
+        )
     if isinstance(value, BaseModel):
         data = value.model_dump()
         return (
@@ -63,6 +75,15 @@ def convert_to_graphql_as_string(value: Any, convert_enum: bool = False) -> str:
             )
             + " }"
         )
+    if isinstance(value, dict):
+        return (
+            "{ "
+            + ", ".join(
+                f"{key}: {convert_to_graphql_as_string(value=val, convert_enum=convert_enum)}"
+                for key, val in value.items()
+            )
+            + " }"
+        )
 
     return str(value)
 

infrahub_sdk/graphql/utils.py

@@ -1,5 +1,90 @@
 import ast
 
+from graphql import (
+    FieldNode,
+    FragmentDefinitionNode,
+    FragmentSpreadNode,
+    InlineFragmentNode,
+    OperationDefinitionNode,
+    SelectionNode,
+    SelectionSetNode,
+)
+
+
+def strip_typename_from_selection_set(selection_set: SelectionSetNode | None) -> SelectionSetNode | None:
+    """Recursively strip __typename fields from a SelectionSetNode.
+
+    The __typename meta-field is an introspection field that is not part of the schema's
+    type definitions. When code generation tools like ariadne-codegen try to look up
+    __typename in the schema, they fail because it's a reserved introspection field.
+
+    This function removes all __typename fields from the selection set, allowing
+    code generation to proceed without errors.
+    """
+    if selection_set is None:
+        return None
+
+    new_selections: list[SelectionNode] = []
+    for selection in selection_set.selections:
+        if isinstance(selection, FieldNode):
+            # Skip __typename fields
+            if selection.name.value == "__typename":
+                continue
+            # Recursively process nested selection sets
+            new_field = FieldNode(
+                alias=selection.alias,
+                name=selection.name,
+                arguments=selection.arguments,
+                directives=selection.directives,
+                selection_set=strip_typename_from_selection_set(selection.selection_set),
+            )
+            new_selections.append(new_field)
+        elif isinstance(selection, InlineFragmentNode):
+            # Process inline fragments
+            new_inline = InlineFragmentNode(
+                type_condition=selection.type_condition,
+                directives=selection.directives,
+                selection_set=strip_typename_from_selection_set(selection.selection_set),
+            )
+            new_selections.append(new_inline)
+        elif isinstance(selection, FragmentSpreadNode):
+            # FragmentSpread references a named fragment - keep as-is
+            new_selections.append(selection)
+        else:
+            raise TypeError(f"Unexpected GraphQL selection node type '{type(selection).__name__}'.")
+
+    return SelectionSetNode(selections=tuple(new_selections))
+
+
+def strip_typename_from_operation(operation: OperationDefinitionNode) -> OperationDefinitionNode:
+    """Strip __typename fields from an operation definition.
+
+    Returns a new OperationDefinitionNode with all __typename fields removed
+    from its selection set and any nested selection sets.
+    """
+    return OperationDefinitionNode(
+        operation=operation.operation,
+        name=operation.name,
+        variable_definitions=operation.variable_definitions,
+        directives=operation.directives,
+        selection_set=strip_typename_from_selection_set(operation.selection_set),
+    )
+
+
+def strip_typename_from_fragment(fragment: FragmentDefinitionNode) -> FragmentDefinitionNode:
+    """Strip __typename fields from a fragment definition.
+
+    Returns a new FragmentDefinitionNode with all __typename fields removed
+    from its selection set and any nested selection sets.
+    """
+    return FragmentDefinitionNode(
+        name=fragment.name,
+        type_condition=fragment.type_condition,
+        variable_definitions=fragment.variable_definitions,
+        directives=fragment.directives,
+        selection_set=strip_typename_from_selection_set(fragment.selection_set),
+    )
+
 
 def get_class_def_index(module: ast.Module) -> int:
     """Get the index of the first class definition in the module.

infrahub_sdk/node/attribute.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, Any, get_args
 
 from ..protocols_base import CoreNodeBase
 from ..uuidt import UUIDT
-from .constants import IP_TYPES, PROPERTIES_FLAG, PROPERTIES_OBJECT, SAFE_VALUE
+from .constants import ATTRIBUTE_METADATA_OBJECT, IP_TYPES, PROPERTIES_FLAG, PROPERTIES_OBJECT, SAFE_VALUE
 from .property import NodeProperty
 
 if TYPE_CHECKING:
@@ -57,11 +57,16 @@ class Attribute:
 
         self.source: NodeProperty | None = None
         self.owner: NodeProperty | None = None
+        self.updated_by: NodeProperty | None = None
 
         for prop_name in self._properties_object:
             if data.get(prop_name):
                 setattr(self, prop_name, NodeProperty(data=data.get(prop_name)))  # type: ignore[arg-type]
 
+        for prop_name in ATTRIBUTE_METADATA_OBJECT:
+            if data.get(prop_name):
+                setattr(self, prop_name, NodeProperty(data=data.get(prop_name)))  # type: ignore[arg-type]
+
     @property
     def value(self) -> Any:
         return self._value
@@ -104,7 +109,7 @@ class Attribute:
 
         return {"data": data, "variables": variables}
 
-    def _generate_query_data(self, property: bool = False) -> dict | None:
+    def _generate_query_data(self, property: bool = False, include_metadata: bool = False) -> dict | None:
         data: dict[str, Any] = {"value": None}
 
         if property:
@@ -115,6 +120,11 @@ class Attribute:
             for prop_name in self._properties_object:
                 data[prop_name] = {"id": None, "display_label": None, "__typename": None}
 
+        if include_metadata:
+            data["updated_at"] = None
+            for prop_name in ATTRIBUTE_METADATA_OBJECT:
+                data[prop_name] = {"id": None, "display_label": None, "__typename": None}
+
         return data
 
     def _generate_mutation_query(self) -> dict[str, Any]:

infrahub_sdk/node/constants.py

@@ -3,6 +3,17 @@ import re
 
 PROPERTIES_FLAG = ["is_protected", "updated_at"]
 PROPERTIES_OBJECT = ["source", "owner"]
+
+# Attribute-level metadata object fields (in addition to PROPERTIES_OBJECT)
+ATTRIBUTE_METADATA_OBJECT = ["updated_by"]
+
+# Node metadata fields (for node_metadata in GraphQL response)
+NODE_METADATA_FIELDS_FLAG = ["created_at", "updated_at"]
+NODE_METADATA_FIELDS_OBJECT = ["created_by", "updated_by"]
+
+# Relationship metadata fields (for relationship_metadata in GraphQL response)
+RELATIONSHIP_METADATA_FIELDS_FLAG = ["updated_at"]
+RELATIONSHIP_METADATA_FIELDS_OBJECT = ["updated_by"]
 SAFE_VALUE = re.compile(r"(^[\. /:a-zA-Z0-9_-]+$)|(^$)")
 
 IP_TYPES = ipaddress.IPv4Interface | ipaddress.IPv6Interface | ipaddress.IPv4Network | ipaddress.IPv6Network
@@ -20,3 +31,4 @@ ARTIFACT_DEFINITION_GENERATE_FEATURE_NOT_SUPPORTED_MESSAGE = (
 HIERARCHY_FETCH_FEATURE_NOT_SUPPORTED_MESSAGE = "Hierarchical fields are not supported for this node."
 
 HFID_STR_SEPARATOR = "__"
+PROFILE_KIND_PREFIX = "Profile"

infrahub_sdk/node/metadata.py

@@ -0,0 +1,69 @@
+from __future__ import annotations
+
+from .property import NodeProperty
+
+
+class NodeMetadata:
+    """Represents metadata about a node (created_at, created_by, updated_at, updated_by)."""
+
+    def __init__(self, data: dict | None = None) -> None:
+        """
+        Args:
+            data: Data containing the metadata fields from the GraphQL response.
+        """
+        self.created_at: str | None = None
+        self.created_by: NodeProperty | None = None
+        self.updated_at: str | None = None
+        self.updated_by: NodeProperty | None = None
+
+        if data:
+            self.created_at = data.get("created_at")
+            self.updated_at = data.get("updated_at")
+            if data.get("created_by"):
+                self.created_by = NodeProperty(data["created_by"])
+            if data.get("updated_by"):
+                self.updated_by = NodeProperty(data["updated_by"])
+
+    def __repr__(self) -> str:
+        return (
+            f"NodeMetadata(created_at={self.created_at!r}, created_by={self.created_by!r}, "
+            f"updated_at={self.updated_at!r}, updated_by={self.updated_by!r})"
+        )
+
+    @classmethod
+    def _generate_query_data(cls) -> dict:
+        """Generate the query structure for node_metadata fields."""
+        return {
+            "created_at": None,
+            "created_by": {"id": None, "__typename": None, "display_label": None},
+            "updated_at": None,
+            "updated_by": {"id": None, "__typename": None, "display_label": None},
+        }
+
+
+class RelationshipMetadata:
+    """Represents metadata about a relationship edge (updated_at, updated_by)."""
+
+    def __init__(self, data: dict | None = None) -> None:
+        """
+        Args:
+            data: Data containing the metadata fields from the GraphQL response.
+        """
+        self.updated_at: str | None = None
+        self.updated_by: NodeProperty | None = None
+
+        if data:
+            self.updated_at = data.get("updated_at")
+            if data.get("updated_by"):
+                self.updated_by = NodeProperty(data["updated_by"])
+
+    def __repr__(self) -> str:
+        return f"RelationshipMetadata(updated_at={self.updated_at!r}, updated_by={self.updated_by!r})"
+
+    @classmethod
+    def _generate_query_data(cls) -> dict:
+        """Generate the query structure for relationship_metadata fields."""
+        return {
+            "updated_at": None,
+            "updated_by": {"id": None, "__typename": None, "display_label": None},
+        }

infrahub_sdk/node/node.py

@@ -23,6 +23,7 @@ from .constants import (
     ARTIFACT_GENERATE_FEATURE_NOT_SUPPORTED_MESSAGE,
     PROPERTIES_OBJECT,
 )
+from .metadata import NodeMetadata
 from .related_node import RelatedNode, RelatedNodeBase, RelatedNodeSync
 from .relationship import RelationshipManager, RelationshipManagerBase, RelationshipManagerSync
 
@@ -50,6 +51,7 @@ class InfrahubNodeBase:
         self._branch = branch
         self._existing: bool = True
         self._attribute_data: dict[str, Attribute] = {}
+        self._metadata: NodeMetadata | None = None
 
         # 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
@@ -152,6 +154,10 @@ class InfrahubNodeBase:
     def hfid_str(self) -> str | None:
         return self.get_human_friendly_id_as_string(include_kind=True)
 
+    def get_node_metadata(self) -> NodeMetadata | None:
+        """Returns the node metadata (created_at, created_by, updated_at, updated_by) if fetched."""
+        return self._metadata
+
     def _init_attributes(self, data: dict | None = None) -> None:
         for attr_schema in self._schema.attributes:
             attr_data = data.get(attr_schema.name, None) if isinstance(data, dict) else None
@@ -192,8 +198,8 @@ class InfrahubNodeBase:
         return self._schema.kind
 
     def get_all_kinds(self) -> list[str]:
-        if hasattr(self._schema, "inherit_from"):
-            return [self._schema.kind] + self._schema.inherit_from
+        if inherit_from := getattr(self._schema, "inherit_from", None):
+            return [self._schema.kind] + inherit_from
         return [self._schema.kind]
 
     def is_ip_prefix(self) -> bool:
@@ -210,7 +216,7 @@ class InfrahubNodeBase:
     def get_raw_graphql_data(self) -> dict | None:
         return self._data
 
-    def _generate_input_data(  # noqa: C901
+    def _generate_input_data(  # noqa: C901, PLR0915
         self,
         exclude_unmodified: bool = False,
         exclude_hfid: bool = False,
@@ -253,7 +259,10 @@ class InfrahubNodeBase:
             rel: RelatedNodeBase | RelationshipManagerBase = getattr(self, item_name)
 
             if rel_schema.cardinality == RelationshipCardinality.ONE and rel_schema.optional and not rel.initialized:
-                data[item_name] = None
+                # Only include None for existing nodes to allow clearing relationships
+                # For new nodes, omit the field to allow object template defaults to be applied
+                if self._existing:
+                    data[item_name] = None
                 continue
 
             if rel is None or not rel.initialized:
@@ -419,12 +428,16 @@ class InfrahubNodeBase:
         exclude: list[str] | None = None,
         partial_match: bool = False,
         order: Order | None = None,
+        include_metadata: bool = False,
     ) -> dict[str, Any | dict]:
         data: dict[str, Any] = {
             "count": None,
             "edges": {"node": {"id": None, "hfid": None, "display_label": None, "__typename": None}},
         }
 
+        if include_metadata:
+            data["edges"]["node_metadata"] = NodeMetadata._generate_query_data()
+
         data["@filters"] = deepcopy(filters) if filters is not None else {}
 
         if order:
@@ -496,8 +509,12 @@ class InfrahubNode(InfrahubNodeBase):
         """
         self._client = client
 
-        if isinstance(data, dict) and isinstance(data.get("node"), dict):
-            data = data.get("node")
+        # Extract node_metadata before extracting node data (node_metadata is sibling to node in edges)
+        node_metadata_data: dict | None = None
+        if isinstance(data, dict):
+            node_metadata_data = data.get("node_metadata")
+            if isinstance(data.get("node"), dict):
+                data = data.get("node")
 
         self._relationship_cardinality_many_data: dict[str, RelationshipManager] = {}
         self._relationship_cardinality_one_data: dict[str, RelatedNode] = {}
@@ -505,6 +522,10 @@ class InfrahubNode(InfrahubNodeBase):
 
         super().__init__(schema=schema, branch=branch or client.default_branch, data=data)
 
+        # Initialize metadata after base class init
+        if node_metadata_data:
+            self._metadata = NodeMetadata(node_metadata_data)
+
     @classmethod
     async def from_graphql(
         cls,
@@ -785,6 +806,7 @@ class InfrahubNode(InfrahubNodeBase):
         partial_match: bool = False,
         property: bool = False,
         order: Order | None = None,
+        include_metadata: bool = False,
     ) -> dict[str, Any | dict]:
         data = self.generate_query_data_init(
             filters=filters,
@@ -794,6 +816,7 @@ class InfrahubNode(InfrahubNodeBase):
             exclude=exclude,
             partial_match=partial_match,
             order=order,
+            include_metadata=include_metadata,
         )
         data["edges"]["node"].update(
             await self.generate_query_data_node(
@@ -802,6 +825,7 @@ class InfrahubNode(InfrahubNodeBase):
                 prefetch_relationships=prefetch_relationships,
                 inherited=True,
                 property=property,
+                include_metadata=include_metadata,
             )
         )
 
@@ -825,6 +849,7 @@ class InfrahubNode(InfrahubNodeBase):
                     inherited=False,
                     insert_alias=True,
                     property=property,
+                    include_metadata=include_metadata,
                 )
 
                 if child_data:
@@ -840,6 +865,7 @@ class InfrahubNode(InfrahubNodeBase):
         insert_alias: bool = False,
         prefetch_relationships: bool = False,
         property: bool = False,
+        include_metadata: bool = False,
     ) -> dict[str, Any | dict]:
         """Generate the node part of a GraphQL Query with attributes and nodes.
 
@@ -850,6 +876,7 @@ class InfrahubNode(InfrahubNodeBase):
                                         Defaults to True.
             insert_alias (bool, optional): If True, inserts aliases in the query for each attribute or relationship.
             prefetch_relationships (bool, optional): If True, pre-fetches relationship data as part of the query.
+            include_metadata (bool, optional): If True, includes node_metadata and relationship_metadata in the query.
 
         Returns:
             dict[str, Union[Any, Dict]]: GraphQL query in dictionary format
@@ -866,7 +893,7 @@ class InfrahubNode(InfrahubNodeBase):
             if not inherited and attr._schema.inherited:
                 continue
 
-            attr_data = attr._generate_query_data(property=property)
+            attr_data = attr._generate_query_data(property=property, include_metadata=include_metadata)
             if attr_data:
                 data[attr_name] = attr_data
                 if insert_alias:
@@ -898,11 +925,14 @@ class InfrahubNode(InfrahubNodeBase):
                 peer_node = InfrahubNode(client=self._client, schema=peer_schema, branch=self._branch)
                 peer_data = await peer_node.generate_query_data_node(
                     property=property,
+                    include_metadata=include_metadata,
                 )
 
             rel_data: dict[str, Any]
             if rel_schema and rel_schema.cardinality == "one":
-                rel_data = RelatedNode._generate_query_data(peer_data=peer_data, property=property)
+                rel_data = RelatedNode._generate_query_data(
+                    peer_data=peer_data, property=property, include_metadata=include_metadata
+                )
                 # Nodes involved in a hierarchy are required to inherit from a common ancestor node, and graphql
                 # tries to resolve attributes in this ancestor instead of actual node. To avoid
                 # invalid queries issues when attribute is missing in the common ancestor, we use a fragment
@@ -912,7 +942,9 @@ class InfrahubNode(InfrahubNodeBase):
                     rel_data["node"] = {}
                     rel_data["node"][f"...on {rel_schema.peer}"] = data_node
             elif rel_schema and rel_schema.cardinality == "many":
-                rel_data = RelationshipManager._generate_query_data(peer_data=peer_data, property=property)
+                rel_data = RelationshipManager._generate_query_data(
+                    peer_data=peer_data, property=property, include_metadata=include_metadata
+                )
             else:
                 continue
 
@@ -1285,8 +1317,12 @@ class InfrahubNodeSync(InfrahubNodeBase):
         """
         self._client = client
 
-        if isinstance(data, dict) and isinstance(data.get("node"), dict):
-            data = data.get("node")
+        # Extract node_metadata before extracting node data (node_metadata is sibling to node in edges)
+        node_metadata_data: dict | None = None
+        if isinstance(data, dict):
+            node_metadata_data = data.get("node_metadata")
+            if isinstance(data.get("node"), dict):
+                data = data.get("node")
 
         self._relationship_cardinality_many_data: dict[str, RelationshipManagerSync] = {}
         self._relationship_cardinality_one_data: dict[str, RelatedNodeSync] = {}
@@ -1294,6 +1330,10 @@ class InfrahubNodeSync(InfrahubNodeBase):
 
         super().__init__(schema=schema, branch=branch or client.default_branch, data=data)
 
+        # Initialize metadata after base class init
+        if node_metadata_data:
+            self._metadata = NodeMetadata(node_metadata_data)
+
     @classmethod
     def from_graphql(
         cls,
@@ -1571,6 +1611,7 @@ class InfrahubNodeSync(InfrahubNodeBase):
         partial_match: bool = False,
         property: bool = False,
         order: Order | None = None,
+        include_metadata: bool = False,
     ) -> dict[str, Any | dict]:
         data = self.generate_query_data_init(
             filters=filters,
@@ -1580,6 +1621,7 @@ class InfrahubNodeSync(InfrahubNodeBase):
             exclude=exclude,
             partial_match=partial_match,
             order=order,
+            include_metadata=include_metadata,
         )
         data["edges"]["node"].update(
             self.generate_query_data_node(
@@ -1588,6 +1630,7 @@ class InfrahubNodeSync(InfrahubNodeBase):
                 prefetch_relationships=prefetch_relationships,
                 inherited=True,
                 property=property,
+                include_metadata=include_metadata,
             )
         )
 
@@ -1610,6 +1653,7 @@ class InfrahubNodeSync(InfrahubNodeBase):
                     inherited=False,
                     insert_alias=True,
                     property=property,
+                    include_metadata=include_metadata,
                 )
 
                 if child_data:
@@ -1625,6 +1669,7 @@ class InfrahubNodeSync(InfrahubNodeBase):
         insert_alias: bool = False,
         prefetch_relationships: bool = False,
         property: bool = False,
+        include_metadata: bool = False,
     ) -> dict[str, Any | dict]:
         """Generate the node part of a GraphQL Query with attributes and nodes.
 
@@ -1635,6 +1680,7 @@ class InfrahubNodeSync(InfrahubNodeBase):
                                         Defaults to True.
             insert_alias (bool, optional): If True, inserts aliases in the query for each attribute or relationship.
             prefetch_relationships (bool, optional): If True, pre-fetches relationship data as part of the query.
+            include_metadata (bool, optional): If True, includes node_metadata and relationship_metadata in the query.
 
         Returns:
             dict[str, Union[Any, Dict]]: GraphQL query in dictionary format
@@ -1651,7 +1697,7 @@ class InfrahubNodeSync(InfrahubNodeBase):
             if not inherited and attr._schema.inherited:
                 continue
 
-            attr_data = attr._generate_query_data(property=property)
+            attr_data = attr._generate_query_data(property=property, include_metadata=include_metadata)
             if attr_data:
                 data[attr_name] = attr_data
                 if insert_alias:
@@ -1683,11 +1729,14 @@ class InfrahubNodeSync(InfrahubNodeBase):
                 peer_node = InfrahubNodeSync(client=self._client, schema=peer_schema, branch=self._branch)
                 peer_data = peer_node.generate_query_data_node(
                     property=property,
+                    include_metadata=include_metadata,
                 )
 
             rel_data: dict[str, Any]
             if rel_schema and rel_schema.cardinality == "one":
-                rel_data = RelatedNodeSync._generate_query_data(peer_data=peer_data, property=property)
+                rel_data = RelatedNodeSync._generate_query_data(
+                    peer_data=peer_data, property=property, include_metadata=include_metadata
+                )
                 # Nodes involved in a hierarchy are required to inherit from a common ancestor node, and graphql
                 # tries to resolve attributes in this ancestor instead of actual node. To avoid
                 # invalid queries issues when attribute is missing in the common ancestor, we use a fragment
@@ -1697,7 +1746,9 @@ class InfrahubNodeSync(InfrahubNodeBase):
                     rel_data["node"] = {}
                     rel_data["node"][f"...on {rel_schema.peer}"] = data_node
             elif rel_schema and rel_schema.cardinality == "many":
-                rel_data = RelationshipManagerSync._generate_query_data(peer_data=peer_data, property=property)
+                rel_data = RelationshipManagerSync._generate_query_data(
+                    peer_data=peer_data, property=property, include_metadata=include_metadata
+                )
             else:
                 continue
 

infrahub_sdk/node/property.py

@@ -20,5 +20,8 @@ class NodeProperty:
             self.display_label = data.get("display_label", None)
             self.typename = data.get("__typename", None)
 
+    def __repr__(self) -> str:
+        return f"NodeProperty({{'id': {self.id!r}, 'display_label': {self.display_label!r}, '__typename': {self.typename!r}}})"
+
     def _generate_input_data(self) -> str | None:
         return self.id

infrahub_sdk/node/related_node.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
+import re
 from typing import TYPE_CHECKING, Any
 
-from ..exceptions import (
-    Error,
-)
+from ..exceptions import Error
 from ..protocols_base import CoreNodeBase
-from .constants import PROPERTIES_FLAG, PROPERTIES_OBJECT
+from .constants import PROFILE_KIND_PREFIX, PROPERTIES_FLAG, PROPERTIES_OBJECT
+from .metadata import NodeMetadata, RelationshipMetadata
 
 if TYPE_CHECKING:
     from ..client import InfrahubClient, InfrahubClientSync
@@ -40,11 +40,14 @@ class RelatedNodeBase:
         self._display_label: str | None = None
         self._typename: str | None = None
         self._kind: str | None = None
+        self._source_typename: str | None = None
+        self._relationship_metadata: RelationshipMetadata | None = None
 
         if isinstance(data, (CoreNodeBase)):
             self._peer = data
             for prop in self._properties:
                 setattr(self, prop, None)
+            self._relationship_metadata = None
 
         elif isinstance(data, list):
             data = {"hfid": data}
@@ -74,11 +77,17 @@ class RelatedNodeBase:
                 prop_data = properties_data.get(prop, properties_data.get(f"_relation__{prop}", None))
                 if prop_data and isinstance(prop_data, dict) and "id" in prop_data:
                     setattr(self, prop, prop_data["id"])
+                    if prop == "source" and "__typename" in prop_data:
+                        self._source_typename = prop_data["__typename"]
                 elif prop_data and isinstance(prop_data, (str, bool)):
                     setattr(self, prop, prop_data)
                 else:
                     setattr(self, prop, None)
 
+            # Parse relationship metadata (at edge level)
+            if data.get("relationship_metadata"):
+                self._relationship_metadata = RelationshipMetadata(data["relationship_metadata"])
+
     @property
     def id(self) -> str | None:
         if self._peer:
@@ -125,6 +134,17 @@ class RelatedNodeBase:
             return self._peer.get_kind()
         return self._kind
 
+    @property
+    def is_from_profile(self) -> bool:
+        """Return whether this relationship was set from a profile. Done by checking if the source is of a profile kind."""
+        if not self._source_typename:
+            return False
+        return bool(re.match(rf"^{PROFILE_KIND_PREFIX}[A-Z]", self._source_typename))
+
+    def get_relationship_metadata(self) -> RelationshipMetadata | None:
+        """Returns the relationship metadata (updated_at, updated_by) if fetched."""
+        return self._relationship_metadata
+
     def _generate_input_data(self, allocate_from_pool: bool = False) -> dict[str, Any]:
         data: dict[str, Any] = {}
 
@@ -151,12 +171,17 @@ class RelatedNodeBase:
         return {}
 
     @classmethod
-    def _generate_query_data(cls, peer_data: dict[str, Any] | None = None, property: bool = False) -> dict:
+    def _generate_query_data(
+        cls, peer_data: dict[str, Any] | None = None, property: bool = False, include_metadata: bool = False
+    ) -> dict:
         """Generates the basic structure of a GraphQL query for a single relationship.
 
         Args:
             peer_data (dict[str, Union[Any, Dict]], optional): Additional data to be included in the query for the node.
                 This is used to add extra fields when prefetching related node data.
+            property (bool, optional): If True, includes property fields (is_protected, source, owner, etc.).
+            include_metadata (bool, optional): If True, includes node_metadata (for the peer node) and
+                relationship_metadata (for the relationship edge) fields.
 
         Returns:
             Dict: A dictionary representing the basic structure of a GraphQL query, including the node's ID, display label,
@@ -172,6 +197,13 @@ class RelatedNodeBase:
                 properties[prop_name] = {"id": None, "display_label": None, "__typename": None}
 
             data["properties"] = properties
+
+        if include_metadata:
+            # node_metadata is for the peer InfrahubNode (populated via from_graphql)
+            data["node_metadata"] = NodeMetadata._generate_query_data()
+            # relationship_metadata is for the relationship edge itself
+            data["relationship_metadata"] = RelationshipMetadata._generate_query_data()
+
         if peer_data:
             data["node"].update(peer_data)