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

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:
@@ -56,6 +57,14 @@ class RelationshipManagerBase:
     def has_update(self) -> bool:
         return self._has_update
 
+    @property
+    def is_from_profile(self) -> bool:
+        """Return whether this relationship was set from a profile. All its peers must be from a profile."""
+        if not self.peers:
+            return False
+        all_profiles = [p.is_from_profile for p in self.peers]
+        return bool(all_profiles) and all(all_profiles)
+
     def _generate_input_data(self, allocate_from_pool: bool = False) -> list[dict]:
         return [peer._generate_input_data(allocate_from_pool=allocate_from_pool) for peer in self.peers]
 
@@ -64,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.
@@ -89,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.6.2.dist-info → infrahub_server-1.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: infrahub-server
-Version: 1.6.2
+Version: 1.7.0
 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
@@ -11,9 +11,10 @@ License-File: LICENSE.txt
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: <3.13,>=3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: <3.14,>=3.12
 Requires-Dist: aio-pika<9.5,>=9.4
-Requires-Dist: aiodataloader==0.4.0
+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
@@ -24,7 +25,7 @@ Requires-Dist: click==8.1.7
 Requires-Dist: deepdiff==8.6.1
 Requires-Dist: dulwich==0.22.7
 Requires-Dist: email-validator<2.2,>=2.1
-Requires-Dist: fast-depends==2.4.12
+Requires-Dist: fast-depends==3.0.5
 Requires-Dist: fastapi-storages<0.4,>=0.3
 Requires-Dist: fastapi==0.121.1
 Requires-Dist: gitpython<4,>=3
@@ -33,22 +34,22 @@ Requires-Dist: gunicorn<24,>=23.0.0
 Requires-Dist: jinja2<4,>=3
 Requires-Dist: lunr<0.8,>=0.7.0.post1
 Requires-Dist: nats-py==2.7.2
-Requires-Dist: neo4j-rust-ext<5.29,>=5.28
-Requires-Dist: neo4j<5.29,>=5.28
+Requires-Dist: neo4j-rust-ext==6.0.3.0
+Requires-Dist: neo4j==6.0.3
 Requires-Dist: netaddr==1.3.0
 Requires-Dist: netutils==1.12.0
-Requires-Dist: numpy==1.26.2
-Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.28.1
-Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.28.1
-Requires-Dist: opentelemetry-instrumentation-aio-pika==0.49b1
-Requires-Dist: opentelemetry-instrumentation-fastapi==0.49b1
-Requires-Dist: prefect-redis==0.2.6
-Requires-Dist: prefect==3.5.0
-Requires-Dist: pyarrow<15,>=14
+Requires-Dist: numpy>=1.26.2
+Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.39.0
+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: pyarrow>=14
 Requires-Dist: pydantic-settings<2.9,>=2.8
-Requires-Dist: pydantic<2.11,>=2.10
+Requires-Dist: pydantic<2.13,>=2.12
 Requires-Dist: pyjwt<2.9,>=2.8
-Requires-Dist: pytest<7.5,>=7.4
+Requires-Dist: pytest<9.1,>=9.0
 Requires-Dist: python-multipart==0.0.18
 Requires-Dist: pyyaml<7,>=6
 Requires-Dist: redis[hiredis]==6.0.0