infrahub-server 1.1.3__py3-none-any.whl → 1.1.4__py3-none-any.whl

infrahub/api/schema.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Sequence
 
 from fastapi import APIRouter, Depends, Query, Request
 from pydantic import (
@@ -128,13 +128,26 @@ class SchemaUpdate(BaseModel):
         return self.hash != self.previous_hash
 
 
+def _merge_candidate_schemas(schemas: Sequence[SchemaRoot]) -> SchemaRoot:
+    """Merge multiple schemas into one suitable to be loaded."""
+    if not schemas:
+        raise ValueError("Cannot merge an empty list of schemas")
+
+    merged = schemas[0]
+    for schema in schemas[1:]:
+        merged = merged.merge(schema=schema)
+
+    return merged
+
+
 def evaluate_candidate_schemas(
     branch_schema: SchemaBranch, schemas_to_evaluate: SchemasLoadAPI
 ) -> tuple[SchemaBranch, SchemaUpdateValidationResult]:
     candidate_schema = branch_schema.duplicate()
+    schema = _merge_candidate_schemas(schemas=schemas_to_evaluate.schemas)
+
     try:
-        for schema in schemas_to_evaluate.schemas:
-            candidate_schema.load_schema(schema=schema)
+        candidate_schema.load_schema(schema=schema)
         candidate_schema.process()
 
         schema_diff = branch_schema.diff(other=candidate_schema)

infrahub/config.py

@@ -585,7 +585,6 @@ class AnalyticsSettings(BaseSettings):
 
 class ExperimentalFeaturesSettings(BaseSettings):
     model_config = SettingsConfigDict(env_prefix="INFRAHUB_EXPERIMENTAL_")
-    pull_request: bool = False
     graphql_enums: bool = False
 
 

infrahub/core/constants/__init__.py

@@ -120,7 +120,12 @@ class AllowOverrideType(InfrahubStringEnum):
 
 class ContentType(InfrahubStringEnum):
     APPLICATION_JSON = "application/json"
+    APPLICATION_YAML = "application/yaml"
+    APPLICATION_XML = "application/xml"
     TEXT_PLAIN = "text/plain"
+    TEXT_MARKDOWN = "text/markdown"
+    TEXT_CSV = "text/csv"
+    IMAGE_SVG = "image/svg+xml"
 
 
 class CheckType(InfrahubStringEnum):

infrahub/core/schema/__init__.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import uuid
 from typing import Any, Optional, TypeAlias, Union
 
+from infrahub_sdk.utils import deep_merge_dict
 from pydantic import BaseModel, ConfigDict, Field
 
 from infrahub.core.constants import RESTRICTED_NAMESPACES
@@ -86,6 +87,10 @@ class SchemaRoot(BaseModel):
                 if not item.id:
                     item.id = str(uuid.uuid4())
 
+    def merge(self, schema: SchemaRoot) -> SchemaRoot:
+        """Return a new `SchemaRoot` after merging `self` with `schema`."""
+        return SchemaRoot.model_validate(deep_merge_dict(dicta=self.model_dump(), dictb=schema.model_dump()))
+
 
 internal_schema = internal.to_dict()
 

infrahub_sdk/analyzer.py

@@ -91,7 +91,7 @@ class GraphQLQueryAnalyzer:
                     else:
                         data["default_value"] = variable.default_value.value
 
-                if not data.get("default_value", None) and non_null:
+                if not data.get("default_value") and non_null:
                     data["required"] = True
 
                 response.append(GraphQLQueryVariable(**data))

infrahub_sdk/checks.py

@@ -8,9 +8,10 @@ from abc import abstractmethod
 from typing import TYPE_CHECKING, Any
 
 import ujson
-from git.repo import Repo
 from pydantic import BaseModel, Field
 
+from infrahub_sdk.repository import GitRepoManager
+
 from .exceptions import UninitializedError
 
 if TYPE_CHECKING:
@@ -43,7 +44,7 @@ class InfrahubCheck:
         params: dict | None = None,
         client: InfrahubClient | None = None,
     ):
-        self.git: Repo | None = None
+        self.git: GitRepoManager | None = None
         self.initializer = initializer or InfrahubCheckInitializer()
 
         self.logs: list[dict[str, Any]] = []
@@ -137,10 +138,9 @@ class InfrahubCheck:
             return self.branch
 
         if not self.git:
-            self.git = Repo(self.root_directory)
+            self.git = GitRepoManager(self.root_directory)
 
         self.branch = str(self.git.active_branch)
-
         return self.branch
 
     @abstractmethod

infrahub_sdk/client.py

@@ -547,8 +547,10 @@ class InfrahubClient(BaseClient):
         at: Timestamp | None = None,
         branch: str | None = None,
         timeout: int | None = None,
+        **kwargs: Any,
     ) -> int:
         """Return the number of nodes of a given kind."""
+        filters = kwargs
         schema = await self.schema.get(kind=kind, branch=branch)
 
         branch = branch or self.default_branch
@@ -556,7 +558,10 @@ class InfrahubClient(BaseClient):
             at = Timestamp(at)
 
         response = await self.execute_graphql(
-            query=Query(query={schema.kind: {"count": None}}).render(), branch_name=branch, at=at, timeout=timeout
+            query=Query(query={schema.kind: {"count": None, "@filters": filters}}).render(),
+            branch_name=branch,
+            at=at,
+            timeout=timeout,
         )
         return int(response.get(schema.kind, {}).get("count", 0))
 
@@ -781,7 +786,7 @@ class InfrahubClient(BaseClient):
             nodes = []
             related_nodes = []
             batch_process = await self.create_batch()
