cognite-neat 1.0.32__py3-none-any.whl → 1.0.34__py3-none-any.whl

cognite/neat/_data_model/_analysis.py

@@ -12,7 +12,7 @@ from cognite.neat._client.data_classes import SpaceStatisticsResponse
 from cognite.neat._data_model._constants import COGNITE_SPACES
 from cognite.neat._data_model._snapshot import SchemaSnapshot
 from cognite.neat._data_model.models.dms._constraints import RequiresConstraintDefinition
-from cognite.neat._data_model.models.dms._container import ContainerRequest
+from cognite.neat._data_model.models.dms._container import ContainerPropertyDefinition, ContainerRequest
 from cognite.neat._data_model.models.dms._data_types import DirectNodeRelation
 from cognite.neat._data_model.models.dms._limits import SchemaLimits
 from cognite.neat._data_model.models.dms._references import (
@@ -55,6 +55,21 @@ class RequiresChangeStatus(Enum):
     NO_MODIFIABLE_CONTAINERS = "no_modifiable_containers"  # All containers are immutable
 
 
+@dataclass
+class ResolvedReverseDirectRelation:
+    """Resolved context for a reverse direct relation, including container-level information."""
+
+    reverse_view_ref: ViewReference
+    reverse_property_id: str
+    direct_view_ref: ViewReference
+    through_property_id: str
+    direct_property: ViewCorePropertyRequest
+    container_ref: ContainerReference
+    container_property_id: str
+    container: ContainerRequest | None
+    container_property: ContainerPropertyDefinition | None
+
+
 @dataclass
 class RequiresChangesForView:
     """Result of computing requires constraint changes for a view."""
@@ -365,6 +380,83 @@ class ValidationResources:
 
         return bidirectional_connections
 
+    @staticmethod
+    def normalize_through_reference(
+        source_view_ref: ViewReference, through: ContainerDirectReference | ViewDirectReference
+    ) -> ViewDirectReference:
+        """Normalize through reference to ViewDirectReference for consistent processing.
+
+        When a reverse direct relation uses a ContainerDirectReference, we convert it to
+        a ViewDirectReference using the source view. This enables consistent handling
+        in validators regardless of how the 'through' was originally specified.
+        """
+        if isinstance(through, ContainerDirectReference):
+            return ViewDirectReference(source=source_view_ref, identifier=through.identifier)
+        return through
+
+    @cached_property
+    def resolved_reverse_direct_relations(self) -> list[ResolvedReverseDirectRelation]:
+        """Get all reverse direct relations with their resolved context.
+
+        This property traverses from reverse direct relation → source view → container,
+        resolving all references along the way.
+
+        Includes reverse direct relations where view-level resolution succeeded:
+        - The source view exists and can be expanded
+        - The through property exists in the source view
+        - The through property is a ViewCorePropertyRequest (direct relation)
+
+        Container-level fields may be None if resolution failed at that level.
+        """
+        result: list[ResolvedReverseDirectRelation] = []
+
+        for (target_view_ref, reverse_prop_id), (
+            source_view_ref,
+            through,
+        ) in self.reverse_to_direct_mapping.items():
+            through_normalized = self.normalize_through_reference(source_view_ref, through)
+
+            # Get expanded source view to include inherited properties
+            source_view_expanded = self.expand_view_properties(source_view_ref)
+            if not source_view_expanded or not source_view_expanded.properties:
+                continue
+
+            if through_normalized.identifier not in source_view_expanded.properties:
+                continue
+
+            source_property = source_view_expanded.properties[through_normalized.identifier]
+
+            # Must be a core property (direct relation)
+            if not isinstance(source_property, ViewCorePropertyRequest):
+                continue
+
+            container_ref = source_property.container
+            container_property_id = source_property.container_property_identifier
+
+            # Resolve container - may be None if missing
+            container = self.select_container(container_ref, container_property_id)
+
+            # Resolve container property - may be None if container missing or property missing
+            container_property = None
+            if container and container.properties:
+                container_property = container.properties.get(container_property_id)
+
+            result.append(
+                ResolvedReverseDirectRelation(
+                    reverse_view_ref=target_view_ref,
+                    reverse_property_id=reverse_prop_id,
+                    direct_view_ref=source_view_ref,
+                    through_property_id=through_normalized.identifier,
+                    direct_property=source_property,
+                    container_ref=container_ref,
+                    container_property_id=container_property_id,
+                    container=container,
+                    container_property=container_property,
+                )
+            )
+
+        return result
+
     @property
     def connection_end_node_types(self) -> dict[tuple[ViewReference, str], ViewReference | None]:
         """Get a mapping of view references to their corresponding ViewRequest objects."""

cognite/neat/_data_model/deployer/_differ_container.py

@@ -55,7 +55,7 @@ class ContainerDiffer(ItemDiffer[ContainerRequest]):
                 "constraints",
                 current.constraints,
                 new.constraints,
-                add_severity=SeverityType.SAFE,
+                add_severity=SeverityType.WARNING,
                 remove_severity=SeverityType.WARNING,
                 differ=ConstraintDiffer("constraints"),
             )

cognite/neat/_data_model/deployer/data_classes.py

