cognite-neat 0.87.3__py3-none-any.whl → 0.87.6__py3-none-any.whl

cognite/neat/_version.py

@@ -1 +1 @@
-__version__ = "0.87.3"
+__version__ = "0.87.6"

cognite/neat/app/api/routers/rules.py

@@ -166,7 +166,7 @@ def get_original_rules_from_workflow(workflow_name: str):
         return {"error": f"Workflow {workflow_name} is not found"}
     context = workflow.get_context()
     rules_data = context["RulesData"]
-    if type(rules_data) != RulesData:
+    if type(rules_data) is not RulesData:
         return {"error": "RulesData is not found in workflow context"}
 
     return Response(content=rules_data.rules.model_dump_json(), media_type="application/json")

cognite/neat/graph/extractors/_classic_cdf/_assets.py

@@ -30,6 +30,8 @@ class AssetsExtractor(BaseExtractor):
             limit the extraction to 1000 assets to test the setup.
         unpack_metadata (bool, optional): Whether to unpack metadata. Defaults to False, which yields the metadata as
             a JSON string.
+        skip_metadata_values (set[str] | frozenset[str] | None, optional): A set of values to skip when unpacking
+            metadata. Defaults to frozenset({"nan", "null", "none", ""}).
     """
 
     _SPACE_PATTERN = re.compile(r"\s+")
@@ -42,6 +44,7 @@ class AssetsExtractor(BaseExtractor):
         total: int | None = None,
         limit: int | None = None,
         unpack_metadata: bool = True,
+        skip_metadata_values: set[str] | frozenset[str] | None = frozenset({"nan", "null", "none", ""}),
     ):
         self.namespace = namespace or DEFAULT_NAMESPACE
         self.assets = assets
@@ -49,6 +52,7 @@ class AssetsExtractor(BaseExtractor):
         self.total = total
         self.limit = min(limit, total) if limit and total else limit
         self.unpack_metadata = unpack_metadata
+        self.skip_metadata_values = skip_metadata_values
 
     @classmethod
     def from_dataset(
@@ -162,7 +166,7 @@ class AssetsExtractor(BaseExtractor):
         if asset.source:
             triples.append((id_, self.namespace.source, Literal(asset.source)))
 
-        # properties ref creation and update
+        # properties' ref creation and update
         triples.append(
             (
                 id_,
@@ -193,7 +197,9 @@ class AssetsExtractor(BaseExtractor):
         if asset.metadata:
             if self.unpack_metadata:
                 for key, value in asset.metadata.items():
-                    if value:
+                    if value and (
+                        self.skip_metadata_values is None or value.casefold() not in self.skip_metadata_values
+                    ):
                         triples.append(
                             (
                                 id_,

cognite/neat/graph/extractors/_mock_graph_generator.py

@@ -250,9 +250,9 @@ def _generate_mock_data_property_triples(
     python_type = value_type.python
     triples = []
     for id_ in instance_ids:
-        if python_type == int:
+        if python_type is int:
             triples.append((id_, URIRef(namespace[property_]), Literal(random.randint(1, 1983))))
-        elif python_type == float:
+        elif python_type is float:
             triples.append((id_, URIRef(namespace[property_]), Literal(numpy.float32(random.uniform(1, 1983)))))
         # generate string
         else:

cognite/neat/graph/loaders/_base.py

@@ -48,18 +48,23 @@ class BaseLoader(ABC, Generic[T_Output]):
 class CDFLoader(BaseLoader[T_Output]):
     _UPLOAD_BATCH_SIZE: ClassVar[int] = 1000
 
-    def load_into_cdf(self, client: CogniteClient, dry_run: bool = False) -> UploadResultList:
-        return UploadResultList(self.load_into_cdf_iterable(client, dry_run))
-
-    def load_into_cdf_iterable(self, client: CogniteClient, dry_run: bool = False) -> Iterable[UploadResult]:
-        missing_capabilities = client.iam.verify_capabilities(self._get_required_capabilities())
-        if missing_capabilities:
-            upload_result = UploadResult[Hashable](name=type(self).__name__)
-            upload_result.issues.append(
-                FailedAuthorizationError(action="Upload to CDF", reason=str(missing_capabilities))
-            )
-            yield upload_result
-            return
+    def load_into_cdf(
+        self, client: CogniteClient, dry_run: bool = False, check_client: bool = True
+    ) -> UploadResultList:
+        return UploadResultList(self.load_into_cdf_iterable(client, dry_run, check_client))
+
+    def load_into_cdf_iterable(
+        self, client: CogniteClient, dry_run: bool = False, check_client: bool = True
+    ) -> Iterable[UploadResult]:
+        if check_client:
+            missing_capabilities = client.iam.verify_capabilities(self._get_required_capabilities())
+            if missing_capabilities:
+                upload_result = UploadResult[Hashable](name=type(self).__name__)
+                upload_result.issues.append(
+                    FailedAuthorizationError(action="Upload to CDF", reason=str(missing_capabilities))
+                )
+                yield upload_result
+                return
 
         issues = NeatIssueList[NeatIssue]()
         items: list[T_Output] = []

cognite/neat/graph/loaders/_rdf2asset.py

@@ -1,14 +1,21 @@
 import json
 from collections.abc import Iterable, Sequence
-from dataclasses import dataclass, fields
 from pathlib import Path
-from typing import cast
+from typing import Any, cast
 
 import yaml
 from cognite.client import CogniteClient
-from cognite.client.data_classes import AssetWrite
-from cognite.client.data_classes.capabilities import AssetsAcl, Capability
-from cognite.client.exceptions import CogniteAPIError
+from cognite.client.data_classes import (
+    AssetWrite,
+    LabelDefinitionWrite,
+    RelationshipWrite,
+)
+from cognite.client.data_classes.capabilities import (
+    AssetsAcl,
+    Capability,
+    RelationshipsAcl,
+)
+from cognite.client.exceptions import CogniteAPIError, CogniteDuplicatedError
 
 from cognite.neat.graph._tracking.base import Tracker
 from cognite.neat.graph._tracking.log import LogTracker
@@ -17,40 +24,15 @@ from cognite.neat.graph.stores import NeatGraphStore
 from cognite.neat.issues import NeatIssue, NeatIssueList
 from cognite.neat.rules.analysis._asset import AssetAnalysis
 from cognite.neat.rules.models import AssetRules
+from cognite.neat.rules.models.entities import ClassEntity, EntityTypes
+from cognite.neat.utils.auxiliary import create_sha256_hash
 from cognite.neat.utils.upload import UploadResult
 
 from ._base import _END_OF_CLASS, CDFLoader
 
 
-@dataclass(frozen=True)
-class AssetLoaderMetadataKeys:
-    """Class holding mapping between NEAT metadata key names and their desired names
-    in CDF Asset metadata
-
-    Args:
-        start_time: Start time key name
-        end_time: End time key name
-        update_time: Update time key name
-        resurrection_time: Resurrection time key name
-        identifier: Identifier key name
-        active: Active key name
-        type: Type key name
-    """
-
-    start_time: str = "start_time"
-    end_time: str = "end_time"
-    update_time: str = "update_time"
-    resurrection_time: str = "resurrection_time"
-    identifier: str = "identifier"
-    active: str = "active"
-    type: str = "type"
-
-    def as_aliases(self) -> dict[str, str]:
-        return {str(field.default): getattr(self, field.name) for field in fields(self)}
-
-
 class AssetLoader(CDFLoader[AssetWrite]):
-    """Load Assets from NeatGraph to Cognite Data Fusions.
+    """Load Assets and their relationships from NeatGraph to Cognite Data Fusions.
 
     Args:
         graph_store (NeatGraphStore): The graph store to load the data into.
@@ -59,10 +41,7 @@ class AssetLoader(CDFLoader[AssetWrite]):
         use_orphanage (bool): Whether to use an orphanage for assets that are not part
                               of the hierarchy. Defaults to False.
         use_labels (bool): Whether to use labels for assets. Defaults to False.
-        asset_external_id_prefix (str | None): The prefix to use for the external id of the assets.
-                                               Defaults to None.
-        metadata_keys (AssetLoaderMetadataKeys | None): Mapping between NEAT metadata key names and
-                                                        their desired names in CDF Asset metadata. Defaults to None.
+        external_id_prefix (str | None): The prefix to use for the external ids. Defaults to None.
         create_issues (Sequence[NeatIssue] | None): A list of issues that occurred during reading. Defaults to None.
         tracker (type[Tracker] | None): The tracker to use. Defaults to None.
     """