-            count = await self.count(kind=schema.kind)
+            count = await self.count(kind=schema.kind, **filters)
             total_pages = (count + pagination_size - 1) // pagination_size
 
             for page_number in range(1, total_pages + 1):
@@ -1181,7 +1186,7 @@ class InfrahubClient(BaseClient):
     async def allocate_next_ip_address(
         self,
         resource_pool: CoreNode,
-        kind: Literal[None] = ...,
+        kind: None = ...,
         identifier: str | None = ...,
         prefix_length: int | None = ...,
         address_type: str | None = ...,
@@ -1196,7 +1201,7 @@ class InfrahubClient(BaseClient):
     async def allocate_next_ip_address(
         self,
         resource_pool: CoreNode,
-        kind: Literal[None] = ...,
+        kind: None = ...,
         identifier: str | None = ...,
         prefix_length: int | None = ...,
         address_type: str | None = ...,
@@ -1211,7 +1216,7 @@ class InfrahubClient(BaseClient):
     async def allocate_next_ip_address(
         self,
         resource_pool: CoreNode,
-        kind: Literal[None] = ...,
+        kind: None = ...,
         identifier: str | None = ...,
         prefix_length: int | None = ...,
         address_type: str | None = ...,
@@ -1328,7 +1333,7 @@ class InfrahubClient(BaseClient):
     async def allocate_next_ip_prefix(
         self,
         resource_pool: CoreNode,
-        kind: Literal[None] = ...,
+        kind: None = ...,
         identifier: str | None = ...,
         prefix_length: int | None = ...,
         member_type: str | None = ...,
@@ -1344,7 +1349,7 @@ class InfrahubClient(BaseClient):
     async def allocate_next_ip_prefix(
         self,
         resource_pool: CoreNode,
-        kind: Literal[None] = ...,
+        kind: None = ...,
         identifier: str | None = ...,
         prefix_length: int | None = ...,
         member_type: str | None = ...,
@@ -1360,7 +1365,7 @@ class InfrahubClient(BaseClient):
     async def allocate_next_ip_prefix(
         self,
         resource_pool: CoreNode,
-        kind: Literal[None] = ...,
+        kind: None = ...,
         identifier: str | None = ...,
         prefix_length: int | None = ...,
         member_type: str | None = ...,
@@ -1651,8 +1656,10 @@ class InfrahubClientSync(BaseClient):
         at: Timestamp | None = None,
         branch: str | None = None,
         timeout: int | None = None,
+        **kwargs: Any,
     ) -> int:
         """Return the number of nodes of a given kind."""
+        filters = kwargs
         schema = self.schema.get(kind=kind, branch=branch)
 
         branch = branch or self.default_branch
@@ -1660,7 +1667,10 @@ class InfrahubClientSync(BaseClient):
             at = Timestamp(at)
 
         response = self.execute_graphql(
-            query=Query(query={schema.kind: {"count": None}}).render(), branch_name=branch, at=at, timeout=timeout
+            query=Query(query={schema.kind: {"count": None, "@filters": filters}}).render(),
+            branch_name=branch,
+            at=at,
+            timeout=timeout,
         )
         return int(response.get(schema.kind, {}).get("count", 0))
 
@@ -1920,7 +1930,7 @@ class InfrahubClientSync(BaseClient):
             related_nodes = []
             batch_process = self.create_batch()
 
-            count = self.count(kind=schema.kind)
+            count = self.count(kind=schema.kind, **filters)
             total_pages = (count + pagination_size - 1) // pagination_size
 
             for page_number in range(1, total_pages + 1):
@@ -2296,7 +2306,7 @@ class InfrahubClientSync(BaseClient):
     def allocate_next_ip_address(
         self,
         resource_pool: CoreNodeSync,
-        kind: Literal[None] = ...,
+        kind: None = ...,
         identifier: str | None = ...,
         prefix_length: int | None = ...,
         address_type: str | None = ...,
@@ -2311,7 +2321,7 @@ class InfrahubClientSync(BaseClient):
     def allocate_next_ip_address(
         self,
         resource_pool: CoreNodeSync,
-        kind: Literal[None] = ...,
+        kind: None = ...,
         identifier: str | None = ...,
         prefix_length: int | None = ...,
         address_type: str | None = ...,
@@ -2326,7 +2336,7 @@ class InfrahubClientSync(BaseClient):
     def allocate_next_ip_address(
         self,
         resource_pool: CoreNodeSync,
-        kind: Literal[None] = ...,
+        kind: None = ...,
         identifier: str | None = ...,
         prefix_length: int | None = ...,
         address_type: str | None = ...,
@@ -2439,7 +2449,7 @@ class InfrahubClientSync(BaseClient):
     def allocate_next_ip_prefix(
         self,
         resource_pool: CoreNodeSync,
-        kind: Literal[None] = ...,
+        kind: None = ...,
         identifier: str | None = ...,
         prefix_length: int | None = ...,
         member_type: str | None = ...,
@@ -2455,7 +2465,7 @@ class InfrahubClientSync(BaseClient):
     def allocate_next_ip_prefix(
         self,
         resource_pool: CoreNodeSync,
-        kind: Literal[None] = ...,
+        kind: None = ...,
         identifier: str | None = ...,
         prefix_length: int | None = ...,
         member_type: str | None = ...,
@@ -2471,7 +2481,7 @@ class InfrahubClientSync(BaseClient):
     def allocate_next_ip_prefix(
         self,
         resource_pool: CoreNodeSync,
-        kind: Literal[None] = ...,
+        kind: None = ...,
         identifier: str | None = ...,
         prefix_length: int | None = ...,
         member_type: str | None = ...,

infrahub_sdk/generator.py

@@ -4,7 +4,7 @@ import os
 from abc import abstractmethod
 from typing import TYPE_CHECKING
 
-from git.repo import Repo
+from infrahub_sdk.repository import GitRepoManager
 
 from .exceptions import UninitializedError
 
@@ -30,7 +30,7 @@ class InfrahubGenerator:
     ) -> None:
         self.query = query
         self.branch = branch
-        self.git: Repo | None = None
+        self.git: GitRepoManager | None = None
         self.params = params or {}
         self.root_directory = root_directory or os.getcwd()
         self.generator_instance = generator_instance
@@ -81,7 +81,7 @@ class InfrahubGenerator:
             return self.branch
 
         if not self.git:
-            self.git = Repo(self.root_directory)
+            self.git = GitRepoManager(self.root_directory)
 
         self.branch = str(self.git.active_branch)
 

infrahub_sdk/node.py

@@ -1074,7 +1074,7 @@ class InfrahubNode(InfrahubNodeBase):
         timeout: int | None = None,
     ) -> Self:
         if not schema:
-            node_kind = data.get("__typename", None) or data.get("node", {}).get("__typename", None)
+            node_kind = data.get("__typename") or data.get("node", {}).get("__typename", None)
             if not node_kind:
                 raise ValueError("Unable to determine the type of the node, __typename not present in data")
             schema = await client.schema.get(kind=node_kind, branch=branch, timeout=timeout)
@@ -1594,7 +1594,7 @@ class InfrahubNodeSync(InfrahubNodeBase):
         timeout: int | None = None,
     ) -> Self:
         if not schema:
-            node_kind = data.get("__typename", None) or data.get("node", {}).get("__typename", None)
+            node_kind = data.get("__typename") or data.get("node", {}).get("__typename", None)
             if not node_kind:
                 raise ValueError("Unable to determine the type of the node, __typename not present in data")
             schema = client.schema.get(kind=node_kind, branch=branch, timeout=timeout)

infrahub_sdk/pytest_plugin/items/base.py

@@ -6,7 +6,6 @@ from typing import TYPE_CHECKING, Any
 
 import pytest
 import ujson
-from git.exc import InvalidGitRepositoryError
 
 from ..exceptions import InvalidResourceConfigError
 from ..models import InfrahubInputOutputTest
@@ -28,7 +27,6 @@ class InfrahubItem(pytest.Item):
         **kwargs: dict[str, Any],
     ):
         super().__init__(*args, **kwargs)  # type: ignore[arg-type]
-
         self.resource_name: str = resource_name
         self.resource_config: InfrahubRepositoryConfigElement = resource_config
         self.test: InfrahubTest = test
@@ -68,9 +66,6 @@ class InfrahubItem(pytest.Item):
         """Run the test logic."""
 
     def repr_failure(self, excinfo: pytest.ExceptionInfo, style: str | None = None) -> str:  # noqa: ARG002
-        if isinstance(excinfo.value, InvalidGitRepositoryError):
-            return f"Invalid Git repository at {excinfo.value}"
-
         return str(excinfo.value)
 
     def reportinfo(self) -> tuple[Path | str, int | None, str]:

infrahub_sdk/repository.py

@@ -0,0 +1,33 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+from dulwich import porcelain
+from dulwich.repo import Repo
+
+
+class GitRepoManager:
+    def __init__(self, root_directory: str, branch: str = "main"):
+        self.root_directory = root_directory
+        self.branch = branch
+        self.git: Repo = self.initialize_repo()
+
+    def initialize_repo(self) -> Repo:
+        # Check if the directory already has a repository
+
+        root_path = Path(self.root_directory)
+
+        if root_path.exists() and (root_path / ".git").is_dir():
+            repo = Repo(self.root_directory)  # Open existing repo
+        else:
+            repo = Repo.init(self.root_directory, default_branch=self.branch.encode("utf-8"))
+
+        if not repo:
+            raise ValueError("Failed to initialize or open a repository.")
+
+        return repo
+
+    @property
+    def active_branch(self) -> str | None:
+        active_branch = porcelain.active_branch(self.root_directory).decode("utf-8")
+        return active_branch

infrahub_sdk/testing/repository.py

@@ -7,10 +7,11 @@ from enum import Enum
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from git.repo import Repo
+from dulwich import porcelain
 
 from infrahub_sdk.graphql import Mutation
 from infrahub_sdk.protocols import CoreGenericRepository
+from infrahub_sdk.repository import GitRepoManager
 
 if TYPE_CHECKING:
     from infrahub_sdk import InfrahubClient
@@ -37,14 +38,14 @@ class GitRepo:
 
     type: GitRepoType = GitRepoType.INTEGRATED
 
-    _repo: Repo | None = None
+    _repo: GitRepoManager | None = None
     initial_branch: str = "main"
     directories_to_ignore: list[str] = field(default_factory=list)
     remote_directory_name: str = "/remote"
     _branches: list[str] = field(default_factory=list)
 
     @property
-    def repo(self) -> Repo:
+    def repo(self) -> GitRepoManager:
         if self._repo:
             return self._repo
         raise ValueError("Repo hasn't been initialized yet")
@@ -62,12 +63,17 @@ class GitRepo:
             dst=self.dst_directory / self.name,
             ignore=shutil.ignore_patterns(".git"),
         )
-        self._repo = Repo.init(self.dst_directory / self.name, initial_branch=self.initial_branch)
-        for untracked in self.repo.untracked_files:
-            self.repo.index.add(untracked)
-        self.repo.index.commit("First commit")
 
-        self.repo.git.checkout(self.initial_branch)
+        self._repo = GitRepoManager(str(Path(self.dst_directory / self.name)), branch=self.initial_branch)
+
+        files = list(
+            porcelain.get_untracked_paths(self._repo.git.path, self._repo.git.path, self._repo.git.open_index())
+        )
+        files_to_add = [str(Path(self._repo.git.path) / t) for t in files]
+        if files_to_add:
+            porcelain.add(repo=self._repo.git.path, paths=files_to_add)
+            porcelain.commit(repo=self._repo.git.path, message="First commit")
+            porcelain.checkout_branch(self._repo.git, self.initial_branch.encode("utf-8"))
 
     async def add_to_infrahub(self, client: InfrahubClient, branch: str | None = None) -> dict:
         input_data = {

infrahub_sdk/transforms.py

@@ -5,7 +5,7 @@ import os
 from abc import abstractmethod
 from typing import TYPE_CHECKING, Any
 
-from git import Repo
+from infrahub_sdk.repository import GitRepoManager
 
 from .exceptions import UninitializedError
 
@@ -27,7 +27,7 @@ class InfrahubTransform:
         server_url: str = "",
         client: InfrahubClient | None = None,
     ):
-        self.git: Repo
+        self.git: GitRepoManager
 
         self.branch = branch
         self.server_url = server_url or os.environ.get("INFRAHUB_URL", "http://127.0.0.1:8000")
@@ -56,7 +56,7 @@ class InfrahubTransform:
             return self.branch
 
         if not hasattr(self, "git") or not self.git:
-            self.git = Repo(self.root_directory)
+            self.git = GitRepoManager(self.root_directory)
 
         self.branch = str(self.git.active_branch)
 

infrahub_sdk/utils.py

@@ -9,13 +9,14 @@ from uuid import UUID, uuid4
 
 import httpx
 import ujson
-from git.repo import Repo
 from graphql import (
     FieldNode,
     InlineFragmentNode,
     SelectionSetNode,
 )
 
+from infrahub_sdk.repository import GitRepoManager
+
 from .exceptions import JsonDecodeError
 
 if TYPE_CHECKING:
@@ -135,8 +136,12 @@ def deep_merge_dict(dicta: dict, dictb: dict, path: list | None = None) -> dict:
         if key in dicta:
             if isinstance(dicta[key], dict) and isinstance(dictb[key], dict):
                 deep_merge_dict(dicta[key], dictb[key], path + [str(key)])
+            elif isinstance(dicta[key], list) and isinstance(dictb[key], list):
+                # Merge lists
+                # Cannot use compare_list because list of dicts won't work (dict not hashable)
+                dicta[key] = [i for i in dicta[key] if i not in dictb[key]] + dictb[key]
             elif dicta[key] == dictb[key]:
-                pass
+                continue
             else:
                 raise ValueError("Conflict at %s" % ".".join(path + [str(key)]))
         else:
@@ -246,7 +251,7 @@ def get_branch(branch: str | None = None, directory: str | Path = ".") -> str:
     if branch:
         return branch
 
-    repo = Repo(directory)
+    repo = GitRepoManager(directory)
     return str(repo.active_branch)
 
 

{infrahub_server-1.1.3.dist-info → infrahub_server-1.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: infrahub-server
-Version: 1.1.3
+Version: 1.1.4
 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.
 Home-page: https://opsmill.com
 License: AGPL-3.0-only
@@ -20,6 +20,7 @@ Requires-Dist: asgi-correlation-id (==4.2.0)
 Requires-Dist: authlib (==1.3.2)
 Requires-Dist: bcrypt (>=4.1,<4.2)
 Requires-Dist: boto3 (==1.34.129)
+Requires-Dist: dulwich (>=0.22.7,<0.23.0)
 Requires-Dist: email-validator (>=2.1,<2.2)
 Requires-Dist: fastapi (>=0.115,<0.116)
 Requires-Dist: fastapi-storages (>=0.3,<0.4)

{infrahub_server-1.1.3.dist-info → infrahub_server-1.1.4.dist-info}/RECORD

@@ -14,7 +14,7 @@ infrahub/api/menu.py,sha256=xp5bj5JXQZA6ZEPWoTSGGSfTXZ1sVmehMxr3VSG7FlQ,1216
 infrahub/api/oauth2.py,sha256=9rOAM2DPvuS25lHPc6M2YRx0Aso1NDHqqk62SevnMpE,5517
 infrahub/api/oidc.py,sha256=wyQXVVqQ0-GFhcVTtB2FwHC8AxV-pwGffRwdaSV7V2E,7240
 infrahub/api/query.py,sha256=uZ93JJpaLzj9Y3O6IzxFGasLY26XTHLlyrwIJHd_kyg,6976
-infrahub/api/schema.py,sha256=XqeHJVH-iVYqeDXngFDZmJenym5uiAxpjHiItD_R7rA,16232
+infrahub/api/schema.py,sha256=1IS6H03fplhkyXa9v0uADiIhz1bad04L95xStNGb1sY,16611
 infrahub/api/static/redoc.standalone.js,sha256=77kGx7mVN9EcdER2ZM4gQ-E-ra_N6AZq9QseAeD6kt0,1042008
 infrahub/api/static/swagger-ui-bundle.js,sha256=wuSp7wgUSDn_R8FCAgY-z-TlnnCk5xVKJr1Q2IDIi6E,1452753
 infrahub/api/static/swagger-ui.css,sha256=QBcPDuhZ0X-SExunBzKaiKBw5PZodNETZemnfSMvYRc,152071
@@ -33,7 +33,7 @@ infrahub/computed_attribute/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 infrahub/computed_attribute/constants.py,sha256=oTMPEfRuf2mcfCkBpRLWRALO6nsLHpFm9jJGu0lowS4,446
 infrahub/computed_attribute/models.py,sha256=icUzsu0DrGoxMkBVXpNiv17rMo0OwpSE-QBJyWblMM0,2637
 infrahub/computed_attribute/tasks.py,sha256=xjRHUz48L6IxE7UjSUMHp7UZCoFFaO-N8FCelK4Y4nY,33141
-infrahub/config.py,sha256=mNcTgvUAgehC08so2D-U8LRH0Ft20xWOaPVgW3Rjwlo,33636
+infrahub/config.py,sha256=DQFXa6e6nbW6McdLVViuCcKYlGjw9ytmYDsKU5l-Jdo,33605
 infrahub/core/__init__.py,sha256=z6EJBZyCYCBqinoBtX9li6BTBbbGV8WCkE_4CrEsmDA,104
 infrahub/core/account.py,sha256=sggpuO_QpwYH7wXG_lZDnrB5Izmej486o_CYiYjYin8,26497
 infrahub/core/attribute.py,sha256=sDhl2BBoX_Q3BR6v8lZE85j5wIuXvswATiCC57tPoqU,42045
@@ -42,7 +42,7 @@ infrahub/core/branch/constants.py,sha256=RJxn6dPZGXrnkmOYcRkx6h7IYFp_RCOgoupj1Br
 infrahub/core/branch/flow_models.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/core/branch/models.py,sha256=dX37fBbHA84WS7Se2nwSwvOyF4bZVVzZ3oXsV46x-so,19607
 infrahub/core/branch/tasks.py,sha256=JgjwBafBfn2CdTLr93dP6zVxqoJnAbY4FdXACrNJMdU,18448
-infrahub/core/constants/__init__.py,sha256=lky12uWG2bXKVuTXhPz-HVBU4nhx_mF5nmpHw93admA,6688
+infrahub/core/constants/__init__.py,sha256=CWAeCuj5sPjJMmCK1l3bniRT_s2dEHAOJ7tny9RqpKM,6864
 infrahub/core/constants/database.py,sha256=lxesWX2z6SZgGok1bAY6_pCBm5rFfu7k4ayMBr6w_Vo,336
 infrahub/core/constants/infrahubkind.py,sha256=UVPYZdsUDjG0LvfCLgKdnJC12dFlpCC6YH2Mp-N7Zp4,2378
 infrahub/core/constants/relationship_label.py,sha256=AWbWghu5MoAKg2DBE-ysdzSOXnWoWdBn98zpIHzn_co,87
@@ -199,7 +199,7 @@ infrahub/core/relationship/constraints/peer_kind.py,sha256=d0Ca4tLt45kU1yfe3UN79
 infrahub/core/relationship/constraints/profiles_kind.py,sha256=ztnc5uh84h-IANHxn6HfIHcJJf4Cga_3waXEh7eIMrQ,2449
 infrahub/core/relationship/model.py,sha256=aAck4EmVsw0DLbT71JeLt8kV7q2QyDi_yzYST6Xu4Z4,44729
 infrahub/core/root.py,sha256=8ZLSOtnmjQcrjqX2vxNO-AGopEUArmBPo_X5NeZBdP0,416
-infrahub/core/schema/__init__.py,sha256=czgGfv5LMkbmNPlr_uCJAdqArvXQNAfyCAi7vorcQzg,3637
+infrahub/core/schema/__init__.py,sha256=0L8vLxx7VwuqCkySA3PgZa91rfnIWeQcuwfeDqFqMZM,3926
 infrahub/core/schema/attribute_schema.py,sha256=oyU-Z8BFLnyEy1q41uukfVQKMUevS0sZ8Ug2m_J3MXk,5022
 infrahub/core/schema/basenode_schema.py,sha256=wPw-qYh1utxjWzLcrwZ8col8ZukfAx7HBPfI1Qici6U,19507
 infrahub/core/schema/computed_attribute.py,sha256=Hf5_2p01SSaIJ_oo4Vkpw7E_Z2FtV_8M0RB1Ol4IebA,1825
@@ -579,12 +579,12 @@ infrahub/workflows/models.py,sha256=Egyrlxsl3QiW7vITis7Lg8MznG9QLCUs9_KHzf_Qh3c,
 infrahub/workflows/utils.py,sha256=oXeQY0Zx3xOLi0ghQZXVBAZcr6lQPaOjCJ9iya1ZNos,2554
 infrahub_sdk/__init__.py,sha256=weZAa06Ar0NO5IOKLQICtCceHUCKQxbkBxHebqQGJ1o,401
 infrahub_sdk/_importer.py,sha256=8oHTMxa_AMO_qbfb3UXNfjSr31S5YJTcqe-YMrixY_E,2257
-infrahub_sdk/analyzer.py,sha256=ejvt1xvQ6_Zbt2Etd44wwT5nesBckbbzOChJT44BsmM,4154
+infrahub_sdk/analyzer.py,sha256=UDJN372vdAiuAv2TEyPUlsSVoUfZN6obWkIokNNaHbA,4148
 infrahub_sdk/async_typer.py,sha256=Gj7E8EGdjA-XF404vr9cBt20mmbroQh7N68HXhWYx00,892
 infrahub_sdk/batch.py,sha256=WSAPAPvRvcHR7aCFH56RcqKaVxsig1A5nIdg0mmSZBQ,3879
 infrahub_sdk/branch.py,sha256=hmtoIekQ1uusoJ6yEKlw6vrFMTAHJrXu-YsqqCQC_kc,12716
-infrahub_sdk/checks.py,sha256=fm-TBXlb0VnNlxf_1JVHXqRXAjsqLUmsbajBWAvDPRo,5655
-infrahub_sdk/client.py,sha256=eKBXdtloCkaNSJyQ5CcUUGszkF0zsyLFT8wSmwyBbGg,99466
+infrahub_sdk/checks.py,sha256=AmlCim-9Mbhpye_yYAaV_NM-pFL4_JvQGEVM3cJsaqY,5700
+infrahub_sdk/client.py,sha256=yuD-uvx_5LLXqHm9sjo0jei1AH-xGgl4DhYJcoqH8uw,99592
 infrahub_sdk/code_generator.py,sha256=UJoqofjO7WSHygORhok0RRUv7HG4aTcl6htczaKNBjc,4411
 infrahub_sdk/config.py,sha256=hjF4Fo6NrxxLHaS1XBZ1O2o0aU7IILEyhPXRiiRedjc,7190
 infrahub_sdk/constants.py,sha256=Ca66r09eDzpmMhfFAspKFSehSxOmoflVongP-UuBDc4,138
@@ -613,11 +613,11 @@ infrahub_sdk/ctl/validate.py,sha256=6DHhk6ubZih-FaNfX6m8G0HwOEJuJk6DFHCg1oAaZtQ,
 infrahub_sdk/data.py,sha256=t3jCqmnYM8rhTZlPlc37aW8zKMKLLVcTWHozH9qb0Bs,870
 infrahub_sdk/diff.py,sha256=Ms-3YyXo-DoF1feV9qP7GKakBYUNFsULZdy-yMEG71w,4258
 infrahub_sdk/exceptions.py,sha256=S563xPBgwvdXkVS42XLLTuCkdVnrXOZyDSY8aFd3udc,4436
-infrahub_sdk/generator.py,sha256=AI9Zl4aygoJHZa4vlGMpy1aSx7h1EFkSJxe4ULYy1g0,5197
+infrahub_sdk/generator.py,sha256=TVxSDByNnnuqFOpmi2mBgUZnU07PudvH8J-aM8QtwMM,5242
 infrahub_sdk/graphql.py,sha256=qw1HJ95-JhRS_zrsyDj5P_PWKuUNgoXvH1q-Kfs27IA,5861
 infrahub_sdk/groups.py,sha256=GL14ByW4GHrkqOLJ-_vGhu6bkYDxljqPtkErcQVehv0,711
 infrahub_sdk/jinja2.py,sha256=lTfV9E_P5gApaX6RW9M8U8oixQi-0H3U8wcs8fdGVaU,1150
-infrahub_sdk/node.py,sha256=qip_0VxnfxzcD3ag7mZK4R83J3Ra1kkEDpHmLlkDh8I,87496
+infrahub_sdk/node.py,sha256=kwVswivc5kPnmzXjFB8Mt-BFbLhOQcp70PMl63CmkIc,87484
 infrahub_sdk/object_store.py,sha256=d-EDnxPpw_7BsbjbGbH50rjt-1-Ojj2zNrhFansP5hA,4299
 infrahub_sdk/playback.py,sha256=ubkY1LiW_wFwm4auerdQ0zFJcFJZ1SYQT6-d4bxzaLg,1906
 infrahub_sdk/protocols.py,sha256=vmAuV_IjjbslSshrmFjKYcSMtyzi0vlgwj9UufCo4Hc,21233
@@ -625,7 +625,7 @@ infrahub_sdk/protocols_base.py,sha256=9aE5K2mwZ0xAza_yBppVWVRDds9ALhQqJofOjT-Ala
 infrahub_sdk/pytest_plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub_sdk/pytest_plugin/exceptions.py,sha256=ek2WyTBPuZdxhJClOhLo4EcFdvgE4BP0q26OiAr-Sec,2185
 infrahub_sdk/pytest_plugin/items/__init__.py,sha256=Au90dLk6lbSgRAoqrZOdYJ6m0lwFJYHFiAQHrcc6_rI,1026
-infrahub_sdk/pytest_plugin/items/base.py,sha256=76UFlFxb9D2umZFdSLPERNrANgqMB4QLkLDaGucCcNo,3245
+infrahub_sdk/pytest_plugin/items/base.py,sha256=-S7Xp3Zf7oQkw8EuqUI9lWWBzhKTfNdkn0UUjSqX9Zc,3068
 infrahub_sdk/pytest_plugin/items/check.py,sha256=cEF9jC61EJzlYCf1YUGF241XO7F7zhkHAg2T_EPmIN8,3364
 infrahub_sdk/pytest_plugin/items/graphql_query.py,sha256=DfYF9hdnhHEHqPCMd7wq0XQaY8HnQXlAjMbalc3UfdI,2346
 infrahub_sdk/pytest_plugin/items/jinja2_transform.py,sha256=qmsJqOXnTNzJFp2zR4uC3FJEGTL7Pci7T5LhOGDNfLE,5360
@@ -637,6 +637,7 @@ infrahub_sdk/pytest_plugin/utils.py,sha256=AfSAgRXBGdx__8MNQJG7faw68ioZzk37CM4ZP
 infrahub_sdk/queries.py,sha256=s4gnx67e-MNg-3jP4Vx1jreO9uiW3uYPllFQgaTODdQ,2308
 infrahub_sdk/query_groups.py,sha256=Hg6MdjU9wSWQmtKktlmKCHcwjlodz7L_VPPou-jC8vk,11434
 infrahub_sdk/recorder.py,sha256=G134AfAwE5efSqArVJneurF2JIEuhvSJWWI3woPczgI,2194
+infrahub_sdk/repository.py,sha256=PbSHHl6ajIeZu1t4pH1j7qzR-DPOkGuzubcNM02NuV0,1011
 infrahub_sdk/schema/__init__.py,sha256=RINn1qvejp88Y57Ov1D7ceYkxV2gpYMucldJPiNkjLU,25879
 infrahub_sdk/schema/main.py,sha256=rySdEBJNMVpulWKMRw3ARqSbZPiFBHRYR2nqZvYp1VY,10580
 infrahub_sdk/schema/repository.py,sha256=AAITXGprCPb2WptJSRhj9gEbRrW1HHM-yEPYAgsztcU,11299
@@ -644,10 +645,9 @@ infrahub_sdk/spec/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 infrahub_sdk/spec/menu.py,sha256=LvNLuBEkiLTMNgM3kseIzM7wQ_zK_2uXM_anUNu6Pfc,1059
 infrahub_sdk/spec/object.py,sha256=H55fctUrQUDbRrRJJQQcXHppVOeMye6ykBoo6lCasDw,5012
 infrahub_sdk/store.py,sha256=kWJ9UvirLuSHLuDDzTd4-ualTkuRocy9W0J7TdL60Po,5734
-infrahub_sdk/task_report.py,sha256=17z02C1g2mkHRoUBAzAgGVLeHXw7X1YHxBLyJ5b8a_M,6400
 infrahub_sdk/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub_sdk/testing/docker.py,sha256=V089h9fGjNnXVdw7Fw-mloSBgSnjXT9rvnDpj7cecoI,724
-infrahub_sdk/testing/repository.py,sha256=hD-3Yg9UZa0LUKmJTgD0K29iAJo0_C5vJw-l1Zqlhvs,3194
+infrahub_sdk/testing/repository.py,sha256=9s4MMaMljbJe97Ua4bJgc64giQ2UMC0bD5qIqYd4YNk,3571
 infrahub_sdk/testing/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub_sdk/testing/schemas/animal.py,sha256=5frpoBCeGaM05X8sFxIDQUH93JrPsa-kIYKb8xcQxcw,6796
 infrahub_sdk/testing/schemas/car_person.py,sha256=1VwgJMJvVggsQyRdSqDjiLrPzysz8cXFSFzSghVSVms,8940
@@ -663,17 +663,17 @@ infrahub_sdk/transfer/importer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 infrahub_sdk/transfer/importer/interface.py,sha256=TN7FH_LgThkBjrpWwkdTZIVJPtNklAYiK3Mn6RPs7IM,195
 infrahub_sdk/transfer/importer/json.py,sha256=-Tlmg22TiBrEqXOSLMnUzlCFOZ2M0Q8lWyPbwjUjifw,9654
 infrahub_sdk/transfer/schema_sorter.py,sha256=ZoBjJGFT-6jQoKOLaoOPMAWzs7vGOeo7x6zOOP4LNv0,1244
-infrahub_sdk/transforms.py,sha256=1M6x5xwQywGert341YRNGzV09aQVouD-gop5446zfJQ,2508
+infrahub_sdk/transforms.py,sha256=5fmoBBKWGhFCu0NLKlSF95GAbbCi2k25zWiWjtsd2dA,2558
 infrahub_sdk/types.py,sha256=UeZ1rDp4eyH12ApTcUD9a1OOtCp3IL1YZUeeZ06qF-I,1726
-infrahub_sdk/utils.py,sha256=sdCyW4t1wphXwY6kicR9g_ufhwATmRMzJA-4BT1rS9U,10730
+infrahub_sdk/utils.py,sha256=5rnk-ZfMoMvNHH72D0Bb5OVRjyk6cJ__UoKvZlUNzns,11064
 infrahub_sdk/uuidt.py,sha256=Tz-4nHkJwbi39UT3gaIe2wJeZNAoBqf6tm3sw7LZbXc,2155
 infrahub_sdk/yaml.py,sha256=dxdzEjuaG-OwF2XIcA2YXoFEmF4TeiwKju5K2uOQhgQ,2963
 infrahub_testcontainers/__init__.py,sha256=oPpmesGgYBSdKTg1L37FGwYBeao1EHury5SJGul-CT8,216
 infrahub_testcontainers/container.py,sha256=g0AOvnV3z_-wGCMOUBCaK4-U_ST38YvGXYqZbfGtKXY,4421
 infrahub_testcontainers/docker-compose.test.yml,sha256=MAF39rw6DONzZq1b2Ujndu545RI2xvOuq1PjHwc8Vto,5360
 infrahub_testcontainers/helpers.py,sha256=3K6Bbfcr19DwH9pfc-WE6ehqIUbAXx1NruVOkKJoXvY,2274
-infrahub_server-1.1.3.dist-info/LICENSE.txt,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
-infrahub_server-1.1.3.dist-info/METADATA,sha256=Mlve3PnYMfKZRLcGrMTlRdTApjWCQ7BCM40y6384IO4,4660
-infrahub_server-1.1.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-infrahub_server-1.1.3.dist-info/entry_points.txt,sha256=JNQoBcLpUyfeOMhls_-uX1CdJ8Vl-AFSh9UhzTcKdjA,329
-infrahub_server-1.1.3.dist-info/RECORD,,
+infrahub_server-1.1.4.dist-info/LICENSE.txt,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
+infrahub_server-1.1.4.dist-info/METADATA,sha256=HMfxxKxYt5GYldw7IAWcdlLApcBWgmy8EPeqg5r8Fpc,4702
+infrahub_server-1.1.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+infrahub_server-1.1.4.dist-info/entry_points.txt,sha256=JNQoBcLpUyfeOMhls_-uX1CdJ8Vl-AFSh9UhzTcKdjA,329
+infrahub_server-1.1.4.dist-info/RECORD,,

infrahub_sdk/task_report.py

@@ -1,208 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Any, Final, Protocol, TypedDict, Union, runtime_checkable
-
-from typing_extensions import Self
-
-from .uuidt import generate_uuid
-
-if TYPE_CHECKING:
-    from types import TracebackType
-
-    from .client import InfrahubClient
-
-
-class Log(TypedDict):
-    message: str
-    severity: str
-
-
-TaskLogs = Union[list[Log], Log]
-
-
-class TaskReport:
-    def __init__(
-        self,
-        client: InfrahubClient,
-        logger: InfrahubLogger,
-        related_node: str,
-        title: str,
-        task_id: str | None = None,
-        created_by: str | None = None,
-        create_with_context: bool = True,
-    ):
-        self.client = client
-        self.title = title
-        self.task_id: Final = task_id or generate_uuid()
-        self.related_node: Final = related_node
-        self.created_by: Final = created_by
-        self.has_failures: bool = False
-        self.finalized: bool = False
-        self.created: bool = False
-        self.create_with_context = create_with_context
-        self.log = logger
-
-    async def __aenter__(self) -> Self:
-        if self.create_with_context:
-            await self.create()
-        return self
-
-    async def __aexit__(
-        self,
-        exc_type: type[BaseException] | None,
-        exc_value: BaseException | None,
-        traceback: TracebackType | None,
-    ) -> None:
-        if exc_type:
-            self.finalized = True
-            await self.update(conclusion="FAILURE", logs={"message": str(exc_value), "severity": "ERROR"})
-
-        if self.finalized or not self.created:
-            return
-
-        conclusion = "FAILURE" if self.has_failures else "SUCCESS"
-        await self.update(conclusion=conclusion)
-
-    async def create(self, title: str | None = None, conclusion: str = "UNKNOWN", logs: TaskLogs | None = None) -> None:
-        variables: dict[str, Any] = {
-            "related_node": self.related_node,
-            "task_id": self.task_id,
-            "title": title or self.title,
-            "conclusion": conclusion,
-        }
-        if self.created_by:
-            variables["created_by"] = self.created_by
-        if logs:
-            variables["logs"] = logs
-
-        await self.client.execute_graphql(
-            query=CREATE_TASK,
-            variables=variables,
-        )
-        self.created = True
-
-    async def info(self, event: str, *args: Any, **kw: Any) -> None:
-        self.log.info(event, *args, **kw)
-        await self.update(logs={"severity": "INFO", "message": event})
-
-    async def warning(self, event: str, *args: Any, **kw: Any) -> None:
-        self.log.warning(event, *args, **kw)
-        await self.update(logs={"severity": "WARNING", "message": event})
-
-    async def error(self, event: str, *args: Any, **kw: Any) -> None:
-        self.log.error(event, *args, **kw)
-        self.has_failures = True
-        await self.update(logs={"severity": "ERROR", "message": event})
-
-    async def critical(self, event: str, *args: Any, **kw: Any) -> None:
-        self.log.critical(event, *args, **kw)
-        self.has_failures = True
-        await self.update(logs={"severity": "CRITICAL", "message": event})
-
-    async def exception(self, event: str, *args: Any, **kw: Any) -> None:
-        self.log.critical(event, *args, **kw)
-        self.has_failures = True
-        await self.update(logs={"severity": "CRITICAL", "message": event})
-
-    async def finalise(
-        self, title: str | None = None, conclusion: str = "SUCCESS", logs: TaskLogs | None = None
-    ) -> None:
-        self.finalized = True
-        await self.update(title=title, conclusion=conclusion, logs=logs)
-
-    async def update(
-        self, title: str | None = None, conclusion: str | None = None, logs: TaskLogs | None = None
-    ) -> None:
-        if not self.created:
-            await self.create()
-        variables: dict[str, Any] = {"task_id": self.task_id}
-        if conclusion:
-            variables["conclusion"] = conclusion
-        if title:
-            variables["title"] = title
-        if logs:
-            variables["logs"] = logs
-        await self.client.execute_graphql(query=UPDATE_TASK, variables=variables)
-
-
-class InfrahubLogger(Protocol):
-    def debug(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
-        """Send a debug event"""
-
-    def info(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
-        """Send an info event"""
-
-    def warning(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
-        """Send a warning event"""
-
-    def error(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
-        """Send an error event."""
-
-    def critical(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
-        """Send a critical event."""
-
-    def exception(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
-        """Send an exception event."""
-
-
-@runtime_checkable
-class InfrahubTaskReportLogger(Protocol):
-    async def info(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
-        """Send an info event"""
-
-    async def warning(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
-        """Send a warning event"""
-
-    async def error(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
-        """Send an error event."""
-
-    async def critical(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
-        """Send a critical event."""
-
-    async def exception(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
-        """Send an exception event."""
-
-
-CREATE_TASK = """
-mutation CreateTask(
-    $conclusion: TaskConclusion!,
-    $title: String!,
-    $task_id: UUID,
-    $related_node: String!,
-    $created_by: String,
-    $logs: [RelatedTaskLogCreateInput]
-    ) {
-    InfrahubTaskCreate(
-        data: {
-            id: $task_id,
-            title: $title,
-            related_node: $related_node,
-            conclusion: $conclusion,
-            created_by: $created_by,
-            logs: $logs
-        }
-    ) {
-        ok
-    }
-}
-"""
-
-UPDATE_TASK = """
-mutation UpdateTask(
-    $conclusion: TaskConclusion,
-    $title: String,
-    $task_id: UUID!,
-    $logs: [RelatedTaskLogCreateInput]
-    ) {
-    InfrahubTaskUpdate(
-        data: {
-            id: $task_id,
-            title: $title,
-            conclusion: $conclusion,
-            logs: $logs
-        }
-    ) {
-        ok
-    }
-}
-"""