infrahub-server 1.2.0b1__py3-none-any.whl → 1.2.1__py3-none-any.whl

infrahub/events/validator_action.py

@@ -0,0 +1,55 @@
+from typing import ClassVar
+
+from pydantic import Field
+
+from .constants import EVENT_NAMESPACE
+from .models import InfrahubEvent
+
+
+class ValidatorEvent(InfrahubEvent):
+    """Event generated when an validator within a pipeline has started."""
+
+    node_id: str = Field(..., description="The ID of the validator")
+    kind: str = Field(..., description="The kind of the validator")
+    proposed_change_id: str = Field(..., description="The ID of the proposed change")
+
+    def get_resource(self) -> dict[str, str]:
+        return {
+            "prefect.resource.id": self.node_id,
+            "infrahub.node.kind": self.kind,
+            "infrahub.node.id": self.node_id,
+            "infrahub.branch.name": self.meta.context.branch.name,
+        }
+
+    def get_related(self) -> list[dict[str, str]]:
+        related = super().get_related()
+        related.append(
+            {
+                "prefect.resource.id": self.proposed_change_id,
+                "prefect.resource.role": "infrahub.related.node",
+                "infrahub.node.kind": "CoreProposedChange",
+            }
+        )
+
+        return related
+
+
+class ValidatorStartedEvent(ValidatorEvent):
+    """Event generated when an validator within a pipeline has started."""
+
+    event_name: ClassVar[str] = f"{EVENT_NAMESPACE}.validator.started"
+    infrahub_node_kind_event: ClassVar[bool] = True
+
+
+class ValidatorPassedEvent(ValidatorEvent):
+    """Event generated when an validator within a pipeline has completed successfully."""
+
+    event_name: ClassVar[str] = f"{EVENT_NAMESPACE}.validator.passed"
+    infrahub_node_kind_event: ClassVar[bool] = True
+
+
+class ValidatorFailedEvent(ValidatorEvent):
+    """Event generated when an validator within a pipeline has completed successfully."""
+
+    event_name: ClassVar[str] = f"{EVENT_NAMESPACE}.validator.failed"
+    infrahub_node_kind_event: ClassVar[bool] = True

infrahub/exceptions.py

@@ -1,12 +1,12 @@
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any
 
 
 class Error(Exception):
     HTTP_CODE: int = 500
     DESCRIPTION: str = "Unknown Error"
     message: str = ""
-    errors: Optional[list] = None
+    errors: list | None = None
 
     def api_response(self) -> dict[str, Any]:
         """Return error response."""
@@ -291,35 +291,26 @@ class MigrationError(Error):
 class ValidationError(Error):
     HTTP_CODE = 422
 
-    def __init__(self, input_value: Union[str, dict, list]) -> None:
+    def __init__(self, input_value: str | dict | list) -> None:
         self.message = ""
-        self.location = None
-        self.messages = {}
 
         if isinstance(input_value, str):
             self.message = input_value
-        elif isinstance(input_value, dict) and len(input_value) == 1:
-            self.message = list(input_value.values())[0]
-            self.location = list(input_value.keys())[0]
-        elif isinstance(input_value, dict) and len(input_value) > 1:
-            for key, value in input_value.items():
-                self.messages[key] = value
-
+        elif isinstance(input_value, dict):
+            self.message = ", ".join([f"{message} at {location}" for location, message in input_value.items()])
         elif isinstance(input_value, list):
-            for item in input_value:
-                if isinstance(item, self.__class__):
-                    self.messages[item.location] = item.message
-                elif isinstance(item, dict):
-                    for key, value in item.items():
-                        self.messages[key] = value
-
-        super().__init__(self.message)
+            if all(isinstance(item, ValidationError) for item in input_value):
+                self.message = ", ".join([validation_error.message for validation_error in input_value])
+            if all(isinstance(item, dict) for item in input_value):
+                messages = []
+                for item in input_value:
+                    messages.append(", ".join([f"{message} at {location}" for location, message in item.items()]))
+                self.message = ", ".join(messages)
 
-    def __str__(self) -> str:
-        if self.messages:
-            return ", ".join([f"{message} at {location}" for location, message in self.messages.items()])
+        if not self.message:
+            raise ValueError("Could not build validation error message")
 
-        return f"{self.message} at {self.location or '<Undefined>'}"
+        super().__init__(self.message)
 
 
 class DiffError(Error):
