infrahub-server 1.1.9__py3-none-any.whl → 1.2.0__py3-none-any.whl

infrahub/core/node/delete_validator.py

@@ -1,6 +1,6 @@
 from collections import defaultdict
 from enum import Enum
-from typing import Iterable, Optional, Union
+from typing import Iterable
 
 from infrahub.core import registry
 from infrahub.core.branch import Branch
@@ -11,7 +11,7 @@ from infrahub.core.query.relationship import (
     RelationshipGetByIdentifierQuery,
     RelationshipPeersData,
 )
-from infrahub.core.schema import MainSchemaTypes, NodeSchema, ProfileSchema
+from infrahub.core.schema import MainSchemaTypes, NodeSchema, ProfileSchema, TemplateSchema
 from infrahub.core.timestamp import Timestamp
 from infrahub.database import InfrahubDatabase
 from infrahub.exceptions import ValidationError
@@ -28,7 +28,7 @@ class NodeDeleteIndex:
         # {node_schema: {DeleteRelationshipType: {relationship_identifier: peer_node_schema}}}
         self._dependency_graph: dict[str, dict[DeleteRelationshipType, dict[str, set[str]]]] = {}
 
-    def index(self, start_schemas: Iterable[NodeSchema | ProfileSchema]) -> None:
+    def index(self, start_schemas: Iterable[NodeSchema | ProfileSchema | TemplateSchema]) -> None:
         self._index_cascading_deletes(start_schemas=start_schemas)
         self._index_dependent_schema(start_schemas=start_schemas)
 
@@ -50,7 +50,7 @@ class NodeDeleteIndex:
             self._dependency_graph[kind][relationship_type] = defaultdict(set)
         self._dependency_graph[kind][relationship_type][relationship_identifier].update(peer_kinds)
 
-    def _index_cascading_deletes(self, start_schemas: Iterable[NodeSchema | ProfileSchema]) -> None:
+    def _index_cascading_deletes(self, start_schemas: Iterable[NodeSchema | ProfileSchema | TemplateSchema]) -> None:
         kinds_to_check: set[str] = {schema.kind for schema in start_schemas}
         while True:
             try:
@@ -72,7 +72,7 @@ class NodeDeleteIndex:
                     if peer_kind not in self._dependency_graph:
                         kinds_to_check.add(peer_kind)
 
-    def _index_dependent_schema(self, start_schemas: Iterable[NodeSchema | ProfileSchema]) -> None:
+    def _index_dependent_schema(self, start_schemas: Iterable[NodeSchema | ProfileSchema | TemplateSchema]) -> None:
         start_schema_kinds: set[str] = set()
         for start_schema in start_schemas:
             start_schema_kinds.add(start_schema.kind)
@@ -124,16 +124,14 @@ class NodeDeleteValidator:
         self._all_schemas_map = schema_branch.get_all(duplicate=False)
         self.index: NodeDeleteIndex = NodeDeleteIndex(all_schemas_map=self._all_schemas_map)
 
-    async def get_ids_to_delete(self, nodes: Iterable[Node], at: Optional[Union[Timestamp, str]] = None) -> set[str]:
+    async def get_ids_to_delete(self, nodes: Iterable[Node], at: Timestamp | str | None = None) -> set[str]:
         start_schemas = {node.get_schema() for node in nodes}
         self.index.index(start_schemas=start_schemas)
         at = Timestamp(at)
 
         return await self._analyze_delete_dependencies(start_nodes=nodes, at=at)
 
-    async def _analyze_delete_dependencies(
-        self, start_nodes: Iterable[Node], at: Optional[Union[Timestamp, str]]
-    ) -> set[str]:
+    async def _analyze_delete_dependencies(self, start_nodes: Iterable[Node], at: Timestamp | str | None) -> set[str]:
         full_relationship_identifiers = self.index.get_relationship_identifiers()
         if not full_relationship_identifiers:
             return {node.get_id() for node in start_nodes}

infrahub/core/node/ipam.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from infrahub.core.ipam.size import get_prefix_space
 from infrahub.core.ipam.utilization import PrefixUtilizationGetter
@@ -16,10 +16,10 @@ class BuiltinIPPrefix(Node):
     async def to_graphql(
         self,
         db: InfrahubDatabase,
-        fields: Optional[dict] = None,
-        related_node_ids: Optional[set] = None,
+        fields: dict | None = None,
+        related_node_ids: set | None = None,
         filter_sensitive: bool = False,
-        permissions: Optional[dict] = None,
+        permissions: dict | None = None,  # noqa: ARG002
         include_properties: bool = True,
     ) -> dict:
         response = await super().to_graphql(
@@ -40,8 +40,8 @@ class BuiltinIPPrefix(Node):
                     retrieved = await NodeManager.get_one(
                         db=db, branch=self._branch, id=self.id, fields={"member_type": None, "prefix": None}
                     )
-                    self.member_type = retrieved.member_type  # type: ignore[union-attr]  # pylint: disable=attribute-defined-outside-init
-                    self.prefix = retrieved.prefix  # type: ignore[union-attr]  # pylint: disable=attribute-defined-outside-init
+                    self.member_type = retrieved.member_type  # type: ignore[union-attr]
+                    self.prefix = retrieved.prefix  # type: ignore[union-attr]
                 utilization_getter = PrefixUtilizationGetter(db=db, ip_prefixes=[self])
                 utilization = await utilization_getter.get_use_percentage(
                     ip_prefixes=[self], branch_names=[self._branch.name]
@@ -51,12 +51,12 @@ class BuiltinIPPrefix(Node):
         return response
 
     async def get_resource_weight(self, db: InfrahubDatabase) -> int:
-        member_type = self.member_type.value  # type: ignore[has-type]  # pylint: disable=access-member-before-definition
-        prefixlen = self.prefix.prefixlen  # type: ignore[has-type]  # pylint: disable=access-member-before-definition
+        member_type = self.member_type.value  # type: ignore[has-type]
+        prefixlen = self.prefix.prefixlen  # type: ignore[has-type]
         if member_type is None or prefixlen is None:
             retrieved = await NodeManager.get_one(
                 db=db, branch=self._branch, id=self.id, fields={"member_type": None, "prefix": None}
             )
-            self.member_type = retrieved.member_type  # type: ignore[union-attr]  # pylint: disable=attribute-defined-outside-init
-            self.prefix = retrieved.prefix  # type: ignore[union-attr]  # pylint: disable=attribute-defined-outside-init
+            self.member_type = retrieved.member_type  # type: ignore[union-attr]
+            self.prefix = retrieved.prefix  # type: ignore[union-attr]
         return get_prefix_space(self)

infrahub/core/node/permissions.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from infrahub.permissions.constants import PermissionDecisionFlag
 
@@ -14,10 +14,10 @@ class CoreGlobalPermission(Node):
     async def to_graphql(
         self,
         db: InfrahubDatabase,
-        fields: Optional[dict] = None,
-        related_node_ids: Optional[set] = None,
+        fields: dict | None = None,
+        related_node_ids: set | None = None,
         filter_sensitive: bool = False,
-        permissions: Optional[dict] = None,
+        permissions: dict | None = None,
         include_properties: bool = True,
     ) -> dict:
         response = await super().to_graphql(
@@ -41,10 +41,10 @@ class CoreObjectPermission(Node):
     async def to_graphql(
         self,
         db: InfrahubDatabase,
-        fields: Optional[dict] = None,
-        related_node_ids: Optional[set] = None,
+        fields: dict | None = None,
+        related_node_ids: set | None = None,
         filter_sensitive: bool = False,
-        permissions: Optional[dict] = None,
+        permissions: dict | None = None,
         include_properties: bool = True,
     ) -> dict:
         response = await super().to_graphql(

infrahub/core/node/resource_manager/ip_address_pool.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 infrahub.core import registry
 from infrahub.core.ipam.reconciler import IpamReconciler
@@ -26,10 +26,10 @@ class CoreIPAddressPool(Node):
         self,
         db: InfrahubDatabase,
         branch: Branch,
-        identifier: Optional[str] = None,
-        data: Optional[dict[str, Any]] = None,
-        address_type: Optional[str] = None,
-        prefixlen: Optional[int] = None,
+        identifier: str | None = None,
+        data: dict[str, Any] | None = None,
+        address_type: str | None = None,
+        prefixlen: int | None = None,
     ) -> Node:
         # Check if there is already a resource allocated with this identifier
         # if not, pull all existing prefixes and allocated the next available
@@ -80,7 +80,7 @@ class CoreIPAddressPool(Node):
 
         return node
 
-    async def get_next(self, db: InfrahubDatabase, prefixlen: Optional[int] = None) -> IPAddressType:
+    async def get_next(self, db: InfrahubDatabase, prefixlen: int | None = None) -> IPAddressType:
         # Measure utilization of all prefixes identified as resources
         resources = await self.resources.get_peers(db=db)  # type: ignore[attr-defined]
         ip_namespace = await self.ip_namespace.get_peer(db=db)  # type: ignore[attr-defined]

infrahub/core/node/resource_manager/ip_prefix_pool.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
 import ipaddress
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
+
+from netaddr import IPSet
 
 from infrahub.core import registry
 from infrahub.core.ipam.reconciler import IpamReconciler
@@ -11,7 +13,7 @@ from infrahub.core.query.resource_manager import (
     PrefixPoolSetReserved,
 )
 from infrahub.exceptions import ValidationError
-from infrahub.pools.prefix import PrefixPool
+from infrahub.pools.prefix import get_next_available_prefix
 
 from .. import Node
 
@@ -26,11 +28,11 @@ class CoreIPPrefixPool(Node):
         self,
         db: InfrahubDatabase,
         branch: Branch,
-        identifier: Optional[str] = None,
-        data: Optional[dict[str, Any]] = None,
-        prefixlen: Optional[int] = None,
-        member_type: Optional[str] = None,
-        prefix_type: Optional[str] = None,
+        identifier: str | None = None,
+        data: dict[str, Any] | None = None,
+        prefixlen: int | None = None,
+        member_type: str | None = None,
+        prefix_type: str | None = None,
     ) -> Node:
         # Check if there is already a resource allocated with this identifier
         # if not, pull all existing prefixes and allocated the next available
@@ -99,14 +101,15 @@ class CoreIPPrefixPool(Node):
                 branch_agnostic=True,
             )
 
-            pool = PrefixPool(resource.prefix.value)  # type: ignore[attr-defined]
+            pool = IPSet([resource.prefix.value])
             for subnet in subnets:
-                pool.reserve(subnet=str(subnet.prefix))
+                pool.remove(addr=str(subnet.prefix))
 
             try:
-                next_available = pool.get(prefixlen=prefixlen)
+                prefix_ver = ipaddress.ip_network(resource.prefix.value).version
+                next_available = get_next_available_prefix(pool=pool, prefix_length=prefixlen, prefix_ver=prefix_ver)
                 return next_available
-            except IndexError:
+            except ValueError:
                 continue
 
         raise IndexError("No more resources available")

infrahub/core/node/resource_manager/number_pool.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from infrahub.core.query.resource_manager import NumberPoolGetReserved, NumberPoolGetUsed, NumberPoolSetReserved
 from infrahub.exceptions import PoolExhaustedError
@@ -18,7 +18,7 @@ class CoreNumberPool(Node):
         db: InfrahubDatabase,
         branch: Branch,
         node: Node,
-        identifier: Optional[str] = None,
+        identifier: str | None = None,
     ) -> int:
         identifier = identifier or node.get_id()
         # Check if there is already a resource allocated with this identifier
@@ -55,7 +55,7 @@ class CoreNumberPool(Node):
         return next_number
 
 
-def find_next_free(start: int, end: int, taken: list[int | None]) -> Optional[int]:
+def find_next_free(start: int, end: int, taken: list[int | None]) -> int | None:
     used_numbers = [number for number in taken if number is not None]
     used_set = set(used_numbers)
 

infrahub/core/node/standard.py

@@ -19,8 +19,6 @@ from infrahub.core.query.standard_node import (
 )
 from infrahub.exceptions import Error, InitializationError
 
-# pylint: disable=redefined-builtin
-
 if TYPE_CHECKING:
     from neo4j.graph import Node as Neo4jNode
     from pydantic.fields import FieldInfo
@@ -173,9 +171,9 @@ class StandardNode(BaseModel):
 
             if value == NULL_VALUE:
                 attrs[key] = None
-            elif issubclass(field_type, (int, float, bool, str, UUID)):
+            elif issubclass(field_type, int | float | bool | str | UUID):
                 attrs[key] = value
-            elif isinstance(value, (str, bytes)):
+            elif isinstance(value, str | bytes):
                 attrs[key] = ujson.loads(value)
 
         return cls(**attrs)
@@ -203,7 +201,7 @@ class StandardNode(BaseModel):
                     data[attr_name] = ujson.dumps(clean_value)
                 else:
                     data[attr_name] = attr_value.model_dump_json()
-            elif issubclass(field_type, (int, float, bool, str, UUID)):
+            elif issubclass(field_type, int | float | bool | str | UUID):
                 data[attr_name] = attr_value
             else:
                 data[attr_name] = ujson.dumps(attr_value)

infrahub/core/path.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from collections import defaultdict
 from itertools import chain
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import TYPE_CHECKING, Any
 
 from pydantic import BaseModel, Field
 from typing_extensions import Self
@@ -56,12 +56,12 @@ class DataPath(InfrahubPath):
     path_type: PathType
     node_id: str = Field(..., description="Kind of the model in the schema")
     kind: str = Field(..., description="Kind of the main node")
-    field_name: Optional[str] = Field(
+    field_name: str | None = Field(
         default=None, description="Name of the field (either an attribute or a relationship)"
     )
-    property_name: Optional[str] = Field(default=None, description="Name of the property")
-    peer_id: Optional[str] = Field(default=None, description="")
-    value: Optional[Any] = Field(default=None, description="Optional value of the resource")
+    property_name: str | None = Field(default=None, description="Name of the property")
+    peer_id: str | None = Field(default=None, description="")
+    value: Any | None = Field(default=None, description="Optional value of the resource")
 
     @property
     def resource_type(self) -> PathResourceType:
@@ -109,11 +109,11 @@ class GroupedDataPaths:
 class SchemaPath(InfrahubPath):
     path_type: SchemaPathType
     schema_kind: str = Field(..., description="Kind of the model in the schema")
-    schema_id: Optional[str] = Field(default=None, description="UUID of the model in the schema")
-    field_name: Optional[str] = Field(
+    schema_id: str | None = Field(default=None, description="UUID of the model in the schema")
+    field_name: str | None = Field(
         default=None, description="Name of the field (either an attribute or a relationship)"
     )
-    property_name: Optional[str] = Field(default=None, description="Name of the property")
+    property_name: str | None = Field(default=None, description="Name of the property")
 
     @property
     def resource_type(self) -> PathResourceType:
@@ -133,10 +133,10 @@ class SchemaPath(InfrahubPath):
     @classmethod
     def init(
         cls,
-        schema: Union[NodeSchema, GenericSchema],
-        schema_id: Optional[str] = None,
-        field_name: Optional[str] = None,
-        property_name: Optional[str] = None,
+        schema: NodeSchema | GenericSchema,
+        schema_id: str | None = None,
+        field_name: str | None = None,
+        property_name: str | None = None,
     ) -> Self:
         if field_name and not schema.get_field(name=field_name, raise_on_error=False):
             raise ValueError(f"Field : {field_name} is not valid for {schema.kind}")

infrahub/core/property.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING
 from uuid import UUID
 
 from pydantic import BaseModel
@@ -32,7 +32,7 @@ class FlagPropertyMixin:
     is_visible = True
     is_protected = False
 
-    def _init_flag_property_mixin(self, kwargs: Optional[dict] = None) -> None:
+    def _init_flag_property_mixin(self, kwargs: dict | None = None) -> None:
         if not kwargs:
             return
 
@@ -47,7 +47,7 @@ class NodePropertyMixin:
     branch: Branch
     at: Timestamp
 
-    def _init_node_property_mixin(self, kwargs: Optional[dict] = None) -> None:
+    def _init_node_property_mixin(self, kwargs: dict | None = None) -> None:
         for node in self._node_properties:
             setattr(self, f"_{node}", None)
             setattr(self, f"{node}_id", None)
@@ -66,7 +66,7 @@ class NodePropertyMixin:
         return self._get_node_property_from_cache(name="source")
 
     @source.setter
-    def source(self, value: Union[str, Node, UUID]) -> None:
+    def source(self, value: str | Node | UUID) -> None:
         self._set_node_property(name="source", value=value)
 
     @property
@@ -74,25 +74,25 @@ class NodePropertyMixin:
         return self._get_node_property_from_cache(name="owner")
 
     @owner.setter
-    def owner(self, value: Optional[Union[str, Node, UUID]]) -> None:
+    def owner(self, value: str | Node | UUID | None) -> None:
         self._set_node_property(name="owner", value=value)
 
     def clear_owner(self) -> None:
         self._set_node_property(name="owner", value=None)
 
-    async def get_source(self, db: InfrahubDatabase) -> Optional[Node]:
+    async def get_source(self, db: InfrahubDatabase) -> Node | None:
         return await self._get_node_property(name="source", db=db)
 
     def clear_source(self) -> None:
         self._set_node_property(name="source", value=None)
 
-    def set_source(self, value: Union[str, Node, UUID]) -> None:
+    def set_source(self, value: str | Node | UUID) -> None:
         self._set_node_property(name="source", value=value)
 
-    async def get_owner(self, db: InfrahubDatabase) -> Optional[Node]:
+    async def get_owner(self, db: InfrahubDatabase) -> Node | None:
         return await self._get_node_property(name="owner", db=db)
 
-    def set_owner(self, value: Union[str, Node, UUID]) -> None:
+    def set_owner(self, value: str | Node | UUID) -> None:
         self._set_node_property(name="owner", value=value)
 
     def _get_node_property_from_cache(self, name: str) -> Node:
@@ -107,7 +107,7 @@ class NodePropertyMixin:
 
         return item
 
-    async def _get_node_property(self, db: InfrahubDatabase, name: str) -> Optional[Node]:
+    async def _get_node_property(self, db: InfrahubDatabase, name: str) -> Node | None:
         """Return the node attribute.
         If the node is already present in cache, serve from the cache
         If the node is not present, query it on the fly using the node_id
@@ -117,13 +117,13 @@ class NodePropertyMixin:
 
         return getattr(self, f"_{name}", None)
 
-    def _set_node_property(self, name: str, value: Optional[Union[str, Node, UUID]]) -> None:
+    def _set_node_property(self, name: str, value: str | Node | UUID | None) -> None:
         """Set the value of the node_property.
         If the value is a string, we assume it's an ID and we'll save it to query it later (if needed)
         If the value is a Node, we save the node and we extract the ID
         if the value is None, we just initialize the 2 variables."""
 
-        if isinstance(value, (str, UUID)):
+        if isinstance(value, str | UUID):
             setattr(self, f"{name}_id", value)
             setattr(self, f"_{name}", None)
         elif isinstance(value, dict) and "id" in value:

infrahub/core/protocols.py

@@ -148,6 +148,14 @@ class CoreMenu(CoreNode):
     children: RelationshipManager
 
 
+class CoreObjectComponentTemplate(CoreNode):
+    template_name: String
+
+
+class CoreObjectTemplate(CoreNode):
+    template_name: String
+
+
 class CoreProfile(CoreNode):
     profile_name: String
     profile_priority: IntegerOptional
@@ -193,6 +201,9 @@ class CoreValidator(CoreNode):
 
 class CoreWebhook(CoreNode):
     name: String
+    event_type: Enum
+    branch_scope: Dropdown
+    node_kind: StringOptional
     description: StringOptional
     url: URL
     validate_certificates: BooleanOptional

infrahub/core/protocols_base.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional, Protocol, Union, runtime_checkable
+from typing import TYPE_CHECKING, Any, Protocol, runtime_checkable
 
 from typing_extensions import Self
 
@@ -9,8 +9,6 @@ if TYPE_CHECKING:
 
     from infrahub.core.schema.schema_branch import SchemaBranch
 
-# pylint: disable=redefined-builtin
-
 
 @runtime_checkable
 class Timestamp(Protocol): ...
@@ -24,6 +22,10 @@ class NodeSchema(Protocol): ...
 class ProfileSchema(Protocol): ...
 
 
+@runtime_checkable
+class TemplateSchema(Protocol): ...
+
+
 @runtime_checkable
 class Branch(Protocol): ...
 
@@ -36,23 +38,23 @@ class InfrahubDatabase(Protocol):
     @property
     def is_transaction(self) -> bool: ...
 
-    def add_schema(self, schema: SchemaBranch, name: Optional[str] = None) -> None: ...
-    def start_session(self, read_only: bool = False, schemas: Optional[list[SchemaBranch]] = None) -> Self: ...
-    def start_transaction(self, schemas: Optional[list[SchemaBranch]] = None) -> Self: ...
+    def add_schema(self, schema: SchemaBranch, name: str | None = None) -> None: ...
+    def start_session(self, read_only: bool = False, schemas: list[SchemaBranch] | None = None) -> Self: ...
+    def start_transaction(self, schemas: list[SchemaBranch] | None = None) -> Self: ...
     async def session(self) -> AsyncSession: ...
-    async def transaction(self, name: Optional[str]) -> AsyncTransaction: ...
+    async def transaction(self, name: str | None) -> AsyncTransaction: ...
     async def close(self) -> None: ...
 
     async def execute_query(
-        self, query: str, params: Optional[dict[str, Any]] = None, name: str = "undefined"
+        self, query: str, params: dict[str, Any] | None = None, name: str = "undefined"
     ) -> list[Record]: ...
 
     async def execute_query_with_metadata(
-        self, query: str, params: Optional[dict[str, Any]] = None, name: str = "undefined"
+        self, query: str, params: dict[str, Any] | None = None, name: str = "undefined"
     ) -> tuple[list[Record], dict[str, Any]]: ...
 
     async def run_query(
-        self, query: str, params: Optional[dict[str, Any]] = None, name: str = "undefined"
+        self, query: str, params: dict[str, Any] | None = None, name: str = "undefined"
     ) -> AsyncResult: ...
 
     def render_list_comprehension(self, items: str, item_name: str) -> str: ...
@@ -71,29 +73,29 @@ class CoreNode(Protocol):
     @classmethod
     async def init(
         cls,
-        schema: Union[NodeSchema, ProfileSchema, str],
+        schema: NodeSchema | ProfileSchema | str,
         db: InfrahubDatabase,
-        branch: Optional[Union[Branch, str]] = None,
-        at: Optional[Union[Timestamp, str]] = None,
+        branch: Branch | str | None = None,
+        at: Timestamp | str | None = None,
     ) -> Self: ...
-    async def new(self, db: InfrahubDatabase, id: Optional[str] = None, **kwargs: Any) -> Self: ...
-    async def save(self, db: InfrahubDatabase, at: Optional[Timestamp] = None) -> Self: ...
-    async def delete(self, db: InfrahubDatabase, at: Optional[Timestamp] = None) -> None: ...
+    async def new(self, db: InfrahubDatabase, id: str | None = None, **kwargs: Any) -> Self: ...
+    async def save(self, db: InfrahubDatabase, at: Timestamp | None = None) -> Self: ...
+    async def delete(self, db: InfrahubDatabase, at: Timestamp | None = None) -> None: ...
     async def load(
         self,
         db: InfrahubDatabase,
-        id: Optional[str] = None,
-        db_id: Optional[str] = None,
-        updated_at: Optional[Union[Timestamp, str]] = None,
+        id: str | None = None,
+        db_id: str | None = None,
+        updated_at: Timestamp | str | None = None,
         **kwargs: Any,
     ) -> Self: ...
     async def to_graphql(
         self,
         db: InfrahubDatabase,
-        fields: Optional[dict] = None,
-        related_node_ids: Optional[set] = None,
+        fields: dict | None = None,
+        related_node_ids: set | None = None,
         filter_sensitive: bool = False,
-        permissions: Optional[dict] = None,
+        permissions: dict | None = None,
     ) -> dict: ...
-    async def render_display_label(self, db: Optional[InfrahubDatabase] = None) -> str: ...
+    async def render_display_label(self, db: InfrahubDatabase | None = None) -> str: ...
     async def from_graphql(self, data: dict, db: InfrahubDatabase) -> bool: ...