infrahub-server 1.4.13__py3-none-any.whl → 1.5.0__py3-none-any.whl

infrahub/workflows/catalogue.py

@@ -1,6 +1,7 @@
 import random
 
 from fast_depends import Depends, inject
+from prefect.client.schemas.objects import ConcurrencyLimitStrategy
 
 from .constants import WorkflowTag, WorkflowType
 from .models import WorkerPoolDefinition, WorkflowDefinition
@@ -17,14 +18,14 @@ ACTION_ADD_NODE_TO_GROUP = WorkflowDefinition(
 
 ACTION_RUN_GENERATOR = WorkflowDefinition(
     name="action-run-generator",
-    type=WorkflowType.CORE,
+    type=WorkflowType.INTERNAL,
     module="infrahub.actions.tasks",
     function="run_generator",
 )
 
 ACTION_RUN_GENERATOR_GROUP_EVENT = WorkflowDefinition(
     name="action-run-generator-group-event",
-    type=WorkflowType.CORE,
+    type=WorkflowType.INTERNAL,
     module="infrahub.actions.tasks",
     function="run_generator_group_event",
 )
@@ -83,7 +84,7 @@ TRIGGER_ARTIFACT_DEFINITION_GENERATE = WorkflowDefinition(
 
 TRIGGER_GENERATOR_DEFINITION_RUN = WorkflowDefinition(
     name="generator-definition-run",
-    type=WorkflowType.CORE,
+    type=WorkflowType.INTERNAL,
     module="infrahub.generators.tasks",
     function="run_generator_definition",
     tags=[WorkflowTag.DATABASE_CHANGE],
@@ -179,6 +180,8 @@ GIT_REPOSITORIES_SYNC = WorkflowDefinition(
     cron="* * * * *",
     module="infrahub.git.tasks",
     function="sync_remote_repositories",
+    concurrency_limit=1,
+    concurrency_limit_strategy=ConcurrencyLimitStrategy.CANCEL_NEW,
 )
 
 GIT_REPOSITORIES_CREATE_BRANCH = WorkflowDefinition(
@@ -227,6 +230,13 @@ BRANCH_REBASE = WorkflowDefinition(
     function="rebase_branch",
     tags=[WorkflowTag.DATABASE_CHANGE],
 )
+BRANCH_MIGRATE = WorkflowDefinition(
+    name="branch-migrate",
+    type=WorkflowType.CORE,
+    module="infrahub.core.branch.tasks",
+    function="migrate_branch",
+    tags=[WorkflowTag.DATABASE_CHANGE],
+)
 
 BRANCH_CREATE = WorkflowDefinition(
     name="create-branch",
@@ -320,6 +330,62 @@ COMPUTED_ATTRIBUTE_JINJA2_UPDATE_VALUE = WorkflowDefinition(
     tags=[WorkflowTag.DATABASE_CHANGE],
 )
 
+DISPLAY_LABELS_PROCESS_JINJA2 = WorkflowDefinition(
+    name="display-label-process-jinja2",
+    type=WorkflowType.CORE,
+    module="infrahub.display_labels.tasks",
+    function="process_display_label",
+    tags=[WorkflowTag.DATABASE_CHANGE],
+)
+
+DISPLAY_LABEL_JINJA2_UPDATE_VALUE = WorkflowDefinition(
+    name="display-label-jinja2-update-value",
+    type=WorkflowType.CORE,
+    module="infrahub.display_labels.tasks",
+    function="display_label_jinja2_update_value",
+    tags=[WorkflowTag.DATABASE_CHANGE],
+)
+
+HFID_PROCESS = WorkflowDefinition(
+    name="hfid-process",
+    type=WorkflowType.CORE,
+    module="infrahub.hfid.tasks",
+    function="process_hfid",
+    tags=[WorkflowTag.DATABASE_CHANGE],
+)
+
+HFID_SETUP = WorkflowDefinition(
+    name="hfid-setup",
+    type=WorkflowType.CORE,
+    module="infrahub.hfid.tasks",
+    function="hfid_setup",
+)
+
+
+HFID_UPDATE_VALUE = WorkflowDefinition(
+    name="hfid-update-value",
+    type=WorkflowType.CORE,
+    module="infrahub.hfid.tasks",
+    function="hfid_update_value",
+    tags=[WorkflowTag.DATABASE_CHANGE],
+)
+
+TRIGGER_UPDATE_DISPLAY_LABELS = WorkflowDefinition(
+    name="trigger-update-display-labels",
+    type=WorkflowType.CORE,
+    module="infrahub.display_labels.tasks",
+    function="trigger_update_display_labels",
+    tags=[WorkflowTag.DATABASE_CHANGE],
+)
+
+TRIGGER_UPDATE_HFID = WorkflowDefinition(
+    name="trigger-update-hfid",
+    type=WorkflowType.CORE,
+    module="infrahub.hfid.tasks",
+    function="trigger_update_hfid",
+    tags=[WorkflowTag.DATABASE_CHANGE],
+)
+
 TRIGGER_UPDATE_JINJA_COMPUTED_ATTRIBUTES = WorkflowDefinition(
     name="trigger_update_jinja2_computed_attributes",
     type=WorkflowType.CORE,
@@ -356,6 +422,14 @@ COMPUTED_ATTRIBUTE_PROCESS_TRANSFORM = WorkflowDefinition(
     tags=[WorkflowTag.DATABASE_CHANGE],
 )
 
+DISPLAY_LABELS_SETUP_JINJA2 = WorkflowDefinition(
+    name="display-labels-setup-jinja2",
+    type=WorkflowType.CORE,
+    module="infrahub.display_labels.tasks",
+    function="display_labels_setup_jinja2",
+)
+
+
 QUERY_COMPUTED_ATTRIBUTE_TRANSFORM_TARGETS = WorkflowDefinition(
     name="query-computed-attribute-transform-targets",
     type=WorkflowType.CORE,
@@ -531,6 +605,35 @@ VALIDATE_SCHEMA_NUMBER_POOLS = WorkflowDefinition(
 )
 
 
+PROFILE_REFRESH_MULTIPLE = WorkflowDefinition(
+    name="objects-profiles-refresh-multiple",
+    type=WorkflowType.CORE,
+    module="infrahub.profiles.tasks",
+    function="objects_profiles_refresh_multiple",
+    tags=[WorkflowTag.DATABASE_CHANGE],
+)
+
+
+PROFILE_REFRESH = WorkflowDefinition(
+    name="object-profiles-refresh",
+    type=WorkflowType.CORE,
+    module="infrahub.profiles.tasks",
+    function="object_profiles_refresh",
+    tags=[WorkflowTag.DATABASE_CHANGE],
+)
+
+
+CLEAN_UP_DEADLOCKS = WorkflowDefinition(
+    name="clean-up-deadlocks",
+    type=WorkflowType.INTERNAL,
+    cron="* * * * *",
+    module="infrahub.locks.tasks",
+    function="clean_up_deadlocks",
+    concurrency_limit=1,
+    concurrency_limit_strategy=ConcurrencyLimitStrategy.CANCEL_NEW,
+)
+
+
 WORKER_POOLS = [INFRAHUB_WORKER_POOL]
 
 WORKFLOWS = [
@@ -545,8 +648,10 @@ WORKFLOWS = [
     BRANCH_MERGED,
     BRANCH_MERGE_MUTATION,
     BRANCH_MERGE_POST_PROCESS,
+    BRANCH_MIGRATE,
     BRANCH_REBASE,
     BRANCH_VALIDATE,
+    CLEAN_UP_DEADLOCKS,
     COMPUTED_ATTRIBUTE_JINJA2_UPDATE_VALUE,
     COMPUTED_ATTRIBUTE_PROCESS_JINJA2,
     COMPUTED_ATTRIBUTE_PROCESS_TRANSFORM,
@@ -556,6 +661,9 @@ WORKFLOWS = [
     DIFF_REFRESH,
     DIFF_REFRESH_ALL,
     DIFF_UPDATE,
+    DISPLAY_LABELS_PROCESS_JINJA2,
+    DISPLAY_LABELS_SETUP_JINJA2,
+    DISPLAY_LABEL_JINJA2_UPDATE_VALUE,
     GIT_REPOSITORIES_CHECK_ARTIFACT_CREATE,
     GIT_REPOSITORIES_CREATE_BRANCH,
     GIT_REPOSITORIES_DIFF_NAMES_ONLY,
@@ -571,7 +679,12 @@ WORKFLOWS = [
     GIT_REPOSITORY_USER_CHECKS_TRIGGER,
     GIT_REPOSITORY_USER_CHECK_RUN,
     GRAPHQL_QUERY_GROUP_UPDATE,
+    HFID_PROCESS,
+    HFID_SETUP,
+    HFID_UPDATE_VALUE,
     IPAM_RECONCILIATION,
+    PROFILE_REFRESH,
+    PROFILE_REFRESH_MULTIPLE,
     PROPOSED_CHANGE_MERGE,
     QUERY_COMPUTED_ATTRIBUTE_TRANSFORM_TARGETS,
     REMOVE_ADD_NODE_FROM_GROUP,
@@ -597,6 +710,8 @@ WORKFLOWS = [
     TRIGGER_ARTIFACT_DEFINITION_GENERATE,
     TRIGGER_CONFIGURE_ALL,
     TRIGGER_GENERATOR_DEFINITION_RUN,
+    TRIGGER_UPDATE_DISPLAY_LABELS,
+    TRIGGER_UPDATE_HFID,
     TRIGGER_UPDATE_JINJA_COMPUTED_ATTRIBUTES,
     TRIGGER_UPDATE_PYTHON_COMPUTED_ATTRIBUTES,
     VALIDATE_SCHEMA_NUMBER_POOLS,

infrahub/workflows/initialization.py

@@ -7,6 +7,8 @@ from prefect.exceptions import ObjectAlreadyExists
 from prefect.logging import get_run_logger
 
 from infrahub import config
+from infrahub.display_labels.gather import gather_trigger_display_labels_jinja2
+from infrahub.hfid.gather import gather_trigger_hfid
 from infrahub.trigger.catalogue import builtin_triggers
 from infrahub.trigger.models import TriggerType
 from infrahub.trigger.setup import setup_triggers
@@ -74,3 +76,22 @@ async def setup_task_manager() -> None:
         await setup_triggers(
             client=client, triggers=builtin_triggers, trigger_type=TriggerType.BUILTIN, force_update=True
         )
+
+
+@flow(name="task-manager-identifiers", flow_run_name="Setup Task Manager Display Labels and HFID")
+async def setup_task_manager_identifiers() -> None:
+    async with get_client(sync_client=False) as client:
+        display_label_triggers = await gather_trigger_display_labels_jinja2()
+        await setup_triggers(
+            client=client,
+            triggers=display_label_triggers,
+            trigger_type=TriggerType.DISPLAY_LABEL_JINJA2,
+            force_update=True,
+        )  # type: ignore[misc]
+        hfid_triggers = await gather_trigger_hfid()
+        await setup_triggers(
+            client=client,
+            triggers=hfid_triggers,
+            trigger_type=TriggerType.HUMAN_FRIENDLY_ID,
+            force_update=True,
+        )  # type: ignore[misc]

infrahub/workflows/models.py

@@ -6,7 +6,7 @@ from uuid import UUID
 from prefect import Flow
 from prefect.client.orchestration import PrefectClient
 from prefect.client.schemas.actions import DeploymentScheduleCreate
-from prefect.client.schemas.objects import FlowRun
+from prefect.client.schemas.objects import ConcurrencyLimitStrategy, FlowRun
 from prefect.client.schemas.schedules import CronSchedule
 from pydantic import BaseModel, Field
 from typing_extensions import Self
@@ -48,6 +48,14 @@ class WorkflowDefinition(BaseModel):
     function: str
     cron: str | None = None
     tags: list[WorkflowTag] = Field(default_factory=list)
+    concurrency_limit: int | None = Field(
+        default=None,
+        description="The concurrency limit for the deployment.",
+    )
+    concurrency_limit_strategy: ConcurrencyLimitStrategy | None = Field(
+        default=None,
+        description="The concurrency options for the deployment.",
+    )
 
     @property
     def entrypoint(self) -> str:
@@ -60,7 +68,14 @@ class WorkflowDefinition(BaseModel):
         return f"{self.name}/{self.name}"
 
     def to_deployment(self) -> dict[str, Any]:
-        payload: dict[str, Any] = {"name": self.name, "entrypoint": self.entrypoint, "tags": self.get_tags()}
+        payload: dict[str, Any] = {
+            "name": self.name,
+            "entrypoint": self.entrypoint,
+            "tags": self.get_tags(),
+            "concurrency_limit": self.concurrency_limit,
+        }
+        if self.concurrency_limit_strategy:
+            payload["concurrency_options"] = {"collision_strategy": self.concurrency_limit_strategy}
         if self.type == WorkflowType.CORE:
             payload["version"] = __version__
         if self.cron:

infrahub_sdk/branch.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import warnings
+from enum import Enum
 from typing import TYPE_CHECKING, Any, Literal, overload
 from urllib.parse import urlencode
 
@@ -14,6 +15,13 @@ if TYPE_CHECKING:
     from .client import InfrahubClient, InfrahubClientSync
 
 
+class BranchStatus(str, Enum):
+    OPEN = "OPEN"
+    NEED_REBASE = "NEED_REBASE"
+    NEED_UPGRADE_REBASE = "NEED_UPGRADE_REBASE"
+    DELETING = "DELETING"
+
+
 class BranchData(BaseModel):
     id: str
     name: str
@@ -21,6 +29,8 @@ class BranchData(BaseModel):
     sync_with_git: bool
     is_default: bool
     has_schema_changes: bool
+    graph_version: int | None = None
+    status: BranchStatus = BranchStatus.OPEN
     origin_branch: str | None = None
     branched_from: str
 
@@ -34,6 +44,8 @@ BRANCH_DATA = {
     "is_default": None,
     "sync_with_git": None,
     "has_schema_changes": None,
+    "graph_version": None,
+    "status": None,
 }
 
 BRANCH_DATA_FILTER = {"@filters": {"name": "$branch_name"}}
@@ -188,9 +200,7 @@ class InfrahubBranchManager(InfraHubBranchManagerBase):
         query = Query(name="GetAllBranch", query=QUERY_ALL_BRANCHES_DATA)
         data = await self.client.execute_graphql(query=query.render(), tracker="query-branch-all")
 
-        branches = {branch["name"]: BranchData(**branch) for branch in data["Branch"]}
-
-        return branches
+        return {branch["name"]: BranchData(**branch) for branch in data["Branch"]}
 
     async def get(self, branch_name: str) -> BranchData:
         query = Query(name="GetBranch", query=QUERY_ONE_BRANCH_DATA, variables={"branch_name": str})
@@ -230,9 +240,7 @@ class InfrahubBranchManagerSync(InfraHubBranchManagerBase):
         query = Query(name="GetAllBranch", query=QUERY_ALL_BRANCHES_DATA)
         data = self.client.execute_graphql(query=query.render(), tracker="query-branch-all")
 
-        branches = {branch["name"]: BranchData(**branch) for branch in data["Branch"]}
-
-        return branches
+        return {branch["name"]: BranchData(**branch) for branch in data["Branch"]}
 
     def get(self, branch_name: str) -> BranchData:
         query = Query(name="GetBranch", query=QUERY_ONE_BRANCH_DATA, variables={"branch_name": str})
@@ -292,13 +300,14 @@ class InfrahubBranchManagerSync(InfraHubBranchManagerBase):
             },
         }
 
-        query = Mutation(mutation="BranchCreate", input_data=input_data, query=MUTATION_QUERY_DATA)
+        mutation_query = MUTATION_QUERY_TASK if background_execution else MUTATION_QUERY_DATA
+        query = Mutation(mutation="BranchCreate", input_data=input_data, query=mutation_query)
         response = self.client.execute_graphql(query=query.render(), tracker="mutation-branch-create")
 
         # Make sure server version is recent enough to support background execution, as previously
         # using background_execution=True had no effect.
         if background_execution and "task" in response["BranchCreate"]:
-            return BranchData(**response["BranchCreate"]["task"]["id"])
+            return response["BranchCreate"]["task"]["id"]
         return BranchData(**response["BranchCreate"]["object"])
 
     def delete(self, branch_name: str) -> bool:

infrahub_sdk/checks.py

@@ -33,7 +33,7 @@ class InfrahubCheckInitializer(BaseModel):
 class InfrahubCheck:
     name: str | None = None
     query: str = ""
-    timeout: int = 10
+    timeout: int = 60
 
     def __init__(
         self,