infrahub-server 1.2.11__py3-none-any.whl → 1.3.0b1__py3-none-any.whl

infrahub/patch/queries/delete_duplicated_edges.py

@@ -23,11 +23,10 @@ MATCH (node_with_dup_edges:Node)-[edge]->(peer)
 WITH node_with_dup_edges, type(edge) AS edge_type, edge.status AS edge_status, edge.branch AS edge_branch, peer, count(*) AS num_dup_edges
 WHERE num_dup_edges > 1
 WITH DISTINCT node_with_dup_edges, edge_type, edge_branch, peer
-CALL {
+CALL (node_with_dup_edges, edge_type, edge_branch, peer) {
     // ------------
     // Get the earliest active and deleted edges for this branch
     // ------------
-    WITH node_with_dup_edges, edge_type, edge_branch, peer
     MATCH (node_with_dup_edges)-[active_edge {branch: edge_branch, status: "active"}]->(peer)
     WHERE type(active_edge) = edge_type
     WITH node_with_dup_edges, edge_type, edge_branch, peer, active_edge
@@ -40,8 +39,7 @@ CALL {
     // ------------
     // Plan one active edge update with correct from and to times
     // ------------
-    CALL {
-        WITH node_with_dup_edges, edge_type, edge_branch, peer, active_from, deleted_from
+    CALL (node_with_dup_edges, edge_type, edge_branch, peer, active_from, deleted_from) {
         MATCH (node_with_dup_edges)-[active_e {branch: edge_branch, status: "active"}]->(peer)
         WHERE type(active_e) = edge_type
         WITH node_with_dup_edges, edge_type, edge_branch, peer, active_from, deleted_from, active_e
@@ -57,8 +55,7 @@ CALL {
     // ------------
     // Plan deletes for all the other active edges of this type on this branch
     // ------------
-    CALL {
-        WITH node_with_dup_edges, edge_type, edge_branch, peer
+    CALL (node_with_dup_edges, edge_type, edge_branch, peer) {
         MATCH (node_with_dup_edges)-[active_e {branch: edge_branch, status: "active"}]->(peer)
         WHERE type(active_e) = edge_type
         WITH node_with_dup_edges, peer, active_e
@@ -77,8 +74,7 @@ CALL {
     // ------------
     // Plan one deleted edge update with correct from time
     // ------------
-    CALL {
-        WITH node_with_dup_edges, edge_type, edge_branch, peer, deleted_from
+    CALL (node_with_dup_edges, edge_type, edge_branch, peer, deleted_from) {
         MATCH (node_with_dup_edges)-[deleted_e {branch: edge_branch, status: "deleted"}]->(peer)
         WHERE type(deleted_e) = edge_type
         WITH node_with_dup_edges, edge_type, edge_branch, peer, deleted_from, deleted_e
@@ -94,8 +90,7 @@ CALL {
     // ------------
     // Plan deletes for all the other deleted edges of this type on this branch
     // ------------
-    CALL {
-        WITH node_with_dup_edges, edge_type, edge_branch, peer
+    CALL (node_with_dup_edges, edge_type, edge_branch, peer) {
         MATCH (node_with_dup_edges)-[deleted_e {branch: edge_branch, status: "deleted"}]->(peer)
         WHERE type(deleted_e) = edge_type
         WITH node_with_dup_edges, peer, deleted_e

infrahub/pools/number.py

@@ -8,7 +8,7 @@ from infrahub.core.registry import registry
 
 if TYPE_CHECKING:
     from infrahub.core.branch import Branch
-    from infrahub.core.protocols import CoreNode
+    from infrahub.core.node.resource_manager.number_pool import CoreNumberPool
     from infrahub.core.timestamp import Timestamp
     from infrahub.database import InfrahubDatabase
 
@@ -20,7 +20,9 @@ class UsedNumber:
 
 
 class NumberUtilizationGetter:
-    def __init__(self, db: InfrahubDatabase, pool: CoreNode, branch: Branch, at: Timestamp | str | None = None) -> None:
+    def __init__(
+        self, db: InfrahubDatabase, pool: CoreNumberPool, branch: Branch, at: Timestamp | str | None = None
+    ) -> None:
         self.db = db
         self.at = at
         self.pool = pool
@@ -62,4 +64,4 @@ class NumberUtilizationGetter:
 
     @property
     def total_pool_size(self) -> int:
-        return self.end_range - self.start_range + 1
+        return self.end_range - self.start_range + 1 - self.pool.get_attribute_nb_excluded_values()

infrahub/prefect_server/models.py

@@ -1,18 +1,10 @@
-from typing import TYPE_CHECKING, Sequence, cast
-
-from prefect.server.database import PrefectDBInterface, db_injector
-from prefect.server.events.filters import EventFilter, EventNameFilter, EventOrder, EventRelatedFilter
+from prefect.server.events.filters import EventFilter, EventNameFilter, EventOrder
 from prefect.server.events.schemas.events import ReceivedEvent
 from prefect.server.utilities.schemas import PrefectBaseModel
 from pydantic import BaseModel, Field
 
-if TYPE_CHECKING:
-    from sqlalchemy.sql.expression import ColumnExpressionArgument
-
 
 class InfrahubEventFilter(EventFilter):
-    matching_related: list[EventRelatedFilter] = Field(default_factory=list)
-
     def set_prefix(self) -> None:
         if self.event:
             if self.event.prefix is not None and "infrahub." not in self.event.prefix:
@@ -20,16 +12,6 @@ class InfrahubEventFilter(EventFilter):
         else:
             self.event = EventNameFilter(prefix=["infrahub."], name=[], exclude_prefix=None, exclude_name=None)
 
-    @db_injector
-    def build_where_clauses(self, db: PrefectDBInterface) -> Sequence["ColumnExpressionArgument[bool]"]:
-        result = cast(list["ColumnExpressionArgument[bool]"], super().build_where_clauses())
-        top_level_filter = self._scoped_event_resources(db)
-        for matching_related in self.matching_related:
-            matching_related._top_level_filter = top_level_filter
-            result.extend(matching_related.build_where_clauses())
-
-        return result
-
     @classmethod
     def default(cls) -> "InfrahubEventFilter":
         return cls(event=None, any_resource=None, resource=None, related=None, order=EventOrder.DESC)

infrahub/proposed_change/models.py

@@ -1,10 +1,25 @@
+import uuid
+
 from pydantic import BaseModel, ConfigDict, Field
 
-from infrahub.context import InfrahubContext
-from infrahub.message_bus.messages.proposed_change.base_with_diff import BaseProposedChangeWithDiffMessage
+from infrahub.core.constants import CheckType
+from infrahub.generators.models import ProposedChangeGeneratorDefinition
+from infrahub.message_bus import InfrahubMessage
 from infrahub.message_bus.types import ProposedChangeArtifactDefinition, ProposedChangeBranchDiff
 
 
+class BaseProposedChangeWithDiffMessage(InfrahubMessage):
+    """Sent trigger the refresh of artifacts that are impacted by the proposed change."""
+
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    proposed_change: str = Field(..., description="The unique ID of the Proposed Change")
+    source_branch: str = Field(..., description="The source branch of the proposed change")
+    source_branch_sync_with_git: bool = Field(..., description="Indicates if the source branch should sync with git")
+    destination_branch: str = Field(..., description="The destination branch of the proposed change")
+    branch_diff: ProposedChangeBranchDiff = Field(..., description="The calculated diff between the two branches")
+
+
 class RequestProposedChangeDataIntegrity(BaseProposedChangeWithDiffMessage):
     """Sent trigger data integrity checks for a proposed change"""
 
@@ -42,4 +57,54 @@ class RequestArtifactDefinitionCheck(BaseModel):
     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")
 
-    context: InfrahubContext = Field(..., description="The context of the task")
+
+class RunGeneratorAsCheckModel(BaseModel):
+    """A check that runs a generator."""
+
+    generator_definition: ProposedChangeGeneratorDefinition = Field(..., description="The Generator definition")
+    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")
+    repository_id: str = Field(..., description="The unique ID of the Repository")
+    repository_name: str = Field(..., description="The name of the Repository")
+    repository_kind: str = Field(..., description="The kind of the Repository")
+    branch_name: str = Field(..., description="The branch where the check is run")
+    target_id: str = Field(..., description="The ID of the target object for this generator")
+    target_name: str = Field(..., description="Name of the generator target")
+    query: str = Field(..., description="The name of the query to use when collecting data")
+    variables: dict = Field(..., description="Input variables when running the generator")
+    validator_id: str = Field(..., description="The ID of the validator")
+    proposed_change: str = Field(..., description="The unique ID of the Proposed Change")
+
+
+class RequestGeneratorDefinitionCheck(BaseModel):
+    """Sent to trigger Generators to run for a proposed change."""
+
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    generator_definition: ProposedChangeGeneratorDefinition = Field(..., description="The Generator 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")
+
+
+class RequestProposedChangePipeline(BaseModel):
+    """Sent request the start of a pipeline connected to a proposed change."""
+
+    proposed_change: str = Field(..., description="The unique ID of the proposed change")
+    source_branch: str = Field(..., description="The source branch of the proposed change")
+    source_branch_sync_with_git: bool = Field(..., description="Indicates if the source branch should sync with git")
+    destination_branch: str = Field(..., description="The destination branch of the proposed change")
+    check_type: CheckType = Field(
+        default=CheckType.ALL, description="Can be used to restrict the pipeline to a specific type of job"
+    )
+    pipeline_id: uuid.UUID = Field(
+        default_factory=uuid.uuid4, description="The unique ID of the execution of this pipeline"
+    )
+
+
+class RequestProposedChangeRefreshArtifacts(BaseProposedChangeWithDiffMessage):
+    """Sent trigger the refresh of artifacts that are impacted by the proposed change."""