@@ -12,7 +12,6 @@ from pydantic.alias_generators import to_camel
 from cognite.neat._data_model._snapshot import SchemaSnapshot
 from cognite.neat._data_model.models.dms import (
     BaseModelObject,
-    Constraint,
     ContainerConstraintReference,
     ContainerIndexReference,
     ContainerPropertyDefinition,
@@ -20,7 +19,6 @@ from cognite.neat._data_model.models.dms import (
     ContainerRequest,
     DataModelRequest,
     DataModelResource,
-    Index,
     T_DataModelResource,
     T_ResourceId,
     ViewRequest,
@@ -193,7 +191,9 @@ class ContainerDeploymentPlan(ResourceDeploymentPlan[ContainerReference, Contain
     def constraints_to_remove(self) -> dict[ContainerConstraintReference, RemovedField]:
         return self._get_fields_to_remove("constraints.", ContainerConstraintReference)
 
-    def _get_fields_to_remove(self, field_prefix: str, ref_cls: type) -> dict:
+    def _get_fields_to_remove(
+        self, field_prefix: str, ref_cls: type[ContainerIndexReference] | type[ContainerConstraintReference]
+    ) -> dict:
         items: dict = {}
         for resource_change in self.resources:
             for change in resource_change.changes:
@@ -202,7 +202,7 @@ class ContainerDeploymentPlan(ResourceDeploymentPlan[ContainerReference, Contain
                     items[
                         ref_cls(
                             space=resource_change.resource_id.space,
-                            external_id=resource_change.resource_id.external_id,
+                            container_external_id=resource_change.resource_id.external_id,
                             identifier=identifier,
                         )
                     ] = change
@@ -254,7 +254,7 @@ class ResourceDeploymentPlanList(UserList[ResourceDeploymentPlan]):
             updated_resource = resource.model_copy(update={"new_value": resource.current_value})
         elif resource.changes and resource.new_value is not None:
             # Find all field removals and update new_value accordingly.
-            removals = [change for change in resource.changes if isinstance(change, RemovedField)]
+            removals: list[RemovedField] = [change for change in resource.changes if isinstance(change, RemovedField)]
             addition_paths = {change.field_path for change in resource.changes if isinstance(change, AddedField)}
             if removals:
                 if resource.current_value is None:
@@ -271,6 +271,13 @@ class ResourceDeploymentPlanList(UserList[ResourceDeploymentPlan]):
                             for change in resource.changes
                             if not isinstance(change, RemovedField)
                             or (isinstance(change, RemovedField) and change.field_path in addition_paths)
+                            or (
+                                isinstance(change, RemovedField)
+                                and (
+                                    change.field_path.startswith("constraints.")
+                                    or change.field_path.startswith("indexes.")
+                                )
+                            )
                         ],
                     }
                 )
@@ -320,22 +327,14 @@ class ResourceDeploymentPlanList(UserList[ResourceDeploymentPlan]):
         resource: ContainerRequest, removals: list[RemovedField], addition_paths: set[str]
     ) -> DataModelResource:
         container_properties = resource.properties.copy()
-        indexes = (resource.indexes or {}).copy()
-        constraints = (resource.constraints or {}).copy()
         for removal in removals:
             if removal.field_path.startswith("properties."):
                 prop_key = removal.field_path.removeprefix("properties.")
                 container_properties[prop_key] = cast(ContainerPropertyDefinition, removal.current_value)
-            elif removal.field_path.startswith("indexes.") and removal.field_path not in addition_paths:
-                # Index was removed and not re-added, so we need to restore it.
-                index_key = removal.field_path.removeprefix("indexes.")
-                indexes[index_key] = cast(Index, removal.current_value)
-            elif removal.field_path.startswith("constraints.") and removal.field_path not in addition_paths:
-                # Constraint was removed and not re-added, so we need to restore it.
-                constraint_key = removal.field_path.removeprefix("constraints.")
-                constraints[constraint_key] = cast(Constraint, removal.current_value)
+            # Note: indexes and constraints are allowed to be removed in additive mode,
+            # so we don't restore them here unlike properties.
         return resource.model_copy(
-            update={"properties": container_properties, "indexes": indexes or None, "constraints": constraints or None},
+            update={"properties": container_properties},
             deep=True,
         )
 

cognite/neat/_data_model/deployer/deployer.py

@@ -185,16 +185,20 @@ class SchemaDeployer(OnSuccessResultProducer):
                 continue
             current_resource = current_resources[ref]
             diffs = differ.diff(current_resource, new_resource)
-            if (
-                isinstance(current_resource, ContainerRequest)
-                and isinstance(new_resource, ContainerRequest)
-                and self.options.modus_operandi == "additive"
-            ):
-                # In additive mode, changes to constraints and indexes require removal and re-adding
-                # In rebuild mode, all changes are forced via deletion and re-adding
+            if isinstance(current_resource, ContainerRequest) and isinstance(new_resource, ContainerRequest):
+                # CDF doesn't support in-place modification of constraints/indexes,
+                # so we transform changes to remove + add operations in both modes
                 diffs = self.remove_readd_modified_indexes_and_constraints(diffs, current_resource, new_resource)
+
+            warnings = self._generate_warnings_for_constraint_and_index_changes(diffs)
             resources.append(
-                ResourceChange(resource_id=ref, new_value=new_resource, current_value=current_resource, changes=diffs)
+                ResourceChange(
+                    resource_id=ref,
+                    new_value=new_resource,
+                    current_value=current_resource,
+                    changes=diffs,
+                    message=" ".join(warnings) if warnings else None,
+                )
             )
 
         return plan_type(endpoint=endpoint, resources=resources)
@@ -222,19 +226,19 @@ class SchemaDeployer(OnSuccessResultProducer):
                     raise RuntimeError("Bug in Neat. Malformed field path for constraint/index change.")
                 # Field type is either "constraints" or "indexes"
                 field_type, identifier, *_ = diff.field_path.split(".", maxsplit=2)
-                # Mark for removal
+                field_path = f"{field_type}.{identifier}"
                 modified_diffs.append(
                     RemovedField(
-                        field_path=f"{field_type}.{identifier}",
+                        field_path=field_path,
                         item_severity=SeverityType.WARNING,
                         current_value=getattr(current_resource, field_type)[identifier],
                     )
                 )
-                # Mark for addition
+                add_severity = SeverityType.WARNING if field_type == "constraints" else SeverityType.SAFE
                 modified_diffs.append(
                     AddedField(
-                        field_path=f"{field_type}.{identifier}",
-                        item_severity=SeverityType.SAFE,
+                        field_path=field_path,
+                        item_severity=add_severity,
                         new_value=getattr(new_resource, field_type)[identifier],
                     )
                 )
@@ -262,6 +266,29 @@ class SchemaDeployer(OnSuccessResultProducer):
             )
         return None
 
+    @classmethod
+    def _generate_warnings_for_constraint_and_index_changes(cls, diffs: list[FieldChange]) -> list[str]:
+        """Generate warning messages for constraint and index changes.
+
+        Args:
+            diffs: The list of field changes.
+
+        Returns:
+            A list of warning messages for field changes involving constraint and index changes.
+        """
+        warnings: list[str] = []
+        if any(isinstance(diff, AddedField) and diff.field_path.startswith("constraints.") for diff in diffs):
+            warnings.append(
+                "Adding constraints could cause ingestion failures if the data being ingested violates the constraint."
+            )
+        if any(
+            isinstance(diff, RemovedField)
+            and (diff.field_path.startswith("constraints.") or diff.field_path.startswith("indexes."))
+            for diff in diffs
+        ):
+            warnings.append("Removing constraints or indexes may affect query performance.")
+        return warnings
+
     def should_proceed_to_deploy(self, plan: Sequence[ResourceDeploymentPlan]) -> bool:
         max_severity_in_plan = SeverityType.max_severity(
             [change.severity for resource_plan in plan for change in resource_plan.resources],

cognite/neat/_data_model/models/dms/_http.py

@@ -6,6 +6,8 @@ from cognite.neat._utils.useful_types import ReferenceObject
 from ._container import ContainerRequest
 from ._data_model import DataModelRequest
 from ._references import (
+    ContainerConstraintReference,
+    ContainerIndexReference,
     ContainerReference,
     DataModelReference,
     SpaceReference,
@@ -18,7 +20,14 @@ DataModelResource: TypeAlias = SpaceRequest | DataModelRequest | ViewRequest | C
 
 T_DataModelResource = TypeVar("T_DataModelResource", bound=DataModelResource)
 
-ResourceId: TypeAlias = SpaceReference | DataModelReference | ViewReference | ContainerReference
+ResourceId: TypeAlias = (
+    SpaceReference
+    | DataModelReference
+    | ViewReference
+    | ContainerReference
+    | ContainerIndexReference
+    | ContainerConstraintReference
+)
 
 T_ResourceId = TypeVar("T_ResourceId", bound=ResourceId)
 

cognite/neat/_data_model/models/dms/_references.py

@@ -133,9 +133,43 @@ class ViewDirectReference(ReferenceObject):
         return f"{self.source!s}.{self.identifier}"
 
 
-class ContainerIndexReference(ContainerReference):
-    identifier: str
+class ContainerIndexReference(ReferenceObject):
+    """Reference to a container index for deletion API."""
+
+    space: str = Field(
+        description="Id of the space hosting the container.",
+        min_length=1,
+        max_length=43,
+        pattern=SPACE_FORMAT_PATTERN,
+    )
+    container_external_id: str = Field(
+        description="External-id of the container.",
+        min_length=1,
+        max_length=255,
+        pattern=DM_EXTERNAL_ID_PATTERN,
+        alias="containerExternalId",
+    )
+    identifier: str = Field(
+        description="Identifier of the index.",
+    )
 
 
-class ContainerConstraintReference(ContainerReference):
-    identifier: str
+class ContainerConstraintReference(ReferenceObject):
+    """Reference to a container constraint for deletion API."""
+
+    space: str = Field(
+        description="Id of the space hosting the container.",
+        min_length=1,
+        max_length=43,
+        pattern=SPACE_FORMAT_PATTERN,
+    )
+    container_external_id: str = Field(
+        description="External-id of the container.",
+        min_length=1,
+        max_length=255,
+        pattern=DM_EXTERNAL_ID_PATTERN,
+        alias="containerExternalId",
+    )
+    identifier: str = Field(
+        description="Identifier of the constraint.",
+    )

cognite/neat/_data_model/rules/dms/__init__.py

@@ -39,6 +39,7 @@ from ._limits import (
 from ._orchestrator import DmsDataModelRulesOrchestrator
 from ._performance import (
     MissingRequiresConstraint,
+    MissingReverseDirectRelationTargetIndex,
     SuboptimalRequiresConstraint,
     UnresolvableQueryPerformance,
 )
@@ -60,6 +61,7 @@ __all__ = [
     "ExternalContainerPropertyDoesNotExist",
     "ImplementedViewNotExisting",
     "MissingRequiresConstraint",
+    "MissingReverseDirectRelationTargetIndex",
     "RequiredContainerDoesNotExist",
     "RequiresConstraintCycle",
     "ReverseConnectionContainerMissing",

cognite/neat/_data_model/rules/dms/_connections.py

@@ -4,7 +4,6 @@ from dataclasses import dataclass
 
 from cognite.neat._data_model.models.dms._data_types import DirectNodeRelation
 from cognite.neat._data_model.models.dms._references import (
-    ContainerDirectReference,
     ViewDirectReference,
     ViewReference,
 )
@@ -119,15 +118,6 @@ class ReverseConnectionContext:
     source_view_ref: ViewReference
 
 
-def _normalize_through_reference(
-    source_view_ref: ViewReference, through: ContainerDirectReference | ViewDirectReference
-) -> ViewDirectReference:
-    """Normalize through reference to ViewDirectReference for consistent processing."""
-    if isinstance(through, ContainerDirectReference):
-        return ViewDirectReference(source=source_view_ref, identifier=through.identifier)
-    return through
-
-
 class ReverseConnectionSourceViewMissing(DataModelRule):
     """Validates that source view referenced in reverse connection exist.
 
@@ -153,7 +143,7 @@ class ReverseConnectionSourceViewMissing(DataModelRule):
             source_view_ref,
             through,
         ) in self.validation_resources.reverse_to_direct_mapping.items():
-            through = _normalize_through_reference(source_view_ref, through)
+            through = self.validation_resources.normalize_through_reference(source_view_ref, through)
             source_view = self.validation_resources.select_view(source_view_ref, through.identifier)
 
             if not source_view:
@@ -198,7 +188,7 @@ class ReverseConnectionSourcePropertyMissing(DataModelRule):
             source_view_ref,
             through,
         ) in self.validation_resources.reverse_to_direct_mapping.items():
-            through = _normalize_through_reference(source_view_ref, through)
+            through = self.validation_resources.normalize_through_reference(source_view_ref, through)
             source_view = self.validation_resources.select_view(source_view_ref, through.identifier)
 
             if not source_view:
@@ -250,7 +240,7 @@ class ReverseConnectionSourcePropertyWrongType(DataModelRule):
             source_view_ref,
             through,
         ) in self.validation_resources.reverse_to_direct_mapping.items():
-            through = _normalize_through_reference(source_view_ref, through)
+            through = self.validation_resources.normalize_through_reference(source_view_ref, through)
             source_view = self.validation_resources.select_view(source_view_ref, through.identifier)
 
             if not source_view:
@@ -301,40 +291,16 @@ class ReverseConnectionContainerMissing(DataModelRule):
     def validate(self) -> list[ConsistencyError]:
         errors: list[ConsistencyError] = []
 
-        for (target_view_ref, reverse_prop_name), (
-            source_view_ref,
-            through,
-        ) in self.validation_resources.reverse_to_direct_mapping.items():
-            through = _normalize_through_reference(source_view_ref, through)
-            source_view = self.validation_resources.select_view(source_view_ref, through.identifier)
-
-            if not source_view:
-                continue  # Handled by ReverseConnectionSourceViewMissing
-
-            if not (source_view_expanded := self.validation_resources.expand_view_properties(source_view_ref)):
-                raise RuntimeError(f"{type(self).__name__}: View {source_view_ref!s} not found. This is a bug in NEAT.")
-
-            if not source_view_expanded.properties or through.identifier not in source_view_expanded.properties:
-                continue  # Handled by ReverseConnectionSourcePropertyMissing
-
-            source_property = source_view_expanded.properties[through.identifier]
-
-            if not isinstance(source_property, ViewCorePropertyRequest):
-                continue  # Handled by ReverseConnectionSourcePropertyWrongType
-
-            container_ref = source_property.container
-            container_property_id = source_property.container_property_identifier
-
-            source_container = self.validation_resources.select_container(container_ref, container_property_id)
-            if not source_container:
+        for resolved in self.validation_resources.resolved_reverse_direct_relations:
+            if resolved.container is None:
                 errors.append(
                     ConsistencyError(
                         message=(
-                            f"Container {container_ref!s} is missing in both the data model and CDF. "
-                            f"This container is required by view {source_view_ref!s}"
-                            f" property '{through.identifier}', "
-                            f"which configures the reverse connection '{reverse_prop_name}'"
-                            f" in target view {target_view_ref!s}."
+                            f"Container {resolved.container_ref!s} is missing in both the data model and CDF. "
+                            f"This container is required by view {resolved.direct_view_ref!s}"
+                            f" property '{resolved.through_property_id}', "
+                            f"which configures the reverse connection '{resolved.reverse_property_id}'"
+                            f" in target view {resolved.reverse_view_ref!s}."
                         ),
                         fix="Define the missing container",
                         code=self.code,
@@ -366,43 +332,18 @@ class ReverseConnectionContainerPropertyMissing(DataModelRule):
     def validate(self) -> list[ConsistencyError]:
         errors: list[ConsistencyError] = []
 
-        for (target_view_ref, reverse_prop_name), (
-            source_view_ref,
-            through,
-        ) in self.validation_resources.reverse_to_direct_mapping.items():
-            through = _normalize_through_reference(source_view_ref, through)
-            source_view = self.validation_resources.select_view(source_view_ref, through.identifier)
-
-            if not source_view:
-                continue  # Handled by ReverseConnectionSourceViewMissing
-
-            if not (source_view_expanded := self.validation_resources.expand_view_properties(source_view_ref)):
-                raise RuntimeError(f"{type(self).__name__}: View {source_view_ref!s} not found. This is a bug in NEAT.")
-
-            if not source_view_expanded.properties or through.identifier not in source_view_expanded.properties:
-                continue  # Handled by ReverseConnectionSourcePropertyMissing
-
-            source_property = source_view_expanded.properties[through.identifier]
-
-            if not isinstance(source_property, ViewCorePropertyRequest):
-                continue  # Handled by ReverseConnectionSourcePropertyWrongType
-
-            container_ref = source_property.container
-            container_property_id = source_property.container_property_identifier
-
-            source_container = self.validation_resources.select_container(container_ref, container_property_id)
-            if not source_container:
-                continue  # Handled by ReverseConnectionContainerMissing
-
-            if not source_container.properties or container_property_id not in source_container.properties:
+        for resolved in self.validation_resources.resolved_reverse_direct_relations:
+            # Container must exist but property is missing
+            if resolved.container is not None and resolved.container_property is None:
                 errors.append(
                     ConsistencyError(
                         message=(
-                            f"Container {container_ref!s} is missing property '{container_property_id}'. "
-                            f"This property is required by the source view {source_view_ref!s}"
-                            f" property '{through.identifier}', "
-                            f"which configures the reverse connection '{reverse_prop_name}' "
-                            f"in target view {target_view_ref!s}."
+                            f"Container {resolved.container_ref!s} is missing "
+                            f"property '{resolved.container_property_id}'. "
+                            f"This property is required by the source view {resolved.direct_view_ref!s}"
+                            f" property '{resolved.through_property_id}', "
+                            f"which configures the reverse connection '{resolved.reverse_property_id}' "
+                            f"in target view {resolved.reverse_view_ref!s}."
                         ),
                         fix="Add the missing property to the container",
                         code=self.code,
@@ -434,46 +375,21 @@ class ReverseConnectionContainerPropertyWrongType(DataModelRule):
     def validate(self) -> list[ConsistencyError]:
         errors: list[ConsistencyError] = []
 
-        for (target_view_ref, reverse_prop_name), (
-            source_view_ref,
-            through,
-        ) in self.validation_resources.reverse_to_direct_mapping.items():
-            through = _normalize_through_reference(source_view_ref, through)
-            source_view = self.validation_resources.select_view(source_view_ref, through.identifier)
-
-            if not source_view:
-                continue  # Handled by ReverseConnectionSourceViewMissing
-
-            if not (source_view_expanded := self.validation_resources.expand_view_properties(source_view_ref)):
-                raise RuntimeError(f"{type(self).__name__}: View {source_view_ref!s} not found. This is a bug in NEAT.")
-
-            if not source_view_expanded.properties or through.identifier not in source_view_expanded.properties:
-                continue  # Handled by ReverseConnectionSourcePropertyMissing
-
-            source_property = source_view_expanded.properties[through.identifier]
-
-            if not isinstance(source_property, ViewCorePropertyRequest):
-                continue  # Handled by ReverseConnectionSourcePropertyWrongType
-
-            container_ref = source_property.container
-            container_property_id = source_property.container_property_identifier
-
-            source_container = self.validation_resources.select_container(container_ref, container_property_id)
-            if not source_container or not source_container.properties:
-                continue  # Handled by other validators
-
-            container_property = source_container.properties.get(container_property_id)
-            if not container_property:
+        for resolved in self.validation_resources.resolved_reverse_direct_relations:
+            if not resolved.container_property:
                 continue  # Handled by ReverseConnectionContainerPropertyMissing
 
-            if not isinstance(container_property.type, DirectNodeRelation):
+            if not isinstance(resolved.container_property.type, DirectNodeRelation):
                 errors.append(
                     ConsistencyError(
                         message=(
-                            f"Container property '{container_property_id}' in container {container_ref!s} "
-                            f"must be a direct connection, but found type '{container_property.type!s}'. "
-                            f"This property is used by source view {source_view_ref!s} property '{through.identifier}' "
-                            f"to configure reverse connection '{reverse_prop_name}' in target view {target_view_ref!s}."
+                            f"Container property '{resolved.container_property_id}' "
+                            f"in container {resolved.container_ref!s} "
+                            f"must be a direct connection, but found type '{resolved.container_property.type!s}'. "
+                            f"This property is used by source view {resolved.direct_view_ref!s} "
+                            f"property '{resolved.through_property_id}' "
+                            f"to configure reverse connection '{resolved.reverse_property_id}' "
+                            f"in target view {resolved.reverse_view_ref!s}."
                         ),
                         fix="Change container property type to be a direct connection",
                         code=self.code,
@@ -504,39 +420,17 @@ class ReverseConnectionTargetMissing(DataModelRule):
     def validate(self) -> list[Recommendation]:
         recommendations: list[Recommendation] = []
 
-        for (target_view_ref, reverse_prop_name), (
-            source_view_ref,
-            through,
-        ) in self.validation_resources.reverse_to_direct_mapping.items():
-            through = _normalize_through_reference(source_view_ref, through)
-            source_view = self.validation_resources.select_view(source_view_ref, through.identifier)
-
-            if not source_view:
-                continue  # Handled by ReverseConnectionSourceViewMissing
-
-            if not (source_view_expanded := self.validation_resources.expand_view_properties(source_view_ref)):
-                raise RuntimeError(f"{type(self).__name__}: View {source_view_ref!s} not found. This is a bug in NEAT.")
-
-            if not source_view_expanded.properties or through.identifier not in source_view_expanded.properties:
-                continue  # Handled by ReverseConnectionSourcePropertyMissing
-
-            source_property = source_view_expanded.properties[through.identifier]
-
-            if not isinstance(source_property, ViewCorePropertyRequest):
-                continue  # Handled by ReverseConnectionSourcePropertyWrongType
-
-            actual_target_view = source_property.source
-
-            if not actual_target_view:
+        for resolved in self.validation_resources.resolved_reverse_direct_relations:
+            if not resolved.direct_property.source:
                 recommendations.append(
                     Recommendation(
                         message=(
-                            f"Source view {source_view_ref!s} property '{through.identifier}' "
+                            f"Source view {resolved.direct_view_ref!s} property '{resolved.through_property_id}' "
                             f"has no target view specified (value type is None). "
-                            f"This property is used for reverse connection '{reverse_prop_name}' "
-                            f"in target view {target_view_ref!s}. "
+                            f"This property is used for reverse connection '{resolved.reverse_property_id}' "
+                            f"in target view {resolved.reverse_view_ref!s}. "
                             f"While this works as a hack for multi-value relations in CDF Search, "
-                            f"it's recommended to explicitly define the target view as {target_view_ref!s}."
+                            f"it's recommended to explicitly define the target view as {resolved.reverse_view_ref!s}."
                         ),
                         fix="Set the property's value type to the target view for better clarity",
                         code=self.code,
@@ -568,41 +462,24 @@ class ReverseConnectionPointsToAncestor(DataModelRule):
     def validate(self) -> list[Recommendation]:
         recommendations: list[Recommendation] = []
 
-        for (target_view_ref, reverse_prop_name), (
-            source_view_ref,
-            through,
-        ) in self.validation_resources.reverse_to_direct_mapping.items():
-            through = _normalize_through_reference(source_view_ref, through)
-            source_view = self.validation_resources.select_view(source_view_ref, through.identifier)
-
-            if not source_view:
-                continue  # Handled by ReverseConnectionSourceViewMissing
-
-            if not (source_view_expanded := self.validation_resources.expand_view_properties(source_view_ref)):
-                raise RuntimeError(f"{type(self).__name__}: View {source_view_ref!s} not found. This is a bug in NEAT.")
-
-            if not source_view_expanded.properties or through.identifier not in source_view_expanded.properties:
-                continue  # Handled by ReverseConnectionSourcePropertyMissing
-
-            source_property = source_view_expanded.properties[through.identifier]
-
-            if not isinstance(source_property, ViewCorePropertyRequest):
-                continue  # Handled by other validators
-
-            actual_target_view = source_property.source
+        for resolved in self.validation_resources.resolved_reverse_direct_relations:
+            actual_target_view = resolved.direct_property.source
 
             if not actual_target_view:
                 continue  # Handled by ReverseConnectionTargetMissing
 
-            if self.validation_resources.is_ancestor(target_view_ref, actual_target_view):
+            if self.validation_resources.is_ancestor(resolved.reverse_view_ref, actual_target_view):
                 recommendations.append(
                     Recommendation(
                         message=(
-                            f"The direct connection property '{through.identifier}' in view {source_view_ref!s} "
-                            f"configures the reverse connection '{reverse_prop_name}' in {target_view_ref!s}. "
-                            f"Therefore, it is expected that '{through.identifier}' points to {target_view_ref!s}. "
+                            f"The direct connection property '{resolved.through_property_id}' "
+                            f"in view {resolved.direct_view_ref!s} "
+                            f"configures the reverse connection '{resolved.reverse_property_id}' "
+                            f"in {resolved.reverse_view_ref!s}. "
+                            f"Therefore, it is expected that '{resolved.through_property_id}' "
+                            f"points to {resolved.reverse_view_ref!s}. "
                             f"However, it currently points to {actual_target_view!s}, which is an ancestor of "
-                            f"{target_view_ref!s}. "
+                            f"{resolved.reverse_view_ref!s}. "
                             "While this will allow for model to be valid, it can be a source of confusion and mistakes."
                         ),
                         fix="Update the direct connection property to point to the target view instead of its ancestor",
@@ -635,42 +512,24 @@ class ReverseConnectionTargetMismatch(DataModelRule):
     def validate(self) -> list[Recommendation]:
         recommendations: list[Recommendation] = []
 
-        for (target_view_ref, reverse_prop_name), (
-            source_view_ref,
-            through,
-        ) in self.validation_resources.reverse_to_direct_mapping.items():
-            through = _normalize_through_reference(source_view_ref, through)
-            source_view = self.validation_resources.select_view(source_view_ref, through.identifier)
-
-            if not source_view:
-                continue  # Handled by ReverseConnectionSourceViewMissing
-
-            if not (source_view_expanded := self.validation_resources.expand_view_properties(source_view_ref)):
-                raise RuntimeError(f"{type(self).__name__}: View {source_view_ref!s} not found. This is a bug in NEAT.")
-
-            if not source_view_expanded.properties or through.identifier not in source_view_expanded.properties:
-                continue  # Handled by ReverseConnectionSourcePropertyMissing
-
-            source_property = source_view_expanded.properties[through.identifier]
-
-            if not isinstance(source_property, ViewCorePropertyRequest):
-                continue  # Handled by other validators
-
-            actual_target_view = source_property.source
+        for resolved in self.validation_resources.resolved_reverse_direct_relations:
+            actual_target_view = resolved.direct_property.source
 
             if not actual_target_view:
                 continue  # Handled by ReverseConnectionTargetMissing
 
-            if self.validation_resources.is_ancestor(target_view_ref, actual_target_view):
-                continue  # Handled by ReverseConnectionTargetAncestor
+            if self.validation_resources.is_ancestor(resolved.reverse_view_ref, actual_target_view):
+                continue  # Handled by ReverseConnectionPointsToAncestor
 
-            if actual_target_view != target_view_ref:
+            if actual_target_view != resolved.reverse_view_ref:
                 recommendations.append(
                     Recommendation(
                         message=(
-                            f"The reverse connection '{reverse_prop_name}' in view {target_view_ref!s} "
-                            f"expects its corresponding direct connection in view {source_view_ref!s} "
-                            f"(property '{through.identifier}') to point back to {target_view_ref!s}, "
+                            f"The reverse connection '{resolved.reverse_property_id}' "
+                            f"in view {resolved.reverse_view_ref!s} "
+                            f"expects its corresponding direct connection in view {resolved.direct_view_ref!s} "
+                            f"(property '{resolved.through_property_id}') "
+                            f"to point back to {resolved.reverse_view_ref!s}, "
                             f"but it actually points to {actual_target_view!s}."
                         ),
                         fix="Update the direct connection property to point back to the correct target view",

cognite/neat/_data_model/rules/dms/_performance.py

@@ -2,6 +2,8 @@
 
 from cognite.neat._data_model._analysis import RequiresChangeStatus
 from cognite.neat._data_model._constants import COGNITE_SPACES
+from cognite.neat._data_model.models.dms._data_types import DirectNodeRelation
+from cognite.neat._data_model.models.dms._indexes import BtreeIndex
 from cognite.neat._data_model.rules.dms._base import DataModelRule
 from cognite.neat._issues import Recommendation
 
@@ -193,3 +195,76 @@ class UnresolvableQueryPerformance(DataModelRule):
                 )
 
         return recommendations
+
+
+class MissingReverseDirectRelationTargetIndex(DataModelRule):
+    """
+    Recommends adding a cursorable index on direct relation properties that are
+    targets of reverse direct relations for query performance.
+
+    ## What it does
+    Identifies direct relation properties that are referenced by reverse direct relations
+    but lack a cursorable B-tree index. When querying through a reverse direct relation,
+    CDF needs to look up nodes that have the direct relation pointing to the
+    source nodes. Without an index, this requires scanning many nodes inefficiently.
+
+    ## Why is this important?
+    Traversing a reverse direct relation (inwards direction) requires an index on the
+    target direct relation property. Without this index, queries will be inefficient,
+    potentially leading to timeouts over time, as they won't scale well with data volume.
+
+    The exception is when the target direct relation is a list property. In that case,
+    this validator will not flag them, as reverse direct relations targeting lists of
+    direct relations needs to be traversed using the `instances/search` endpoint instead,
+    which does not directly benefit from adding indexes to container properties.
+
+    ## Example
+    View `WindFarm` has a reverse property `turbines` through `WindTurbine.windFarm`.
+    Container `WindTurbine` should have a cursorable B-tree index on the `windFarm`
+    property to enable efficient traversal from WindFarm to its turbines.
+    """
+
+    code = f"{BASE_CODE}-004"
+    issue_type = Recommendation
+    alpha = True
+
+    def validate(self) -> list[Recommendation]:
+        recommendations: list[Recommendation] = []
+
+        for resolved in self.validation_resources.resolved_reverse_direct_relations:
+            # Skip if container or container property couldn't be resolved
+            if not resolved.container or not resolved.container_property:
+                continue
+
+            # Must be a DirectNodeRelation type (other types handled by ReverseConnectionContainerPropertyWrongType)
+            if not isinstance(resolved.container_property.type, DirectNodeRelation):
+                continue
+
+            # Skip if this is a list direct relation - indexes are not supported for list properties
+            if resolved.container_property.type.list:
+                continue
+
+            # Skip if there's already a cursorable B-tree index on this property
+            if resolved.container.indexes and any(
+                isinstance(index, BtreeIndex)
+                and index.cursorable
+                and resolved.container_property_id in index.properties
+                for index in resolved.container.indexes.values()
+            ):
+                continue
+
+            recommendations.append(
+                Recommendation(
+                    message=(
+                        f"View '{resolved.reverse_view_ref!s}' has a reverse direct relation "
+                        f"'{resolved.reverse_property_id}' that points to container "
+                        f"'{resolved.container_ref!s}' property '{resolved.container_property_id}'. "
+                        f"Add a cursorable B-tree index on this target container property "
+                        f"to enable efficient query traversal."
+                    ),
+                    fix="Add a cursorable B-tree index on the target direct relation property",
+                    code=self.code,
+                )
+            )
+
+        return recommendations

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "1.0.32"
+__version__ = "1.0.34"
 __engine__ = "^2.0.4"

{cognite_neat-1.0.32.dist-info → cognite_neat-1.0.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 1.0.32
+Version: 1.0.34
 Summary: Knowledge graph transformation
 Author: Nikola Vasiljevic, Anders Albert
 Author-email: Nikola Vasiljevic <nikola.vasiljevic@cognite.com>, Anders Albert <anders.albert@cognite.com>

{cognite_neat-1.0.32.dist-info → cognite_neat-1.0.34.dist-info}/RECORD

@@ -17,19 +17,19 @@ cognite/neat/_client/statistics_api.py,sha256=3KNVsD2OV-EDFb1eqIrCXfYwjvyCDO80bP
 cognite/neat/_client/views_api.py,sha256=YMaw7IaxU4gmixpd_t1u9JK9BHfNerf5DMNinGPCAa0,3692
 cognite/neat/_config.py,sha256=IJS_R-86M4SLxdo644LZ0dE9h0jg2XBL1A4QKWJj0TQ,10160
 cognite/neat/_data_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite/neat/_data_model/_analysis.py,sha256=sZO2NATkyuSzlo3uRgXJ6B3btKWkwblNos7SXT6LHLc,43779
+cognite/neat/_data_model/_analysis.py,sha256=KHN6QgRIjndkQJO_m4pX9_yqRsA5LZzvUgCOgM8ZZBA,47799
 cognite/neat/_data_model/_constants.py,sha256=pPDtRwBsOq80IkYXRJ0XaRfFOb7CPvxz81IQzcPgAuc,1889
 cognite/neat/_data_model/_identifiers.py,sha256=lDLvMvYDgRNFgk5GmxWzOUunG7M3synAciNjzJI0m_o,1913
 cognite/neat/_data_model/_shared.py,sha256=H0gFqa8tKFNWuvdat5jL6OwySjCw3aQkLPY3wtb9Wrw,1302
 cognite/neat/_data_model/_snapshot.py,sha256=JBaKmL0Tmprz59SZ1JeB49BPMB8Hqa-OAOt0Bai8cw4,6305
 cognite/neat/_data_model/deployer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/_data_model/deployer/_differ.py,sha256=1ircRBCoaFooSzMTmTZBTORHeAhDa8YtDEnVwBo6TUI,4742
-cognite/neat/_data_model/deployer/_differ_container.py,sha256=mcy7PhUOfnvAxnZWNoeNRmiXa8ovIn0W6YoqfzVYyiQ,14665
+cognite/neat/_data_model/deployer/_differ_container.py,sha256=AGD4emPRCEdFGFN4rJzLn8JhOjbTrHtYVtXr8q9vSPY,14668
 cognite/neat/_data_model/deployer/_differ_data_model.py,sha256=iA7Xp-7NRvzZJXLLpJaLebkKKpv_VCBKPX6f-RU9wBk,1864
 cognite/neat/_data_model/deployer/_differ_space.py,sha256=J_AaqiseLpwQsOkKc7gmho4U2oSWAGVeEdQNepZiWw0,343
 cognite/neat/_data_model/deployer/_differ_view.py,sha256=g1xHwsoxFUaTOTtQa19nntKF3rxFzc2FxpKKFAUN_NE,11412
-cognite/neat/_data_model/deployer/data_classes.py,sha256=cq86u7wuKCcvH-A_cGI_gWzlQCTIG6mrXG2MahdiGco,27299
-cognite/neat/_data_model/deployer/deployer.py,sha256=lEdTh4jOwTxLkSEx-SlcnXUZyPZCUtIzop1zhAe2s44,19681
+cognite/neat/_data_model/deployer/data_classes.py,sha256=HhByk8m7SbEPAKkUNDF7koRtQPHhILpVXN3f83icfKs,27028
+cognite/neat/_data_model/deployer/deployer.py,sha256=CaD_N6fy2wk6TfrAyRssC65vf_FRvl3yfLQXtGUFdCo,20870
 cognite/neat/_data_model/exporters/__init__.py,sha256=AskjmB_0Vqib4kN84bWt8-M8nO42QypFf-l-E8oA5W8,482
 cognite/neat/_data_model/exporters/_api_exporter.py,sha256=nBDHx9dGbaje0T4IEQv0Kulk2Yu7FkPXgXK_MgLbE50,4948
 cognite/neat/_data_model/exporters/_base.py,sha256=rG_qAU5i5Hh5hUMep2UmDFFZID4x3LEenL6Z5C6N8GQ,646
@@ -59,10 +59,10 @@ cognite/neat/_data_model/models/dms/_constraints.py,sha256=cyGgDlByXAuSMWJg7Oc25
 cognite/neat/_data_model/models/dms/_container.py,sha256=wtQbNUwtpymltT1jav8wD4kIfjaIYnvhhz1KS0ffAbo,6044
 cognite/neat/_data_model/models/dms/_data_model.py,sha256=tq_JGNN-1JxG46bhBhunZiLedklYbDXFEfINB0x3a3Q,3219
 cognite/neat/_data_model/models/dms/_data_types.py,sha256=FMt_d5aJD-o3s9VQWyyCVlHk7D_p3RlSNXBP1OACPs4,6424
-cognite/neat/_data_model/models/dms/_http.py,sha256=YIRRowqkphFAYkx3foTeLyPMe9fNnmzhUCBDXe0u9Kk,926
+cognite/neat/_data_model/models/dms/_http.py,sha256=FxOWb0qDKOc7urVXp8J0xl8gRV_psHWwfQLyAS8sLeM,1074
 cognite/neat/_data_model/models/dms/_indexes.py,sha256=ZtXe8ABuRcsAwRIZ9FCanS3uwZHpkOAhvDvjSXtx_Fs,900
 cognite/neat/_data_model/models/dms/_limits.py,sha256=-vwRutprJ7rPXLleSxCh_satR9AqRAvEMig5wSVBEXg,3596
-cognite/neat/_data_model/models/dms/_references.py,sha256=Mx_nxfvOrvAx7nvebhhbFw6eRm3nHqeFW5P5AqADUlM,3890
+cognite/neat/_data_model/models/dms/_references.py,sha256=2l9ZD4ZCj-gzc0QB-rV4iVm8-fsnczziEOn2mZTaEfE,4934
 cognite/neat/_data_model/models/dms/_schema.py,sha256=2JFLcm52smzPdtZ69Lf02UbYAD8I_hpRbI7ZAzdxJJs,641
 cognite/neat/_data_model/models/dms/_space.py,sha256=mj6gID4vcAGsHNtgfXm4_4FMOQbUOkMd3HaYEdy07XM,1895
 cognite/neat/_data_model/models/dms/_types.py,sha256=5-cgC53AG186OZUqkltv7pMjcGNLuH7Etbn8IUcgk1c,447
@@ -81,15 +81,15 @@ cognite/neat/_data_model/rules/cdf/__init__.py,sha256=Bn9_DkkO4OPUYh0CsM3Pf1fD_U
 cognite/neat/_data_model/rules/cdf/_base.py,sha256=59fqmFi_Gvzx3swLsIyc2ACkHAzKAKiqNlwwGnW5bDg,128
 cognite/neat/_data_model/rules/cdf/_orchestrator.py,sha256=egzcYUuFDd8Vm7neBpZFofqZBfYjuElAjYwJWAScutc,2250
 cognite/neat/_data_model/rules/cdf/_spaces.py,sha256=Lsfrp2e7yzgRimkD0qynJ5M2S7Zwzplfg_4Pim1voHk,1605
-cognite/neat/_data_model/rules/dms/__init__.py,sha256=ThCvtSCPzEhciJNnzBKDoTWMimw5U74MbfUwoF6e7F8,2950
+cognite/neat/_data_model/rules/dms/__init__.py,sha256=LiZNGYClXHrgSbG0K6tk8nYN2B0VX3JlKn_minyCiI8,3042
 cognite/neat/_data_model/rules/dms/_ai_readiness.py,sha256=1KvOk3Q8aQkE8G6oHml7O-SHiTeIBNmyKPWr3hPcCCw,16133
 cognite/neat/_data_model/rules/dms/_base.py,sha256=BnzBELon389lEXJi7dlb9t3SPjiXgVquiI445I7-APU,134
-cognite/neat/_data_model/rules/dms/_connections.py,sha256=vi_cJp5S4MpfX-jA1eqZClnHdKznkQMDvZk9iIj42mM,30343
+cognite/neat/_data_model/rules/dms/_connections.py,sha256=yvlcb_-lBILZpMZ9Zcp8R1sC-G6DhCdyqjffwOnlmUI,23416
 cognite/neat/_data_model/rules/dms/_consistency.py,sha256=7u-EDQk08eV4CJoY5nRbrYXs2cbkQkH6TQCcPOyUGI8,2425
 cognite/neat/_data_model/rules/dms/_containers.py,sha256=eb0eLy13n7OozKp2vrE_oXqD6m2uyX-9fhoCqU_gJqc,10542
 cognite/neat/_data_model/rules/dms/_limits.py,sha256=L6dAsLWVBEpfVFZgw3SvJk1PnEGf4lhJ3SOXjDUsY2Q,14820
 cognite/neat/_data_model/rules/dms/_orchestrator.py,sha256=tTXxLH1yThAeTW_GdDeD-to19faK72c_z8QL9kzgGJc,3069
-cognite/neat/_data_model/rules/dms/_performance.py,sha256=7LTs1E86xA-hvL4fqiIhAHcgIeohwb1pODzh3o6tuzQ,8601
+cognite/neat/_data_model/rules/dms/_performance.py,sha256=Tp7D5cCEOqjfst9tLKuA9X2F9f4lQLJHEiGojm-rQUI,12229
 cognite/neat/_data_model/rules/dms/_views.py,sha256=Tp4VW2512eGSGgeMRoUFh7hqK2vsZD8ryN_EJ7QJoEg,6335
 cognite/neat/_exceptions.py,sha256=hOjPL1vFNNAZzqAHFB9l9ek-XJEBKcqiaPk0onwLPns,2540
 cognite/neat/_issues.py,sha256=wH1mnkrpBsHUkQMGUHFLUIQWQlfJ_qMfdF7q0d9wNhY,1871
@@ -333,9 +333,9 @@ cognite/neat/_v0/session/_template.py,sha256=BNcvrW5y7LWzRM1XFxZkfR1Nc7e8UgjBClH
 cognite/neat/_v0/session/_to.py,sha256=AnsRSDDdfFyYwSgi0Z-904X7WdLtPfLlR0x1xsu_jAo,19447
 cognite/neat/_v0/session/_wizard.py,sha256=baPJgXAAF3d1bn4nbIzon1gWfJOeS5T43UXRDJEnD3c,1490
 cognite/neat/_v0/session/exceptions.py,sha256=jv52D-SjxGfgqaHR8vnpzo0SOJETIuwbyffSWAxSDJw,3495
-cognite/neat/_version.py,sha256=yW-UQpMiFBxk9CkqtMOupox-RheZyNu-70iZhHFcuEI,45
+cognite/neat/_version.py,sha256=fdWCQSFXmDmKK6idWGSpmri7JwQy0lv0A26K5YheUxQ,45
 cognite/neat/legacy.py,sha256=DMFeLCSBLT2enk-nm1KfX1rKR2DQDpxY-w6ThY0y9c8,421
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite_neat-1.0.32.dist-info/WHEEL,sha256=e_m4S054HL0hyR3CpOk-b7Q7fDX6BuFkgL5OjAExXas,80
-cognite_neat-1.0.32.dist-info/METADATA,sha256=7ZoBFgcFA7TUMrocwakJBvfuWt1Amux3_mqWNtqEMAE,6872
-cognite_neat-1.0.32.dist-info/RECORD,,
+cognite_neat-1.0.34.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+cognite_neat-1.0.34.dist-info/METADATA,sha256=0_I8k0cZIjhgDYicQb2oUsbesqbLDLr4-MzFGAC--3w,6872
+cognite_neat-1.0.34.dist-info/RECORD,,

{cognite_neat-1.0.32.dist-info → cognite_neat-1.0.34.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.27
+Generator: uv 0.9.28
 Root-Is-Purelib: true
 Tag: py3-none-any