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

infrahub_sdk/ctl/graphql.py

@@ -22,12 +22,7 @@ from rich.console import Console
 from ..async_typer import AsyncTyper
 from ..ctl.client import initialize_client
 from ..ctl.utils import catch_exception
-from ..graphql.utils import (
-    insert_fragments_inline,
-    remove_fragment_import,
-    strip_typename_from_fragment,
-    strip_typename_from_operation,
-)
+from ..graphql.utils import insert_fragments_inline, remove_fragment_import
 from .parameters import CONFIG_PARAM
 
 app = AsyncTyper()
@@ -157,18 +152,12 @@ async def generate_return_types(
             queries = filter_operations_definitions(definitions)
             fragments = filter_fragments_definitions(definitions)
 
-            # Strip __typename fields from operations and fragments before code generation.
-            # __typename is a GraphQL introspection meta-field that isn't part of the schema's
-            # type definitions, causing ariadne-codegen to fail with "Redefinition of reserved type 'String'"
-            stripped_queries = [strip_typename_from_operation(q) for q in queries]
-            stripped_fragments = [strip_typename_from_fragment(f) for f in fragments]
-
             package_generator = get_package_generator(
                 schema=graphql_schema,
-                fragments=stripped_fragments,
+                fragments=fragments,
                 settings=ClientSettings(
                     schema_path=str(schema),
-                    target_package_name=directory.name or "graphql_client",
+                    target_package_name=directory.name,
                     queries_path=str(directory),
                     include_comments=CommentsStrategy.NONE,
                 ),
@@ -177,7 +166,7 @@ async def generate_return_types(
 
             parsing_failed = False
             try:
-                for query_operation in stripped_queries:
+                for query_operation in queries:
                     package_generator.add_operation(query_operation)
             except ParsingError as exc:
                 console.print(f"[red]Unable to process {gql_file.name}: {exc}")

infrahub_sdk/ctl/utils.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import inspect
+import asyncio
 import logging
 import traceback
 from collections.abc import Callable, Coroutine
@@ -83,7 +83,7 @@ def catch_exception(
         console = Console()
 
     def decorator(func: Callable[..., T]) -> Callable[..., T | Coroutine[Any, Any, T]]:
-        if inspect.iscoroutinefunction(func):
+        if asyncio.iscoroutinefunction(func):
 
             @wraps(func)
             async def async_wrapper(*args: Any, **kwargs: Any) -> T:

infrahub_sdk/graphql/renderers.py

@@ -7,8 +7,6 @@ from typing import Any
 
 from pydantic import BaseModel
 
-from infrahub_sdk.types import Order
-
 from .constants import VARIABLE_TYPE_MAPPING
 
 
@@ -55,16 +53,6 @@ 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 (
@@ -75,15 +63,6 @@ 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,90 +1,5 @@
 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 ATTRIBUTE_METADATA_OBJECT, IP_TYPES, PROPERTIES_FLAG, PROPERTIES_OBJECT, SAFE_VALUE
+from .constants import IP_TYPES, PROPERTIES_FLAG, PROPERTIES_OBJECT, SAFE_VALUE
 from .property import NodeProperty
 
 if TYPE_CHECKING:
@@ -57,16 +57,11 @@ 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
@@ -109,7 +104,7 @@ class Attribute:
 
         return {"data": data, "variables": variables}
 
-    def _generate_query_data(self, property: bool = False, include_metadata: bool = False) -> dict | None:
+    def _generate_query_data(self, property: bool = False) -> dict | None:
         data: dict[str, Any] = {"value": None}
 
         if property:
@@ -120,11 +115,6 @@ 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,17 +3,6 @@ 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

infrahub_sdk/node/node.py

@@ -23,7 +23,6 @@ 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
 
@@ -51,7 +50,6 @@ 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
@@ -154,10 +152,6 @@ 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
@@ -198,8 +192,8 @@ class InfrahubNodeBase:
         return self._schema.kind
 
     def get_all_kinds(self) -> list[str]:
-        if inherit_from := getattr(self._schema, "inherit_from", None):
-            return [self._schema.kind] + inherit_from
+        if hasattr(self._schema, "inherit_from"):
+            return [self._schema.kind] + self._schema.inherit_from
         return [self._schema.kind]
 
     def is_ip_prefix(self) -> bool:
@@ -216,7 +210,7 @@ class InfrahubNodeBase:
     def get_raw_graphql_data(self) -> dict | None:
         return self._data
 
-    def _generate_input_data(  # noqa: C901, PLR0915
+    def _generate_input_data(  # noqa: C901
         self,
         exclude_unmodified: bool = False,
         exclude_hfid: bool = False,
@@ -259,10 +253,7 @@ class InfrahubNodeBase:
             rel: RelatedNodeBase | RelationshipManagerBase = getattr(self, item_name)
 
             if rel_schema.cardinality == RelationshipCardinality.ONE and rel_schema.optional and not rel.initialized:
-                # 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
+                data[item_name] = None
                 continue
 
             if rel is None or not rel.initialized:
@@ -428,16 +419,12 @@ 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:
@@ -509,12 +496,8 @@ class InfrahubNode(InfrahubNodeBase):
         """
         self._client = client
 
-        # 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")
+        if isinstance(data, dict) and 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] = {}
@@ -522,10 +505,6 @@ 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,
@@ -806,7 +785,6 @@ 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,
@@ -816,7 +794,6 @@ 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(
@@ -825,7 +802,6 @@ class InfrahubNode(InfrahubNodeBase):
                 prefetch_relationships=prefetch_relationships,
                 inherited=True,
                 property=property,
-                include_metadata=include_metadata,
             )
         )
 
@@ -849,7 +825,6 @@ class InfrahubNode(InfrahubNodeBase):
                     inherited=False,
                     insert_alias=True,
                     property=property,
-                    include_metadata=include_metadata,
                 )
 
                 if child_data:
@@ -865,7 +840,6 @@ 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.
 
@@ -876,7 +850,6 @@ 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
@@ -893,7 +866,7 @@ class InfrahubNode(InfrahubNodeBase):
             if not inherited and attr._schema.inherited:
                 continue
 
-            attr_data = attr._generate_query_data(property=property, include_metadata=include_metadata)
+            attr_data = attr._generate_query_data(property=property)
             if attr_data:
                 data[attr_name] = attr_data
                 if insert_alias:
@@ -925,14 +898,11 @@ 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, include_metadata=include_metadata
-                )
+                rel_data = RelatedNode._generate_query_data(peer_data=peer_data, property=property)
                 # 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
@@ -942,9 +912,7 @@ 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, include_metadata=include_metadata
-                )
+                rel_data = RelationshipManager._generate_query_data(peer_data=peer_data, property=property)
             else:
                 continue
 
@@ -1317,12 +1285,8 @@ class InfrahubNodeSync(InfrahubNodeBase):
         """
         self._client = client
 
-        # 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")
+        if isinstance(data, dict) and 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] = {}
@@ -1330,10 +1294,6 @@ 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,
@@ -1611,7 +1571,6 @@ 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,
@@ -1621,7 +1580,6 @@ class InfrahubNodeSync(InfrahubNodeBase):
             exclude=exclude,
             partial_match=partial_match,
             order=order,
-            include_metadata=include_metadata,
         )
         data["edges"]["node"].update(
             self.generate_query_data_node(
@@ -1630,7 +1588,6 @@ class InfrahubNodeSync(InfrahubNodeBase):
                 prefetch_relationships=prefetch_relationships,
                 inherited=True,
                 property=property,
-                include_metadata=include_metadata,
             )
         )
 
@@ -1653,7 +1610,6 @@ class InfrahubNodeSync(InfrahubNodeBase):
                     inherited=False,
                     insert_alias=True,
                     property=property,
-                    include_metadata=include_metadata,
                 )
 
                 if child_data:
@@ -1669,7 +1625,6 @@ 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.
 
@@ -1680,7 +1635,6 @@ 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
@@ -1697,7 +1651,7 @@ class InfrahubNodeSync(InfrahubNodeBase):
             if not inherited and attr._schema.inherited:
                 continue
 
-            attr_data = attr._generate_query_data(property=property, include_metadata=include_metadata)
+            attr_data = attr._generate_query_data(property=property)
             if attr_data:
                 data[attr_name] = attr_data
                 if insert_alias:
@@ -1729,14 +1683,11 @@ 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, include_metadata=include_metadata
-                )
+                rel_data = RelatedNodeSync._generate_query_data(peer_data=peer_data, property=property)
                 # 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
@@ -1746,9 +1697,7 @@ 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, include_metadata=include_metadata
-                )
+                rel_data = RelationshipManagerSync._generate_query_data(peer_data=peer_data, property=property)
             else:
                 continue
 

infrahub_sdk/node/property.py

@@ -20,8 +20,5 @@ 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

@@ -6,7 +6,6 @@ from typing import TYPE_CHECKING, Any
 from ..exceptions import Error
 from ..protocols_base import CoreNodeBase
 from .constants import PROFILE_KIND_PREFIX, PROPERTIES_FLAG, PROPERTIES_OBJECT
-from .metadata import NodeMetadata, RelationshipMetadata
 
 if TYPE_CHECKING:
     from ..client import InfrahubClient, InfrahubClientSync
@@ -41,13 +40,11 @@ class RelatedNodeBase:
         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}
@@ -84,10 +81,6 @@ class RelatedNodeBase:
                 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:
@@ -141,10 +134,6 @@ class RelatedNodeBase:
             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] = {}
 