@@ -74,8 +53,7 @@ class AssetLoader(CDFLoader[AssetWrite]):
         data_set_id: int,
         use_orphanage: bool = False,
         use_labels: bool = False,
-        asset_external_id_prefix: str | None = None,
-        metadata_keys: AssetLoaderMetadataKeys | None = None,
+        external_id_prefix: str | None = None,
         create_issues: Sequence[NeatIssue] | None = None,
         tracker: type[Tracker] | None = None,
     ):
@@ -83,15 +61,14 @@ class AssetLoader(CDFLoader[AssetWrite]):
 
         self.rules = rules
         self.data_set_id = data_set_id
+
         self.use_labels = use_labels
 
         self.orphanage = (
             AssetWrite.load(
                 {
                     "dataSetId": self.data_set_id,
-                    "externalId": (
-                        f"{asset_external_id_prefix or ''}orphanage-{data_set_id}" if use_orphanage else None
-                    ),
+                    "externalId": (f"{external_id_prefix or ''}orphanage-{data_set_id}" if use_orphanage else None),
                     "name": "Orphanage",
                     "description": "Orphanage for assets whose parents do not exist",
                 }
@@ -100,9 +77,9 @@ class AssetLoader(CDFLoader[AssetWrite]):
             else None
         )
 
-        self.asset_external_id_prefix = asset_external_id_prefix
-        self.metadata_keys = metadata_keys or AssetLoaderMetadataKeys()
+        self.external_id_prefix = external_id_prefix
 
+        self.processed_assets: set[str] = set()
         self._issues = NeatIssueList[NeatIssue](create_issues or [])
         self._tracker: type[Tracker] = tracker or LogTracker
 
@@ -124,27 +101,50 @@ class AssetLoader(CDFLoader[AssetWrite]):
             "classes",
         )
 
-        processed_instances = set()
+        if self.use_labels:
+            yield from self._create_labels()
 
         if self.orphanage:
             yield self.orphanage
-            processed_instances.add(self.orphanage.external_id)
+            self.processed_assets.add(cast(str, self.orphanage.external_id))
+
+        yield from self._create_assets(ordered_classes, tracker, stop_on_exception)
+        yield from self._create_relationship(ordered_classes, tracker, stop_on_exception)
+
+    def _create_labels(self) -> Iterable[Any]:
+        for label in AssetAnalysis(self.rules).define_labels():
+            yield LabelDefinitionWrite(name=label, external_id=label, data_set_id=self.data_set_id)
+        yield _END_OF_CLASS
 
+    def _create_assets(
+        self,
+        ordered_classes: list[ClassEntity],
+        tracker: Tracker,
+        stop_on_exception: bool,
+    ) -> Iterable[Any]:
         for class_ in ordered_classes:
             tracker.start(repr(class_.id))
 
-            property_renaming_config = AssetAnalysis(self.rules).define_property_renaming_config(class_)
+            property_renaming_config = AssetAnalysis(self.rules).define_asset_property_renaming_config(class_)
 
             for identifier, properties in self.graph_store.read(class_.suffix):
-                fields = _process_properties(properties, property_renaming_config)
+                identifier = f"{self.external_id_prefix or ''}{identifier}"
+
+                fields = _process_asset_properties(properties, property_renaming_config)
                 # set data set id and external id
                 fields["dataSetId"] = self.data_set_id
                 fields["externalId"] = identifier
 