@@ -329,6 +320,14 @@ class DiffError(Error):
         self.message = message
 
 
+class HFIDViolatedError(ValidationError):
+    matching_nodes_ids: set[str]
+
+    def __init__(self, input_value: str | dict | list, matching_nodes_ids: set[str]) -> None:
+        self.matching_nodes_ids = matching_nodes_ids
+        super().__init__(input_value)
+
+
 class DiffRangeValidationError(DiffError): ...
 
 

infrahub/generators/models.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 from pydantic import BaseModel, ConfigDict, Field
 
 
@@ -9,7 +7,7 @@ class RequestGeneratorRun(BaseModel):
     """Runs a generator."""
 
     generator_definition: ProposedChangeGeneratorDefinition = Field(..., description="The Generator definition")
-    generator_instance: Optional[str] = Field(
+    generator_instance: str | None = Field(
         default=None, description="The id of the generator instance if it previously existed"
     )
     commit: str = Field(..., description="The commit to target")

infrahub/git/base.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import shutil
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import TYPE_CHECKING, NoReturn, Optional, Union
+from typing import TYPE_CHECKING, NoReturn
 from uuid import UUID  # noqa: TC003
 
 import git
@@ -144,12 +144,12 @@ class InfrahubRepositoryBase(BaseModel, ABC):
         False, description="Flag to indicate if a remote repository (named origin) is present in the config."
     )
 
-    client: Optional[InfrahubClient] = Field(
+    client: InfrahubClient | None = Field(
         default=None,
         description="Infrahub Client, used to query the Repository and Branch information in the graph and to update the commit.",
     )
 
-    cache_repo: Optional[Repo] = Field(None, description="Internal cache of the GitPython Repo object")
+    cache_repo: Repo | None = Field(None, description="Internal cache of the GitPython Repo object")
     service: InfrahubServices = Field(
         ..., description="Service object with access to the message queue, the database etc.."
     )
@@ -584,7 +584,7 @@ class InfrahubRepositoryBase(BaseModel, ABC):
 
         return True
 
-    def create_commit_worktree(self, commit: str) -> Union[bool, Worktree]:
+    def create_commit_worktree(self, commit: str) -> bool | Worktree:
         """Create a new worktree for a given commit."""
 
         # Check of the worktree already exist
@@ -744,7 +744,7 @@ class InfrahubRepositoryBase(BaseModel, ABC):
         branch_id: str | None = None,
         create_if_missing: bool = False,
         update_commit_value: bool = True,
-    ) -> Union[bool, str]:
+    ) -> bool | str:
         """Pull the latest update from the remote repository on a given branch."""
 
         if not self.has_origin:
@@ -812,10 +812,10 @@ class InfrahubRepositoryBase(BaseModel, ABC):
 
     async def find_files(
         self,
-        extension: Union[str, list[str]],
+        extension: str | list[str],
         branch_name: str | None = None,
         commit: str | None = None,
-        directory: Optional[Path] = None,
+        directory: Path | None = None,
     ) -> list[Path]:
         """Return the path of all files matching a specific extension in a given Branch or Commit."""
         if not branch_name and not commit:

infrahub/git/integrator.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import hashlib
 import importlib
 import sys
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import TYPE_CHECKING, Any
 
 import jinja2
 import ujson
@@ -39,7 +39,7 @@ from typing_extensions import Self
 
 from infrahub.core.constants import ArtifactStatus, ContentType, InfrahubKind, RepositorySyncStatus
 from infrahub.core.registry import registry
-from infrahub.events.artifact_action import ArtifactEvent
+from infrahub.events.artifact_action import ArtifactCreatedEvent, ArtifactUpdatedEvent
 from infrahub.events.models import EventMeta
 from infrahub.events.repository_action import CommitUpdatedEvent
 from infrahub.exceptions import CheckError, RepositoryInvalidFileSystemError, TransformError
@@ -93,10 +93,10 @@ class CheckDefinitionInformation(BaseModel):
     timeout: int
     """Timeout for the Check."""
 
-    parameters: Optional[dict] = None
+    parameters: dict | None = None
     """Additional Parameters to extract from each target (if targets is provided)"""
 
-    targets: Optional[str] = Field(default=None, description="Targets if not a global check")
+    targets: str | None = Field(default=None, description="Targets if not a global check")
 
 
 class TransformPythonInformation(BaseModel):
