cognite-neat 0.77.0__tar.gz → 0.77.2__tar.gz

{cognite_neat-0.77.0 → cognite_neat-0.77.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-neat
-Version: 0.77.0
+Version: 0.77.2
 Summary: Knowledge graph transformation
 Home-page: https://cognite-neat.readthedocs-hosted.com/
 License: Apache-2.0

cognite_neat-0.77.2/cognite/neat/_version.py

@@ -0,0 +1 @@
+__version__ = "0.77.2"

{cognite_neat-0.77.0 → cognite_neat-0.77.2}/cognite/neat/rules/exporters/_rules2dms.py

@@ -5,7 +5,14 @@ from typing import Literal, TypeAlias, cast
 
 from cognite.client import CogniteClient
 from cognite.client.data_classes._base import CogniteResource, CogniteResourceList
-from cognite.client.data_classes.data_modeling import DataModelApply, DataModelApplyList, DataModelId
+from cognite.client.data_classes.data_modeling import (
+    ContainerApplyList,
+    DataModelApply,
+    DataModelApplyList,
+    DataModelId,
+    SpaceApplyList,
+    ViewApplyList,
+)
 from cognite.client.exceptions import CogniteAPIError
 
 from cognite.neat.rules import issues
@@ -264,11 +271,11 @@ class DMSExporter(CDFExporter[DMSSchema]):
         schema = self.export(rules)
         to_export: list[tuple[CogniteResourceList, ResourceLoader]] = []
         if self.export_components.intersection({"all", "spaces"}):
-            to_export.append((schema.spaces, SpaceLoader(client)))
+            to_export.append((SpaceApplyList(schema.spaces.values()), SpaceLoader(client)))
         if self.export_components.intersection({"all", "containers"}):
-            to_export.append((schema.containers, ContainerLoader(client)))
+            to_export.append((ContainerApplyList(schema.containers.values()), ContainerLoader(client)))
         if self.export_components.intersection({"all", "views"}):
-            to_export.append((schema.views, ViewLoader(client, self.existing_handling)))
+            to_export.append((ViewApplyList(schema.views.values()), ViewLoader(client, self.existing_handling)))
         if self.export_components.intersection({"all", "data_models"}):
             to_export.append((DataModelApplyList([schema.data_model]), DataModelLoader(client)))
         if isinstance(schema, PipelineSchema):

{cognite_neat-0.77.0 → cognite_neat-0.77.2}/cognite/neat/rules/importers/_dms2rules.py

@@ -60,11 +60,9 @@ class DMSImporter(BaseImporter):
         self.metadata = metadata
         self.ref_metadata = ref_metadata
         self.issue_list = IssueList(read_issues)
-        self._all_containers_by_id = {container.as_id(): container for container in schema.containers}
+        self._all_containers_by_id = schema.containers.copy()
         if self.root_schema.reference:
-            self._all_containers_by_id.update(
-                {container.as_id(): container for container in self.root_schema.reference.containers}
-            )
+            self._all_containers_by_id.update(self.root_schema.reference.containers)
 
     @classmethod
     def from_data_model_id(
@@ -200,7 +198,7 @@ class DMSImporter(BaseImporter):
                     **self._create_rule_components(
                         ref_model,
                         ref_schema,
-                        self.ref_metadata or self._create_default_metadata(ref_schema.views),
+                        self.ref_metadata or self._create_default_metadata(list(ref_schema.views.values())),
                         DataModelType.enterprise,
                     )
                 )
@@ -228,8 +226,7 @@ class DMSImporter(BaseImporter):
         schema_completeness: SchemaCompleteness | None = None,
     ) -> dict[str, Any]:
         properties = SheetList[DMSProperty]()
-        for view in schema.views:
-            view_id = view.as_id()
+        for view_id, view in schema.views.items():
             view_entity = ViewEntity.from_id(view_id)
             class_entity = view_entity.as_class()
             for prop_id, prop in (view.properties or {}).items():
@@ -250,10 +247,13 @@ class DMSImporter(BaseImporter):
             metadata=metadata,
             properties=properties,
             containers=SheetList[DMSContainer](
-                data=[DMSContainer.from_container(container) for container in schema.containers]
+                data=[DMSContainer.from_container(container) for container in schema.containers.values()]
             ),
             views=SheetList[DMSView](
-                data=[DMSView.from_view(view, in_model=view.as_id() in data_model_view_ids) for view in schema.views]
+                data=[
+                    DMSView.from_view(view, in_model=view_id in data_model_view_ids)
+                    for view_id, view in schema.views.items()
+                ]
             ),
         )
 

