cognite-neat 0.96.5__tar.gz → 0.96.6__tar.gz

{cognite_neat-0.96.5 → cognite_neat-0.96.6}/PKG-INFO

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

{cognite_neat-0.96.5 → cognite_neat-0.96.6}/cognite/neat/_constants.py

@@ -36,6 +36,7 @@ COGNITE_MODELS = (
     DataModelId("cdf_cdm", "CogniteCore", "v1"),
     DataModelId("cdf_idm", "CogniteProcessIndustries", "v1"),
 )
+COGNITE_SPACES = frozenset(model.space for model in COGNITE_MODELS)
 DMS_LISTABLE_PROPERTY_LIMIT = 1000
 
 EXAMPLE_RULES = PACKAGE_DIRECTORY / "_rules" / "examples"

{cognite_neat-0.96.5 → cognite_neat-0.96.6}/cognite/neat/_rules/importers/_spreadsheet2rules.py

@@ -47,6 +47,8 @@ SOURCE_SHEET__TARGET_FIELD__HEADERS = [
     ("Classes", "Classes", "Class"),
     ("Containers", "Containers", "Container"),
     ("Views", "Views", "View"),
+    ("Enum", "Enum", "Collection"),
+    ("Nodes", "Nodes", "Node"),
 ]
 
 MANDATORY_SHEETS_BY_ROLE: dict[RoleTypes, set[str]] = {
@@ -112,7 +114,7 @@ class SpreadsheetReader:
         issue_list: IssueList,
         required: bool = True,
         metadata: MetadataRaw | None = None,
-        sheet_prefix: Literal["", "Last", "Ref"] = "",
+        sheet_prefix: Literal["", "Last", "Ref", "CDMRef"] = "",
     ):
         self.issue_list = issue_list
         self.required = required
@@ -267,6 +269,8 @@ class ExcelImporter(BaseImporter[T_InputRules]):
             reference_read: ReadResult | None = None
             if any(sheet_name.startswith("Ref") for sheet_name in user_reader.seen_sheets):
                 reference_read = SpreadsheetReader(issue_list, sheet_prefix="Ref").read(excel_file, self.filepath)
+            elif any(sheet_name.startswith("CDMRef") for sheet_name in user_reader.seen_sheets):
+                reference_read = SpreadsheetReader(issue_list, sheet_prefix="CDMRef").read(excel_file, self.filepath)
 
         if issue_list.has_errors:
             return ReadRules(None, issue_list, {})

{cognite_neat-0.96.5 → cognite_neat-0.96.6}/cognite/neat/_rules/models/dms/_exporter.py

@@ -402,17 +402,30 @@ class _DMSExporter:
 
         return container_properties_by_id, view_properties_by_id
 
-    @staticmethod
     def _gather_properties_with_ancestors(
+        self,
         view_properties_by_id: dict[dm.ViewId, list[DMSProperty]],
         views: Sequence[DMSView],
     ) -> dict[dm.ViewId, list[DMSProperty]]:
+        all_view_properties_by_id = view_properties_by_id.copy()
+        if self.rules.reference:
+            # We need to include t
+            ref_view_properties_by_id = self._gather_properties(self.rules.reference.properties)[1]
+            for view_id, properties in ref_view_properties_by_id.items():
+                if view_id not in all_view_properties_by_id:
+                    all_view_properties_by_id[view_id] = properties
+                else:
+                    existing_properties = {prop._identifier() for prop in all_view_properties_by_id[view_id]}
+                    for prop in properties:
+                        if prop._identifier() not in existing_properties:
+                            all_view_properties_by_id[view_id].append(prop)
+
         view_properties_with_parents_by_id: dict[dm.ViewId, list[DMSProperty]] = defaultdict(list)
         view_by_view_id = {view.view.as_id(): view for view in views}
         for view in views:
             view_id = view.view.as_id()
             seen: set[Hashable] = set()
-            if view_properties := view_properties_by_id.get(view_id):
+            if view_properties := all_view_properties_by_id.get(view_id):
                 view_properties_with_parents_by_id[view_id].extend(view_properties)
                 seen.update(prop._identifier() for prop in view_properties)
             if not view.implements:
@@ -428,7 +441,7 @@ class _DMSExporter:
                             parents.append(grandparent)
                             seen_parents.add(grandparent)
 
-                if not (parent_view_properties := view_properties_by_id.get(parent_view_id)):
+                if not (parent_view_properties := all_view_properties_by_id.get(parent_view_id)):
                     continue
                 for prop in parent_view_properties:
                     new_prop = prop.model_copy(update={"view": view.view})

{cognite_neat-0.96.5 → cognite_neat-0.96.6}/cognite/neat/_rules/models/dms/_rules.py

@@ -1,15 +1,15 @@
 import math
-import sys
 import warnings
 from collections.abc import Hashable
 from datetime import datetime
-from typing import TYPE_CHECKING, Any, ClassVar, Literal
+from typing import Any, ClassVar, Literal
 
 import pandas as pd
 from cognite.client import data_modeling as dm
 from pydantic import Field, field_serializer, field_validator, model_validator
 from pydantic_core.core_schema import SerializationInfo, ValidationInfo
 
+from cognite.neat._constants import COGNITE_SPACES
 from cognite.neat._issues import MultiValueError
 from cognite.neat._issues.warnings import (
     PrincipleMatchingSpaceAndVersionWarning,
@@ -56,14 +56,6 @@ from cognite.neat._rules.models.entities import (
 
 from ._schema import DMSSchema
 
-if TYPE_CHECKING:
-    pass
-
-if sys.version_info >= (3, 11):
-    pass
-else:
-    pass
-
 _DEFAULT_VERSION = "1"
 
 
@@ -197,6 +189,24 @@ class DMSProperty(SheetRow):
             raise ValueError(f"Reverse connection must have a value type that points to a view, got {value}")
         return value
 
+    @field_validator("container", "container_property", mode="after")
+    def container_set_correctly(cls, value: Any, info: ValidationInfo) -> Any:
+        if (connection := info.data.get("connection")) is None:
+            return value
+        if connection == "direct" and value is None:
+            raise ValueError(
+                "You must provide a container and container property for where to store direct connections"
+            )
+        elif isinstance(connection, EdgeEntity) and value is not None:
+            raise ValueError(
+                "Edge connections are not stored in a container, please remove the container and container property"
+            )
+        elif isinstance(connection, ReverseConnectionEntity) and value is not None:
+            raise ValueError(
+                "Reverse connection are not stored in a container, please remove the container and container property"
+            )
+        return value
+
     @field_serializer("reference", when_used="always")
     def set_reference(self, value: Any, info: SerializationInfo) -> str | None:
         if isinstance(info.context, dict) and info.context.get("as_reference") is True:
@@ -421,7 +431,11 @@ class DMSRules(BaseRules):
         if not (metadata := info.data.get("metadata")):
             return value
         model_version = metadata.version
-        if different_version := [view.view.as_id() for view in value if view.view.version != model_version]:
+        if different_version := [
+            view.view.as_id()
+            for view in value
+            if view.view.version != model_version and view.view.space not in COGNITE_SPACES
+        ]:
             for view_id in different_version:
                 warnings.warn(
                     PrincipleMatchingSpaceAndVersionWarning(
@@ -429,7 +443,11 @@ class DMSRules(BaseRules):
                     ),
                     stacklevel=2,
                 )
-        if different_space := [view.view.as_id() for view in value if view.view.space != metadata.space]:
+        if different_space := [
+            view.view.as_id()
+            for view in value
+            if view.view.space != metadata.space and view.view.space not in COGNITE_SPACES
+        ]:
             for view_id in different_space:
                 warnings.warn(
                     PrincipleMatchingSpaceAndVersionWarning(

cognite_neat-0.96.6/cognite/neat/_version.py

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

{cognite_neat-0.96.5 → cognite_neat-0.96.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cognite-neat"
-version = "0.96.5"
+version = "0.96.6"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [

cognite_neat-0.96.5/cognite/neat/_version.py

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