@@ -161,7 +161,7 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
 
     @flow(name="import-object-from-file", flow_run_name="Import objects")
     async def import_objects_from_files(
-        self, infrahub_branch_name: str, git_branch_name: Optional[str] = None, commit: Optional[str] = None
+        self, infrahub_branch_name: str, git_branch_name: str | None = None, commit: str | None = None
     ) -> None:
         if not commit:
             commit = self.get_commit_value(branch_name=git_branch_name or infrahub_branch_name)
@@ -171,27 +171,27 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
         self.create_commit_worktree(commit)
         await self._update_sync_status(branch_name=infrahub_branch_name, status=RepositorySyncStatus.SYNCING)
 
-        config_file = await self.get_repository_config(branch_name=infrahub_branch_name, commit=commit)
+        config_file = await self.get_repository_config(branch_name=infrahub_branch_name, commit=commit)  # type: ignore[misc]
         sync_status = RepositorySyncStatus.IN_SYNC if config_file else RepositorySyncStatus.ERROR_IMPORT
         error: Exception | None = None
 
         try:
             if config_file:
-                await self.import_schema_files(branch_name=infrahub_branch_name, commit=commit, config_file=config_file)
+                await self.import_schema_files(branch_name=infrahub_branch_name, commit=commit, config_file=config_file)  # type: ignore[misc]
 
                 await self.import_all_graphql_query(
                     branch_name=infrahub_branch_name, commit=commit, config_file=config_file
-                )
+                )  # type: ignore[misc]
 
                 await self.import_all_python_files(  # type: ignore[call-overload]
                     branch_name=infrahub_branch_name, commit=commit, config_file=config_file
-                )
+                )  # type: ignore[misc]
                 await self.import_jinja2_transforms(
                     branch_name=infrahub_branch_name, commit=commit, config_file=config_file
-                )
+                )  # type: ignore[misc]
                 await self.import_artifact_definitions(
                     branch_name=infrahub_branch_name, commit=commit, config_file=config_file
-                )
+                )  # type: ignore[misc]
 
         except Exception as exc:
             sync_status = RepositorySyncStatus.ERROR_IMPORT
@@ -443,7 +443,7 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
         await existing_artifact_definition.save()
 
     @task(name="repository-get-config", task_run_name="get repository config", cache_policy=NONE)  # type: ignore[arg-type]
-    async def get_repository_config(self, branch_name: str, commit: str) -> Optional[InfrahubRepositoryConfig]:
+    async def get_repository_config(self, branch_name: str, commit: str) -> InfrahubRepositoryConfig | None:
         branch_wt = self.get_worktree(identifier=commit or branch_name)
         log = get_run_logger()
 
@@ -636,7 +636,7 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
                     module=module,
                     file_path=file_info.relative_path_file,
                     check_definition=check,
-                )
+                )  # type: ignore[misc]
             )
 
         local_check_definitions = {check.name: check for check in checks}
@@ -797,7 +797,7 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
                     module=module,
                     file_path=file_info.relative_path_file,
                     transform=transform,
-                )
+                )  # type: ignore[misc]
             )
 
         local_transform_definitions = {transform.name: transform for transform in transforms}
@@ -1070,9 +1070,9 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
     ) -> None:
         await add_tags(branches=[branch_name], nodes=[str(self.id)])
 
-        await self.import_python_check_definitions(branch_name=branch_name, commit=commit, config_file=config_file)
-        await self.import_python_transforms(branch_name=branch_name, commit=commit, config_file=config_file)
-        await self.import_generator_definitions(branch_name=branch_name, commit=commit, config_file=config_file)
+        await self.import_python_check_definitions(branch_name=branch_name, commit=commit, config_file=config_file)  # type: ignore[misc]
+        await self.import_python_transforms(branch_name=branch_name, commit=commit, config_file=config_file)  # type: ignore[misc]
+        await self.import_generator_definitions(branch_name=branch_name, commit=commit, config_file=config_file)  # type: ignore[misc]
 
     @task(name="jinja2-template-render", task_run_name="Render Jinja2 template", cache_policy=NONE)  # type: ignore[arg-type]
     async def render_jinja2_template(self, commit: str, location: str, data: dict) -> str:
@@ -1098,7 +1098,7 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
         location: str,
         class_name: str,
         client: InfrahubClient,
