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

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

@@ -6,6 +6,7 @@ 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
@@ -40,11 +41,13 @@ 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}
@@ -81,6 +84,10 @@ 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:
@@ -134,6 +141,10 @@ 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] = {}
 
@@ -160,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,
@@ -181,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)
 

infrahub_sdk/node/relationship.py

@@ -10,6 +10,7 @@ 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:
@@ -72,12 +73,16 @@ class RelationshipManagerBase:
         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 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.
@@ -97,6 +102,10 @@ 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)
 

infrahub_sdk/operation.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import os
+import pathlib
 from typing import TYPE_CHECKING
 
 from .repository import GitRepoManager
@@ -22,7 +22,7 @@ class InfrahubOperation:
     ) -> None:
         self.branch = branch
         self.convert_query_response = convert_query_response
-        self.root_directory = root_directory or os.getcwd()
+        self.root_directory = root_directory or str(pathlib.Path.cwd())
         self.infrahub_node = infrahub_node
         self._nodes: list[InfrahubNode] = []
         self._related_nodes: list[InfrahubNode] = []

infrahub_sdk/schema/repository.py

@@ -151,8 +151,7 @@ class InfrahubRepositoryGraphQLConfig(InfrahubRepositoryConfigElement):
 
     def load_query(self, relative_path: str = ".") -> str:
         file_name = Path(f"{relative_path}/{self.file_path}")
-        with file_name.open("r", encoding="UTF-8") as file:
-            return file.read()
+        return file_name.read_text(encoding="UTF-8")
 
 
 class InfrahubObjectConfig(InfrahubRepositoryConfigElement):

infrahub_sdk/transforms.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import asyncio
+import inspect
 import os
 from abc import abstractmethod
 from typing import TYPE_CHECKING, Any
@@ -75,7 +75,7 @@ class InfrahubTransform(InfrahubOperation):
         unpacked = data.get("data") or data
         await self.process_nodes(data=unpacked)
 
-        if asyncio.iscoroutinefunction(self.transform):
+        if inspect.iscoroutinefunction(self.transform):
             return await self.transform(data=unpacked)
 
         return self.transform(data=unpacked)

infrahub_sdk/types.py

@@ -4,7 +4,9 @@ import enum
 from logging import Logger
 from typing import TYPE_CHECKING, Any, Protocol, runtime_checkable
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field, model_validator
+
+from infrahub_sdk.enums import OrderDirection  # noqa: TC001
 
 if TYPE_CHECKING:
     import httpx
@@ -68,5 +70,19 @@ class InfrahubLogger(Protocol):
 InfrahubLoggers = InfrahubLogger | Logger
 
 
+class NodeMetaOrder(BaseModel):
+    created_at: OrderDirection | None = None
+    updated_at: OrderDirection | None = None
+
+    @model_validator(mode="after")
+    def validate_selection(self) -> NodeMetaOrder:
+        if self.created_at and self.updated_at:
+            raise ValueError("'created_at' and 'updated_at' are mutually exclusive")
+        return self
+
+
 class Order(BaseModel):
-    disable: bool | None = None
+    disable: bool | None = Field(
+        default=None, description="Disable default ordering, can be used to improve performance"
+    )
+    node_metadata: NodeMetaOrder | None = Field(default=None, description="Order by node meta fields")

{infrahub_server-1.7.0rc0.dist-info → infrahub_server-1.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: infrahub-server
-Version: 1.7.0rc0
+Version: 1.7.2
 Summary: Infrahub is taking a new approach to Infrastructure Management by providing a new generation of datastore to organize and control all the data that defines how an infrastructure should run.
 Project-URL: Homepage, https://opsmill.com
 Project-URL: Repository, https://github.com/opsmill/infrahub
@@ -17,7 +17,7 @@ Requires-Dist: aio-pika<9.5,>=9.4
 Requires-Dist: aiodataloader==0.4.3
 Requires-Dist: ariadne-codegen==0.15.3
 Requires-Dist: asgi-correlation-id==4.2.0
-Requires-Dist: authlib==1.6.5
+Requires-Dist: authlib==1.6.6
 Requires-Dist: bcrypt<4.2,>=4.1
 Requires-Dist: boto3==1.34.129
 Requires-Dist: cachetools-async==0.0.5
@@ -44,13 +44,13 @@ Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.39.0
 Requires-Dist: opentelemetry-instrumentation-aio-pika==0.60b0
 Requires-Dist: opentelemetry-instrumentation-fastapi==0.60b0
 Requires-Dist: prefect-redis==0.2.8
-Requires-Dist: prefect==3.6.7
+Requires-Dist: prefect==3.6.13
 Requires-Dist: pyarrow>=14
 Requires-Dist: pydantic-settings<2.9,>=2.8
 Requires-Dist: pydantic<2.13,>=2.12
 Requires-Dist: pyjwt<2.9,>=2.8
 Requires-Dist: pytest<9.1,>=9.0
-Requires-Dist: python-multipart==0.0.18
+Requires-Dist: python-multipart==0.0.22
 Requires-Dist: pyyaml<7,>=6
 Requires-Dist: redis[hiredis]==6.0.0
 Requires-Dist: rich<14,>=13
@@ -64,15 +64,15 @@ Requires-Dist: whenever==0.9.3
 Description-Content-Type: text/markdown
 
 <h1 align="center">
-  <a href=""><img src="docs/static/img/infrahub-hori.svg" alt="Infrahub" width="350"></a>
+  <a href="https://docs.infrahub.app"><img src="docs/static/img/infrahub-hori.svg" alt="Infrahub logo" width="350"></a>
 </h1>
 
 <p align="center">
 <a href="https://www.linkedin.com/company/opsmill">
-<img src="https://img.shields.io/badge/linkedin-blue?logo=LinkedIn"/>
+<img src="https://img.shields.io/badge/linkedin-blue?logo=LinkedIn" alt="LinkedIn badge"/>
 </a>
 <a href="https://discord.gg/opsmill">
-<img src="https://img.shields.io/badge/Discord-7289DA?&logo=discord&logoColor=white"/>
+<img src="https://img.shields.io/badge/Discord-7289DA?&logo=discord&logoColor=white" alt="Discord badge"/>
 </a>
 </p>
 
@@ -131,7 +131,7 @@ If you need help, support for the community version of Infrahub is provided on [
 To help our community with the creation of contributions, please view our [CONTRIBUTING](./CONTRIBUTING.md) page.
 
 <a  href="https://github.com/opsmill/infrahub/graphs/contributors">
-<img  src="https://contrib.rocks/image?repo=opsmill/infrahub" />
+<img src="https://contrib.rocks/image?repo=opsmill/infrahub" alt="Contributors"/>
 </a>
 
 ## Security