infrahub-server 1.3.0b6__tar.gz → 1.3.1__tar.gz

{infrahub_server-1.3.0b6 → infrahub_server-1.3.1}/PKG-INFO

@@ -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 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.1/backend/infrahub/core/graph/__init__.py

@@ -0,0 +1 @@
+GRAPH_VERSION = 31

{infrahub_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.1/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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_server-1.3.0b6 → infrahub_server-1.3.1}/backend/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(