infrahub-server 1.2.10__py3-none-any.whl → 1.3.0a0__py3-none-any.whl

infrahub/graphql/resolvers/single_relationship.py

@@ -109,7 +109,7 @@ class SingleRelationshipResolver:
             for key, value in kwargs.items()
             if "__" in key and value or key in ["id", "ids"]
         }
-        async with db.start_session() as dbs:
+        async with db.start_session(read_only=True) as dbs:
             objs = await NodeManager.query_peers(
                 db=dbs,
                 ids=[parent_id],
@@ -171,5 +171,5 @@ class SingleRelationshipResolver:
         node = await loader.load(key=peer_id)
         if not node:
             return None
-        async with db.start_session() as dbs:
+        async with db.start_session(read_only=True) as dbs:
             return await node.to_graphql(db=dbs, fields=node_fields, related_node_ids=related_node_ids)

infrahub/graphql/schema.py

@@ -16,6 +16,7 @@ from .mutations.branch import (
     BranchValidate,
 )
 from .mutations.computed_attribute import UpdateComputedAttribute
+from .mutations.convert_object_type import ConvertObjectType
 from .mutations.diff import DiffUpdateMutation
 from .mutations.diff_conflict import ResolveDiffConflict
 from .mutations.generator import GeneratorDefinitionRequestRun
@@ -48,6 +49,7 @@ from .queries import (
     InfrahubStatus,
     Relationship,
 )
+from .queries.convert_object_type_mapping import FieldsMappingTypeConversion
 from .queries.diff.tree import DiffTreeQuery, DiffTreeSummaryQuery
 from .queries.event import Event
 from .queries.task import Task, TaskBranchStatus
@@ -77,6 +79,8 @@ class InfrahubBaseQuery(ObjectType):
     InfrahubResourcePoolAllocated = InfrahubResourcePoolAllocated
     InfrahubResourcePoolUtilization = InfrahubResourcePoolUtilization
 
+    FieldsMappingTypeConversion = FieldsMappingTypeConversion
+
 
 class InfrahubBaseMutation(ObjectType):
     InfrahubAccountTokenCreate = InfrahubAccountTokenCreate.Field()
@@ -109,3 +113,5 @@ class InfrahubBaseMutation(ObjectType):
     SchemaEnumAdd = SchemaEnumAdd.Field()
     SchemaEnumRemove = SchemaEnumRemove.Field()
     ResolveDiffConflict = ResolveDiffConflict.Field()
+
+    ConvertObjectType = ConvertObjectType.Field()

infrahub/graphql/subscription/graphql_query.py

@@ -29,7 +29,7 @@ async def resolver_graphql_query(
     graphql_context: GraphqlContext = info.context
     at = Timestamp()
 
-    async with graphql_context.db.start_session() as db:
+    async with graphql_context.db.start_session(read_only=True) as db:
         # Find the GraphQLQuery and the GraphQL Schema
         graphql_query = await NodeManager.get_one_by_default_filter(
             db=db, id=name, kind=CoreGraphQLQuery, branch=graphql_context.branch, at=at
@@ -38,7 +38,7 @@ async def resolver_graphql_query(
             raise ValueError(f"Unable to find the {InfrahubKind.GRAPHQLQUERY} {name}")
 
     while True:
-        async with graphql_context.db.start_session() as db:
+        async with graphql_context.db.start_session(read_only=True) as db:
             result = await graphql(
                 schema=graphql_schema,
                 source=graphql_query.query.value,

infrahub/graphql/types/branch.py

@@ -37,7 +37,7 @@ class BranchType(InfrahubObjectType):
         graphql_context: GraphqlContext,
         **kwargs: Any,
     ) -> list[dict[str, Any]]:
-        async with graphql_context.db.start_session() as db:
+        async with graphql_context.db.start_session(read_only=True) as db:
             objs = await Branch.get_list(db=db, **kwargs)
 
             if not objs:

infrahub/menu/menu.py

@@ -246,6 +246,37 @@ default_menu = [
                 section=MenuSection.INTERNAL,
                 order_weight=2000,
             ),
+            MenuItemDefinition(
+                namespace="Builtin",
+                name="TriggerDefinition",
+                label="Triggers",
+                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.TRIGGERRULE)),
+                protected=True,
+                section=MenuSection.INTERNAL,
+                order_weight=6000,
+                children=[
+                    MenuItemDefinition(
+                        namespace="Core",
+                        name="TriggerRule",
+                        label="Trigger Rules",
+                        kind=InfrahubKind.TRIGGERRULE,
+                        icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.TRIGGERRULE)),
+                        protected=True,
+                        section=MenuSection.INTERNAL,
+                        order_weight=1000,
+                    ),
+                    MenuItemDefinition(
+                        namespace="Core",
+                        name="Action",
+                        label="Trigger Actions",
+                        kind=InfrahubKind.ACTION,
+                        icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.ACTION)),
+                        protected=True,
+                        section=MenuSection.INTERNAL,
+                        order_weight=2000,
+                    ),
+                ],
+            ),
         ],
     ),
     MenuItemDefinition(

infrahub/message_bus/messages/__init__.py

@@ -1,28 +1,18 @@
 from infrahub.message_bus import InfrahubMessage, InfrahubResponse
 
-from .check_generator_run import CheckGeneratorRun
-from .finalize_validator_execution import FinalizeValidatorExecution
 from .git_file_get import GitFileGet, GitFileGetResponse
 from .git_repository_connectivity import GitRepositoryConnectivity
-from .proposed_change.request_proposedchange_refreshartifacts import RequestProposedChangeRefreshArtifacts
 from .refresh_git_fetch import RefreshGitFetch
 from .refresh_registry_branches import RefreshRegistryBranches
 from .refresh_registry_rebasedbranch import RefreshRegistryRebasedBranch
-from .request_generatordefinition_check import RequestGeneratorDefinitionCheck
-from .request_proposedchange_pipeline import RequestProposedChangePipeline
 from .send_echo_request import SendEchoRequest, SendEchoRequestResponse
 
 MESSAGE_MAP: dict[str, type[InfrahubMessage]] = {
-    "check.generator.run": CheckGeneratorRun,
-    "finalize.validator.execution": FinalizeValidatorExecution,
     "git.file.get": GitFileGet,
     "git.repository.connectivity": GitRepositoryConnectivity,
     "refresh.git.fetch": RefreshGitFetch,
     "refresh.registry.branches": RefreshRegistryBranches,
     "refresh.registry.rebased_branch": RefreshRegistryRebasedBranch,
-    "request.generator_definition.check": RequestGeneratorDefinitionCheck,
-    "request.proposed_change.pipeline": RequestProposedChangePipeline,
-    "request.proposed_change.refresh_artifacts": RequestProposedChangeRefreshArtifacts,
     "send.echo.request": SendEchoRequest,
 }
 

infrahub/message_bus/operations/__init__.py

@@ -3,11 +3,8 @@ from prefect import Flow
 
 from infrahub.message_bus import RPCErrorResponse, messages
 from infrahub.message_bus.operations import (
-    check,
-    finalize,
     git,
     refresh,
-    requests,
     send,
 )
 from infrahub.message_bus.types import MessageTTL
@@ -15,16 +12,11 @@ from infrahub.services import InfrahubServices
 from infrahub.tasks.check import set_check_status
 
 COMMAND_MAP = {
-    "check.generator.run": check.generator.run,
-    "finalize.validator.execution": finalize.validator.execution,
     "git.file.get": git.file.get,
     "git.repository.connectivity": git.repository.connectivity,
     "refresh.git.fetch": git.repository.fetch,
     "refresh.registry.branches": refresh.registry.branches,
     "refresh.registry.rebased_branch": refresh.registry.rebased_branch,
-    "request.generator_definition.check": requests.generator_definition.check,
-    "request.proposed_change.pipeline": requests.proposed_change.pipeline,
-    "request.proposed_change.refresh_artifacts": requests.proposed_change.refresh_artifacts,
     "send.echo.request": send.echo.request,
 }
 

infrahub/message_bus/operations/refresh/registry.py

@@ -11,7 +11,7 @@ async def branches(message: messages.RefreshRegistryBranches, service: InfrahubS
         service.log.info("Ignoring refresh registry refresh request originating from self", worker=WORKER_IDENTITY)
         return
 
-    async with service.database.start_session() as db:
+    async with service.database.start_session(read_only=True) as db:
         await refresh_branches(db=db)
 
     await service.component.refresh_schema_hash()

infrahub/patch/queries/consolidate_duplicated_nodes.py

@@ -22,8 +22,7 @@ WITH n.uuid AS node_uuid, count(*) as num_nodes_with_uuid
 WHERE num_nodes_with_uuid > 1
 WITH DISTINCT node_uuid
 MATCH (n:Node {uuid: node_uuid})
-CALL {
-    WITH n
+CALL (n) {
     WITH labels(n) AS n_labels
     UNWIND n_labels AS n_label
     WITH n_label
@@ -37,8 +36,7 @@ UNWIND nodes_to_delete AS node_to_delete
 //------------
 // Find the edges that we need to move to the selected node_to_keep
 //------------
-CALL {
-    WITH node_to_keep, node_to_delete
+CALL (node_to_keep, node_to_delete) {
     MATCH (node_to_delete)-[edge_to_delete]->(peer)
     RETURN {
         from_id: %(id_func_name)s(node_to_keep),
@@ -60,8 +58,7 @@ WITH node_to_delete, collect(edge_to_create) AS edges_to_create
 //------------
 // Find the edges that we need to remove from the duplicated nodes
 //------------
-CALL {
-    WITH node_to_delete
+CALL (node_to_delete) {
     MATCH (node_to_delete)-[e]->(peer)
     RETURN {
         db_id: %(id_func_name)s(e),

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/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."""