-        params: Optional[dict] = None,
+        params: dict | None = None,
     ) -> InfrahubCheck:
         """Execute A Python Check stored in the repository."""
         log = get_run_logger()
@@ -1227,7 +1227,7 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
         if transformation.typename == InfrahubKind.TRANSFORMJINJA2:
             artifact_content = await self.render_jinja2_template.with_options(
                 timeout_seconds=transformation.timeout.value
-            )(commit=commit, location=transformation.template_path.value, data=response)
+            )(commit=commit, location=transformation.template_path.value, data=response)  # type: ignore[misc]
         elif transformation.typename == InfrahubKind.TRANSFORMPYTHON:
             transformation_location = f"{transformation.file_path.value}::{transformation.class_name.value}"
             artifact_content = await self.execute_python_transform.with_options(
@@ -1238,7 +1238,7 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
                 location=transformation_location,
                 data=response,
                 client=self.sdk,
-            )
+            )  # type: ignore[misc]
 
         if definition.content_type.value == ContentType.APPLICATION_JSON.value and isinstance(artifact_content, dict):
             artifact_content_str = ujson.dumps(artifact_content, indent=2)
@@ -1270,7 +1270,7 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
         self,
         artifact: CoreArtifact,
         artifact_created: bool,
-        message: Union[CheckArtifactCreate, RequestArtifactGenerate],
+        message: CheckArtifactCreate | RequestArtifactGenerate,
     ) -> ArtifactGenerateResult:
         response = await self.sdk.query_gql_query(
             name=message.query,
@@ -1289,7 +1289,7 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
         if message.transform_type == InfrahubKind.TRANSFORMJINJA2:
             artifact_content = await self.render_jinja2_template.with_options(timeout_seconds=message.timeout)(
                 commit=message.commit, location=message.transform_location, data=response
-            )
+            )  # type: ignore[misc]
         elif message.transform_type == InfrahubKind.TRANSFORMPYTHON:
             artifact_content = await self.execute_python_transform.with_options(timeout_seconds=message.timeout)(
                 branch_name=message.branch_name,
@@ -1297,7 +1297,7 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
                 location=message.transform_location,
                 data=response,
                 client=self.sdk,
-            )
+            )  # type: ignore[misc]
 
         if message.content_type == ContentType.APPLICATION_JSON.value and isinstance(artifact_content, dict):
             artifact_content_str = ujson.dumps(artifact_content, indent=2)
@@ -1324,7 +1324,9 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
             artifact.name.value = message.artifact_name
         await artifact.save()
 