{cognite_neat-0.77.0 → cognite_neat-0.77.2}/cognite/neat/rules/issues/dms.py

@@ -507,6 +507,26 @@ class HasDataFilterAppliedToTooManyContainersWarning(DMSSchemaWarning):
         return output
 
 
+@dataclass(frozen=True)
+class RawFilterAppliedToViewWarning(DMSSchemaWarning):
+    description = "Raw filter is applied to a view, which is against the neat data modeling lifecycle."
+    fix = "Do not use raw filter, instead use HasData filter or nodeType filter or change the data model design."
+    error_name: ClassVar[str] = "RawFilterAppliedToView"
+    view_id: dm.ViewId
+
+    def message(self) -> str:
+        return (
+            f"RawFilter applied to the view {self.view_id}."
+            " The usage of RawFilter is against the neat team recommendations and the neat data modeling lifecycle."
+            " When opting for raw filter, the user is responsible for any errors that arise in neat."
+        )
+
+    def dump(self) -> dict[str, Any]:
+        output = super().dump()
+        output["view_id"] = self.view_id.dump()
+        return output
+
+
 @dataclass(frozen=True)
 class NodeTypeFilterOnParentViewWarning(DMSSchemaWarning):
     description = (

{cognite_neat-0.77.0 → cognite_neat-0.77.2}/cognite/neat/rules/models/dms/_exporter.py

@@ -22,6 +22,7 @@ from cognite.neat.rules.models.entities import (
     ViewPropertyEntity,
 )
 from cognite.neat.rules.models.wrapped_entities import DMSFilter, HasDataFilter, NodeTypeFilter
+from cognite.neat.utils.cdf_classes import ContainerApplyDict, NodeApplyDict, SpaceApplyDict, ViewApplyDict
 
 from ._rules import DMSMetadata, DMSProperty, DMSRules, DMSView
 from ._schema import DMSSchema, PipelineSchema
@@ -51,7 +52,9 @@ class _DMSExporter:
         self._ref_schema = rules.reference.as_schema() if rules.reference else None
         if self._ref_schema:
             # We skip version as that will always be missing in the reference
-            self._ref_views_by_id = {dm.ViewId(view.space, view.external_id): view for view in self._ref_schema.views}
+            self._ref_views_by_id = {
+                dm.ViewId(view.space, view.external_id): view for view in self._ref_schema.views.values()
+            }
         else:
             self._ref_views_by_id = {}
 
@@ -65,7 +68,7 @@ class _DMSExporter:
         views_not_in_model = {view.view.as_id() for view in rules.views if not view.in_model}
         data_model = rules.metadata.as_data_model()
         data_model.views = sorted(
-            [view_id for view_id in views.as_ids() if view_id not in views_not_in_model],
+            [view_id for view_id in views.keys() if view_id not in views_not_in_model],
             key=lambda v: v.as_tuple(),  # type: ignore[union-attr]
         )
 
@@ -89,31 +92,30 @@ class _DMSExporter:
     def _create_spaces(
         self,
         metadata: DMSMetadata,
-        containers: dm.ContainerApplyList,
-        views: dm.ViewApplyList,
+        containers: ContainerApplyDict,
+        views: ViewApplyDict,
         data_model: dm.DataModelApply,
-    ) -> dm.SpaceApplyList:
-        used_spaces = {container.space for container in containers} | {view.space for view in views}
+    ) -> SpaceApplyDict:
+        used_spaces = {container.space for container in containers.values()} | {view.space for view in views.values()}
         if len(used_spaces) == 1:
             # We skip the default space and only use this space for the data model
             data_model.space = used_spaces.pop()
-            spaces = dm.SpaceApplyList([dm.SpaceApply(space=data_model.space)])
+            spaces = SpaceApplyDict([dm.SpaceApply(space=data_model.space)])
         else:
             used_spaces.add(metadata.space)
