infrahub-server 1.3.0b6__py3-none-any.whl → 1.3.1__py3-none-any.whl

infrahub/cli/db.py

@@ -287,10 +287,10 @@ async def index(
     await dbdriver.close()
 
 
-async def migrate_database(db: InfrahubDatabase, initialize: bool = False, check: bool = False) -> None:
+async def migrate_database(db: InfrahubDatabase, initialize: bool = False, check: bool = False) -> bool:
     """Apply the latest migrations to the database, this function will print the status directly in the console.
 
-    This function is expected to run on an empty
+    Returns a boolean indicating whether a migration failed or if all migrations succeeded.
 
     Args:
         db: The database object.
@@ -306,14 +306,14 @@ async def migrate_database(db: InfrahubDatabase, initialize: bool = False, check
 
     if not migrations:
         rprint(f"Database up-to-date (v{root_node.graph_version}), no migration to execute.")
-        return
+        return True
 
     rprint(
         f"Database needs to be updated (v{root_node.graph_version} -> v{GRAPH_VERSION}), {len(migrations)} migrations pending"
     )
 
     if check:
-        return
+        return True
 
     for migration in migrations:
         execution_result = await migration.execute(db=db)
@@ -333,7 +333,9 @@ async def migrate_database(db: InfrahubDatabase, initialize: bool = False, check
             if validation_result and not validation_result.success:
                 for error in validation_result.errors:
                     rprint(f"  {error}")
-            break
+            return False
+
+    return True
 
 
 async def initialize_internal_schema() -> None:

infrahub/cli/upgrade.py

@@ -75,7 +75,12 @@ async def upgrade_cmd(
     # -------------------------------------------
     # Upgrade Infrahub Database and Schema
     # -------------------------------------------
-    await migrate_database(db=dbdriver, initialize=False, check=check)
+
+    if not await migrate_database(db=dbdriver, initialize=False, check=check):
+        # A migration failed, stop the upgrade process
+        rprint("Upgrade cancelled due to migration failure.")
+        await dbdriver.close()
+        return
 
     await initialize_internal_schema()
     await update_core_schema(db=dbdriver, service=service, initialize=False)

infrahub/core/attribute.py

@@ -31,6 +31,7 @@ from infrahub.helpers import hash_password
 
 from ..types import ATTRIBUTE_TYPES, LARGE_ATTRIBUTE_TYPES
 from .constants.relationship_label import RELATIONSHIP_TO_NODE_LABEL, RELATIONSHIP_TO_VALUE_LABEL
+from .schema.attribute_parameters import NumberAttributeParameters
 
 if TYPE_CHECKING:
     from infrahub.core.branch import Branch
@@ -255,6 +256,10 @@ class BaseAttribute(FlagPropertyMixin, NodePropertyMixin):
             if len(value) > max_length:
                 raise ValidationError({name: f"{value} must have a maximum length of {max_length!r}"})
 
+        # Some invalid values may exist due to https://github.com/opsmill/infrahub/issues/6714.
+        if config.SETTINGS.main.schema_strict_mode and isinstance(schema.parameters, NumberAttributeParameters):
+            schema.parameters.check_valid_value(value=value, name=name)
+
         if schema.enum:
             try:
                 schema.convert_value_to_enum(value)

infrahub/core/diff/coordinator.py

@@ -4,7 +4,10 @@ from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Iterable, Literal, Sequence, overload
 from uuid import uuid4
 
+from prefect import flow
+
 from infrahub import lock
+from infrahub.core.branch import Branch  # noqa: TC001
 from infrahub.core.timestamp import Timestamp
 from infrahub.exceptions import ValidationError
 from infrahub.log import get_logger
@@ -22,7 +25,6 @@ from .model.path import (
 )
 
 if TYPE_CHECKING:
-    from infrahub.core.branch import Branch
     from infrahub.core.node import Node
 
     from .calculator import DiffCalculator
@@ -301,6 +303,11 @@ class DiffCoordinator:
         force_branch_refresh: Literal[False] = ...,
     ) -> tuple[EnrichedDiffs | EnrichedDiffsMetadata, set[NodeIdentifier]]: ...
 
+    @flow(  # type: ignore[misc]
+        name="update-diff",
+        flow_run_name="Update diff for {base_branch.name} - {diff_branch.name}: ({from_time}-{to_time}),tracking_id={tracking_id}",
+        validate_parameters=False,
+    )
     async def _update_diffs(
         self,
         base_branch: Branch,

infrahub/core/diff/query/field_specifiers.py

@@ -15,7 +15,7 @@ class EnrichedDiffFieldSpecifiersQuery(Query):
     async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
         self.params["diff_id"] = self.diff_id
         query = """
-CALL {
+CALL () {
     MATCH (root:DiffRoot {uuid: $diff_id})-[:DIFF_HAS_NODE]->(node:DiffNode)-[:DIFF_HAS_ATTRIBUTE]->(attr:DiffAttribute)
     WHERE (root.is_merged IS NULL OR root.is_merged <> TRUE)
     RETURN node.uuid AS node_uuid, node.kind AS node_kind, attr.name AS field_name

infrahub/core/diff/query/merge.py

@@ -710,14 +710,14 @@ class DiffMergeRollbackQuery(Query):
         // ---------------------------
         // reset to times on target branch
         // ---------------------------
-        CALL {
+        CALL () {
             OPTIONAL MATCH ()-[r_to {to: $at, branch: $target_branch}]-()
             SET r_to.to = NULL
         }
         // ---------------------------
         // reset from times on target branch
         // ---------------------------
-        CALL {
+        CALL () {
             OPTIONAL MATCH ()-[r_from {from: $at, branch: $target_branch}]-()
             DELETE r_from
         }

infrahub/core/graph/__init__.py

@@ -1 +1 @@
-GRAPH_VERSION = 30
+GRAPH_VERSION = 31

infrahub/core/migrations/graph/__init__.py

@@ -32,6 +32,7 @@ from .m027_delete_isolated_nodes import Migration027
 from .m028_delete_diffs import Migration028
 from .m029_duplicates_cleanup import Migration029
 from .m030_illegal_edges import Migration030
+from .m031_check_number_attributes import Migration031
 
 if TYPE_CHECKING:
     from infrahub.core.root import Root
@@ -69,6 +70,7 @@ MIGRATIONS: list[type[GraphMigration | InternalSchemaMigration | ArbitraryMigrat
     Migration028,
     Migration029,
     Migration030,
+    Migration031,
 ]
 
 

infrahub/core/migrations/graph/m012_convert_account_generic.py

@@ -61,7 +61,7 @@ class Migration012RenameTypeAttributeData(AttributeRenameQuery):
     def render_match(self) -> str:
         query = """
         // Find all the active nodes
-        CALL {
+        CALL () {
             MATCH (node:%(node_kind)s)
             WHERE exists((node)-[:HAS_ATTRIBUTE]-(:Attribute { name: $prev_attr.name }))
                 AND NOT exists((node)-[:HAS_ATTRIBUTE]-(:Attribute { name: $new_attr.name }))

infrahub/core/migrations/graph/m023_deduplicate_cardinality_one_relationships.py

@@ -52,7 +52,7 @@ class DedupCardinalityOneRelsQuery(Query):
         # of a one-to-many BIDIR relationship.
         query = """
 
-        CALL {
+        CALL () {
             MATCH (rel_node: Relationship)-[edge:IS_RELATED]->(n: Node)<-[edge_2:IS_RELATED]-(rel_node_2: Relationship {name: rel_node.name})
             WHERE rel_node.name in $rel_one_identifiers_inbound[n.kind]
                 AND edge.branch = edge_2.branch
@@ -64,7 +64,7 @@ class DedupCardinalityOneRelsQuery(Query):
             DETACH DELETE rel_node
         }
 
-        CALL {
+        CALL () {
             MATCH (rel_node_3: Relationship)<-[edge_3:IS_RELATED]-(n: Node)-[edge_4:IS_RELATED]->(rel_node_4: Relationship {name: rel_node_3.name})
             WHERE rel_node_3.name in $rel_one_identifiers_outbound[n.kind]
                 AND edge_3.branch = edge_4.branch

infrahub/core/migrations/graph/m029_duplicates_cleanup.py

@@ -535,12 +535,12 @@ class PerformHardDeletes(Query):
 
     async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:  # noqa: ARG002
         query = """
-CALL {
+CALL () {
     MATCH (n)
     WHERE n.to_delete = TRUE
     DETACH DELETE n
 }
-CALL {
+CALL () {
     MATCH ()-[e]-()
     WHERE e.to_delete = TRUE
     DELETE e

infrahub/core/migrations/graph/m031_check_number_attributes.py

@@ -0,0 +1,102 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Sequence
+
+from infrahub import config
+from infrahub.core import registry
+from infrahub.core.branch import Branch
+from infrahub.core.constants import SchemaPathType
+from infrahub.core.initialization import initialization
+from infrahub.core.migrations.shared import InternalSchemaMigration, MigrationResult, SchemaMigration
+from infrahub.core.path import SchemaPath
+from infrahub.core.schema import GenericSchema, NodeSchema
+from infrahub.core.schema.attribute_parameters import NumberAttributeParameters
+from infrahub.core.validators.attribute.min_max import AttributeNumberChecker
+from infrahub.core.validators.enum import ConstraintIdentifier
+from infrahub.core.validators.model import SchemaConstraintValidatorRequest
+from infrahub.lock import initialize_lock
+from infrahub.log import get_logger
+from infrahub.types import Number
+
+if TYPE_CHECKING:
+    from infrahub.database import InfrahubDatabase
+
+log = get_logger()
+
+
+class Migration031(InternalSchemaMigration):
+    """
+    Some nodes with invalid number attributes may have been created as min/max/excluded_values were not working properly.
+    This migration indicates corrupted nodes. If strict mode is disabled, both this migration and min/max/excludes_values constraints are disabled,
+    so that users can carry one with their corrupted data without any failure.
+    """
+
+    name: str = "031_check_number_attributes"
+    minimum_version: int = 30
+    migrations: Sequence[SchemaMigration] = []
+
+    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+        """Retrieve all number attributes that have a min/max/excluded_values
+        For any of these attributes, check if corresponding existing nodes are valid."""
+
+        if not config.SETTINGS.main.schema_strict_mode:
+            return MigrationResult()
+
+        # load schemas from database into registry
+        initialize_lock()
+        await initialization(db=db)
+
+        node_id_to_error_message = {}
+
+        branches = await Branch.get_list(db=db)
+        for branch in branches:  # noqa
+            schema_branch = await registry.schema.load_schema_from_db(db=db, branch=branch)
+            for node_schema_kind in schema_branch.node_names:
+                schema = schema_branch.get_node(name=node_schema_kind, duplicate=False)
+                if not isinstance(schema, (NodeSchema, GenericSchema)):
+                    continue
+
+                for attr in schema.attributes:
+                    if attr.kind != Number.label:
+                        continue
+
+                    # Check if the attribute has a min/max/excluded_values being violated
+                    if isinstance(attr.parameters, NumberAttributeParameters) and (
+                        attr.parameters.min_value is not None
+                        or attr.parameters.max_value is not None
+                        or attr.parameters.excluded_values
+                    ):
+                        request = SchemaConstraintValidatorRequest(
+                            branch=branch,
+                            constraint_name=ConstraintIdentifier.ATTRIBUTE_PARAMETERS_MIN_VALUE_UPDATE.value,
+                            node_schema=schema,
+                            schema_path=SchemaPath(
+                                path_type=SchemaPathType.ATTRIBUTE, schema_kind=schema.kind, field_name=attr.name
+                            ),
+                            schema_branch=db.schema.get_schema_branch(name=registry.default_branch),
+                        )
+
+                        constraint_checker = AttributeNumberChecker(db=db, branch=branch)
+                        grouped_data_paths = await constraint_checker.check(request)
+                        data_paths = grouped_data_paths[0].get_all_data_paths()
+                        for data_path in data_paths:
+                            # Avoid having duplicated error messages for nodes present on multiple branches.
+                            if data_path.node_id not in node_id_to_error_message:
+                                node_id_to_error_message[data_path.node_id] = (
+                                    f"Node {data_path.node_id} on branch {branch.name} "
+                                    f"has an invalid Number attribute {data_path.field_name}: {data_path.value}"
+                                )
+
+        if len(node_id_to_error_message) == 0:
+            return MigrationResult()
+
+        error_str = (
+            "Following nodes attributes values must be updated to not violate corresponding min_value, "
+            "max_value or excluded_values schema constraints"
+        )
+        errors_messages = list(node_id_to_error_message.values())
+        return MigrationResult(errors=[error_str] + errors_messages)
+
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
+        result = MigrationResult()
+        return result

infrahub/core/migrations/query/attribute_rename.py

@@ -38,7 +38,7 @@ class AttributeRenameQuery(Query):
     def render_match(self) -> str:
         query = """
         // Find all the active nodes
-        CALL {
+        CALL () {
             MATCH (node:%(node_kind)s)
             WHERE exists((node)-[:HAS_ATTRIBUTE]-(:Attribute { name: $prev_attr.name }))
             RETURN node

infrahub/core/node/__init__.py

@@ -70,7 +70,9 @@ log = get_logger()
 
 class Node(BaseNode, metaclass=BaseNodeMeta):
     @classmethod
-    def __init_subclass_with_meta__(cls, _meta=None, default_filter=None, **options) -> None:
+    def __init_subclass_with_meta__(
+        cls, _meta: BaseNodeOptions | None = None, default_filter: None = None, **options: dict[str, Any]
+    ) -> None:
         if not _meta:
             _meta = BaseNodeOptions(cls)
 
@@ -959,6 +961,8 @@ class Node(BaseNode, metaclass=BaseNodeMeta):
             if relationship.kind == RelationshipKind.PARENT:
                 return relationship.name
 
+        return None
+
     async def get_object_template(self, db: InfrahubDatabase) -> CoreObjectTemplate | None:
         object_template: RelationshipManager = getattr(self, OBJECT_TEMPLATE_RELATIONSHIP_NAME, None)
         return (

infrahub/core/query/delete.py

@@ -21,7 +21,7 @@ class DeleteAfterTimeQuery(Query):
         // ---------------------
         // Reset edges with to time after timestamp
         // ---------------------
-        CALL {
+        CALL () {
             OPTIONAL MATCH (p)-[r]-(q)
             WHERE r.to > $timestamp
             SET r.to = NULL
@@ -33,7 +33,7 @@ class DeleteAfterTimeQuery(Query):
             // ---------------------
             // Delete edges with from time after timestamp timestamp
             // ---------------------
-            CALL {
+            CALL () {
                 OPTIONAL MATCH (p)-[r]->(q)
                 WHERE r.from > $timestamp
                 DELETE r
@@ -49,7 +49,7 @@ class DeleteAfterTimeQuery(Query):
             // ---------------------
             // Delete edges with from time after timestamp timestamp
             // ---------------------
-            CALL {
+            CALL () {
                 OPTIONAL MATCH (p)-[r]->(q)
                 WHERE r.from > $timestamp
                 DELETE r

infrahub/core/schema/attribute_parameters.py

@@ -8,6 +8,7 @@ from pydantic import ConfigDict, Field, model_validator
 from infrahub import config
 from infrahub.core.constants.schema import UpdateSupport
 from infrahub.core.models import HashableModel
+from infrahub.exceptions import ValidationError
 
 
 def get_attribute_parameters_class_for_kind(kind: str) -> type[AttributeParameters]:
@@ -124,16 +125,22 @@ class NumberAttributeParameters(AttributeParameters):
         return ranges
 
     def is_valid_value(self, value: int) -> bool:
-        if self.min_value is not None and value < self.min_value:
+        try:
+            self.check_valid_value(value=value, name="UNUSED")
+        except ValidationError:
             return False
+        return True
+
+    def check_valid_value(self, value: int, name: str) -> None:
+        if self.min_value is not None and value < self.min_value:
+            raise ValidationError({name: f"{value} is lower than the minimum allowed value {self.min_value!r}"})
         if self.max_value is not None and value > self.max_value:
-            return False
+            raise ValidationError({name: f"{value} is higher than the maximum allowed value {self.max_value!r}"})
         if value in self.get_excluded_single_values():
-            return False
+            raise ValidationError({name: f"{value} is in the excluded values"})
         for start, end in self.get_excluded_ranges():
             if start <= value <= end:
-                return False
-        return True
+                raise ValidationError({name: f"{value} is in an the excluded range {start}-{end}"})
 
 
 class NumberPoolParameters(AttributeParameters):

infrahub/core/schema/basenode_schema.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import hashlib
 import keyword
 import os
+from collections import defaultdict
 from dataclasses import asdict, dataclass
 from enum import Enum
 from typing import TYPE_CHECKING, Any, Callable, Iterable, Literal, overload
@@ -10,7 +11,7 @@ from typing import TYPE_CHECKING, Any, Callable, Iterable, Literal, overload
 from infrahub_sdk.utils import compare_lists, intersection
 from pydantic import field_validator
 
-from infrahub.core.constants import RelationshipCardinality, RelationshipKind
+from infrahub.core.constants import HashableModelState, RelationshipCardinality, RelationshipKind
 from infrahub.core.models import HashableModel, HashableModelDiff
 
 from .attribute_schema import AttributeSchema, get_attribute_schema_class_for_kind
@@ -514,7 +515,86 @@ class BaseNodeSchema(GeneratedBaseNodeSchema):
             return UniquenessConstraintType.SUBSET_OF_HFID
         return UniquenessConstraintType.STANDARD
 
+    def _update_schema_paths(
+        self, schema_paths_list: list[str], field_name_update_map: dict[str, str], deleted_field_names: set[str]
+    ) -> list[str]:
+        """
+        For each schema_path (eg name__value, device__name_value), update the field name if the current name is
+        in field_name_update_map, remove the path if the field name is in deleted_field_names
+        """
+        updated_element_list = []
+        for schema_path in schema_paths_list:
+            split_path = schema_path.split("__", maxsplit=1)
+            current_field_name = split_path[0]
+            if current_field_name in deleted_field_names:
+                continue
+            new_field_name = field_name_update_map.get(current_field_name)
+            if not new_field_name:
+                updated_element_list.append(schema_path)
+                continue
+            rest_of_path = f"__{split_path[1]}" if len(split_path) > 1 else ""
+            new_element_str = f"{new_field_name}{rest_of_path}"
+            updated_element_list.append(new_element_str)
+        return updated_element_list
+
+    def handle_field_renames_and_deletes(self, other: BaseNodeSchema) -> None:
+        properties_to_update = [self.uniqueness_constraints, self.human_friendly_id, self.display_labels, self.order_by]
+        if not any(p for p in properties_to_update):
+            return
+
+        deleted_names: set[str] = set()
+        field_names_by_id = defaultdict(list)
+        for field in self.attributes + self.relationships:
+            if not field.id:
+                continue
+            field_names_by_id[field.id].append(field.name)
+        for field in other.attributes + other.relationships:
+            # identify fields deleted in the other schema
+            if field.state is HashableModelState.ABSENT:
+                deleted_names.add(field.name)
+            if not field.id:
+                continue
+            if field.name not in field_names_by_id[field.id]:
+                field_names_by_id[field.id].append(field.name)
+        # identify fields renamed from this schema to the other schema
+        renamed_field_name_map = {v[0]: v[-1] for v in field_names_by_id.values() if len(v) > 1}
+
+        if self.uniqueness_constraints:
+            updated_constraints = []
+            for constraint in self.uniqueness_constraints:
+                updated_constraint = self._update_schema_paths(
+                    schema_paths_list=constraint,
+                    field_name_update_map=renamed_field_name_map,
+                    deleted_field_names=deleted_names,
+                )
+                if updated_constraint:
+                    updated_constraints.append(updated_constraint)
+            self.uniqueness_constraints = updated_constraints
+        if self.human_friendly_id:
+            self.human_friendly_id = self._update_schema_paths(
+                schema_paths_list=self.human_friendly_id,
+                field_name_update_map=renamed_field_name_map,
+                deleted_field_names=deleted_names,
+            )
+        if self.display_labels:
+            self.display_labels = self._update_schema_paths(
+                schema_paths_list=self.display_labels,
+                field_name_update_map=renamed_field_name_map,
+                deleted_field_names=deleted_names,
+            )
+        if self.order_by:
+            self.order_by = self._update_schema_paths(
+                schema_paths_list=self.order_by,
+                field_name_update_map=renamed_field_name_map,
+                deleted_field_names=deleted_names,
+            )
+
     def update(self, other: HashableModel) -> Self:
+        # handle renamed/deleted field updates for schema properties here
+        # so that they can still be overridden during the call to `update()` below
+        if isinstance(other, BaseNodeSchema):
+            self.handle_field_renames_and_deletes(other=other)
+
         super().update(other=other)
 
         # Allow to specify empty string to remove existing fields values
@@ -551,6 +631,24 @@ class SchemaAttributePath:
     attribute_schema: AttributeSchema | None = None
     attribute_property_name: str | None = None
 
+    def __str__(self) -> str:
+        return self.to_string()
+
+    def to_string(self, field_name_override: str | None = None) -> str:
+        str_path = ""
+        if self.relationship_schema:
+            str_path += field_name_override or self.relationship_schema.name
+        if self.attribute_schema:
+            if str_path:
+                str_path += "__"
+                attr_name = self.attribute_schema.name
+            else:
+                attr_name = field_name_override or self.attribute_schema.name
+            str_path += attr_name
+        if self.attribute_property_name:
+            str_path += f"__{self.attribute_property_name}"
+        return str_path
+
     @property
     def is_type_attribute(self) -> bool:
         return bool(self.attribute_schema and not self.related_schema and not self.relationship_schema)
@@ -563,6 +661,14 @@ class SchemaAttributePath:
     def has_property(self) -> bool:
         return bool(self.attribute_property_name)
 
+    @property
+    def field_name(self) -> str | None:
+        if self.relationship_schema:
+            return self.relationship_schema.name
+        if self.attribute_schema:
+            return self.attribute_schema.name
+        return None
+
     @property
     def active_relationship_schema(self) -> RelationshipSchema:
         if self.relationship_schema:

infrahub/core/schema/schema_branch.py

@@ -710,7 +710,9 @@ class SchemaBranch:
                 ):
                     unique_attrs_in_constraints.add(schema_attribute_path.attribute_schema.name)
 
-            unique_attrs_in_attrs = {attr_schema.name for attr_schema in node_schema.unique_attributes}
+            unique_attrs_in_attrs = {
+                attr_schema.name for attr_schema in node_schema.unique_attributes if not attr_schema.inherited
+            }
             if unique_attrs_in_attrs == unique_attrs_in_constraints:
                 continue
 
@@ -822,11 +824,16 @@ class SchemaBranch:
                     ) from exc
 
     def _is_attr_combination_unique(
-        self, attrs_paths: list[str], uniqueness_constraints: list[list[str]] | None
+        self, attrs_paths: list[str], uniqueness_constraints: list[list[str]] | None, unique_attribute_names: list[str]
     ) -> bool:
         """
-        Return whether at least one combination of any length of `attrs_paths` is equal to a uniqueness constraint.
+        Return whether at least one combination of any length of `attrs_paths` is unique
         """
+        if unique_attribute_names:
+            for attr_path in attrs_paths:
+                for unique_attr_name in unique_attribute_names:
+                    if attr_path.startswith(unique_attr_name):
+                        return True
 
         if not uniqueness_constraints:
             return False
@@ -868,9 +875,14 @@ class SchemaBranch:
             if config.SETTINGS.main.schema_strict_mode:
                 # For every relationship referred within hfid, check whether the combination of attributes is unique is the peer schema node
                 for related_schema, attrs_paths in rel_schemas_to_paths.values():
-                    if not self._is_attr_combination_unique(attrs_paths, related_schema.uniqueness_constraints):
+                    if not self._is_attr_combination_unique(
+                        attrs_paths=attrs_paths,
+                        uniqueness_constraints=related_schema.uniqueness_constraints,
+                        unique_attribute_names=[a.name for a in related_schema.unique_attributes],
+                    ):
                         raise ValidationError(
-                            f"HFID of {node_schema.kind} refers peer {related_schema.kind} with a non-unique combination of attributes {attrs_paths}"
+                            f"HFID of {node_schema.kind} refers to peer {related_schema.kind}"
+                            f" with a non-unique combination of attributes {attrs_paths}"
                         )
 
     def validate_required_relationships(self) -> None:

infrahub/core/validators/attribute/min_max.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
+from infrahub import config
 from infrahub.core.constants import PathType
 from infrahub.core.path import DataPath, GroupedDataPaths
 from infrahub.core.schema.attribute_parameters import NumberAttributeParameters
@@ -87,6 +88,10 @@ class AttributeNumberChecker(ConstraintCheckerInterface):
         return "attribute.number.update"
 
     def supports(self, request: SchemaConstraintValidatorRequest) -> bool:
+        # Some invalid values may exist due to https://github.com/opsmill/infrahub/issues/6714.
+        if not config.SETTINGS.main.schema_strict_mode:
+            return False
+
         return request.constraint_name in (
             ConstraintIdentifier.ATTRIBUTE_PARAMETERS_MIN_VALUE_UPDATE.value,
             ConstraintIdentifier.ATTRIBUTE_PARAMETERS_MAX_VALUE_UPDATE.value,
@@ -94,7 +99,6 @@ class AttributeNumberChecker(ConstraintCheckerInterface):
         )
 
     async def check(self, request: SchemaConstraintValidatorRequest) -> list[GroupedDataPaths]:
-        grouped_data_paths_list: list[GroupedDataPaths] = []
         if not request.schema_path.field_name:
             raise ValueError("field_name is not defined")
         attribute_schema = request.node_schema.get_attribute(name=request.schema_path.field_name)
@@ -106,8 +110,9 @@ class AttributeNumberChecker(ConstraintCheckerInterface):
             and attribute_schema.parameters.max_value is None
             and attribute_schema.parameters.excluded_values is None
         ):
-            return grouped_data_paths_list
+            return []
 
+        grouped_data_paths_list: list[GroupedDataPaths] = []
         for query_class in self.query_classes:
             # TODO add exception handling
             query = await query_class.init(

infrahub/graphql/app.py

@@ -88,6 +88,8 @@ GQL_STOP = "stop"
 ContextValue = Any | Callable[[HTTPConnection], Any]
 RootValue = Any
 
+subscription_tasks = set()
+
 
 class InfrahubGraphQLApp:
     def __init__(
@@ -446,7 +448,9 @@ class InfrahubGraphQLApp:
 
         asyncgen = cast(AsyncGenerator[Any, None], result)
         subscriptions[operation_id] = asyncgen
-        asyncio.create_task(self._observe_subscription(asyncgen, operation_id, websocket))
+        task = asyncio.create_task(self._observe_subscription(asyncgen, operation_id, websocket))
+        subscription_tasks.add(task)
+        task.add_done_callback(subscription_tasks.discard)
         return []
 
     async def _observe_subscription(

infrahub/services/adapters/message_bus/nats.py

@@ -26,6 +26,8 @@ if TYPE_CHECKING:
 MessageFunction = Callable[[InfrahubMessage], Awaitable[None]]
 ResponseClass = TypeVar("ResponseClass")
 
+publish_tasks = set()
+
 
 async def _add_request_id(message: InfrahubMessage) -> None:
     log_data = get_log_data()
@@ -223,7 +225,9 @@ class NATSMessageBus(InfrahubMessageBus):
                     # Delayed retries are directly handled in the callback using Nack
                     return
                 # Use asyncio task for delayed publish since NATS does not support that out of the box
-                asyncio.create_task(self._publish_with_delay(message, routing_key, delay))
+                task = asyncio.create_task(self._publish_with_delay(message, routing_key, delay))
+                publish_tasks.add(task)
+                task.add_done_callback(publish_tasks.discard)
                 return
 
             for enricher in self.message_enrichers:

infrahub/services/scheduler.py

@@ -16,6 +16,8 @@ if TYPE_CHECKING:
 
 log = get_logger()
 
+background_tasks = set()
+
 
 @dataclass
 class Schedule:
@@ -56,7 +58,9 @@ class InfrahubScheduler:
 
     async def start_schedule(self) -> None:
         for schedule in self.schedules:
-            asyncio.create_task(self.run_schedule(schedule=schedule), name=f"scheduled_task_{schedule.name}")
+            task = asyncio.create_task(self.run_schedule(schedule=schedule), name=f"scheduled_task_{schedule.name}")
+            background_tasks.add(task)
+            task.add_done_callback(background_tasks.discard)
 
     async def shutdown(self) -> None:
         self.running = False

infrahub_sdk/node/__init__.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from .attribute import Attribute
 from .constants import (
     ARTIFACT_DEFINITION_GENERATE_FEATURE_NOT_SUPPORTED_MESSAGE,
     ARTIFACT_FETCH_FEATURE_NOT_SUPPORTED_MESSAGE,
@@ -25,6 +26,7 @@ __all__ = [
     "PROPERTIES_FLAG",
     "PROPERTIES_OBJECT",
     "SAFE_VALUE",
+    "Attribute",
     "InfrahubNode",
     "InfrahubNodeBase",
     "InfrahubNodeSync",

infrahub_sdk/node/node.py

@@ -501,11 +501,21 @@ class InfrahubNode(InfrahubNodeBase):
 
         return cls(client=client, schema=schema, branch=branch, data=cls._strip_alias(data))
 
-    def _init_relationships(self, data: dict | None = None) -> None:
+    def _init_relationships(self, data: dict | RelatedNode | None = None) -> None:
         for rel_schema in self._schema.relationships:
             rel_data = data.get(rel_schema.name, None) if isinstance(data, dict) else None
 
             if rel_schema.cardinality == "one":
+                if isinstance(rel_data, RelatedNode):
+                    peer_id_data: dict[str, Any] = {}
+                    if rel_data.id:
+                        peer_id_data["id"] = rel_data.id
+                    if rel_data.hfid:
+                        peer_id_data["hfid"] = rel_data.hfid
+                    if peer_id_data:
+                        rel_data = peer_id_data
+                    else:
+                        rel_data = None
                 self._relationship_cardinality_one_data[rel_schema.name] = RelatedNode(
                     name=rel_schema.name, branch=self._branch, client=self._client, schema=rel_schema, data=rel_data
                 )
@@ -1079,10 +1089,19 @@ class InfrahubNodeSync(InfrahubNodeBase):
             rel_data = data.get(rel_schema.name, None) if isinstance(data, dict) else None
 
             if rel_schema.cardinality == "one":
+                if isinstance(rel_data, RelatedNodeSync):
+                    peer_id_data: dict[str, Any] = {}
+                    if rel_data.id:
+                        peer_id_data["id"] = rel_data.id
+                    if rel_data.hfid:
+                        peer_id_data["hfid"] = rel_data.hfid
+                    if peer_id_data:
+                        rel_data = peer_id_data
+                    else:
+                        rel_data = None
                 self._relationship_cardinality_one_data[rel_schema.name] = RelatedNodeSync(
                     name=rel_schema.name, branch=self._branch, client=self._client, schema=rel_schema, data=rel_data
                 )
-
             else:
                 self._relationship_cardinality_many_data[rel_schema.name] = RelationshipManagerSync(
                     name=rel_schema.name,

{infrahub_server-1.3.0b6.dist-info → infrahub_server-1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: infrahub-server
-Version: 1.3.0b6
+Version: 1.3.1
 Summary: Infrahub is taking a new approach to Infrastructure Management by providing a new generation of datastore to organize and control all the data that defines how an infrastructure should run.
 License: AGPL-3.0-only
 Author: OpsMill

{infrahub_server-1.3.0b6.dist-info → infrahub_server-1.3.1.dist-info}/RECORD

@@ -38,13 +38,13 @@ infrahub/branch/triggers.py,sha256=4sywoEX79fY2NkaGe6tTHnmytf4k6gXDm2FJHkkRJOw,7
 infrahub/cli/__init__.py,sha256=zQjE9zMrwAmk_4qb5mbUgNi06g3HKvrPwQvJLQmv9JY,1814
 infrahub/cli/constants.py,sha256=CoCeTMnfsA3j7ArdLKLZK4VPxOM7ls17qpxGJmND0m8,129
 infrahub/cli/context.py,sha256=20CJj_D1VhigR9uhTDPHiVHnV7vzsgK8v-uLKs06kzA,398
-infrahub/cli/db.py,sha256=mQ0BYcYwhzzp2YLC0CiBLOSVGz_egLgZTi1BuoTiurE,28395
+infrahub/cli/db.py,sha256=0kBWyzHo6EFnINivClMj0jTBPC_9-RDVeuxrQrRYRws,28472
 infrahub/cli/events.py,sha256=nJmowQgTxRs6qaT41A71Ei9jm6qtYaL2amAT5TA1H_k,1726
 infrahub/cli/git_agent.py,sha256=ajT9-kdd3xLIysOPe8GqZyCDMkpNyhqfWjBg9HPWVcg,5240
 infrahub/cli/patch.py,sha256=ztOkWyo0l_Wo0WX10bvSqGZibKzowrwx82oi69cjwkY,6018
 infrahub/cli/server.py,sha256=zeKgJE9V0usSMVBwye0sRNNh6Ctj-nSZHqHbNskqyz4,2248
 infrahub/cli/tasks.py,sha256=uVtMuUbcXwb6H3hnunUl9JJh99XShpWn2pwryVrR7hg,1952
-infrahub/cli/upgrade.py,sha256=GQWzga8AFTvfS_VY6s1Nmf_J1UJb533IUVQiF_FC9r0,5031
+infrahub/cli/upgrade.py,sha256=NMYIXv31ZsdBQvq7bpQEYYtXbjGCI4Ak3_92GceEIrM,5203
 infrahub/components.py,sha256=lSLDCDwIZoakZ2iBrfHi9c3BxzugMiuiZO6V7Egt6tk,107
 infrahub/computed_attribute/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/computed_attribute/constants.py,sha256=oTMPEfRuf2mcfCkBpRLWRALO6nsLHpFm9jJGu0lowS4,446
@@ -58,7 +58,7 @@ infrahub/constants/database.py,sha256=WmV1iuOk4xulxZHOVvO3sS_VF1eTf7fKh0TPe_RnfV
 infrahub/context.py,sha256=8SZRKSECkkcsNNzDaKEUJ7Nyr0EzUfToAy969LXjQVk,1554
 infrahub/core/__init__.py,sha256=z6EJBZyCYCBqinoBtX9li6BTBbbGV8WCkE_4CrEsmDA,104
 infrahub/core/account.py,sha256=s8ZC7J8rtEvQZQjbVuiKMlPhl6aQjtAjbZhBejLC0X8,26182
-infrahub/core/attribute.py,sha256=6JSnPb0eC6sHiBzoXy9xcrnWRzOR0cLm_t-jf5ksQLM,43908
+infrahub/core/attribute.py,sha256=stmJ_dOr7rFTXzH80keuE64f6y3K3393GiSYeOaay3s,44257
 infrahub/core/branch/__init__.py,sha256=h0oIj0gHp1xI-N1cYW8_N6VZ81CBOmLuiUt5cS5nKuk,49
 infrahub/core/branch/models.py,sha256=8e0BXwbFV4zHMSpqAp1Zp4L8YlxBs0Mxpl9gMoFGeJ4,19539
 infrahub/core/branch/tasks.py,sha256=_5tuv068xczwGYB2MZffPIdchhhgm1ciqOawdIO2pAo,20904
@@ -85,7 +85,7 @@ infrahub/core/diff/combiner.py,sha256=qL4WQsphB2sVnncgskSG_QcJBqBHjaK0vWU_apeTn-
 infrahub/core/diff/conflict_transferer.py,sha256=LZCuS9Dbr4yBf-bd3RF-9cPnaOvVWiU3KBmmwxbRZl0,3968
 infrahub/core/diff/conflicts_enricher.py,sha256=x6qiZOXO2A3BQ2Fm78apJ4WA7HLzPO84JomJfcyuyDg,12552
 infrahub/core/diff/conflicts_extractor.py,sha256=HysGoyNy9qMxfQ0Lh4AVZsRpHUBpezQNUa8cteVLb2k,9715
-infrahub/core/diff/coordinator.py,sha256=HDbz6dTIALTR6NzmGw1DnEb6o_VYDYbpZzP8TUqN7l4,27134
+infrahub/core/diff/coordinator.py,sha256=wlQSnjuBQ-N6b3wH7t2rBsVnFJb0ACgvKCApBCpIlvw,27405
 infrahub/core/diff/data_check_synchronizer.py,sha256=HcbYEIe-70MBiSR6P0AmAwgY9aFxYCJktxOiRcJaxj8,9241
 infrahub/core/diff/enricher/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/core/diff/enricher/aggregated.py,sha256=-LnAeNKDo6mifjL3d3ylCg1A9dTZJBySngWPeF7DfrY,793
@@ -115,12 +115,12 @@ infrahub/core/diff/query/delete_query.py,sha256=KMZ-HbSz2RKYqqMZ1Lj0mZBlWvkBYOyO
 infrahub/core/diff/query/diff_get.py,sha256=SzlJAF5DNKcbavgVOxLKJ-o8EsuImTGE2uNPg9hcMq0,7438
 infrahub/core/diff/query/diff_summary.py,sha256=sypXfK4EO_BZBuohlv419AjgL5ZeRwMiwnI7IIlh0KE,3841
 infrahub/core/diff/query/drop_nodes.py,sha256=NP29dbW-z4s_rp_MtIwTl3FXElfCP6eqEpF_9r3Z3VA,1674
-infrahub/core/diff/query/field_specifiers.py,sha256=XXtP2kwBxKnN7ALJN5DYuMyUl17ARnz4NJgeDzldm8w,1699
+infrahub/core/diff/query/field_specifiers.py,sha256=y_kPpPnOYQvUvdl6xc2sqQzVXODP4NQWIC55ya0x3ps,1702
 infrahub/core/diff/query/field_summary.py,sha256=-1p6xeyn0w6fQPrpOI6a9Id95wqtdxKUREulTH_yIec,3150
 infrahub/core/diff/query/filters.py,sha256=McTtRNGg8fmnqTtNH-msfzH-8eKCBsM6-fitxTp5T8w,4324
 infrahub/core/diff/query/get_conflict_query.py,sha256=kpGZA4QZrXxv_vnoAP5oa9-347VzsNWUIBWcg7rg03U,892
 infrahub/core/diff/query/has_conflicts_query.py,sha256=kt0Z606vP2r1g7OqW2RrYj9LbiVkrzGfQ0AKCHx21XI,2547
-infrahub/core/diff/query/merge.py,sha256=duFTAd81BcoztSEIhK4KP6vpbWvrefSV_Xb97vrQlaM,32149
+infrahub/core/diff/query/merge.py,sha256=UJ816ALrxsg0mjc1RWUygzL5Wy-ObKar0rOpIljlmTM,32155
 infrahub/core/diff/query/merge_tracking_id.py,sha256=VLGsKuOCIMYe0I-0r01YHF5iaLYIkfSCVQatHM-ybFA,833
 infrahub/core/diff/query/roots_metadata.py,sha256=FT-48amqoR2RS4CkfnnXGI7Z5uOL4hm7IdZiz3SFHRo,2182
 infrahub/core/diff/query/save.py,sha256=xBKWpWfRWfaP7g523xKMK82ogg0AfVQTTMeyz8oe-o0,22956
@@ -133,7 +133,7 @@ infrahub/core/diff/repository/deserializer.py,sha256=bhN9ao8HxqKyRz273QGLNV9z9_S
 infrahub/core/diff/repository/repository.py,sha256=x3QP9VmBVYBOVtf3IZUyzXqCd8sSfmHTqVoYlAOdGao,26006
 infrahub/core/diff/tasks.py,sha256=7_k-ZNcJZsiDp-xCZvCQfPJjg0xRxpaGTiVVNuRPfBI,3322
 infrahub/core/enums.py,sha256=qGbhRVoH43Xi0iDkUfWdQiKapJbLT9UKsCobFk_paIk,491
-infrahub/core/graph/__init__.py,sha256=2EUPjmgYV1tf8ln4lfXK57uUCRFRuanN9SNHZmXdy24,19
+infrahub/core/graph/__init__.py,sha256=BGr-0-sGLkh6KZu0KVKYgP5KJXbAfOfNoaKpB2168Cg,19
 infrahub/core/graph/constraints.py,sha256=lmuzrKDFoeSKRiLtycB9PXi6zhMYghczKrPYvfWyy90,10396
 infrahub/core/graph/index.py,sha256=IHLP-zPRp7HJYLGHMRDRXQp8RC69ztP10Tr5NcL2j4Y,1736
 infrahub/core/graph/schema.py,sha256=FmEPPb1XOFv3nnS_XJCuUqlp8HsStX5A2frHjlhoqvE,10105
@@ -152,7 +152,7 @@ infrahub/core/ipam/utilization.py,sha256=d-zpXCaWsHgJxBLopCDd7y4sJYvHcIzzpYhbTMI
 infrahub/core/manager.py,sha256=NaUuSY7Veesa67epQRuQ2TJD0-ooUSnvNRIUZCntV3g,47576
 infrahub/core/merge.py,sha256=bZvToLKyphJlWMbQAzGuSHcrG2DfeqL69KSfqb1wWdc,10430
 infrahub/core/migrations/__init__.py,sha256=syPb3-Irf11dXCHgbT0UdmTnEBbpf4wXJ3m8ADYXDpk,1175
-infrahub/core/migrations/graph/__init__.py,sha256=e0OzJEAn1qvtPghPwan8kWrLzDXX9eaw7YgbFlAZevA,2872
+infrahub/core/migrations/graph/__init__.py,sha256=jf-xSA-9fSQAQYESBhnPIXCM60gCALgLrzxWPyAo2_o,2945
 infrahub/core/migrations/graph/m001_add_version_to_graph.py,sha256=YcLN6cFjE6IGheXR4Ujb6CcyY8bJ7WE289hcKJaENOc,1515
 infrahub/core/migrations/graph/m002_attribute_is_default.py,sha256=wB6f2N_ChTvGajqHD-OWCG5ahRMDhhXZuwo79ieq_II,1036
 infrahub/core/migrations/graph/m003_relationship_parent_optional.py,sha256=Aya-s98XfE9C7YluOwEjilwgnjaBnZxp27w_Xdv_NmU,2330
@@ -164,7 +164,7 @@ infrahub/core/migrations/graph/m008_add_human_friendly_id.py,sha256=7zswLvod5iTp
 infrahub/core/migrations/graph/m009_add_generate_profile_attr.py,sha256=7FfjKyVYOebU51SeRtRYkTWKX26SBQx2dfofi7TiQQ8,1346
 infrahub/core/migrations/graph/m010_add_generate_profile_attr_generic.py,sha256=M4Orq480PzwBEz85QZqdBh-1arJdIwXNwnPA6cWy5Yg,1366
 infrahub/core/migrations/graph/m011_remove_profile_relationship_schema.py,sha256=TYQ1jXNucLIBbqLS35nUb_72OmMspXexSSW83Ax0oEw,1980
-infrahub/core/migrations/graph/m012_convert_account_generic.py,sha256=XvOKS0CSJSOdXQfan7N_Nrak6CB75r9xyT5rErUb61w,10998
+infrahub/core/migrations/graph/m012_convert_account_generic.py,sha256=FZWv-axVbhq86-3l-T8TLnzW7IW2rHLbkgAEb5ol-6A,11001
 infrahub/core/migrations/graph/m013_convert_git_password_credential.py,sha256=Vq9jH4NK4LNH__2c_2wCRIHZg17-nxhfLB0CiMSdmNk,12734
 infrahub/core/migrations/graph/m014_remove_index_attr_value.py,sha256=Amds1gl8YtNIekU0tSXpHzdfk8UFqChC2LOLfnQ1YTM,1441
 infrahub/core/migrations/graph/m015_diff_format_update.py,sha256=fMnUja-VgKbCxtx4Rh3PnA_s3iidaYunJWEkw0AD51w,1169
@@ -175,17 +175,18 @@ infrahub/core/migrations/graph/m019_restore_rels_to_time.py,sha256=jsSrUWHxvvfJf
 infrahub/core/migrations/graph/m020_duplicate_edges.py,sha256=zzz7CLPynCUvfyXhUPD1RzzXUSOJhga_7vsHSoRDdPE,6749
 infrahub/core/migrations/graph/m021_missing_hierarchy_merge.py,sha256=sd3its0zG2c8b36wIyhmcFUlwrIX34SyTegJsRQ-Wk4,1623
 infrahub/core/migrations/graph/m022_add_generate_template_attr.py,sha256=CmSxcXoWdjNXk4UxbUUeR7X49qiyNIIJuvigV9pOqNA,1748
-infrahub/core/migrations/graph/m023_deduplicate_cardinality_one_relationships.py,sha256=tW-su33h0K1zZk6GsOxqZcqpAsTNCmKo7kN88Te7jAA,3930
+infrahub/core/migrations/graph/m023_deduplicate_cardinality_one_relationships.py,sha256=NwGnJdbjOWCm7bG-E9E5Uw2fRw4KzHZwaJLKBIVhTcw,3936
 infrahub/core/migrations/graph/m024_missing_hierarchy_backfill.py,sha256=_Ex13D1JYCSLcX_eXNgx_etcQXdqbxdgQ-6z7CpJKns,2487
 infrahub/core/migrations/graph/m025_uniqueness_nulls.py,sha256=n_g09PDLs1yo3dMYL00HH2VtmYkjV1sVnxFL0KL4hOg,863
 infrahub/core/migrations/graph/m026_0000_prefix_fix.py,sha256=7sP6nQZrqgzFyRUHKf5fKSX2LrzKEAAsiDsRSu9noJM,1944
 infrahub/core/migrations/graph/m027_delete_isolated_nodes.py,sha256=aAfDUdhsR05CpehVeyLWQ1tRstgrF0HY2V5V6X5ALxM,1589
 infrahub/core/migrations/graph/m028_delete_diffs.py,sha256=c2FyUkbeuXfmsNxzcG11b0mD7KqCipyGq6SiFsFWaoM,1299
-infrahub/core/migrations/graph/m029_duplicates_cleanup.py,sha256=pXG1cmuEkBjDnPuuyugCJ-OsweOcm3GgorKcklwaAyU,28272
+infrahub/core/migrations/graph/m029_duplicates_cleanup.py,sha256=DpOwTMzkdi9-kha-UI6DzzJ_6qWen9kdCl_6j2IimV4,28278
 infrahub/core/migrations/graph/m030_illegal_edges.py,sha256=Saz7QmUqwuLiBtSBdQf54E1Bj3hz0k9KAOQ-pwPBH4g,2797
+infrahub/core/migrations/graph/m031_check_number_attributes.py,sha256=s3sVoKIkrZAMVZtWWH8baJW42UCAePp5nMUKy5FDSiM,4944
 infrahub/core/migrations/query/__init__.py,sha256=JoWOUWlV6IzwxWxObsfCnAAKUOHJkE7dZlOsfB64ZEo,876
 infrahub/core/migrations/query/attribute_add.py,sha256=LlhkIfVOR3TFSUJEV_4kU5JBKXsWwTsRiX1ySUPe4TU,3655
-infrahub/core/migrations/query/attribute_rename.py,sha256=crY7divyLxUAnPsPK7xy_09eEPzr2Bc4FxyEB43Mnrc,6889
+infrahub/core/migrations/query/attribute_rename.py,sha256=onb9Nanht1Tz47JgneAcFsuhqqvPS6dvI2nNjRupLLo,6892
 infrahub/core/migrations/query/delete_element_in_schema.py,sha256=QYw2LIpJGQXBPOTm6w9gFdCltZRd-V_YUh5l9HmGthg,7402
 infrahub/core/migrations/query/node_duplicate.py,sha256=CXkGoa6Dqg4njdg8GSNQUwoDDnHgiOn2O45zU1vN9lE,8527
 infrahub/core/migrations/query/relationship_duplicate.py,sha256=hjUFjNqhaFc2tEg79BXR2xDr_4Wdmu9fVF02cTEICTk,7319
@@ -201,7 +202,7 @@ infrahub/core/migrations/schema/placeholder_dummy.py,sha256=3T3dBwC_ZyehOJr2KRKF
 infrahub/core/migrations/schema/tasks.py,sha256=x6c_5N0pcQ_lTH5Vaqg2_MwlQ08I35BdX-8NhRDozBE,4165
 infrahub/core/migrations/shared.py,sha256=e7HEBijWhG46UN8ODjSmxvGeK8KAQ3Twnj2q1dvb2m0,6983
 infrahub/core/models.py,sha256=aqsqO2cP0MndeX6KZk4NEBmeIy6dE7Ob9UqsmjTIAtA,26149
-infrahub/core/node/__init__.py,sha256=2HJXakQ4FVwLmgpm6GBN_3rKzFrD7aGl2qQNydbGa9Q,41653
+infrahub/core/node/__init__.py,sha256=4of1tA26-EV8FOubg-rhBFU9wkJ0BBipePnnvx1vi_8,41738
 infrahub/core/node/base.py,sha256=BAowVRCK_WC50yXym1kCyUppJDJnrODGU5uoj1s0Yd4,2564
 infrahub/core/node/constraints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/core/node/constraints/attribute_uniqueness.py,sha256=9MThTmuqZ7RgK71ZZARlw1k1x3ARn1U67g2_Gatd6rE,2099
@@ -223,7 +224,7 @@ infrahub/core/protocols_base.py,sha256=cEi6giHtEUmaD0JWfDfWHJhEv_6wjaBA3oJRJCbvc
 infrahub/core/query/__init__.py,sha256=2qIMaODLwJ6pK6BUd5vODTlA15Aecf5I8_-J44UlCso,23089
 infrahub/core/query/attribute.py,sha256=DzwbElgTaZs6-nBYGmnDpBr9n0lmUPK3p7eyI30Snh8,11783
 infrahub/core/query/branch.py,sha256=Fqycgk8kzhmc1H_-gfiw3c-ZjNjAHw64XU7OQUkhDi0,4976
-infrahub/core/query/delete.py,sha256=_PL97nz-ybF0JqDSYlTPhIa4oCxwPiFerwd8Wjw-x-8,1918
+infrahub/core/query/delete.py,sha256=7tPP1qtNV6QGYtmgE1RKsuQ9oxENnMTVkttLvJ2PiKg,1927
 infrahub/core/query/diff.py,sha256=DOtPHIu45Yp8wvj8wp16me9E3AK7wVcVfzS2_LIZn2k,35952
 infrahub/core/query/ipam.py,sha256=0glfVQmcKqMvNyK4GU_zRl2O9pjl7JBeavyE8VC-De4,28234
 infrahub/core/query/node.py,sha256=yEDRmEsVUttO7CXNCXnRK0p98wmUHqwybavJS4gfOAo,65140
@@ -246,9 +247,9 @@ infrahub/core/relationship/constraints/profiles_kind.py,sha256=nEZPGtGcmelZ1Nb8E
 infrahub/core/relationship/model.py,sha256=CiSJn6uGBuDrdP4K1Kl0w_A6Lq_FLoNZH4ksssZnXMM,47004
 infrahub/core/root.py,sha256=8ZLSOtnmjQcrjqX2vxNO-AGopEUArmBPo_X5NeZBdP0,416
 infrahub/core/schema/__init__.py,sha256=Q8kzfcX7zhpHThTBoQMMjcXG95DdHcfOWT4poS0QJEY,4035
-infrahub/core/schema/attribute_parameters.py,sha256=S0vOpkq2rd6W2py8LIZ53MusUZDLELeBBRmCRU9ZmMw,5787
+infrahub/core/schema/attribute_parameters.py,sha256=-c8Gh8mHaQk6rZXvBz7VcicRQ8l1Ijmk3BxoxPFAQrc,6336
 infrahub/core/schema/attribute_schema.py,sha256=Da7h3254LHqW4MuIEY6a_kbzhzhyVlCXEKU7f7DtN4Q,10228
-infrahub/core/schema/basenode_schema.py,sha256=q-jytPJUaaOq9l6mGXOnAiE3HPIRQe7hSJijH_6mkNk,23376
+infrahub/core/schema/basenode_schema.py,sha256=9iCPN6IsDnNQ3qO5aQu_w8lgbZX-XgmQgaMMZcU0uIk,28182
 infrahub/core/schema/computed_attribute.py,sha256=9rznZJpGqX8fxLx0EguPmww8LoHsadMtQQUKaMoJPcI,1809
 infrahub/core/schema/constants.py,sha256=KtFrvwNckyKZSGIMD4XfxI5eFTZqBRiw54R7BE5h39Q,374
 infrahub/core/schema/definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -288,7 +289,7 @@ infrahub/core/schema/manager.py,sha256=UEOPCq6iz4H1xcz_Copztk_03PamggL-pjtANruY3
 infrahub/core/schema/node_schema.py,sha256=ld_Wrqf-RsoEUVz_lKE0tcSf5n_oYZYtRI0lTqtd63o,6150
 infrahub/core/schema/profile_schema.py,sha256=cOPSOt5KLgQ0nbqrAN_o33hY_pUtrKmiwSbY_YpVolI,1092
 infrahub/core/schema/relationship_schema.py,sha256=lVbyQKMP2jPZZwZGK6DBvXdXfEQEsQGMbZ2WYxOZKTw,8261
-infrahub/core/schema/schema_branch.py,sha256=TnEP58sNC451_Wh6yob6y0RQP6pjT00t_XVfA1mW6Nw,103141
+infrahub/core/schema/schema_branch.py,sha256=1NS6YuGXcxedUn8O8gnASo7P5bPs1Njs8FKIbbn3Qn4,103688
 infrahub/core/schema/schema_branch_computed.py,sha256=14UUsQJDLMHkYhg7QMqeLiTF3PO8c8rGa90ul3F2ZZo,10629
 infrahub/core/schema/template_schema.py,sha256=O-PBS9IRM4JX6PxeoyZKwqZ0u0SdQ2zxWMc01PJ2_EA,1084
 infrahub/core/task/__init__.py,sha256=Ied1NvKGJUDmff27z_-yWW8ArenHxGvSvQTaQyx1iHs,128
@@ -304,7 +305,7 @@ infrahub/core/validators/attribute/choices.py,sha256=a5rMF80FARUvOHjyL9VfpKoQ5oN
 infrahub/core/validators/attribute/enum.py,sha256=3PzkYUuzbt8NqRH4IP4cMjoDxzUvJzbNYC5ZpW5zKZQ,4161
 infrahub/core/validators/attribute/kind.py,sha256=knOToYe5NrAsEifnUC-ci05CMkQC3GB3Yeqf2Vi_ss4,4394
 infrahub/core/validators/attribute/length.py,sha256=H0nP2x2ynzcbMnc6neIje01wXipbt8Wr49iNTqIvWxI,4526
-infrahub/core/validators/attribute/min_max.py,sha256=dMBKcS8m-9o0tI2HoDI7TNTppOHlRNO_VKtuRTT_0C8,5476
+infrahub/core/validators/attribute/min_max.py,sha256=3x6iCJuVdt3vim6wPaF4Bar8RlR3FhJu3DYQiR2GZRI,5661
 infrahub/core/validators/attribute/number_pool.py,sha256=edWmpHbme9YqWxeZJ5V0dvTCyIqLFyej2YNTyM-Emq4,4709
 infrahub/core/validators/attribute/optional.py,sha256=qczSkKll4eKsutLgiVi_lCHgqa8ASmQbWOa00dXyxwg,3801
 infrahub/core/validators/attribute/regex.py,sha256=DENGbf3H5aS4dZZTeBQc39bJL8Ih70yITqXfpAR6etU,4201
@@ -435,7 +436,7 @@ infrahub/graphql/analyzer.py,sha256=TAWo4AWMr33MFjK3YcYBxXSjdwRHxU2HzpIuY9tTHqU,
 infrahub/graphql/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/graphql/api/dependencies.py,sha256=-NMUA_N4tWcVpS6ksCebAyza-JTmHqyYY_QZizgBR1c,1690
 infrahub/graphql/api/endpoints.py,sha256=wH9eO3CFT-eoSe1Y32BhU9mIf6smEnPeP3tAxZkdt4g,1510
-infrahub/graphql/app.py,sha256=4xKptosI6SXlBfQSNJHHGNrdCRAZQ2uMTpPPKY3_mzE,21004
+infrahub/graphql/app.py,sha256=zjlsZxkYRqye9yL0c1Y69QcBMr4mwgTu_PdVxyEUlG8,21135
 infrahub/graphql/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/graphql/auth/query_permission_checker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/graphql/auth/query_permission_checker/anonymous_checker.py,sha256=ibsmGyOelLJbN2Kfkmffv-5D79h7tRc1Fez5tauFY8w,1377
@@ -617,14 +618,14 @@ infrahub/services/adapters/http/__init__.py,sha256=SyMHID_aqH6bGLVZgDxQFqhJB7v_5
 infrahub/services/adapters/http/httpx.py,sha256=jUPbxnjYZzWxk7fnFt2D4eSbd4JmiAGZFPk0Tz-Eyo0,3652
 infrahub/services/adapters/message_bus/__init__.py,sha256=259um9F05MXukfbDvEyxY_iDDbPUmpkcYR8LWP_W_vY,3261
 infrahub/services/adapters/message_bus/local.py,sha256=wG4i-Bp6gW2bDaP0x6eMPtmmJYGbM5pavuaYrPNCBvI,2403
-infrahub/services/adapters/message_bus/nats.py,sha256=SPjwPZQHSdUbMoap0H38Ulbe1V58wP0W1TcHM7Ud9hI,12009
+infrahub/services/adapters/message_bus/nats.py,sha256=yHqSeXJL9BiHAP3JQ0S86fITSQUbe7TSJnQrq4r7Cu4,12141
 infrahub/services/adapters/message_bus/rabbitmq.py,sha256=OHEnQlZiY58S-5OksaxxvpltOZ-VJ-HXmY7fzdCDWKM,10975
 infrahub/services/adapters/workflow/__init__.py,sha256=NvZnbwK2Gp5CYaMEiiQVClNa5u_4QWVN4G2KDtfNZBI,1642
 infrahub/services/adapters/workflow/local.py,sha256=4W-WIrq2LSsn35K0ITmaJXCi_RAI4qsMp0iuQBBR26I,1850
 infrahub/services/adapters/workflow/worker.py,sha256=T3TaqvdG8dZtf1oQOgrTgRCaC6ycKAMeHieu0WQalp0,3097
 infrahub/services/component.py,sha256=uQvmhDtvPTfxYAdDkaQulbdIWh_kxrFAuhJooKufaac,5634
 infrahub/services/protocols.py,sha256=Ci4cnWK6L_R_5V2qAPnQpHtKXYS0hktp7CoJWIbcbc0,754
-infrahub/services/scheduler.py,sha256=LbuIyLsyYa5E8eWA6aXidGyhIIninGJ8ue5tO5qmiCA,3113
+infrahub/services/scheduler.py,sha256=TbKg74oBINScHJYtV8_lOuQR2RjxqS6IfU_slyjpNYw,3246
 infrahub/storage.py,sha256=bpK8m7GNlp5LHI0yXuFNZhhBVQpU7RZr7MeWCaAAPLk,1812
 infrahub/task_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/task_manager/constants.py,sha256=1t1BZRa8_y89gIDPNHzIbRKo63nHOP37-r5OvtHa56c,559
@@ -715,10 +716,10 @@ infrahub_sdk/generator.py,sha256=I00G7BdQohJFZ7wQru1SWcwO41gPbuQ3ZGEDVkLIn60,340
 infrahub_sdk/graphql.py,sha256=zrxRveg8-t0FbLtOEMDiiW0vqtBHc2qaFRkiHF9Bp6g,7019
 infrahub_sdk/groups.py,sha256=GL14ByW4GHrkqOLJ-_vGhu6bkYDxljqPtkErcQVehv0,711
 infrahub_sdk/jinja2.py,sha256=lTfV9E_P5gApaX6RW9M8U8oixQi-0H3U8wcs8fdGVaU,1150
-infrahub_sdk/node/__init__.py,sha256=sUTxgpA6gnnotu-_83Va_W8VNkOtEqijel_0PPiLqSQ,1212
+infrahub_sdk/node/__init__.py,sha256=clAUZ9lNVPFguelR5Sg9PzklAZruTKEm2xk-BaO68l8,1262
 infrahub_sdk/node/attribute.py,sha256=oEY1qxip8ETEx9Q33NhSQo013zmzrmpVIFzSkEMUY8M,4547
 infrahub_sdk/node/constants.py,sha256=TJO4uxvv7sc3FjoLdQdV7Ccymqz8AqxDenARst8awb4,775
-infrahub_sdk/node/node.py,sha256=cmLp-Xdv5xjgDDyJZwimLY3taDEJNvsSXGv_j3VlN1w,69219
+infrahub_sdk/node/node.py,sha256=ht6T2Td9CSRrdgCTIemVJmTqEuL4a9YC77zhElN8S0U,70138
 infrahub_sdk/node/parsers.py,sha256=sLDdT6neoYSZIjOCmq8Bgd0LK8FFoasjvJLuSz0whSU,543
 infrahub_sdk/node/property.py,sha256=8Mjkc8bp3kLlHyllwxDJlpJTuOA1ciMgY8mtH3dFVLM,728
 infrahub_sdk/node/related_node.py,sha256=41VTj4k1qojuyBZr0XiD7e2NESl8YwsU3fCmaarlrD0,9916
@@ -800,8 +801,8 @@ infrahub_testcontainers/models.py,sha256=ASYyvl7d_WQz_i7y8-3iab9hwwmCl3OCJavqVbe
 infrahub_testcontainers/performance_test.py,sha256=hvwiy6tc_lWniYqGkqfOXVGAmA_IV15VOZqbiD9ezno,6149
 infrahub_testcontainers/plugin.py,sha256=I3RuZQ0dARyKHuqCf0y1Yj731P2Mwf3BJUehRJKeWrs,5645
 infrahub_testcontainers/prometheus.yml,sha256=610xQEyj3xuVJMzPkC4m1fRnCrjGpiRBrXA2ytCLa54,599
-infrahub_server-1.3.0b6.dist-info/LICENSE.txt,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
-infrahub_server-1.3.0b6.dist-info/METADATA,sha256=9CZIMdsxhxRo1eavv6Jl1CuKHoqXPXkbNcNE4vG3aBE,8207
-infrahub_server-1.3.0b6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-infrahub_server-1.3.0b6.dist-info/entry_points.txt,sha256=UXIeFWDsrV-4IllNvUEd6KieYGzQfn9paga2YyABOQI,393
-infrahub_server-1.3.0b6.dist-info/RECORD,,
+infrahub_server-1.3.1.dist-info/LICENSE.txt,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
+infrahub_server-1.3.1.dist-info/METADATA,sha256=7WxSk_ctoonbM_snztUovCRsd9Lq-grShqcalwFQuEo,8205
+infrahub_server-1.3.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+infrahub_server-1.3.1.dist-info/entry_points.txt,sha256=UXIeFWDsrV-4IllNvUEd6KieYGzQfn9paga2YyABOQI,393
+infrahub_server-1.3.1.dist-info/RECORD,,