infrahub-server 1.5.0b0__py3-none-any.whl → 1.5.0b2__py3-none-any.whl

infrahub/graphql/mutations/schema.py

@@ -81,7 +81,7 @@ class SchemaDropdownAdd(Mutation):
         _validate_schema_permission(graphql_context=graphql_context)
         await apply_external_context(graphql_context=graphql_context, context_input=context)
 
-        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name)
+        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=False)
         attribute = str(data.attribute)
         validate_kind_dropdown(kind=kind, attribute=attribute)
         dropdown = str(data.dropdown)
@@ -104,7 +104,7 @@ class SchemaDropdownAdd(Mutation):
             context=graphql_context.get_context(),
         )
 
-        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name)
+        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=False)
         attrib = kind.get_attribute(attribute)
         dropdown_entry = {}
         success = False
@@ -141,7 +141,7 @@ class SchemaDropdownRemove(Mutation):
         graphql_context: GraphqlContext = info.context
 
         _validate_schema_permission(graphql_context=graphql_context)
-        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name)
+        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=False)
         await apply_external_context(graphql_context=graphql_context, context_input=context)
 
         attribute = str(data.attribute)
@@ -197,7 +197,7 @@ class SchemaEnumAdd(Mutation):
         graphql_context: GraphqlContext = info.context
 
         _validate_schema_permission(graphql_context=graphql_context)
-        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name)
+        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=False)
         await apply_external_context(graphql_context=graphql_context, context_input=context)
 
         attribute = str(data.attribute)
@@ -243,7 +243,7 @@ class SchemaEnumRemove(Mutation):
         graphql_context: GraphqlContext = info.context
 
         _validate_schema_permission(graphql_context=graphql_context)
-        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name)
+        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=False)
         await apply_external_context(graphql_context=graphql_context, context_input=context)
 
         attribute = str(data.attribute)

infrahub/graphql/queries/resource_manager.py

@@ -242,7 +242,7 @@ class PoolUtilization(ObjectType):
                     if "kind" in node_fields:
                         node_response["kind"] = resource_node.get_kind()
                     if "display_label" in node_fields:
-                        node_response["display_label"] = await resource_node.render_display_label(db=db)
+                        node_response["display_label"] = await resource_node.get_display_label(db=db)
                     if "weight" in node_fields:
                         node_response["weight"] = await resource_node.get_resource_weight(db=db)  # type: ignore[attr-defined]
                     if "utilization" in node_fields:

infrahub/graphql/resolvers/resolver.py

@@ -166,6 +166,8 @@ async def default_paginated_list_resolver(
 
         edges = fields.get("edges", {})
         node_fields = edges.get("node", {})
+        if "hfid" in node_fields:
+            node_fields["human_friendly_id"] = None
 
         permission_set: dict[str, Any] | None = None
         permissions = (

infrahub/graphql/schema.py

@@ -19,7 +19,9 @@ from .mutations.computed_attribute import RecomputeComputedAttribute, UpdateComp
 from .mutations.convert_object_type import ConvertObjectType
 from .mutations.diff import DiffUpdateMutation
 from .mutations.diff_conflict import ResolveDiffConflict
+from .mutations.display_label import UpdateDisplayLabel
 from .mutations.generator import GeneratorDefinitionRequestRun
+from .mutations.hfid import UpdateHFID
 from .mutations.profile import InfrahubProfilesRefresh
 from .mutations.proposed_change import (
     ProposedChangeCheckForApprovalRevoke,
@@ -114,6 +116,8 @@ class InfrahubBaseMutation(ObjectType):
     InfrahubRepositoryProcess = ProcessRepository.Field()
     InfrahubRepositoryConnectivity = ValidateRepositoryConnectivity.Field()
     InfrahubUpdateComputedAttribute = UpdateComputedAttribute.Field()
+    InfrahubUpdateDisplayLabel = UpdateDisplayLabel.Field()
+    InfrahubUpdateHFID = UpdateHFID.Field()
     InfrahubRecomputeComputedAttribute = RecomputeComputedAttribute.Field()
 
     RelationshipAdd = RelationshipAdd.Field()

infrahub/graphql/schema_sort.py

@@ -0,0 +1,170 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from graphql.language.ast import (
+    DocumentNode,
+    EnumTypeDefinitionNode,
+    EnumValueDefinitionNode,
+    FieldDefinitionNode,
+    InputObjectTypeDefinitionNode,
+    InputValueDefinitionNode,
+    InterfaceTypeDefinitionNode,
+    NamedTypeNode,
+    ObjectTypeDefinitionNode,
+)
+
+if TYPE_CHECKING:
+    from graphql import DefinitionNode
+
+
+def _sort_arguments(args: tuple[InputValueDefinitionNode, ...] | None) -> list[InputValueDefinitionNode] | None:
+    """Sort arguments (filters) of a field alphabetically by name.
+
+    Args:
+        args: List of input value definition nodes to sort, or None.
+
+    Returns:
+        Sorted list of input value definition nodes, or None if input was None.
+    """
+    if not args:
+        return None
+    return sorted(args, key=lambda a: a.name.value)
+
+
+def _sort_fields(fields: tuple[FieldDefinitionNode, ...] | None) -> list[FieldDefinitionNode] | None:
+    """Sort fields and their arguments alphabetically.
+
+    Args:
+        fields: List of field definition nodes to sort, or None.
+
+    Returns:
+        Sorted list of field definition nodes with sorted arguments, or None if input was None.
+    """
+    if not fields:
+        return None
+    sorted_fields = []
+    for field in sorted(fields, key=lambda fld: fld.name.value):
+        sorted_args = _sort_arguments(field.arguments)
+        sorted_fields.append(
+            FieldDefinitionNode(
+                name=field.name,
+                type=field.type,
+                arguments=sorted_args,
+                directives=field.directives,
+                description=field.description,
+                loc=field.loc,
+            )
+        )
+    return sorted_fields
+
+
+def _sort_enum_values(values: tuple[EnumValueDefinitionNode, ...] | None) -> list[EnumValueDefinitionNode] | None:
+    """Sort enum values alphabetically by name.
+
+    Args:
+        values: List of enum value definition nodes to sort, or None.
+
+    Returns:
+        Sorted list of enum value definition nodes, or None if input was None.
+    """
+    if not values:
+        return None
+    return sorted(values, key=lambda v: v.name.value)
+
+
+def _sort_input_fields(fields: tuple[InputValueDefinitionNode, ...] | None) -> list[InputValueDefinitionNode] | None:
+    """Sort input object fields alphabetically by name.
+
+    Args:
+        fields: List of input value definition nodes to sort, or None.
+
+    Returns:
+        Sorted list of input value definition nodes, or None if input was None.
+    """
+    if not fields:
+        return None
+    return sorted(fields, key=lambda f: f.name.value)
+
+
+def _sort_interfaces(interfaces: tuple[NamedTypeNode, ...] | None) -> list[NamedTypeNode] | None:
+    """Sort interface implementations alphabetically by name.
+
+    Args:
+        interfaces: Tuple of named type nodes representing interfaces, or None.
+
+    Returns:
+        Sorted list of named type nodes, or None if input was None.
+    """
+    if not interfaces:
+        return None
+    return sorted(interfaces, key=lambda i: i.name.value)
+
+
+def sort_schema_ast(document: DocumentNode) -> DocumentNode:
+    """Return a new DocumentNode with all definitions, fields, and arguments sorted alphabetically.
+
+    This function recursively sorts all GraphQL schema elements including:
+    - Type definitions (objects, interfaces, enums, input objects)
+    - Field definitions and their arguments
+    - Enum values
+    - Input object fields
+
+    Args:
+        document: The GraphQL document node containing schema definitions.
+
+    Returns:
+        A new DocumentNode with all elements sorted alphabetically by name.
+    """
+
+    sorted_definitions: list[
+        ObjectTypeDefinitionNode
+        | InterfaceTypeDefinitionNode
+        | EnumTypeDefinitionNode
+        | InputObjectTypeDefinitionNode
+        | DefinitionNode
+    ] = []
+
+    for definition in sorted(
+        document.definitions, key=lambda d: getattr(d.name, "value", "") if hasattr(d, "name") and d.name else ""
+    ):
+        if isinstance(definition, (ObjectTypeDefinitionNode, InterfaceTypeDefinitionNode)):
+            sorted_fields = _sort_fields(definition.fields)
+            sorted_interfaces = _sort_interfaces(definition.interfaces)
+            sorted_definitions.append(
+                definition.__class__(
+                    name=definition.name,
+                    interfaces=sorted_interfaces,
+                    directives=definition.directives,
+                    fields=sorted_fields,
+                    description=definition.description,
+                    loc=definition.loc,
+                )
+            )
+
+        elif isinstance(definition, EnumTypeDefinitionNode):
+            sorted_values = _sort_enum_values(definition.values)
+            sorted_definitions.append(
+                EnumTypeDefinitionNode(
+                    name=definition.name,
+                    directives=definition.directives,
+                    values=sorted_values,
+                    description=definition.description,
+                    loc=definition.loc,
+                )
+            )
+        elif isinstance(definition, InputObjectTypeDefinitionNode):
+            sorted_inputs = _sort_input_fields(definition.fields)
+            sorted_definitions.append(
+                InputObjectTypeDefinitionNode(
+                    name=definition.name,
+                    directives=definition.directives,
+                    fields=sorted_inputs,
+                    description=definition.description,
+                    loc=definition.loc,
+                )
+            )
+        else:
+            sorted_definitions.append(definition)
+
+    return DocumentNode(definitions=sorted_definitions)

infrahub/graphql/types/branch.py

@@ -2,11 +2,12 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
-from graphene import Boolean, Field, String
+from graphene import Boolean, Field, Int, String
 
 from infrahub.core.branch import Branch
 from infrahub.core.constants import GLOBAL_BRANCH_NAME
 
+from .enums import InfrahubBranchStatus
 from .standard_node import InfrahubObjectType
 
 if TYPE_CHECKING:
@@ -19,6 +20,8 @@ class BranchType(InfrahubObjectType):
     description = String(required=False)
     origin_branch = String(required=False)
     branched_from = String(required=False)
+    status = InfrahubBranchStatus(required=True)
+    graph_version = Int(required=False)
     created_at = String(required=False)
     sync_with_git = Boolean(required=False)
     is_default = Boolean(required=False)

infrahub/graphql/types/enums.py

@@ -1,6 +1,7 @@
 from graphene import Enum
 
 from infrahub.core import constants
+from infrahub.core.branch.enums import BranchStatus
 from infrahub.permissions import constants as permission_constants
 
 CheckType = Enum.from_enum(constants.CheckType)
@@ -10,3 +11,5 @@ DiffAction = Enum.from_enum(constants.DiffAction)
 Severity = Enum.from_enum(constants.Severity)
 
 BranchRelativePermissionDecision = Enum.from_enum(permission_constants.BranchRelativePermissionDecision)
+
+InfrahubBranchStatus = Enum.from_enum(BranchStatus)

infrahub/groups/tasks.py

@@ -20,7 +20,7 @@ async def update_graphql_query_group(model: RequestGraphQLQueryGroupUpdate) -> N
     if len(model.subscribers) == 1:
         related_nodes.append(model.subscribers[0])
 
-    await add_tags(branches=[model.branch], nodes=related_nodes)
+    await add_tags(branches=[model.branch], nodes=related_nodes, namespace=False)
 
     params_hash = dict_hash(model.params)
     group_name = f"{model.query_name}__{params_hash}"

infrahub/hfid/gather.py

@@ -0,0 +1,48 @@
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+
+from prefect import task
+from prefect.cache_policies import NONE
+from prefect.logging import get_run_logger
+
+from infrahub.core.registry import registry
+from infrahub.database import InfrahubDatabase  # noqa: TC001  needed for prefect flow
+
+from .models import HFIDTriggerDefinition
+
+
+@dataclass
+class BranchScope:
+    name: str
+    out_of_scope: list[str] = field(default_factory=list)
+
+
+@task(
+    name="gather-trigger-hfid",
+    cache_policy=NONE,
+)
+async def gather_trigger_hfid(
+    db: InfrahubDatabase | None = None,  # noqa: ARG001 Needed to have a common function signature for gathering functions
+) -> list[HFIDTriggerDefinition]:
+    log = get_run_logger()
+
+    # Build a list of all branches to process based on which branch is different from main
+    branches_with_diff_from_main = registry.get_altered_schema_branches()
+    branches_to_process: list[BranchScope] = [BranchScope(name=branch) for branch in branches_with_diff_from_main]
+    branches_to_process.append(BranchScope(name=registry.default_branch, out_of_scope=branches_with_diff_from_main))
+
+    triggers: list[HFIDTriggerDefinition] = []
+
+    for branch in branches_to_process:
+        schema_branch = registry.schema.get_schema_branch(name=branch.name)
+        branch_triggers = HFIDTriggerDefinition.from_schema_hfids(
+            branch=branch.name,
+            hfids=schema_branch.hfids,
+            branches_out_of_scope=branch.out_of_scope,
+        )
+        log.info(f"Generating {len(branch_triggers)} HFID trigger for {branch.name} (except {branch.out_of_scope})")
+
+        triggers.extend(branch_triggers)
+
+    return triggers

infrahub/hfid/models.py

@@ -0,0 +1,240 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Any, Self
+
+from infrahub_sdk.graphql import Query
+from pydantic import BaseModel, Field
+
+from infrahub.core.constants import RelationshipCardinality
+from infrahub.core.registry import registry
+from infrahub.core.schema import NodeSchema  # noqa: TC001
+from infrahub.events import NodeUpdatedEvent
+from infrahub.trigger.constants import NAME_SEPARATOR
+from infrahub.trigger.models import (
+    EventTrigger,
+    ExecuteWorkflow,
+    TriggerBranchDefinition,
+    TriggerType,
+)
+from infrahub.workflows.catalogue import HFID_PROCESS
+
+if TYPE_CHECKING:
+    from infrahub.core.schema.schema_branch_hfid import HFIDs, RelationshipTriggers
+
+
+@dataclass
+class AttributeTarget:
+    hash: str
+    fields: set[str]
+
+
+class HFIDTriggerDefinition(TriggerBranchDefinition):
+    type: TriggerType = TriggerType.HUMAN_FRIENDLY_ID
+    hfid_hash: str
+    target_kind: str | None = Field(default=None)
+
+    def get_description(self) -> str:
+        return f"{super().get_description()} | hash:{self.hfid_hash}"
+
+    @classmethod
+    def from_schema_hfids(
+        cls,
+        branch: str,
+        hfids: HFIDs,
+        branches_out_of_scope: list[str] | None = None,
+    ) -> list[HFIDTriggerDefinition]:
+        """
+        This function is used to create a trigger definition for a display labels of type Jinja2.
+        """
+
+        definitions: list[HFIDTriggerDefinition] = []
+
+        for node_kind, hfid_definition in hfids.get_template_nodes().items():
+            definitions.append(
+                cls.new(
+                    branch=branch,
+                    node_kind=node_kind,
+                    target_kind=node_kind,
+                    fields=[
+                        "_trigger_placeholder"
+                    ],  # Triggers for the nodes themselves are only used to determine if all nodes should be regenerated
+                    hfid_hash=hfid_definition.get_hash(),
+                    branches_out_of_scope=branches_out_of_scope,
+                )
+            )
+
+        for related_kind, relationship_trigger in hfids.get_related_trigger_nodes().items():
+            definitions.extend(
+                cls.from_related_node(
+                    branch=branch,
+                    related_kind=related_kind,
+                    relationship_trigger=relationship_trigger,
+                    hfids=hfids,
+                    branches_out_of_scope=branches_out_of_scope,
+                )
+            )
+
+        return definitions
+
+    @classmethod
+    def from_related_node(
+        cls,
+        branch: str,
+        related_kind: str,
+        relationship_trigger: RelationshipTriggers,
+        hfids: HFIDs,
+        branches_out_of_scope: list[str] | None = None,
+    ) -> list[HFIDTriggerDefinition]:
+        targets_by_attribute: dict[str, AttributeTarget] = {}
+        definitions: list[HFIDTriggerDefinition] = []
+        for attribute, relationship_identifiers in relationship_trigger.attributes.items():
+            for relationship_identifier in relationship_identifiers:
+                actual_node = hfids.get_node_definition(kind=relationship_identifier.kind)
+                if relationship_identifier.kind not in targets_by_attribute:
+                    targets_by_attribute[relationship_identifier.kind] = AttributeTarget(
+                        actual_node.get_hash(), fields=set()
+                    )
+                targets_by_attribute[relationship_identifier.kind].fields.add(attribute)
+
+        for target_kind, attribute_target in targets_by_attribute.items():
+            definitions.append(
+                cls.new(
+                    branch=branch,
+                    node_kind=related_kind,
+                    target_kind=target_kind,
+                    fields=sorted(attribute_target.fields),
+                    hfid_hash=attribute_target.hash,
+                    branches_out_of_scope=branches_out_of_scope,
+                )
+            )
+
+        return definitions
+
+    @classmethod
+    def new(
+        cls,
+        branch: str,
+        node_kind: str,
+        target_kind: str,
+        hfid_hash: str,
+        fields: list[str],
+        branches_out_of_scope: list[str] | None = None,
+    ) -> Self:
+        event_trigger = EventTrigger()
+        event_trigger.events.add(NodeUpdatedEvent.event_name)
+        event_trigger.match = {"infrahub.node.kind": node_kind}
+        if branches_out_of_scope:
+            event_trigger.match["infrahub.branch.name"] = [f"!{branch}" for branch in branches_out_of_scope]
+        elif not branches_out_of_scope and branch != registry.default_branch:
+            event_trigger.match["infrahub.branch.name"] = branch
+
+        event_trigger.match_related = {
+            "prefect.resource.role": ["infrahub.node.attribute_update", "infrahub.node.relationship_update"],
+            "infrahub.field.name": fields,
+        }
+
+        workflow = ExecuteWorkflow(
+            workflow=HFID_PROCESS,
+            parameters={
+                "branch_name": "{{ event.resource['infrahub.branch.name'] }}",
+                "node_kind": node_kind,
+                "object_id": "{{ event.resource['infrahub.node.id'] }}",
+                "target_kind": target_kind,
+                "context": {
+                    "__prefect_kind": "json",
+                    "value": {
+                        "__prefect_kind": "jinja",
+                        "template": "{{ event.payload['context'] | tojson }}",
+                    },
+                },
+            },
+        )
+
+        trigger_definition_target_kind = target_kind if target_kind == node_kind else None
+
+        return cls(
+            name=f"{target_kind}{NAME_SEPARATOR}by{NAME_SEPARATOR}{node_kind}",
+            hfid_hash=hfid_hash,
+            branch=branch,
+            trigger=event_trigger,
+            actions=[workflow],
+            target_kind=trigger_definition_target_kind,
+        )
+
+
+class HFIDGraphQLResponse(BaseModel):
+    node_id: str
+    hfid_value: list[str] | None = Field(default=None)
+    variables: dict[str, str] = Field(default_factory=dict)
+
+
+class HFIDGraphQL(BaseModel):
+    filter_key: str
+    node_schema: NodeSchema = Field(..., description="The node kind where the computed attribute is defined")
+    variables: list[str] = Field(..., description="The list of variable names used within the computed attribute")
+
+    def render_graphql_query(self, filter_id: str) -> str:
+        query_fields = self.query_fields
+        query_fields["id"] = None
+        query_fields["hfid"] = None
+        query = Query(
+            name="HFIDFilter",
+            query={
+                self.node_schema.kind: {
+                    "@filters": {self.filter_key: filter_id},
+                    "edges": {"node": query_fields},
+                }
+            },
+        )
+
+        return query.render()
+
+    @property
+    def query_fields(self) -> dict[str, Any]:
+        output: dict[str, Any] = {}
+        for variable in self.variables:
+            field_name, remainder = variable.split("__", maxsplit=1)
+            if field_name in self.node_schema.attribute_names:
+                output[field_name] = {remainder: None}
+            elif field_name in self.node_schema.relationship_names:
+                related_attribute, related_value = remainder.split("__", maxsplit=1)
+                relationship = self.node_schema.get_relationship(name=field_name)
+                if relationship.cardinality == RelationshipCardinality.ONE:
+                    if field_name not in output:
+                        output[field_name] = {"node": {}}
+                    output[field_name]["node"][related_attribute] = {related_value: None}
+        return output
+
+    def parse_response(self, response: dict[str, Any]) -> list[HFIDGraphQLResponse]:
+        rendered_response: list[HFIDGraphQLResponse] = []
+        if kind_payload := response.get(self.node_schema.kind):
+            edges = kind_payload.get("edges", [])
+            for node in edges:
+                if node_response := self.to_node_response(node_dict=node):
+                    rendered_response.append(node_response)
+        return rendered_response
+
+    def to_node_response(self, node_dict: dict[str, Any]) -> HFIDGraphQLResponse | None:
+        if node := node_dict.get("node"):
+            node_id = node.get("id")
+        else:
+            return None
+
+        hfid = node.get("hfid")
+        response = HFIDGraphQLResponse(node_id=node_id, hfid_value=hfid)
+        for variable in self.variables:
+            field_name, remainder = variable.split("__", maxsplit=1)
+            # response.variables[variable] = None
+            if field_content := node.get(field_name):
+                if field_name in self.node_schema.attribute_names:
+                    response.variables[variable] = str(field_content.get(remainder, ""))
+                elif field_name in self.node_schema.relationship_names:
+                    relationship = self.node_schema.get_relationship(name=field_name)
+                    if relationship.cardinality == RelationshipCardinality.ONE:
+                        related_attribute, related_value = remainder.split("__", maxsplit=1)
+                        node_content = field_content.get("node") or {}
+                        related_attribute_content = node_content.get(related_attribute) or {}
+                        response.variables[variable] = str(related_attribute_content.get(related_value, ""))
+
+        return response