-            spaces = dm.SpaceApplyList([dm.SpaceApply(space=space) for space in used_spaces])
-        if self.instance_space and self.instance_space not in {space.space for space in spaces}:
-            spaces.append(dm.SpaceApply(space=self.instance_space, name=self.instance_space))
+            spaces = SpaceApplyDict([dm.SpaceApply(space=space) for space in used_spaces])
+        if self.instance_space and self.instance_space not in spaces:
+            spaces[self.instance_space] = dm.SpaceApply(space=self.instance_space, name=self.instance_space)
         return spaces
 
     def _create_views_with_node_types(
         self,
         view_properties_by_id: dict[dm.ViewId, list[DMSProperty]],
-    ) -> tuple[dm.ViewApplyList, dm.NodeApplyList]:
-        views = dm.ViewApplyList([dms_view.as_view() for dms_view in self.rules.views])
+    ) -> tuple[ViewApplyDict, NodeApplyDict]:
+        views = ViewApplyDict([dms_view.as_view() for dms_view in self.rules.views])
         dms_view_by_id = {dms_view.view.as_id(): dms_view for dms_view in self.rules.views}
 
-        for view in views:
-            view_id = view.as_id()
+        for view_id, view in views.items():
             view.properties = {}
             if not (view_properties := view_properties_by_id.get(view_id)):
                 continue
@@ -124,14 +126,13 @@ class _DMSExporter:
 
         data_model_type = self.rules.metadata.data_model_type
         unique_node_types: set[dm.NodeId] = set()
-        parent_views = {parent for view in views for parent in view.implements or []}
-        for view in views:
-            dms_view = dms_view_by_id.get(view.as_id())
-            dms_properties = view_properties_by_id.get(view.as_id(), [])
+        parent_views = {parent for view in views.values() for parent in view.implements or []}
+        for view_id, view in views.items():
+            dms_view = dms_view_by_id.get(view_id)
+            dms_properties = view_properties_by_id.get(view_id, [])
             view_filter = self._create_view_filter(view, dms_view, data_model_type, dms_properties)
 
             view.filter = view_filter.as_dms_filter()
-
             if isinstance(view_filter, NodeTypeFilter):
                 unique_node_types.update(view_filter.nodes)
                 if view.as_id() in parent_views:
@@ -151,7 +152,7 @@ class _DMSExporter:
                     issues.dms.HasDataFilterOnViewWithReferencesWarning(view.as_id(), list(references)), stacklevel=2
                 )
 
-        return views, dm.NodeApplyList(
+        return views, NodeApplyDict(
             [dm.NodeApply(space=node.space, external_id=node.external_id) for node in unique_node_types]
         )
 
@@ -174,7 +175,7 @@ class _DMSExporter:
     def _create_containers(
         self,
         container_properties_by_id: dict[dm.ContainerId, list[DMSProperty]],
-    ) -> dm.ContainerApplyList:
+    ) -> ContainerApplyDict:
         containers = dm.ContainerApplyList(
             [dms_container.as_container() for dms_container in self.rules.containers or []]
         )
@@ -229,9 +230,7 @@ class _DMSExporter:
                     for name, const in container.constraints.items()
                     if not (isinstance(const, dm.RequiresConstraint) and const.require in container_to_drop)
                 }
-        return dm.ContainerApplyList(
-            [container for container in containers if container.as_id() not in container_to_drop]
-        )
+        return ContainerApplyDict([container for container in containers if container.as_id() not in container_to_drop])
 
     def _gather_properties(self) -> tuple[dict[dm.ContainerId, list[DMSProperty]], dict[dm.ViewId, list[DMSProperty]]]:
         container_properties_by_id: dict[dm.ContainerId, list[DMSProperty]] = defaultdict(list)
@@ -254,6 +253,7 @@ class _DMSExporter:
         dms_properties: list[DMSProperty],
     ) -> DMSFilter:
         selected_filter_name = (dms_view and dms_view.filter_ and dms_view.filter_.name) or ""
+
         if dms_view and dms_view.filter_ and not dms_view.filter_.is_empty:
             # Has Explicit Filter, use it
             return dms_view.filter_

{cognite_neat-0.77.0 → cognite_neat-0.77.2}/cognite/neat/rules/models/dms/_rules.py

@@ -41,7 +41,7 @@ from cognite.neat.rules.models.entities import (
     ViewEntityList,
     ViewPropertyEntity,
 )