@@ -171,17 +160,12 @@ class RelatedNodeBase:
         return {}
 
     @classmethod
-    def _generate_query_data(
-        cls, peer_data: dict[str, Any] | None = None, property: bool = False, include_metadata: bool = False
-    ) -> dict:
+    def _generate_query_data(cls, peer_data: dict[str, Any] | None = None, property: 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,
@@ -197,13 +181,6 @@ 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)
 

infrahub_sdk/node/relationship.py

@@ -10,7 +10,6 @@ from ..exceptions import (
 )
 from ..types import Order
 from .constants import PROPERTIES_FLAG, PROPERTIES_OBJECT
-from .metadata import NodeMetadata, RelationshipMetadata
 from .related_node import RelatedNode, RelatedNodeSync
 
 if TYPE_CHECKING:
@@ -73,16 +72,12 @@ class RelationshipManagerBase:
         return {}
 
     @classmethod
-    def _generate_query_data(
-        cls, peer_data: dict[str, Any] | None = None, property: bool = False, include_metadata: bool = False
-    ) -> dict:
+    def _generate_query_data(cls, peer_data: dict[str, Any] | None = None, property: bool = False) -> dict:
         """Generates the basic structure of a GraphQL query for relationships with multiple nodes.
 
         Args:
             peer_data (dict[str, Union[Any, Dict]], optional): Additional data to be included in the query for each node.
                 This is used to add extra fields when prefetching related node data in many-to-many relationships.
-            property (bool, optional): If True, includes property fields (is_protected, source, owner, etc.).
-            include_metadata (bool, optional): If True, includes node_metadata and relationship_metadata fields.
 
         Returns:
             Dict: A dictionary representing the basic structure of a GraphQL query for multiple related nodes.
@@ -102,10 +97,6 @@ class RelationshipManagerBase:
                 properties[prop_name] = {"id": None, "display_label": None, "__typename": None}
             data["edges"]["properties"] = properties
 
-        if include_metadata:
-            data["edges"]["node_metadata"] = NodeMetadata._generate_query_data()
-            data["edges"]["relationship_metadata"] = RelationshipMetadata._generate_query_data()
-
         if peer_data:
             data["edges"]["node"].update(peer_data)