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

infrahub/core/schema/definitions/core/webhook.py

@@ -1,108 +1,134 @@
-from infrahub.core.constants import AllowOverrideType, BranchSupportType, EventType, InfrahubKind
+from infrahub.core.constants import (
+    AllowOverrideType,
+    BranchSupportType,
+    EventType,
+    InfrahubKind,
+)
+from infrahub.core.constants import RelationshipCardinality as Cardinality
+from infrahub.core.constants import RelationshipKind as RelKind
 
-core_webhook = {
-    "name": "Webhook",
-    "namespace": "Core",
-    "description": "A webhook that connects to an external integration",
-    "label": "Webhook",
-    "default_filter": "name__value",
-    "order_by": ["name__value"],
-    "display_labels": ["name__value"],
-    "include_in_menu": False,
-    "icon": "mdi:webhook",
-    "branch": BranchSupportType.AGNOSTIC.value,
-    "uniqueness_constraints": [["name__value"]],
-    "attributes": [
-        {"name": "name", "kind": "Text", "unique": True, "order_weight": 1000},
-        {
-            "name": "event_type",
-            "kind": "Text",
-            "enum": ["all"] + EventType.available_types(),
-            "default_value": "all",
-            "order_weight": 1500,
-            "description": "The event type that triggers the webhook",
-        },
-        {
-            "name": "branch_scope",
-            "kind": "Dropdown",
-            "choices": [
-                {
-                    "name": "all_branches",
-                    "label": "All Branches",
-                    "description": "All branches",
-                    "color": "#fef08a",
-                },
-                {
-                    "name": "default_branch",
-                    "label": "Default Branch",
-                    "description": "Only the default branch",
-                    "color": "#86efac",
-                },
-                {
-                    "name": "other_branches",
-                    "label": "Other Branches",
-                    "description": "All branches except the default branch",
-                    "color": "#e5e7eb",
-                },
+from ...attribute_schema import AttributeSchema as Attr
+from ...dropdown import DropdownChoice
+from ...generic_schema import GenericSchema
+from ...node_schema import NodeSchema
+from ...relationship_schema import (
+    RelationshipSchema as Rel,
+)
+
+core_webhook = GenericSchema(
+    name="Webhook",
+    namespace="Core",
+    description="A webhook that connects to an external integration",
+    label="Webhook",
+    default_filter="name__value",
+    order_by=["name__value"],
+    display_labels=["name__value"],
+    include_in_menu=False,
+    icon="mdi:webhook",
+    branch=BranchSupportType.AGNOSTIC,
+    uniqueness_constraints=[["name__value"]],
+    attributes=[
+        Attr(name="name", kind="Text", unique=True, order_weight=1000),
+        Attr(
+            name="event_type",
+            kind="Text",
+            enum=["all"] + EventType.available_types(),
+            default_value="all",
+            order_weight=1500,
+            description="The event type that triggers the webhook",
+        ),
+        Attr(
+            name="branch_scope",
+            kind="Dropdown",
+            choices=[
+                DropdownChoice(
+                    name="all_branches",
+                    label="All Branches",
+                    description="All branches",
+                    color="#fef08a",
+                ),
+                DropdownChoice(
+                    name="default_branch",
+                    label="Default Branch",
+                    description="Only the default branch",
+                    color="#86efac",
+                ),
+                DropdownChoice(
+                    name="other_branches",
+                    label="Other Branches",
+                    description="All branches except the default branch",
+                    color="#e5e7eb",
+                ),
             ],
-            "default_value": "default_branch",
-            "optional": False,
-            "order_weight": 2000,
-            "allow_override": AllowOverrideType.NONE,
-        },
-        {"name": "description", "kind": "Text", "optional": True, "order_weight": 2500},
-        {"name": "url", "kind": "URL", "order_weight": 3000},
-        {
-            "name": "validate_certificates",
-            "kind": "Boolean",
-            "default_value": True,
-            "optional": True,
-            "order_weight": 5000,
-        },
+            default_value="default_branch",
+            optional=False,
+            order_weight=2000,
+            allow_override=AllowOverrideType.NONE,
+        ),
+        Attr(
+            name="node_kind",
+            kind="Text",
+            optional=True,
+            description="Only send node mutation events for nodes of this kind",
+            order_weight=2250,
+        ),
+        Attr(
+            name="description",
+            kind="Text",
+            optional=True,
+            order_weight=2500,
+        ),
+        Attr(name="url", kind="URL", order_weight=3000),
+        Attr(
+            name="validate_certificates",
+            kind="Boolean",
+            default_value=True,
+            optional=True,
+            order_weight=5000,
+        ),
     ],
-}
+)
 
-core_standard_webhook = {
-    "name": "StandardWebhook",
-    "namespace": "Core",
-    "description": "A webhook that connects to an external integration",
-    "label": "Standard Webhook",
-    "default_filter": "name__value",
-    "order_by": ["name__value"],
-    "display_labels": ["name__value"],
-    "include_in_menu": False,
-    "icon": "mdi:webhook",
-    "branch": BranchSupportType.AGNOSTIC.value,
-    "generate_profile": False,
-    "inherit_from": [InfrahubKind.WEBHOOK, InfrahubKind.TASKTARGET],
-    "attributes": [
-        {"name": "shared_key", "kind": "Password", "unique": False, "order_weight": 4000},
+core_standard_webhook = NodeSchema(
+    name="StandardWebhook",
+    namespace="Core",
+    description="A webhook that connects to an external integration",
+    label="Standard Webhook",
+    default_filter="name__value",
+    order_by=["name__value"],
+    display_labels=["name__value"],
+    include_in_menu=False,
+    icon="mdi:webhook",
+    branch=BranchSupportType.AGNOSTIC,
+    generate_profile=False,
+    inherit_from=[InfrahubKind.WEBHOOK, InfrahubKind.TASKTARGET],
+    attributes=[
+        Attr(name="shared_key", kind="Password", unique=False, order_weight=4000),
     ],
-}
+)
 
-core_custom_webhook = {
-    "name": "CustomWebhook",
-    "namespace": "Core",
-    "description": "A webhook that connects to an external integration",
-    "label": "Custom Webhook",
-    "default_filter": "name__value",
-    "order_by": ["name__value"],
-    "display_labels": ["name__value"],
-    "include_in_menu": False,
-    "icon": "mdi:cog-outline",
-    "branch": BranchSupportType.AGNOSTIC.value,
-    "generate_profile": False,
-    "inherit_from": [InfrahubKind.WEBHOOK, InfrahubKind.TASKTARGET],
-    "attributes": [],
-    "relationships": [
-        {
-            "name": "transformation",
-            "peer": InfrahubKind.TRANSFORMPYTHON,
-            "kind": "Attribute",
-            "identifier": "webhook___transformation",
-            "cardinality": "one",
-            "optional": True,
-            "order_weight": 7000,
-        },
+core_custom_webhook = NodeSchema(
+    name="CustomWebhook",
+    namespace="Core",
+    description="A webhook that connects to an external integration",
+    label="Custom Webhook",
+    default_filter="name__value",
+    order_by=["name__value"],
+    display_labels=["name__value"],
+    include_in_menu=False,
+    icon="mdi:cog-outline",
+    branch=BranchSupportType.AGNOSTIC,
+    generate_profile=False,
+    inherit_from=[InfrahubKind.WEBHOOK, InfrahubKind.TASKTARGET],
+    relationships=[
+        Rel(
+            name="transformation",
+            peer=InfrahubKind.TRANSFORMPYTHON,
+            kind=RelKind.ATTRIBUTE,
+            identifier="webhook___transformation",
+            cardinality=Cardinality.ONE,
+            optional=True,
+            order_weight=7000,
+        ),
     ],
-}
+)

infrahub/core/schema/definitions/internal.py

@@ -4,7 +4,7 @@ from copy import deepcopy
 from dataclasses import dataclass
 from enum import Enum
 from types import GenericAlias
-from typing import Any, Optional, Union
+from typing import Any
 
 from pydantic import BaseModel, ConfigDict, Field
 from typing_extensions import TypedDict
@@ -46,17 +46,17 @@ class SchemaAttribute(BaseModel):
     kind: str
     description: str
     extra: ExtraField
-    internal_kind: Optional[Union[type[Any], GenericAlias]] = None
-    regex: Optional[str] = None
-    unique: Optional[bool] = None
-    optional: Optional[bool] = None
-    min_length: Optional[int] = None
-    max_length: Optional[int] = None
-    enum: Optional[list[str]] = None
-    default_value: Optional[Any] = None
-    default_factory: Optional[str] = None
+    internal_kind: type[Any] | GenericAlias | None = None
+    regex: str | None = None
+    unique: bool | None = None
+    optional: bool | None = None
+    min_length: int | None = None
+    max_length: int | None = None
+    enum: list[str] | None = None
+    default_value: Any | None = None
+    default_factory: str | None = None
     default_to_none: bool = False
-    override_default_value: Optional[Any] = Field(
+    override_default_value: Any | None = Field(
         default=None,
         description="Currently optional is defined with different defaults for the Pydantic models compared to the internal_schema dictionary",
     )
@@ -83,7 +83,7 @@ class SchemaAttribute(BaseModel):
     @property
     def type_annotation(self) -> str:
         if self.optional_in_model:
-            return f"Optional[{self.object_kind}]"
+            return f"{self.object_kind} | None"
 
         return self.object_kind
 
@@ -150,8 +150,8 @@ class SchemaAttribute(BaseModel):
 class SchemaRelationship(BaseModel):
     name: str
     peer: str
-    description: Optional[str] = None
-    kind: Optional[str] = None
+    description: str | None = None
+    kind: str | None = None
     identifier: str
     cardinality: str
     branch: str
@@ -166,7 +166,7 @@ class SchemaNode(BaseModel):
     namespace: str
     branch: str
     include_in_menu: bool
-    default_filter: Optional[str] = None
+    default_filter: str | None = None
     attributes: list[SchemaAttribute]
     relationships: list[SchemaRelationship]
     display_labels: list[str]
@@ -199,7 +199,7 @@ class SchemaNode(BaseModel):
 
 @dataclass
 class InternalSchema:
-    version: Optional[str]
+    version: str | None
     nodes: list[SchemaNode]
 
     def to_dict(self) -> dict[str, Any]:

infrahub/core/schema/dropdown.py

@@ -1,5 +1,4 @@
 import re
-from typing import Optional
 
 from pydantic import field_validator
 
@@ -10,9 +9,9 @@ HTML_COLOR = re.compile(r"#[0-9a-fA-F]{6}\b")
 
 class DropdownChoice(HashableModel):
     name: str
-    description: Optional[str] = None
-    color: Optional[str] = None
-    label: Optional[str] = None
+    description: str | None = None
+    color: str | None = None
+    label: str | None = None
 
     _sort_by: list[str] = ["name"]
 

infrahub/core/schema/generated/attribute_schema.py

@@ -2,21 +2,18 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional
+from typing import Any
 
 from pydantic import Field
 
-from infrahub.core.constants import AllowOverrideType, HashableModelState
+from infrahub.core.constants import AllowOverrideType, BranchSupportType, HashableModelState
 from infrahub.core.models import HashableModel
 from infrahub.core.schema.computed_attribute import ComputedAttribute  # noqa: TC001
 from infrahub.core.schema.dropdown import DropdownChoice  # noqa: TC001
 
-if TYPE_CHECKING:
-    from infrahub.core.constants import BranchSupportType
-
 
 class GeneratedAttributeSchema(HashableModel):
-    id: Optional[str] = Field(
+    id: str | None = Field(
         default=None, description="The ID of the attribute", json_schema_extra={"update": "not_applicable"}
     )
     name: str = Field(
@@ -30,43 +27,43 @@ class GeneratedAttributeSchema(HashableModel):
     kind: str = Field(
         ..., description="Defines the type of the attribute.", json_schema_extra={"update": "validate_constraint"}
     )
-    enum: Optional[list] = Field(
+    enum: list | None = Field(
         default=None,
         description="Define a list of valid values for the attribute.",
         json_schema_extra={"update": "validate_constraint"},
     )
-    computed_attribute: Optional[ComputedAttribute] = Field(
+    computed_attribute: ComputedAttribute | None = Field(
         default=None,
         description="Defines how the value of this attribute will be populated.",
         json_schema_extra={"update": "allowed"},
     )
-    choices: Optional[list[DropdownChoice]] = Field(
+    choices: list[DropdownChoice] | None = Field(
         default=None,
         description="Define a list of valid choices for a dropdown attribute.",
         json_schema_extra={"update": "validate_constraint"},
     )
-    regex: Optional[str] = Field(
+    regex: str | None = Field(
         default=None,
         description="Regex uses to limit the characters allowed in for the attributes.",
         json_schema_extra={"update": "validate_constraint"},
     )
-    max_length: Optional[int] = Field(
+    max_length: int | None = Field(
         default=None,
         description="Set a maximum number of characters allowed for a given attribute.",
         json_schema_extra={"update": "validate_constraint"},
     )
-    min_length: Optional[int] = Field(
+    min_length: int | None = Field(
         default=None,
         description="Set a minimum number of characters allowed for a given attribute.",
         json_schema_extra={"update": "validate_constraint"},
     )
-    label: Optional[str] = Field(
+    label: str | None = Field(
         default=None,
         description="Human friendly representation of the name. Will be autogenerated if not provided",
         max_length=32,
         json_schema_extra={"update": "allowed"},
     )
-    description: Optional[str] = Field(
+    description: str | None = Field(
         default=None,
         description="Short description of the attribute.",
         max_length=128,
@@ -87,17 +84,17 @@ class GeneratedAttributeSchema(HashableModel):
         description="Indicate if this attribute is mandatory or optional.",
         json_schema_extra={"update": "validate_constraint"},
     )
-    branch: Optional[BranchSupportType] = Field(
+    branch: BranchSupportType | None = Field(
         default=None,
         description="Type of branch support for the attribute, if not defined it will be inherited from the node.",
         json_schema_extra={"update": "not_supported"},
     )
-    order_weight: Optional[int] = Field(
+    order_weight: int | None = Field(
         default=None,
         description="Number used to order the attribute in the frontend (table and view). Lowest value will be ordered first.",
         json_schema_extra={"update": "allowed"},
     )
-    default_value: Optional[Any] = Field(
+    default_value: Any | None = Field(
         default=None, description="Default value of the attribute.", json_schema_extra={"update": "allowed"}
     )
     inherited: bool = Field(
@@ -115,7 +112,7 @@ class GeneratedAttributeSchema(HashableModel):
         description="Type of allowed override for the attribute.",
         json_schema_extra={"update": "allowed"},
     )
-    deprecation: Optional[str] = Field(
+    deprecation: str | None = Field(
         default=None,
         description="Mark attribute as deprecated and provide a user-friendly message to display",
         max_length=128,

infrahub/core/schema/generated/base_node_schema.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from typing import Optional
-
 from pydantic import Field
 
 from infrahub.core.constants import BranchSupportType, HashableModelState
@@ -13,7 +11,7 @@ from infrahub.core.schema.relationship_schema import RelationshipSchema  # noqa:
 
 
 class GeneratedBaseNodeSchema(HashableModel):
-    id: Optional[str] = Field(
+    id: str | None = Field(
         default=None, description="The ID of the node", json_schema_extra={"update": "not_applicable"}
     )
     name: str = Field(
@@ -32,13 +30,13 @@ class GeneratedBaseNodeSchema(HashableModel):
         max_length=32,
         json_schema_extra={"update": "migration_required"},
     )
-    description: Optional[str] = Field(
+    description: str | None = Field(
         default=None,
         description="Short description of the model, will be visible in the frontend.",
         max_length=128,
         json_schema_extra={"update": "allowed"},
     )
-    label: Optional[str] = Field(
+    label: str | None = Field(
         default=None,
         description="Human friendly representation of the name/kind",
         max_length=64,
@@ -49,48 +47,48 @@ class GeneratedBaseNodeSchema(HashableModel):
         description="Type of branch support for the model.",
         json_schema_extra={"update": "not_supported"},
     )
-    default_filter: Optional[str] = Field(
+    default_filter: str | None = Field(
         default=None,
         description="Default filter used to search for a node in addition to its ID. (deprecated: please use human_friendly_id instead)",
         pattern=r"^[a-z0-9\_]+$",
         json_schema_extra={"update": "allowed"},
     )
-    human_friendly_id: Optional[list[str]] = Field(
+    human_friendly_id: list[str] | None = Field(
         default=None,
         description="Human friendly and unique identifier for the object.",
         json_schema_extra={"update": "allowed"},
     )
-    display_labels: Optional[list[str]] = Field(
+    display_labels: list[str] | None = Field(
         default=None,
         description="List of attributes to use to generate the display label",
         json_schema_extra={"update": "allowed"},
     )
-    include_in_menu: Optional[bool] = Field(
+    include_in_menu: bool | None = Field(
         default=None,
         description="Defines if objects of this kind should be included in the menu.",
         json_schema_extra={"update": "allowed"},
     )
-    menu_placement: Optional[str] = Field(
+    menu_placement: str | None = Field(
         default=None,
         description="Defines where in the menu this object should be placed.",
         json_schema_extra={"update": "allowed"},
     )
-    icon: Optional[str] = Field(
+    icon: str | None = Field(
         default=None,
         description="Defines the icon to use in the menu. Must be a valid value from the MDI library https://icon-sets.iconify.design/mdi/",
         json_schema_extra={"update": "allowed"},
     )
-    order_by: Optional[list[str]] = Field(
+    order_by: list[str] | None = Field(
         default=None,
         description="List of attributes to use to order the results by default",
         json_schema_extra={"update": "allowed"},
     )
-    uniqueness_constraints: Optional[list[list[str]]] = Field(
+    uniqueness_constraints: list[list[str]] | None = Field(
         default=None,
         description="List of multi-element uniqueness constraints that can combine relationships and attributes",
         json_schema_extra={"update": "validate_constraint"},
     )
-    documentation: Optional[str] = Field(
+    documentation: str | None = Field(
         default=None,
         description="Link to a documentation associated with this object, can be internal or external.",
         json_schema_extra={"update": "allowed"},

infrahub/core/schema/generated/node_schema.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from typing import Optional
-
 from pydantic import Field
 
 from infrahub.core.schema.basenode_schema import BaseNodeSchema
@@ -25,17 +23,17 @@ class GeneratedNodeSchema(BaseNodeSchema):
         description="Indicate if an object template schema should be generated for this schema",
         json_schema_extra={"update": "allowed"},
     )
-    hierarchy: Optional[str] = Field(
+    hierarchy: str | None = Field(
         default=None,
         description="Internal value to track the name of the Hierarchy, must match the name of a Generic supporting hierarchical mode",
         json_schema_extra={"update": "validate_constraint"},
     )
-    parent: Optional[str] = Field(
+    parent: str | None = Field(
         default=None,
         description="Expected Kind for the parent node in a Hierarchy, default to the main generic defined if not defined.",
         json_schema_extra={"update": "validate_constraint"},
     )
-    children: Optional[str] = Field(
+    children: str | None = Field(
         default=None,
         description="Expected Kind for the children nodes in a Hierarchy, default to the main generic defined if not defined.",
         json_schema_extra={"update": "validate_constraint"},

infrahub/core/schema/generated/relationship_schema.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from typing import Optional
-
 from pydantic import Field
 
 from infrahub.core.constants import (
@@ -19,7 +17,7 @@ from infrahub.core.models import HashableModel
 
 
 class GeneratedRelationshipSchema(HashableModel):
-    id: Optional[str] = Field(
+    id: str | None = Field(
         default=None, description="The ID of the relationship schema", json_schema_extra={"update": "not_applicable"}
     )
     name: str = Field(
@@ -41,19 +39,19 @@ class GeneratedRelationshipSchema(HashableModel):
         description="Defines the type of the relationship.",
         json_schema_extra={"update": "allowed"},
     )
-    label: Optional[str] = Field(
+    label: str | None = Field(
         default=None,
         description="Human friendly representation of the name. Will be autogenerated if not provided",
         max_length=32,
         json_schema_extra={"update": "allowed"},
     )
-    description: Optional[str] = Field(
+    description: str | None = Field(
         default=None,
         description="Short description of the relationship.",
         max_length=128,
         json_schema_extra={"update": "allowed"},
     )
-    identifier: Optional[str] = Field(
+    identifier: str | None = Field(
         default=None,
         description="Unique identifier of the relationship within a model, identifiers must match to traverse a relationship on both direction.",
         pattern=r"^[a-z0-9\_]+$",
@@ -75,7 +73,7 @@ class GeneratedRelationshipSchema(HashableModel):
         description="Defines the maximum objects allowed on the other side of the relationship.",
         json_schema_extra={"update": "validate_constraint"},
     )
-    order_weight: Optional[int] = Field(
+    order_weight: int | None = Field(
         default=None,
         description="Number used to order the relationship in the frontend (table and view). Lowest value will be ordered first.",
         json_schema_extra={"update": "allowed"},
@@ -85,7 +83,7 @@ class GeneratedRelationshipSchema(HashableModel):
         description="Indicate if this relationship is mandatory or optional.",
         json_schema_extra={"update": "validate_constraint"},
     )
-    branch: Optional[BranchSupportType] = Field(
+    branch: BranchSupportType | None = Field(
         default=None,
         description="Type of branch support for the relatioinship, if not defined it will be determine based both peers.",
         json_schema_extra={"update": "not_supported"},
@@ -100,7 +98,7 @@ class GeneratedRelationshipSchema(HashableModel):
         description="Defines the direction of the relationship,  Unidirectional relationship are required when the same model is on both side.",
         json_schema_extra={"update": "not_supported"},
     )
-    hierarchical: Optional[str] = Field(
+    hierarchical: str | None = Field(
         default=None,
         description="Internal attribute to track the type of hierarchy this relationship is part of, must match a valid Generic Kind",
         json_schema_extra={"update": "not_supported"},
@@ -110,7 +108,7 @@ class GeneratedRelationshipSchema(HashableModel):
         description="Expected state of the relationship after loading the schema",
         json_schema_extra={"update": "not_applicable"},
     )
-    on_delete: Optional[RelationshipDeleteBehavior] = Field(
+    on_delete: RelationshipDeleteBehavior | None = Field(
         default=None,
         description="Default is no-action. If cascade, related node(s) are deleted when this node is deleted.",
         json_schema_extra={"update": "allowed"},
@@ -125,7 +123,7 @@ class GeneratedRelationshipSchema(HashableModel):
         description="Set the relationship as read-only, users won't be able to change its value.",
         json_schema_extra={"update": "allowed"},
     )
-    deprecation: Optional[str] = Field(
+    deprecation: str | None = Field(
         default=None,
         description="Mark relationship as deprecated and provide a user-friendly message to display",
         max_length=128,