-from cognite.neat.rules.models.wrapped_entities import HasDataFilter, NodeTypeFilter
+from cognite.neat.rules.models.wrapped_entities import HasDataFilter, NodeTypeFilter, RawFilter
 
 from ._schema import DMSSchema
 
@@ -257,7 +257,7 @@ class DMSView(SheetEntity):
     description: str | None = Field(alias="Description", default=None)
     implements: ViewEntityList | None = Field(None, alias="Implements")
     reference: URLEntity | ReferenceEntity | None = Field(alias="Reference", default=None, union_mode="left_to_right")
-    filter_: HasDataFilter | NodeTypeFilter | None = Field(None, alias="Filter")
+    filter_: HasDataFilter | NodeTypeFilter | RawFilter | None = Field(None, alias="Filter")
     in_model: bool = Field(True, alias="In Model")
     class_: ClassEntity = Field(alias="Class (linage)")
 

{cognite_neat-0.77.0 → cognite_neat-0.77.2}/cognite/neat/rules/models/dms/_rules_input.py

@@ -237,7 +237,7 @@ class DMSViewInput:
     description: str | None = None
     implements: str | None = None
     reference: str | None = None
-    filter_: Literal["hasData", "nodeType"] | None = None
+    filter_: Literal["hasData", "nodeType", "rawFilter"] | None = None
     in_model: bool = True
 
     @classmethod

{cognite_neat-0.77.0 → cognite_neat-0.77.2}/cognite/neat/rules/models/dms/_schema.py

@@ -3,7 +3,6 @@ import sys
 import warnings
 import zipfile
 from collections import Counter, defaultdict
-from collections.abc import Sequence
 from dataclasses import Field, dataclass, field, fields
 from pathlib import Path
 from typing import Any, ClassVar, cast
@@ -31,6 +30,13 @@ from cognite.neat.rules.issues.dms import (
     MissingViewError,
 )
 from cognite.neat.rules.models.data_types import _DATA_TYPE_BY_DMS_TYPE
+from cognite.neat.utils.cdf_classes import (
+    CogniteResourceDict,
+    ContainerApplyDict,
+    NodeApplyDict,
+    SpaceApplyDict,
+    ViewApplyDict,
+)
 from cognite.neat.utils.cdf_loaders import ViewLoader
 from cognite.neat.utils.cdf_loaders.data_classes import RawTableWrite, RawTableWriteList
 from cognite.neat.utils.text import to_camel
@@ -45,10 +51,10 @@ else:
 @dataclass
 class DMSSchema:
     data_model: dm.DataModelApply | None = None
-    spaces: dm.SpaceApplyList = field(default_factory=lambda: dm.SpaceApplyList([]))
-    views: dm.ViewApplyList = field(default_factory=lambda: dm.ViewApplyList([]))
-    containers: dm.ContainerApplyList = field(default_factory=lambda: dm.ContainerApplyList([]))
-    node_types: dm.NodeApplyList = field(default_factory=lambda: dm.NodeApplyList([]))
+    spaces: SpaceApplyDict = field(default_factory=SpaceApplyDict)
+    views: ViewApplyDict = field(default_factory=ViewApplyDict)
+    containers: ContainerApplyDict = field(default_factory=ContainerApplyDict)
+    node_types: NodeApplyDict = field(default_factory=NodeApplyDict)
     # The last schema is the previous version of the data model. In the case, extension=addition, this
     # should not be modified.
     last: "DMSSchema | None" = None
@@ -65,22 +71,21 @@ class DMSSchema:
 
     def _get_mapped_container_from_view(self, view_id: dm.ViewId) -> set[dm.ContainerId]:
         # index all views, including ones from reference
-        indexed_views = {
-            **{view.as_id(): view for view in self.views},
-            **({view.as_id(): view for view in self.reference.views} if self.reference else {}),
-        }
+        view_by_id = self.views.copy()
+        if self.reference:
+            view_by_id.update(self.reference.views)
 
-        if view_id not in indexed_views:
+        if view_id not in view_by_id:
             raise ValueError(f"View {view_id} not found")
 
-        indexed_implemented_views = {id_: view.implements for id_, view in indexed_views.items()}
+        indexed_implemented_views = {id_: view.implements for id_, view in view_by_id.items()}
         view_inheritance = get_inheritance_path(view_id, indexed_implemented_views)
 
