infrahub-server 1.2.0b1__py3-none-any.whl → 1.2.1__py3-none-any.whl

infrahub/graphql/mutations/proposed_change.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any, Self
 
 from graphene import Boolean, Field, InputObjectType, Mutation, String
 from graphql import GraphQLResolveInfo
@@ -31,7 +31,7 @@ if TYPE_CHECKING:
 
 class InfrahubProposedChangeMutation(InfrahubMutationMixin, Mutation):
     @classmethod
-    def __init_subclass_with_meta__(cls, schema: NodeSchema = None, _meta=None, **options):
+    def __init_subclass_with_meta__(cls, schema: NodeSchema = None, _meta=None, **options) -> None:
         # Make sure schema is a valid NodeSchema Node Class
         if not isinstance(schema, NodeSchema):
             raise ValueError(f"You need to pass a valid NodeSchema in '{cls.__name__}.Meta', received '{schema}'")
@@ -49,8 +49,8 @@ class InfrahubProposedChangeMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        database: Optional[InfrahubDatabase] = None,  # noqa: ARG003
-    ):
+        database: InfrahubDatabase | None = None,  # noqa: ARG003
+    ) -> tuple[Node, Self]:
         graphql_context: GraphqlContext = info.context
 
         async with graphql_context.db.start_transaction() as dbt:
@@ -86,9 +86,9 @@ class InfrahubProposedChangeMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        database: Optional[InfrahubDatabase] = None,  # noqa: ARG003
-        node: Optional[Node] = None,  # noqa: ARG003
-    ):
+        database: InfrahubDatabase | None = None,  # noqa: ARG003
+        node: Node | None = None,  # noqa: ARG003
+    ) -> tuple[Node, Self]:
         graphql_context: GraphqlContext = info.context
 
         obj = await NodeManager.get_one_by_id_or_default_filter(

infrahub/graphql/mutations/relationship.py

@@ -8,14 +8,12 @@ from infrahub_sdk.utils import compare_lists
 
 from infrahub import config
 from infrahub.core.account import GlobalPermission, ObjectPermission
-from infrahub.core.changelog.models import NodeChangelog
+from infrahub.core.changelog.models import NodeChangelog, RelationshipChangelogGetter
 from infrahub.core.constants import (
     InfrahubKind,
-    MutationAction,
     PermissionAction,
     PermissionDecision,
     RelationshipCardinality,
-    RelationshipHierarchyDirection,
 )
 from infrahub.core.manager import NodeManager
 from infrahub.core.query.node import NodeGetKindQuery
@@ -24,14 +22,15 @@ from infrahub.core.query.relationship import (
     RelationshipPeerData,
 )
 from infrahub.core.relationship import Relationship
-from infrahub.core.schema import NodeSchema
 from infrahub.database import retry_db_transaction
-from infrahub.events import EventMeta, NodeMutatedEvent
+from infrahub.events import EventMeta
 from infrahub.events.group_action import GroupMemberAddedEvent, GroupMemberRemovedEvent
 from infrahub.events.models import EventNode
+from infrahub.events.node_action import NodeUpdatedEvent
 from infrahub.exceptions import NodeNotFoundError, ValidationError
 from infrahub.graphql.context import apply_external_context
 from infrahub.graphql.types.context import ContextInput
+from infrahub.groups.ancestors import collect_ancestors
 from infrahub.permissions import get_global_permission_for_kind
 
 from ..types import RelatedNodeInput
@@ -119,7 +118,12 @@ class RelationshipAdd(Mutation):
 
         if config.SETTINGS.broker.enable and graphql_context.background and node_changelog.has_changes:
             if group_event_type == GroupUpdateType.MEMBERS:
-                ancestors = await _collect_ancestors(info=info, node_kind=source.get_schema().kind, node_id=source.id)
+                ancestors = await collect_ancestors(
+                    db=graphql_context.db,
+                    branch=graphql_context.branch,
+                    node_kind=source.get_schema().kind,
+                    node_id=source.id,
+                )
                 group_add_event = GroupMemberAddedEvent(
                     node_id=source.id,
                     kind=source.get_schema().kind,
@@ -137,7 +141,9 @@ class RelationshipAdd(Mutation):
                     node_kind_map = await node_kind_query.get_node_kind_map()
 
                     for node_id, node_kind in node_kind_map.items():
-                        ancestors = await _collect_ancestors(info=info, node_kind=node_kind, node_id=node_id)
+                        ancestors = await collect_ancestors(
+                            db=graphql_context.db, branch=graphql_context.branch, node_kind=node_kind, node_id=node_id
+                        )
                         group_add_event = GroupMemberAddedEvent(
                             node_id=node_id,
                             kind=node_kind,
@@ -148,15 +154,33 @@ class RelationshipAdd(Mutation):
                         graphql_context.background.add_task(graphql_context.active_service.event.send, group_add_event)
 
             else:
-                event = NodeMutatedEvent(
+                main_event = NodeUpdatedEvent(
                     kind=source.get_schema().kind,
                     node_id=source.id,
-                    data=node_changelog,
-                    action=MutationAction.UPDATED,
+                    changelog=node_changelog,
                     fields=[relationship_name],
                     meta=EventMeta(branch=graphql_context.branch, context=graphql_context.get_context()),
                 )
-                graphql_context.background.add_task(graphql_context.active_service.event.send, event)
+                relationship_changelogs = RelationshipChangelogGetter(
+                    db=graphql_context.db, branch=graphql_context.branch
+                )
+                node_changelogs = await relationship_changelogs.get_changelogs(primary_changelog=node_changelog)
+
+                events = [main_event]
+
+                for node_changelog in node_changelogs:
+                    meta = EventMeta.from_parent(parent=main_event)
+                    event = NodeUpdatedEvent(
+                        kind=node_changelog.node_kind,
+                        node_id=node_changelog.node_id,
+                        changelog=node_changelog,
+                        fields=node_changelog.updated_fields,
+                        meta=meta,
+                    )
+                    events.append(event)
+
+                for event in events:
+                    graphql_context.background.add_task(graphql_context.active_service.event.send, event)
 
         return cls(ok=True)
 
@@ -216,7 +240,12 @@ class RelationshipRemove(Mutation):
 
         if config.SETTINGS.broker.enable and graphql_context.background and node_changelog.has_changes:
             if group_event_type == GroupUpdateType.MEMBERS:
-                ancestors = await _collect_ancestors(info=info, node_kind=source.get_schema().kind, node_id=source.id)
+                ancestors = await collect_ancestors(
+                    db=graphql_context.db,
+                    branch=graphql_context.branch,
+                    node_kind=source.get_schema().kind,
+                    node_id=source.id,
+                )
                 group_remove_event = GroupMemberRemovedEvent(
                     node_id=source.id,
                     kind=source.get_schema().kind,
@@ -233,7 +262,9 @@ class RelationshipRemove(Mutation):
                     node_kind_map = await node_kind_query.get_node_kind_map()
 
                     for node_id, node_kind in node_kind_map.items():
-                        ancestors = await _collect_ancestors(info=info, node_kind=node_kind, node_id=node_id)
+                        ancestors = await collect_ancestors(
+                            db=graphql_context.db, branch=graphql_context.branch, node_kind=node_kind, node_id=node_id
+                        )
                         group_remove_event = GroupMemberRemovedEvent(
                             node_id=node_id,
                             kind=node_kind,
@@ -244,15 +275,34 @@ class RelationshipRemove(Mutation):
                             graphql_context.active_service.event.send, group_remove_event
                         )
             else:
-                event = NodeMutatedEvent(
+                main_event = NodeUpdatedEvent(
                     kind=source.get_schema().kind,
                     node_id=source.id,
-                    data=node_changelog,
-                    action=MutationAction.UPDATED,
+                    changelog=node_changelog,
                     fields=[relationship_name],
                     meta=EventMeta(branch=graphql_context.branch, context=graphql_context.get_context()),
                 )
-                graphql_context.background.add_task(graphql_context.active_service.event.send, event)
+
+                relationship_changelogs = RelationshipChangelogGetter(
+                    db=graphql_context.db, branch=graphql_context.branch
+                )
+                node_changelogs = await relationship_changelogs.get_changelogs(primary_changelog=node_changelog)
+
+                events = [main_event]
+
+                for node_changelog in node_changelogs:
+                    meta = EventMeta.from_parent(parent=main_event)
+                    event = NodeUpdatedEvent(
+                        kind=node_changelog.node_kind,
+                        node_id=node_changelog.node_id,
+                        changelog=node_changelog,
+                        fields=node_changelog.updated_fields,
+                        meta=meta,
+                    )
+                    events.append(event)
+
+                for event in events:
+                    graphql_context.background.add_task(graphql_context.active_service.event.send, event)
 
         return cls(ok=True)
 
@@ -356,24 +406,6 @@ async def _validate_peer_types(
                     )
 
 
-async def _collect_ancestors(info: GraphQLResolveInfo, node_kind: str, node_id: str) -> list[EventNode]:
-    graphql_context: GraphqlContext = info.context
-    schema = graphql_context.db.schema.get(name=node_kind, branch=graphql_context.branch)
-
-    if not isinstance(schema, NodeSchema):
-        return []
-
-    ancestors = await NodeManager.query_hierarchy(
-        db=graphql_context.db,
-        branch=graphql_context.branch,
-        direction=RelationshipHierarchyDirection.ANCESTORS,
-        id=node_id,
-        node_schema=schema,
-        filters={"id": None},
-    )
-    return [EventNode(id=ancestor.get_id(), kind=ancestor.get_kind()) for ancestor in ancestors.values()]
-
-
 async def _collect_current_peers(
     info: GraphQLResolveInfo, data: RelationshipNodesInput, source_node: Node
 ) -> dict[str, RelationshipPeerData]:

infrahub/graphql/mutations/repository.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import re
-from typing import TYPE_CHECKING, Any, Optional, cast
+from typing import TYPE_CHECKING, Any, Self, cast
 
 import httpx
 from graphene import Boolean, Field, InputObjectType, Mutation, String
@@ -45,7 +45,7 @@ log = get_logger()
 
 class InfrahubRepositoryMutation(InfrahubMutationMixin, Mutation):
     @classmethod
-    def __init_subclass_with_meta__(cls, schema: Optional[NodeSchema] = None, _meta=None, **options):
+    def __init_subclass_with_meta__(cls, schema: NodeSchema | None = None, _meta=None, **options) -> None:
         # Make sure schema is a valid NodeSchema Node Class
         if not isinstance(schema, NodeSchema):
             raise ValueError(f"You need to pass a valid NodeSchema in '{cls.__name__}.Meta', received '{schema}'")
@@ -63,8 +63,8 @@ class InfrahubRepositoryMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        database: Optional[InfrahubDatabase] = None,  # noqa: ARG003
-    ):
+        database: InfrahubDatabase | None = None,  # noqa: ARG003
+    ) -> tuple[Node, Self]:
         graphql_context: GraphqlContext = info.context
 
         cleanup_payload(data)
@@ -149,9 +149,9 @@ class InfrahubRepositoryMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        database: Optional[InfrahubDatabase] = None,  # noqa: ARG003
-        node: Optional[Node] = None,
-    ):
+        database: InfrahubDatabase | None = None,  # noqa: ARG003
+        node: Node | None = None,
+    ) -> tuple[Node, Self]:
         graphql_context: GraphqlContext = info.context
 
         cleanup_payload(data)
@@ -219,7 +219,7 @@ def cleanup_payload(data: InputObjectType | dict[str, Any]) -> None:
     ):
         url = httpx.URL(data["location"]["value"])
         if url.host in config.SETTINGS.git.append_git_suffix:
-            data["location"]["value"] = f'{data["location"]["value"]}.git'
+            data["location"]["value"] = f"{data['location']['value']}.git"
 
 
 class ProcessRepository(Mutation):

infrahub/graphql/mutations/resource_manager.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
-from graphene import Boolean, Field, InputField, InputObjectType, Int, Mutation, String
+from graphene import Boolean, Field, InputField, InputObjectType, Int, List, Mutation, String
 from graphene.types.generic import GenericScalar
 from typing_extensions import Self
 
@@ -30,7 +30,7 @@ if TYPE_CHECKING:
 
 class IPPrefixPoolGetResourceInput(InputObjectType):
     id = InputField(String(required=False), description="ID of the pool to allocate from")
-    hfid = InputField(String(required=False), description="HFID of the pool to allocate from")
+    hfid = InputField(List(of_type=String, required=False), description="HFID of the pool to allocate from")
     identifier = InputField(String(required=False), description="Identifier for the allocated resource")
     prefix_length = InputField(Int(required=False), description="Size of the prefix to allocate")
     member_type = InputField(String(required=False), description="Type of members for the newly created prefix")
@@ -40,7 +40,7 @@ class IPPrefixPoolGetResourceInput(InputObjectType):
 
 class IPAddressPoolGetResourceInput(InputObjectType):
     id = InputField(String(required=False), description="ID of the pool to allocate from")
-    hfid = InputField(String(required=False), description="HFID of the pool to allocate from")
+    hfid = InputField(List(of_type=String, required=False), description="HFID of the pool to allocate from")
     identifier = InputField(String(required=False), description="Identifier for the allocated resource")
     prefix_length = InputField(
         Int(required=False), description="Size of the prefix mask to allocate on the new IP address"

infrahub/graphql/mutations/schema.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Self, Union
+from typing import TYPE_CHECKING, Self
 
 from graphene import Boolean, Field, InputObjectType, Mutation, String
 
@@ -267,21 +267,21 @@ class SchemaEnumRemove(Mutation):
         return {"ok": True}
 
 
-def validate_kind_dropdown(kind: Union[GenericSchema, NodeSchema], attribute: str) -> None:
+def validate_kind_dropdown(kind: GenericSchema | NodeSchema, attribute: str) -> None:
     validate_kind(kind=kind, attribute=attribute)
     matching_attribute = [attrib for attrib in kind.attributes if attrib.name == attribute]
     if matching_attribute and matching_attribute[0].kind != "Dropdown":
         raise ValidationError(f"Attribute {attribute} on {kind.kind} is not a Dropdown")
 
 
-def validate_kind_enum(kind: Union[GenericSchema, NodeSchema], attribute: str) -> None:
+def validate_kind_enum(kind: GenericSchema | NodeSchema, attribute: str) -> None:
     validate_kind(kind=kind, attribute=attribute)
     matching_attribute = [attrib for attrib in kind.attributes if attrib.name == attribute]
     if not matching_attribute[0].enum:
         raise ValidationError(f"Attribute {attribute} on {kind.kind} is not an enum")
 
 
-def validate_kind(kind: Union[GenericSchema, NodeSchema], attribute: str) -> None:
+def validate_kind(kind: GenericSchema | NodeSchema, attribute: str) -> None:
     if kind.namespace in RESTRICTED_NAMESPACES:
         raise ValidationError(f"Operation not allowed for {kind.kind} in restricted namespace {kind.namespace}")
     if attribute not in kind.attribute_names:

infrahub/graphql/mutations/webhook.py

@@ -0,0 +1,137 @@
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+from typing import TYPE_CHECKING, Any, Self, cast
+
+from graphene import InputObjectType, Mutation
+
+from infrahub.core.manager import NodeManager
+from infrahub.core.protocols import CoreWebhook
+from infrahub.core.schema import NodeSchema
+from infrahub.database import retry_db_transaction
+from infrahub.events.utils import get_all_infrahub_node_kind_events
+from infrahub.exceptions import ValidationError
+from infrahub.log import get_logger
+
+from .main import InfrahubMutationMixin, InfrahubMutationOptions
+
+if TYPE_CHECKING:
+    from graphql import GraphQLResolveInfo
+
+    from infrahub.core.branch import Branch
+    from infrahub.core.node import Node
+    from infrahub.database import InfrahubDatabase
+    from infrahub.graphql.initialization import GraphqlContext
+
+log = get_logger()
+
+
+@dataclass
+class StringValue:
+    value: str
+
+
+@dataclass
+class WebhookCreate:
+    event_type: StringValue | None = field(default=None)
+    node_kind: StringValue | None = field(default=None)
+
+
+class WebhookUpdate(WebhookCreate):
+    id: str | None = field(default=None)
+    hfid: list[str] | None = field(default=None)
+
+
+class InfrahubWebhookMutation(InfrahubMutationMixin, Mutation):
+    _meta: InfrahubMutationOptions
+
+    @classmethod
+    def __init_subclass_with_meta__(
+        cls, schema: NodeSchema | None = None, _meta: InfrahubMutationOptions | None = None, **options: dict[str, Any]
+    ) -> None:
+        # Make sure schema is a valid NodeSchema Node Class
+        if not isinstance(schema, NodeSchema):
+            raise ValueError(f"You need to pass a valid NodeSchema in '{cls.__name__}.Meta', received '{schema}'")
+
+        if not _meta:
+            _meta = InfrahubMutationOptions(cls)
+
+        _meta.schema = schema
+
+        super().__init_subclass_with_meta__(_meta=_meta, **options)
+
+    @classmethod
+    async def mutate_create(
+        cls,
+        info: GraphQLResolveInfo,
+        data: InputObjectType,
+        branch: Branch,
+        database: InfrahubDatabase | None = None,
+    ) -> tuple[Node, Self]:
+        graphql_context: GraphqlContext = info.context
+
+        input_data = cast("WebhookCreate", data)
+
+        _validate_input(graphql_context=graphql_context, branch=branch, input_data=input_data)
+
+        obj, result = await super().mutate_create(info=info, data=data, branch=branch, database=database)
+
+        return obj, result
+
+    @classmethod
+    @retry_db_transaction(name="object_update")
+    async def mutate_update(
+        cls,
+        info: GraphQLResolveInfo,
+        data: InputObjectType,
+        branch: Branch,
+        database: InfrahubDatabase | None = None,
+        node: Node | None = None,
+    ) -> tuple[Node, Self]:
+        graphql_context: GraphqlContext = info.context
+
+        db = database or graphql_context.db
+
+        input_data = cast("WebhookUpdate", data)
+
+        _validate_input(graphql_context=graphql_context, branch=branch, input_data=input_data)
+
+        obj = node or await NodeManager.find_object(
+            db=db,
+            kind=cls._meta.active_schema.kind,
+            id=input_data.id,
+            hfid=input_data.hfid,
+            branch=branch,
+        )
+
+        webhook = cast(CoreWebhook, obj)
+
+        event_type = input_data.event_type.value if input_data.event_type else webhook.event_type.value.value
+        node_kind = input_data.node_kind.value if input_data.node_kind else webhook.node_kind.value
+
+        if event_type and node_kind:
+            updated_data = WebhookUpdate(
+                event_type=StringValue(value=event_type), node_kind=StringValue(value=node_kind)
+            )
+            _validate_input(graphql_context=graphql_context, branch=branch, input_data=updated_data)
+
+        try:
+            obj, result = await cls._call_mutate_update(info=info, data=data, db=db, branch=branch, obj=obj)
+        except ValidationError as exc:
+            raise ValueError(str(exc)) from exc
+
+        return obj, result
+
+
+def _validate_input(graphql_context: GraphqlContext, branch: Branch, input_data: WebhookCreate) -> None:
+    if input_data.node_kind:
+        # Validate that the requested node_kind exists, will raise an error if not
+        graphql_context.db.schema.get(name=input_data.node_kind.value, branch=branch, duplicate=False)
+
+        if input_data.event_type:
+            # If the event type is not set then all events are applicable, this will mean that some events
+            # would be filtered out, as they won't match the node.
+            if input_data.event_type.value not in get_all_infrahub_node_kind_events():
+                raise ValidationError(
+                    input_value=f"Defining a node_kind is not valid for {input_data.event_type.value} events"
+                )

infrahub/graphql/parser.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from graphql.language import (
     DirectiveNode,
@@ -172,13 +172,13 @@ class GraphQLExtractor:
         return fields
 
     async def extract_fields(
-        self, selection_set: Optional[SelectionSetNode], path: str = "/"
-    ) -> Optional[dict[str, Optional[dict]]]:
+        self, selection_set: SelectionSetNode | None, path: str = "/"
+    ) -> dict[str, dict | None] | None:
         """Extract fields and apply Directives"""
         if not selection_set:
             return None
 
-        fields: dict[str, Optional[dict]] = {}
+        fields: dict[str, dict | None] = {}
         for node in selection_set.selections:
             sub_selection_set = getattr(node, "selection_set", None)
             if isinstance(node, FieldNode):

infrahub/graphql/queries/diff/tree.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import TYPE_CHECKING, Any
 
 from graphene import Argument, Boolean, DateTime, Field, InputObjectType, Int, List, NonNull, ObjectType, String
 from graphene import Enum as GrapheneEnum
@@ -324,7 +324,7 @@ class DiffTreeResolver:
 
     async def to_graphql(
         self, fields: dict[str, dict], diff_object: Any | None
-    ) -> Optional[Union[list[dict[str, Any]], dict[str, Any]]]:
+    ) -> list[dict[str, Any]] | dict[str, Any] | None:
         if diff_object is None:
             return None
         if isinstance(diff_object, list):
@@ -387,7 +387,7 @@ class DiffTreeResolver:
         root_node_uuids: list[str] | None = None,
         limit: int | None = None,
         offset: int | None = None,
-    ) -> Optional[Union[list[dict[str, Any]], dict[str, Any]]]:
+    ) -> list[dict[str, Any]] | dict[str, Any] | None:
         component_registry = get_component_registry()
         graphql_context: GraphqlContext = info.context
         base_branch = await registry.get_branch(db=graphql_context.db, branch=registry.default_branch)