-        event = ArtifactEvent(
+        event_class = ArtifactCreatedEvent if artifact_created else ArtifactUpdatedEvent
+
+        event = event_class(
             node_id=artifact.id,
             target_id=message.target_id,
             target_kind=message.target_kind,
@@ -1334,7 +1336,6 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
             checksum_previous=previous_checksum,
             storage_id=storage_id,
             storage_id_previous=previous_storage_id,
-            created=artifact_created,
         )
 
         await self.service.event.send(event=event)

infrahub/git/models.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from pydantic import BaseModel, ConfigDict, Field
 
 from infrahub.context import InfrahubContext
@@ -34,7 +32,7 @@ class RequestArtifactGenerate(BaseModel):
     target_id: str = Field(..., description="The ID of the target object for this artifact")
     target_kind: str = Field(..., description="The kind of the target object for this artifact")
     target_name: str = Field(..., description="Name of the artifact target")
-    artifact_id: Optional[str] = Field(default=None, description="The id of the artifact if it previously existed")
+    artifact_id: str | None = Field(default=None, description="The id of the artifact if it previously existed")
     query: str = Field(..., description="The name of the query to use when collecting data")
     timeout: int = Field(..., description="Timeout for requests used to generate this artifact")
     variables: dict = Field(..., description="Input variables when generating the artifact")
@@ -47,8 +45,8 @@ class GitRepositoryAdd(BaseModel):
     location: str = Field(..., description="The external URL of the repository")
     repository_id: str = Field(..., description="The unique ID of the Repository")
     repository_name: str = Field(..., description="The name of the repository")
-    created_by: Optional[str] = Field(default=None, description="The user ID of the user that created the repository")
-    default_branch_name: Optional[str] = Field(None, description="Default branch for this repository")
+    created_by: str | None = Field(default=None, description="The user ID of the user that created the repository")
+    default_branch_name: str | None = Field(None, description="Default branch for this repository")
     infrahub_branch_name: str = Field(..., description="Infrahub branch on which to sync the remote repository")
     infrahub_branch_id: str = Field(..., description="Id of the Infrahub branch on which to sync the remote repository")
     internal_status: str = Field(..., description="Administrative status of the repository")
@@ -61,7 +59,7 @@ class GitRepositoryAddReadOnly(BaseModel):
     repository_id: str = Field(..., description="The unique ID of the Repository")
     repository_name: str = Field(..., description="The name of the repository")
     ref: str = Field(..., description="Ref to track on the external repository")
-    created_by: Optional[str] = Field(default=None, description="The user ID of the user that created the repository")
+    created_by: str | None = Field(default=None, description="The user ID of the user that created the repository")
     infrahub_branch_name: str = Field(..., description="Infrahub branch on which to sync the remote repository")
     infrahub_branch_id: str = Field(..., description="Id of the Infrahub branch on which to sync the remote repository")
     internal_status: str = Field(..., description="Internal status of the repository")
@@ -73,8 +71,8 @@ class GitRepositoryPullReadOnly(BaseModel):
     location: str = Field(..., description="The external URL of the repository")
     repository_id: str = Field(..., description="The unique ID of the Repository")
     repository_name: str = Field(..., description="The name of the repository")
-    ref: Optional[str] = Field(None, description="Ref to track on the external repository")
-    commit: Optional[str] = Field(None, description="Specific commit to pull")
+    ref: str | None = Field(None, description="Ref to track on the external repository")
+    commit: str | None = Field(None, description="Specific commit to pull")
     infrahub_branch_name: str = Field(..., description="Infrahub branch on which to sync the remote repository")
     infrahub_branch_id: str = Field(..., description="Infrahub branch on which to sync the remote repository")
 
@@ -108,7 +106,7 @@ class GitDiffNamesOnly(BaseModel):
     repository_name: str = Field(..., description="The name of the repository")
     repository_kind: str = Field(..., description="The kind of the repository")
     first_commit: str = Field(..., description="The first commit")
-    second_commit: Optional[str] = Field(None, description="The second commit")
+    second_commit: str | None = Field(None, description="The second commit")
 
 
 class GitDiffNamesOnlyResponse(BaseModel):
@@ -189,3 +187,18 @@ class CheckRepositoryMergeConflicts(BaseModel):
     repository_name: str = Field(..., description="The name of the Repository")
     source_branch: str = Field(..., description="The source branch")
     target_branch: str = Field(..., description="The target branch")
+
+
+class RepositoryBranchInfo(BaseModel):
+    internal_status: str
+
+
+class RepositoryData(BaseModel):
+    repository_id: str = Field(..., description="Id of the repository")
+    repository_name: str = Field(..., description="Name of the repository")
+    branches: dict[str, str] = Field(
+        ...,
+        description="Dictionary with the name of the branch as the key and the active commit id as the value",
+    )
+
+    branch_info: dict[str, RepositoryBranchInfo] = Field(default_factory=dict)

infrahub/git/repository.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Union
+from typing import TYPE_CHECKING, Any
 
 from git.exc import BadName, GitCommandError
 from infrahub_sdk.exceptions import GraphQLError
@@ -250,7 +250,7 @@ class InfrahubReadOnlyRepository(InfrahubRepositoryIntegrator):
 
 async def get_initialized_repo(
     repository_id: str, name: str, service: InfrahubServices, repository_kind: str, commit: str | None = None
-) -> Union[InfrahubReadOnlyRepository, InfrahubRepository]:
+) -> InfrahubReadOnlyRepository | InfrahubRepository:
     if repository_kind == InfrahubKind.REPOSITORY:
         return await InfrahubRepository.init(
             id=repository_id, name=name, commit=commit, client=service._client, service=service
@@ -266,7 +266,7 @@ async def get_initialized_repo(
 
 async def initialize_repo(
     location: str, repository_id: str, name: str, service: InfrahubServices, repository_kind: str
-) -> Union[InfrahubReadOnlyRepository, InfrahubRepository]:
+) -> InfrahubReadOnlyRepository | InfrahubRepository:
     if repository_kind == InfrahubKind.REPOSITORY:
         return await InfrahubRepository.new(
             location=location, id=repository_id, name=name, client=service._client, service=service