-        directly_referenced_containers = indexed_views[view_id].referenced_containers()
+        directly_referenced_containers = view_by_id[view_id].referenced_containers()
         inherited_referenced_containers = set()
 
         for view_id in view_inheritance:
-            if implemented_view := indexed_views.get(view_id):
+            if implemented_view := view_by_id.get(view_id):
                 inherited_referenced_containers |= implemented_view.referenced_containers()
             else:
                 raise IncompleteSchemaError(missing_component=view_id).as_exception()
@@ -151,31 +156,39 @@ class DMSSchema:
         # as the read format contains all properties from all parents, while the write formate should not contain
         # properties from any parents.
         # The ViewLoader as_write method looks up parents and remove properties from them.
-        view_write = dm.ViewApplyList([view_loader.as_write(view) for view in views])
+        view_write = ViewApplyDict([view_loader.as_write(view) for view in views])
 
-        container_write = containers.as_write()
+        container_write = ContainerApplyDict(containers.as_write())
         user_space = data_model.space
         if reference_model:
             user_model_view_ids = set(data_model_write.views)
             ref_model_write = reference_model.as_write()
             ref_model_write.views = [view.as_id() for view in reference_model.views]
 
-            ref_views = dm.ViewApplyList(
-                [view for view in view_write if (view.space != user_space) or (view.as_id() not in user_model_view_ids)]
+            ref_views = ViewApplyDict(
+                [
+                    view
+                    for view_id, view in view_write.items()
+                    if (view.space != user_space) or (view_id not in user_model_view_ids)
+                ]
             )
-            view_write = dm.ViewApplyList(
-                [view for view in view_write if view.space == user_space or view.as_id() in user_model_view_ids]
+            view_write = ViewApplyDict(
+                [
+                    view
+                    for view_id, view in view_write.items()
+                    if view.space == user_space or view_id in user_model_view_ids
+                ]
             )
 
-            ref_containers = dm.ContainerApplyList(
-                [container for container in container_write if container.space != user_space]
+            ref_containers = ContainerApplyDict(
+                [container for container in container_write.values() if container.space != user_space]
             )
-            container_write = dm.ContainerApplyList(
-                [container for container in container_write if container.space == user_space]
+            container_write = ContainerApplyDict(
+                [container for container in container_write.values() if container.space == user_space]
             )
 
             ref_schema: DMSSchema | None = cls(
-                spaces=dm.SpaceApplyList([s for s in space_write if s.space != user_space]),
+                spaces=SpaceApplyDict([s for s in space_write if s.space != user_space]),
                 data_model=ref_model_write,
                 views=ref_views,
                 containers=ref_containers,
@@ -183,7 +196,7 @@ class DMSSchema:
         else:
             ref_schema = None
         return cls(
-            spaces=dm.SpaceApplyList([s for s in space_write if s.space == user_space]),
+            spaces=SpaceApplyDict([s for s in space_write if s.space == user_space]),
             data_model=data_model_write,
             views=view_write,
             containers=container_write,
@@ -245,7 +258,7 @@ class DMSSchema:
         data_models = path_dir / "data_models"
         data_models.mkdir(parents=True, exist_ok=True)
         if "spaces" not in exclude_set:
-            for space in self.spaces:
+            for space in self.spaces.values():
                 (data_models / f"{space.space}.space.yaml").write_text(
                     space.dump_yaml(), newline=new_line, encoding=encoding
                 )
@@ -256,21 +269,21 @@ class DMSSchema:
         if "views" not in exclude_set and self.views:
             view_dir = data_models / "views"
             view_dir.mkdir(parents=True, exist_ok=True)
-            for view in self.views:
+            for view in self.views.values():
                 (view_dir / f"{view.external_id}.view.yaml").write_text(
                     view.dump_yaml(), newline=new_line, encoding=encoding
                 )
         if "containers" not in exclude_set and self.containers:
             container_dir = data_models / "containers"
             container_dir.mkdir(parents=True, exist_ok=True)
-            for container in self.containers:
+            for container in self.containers.values():
                 (container_dir / f"{container.external_id}.container.yaml").write_text(
                     container.dump_yaml(), newline=new_line, encoding=encoding
                 )
         if "node_types" not in exclude_set and self.node_types:
             node_dir = data_models / "nodes"
             node_dir.mkdir(parents=True, exist_ok=True)
-            for node in self.node_types:
+            for node in self.node_types.values():
                 (node_dir / f"{node.external_id}.node.yaml").write_text(
                     node.dump_yaml(), newline=new_line, encoding=encoding
                 )
@@ -324,22 +337,22 @@ class DMSSchema:
         exclude_set = exclude or set()
         with zipfile.ZipFile(zip_file, "w") as zip_ref:
             if "spaces" not in exclude_set:
-                for space in self.spaces:
+                for space in self.spaces.values():
                     zip_ref.writestr(f"data_models/{space.space}.space.yaml", space.dump_yaml())
             if "data_models" not in exclude_set and self.data_model:
                 zip_ref.writestr(
                     f"data_models/{self.data_model.external_id}.datamodel.yaml", self.data_model.dump_yaml()
                 )
             if "views" not in exclude_set:
-                for view in self.views:
+                for view in self.views.values():
                     zip_ref.writestr(f"data_models/views/{view.external_id}.view.yaml", view.dump_yaml())
             if "containers" not in exclude_set:
-                for container in self.containers:
+                for container in self.containers.values():
                     zip_ref.writestr(
                         f"data_models/containers{container.external_id}.container.yaml", container.dump_yaml()
                     )
             if "node_types" not in exclude_set:
-                for node in self.node_types:
+                for node in self.node_types.values():
                     zip_ref.writestr(f"data_models/nodes/{node.external_id}.node.yaml", node.dump_yaml())
 
     @classmethod
@@ -436,9 +449,13 @@ class DMSSchema:
         for attr in cls_fields:
             if items := getattr(self, attr.name):
                 key = to_camel(attr.name) if camel_case else attr.name
-                if isinstance(items, Sequence):
-                    items = sorted(items, key=self._to_sortable_identifier) if sort else items
-                    output[key] = [item.dump(camel_case=camel_case) for item in items]
+                if isinstance(items, CogniteResourceDict):
+                    if sort:
+                        output[key] = [
+                            item.dump(camel_case) for item in sorted(items.values(), key=self._to_sortable_identifier)
+                        ]
+                    else:
+                        output[key] = items.dump(camel_case)
                 else:
                     output[key] = items.dump(camel_case=camel_case)
         return output
@@ -461,19 +478,19 @@ class DMSSchema:
 
     def validate(self) -> list[DMSSchemaError]:
         errors: set[DMSSchemaError] = set()
-        defined_spaces = {space.space for space in self.spaces}
-        defined_containers = {container.as_id(): container for container in self.containers}
-        defined_views = {view.as_id() for view in self.views}
+        defined_spaces = self.spaces.copy()
+        defined_containers = self.containers.copy()
+        defined_views = self.views.copy()
         if self.reference:
-            defined_spaces |= {space.space for space in self.reference.spaces}
-            defined_containers |= {container.as_id(): container for container in self.reference.containers}
-            defined_views |= {view.as_id() for view in self.reference.views}
+            defined_spaces |= self.reference.spaces
+            defined_containers |= self.reference.containers
+            defined_views |= self.reference.views
 
-        for container in self.containers:
+        for container in self.containers.values():
             if container.space not in defined_spaces:
                 errors.add(MissingSpaceError(space=container.space, referred_by=container.as_id()))
 
-        for view in self.views:
+        for view in self.views.values():
             view_id = view.as_id()
             if view.space not in defined_spaces:
                 errors.add(MissingSpaceError(space=view.space, referred_by=view_id))
@@ -601,16 +618,18 @@ class DMSSchema:
         Returns:
             set[str]: The spaces referenced by the schema.
         """
-        referenced_spaces = {view.space for view in self.views}
-        referenced_spaces |= {container.space for container in self.containers}
+        referenced_spaces = {view.space for view in self.views.values()}
+        referenced_spaces |= {container.space for container in self.containers.values()}
         if include_indirect_references:
-            referenced_spaces |= {container.space for view in self.views for container in view.referenced_containers()}
-            referenced_spaces |= {parent.space for view in self.views for parent in view.implements or []}
-        referenced_spaces |= {node.space for node in self.node_types}
+            referenced_spaces |= {
+                container.space for view in self.views.values() for container in view.referenced_containers()
+            }
+            referenced_spaces |= {parent.space for view in self.views.values() for parent in view.implements or []}
+        referenced_spaces |= {node.space for node in self.node_types.values()}
         if self.data_model:
             referenced_spaces |= {self.data_model.space}
             referenced_spaces |= {view.space for view in self.data_model.views or []}
-        referenced_spaces |= {s.space for s in self.spaces}
+        referenced_spaces |= {s.space for s in self.spaces.values()}
         return referenced_spaces
 
 
@@ -727,12 +746,12 @@ class PipelineSchema(DMSSchema):
         database_name = first_data_model.external_id[:32]
         instance_space = instance_space or first_data_model.space
         database = DatabaseWrite(name=database_name)
-        parent_views = {parent for view in schema.views for parent in view.implements or []}
-        container_by_id = {container.as_id(): container for container in schema.containers}
+        parent_views = {parent for view in schema.views.values() for parent in view.implements or []}
+        container_by_id = schema.containers.copy()
 
         transformations = TransformationWriteList([])
         raw_tables = RawTableWriteList([])
-        for view in schema.views:
+        for view in schema.views.values():
             if view.as_id() in parent_views:
                 # Skipping parents as they do not have their own data
                 continue

{cognite_neat-0.77.0 → cognite_neat-0.77.2}/cognite/neat/rules/models/dms/_validation.py

@@ -8,6 +8,7 @@ from cognite.neat.rules.issues import IssueList
 from cognite.neat.rules.models._base import ExtensionCategory, SchemaCompleteness
 from cognite.neat.rules.models.data_types import DataType
 from cognite.neat.rules.models.entities import ContainerEntity
+from cognite.neat.rules.models.wrapped_entities import RawFilter
 
 from ._rules import DMSProperty, DMSRules
 
@@ -25,6 +26,7 @@ class DMSPostValidation:
         self.issue_list = IssueList()
 
     def validate(self) -> IssueList:
+        self._validate_best_practices()
         self._consistent_container_properties()
         self._referenced_views_and_containers_are_existing()
         self._validate_extension()
@@ -166,8 +168,8 @@ class DMSPostValidation:
         # Is an extension of an existing model.
         user_schema = self.rules.as_schema()
         ref_schema = self.rules.reference.as_schema()
-        new_containers = {container.as_id(): container for container in user_schema.containers}
-        existing_containers = {container.as_id(): container for container in ref_schema.containers}
+        new_containers = user_schema.containers.copy()
+        existing_containers = ref_schema.containers.copy()
 
         for container_id, container in new_containers.items():
             existing_container = existing_containers.get(container_id)
@@ -193,8 +195,8 @@ class DMSPostValidation:
             # Reshape allows changes to views
             return None
 
-        new_views = {view.as_id(): view for view in user_schema.views}
-        existing_views = {view.as_id(): view for view in ref_schema.views}
+        new_views = user_schema.views.copy()
+        existing_views = ref_schema.views.copy()
         for view_id, view in new_views.items():
             existing_view = existing_views.get(view_id)
             if not existing_view or existing_view == view:
@@ -219,13 +221,13 @@ class DMSPostValidation:
 
         dms_schema = self.rules.as_schema()
 
-        for view in dms_schema.views:
-            mapped_containers = dms_schema._get_mapped_container_from_view(view.as_id())
+        for view_id, view in dms_schema.views.items():
+            mapped_containers = dms_schema._get_mapped_container_from_view(view_id)
 
             if mapped_containers and len(mapped_containers) > 10:
                 self.issue_list.append(
                     issues.dms.ViewMapsToTooManyContainersWarning(
-                        view_id=view.as_id(),
+                        view_id=view_id,
                         container_ids=mapped_containers,
                     )
                 )
@@ -236,11 +238,20 @@ class DMSPostValidation:
                 ):
                     self.issue_list.append(
                         issues.dms.HasDataFilterAppliedToTooManyContainersWarning(
-                            view_id=view.as_id(),
+                            view_id=view_id,
                             container_ids=mapped_containers,
                         )
                     )
 
+    def _validate_best_practices(self) -> None:
+        for view in self.views:
+            if view.filter_ and isinstance(view.filter_, RawFilter):
+                self.issue_list.append(
+                    issues.dms.RawFilterAppliedToViewWarning(
+                        view_id=view.view.as_id(),
+                    )
+                )
+
     @staticmethod
     def _changed_attributes_and_properties(
         new_dumped: dict[str, Any], existing_dumped: dict[str, Any]