@@ -459,7 +459,7 @@ class DiffTreeResolver:
         from_time: datetime | None = None,
         to_time: datetime | None = None,
         filters: dict | None = None,
-    ) -> Optional[Union[list[dict[str, Any]], dict[str, Any]]]:
+    ) -> list[dict[str, Any]] | dict[str, Any] | None:
         component_registry = get_component_registry()
         graphql_context: GraphqlContext = info.context
         base_branch = await registry.get_branch(db=graphql_context.db, branch=registry.default_branch)

infrahub/graphql/queries/ipam.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ipaddress
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from graphene import Field, Int, ObjectType, String
 from netaddr import IPSet
@@ -27,7 +27,7 @@ class IPAddressGetNextAvailable(ObjectType):
         root: dict,  # noqa: ARG004
         info: GraphQLResolveInfo,
         prefix_id: str,
-        prefix_length: Optional[int] = None,
+        prefix_length: int | None = None,
     ) -> dict[str, str]:
         graphql_context: GraphqlContext = info.context
 

infrahub/graphql/queries/relationship.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 from graphene import Field, Int, List, NonNull, ObjectType, String
 from infrahub_sdk.utils import extract_fields_first_node
@@ -25,7 +25,7 @@ class Relationships(ObjectType):
         ids: list[str],
         limit: int = 10,
         offset: int = 0,
-        excluded_namespaces: Optional[list[str]] = None,
+        excluded_namespaces: list[str] | None = None,
     ) -> dict[str, Any]:
         graphql_context: GraphqlContext = info.context
 

infrahub/graphql/queries/search.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ipaddress
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 from graphene import Boolean, Field, Int, List, NonNull, ObjectType, String
 from infrahub_sdk.utils import extract_fields_first_node, is_valid_uuid
@@ -110,7 +110,7 @@ async def search_resolver(
     fields = await extract_fields_first_node(info)
 
     if is_valid_uuid(q):
-        matching: Optional[CoreNode] = await NodeManager.get_one(
+        matching: CoreNode | None = await NodeManager.get_one(
             db=graphql_context.db, branch=graphql_context.branch, at=graphql_context.at, id=q
         )
         if matching: