Multiple fixes

Author: LucasG0

backend/infrahub/core/checks/__init__.py renamed to backend/infrahub/artifacts/__init__.py

@@ -1,21 +1,6 @@
 from typing import Optional
 
-from pydantic import BaseModel, ConfigDict, Field
-
-from infrahub.message_bus.types import ProposedChangeArtifactDefinition, ProposedChangeBranchDiff
-
-
-class RequestArtifactDefinitionCheck(BaseModel):
-    """Sent to validate the generation of artifacts in relation to a proposed change."""
-
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
-    artifact_definition: ProposedChangeArtifactDefinition = Field(..., description="The Artifact Definition")
-    branch_diff: ProposedChangeBranchDiff = Field(..., description="The calculated diff between the two branches")
-    proposed_change: str = Field(..., description="The unique ID of the Proposed Change")
-    source_branch: str = Field(..., description="The source branch")
-    source_branch_sync_with_git: bool = Field(..., description="Indicates if the source branch should sync with git")
-    destination_branch: str = Field(..., description="The target branch")
+from pydantic import BaseModel, Field
 
 
 class CheckArtifactCreate(BaseModel):

backend/infrahub/core/checks/models.py renamed to backend/infrahub/artifacts/models.py

@@ -0,0 +1,99 @@
+from typing import Union
+
+from prefect import flow
+
+from infrahub.artifacts.models import CheckArtifactCreate
+from infrahub.core.constants import InfrahubKind, ValidatorConclusion
+from infrahub.core.timestamp import Timestamp
+from infrahub.git import InfrahubReadOnlyRepository, InfrahubRepository
+from infrahub.services import InfrahubServices
+from infrahub.tasks.artifact import define_artifact
+from infrahub.workflows.utils import add_tags
+
+
+@flow(name="git-repository-check-artifact-create", flow_run_name="Check artifact creation")
+async def create(model: CheckArtifactCreate, service: InfrahubServices) -> ValidatorConclusion:
+    await add_tags(branches=[model.branch_name], nodes=[model.target_id])
+    validator = await service.client.get(kind=InfrahubKind.ARTIFACTVALIDATOR, id=model.validator_id, include=["checks"])
+
+    repo: InfrahubReadOnlyRepository | InfrahubRepository
+    if InfrahubKind.READONLYREPOSITORY:
+        repo = await InfrahubReadOnlyRepository.init(
+            id=model.repository_id,
+            name=model.repository_name,
+            client=service.client,
+            service=service,
+        )
+    else:
+        repo = await InfrahubRepository.init(
+            id=model.repository_id,
+            name=model.repository_name,
+            client=service.client,
+            service=service,
+        )
+
+    artifact = await define_artifact(model=model, service=service)
+
+    severity = "info"
+    artifact_result: dict[str, Union[str, bool, None]] = {
+        "changed": None,
+        "checksum": None,
+        "artifact_id": None,
+        "storage_id": None,
+    }
+    check_message = "Failed to render artifact"
+
+    try:
+        result = await repo.render_artifact(artifact=artifact, message=model)
+        artifact_result["changed"] = result.changed
+        artifact_result["checksum"] = result.checksum
+        artifact_result["artifact_id"] = result.artifact_id
+        artifact_result["storage_id"] = result.storage_id
+        check_message = "Artifact rendered successfully"
+        conclusion = ValidatorConclusion.SUCCESS
+
+    except Exception as exc:
+        artifact.status.value = "Error"
+        await artifact.save()
+        severity = "critical"
+        conclusion = ValidatorConclusion.FAILURE
+        check_message += f": {str(exc)}"
+
+    check = None
+    check_name = f"{model.artifact_name}: {model.target_name}"
+    existing_check = await service.client.filters(
+        kind=InfrahubKind.ARTIFACTCHECK, validator__ids=validator.id, name__value=check_name
+    )
+    if existing_check:
+        check = existing_check[0]
+
+    if check:
+        check.created_at.value = Timestamp().to_string()
+        check.conclusion.value = conclusion.value
+        check.severity.value = severity
+        check.changed.value = artifact_result["changed"]
+        check.checksum.value = artifact_result["checksum"]
+        check.artifact_id.value = artifact_result["artifact_id"]
+        check.storage_id.value = artifact_result["storage_id"]
+        await check.save()
+    else:
+        check = await service.client.create(
+            kind=InfrahubKind.ARTIFACTCHECK,
+            data={
+                "name": check_name,
+                "origin": model.repository_id,
+                "kind": "ArtifactDefinition",
+                "validator": model.validator_id,
+                "created_at": Timestamp().to_string(),
+                "message": check_message,
+                "conclusion": conclusion.value,
+                "severity": severity,
+                "changed": artifact_result["changed"],
+                "checksum": artifact_result["checksum"],
+                "artifact_id": artifact_result["artifact_id"],
+                "storage_id": artifact_result["storage_id"],
+            },
+        )
+        await check.save()
+
+    return conclusion

backend/infrahub/artifacts/tasks.py

@@ -1,13 +1,15 @@
 import asyncio
-from typing import Coroutine
+from typing import Any, Coroutine
 
 from infrahub_sdk.node import InfrahubNode
 
 from infrahub.core.constants import ValidatorConclusion, ValidatorState
 from infrahub.core.timestamp import Timestamp
 
 
-async def run_checks_and_update_validator(checks: list[Coroutine], validator: InfrahubNode) -> None:
+async def run_checks_and_update_validator(
+    checks: list[Coroutine[Any, None, ValidatorConclusion]], validator: InfrahubNode
+) -> None:
     """
     Execute a list of checks coroutines, and set validator fields accordingly.
     Tasks are retrieved by completion order so as soon as we detect a failing check,
@@ -22,7 +24,7 @@ async def run_checks_and_update_validator(checks: list[Coroutine], validator: In
 
     for earliest_task in asyncio.as_completed(checks):
         result = await earliest_task
-        if result == ValidatorConclusion.FAILURE:
+        if validator.conclusion.value != ValidatorConclusion.FAILURE.value and result == ValidatorConclusion.FAILURE:
             validator.conclusion.value = ValidatorConclusion.FAILURE.value
             await validator.save()
             # Continue to iterate to wait for the end of all checks

backend/infrahub/core/checks/tasks.py

@@ -7,7 +7,6 @@
 from pydantic import BaseModel
 
 from infrahub import lock
-from infrahub.core.checks.models import RequestArtifactDefinitionCheck
 from infrahub.core.constants import CheckType, InfrahubKind, RepositoryInternalStatus
 from infrahub.core.diff.coordinator import DiffCoordinator
 from infrahub.core.registry import registry
@@ -21,6 +20,7 @@
     ProposedChangeSubscriber,
 )
 from infrahub.proposed_change.models import (
+    RequestArtifactDefinitionCheck,
     RequestProposedChangeDataIntegrity,
     RequestProposedChangeRepositoryChecks,
     RequestProposedChangeRunGenerators,