+                if self.use_labels:
+                    fields["labels"] = [class_.suffix]
+
+                if parent_external_id := fields.get("parentExternalId", None):
+                    fields["parentExternalId"] = f"{self.external_id_prefix or ''}{parent_external_id}"
+
                 # check on parent
-                if "parentExternalId" in fields and fields["parentExternalId"] not in processed_instances:
+                if "parentExternalId" in fields and fields["parentExternalId"] not in self.processed_assets:
                     error = loader_issues.InvalidInstanceError(
-                        type_="asset",
+                        type_=EntityTypes.asset,
                         identifier=identifier,
                         reason=(
                             f"Parent asset {fields['parentExternalId']} does not exist or failed creation"
@@ -169,9 +169,11 @@ class AssetLoader(CDFLoader[AssetWrite]):
 
                 try:
                     yield AssetWrite.load(fields)
-                    processed_instances.add(identifier)
+                    self.processed_assets.add(identifier)
                 except KeyError as e:
-                    error = loader_issues.InvalidInstanceError(type_="asset", identifier=identifier, reason=str(e))
+                    error = loader_issues.InvalidInstanceError(
+                        type_=EntityTypes.asset, identifier=identifier, reason=str(e)
+                    )
                     tracker.issue(error)
                     if stop_on_exception:
                         raise error.as_exception() from e
@@ -179,6 +181,87 @@ class AssetLoader(CDFLoader[AssetWrite]):
 
             yield _END_OF_CLASS
 
+    def _create_relationship(
+        self,
+        ordered_classes: list[ClassEntity],
+        tracker: Tracker,
+        stop_on_exception: bool,
+    ) -> Iterable[Any]:
+        for class_ in ordered_classes:
+            tracker.start(repr(class_.id))
+
+            property_renaming_config = AssetAnalysis(self.rules).define_relationship_property_renaming_config(class_)
+
+            # class does not have any relationship properties
+            if not property_renaming_config:
+                continue
+
+            for source_external_id, properties in self.graph_store.read(class_.suffix):
+                relationships = _process_relationship_properties(properties, property_renaming_config)
+
+                source_external_id = f"{self.external_id_prefix or ''}{source_external_id}"
+
+                # check if source asset exists
+                if source_external_id not in self.processed_assets:
+                    error = loader_issues.InvalidInstanceError(
+                        type_=EntityTypes.relationship,
+                        identifier=source_external_id,
+                        reason=(
+                            f"Asset {source_external_id} does not exist! "
+                            "Aborting creation of relationships which use this asset as the source."
+                        ),
+                    )
+                    tracker.issue(error)
+                    if stop_on_exception:
+                        raise error.as_exception()
+                    yield error
+                    continue
+
+                for label, target_external_ids in relationships.items():
+                    # we can have 1-many relationships
+                    for target_external_id in target_external_ids:
+                        target_external_id = f"{self.external_id_prefix or ''}{target_external_id}"
+                        # check if source asset exists
+                        if target_external_id not in self.processed_assets:
+                            error = loader_issues.InvalidInstanceError(
+                                type_=EntityTypes.relationship,
+                                identifier=target_external_id,
+                                reason=(
+                                    f"Asset {target_external_id} does not exist! "
+                                    f"Cannot create relationship between {source_external_id}"
+                                    f" and {target_external_id}. "
+                                ),
+                            )
+                            tracker.issue(error)
+                            if stop_on_exception:
+                                raise error.as_exception()
+                            yield error
+                            continue
+
+                        external_id = "relationship_" + create_sha256_hash(f"{source_external_id}_{target_external_id}")
+                        try:
+                            yield RelationshipWrite(
+                                external_id=external_id,
+                                source_external_id=source_external_id,
+                                target_external_id=target_external_id,
+                                source_type="asset",
+                                target_type="asset",
+                                data_set_id=self.data_set_id,
+                                labels=[label] if self.use_labels else None,
+                            )
+                        except KeyError as e:
+                            error = loader_issues.InvalidInstanceError(
+                                type_=EntityTypes.relationship,
+                                identifier=external_id,
+                                reason=str(e),
+                            )
+                            tracker.issue(error)
+                            if stop_on_exception:
+                                raise error.as_exception() from e
+                            yield error
+
+            yield _END_OF_CLASS
+
     def _get_required_capabilities(self) -> list[Capability]:
         return [
             AssetsAcl(
@@ -187,10 +270,58 @@ class AssetLoader(CDFLoader[AssetWrite]):
                     AssetsAcl.Action.Read,
                 ],
                 scope=AssetsAcl.Scope.DataSet([self.data_set_id]),
-            )
+            ),
+            RelationshipsAcl(
+                actions=[
+                    RelationshipsAcl.Action.Write,
+                    RelationshipsAcl.Action.Read,
+                ],
+                scope=RelationshipsAcl.Scope.DataSet([self.data_set_id]),
+            ),
         ]
 
     def _upload_to_cdf(
+        self,
+        client: CogniteClient,
+        items: list[AssetWrite] | list[RelationshipWrite] | list[LabelDefinitionWrite],
+        dry_run: bool,
+        read_issues: NeatIssueList,
+    ) -> Iterable[UploadResult]:
+        if isinstance(items[0], AssetWrite) and all(isinstance(item, AssetWrite) for item in items):
+            yield from self._upload_assets_to_cdf(client, cast(list[AssetWrite], items), dry_run, read_issues)
+        elif isinstance(items[0], RelationshipWrite) and all(isinstance(item, RelationshipWrite) for item in items):
+            yield from self._upload_relationships_to_cdf(
+                client, cast(list[RelationshipWrite], items), dry_run, read_issues
+            )
+        elif isinstance(items[0], LabelDefinitionWrite) and all(
+            isinstance(item, LabelDefinitionWrite) for item in items
+        ):
+            yield from self._upload_labels_to_cdf(client, cast(list[LabelDefinitionWrite], items), dry_run, read_issues)
+        else:
+            raise ValueError(f"Item {items[0]} is not supported. This is a bug in neat please report it.")
+
+    def _upload_labels_to_cdf(
+        self,
+        client: CogniteClient,
+        items: list[LabelDefinitionWrite],
+        dry_run: bool,
+        read_issues: NeatIssueList,
+    ) -> Iterable[UploadResult]:
+        try:
+            created = client.labels.create(items)
+        except (CogniteAPIError, CogniteDuplicatedError) as e:
+            result = UploadResult[str](name="Label", issues=read_issues)
+            result.error_messages.append(str(e))
+            result.failed_created.update(item.external_id for item in e.failed + e.unknown)
+            result.created.update(item.external_id for item in e.successful)
+            yield result
+        else:
+            for label in created:
+                result = UploadResult[str](name="Label", issues=read_issues)
+                result.upserted.add(cast(str, label.external_id))
+                yield result
+
+    def _upload_assets_to_cdf(
         self,
         client: CogniteClient,
         items: list[AssetWrite],
@@ -202,22 +333,44 @@ class AssetLoader(CDFLoader[AssetWrite]):
         except CogniteAPIError as e:
             result = UploadResult[str](name="Asset", issues=read_issues)
             result.error_messages.append(str(e))
-            result.failed_upserted.update(item.as_id() for item in e.failed + e.unknown)
-            result.upserted.update(item.as_id() for item in e.successful)
+            result.failed_upserted.update(item.external_id for item in e.failed + e.unknown)
+            result.upserted.update(item.external_id for item in e.successful)
             yield result
         else:
             for asset in upserted:
-                result = UploadResult[str](name="asset", issues=read_issues)
+                result = UploadResult[str](name="Asset", issues=read_issues)
                 result.upserted.add(cast(str, asset.external_id))
                 yield result
 
+    def _upload_relationships_to_cdf(
+        self,
+        client: CogniteClient,
+        items: list[RelationshipWrite],
+        dry_run: bool,
+        read_issues: NeatIssueList,
+    ) -> Iterable[UploadResult]:
+        try:
+            upserted = client.relationships.upsert(items, mode="replace")
+        except CogniteAPIError as e:
+            result = UploadResult[str](name="Relationship", issues=read_issues)
+            result.error_messages.append(str(e))
+            result.failed_upserted.update(item.external_id for item in e.failed + e.unknown)
+            result.upserted.update(item.external_id for item in e.successful)
+            yield result
+        else:
+            for relationship in upserted:
+                result = UploadResult[str](name="relationship", issues=read_issues)
+                result.upserted.add(cast(str, relationship.external_id))
+                yield result
+
     def write_to_file(self, filepath: Path) -> None:
         if filepath.suffix not in [".json", ".yaml", ".yml"]:
             raise ValueError(f"File format {filepath.suffix} is not supported")
-        dumped: dict[str, list] = {"assets": []}
+        dumped: dict[str, list] = {"assets": [], "relationship": []}
         for item in self.load(stop_on_exception=False):
             key = {
                 AssetWrite: "assets",
+                RelationshipWrite: "relationship",
                 NeatIssue: "issues",
                 _END_OF_CLASS: "end_of_class",
             }.get(type(item))
@@ -234,7 +387,7 @@ class AssetLoader(CDFLoader[AssetWrite]):
                 yaml.safe_dump(dumped, f, sort_keys=False)
 
 
-def _process_properties(properties: dict[str, list[str]], property_renaming_config: dict[str, str]) -> dict:
+def _process_asset_properties(properties: dict[str, list[str]], property_renaming_config: dict[str, str]) -> dict:
     metadata: dict[str, str] = {}
     fields: dict[str, str | dict] = {}
 
@@ -251,3 +404,15 @@ def _process_properties(properties: dict[str, list[str]], property_renaming_conf
         fields["metadata"] = metadata
 
     return fields
+
+
+def _process_relationship_properties(
+    properties: dict[str, list[str]], property_renaming_config: dict[str, str]
+) -> dict:
+    relationships: dict[str, list[str]] = {}
+
+    for original_property, values in properties.items():
+        if renamed_property := property_renaming_config.get(original_property, None):
+            relationships[renamed_property] = values
+
+    return relationships

cognite/neat/graph/loaders/_rdf2dms.py

@@ -34,7 +34,7 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
         data_model (dm.DataModel[dm.View] | None): The data model to load.
         instance_space (str): The instance space to load the data into.
         class_by_view_id (dict[ViewId, str] | None): A mapping from view id to class name. Defaults to None.
-        creat_issues (Sequence[NeatIssue] | None): A list of issues that occurred during reading. Defaults to None.
+        create_issues (Sequence[NeatIssue] | None): A list of issues that occurred during reading. Defaults to None.
         tracker (type[Tracker] | None): The tracker to use. Defaults to None.
     """
 

cognite/neat/legacy/graph/extractors/_mock_graph_generator.py

@@ -241,9 +241,9 @@ def _generate_mock_data_property_triples(
     python_type = XSD_VALUE_TYPE_MAPPINGS[value_type].python
     triples = []
     for id_ in instance_ids:
-        if python_type == int:
+        if python_type is int:
             triples.append((id_, URIRef(namespace[property_]), Literal(random.randint(1, 1983))))
-        elif python_type == float:
+        elif python_type is float:
             triples.append((id_, URIRef(namespace[property_]), Literal(numpy.float32(random.uniform(1, 1983)))))
         # generate string
         else:

cognite/neat/legacy/rules/models/rules.py

@@ -886,7 +886,7 @@ class Property(Resource):
         if self.property_type == "DatatypeProperty" and self.default:
             default_value = self.default[0] if isinstance(self.default, list) else self.default
 
-            if type(default_value) != self.expected_value_type.python:
+            if type(default_value) is not self.expected_value_type.python:
                 try:
                     if isinstance(self.default, list):
                         updated_list = []

cognite/neat/rules/analysis/_asset.py

@@ -128,7 +128,7 @@ class AssetAnalysis(BaseAnalysis[AssetRules, AssetClass, AssetProperty, ClassEnt
             implementation_type=EntityTypes.relationship,
         )
 
-    def define_property_renaming_config(self, class_: ClassEntity) -> dict[str, str]:
+    def define_asset_property_renaming_config(self, class_: ClassEntity) -> dict[str, str]:
         property_renaming_configuration = {}
 
         if asset_definition := self.asset_definition().get(class_, None):
@@ -141,3 +141,33 @@ class AssetAnalysis(BaseAnalysis[AssetRules, AssetClass, AssetProperty, ClassEnt
                     property_renaming_configuration[property_] = f"{asset_property}.{property_}"
 
         return property_renaming_configuration
+
+    def define_relationship_property_renaming_config(self, class_: ClassEntity) -> dict[str, str]:
+        property_renaming_configuration = {}
+
+        if relationship_definition := self.relationship_definition().get(class_, None):
+            for property_, transformation in relationship_definition.items():
+                relationship = cast(list[RelationshipEntity], transformation.implementation)[0]
+
+                if relationship.label:
+                    property_renaming_configuration[property_] = relationship.label
+                else:
+                    property_renaming_configuration[property_] = property_
+
+        return property_renaming_configuration
+
+    def define_labels(self) -> set:
+        labels = set()
+
+        for _, properties in AssetAnalysis(self.rules).relationship_definition().items():
+            for property_, definition in properties.items():
+                labels.add(
+                    cast(RelationshipEntity, definition.implementation[0]).label
+                    if cast(RelationshipEntity, definition.implementation[0]).label
+                    else property_
+                )
+
+        for class_ in AssetAnalysis(self.rules).asset_definition().keys():
+            labels.add(class_.suffix)
+
+        return labels

cognite/neat/rules/importers/_dms2rules.py

@@ -346,6 +346,7 @@ class DMSImporter(BaseImporter):
             value_type=value_type,
             is_list=self._get_is_list(prop),
             nullable=self._get_nullable(prop),
+            immutable=self._get_immutable(prop),
             default=self._get_default(prop),
             container=ContainerEntity.from_id(prop.container) if isinstance(prop, dm.MappedPropertyApply) else None,
             container_property=prop.container_property_identifier if isinstance(prop, dm.MappedPropertyApply) else None,
@@ -402,6 +403,12 @@ class DMSImporter(BaseImporter):
         else:
             return None
 
+    def _get_immutable(self, prop: ViewPropertyApply) -> bool | None:
+        if isinstance(prop, dm.MappedPropertyApply):
+            return self._container_prop_unsafe(prop).immutable
+        else:
+            return None
+
     def _get_is_list(self, prop: ViewPropertyApply) -> bool | None:
         if isinstance(prop, dm.MappedPropertyApply):
             prop_type = self._container_prop_unsafe(prop).type

cognite/neat/rules/models/dms/_exporter.py

@@ -290,7 +290,9 @@ class _DMSExporter:
                     type_ = type_cls()
                 container.properties[prop.container_property] = dm.ContainerProperty(
                     type=type_,
+                    # If not set, nullable is True and immutable is False
                     nullable=prop.nullable if prop.nullable is not None else True,
+                    immutable=prop.immutable if prop.immutable is not None else False,
                     default_value=prop.default,
                     name=prop.name,
                     description=prop.description,

cognite/neat/rules/models/dms/_rules.py

@@ -177,6 +177,7 @@ class DMSProperty(SheetEntity):
     connection: Literal["direct", "edge", "reverse"] | None = Field(None, alias="Connection")
     value_type: DataType | ViewPropertyEntity | ViewEntity | DMSUnknownEntity = Field(alias="Value Type")
     nullable: bool | None = Field(default=None, alias="Nullable")
+    immutable: bool | None = Field(default=None, alias="Immutable")
     is_list: bool | None = Field(default=None, alias="Is List")
     default: str | int | dict | None = Field(None, alias="Default")
     reference: URLEntity | ReferenceEntity | None = Field(default=None, alias="Reference", union_mode="left_to_right")

cognite/neat/rules/models/dms/_rules_input.py

@@ -78,6 +78,7 @@ class DMSPropertyInput:
     description: str | None = None
     connection: Literal["direct", "edge", "reverse"] | None = None
     nullable: bool | None = None
+    immutable: bool | None = None
     is_list: bool | None = None
     default: str | int | dict | None = None
     reference: str | None = None
@@ -119,6 +120,7 @@ class DMSPropertyInput:
             description=data.get("description"),
             connection=data.get("connection"),
             nullable=data.get("nullable"),
+            immutable=data.get("immutable"),
             is_list=data.get("is_list"),
             default=data.get("default"),
             reference=data.get("reference"),
@@ -154,6 +156,7 @@ class DMSPropertyInput:
             "Description": self.description,
             "Connection": self.connection,
             "Nullable": self.nullable,
+            "Immutable": self.immutable,
             "Is List": self.is_list,
             "Default": self.default,
             "Reference": self.reference,

cognite/neat/rules/models/information/_rules.py

@@ -216,7 +216,7 @@ class InformationProperty(SheetEntity):
         if self.type_ == EntityTypes.data_property and self.default:
             default_value = self.default[0] if isinstance(self.default, list) else self.default
 
-            if type(default_value) != self.value_type.python:
+            if type(default_value) is not self.value_type.python:
                 try:
                     if isinstance(self.default, list):
                         updated_list = []

{cognite_neat-0.87.3.dist-info → cognite_neat-0.87.6.dist-info}/METADATA

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

{cognite_neat-0.87.3.dist-info → cognite_neat-0.87.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cognite/neat/__init__.py,sha256=AiexNcHdAHFbrrbo9c65gtil1dqx_SGraDH1PSsXjKE,126
 cognite/neat/_shared.py,sha256=RSaHm2eJceTlvb-hMMe4nHgoHdPYDfN3XcxDXo24k3A,1530
-cognite/neat/_version.py,sha256=3v-UA6wOjR8iz4XHC5-uiPeVNKlUaUCf6XCUN-gr2NI,23
+cognite/neat/_version.py,sha256=zHK3D8i3mdcm2cU252645u9BQTB66eyTBLNGSit98n4,23
 cognite/neat/app/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/app/api/asgi/metrics.py,sha256=nxFy7L5cChTI0a-zkCiJ59Aq8yLuIJp5c9Dg0wRXtV0,152
 cognite/neat/app/api/configuration.py,sha256=L1DCtLZ1HZku8I2z-JWd5RDsXhIsboFsKwAMhkrm-bY,3600
@@ -14,7 +14,7 @@ cognite/neat/app/api/routers/core.py,sha256=WznuQHzGkhBzf_GrHFiaSCXewBiQcrT4O6kY
 cognite/neat/app/api/routers/crud.py,sha256=VCQMjvcLosELkmMZRiunyd-RK5sltQFjcCSrGk5kwXc,4597
 cognite/neat/app/api/routers/data_exploration.py,sha256=xTE2nK8qfnG7iqIYa4KaLByi_EZPpD6NXQg5HQtqDcg,13703
 cognite/neat/app/api/routers/metrics.py,sha256=S_bUQk_GjfQq7WbEhSVdow4MUYBZ_bZNafzgcKogXK8,210
-cognite/neat/app/api/routers/rules.py,sha256=MECSzurNe7y07-GfsggBDmfNtYkFuLdAm9ogSjLbzzk,8121
+cognite/neat/app/api/routers/rules.py,sha256=olITHs56xyGz7Lo7vOQWH3ju5iHtpy86vh4NzbVuxhQ,8125
 cognite/neat/app/api/routers/workflows.py,sha256=fPqNT0swH-sfcjD8PLK5NzKY1sVSU7GaCMkHfH78gxw,12393
 cognite/neat/app/api/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/app/api/utils/data_mapping.py,sha256=ocqRyeCLbk3gS1NrQQnDr0w-q-xbkqV60uLZzsJIdyE,564
@@ -57,7 +57,7 @@ cognite/neat/graph/exceptions.py,sha256=R6pyOH774n9w2x_X_nrUr8OMAdjJMf_XPIqAvxIQ
 cognite/neat/graph/extractors/__init__.py,sha256=nXcNp6i3-1HteIkr8Ujxk4b09W5jk27Q3eWuwjcnGnM,1647
 cognite/neat/graph/extractors/_base.py,sha256=8IWygpkQTwo0UOmbbwWVI7540_klTVdUVX2JjVPFRIs,498
 cognite/neat/graph/extractors/_classic_cdf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite/neat/graph/extractors/_classic_cdf/_assets.py,sha256=3rhQU_jabVkfBy05BHYS-mbQzCEN_fkeZiTUzj3qeyM,7854
+cognite/neat/graph/extractors/_classic_cdf/_assets.py,sha256=saRtiT-TPvp3pzm-PBfyXf-bCWEEjhwWUel5SBesUvg,8344
 cognite/neat/graph/extractors/_classic_cdf/_events.py,sha256=_XhfNcDVrxhPsQD6jgh3OZVhyzF-bjjrW3onePBUU-A,5113
 cognite/neat/graph/extractors/_classic_cdf/_files.py,sha256=lP_y1HmF5rQ0Ufz4KL0fyPvM02Qv9Rvu6jwBZKyAsBY,6290
 cognite/neat/graph/extractors/_classic_cdf/_labels.py,sha256=Cd2l_WWFypryTc3zB8z5upgxh4BVf-vWSH2G7plh9lo,3015
@@ -65,14 +65,14 @@ cognite/neat/graph/extractors/_classic_cdf/_relationships.py,sha256=zpJlRbx1Jx5J
 cognite/neat/graph/extractors/_classic_cdf/_sequences.py,sha256=K6A_vZ_3HNI-51DSB23y9hhVajxCdkQKw3gv1TXIyuA,4681
 cognite/neat/graph/extractors/_classic_cdf/_timeseries.py,sha256=5n73uLcA5l30zGZuPq6xSs6hti1Al2qnj3c3q7zkQQg,6126
 cognite/neat/graph/extractors/_dexpi.py,sha256=Q3whJpEi3uFMzJGAAeUfgRnAzz6ZHmtuEdVBWqsZsTM,9384
-cognite/neat/graph/extractors/_mock_graph_generator.py,sha256=UNSAkspuQTA8uTR65BDgwzU89NJ1k0NkJLwwLatGmFk,14678
+cognite/neat/graph/extractors/_mock_graph_generator.py,sha256=2qHh3fJxxAR9QdR6TPu-6DOvcjJkjHF4bwZN7lulziY,14678
 cognite/neat/graph/extractors/_rdf_file.py,sha256=ialMCLv9WH5k6v1YMfozfcmAYhz8OVo9jVhsKMyQkDA,763
 cognite/neat/graph/issues/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/graph/issues/loader.py,sha256=v8YDsehkUT1QUG61JM9BDV_lqowMUnDmGmbay0aFzN4,3085
 cognite/neat/graph/loaders/__init__.py,sha256=TbeJqifd16JLOglPVNOeb6pN_w060UYag50KquBM_r0,769
-cognite/neat/graph/loaders/_base.py,sha256=p58Lb0yBDQpxhpo7tfLiyPxSB0TDoqlo6WKBWC-huRw,3498
-cognite/neat/graph/loaders/_rdf2asset.py,sha256=n83OW2P0sH54gAtcdVj2yiBrX_W4sjRiANvzwD7ShyY,10125
-cognite/neat/graph/loaders/_rdf2dms.py,sha256=HxfHmUnkDPaQWyEyEqmqI7xGBNwJY8XmcWALaOMinNk,14595
+cognite/neat/graph/loaders/_base.py,sha256=497Jc1Gu3SmBpafUNTQ6fCAJz6dKq8HkweecdUmDsu4,3651
+cognite/neat/graph/loaders/_rdf2asset.py,sha256=CqSXDcF4gVPSvE_9jy7yyuaCv-8HA9g0ld_2hqhnXug,17793
+cognite/neat/graph/loaders/_rdf2dms.py,sha256=7HdFAVMORLaHIWzxKbm1DDGi45TcvqxXZYXYnggLYBI,14596
 cognite/neat/graph/models.py,sha256=AtLgZh2qyRP6NRetjQCy9qLMuTQB0CH52Zsev-qa2sk,149
 cognite/neat/graph/queries/__init__.py,sha256=BgDd-037kvtWwAoGAy8eORVNMiZ5-E9sIV0txIpeaN4,50
 cognite/neat/graph/queries/_base.py,sha256=82WJMT2SreLCKq00hujrk2H5W_w_Rq53bJQTK7E_Bz4,8500
@@ -98,7 +98,7 @@ cognite/neat/legacy/graph/extractors/__init__.py,sha256=wqCiqz-sXhUpTL5LRcrl_KFT
 cognite/neat/legacy/graph/extractors/_base.py,sha256=ohiuEzwZ1Fh9ers07MCbjGOGQ0HLb-ctwgEvGy7o_AQ,363
 cognite/neat/legacy/graph/extractors/_dexpi.py,sha256=R4itgYxWUiPlZgRqUB4IrmLKzpsxhHrxSv7Gq4PeodM,1469
 cognite/neat/legacy/graph/extractors/_graph_capturing_sheet.py,sha256=sEV6P4a4OlFx_O-vtKoB1H-ex1RnD5VhqmBcazGfLwk,17695
-cognite/neat/legacy/graph/extractors/_mock_graph_generator.py,sha256=Df_9IxlLq2j9i3FBA2s-ybRKv7wXDpvIh5kNv5qQyxw,14955
+cognite/neat/legacy/graph/extractors/_mock_graph_generator.py,sha256=rBWiQGPsEBmI31UNU3v8ZoJO8BvY2ybGUualCGjemxE,14955
 cognite/neat/legacy/graph/loaders/__init__.py,sha256=Nap1LGaXA3AotL5U6pwY1Yc3J92Y7GC60qVPBhGl5LA,701
 cognite/neat/legacy/graph/loaders/_asset_loader.py,sha256=mFYIF7bzwsV7RcEoNgObW5NRj-as7XUJBs97QpogGRU,23873
 cognite/neat/legacy/graph/loaders/_base.py,sha256=oj1vo8dGPXxJORQXPa_kJa5G53VZBXOiIoWOngtMw5E,2383
@@ -167,7 +167,7 @@ cognite/neat/legacy/rules/models/__init__.py,sha256=23T73EaHuS0dsYTh6tww6gXAc7S4
 cognite/neat/legacy/rules/models/_base.py,sha256=1WNXBJHJ3nwnVoeNhpm9B6TBuqWYYgChkrdK4FJIpQM,4989
 cognite/neat/legacy/rules/models/raw_rules.py,sha256=o7iPhV7sS7h22edcyOpvJAQFPE7PiTULZAmGmZtKZPI,12491
 cognite/neat/legacy/rules/models/rdfpath.py,sha256=iXEPnx0rdOzkJ68FoJmsWQBbMBABenQ_cyDlsqwPCBg,7351
-cognite/neat/legacy/rules/models/rules.py,sha256=p4Ul8Yuz-ol3PMaxHQ87bwykFEtC1N400iZm0o2wkYo,51367
+cognite/neat/legacy/rules/models/rules.py,sha256=yBtUwpsd3CDJkTj6jBFPOTND-Q-wZkPiBX70b_2_4GU,51371
 cognite/neat/legacy/rules/models/tables.py,sha256=hj7qjjIpwDXBnkVQrL47V2kjFxDz7aE4mkYOZTwepj8,171
 cognite/neat/legacy/rules/models/value_types.py,sha256=wAjYe0yv90FgKqMjJITxyg4QgCYaolFVM9WAr7g0bJY,4402
 cognite/neat/legacy/workflows/examples/Export_DMS/workflow.yaml,sha256=dViI5aotf6cvcsePXjDBB_osyw1IUbNu2-rsGS1-5NM,1898
@@ -184,7 +184,7 @@ cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/rules/_shared.py,sha256=G0bIu5XSrtEa93qqtOS5P0IDJUkU32gX5ypFhcV6t5c,216
 cognite/neat/rules/analysis/__init__.py,sha256=1qQXgddwSmRjC5s22XfQhsn8XPYfwAV_2n6lqeWJmKc,141
-cognite/neat/rules/analysis/_asset.py,sha256=UvBl8vM83azkCI2As97xAfXe33nNqt4QSCmc5KvcZ-4,6044
+cognite/neat/rules/analysis/_asset.py,sha256=SCiDatwDPi80jj41yQAp740irRWijMKEtAObkwKOKYs,7322
 cognite/neat/rules/analysis/_base.py,sha256=jb9G2g59QaSZDwJmG1Kh9rq7CprvyrokTqfMytr0ZOk,16758
 cognite/neat/rules/analysis/_information.py,sha256=TU9QbhtyhPVYqAxR-9L5awevl9i3q7x1Y25D5xb_Ciw,8085
 cognite/neat/rules/examples/__init__.py,sha256=nxIwueAcHgZhkYriGxnDLQmIyiT8PByPHbScjYKDKe0,374
@@ -199,7 +199,7 @@ cognite/neat/rules/exporters/_rules2yaml.py,sha256=GA8eUYRxUfIU6IMvlyGO5JidkOD5e
 cognite/neat/rules/exporters/_validation.py,sha256=OlKIyf4nhSDehJwFHDQ8Zdf6HpNfW7dSe2s67eywHu4,4078
 cognite/neat/rules/importers/__init__.py,sha256=Vxl2Iq1dMXUsI6Wb411xPI3rromdq50xZUci-S8faSw,1097
 cognite/neat/rules/importers/_base.py,sha256=EgXF2pmJ90LbmFs5rAMwh151wGX3PGkhTTF6rC-DzOg,4510
-cognite/neat/rules/importers/_dms2rules.py,sha256=tCDzeieIDSQhI2krcOYOyqlA1LNMzo6W__p4Fecbc7U,19470
+cognite/neat/rules/importers/_dms2rules.py,sha256=Bk9vJT9Tdei2OE_1HaaFYjitBFp0omyGuqIQEblF_IE,19744
 cognite/neat/rules/importers/_dtdl2rules/__init__.py,sha256=CNR-sUihs2mnR1bPMKs3j3L4ds3vFTsrl6YycExZTfU,68
 cognite/neat/rules/importers/_dtdl2rules/_unit_lookup.py,sha256=wW4saKva61Q_i17guY0dc4OseJDQfqHy_QZBtm0OD6g,12134
 cognite/neat/rules/importers/_dtdl2rules/dtdl_converter.py,sha256=5ee8bD4iJ3Ndhx_S234XBCuBHxYjFkJnWiwnZwbTrXs,12432
@@ -237,9 +237,9 @@ cognite/neat/rules/models/asset/_validation.py,sha256=7P46ksX2jkLbexfHX0ocYijFcx
 cognite/neat/rules/models/data_types.py,sha256=mHTjWh47VzLwrr0w6dRf59LW7pTTGRTgsxvtW9p0JWw,6020
 cognite/neat/rules/models/dms/__init__.py,sha256=Wzyqzz2ZIjpUbDg04CMuuIAw-f2A02DayNeqO9R-2Hw,491
 cognite/neat/rules/models/dms/_converter.py,sha256=2qiMsFKwVBi4K6ZnJPajUEtVSGYg_Wof1yGZLNMWrZ4,5869
-cognite/neat/rules/models/dms/_exporter.py,sha256=JrT04hWqxWSLGnCMju9EIxn63hHcC-Mjx9S27hQR604,25042
-cognite/neat/rules/models/dms/_rules.py,sha256=pYWyS9E1hoceeU-nvKt6JsgPZYyHnW3JedI7wo-sIXg,20148
-cognite/neat/rules/models/dms/_rules_input.py,sha256=M5AqwW-p6z_qAum-1HE_lmONSmg-vF1ak7Y_AiM8vnU,13525
+cognite/neat/rules/models/dms/_exporter.py,sha256=YfJXW4lTD9YZVq6-YBhzK9U83l9SMV-Pq-40rLGOTTc,25203
+cognite/neat/rules/models/dms/_rules.py,sha256=9sXEnx6Djy_uVagKn1j6WDGXNIGSmfFsLIJOWT6S6M0,20216
+cognite/neat/rules/models/dms/_rules_input.py,sha256=bGarQoDNZmBuSZh_l7ARsZH86_hVWmlX73GmyOI3zGE,13645
 cognite/neat/rules/models/dms/_schema.py,sha256=WmF4ektkA9LhHiz9QuQEx0fuxXyxeSsllpqQMkz2Epo,49523
 cognite/neat/rules/models/dms/_serializer.py,sha256=iqp2zyyf8jEcU-R3PERuN8nu248xIqyxiWj4owAn92g,6406
 cognite/neat/rules/models/dms/_validation.py,sha256=5mk9L99FSwC8Ok7weEjnFJ_OZnmqMWUc6XFMTfkqfDw,14549
@@ -247,7 +247,7 @@ cognite/neat/rules/models/domain.py,sha256=qG1387w6E4XIviOb7EwAjMaavUUQBweYlmYrZ
 cognite/neat/rules/models/entities.py,sha256=xYUNZ9nhU2y741xW6tqvF_JeQS1KsLi3YB-3zE0E79w,20771
 cognite/neat/rules/models/information/__init__.py,sha256=HR6g8xgyU53U7Ck8pPdbT70817Q4NC1r1pCRq5SA8iw,291
 cognite/neat/rules/models/information/_converter.py,sha256=J3mY5clqMY1PR_EmIT-GsTBJ16XCpHQG8EkQWvpqdnI,13930
-cognite/neat/rules/models/information/_rules.py,sha256=9qUfKGUSNgJRjIpm8hBDUDDbM1ikBKHqEcUU1ZEglXI,13472
+cognite/neat/rules/models/information/_rules.py,sha256=-PYfsyQa7IqU8ziVZQkz6h2fl_VeVszVRq6c7zc5hEo,13476
 cognite/neat/rules/models/information/_rules_input.py,sha256=AOTslaehKZH67VJaJO5bu8tT-1iSQz2uwf9mWFpK_44,10580
 cognite/neat/rules/models/information/_serializer.py,sha256=yti9I_xJruxrib66YIBInhze___Io-oPTQH6uWDumPE,3503
 cognite/neat/rules/models/information/_validation.py,sha256=rkDGbRHCLKyoZ6ooBZBfjDslouVUu9GXmfBcCorwxt4,8216
@@ -312,8 +312,8 @@ cognite/neat/workflows/steps_registry.py,sha256=fkTX14ZA7_gkUYfWIlx7A1XbCidvqR23
 cognite/neat/workflows/tasks.py,sha256=dqlJwKAb0jlkl7abbY8RRz3m7MT4SK8-7cntMWkOYjw,788
 cognite/neat/workflows/triggers.py,sha256=_BLNplzoz0iic367u1mhHMHiUrCwP-SLK6_CZzfODX0,7071
 cognite/neat/workflows/utils.py,sha256=gKdy3RLG7ctRhbCRwaDIWpL9Mi98zm56-d4jfHDqP1E,453
-cognite_neat-0.87.3.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.87.3.dist-info/METADATA,sha256=XOSvfzE9pNsNl2d6VybR5JybtudHo614LtOdlz_Jf18,9493
-cognite_neat-0.87.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cognite_neat-0.87.3.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
-cognite_neat-0.87.3.dist-info/RECORD,,
+cognite_neat-0.87.6.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.87.6.dist-info/METADATA,sha256=652vw8eKhaR_1-682l1xl4ODE8CC89qx1jlIjRyxRXg,9493
+cognite_neat-0.87.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cognite_neat-0.87.6.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
+cognite_neat-0.87.6.dist-info/RECORD,,