cognite-neat 0.87.0__py3-none-any.whl → 0.87.4__py3-none-any.whl

cognite/neat/graph/stores/_base.py

@@ -179,9 +179,21 @@ class NeatGraphStore:
             warnings.warn("Desired type not found in graph!", stacklevel=2)
             return None
 
-        if InformationAnalysis(self.rules).has_hop_transformations():
+        analysis = InformationAnalysis(self.rules)
+        has_hop_transformations = analysis.has_hop_transformations()
+        has_self_reference_transformations = analysis.has_self_reference_property_transformations()
+        if has_hop_transformations or has_self_reference_transformations:
+            msg = (
+                f"Rules contain [{'Hop' if has_hop_transformations else '' }"
+                f", {'SelfReferenceProperty' if has_self_reference_transformations else '' }]"
+                " rdfpath."
+                f" Run [{'ReduceHopTraversal' if has_hop_transformations else '' }"
+                f", {'AddSelfReferenceProperty' if has_self_reference_transformations else '' }]"
+                " transformer(s) first!"
+            )
+
             warnings.warn(
-                "Rules contain Hop rdfpath, run ReduceHopTraversal transformer first!",
+                msg,
                 stacklevel=2,
             )
             return None
@@ -189,7 +201,6 @@ class NeatGraphStore:
         instance_ids = self.queries.list_instances_ids_of_class(self.rules.metadata.namespace[class_])
 
         property_renaming_config = InformationAnalysis(self.rules).define_property_renaming_config(class_entity)
-        print(property_renaming_config)
 
         for instance_id in instance_ids:
             yield self.queries.describe(instance_id, property_renaming_config)

cognite/neat/graph/transformers/__init__.py

@@ -6,6 +6,7 @@ from ._classic_cdf import (
     AssetSequenceConnector,
     AssetTimeSeriesConnector,
 )
+from ._rdfpath import AddSelfReferenceProperty
 
 __all__ = [
     "AddAssetDepth",
@@ -14,6 +15,7 @@ __all__ = [
     "AssetFileConnector",
     "AssetEventConnector",
     "AssetRelationshipConnector",
+    "AddSelfReferenceProperty",
 ]
 
 Transformers = (
@@ -23,4 +25,5 @@ Transformers = (
     | AssetFileConnector
     | AssetEventConnector
     | AssetRelationshipConnector
+    | AddSelfReferenceProperty
 )

cognite/neat/graph/transformers/_rdfpath.py

@@ -1,3 +1,9 @@
+from rdflib import RDF, Graph
+
+from cognite.neat.rules.analysis import InformationAnalysis
+from cognite.neat.rules.models._rdfpath import RDFPath, SingleProperty
+from cognite.neat.rules.models.information import InformationRules
+
 from ._base import BaseTransformer
 
 
@@ -5,3 +11,39 @@ class ReduceHopTraversal(BaseTransformer):
     """ReduceHopTraversal is a transformer that reduces the number of hops to direct connection."""
 
     ...
+
+
+class AddSelfReferenceProperty(BaseTransformer):
+    description: str = "Adds property that contains id of reference to all references of given class in Rules"
+    _use_only_once: bool = True
+    _need_changes = frozenset({})
+
+    def __init__(
+        self,
+        rules: InformationRules,
+    ):
+        self.rules = rules
+        self.properties = InformationAnalysis(rules).all_reference_transformations()
+
+    def transform(self, graph: Graph) -> None:
+        for property_ in self.properties:
+            prefix = property_.transformation.traversal.class_.prefix
+            suffix = property_.transformation.traversal.class_.suffix
+
+            namespace = self.rules.prefixes[prefix] if prefix in self.rules.prefixes else self.rules.metadata.namespace
+
+            for reference in graph.subjects(RDF.type, namespace[suffix]):
+                graph.add(
+                    (
+                        reference,
+                        self.rules.metadata.namespace[property_.property_],
+                        reference,
+                    )
+                )
+
+            traversal = SingleProperty.from_string(
+                class_=property_.class_.id,
+                property_=f"{self.rules.metadata.prefix}:{property_.property_}",
+            )
+
+            property_.transformation = RDFPath(traversal=traversal)

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

@@ -20,7 +20,7 @@ from cognite.neat.legacy.rules.analysis import (
 from cognite.neat.legacy.rules.exporters._rules2rules import subset_rules
 from cognite.neat.legacy.rules.models import Rules
 from cognite.neat.legacy.rules.models.value_types import XSD_VALUE_TYPE_MAPPINGS
-from cognite.neat.utils.utils import remove_namespace_from_uri
+from cognite.neat.utils.rdf_ import remove_namespace_from_uri
 
 from ._base import BaseExtractor
 

cognite/neat/legacy/graph/loaders/_asset_loader.py

@@ -15,8 +15,8 @@ from rdflib.query import ResultRow
 from cognite.neat.legacy.graph.stores import NeatGraphStoreBase
 from cognite.neat.legacy.rules.models import Rules
 from cognite.neat.legacy.rules.models.rules import Property
-from cognite.neat.utils import remove_namespace_from_uri
-from cognite.neat.utils.utils import epoch_now_ms
+from cognite.neat.utils.rdf_ import remove_namespace_from_uri
+from cognite.neat.utils.time_ import epoch_now_ms
 
 from ._base import CogniteLoader
 

cognite/neat/legacy/graph/loaders/core/rdf_to_assets.py

@@ -18,7 +18,10 @@ from rdflib.term import URIRef
 from cognite.neat.legacy.graph.loaders.core.models import AssetTemplate
 from cognite.neat.legacy.graph.stores import NeatGraphStoreBase
 from cognite.neat.legacy.rules.models.rules import Property, Rules
-from cognite.neat.utils.utils import chunker, datetime_utc_now, remove_namespace_from_uri, retry_decorator
+from cognite.neat.utils.auxiliary import retry_decorator
+from cognite.neat.utils.collection_ import chunker
+from cognite.neat.utils.rdf_ import remove_namespace_from_uri
+from cognite.neat.utils.time_ import datetime_utc_now
 
 if sys.version_info >= (3, 11):
     from datetime import UTC
@@ -899,7 +902,7 @@ def _micro_batch_push(
         except CogniteDuplicatedError:
             # this is handling of very rare case when some assets might be lost . Normally this should not happen.
             # Last attempt to recover
-            client.assets.create_hierarchy(batch, upsert=True)
+            client.assets.create_hierarchy(batch, upsert=True)  # type: ignore[arg-type]
 
         delta_time = (datetime_utc_now() - start_time).seconds
 

cognite/neat/legacy/graph/loaders/core/rdf_to_relationships.py

@@ -14,7 +14,10 @@ from cognite.neat.legacy.graph.loaders.core.models import RelationshipDefinition
 from cognite.neat.legacy.graph.loaders.core.rdf_to_assets import _categorize_cdf_assets
 from cognite.neat.legacy.graph.stores import NeatGraphStoreBase
 from cognite.neat.legacy.rules.models.rules import Rules
-from cognite.neat.utils.utils import chunker, datetime_utc_now, epoch_now_ms, remove_namespace_from_uri, retry_decorator
+from cognite.neat.utils.auxiliary import retry_decorator
+from cognite.neat.utils.collection_ import chunker
+from cognite.neat.utils.rdf_ import remove_namespace_from_uri
+from cognite.neat.utils.time_ import datetime_utc_now, epoch_now_ms
 
 
 def define_relationships(rules: Rules, data_set_id: int, stop_on_exception: bool = False) -> RelationshipDefinitions:

cognite/neat/legacy/graph/loaders/rdf_to_dms.py

@@ -13,7 +13,9 @@ from cognite.neat.legacy.graph.transformations.query_generator.sparql import tri
 from cognite.neat.legacy.rules.exporters._rules2dms import DMSSchemaComponents
 from cognite.neat.legacy.rules.exporters._rules2pydantic_models import add_class_prefix_to_xid, rules_to_pydantic_models
 from cognite.neat.legacy.rules.models.rules import Rules
-from cognite.neat.utils.utils import chunker, datetime_utc_now, retry_decorator
+from cognite.neat.utils.auxiliary import retry_decorator
+from cognite.neat.utils.collection_ import chunker
+from cognite.neat.utils.time_ import datetime_utc_now
 
 from ._base import CogniteLoader
 

cognite/neat/legacy/graph/transformations/query_generator/sparql.py

@@ -21,7 +21,7 @@ from cognite.neat.legacy.rules.models.rdfpath import (
     parse_traversal,
 )
 from cognite.neat.legacy.rules.models.rules import Rules
-from cognite.neat.utils.utils import remove_namespace_from_uri
+from cognite.neat.utils.rdf_ import remove_namespace_from_uri
 
 
 def _generate_prefix_header(prefixes: dict[str, Namespace] | None = None) -> str:

cognite/neat/legacy/graph/transformations/transformer.py

@@ -24,7 +24,7 @@ from cognite.neat.legacy.rules.models.rdfpath import (
     parse_rule,
 )
 from cognite.neat.legacy.rules.models.rules import Rules
-from cognite.neat.utils.utils import remove_namespace_from_uri
+from cognite.neat.utils.rdf_ import remove_namespace_from_uri
 
 prom_total_proc_rules_g = Gauge("neat_total_processed_rules", "Number of processed rules", ["state"])
 rules_processing_timing_metric = Gauge(

cognite/neat/legacy/rules/exporters/_rules2dms.py

@@ -8,6 +8,7 @@ from pathlib import Path
 from typing import ClassVar, Literal, cast, no_type_check
 
 import yaml
+from cognite.client.data_classes.data_modeling.data_types import ListablePropertyType
 
 from cognite.neat.legacy.rules.models.value_types import ValueTypeMapping
 
@@ -45,7 +46,7 @@ from cognite.neat.legacy.rules.exporters._base import BaseExporter
 from cognite.neat.legacy.rules.exporters._validation import are_entity_names_dms_compliant
 from cognite.neat.legacy.rules.models._base import ContainerEntity, EntityTypes, ParentClass
 from cognite.neat.legacy.rules.models.rules import Class, Property, Rules
-from cognite.neat.utils.utils import generate_exception_report
+from cognite.neat.utils.auxiliary import generate_exception_report
 
 if sys.version_info < (3, 11):
     from exceptiongroup import ExceptionGroup
@@ -278,13 +279,17 @@ class DMSSchemaComponents(BaseModel):
                             existing_property, default_value=None
                         )
 
-                    # scenario: property hold multiple values -> set is_list to True
+                    # scenario: property holds multiple values -> set is_list to True
                     if (
                         not isinstance(existing_property.type, DirectRelation)
                         and not isinstance(api_container_property.type, DirectRelation)
+                        and isinstance(existing_property.type, ListablePropertyType)
+                        and isinstance(api_container_property.type, ListablePropertyType)
                         and existing_property.type.is_list != api_container_property.type.is_list
                     ):
-                        containers[container_id].properties[container_property_id].type.is_list = True
+                        type_ = containers[container_id].properties[container_property_id].type
+                        if isinstance(type_, ListablePropertyType):
+                            type_.is_list = True
 
         if errors:
             raise ExceptionGroup("Properties value types have been redefined! This is prohibited! Aborting!", errors)

cognite/neat/legacy/rules/exporters/_rules2graphql.py

@@ -14,7 +14,7 @@ from cognite.neat.legacy.rules.analysis import to_class_property_pairs
 from cognite.neat.legacy.rules.exporters._validation import are_entity_names_dms_compliant, are_properties_redefined
 from cognite.neat.legacy.rules.models.rules import Rules
 from cognite.neat.legacy.rules.models.value_types import XSD_VALUE_TYPE_MAPPINGS
-from cognite.neat.utils.utils import generate_exception_report
+from cognite.neat.utils.auxiliary import generate_exception_report
 
 from ._base import BaseExporter
 

cognite/neat/legacy/rules/exporters/_rules2ontology.py

@@ -14,7 +14,8 @@ from cognite.neat.legacy.rules.exporters._base import BaseExporter
 from cognite.neat.legacy.rules.exporters._validation import are_properties_redefined
 from cognite.neat.legacy.rules.models.rules import Class, Metadata, Property, Rules
 from cognite.neat.legacy.rules.models.value_types import XSD_VALUE_TYPE_MAPPINGS
-from cognite.neat.utils.utils import generate_exception_report, remove_namespace_from_uri
+from cognite.neat.utils.auxiliary import generate_exception_report
+from cognite.neat.utils.rdf_ import remove_namespace_from_uri
 
 if sys.version_info >= (3, 11):
     from typing import Self

cognite/neat/legacy/rules/exporters/_rules2pydantic_models.py

@@ -11,7 +11,6 @@ from cognite.client.data_classes.data_modeling.views import SingleHopConnectionD
 from pydantic import BaseModel, ConfigDict, Field, create_model
 from pydantic._internal._model_construction import ModelMetaclass
 from rdflib import Graph, URIRef
-from typing_extensions import TypeAliasType
 
 from cognite.neat.legacy.graph.loaders.core.rdf_to_assets import NeatMetadataKeys
 from cognite.neat.legacy.graph.transformations.query_generator.sparql import build_construct_query, triples2dictionary
@@ -21,7 +20,7 @@ from cognite.neat.legacy.rules.exporters._rules2dms import DMSSchemaComponents
 from cognite.neat.legacy.rules.exporters._validation import are_entity_names_dms_compliant
 from cognite.neat.legacy.rules.models.rules import Property, Rules
 from cognite.neat.legacy.rules.models.value_types import ValueTypeMapping
-from cognite.neat.utils.utils import create_sha256_hash, generate_exception_report
+from cognite.neat.utils.auxiliary import create_sha256_hash, generate_exception_report
 
 if sys.version_info >= (3, 11):
     from datetime import UTC
@@ -30,8 +29,8 @@ else:
 
     UTC = timezone.utc
 
-EdgeOneToOne: TypeAlias = TypeAliasType("EdgeOneToOne", str)  # type: ignore[valid-type]
-EdgeOneToMany: TypeAlias = TypeAliasType("EdgeOneToMany", list[str])  # type: ignore[valid-type]
+EdgeOneToOne: TypeAlias = str  # type: ignore[valid-type]
+EdgeOneToMany: TypeAlias = list[str]  # type: ignore[valid-type]
 
 
 def default_model_configuration(

cognite/neat/legacy/rules/importers/_dms2rules.py

@@ -13,6 +13,7 @@ from cognite.client.data_classes.data_modeling import (
     SingleHopConnectionDefinition,
     View,
 )
+from cognite.client.data_classes.data_modeling.data_types import ListablePropertyType
 from cognite.client.data_classes.data_modeling.ids import DataModelIdentifier, ViewId
 
 from cognite.neat.legacy.rules.models.tables import Tables
@@ -129,7 +130,9 @@ class DMSImporter(BaseImporter):
 
                 max_count: str | float = "1"
                 if isinstance(prop, SingleHopConnectionDefinition) or (
-                    isinstance(prop, MappedProperty) and prop.type.is_list
+                    isinstance(prop, MappedProperty)
+                    and isinstance(prop.type, ListablePropertyType)
+                    and prop.type.is_list
                 ):
                     max_count = float("nan")
 

cognite/neat/legacy/rules/importers/_graph2rules.py

@@ -14,11 +14,7 @@ from cognite.neat.constants import get_default_prefixes
 from cognite.neat.legacy.rules import exceptions
 from cognite.neat.legacy.rules.exporters._rules2rules import to_dms_name
 from cognite.neat.legacy.rules.models.tables import Tables
-from cognite.neat.utils.utils import (
-    get_namespace,
-    remove_namespace_from_uri,
-    uri_to_short_form,
-)
+from cognite.neat.utils.rdf_ import get_namespace, remove_namespace_from_uri, uri_to_short_form
 
 from ._base import BaseImporter
 
@@ -78,26 +74,11 @@ def _create_default_properties_parsing_config() -> dict[str, tuple[str, ...]]:
 
 def _create_default_classes_parsing_config() -> dict[str, tuple[str, ...]]:
     # TODO: these are to be read from Class pydantic model
-    return {
-        "header": (
-            "Class",
-            "Description",
-            "Parent Class",
-            "Source",
-            "Source Entity Name",
-            "Match Type",
-            "Comment",
-        )
-    }
+    return {"header": ("Class", "Description", "Parent Class", "Source", "Source Entity Name", "Match Type", "Comment")}
 
 
 def _parse_prefixes_df(prefixes: dict[str, Namespace]) -> pd.DataFrame:
-    return pd.DataFrame.from_dict(
-        {
-            "Prefix": list(prefixes.keys()),
-            "URI": [str(uri) for uri in prefixes.values()],
-        }
-    )
+    return pd.DataFrame.from_dict({"Prefix": list(prefixes.keys()), "URI": [str(uri) for uri in prefixes.values()]})
 
 
 def _parse_metadata_df() -> pd.DataFrame:
@@ -202,18 +183,10 @@ def _graph_to_data_model_dict(graph: Graph, max_number_of_instance: int = -1) ->
             )
             class_name = f"{class_name}_{len(data_model)+1}"
 
-        data_model[class_name] = {
-            "properties": {},
-            "uri": uri_to_short_form(class_, prefixes),
-        }
+        data_model[class_name] = {"properties": {}, "uri": uri_to_short_form(class_, prefixes)}
 
         for instance in _get_class_instance_ids(graph, class_, max_number_of_instance):
-            for (
-                property_,
-                occurrence,
-                data_type,
-                object_type,
-            ) in _define_instance_properties(graph, instance):
+            for property_, occurrence, data_type, object_type in _define_instance_properties(graph, instance):
                 property_name = remove_namespace_from_uri(property_)
                 _add_uri_namespace_to_prefixes(property_, prefixes)
 

cognite/neat/legacy/rules/importers/_owl2rules/_owl2classes.py

@@ -4,7 +4,7 @@ import numpy as np
 import pandas as pd
 from rdflib import OWL, Graph
 
-from cognite.neat.utils.utils import remove_namespace_from_uri
+from cognite.neat.utils.rdf_ import remove_namespace_from_uri
 
 
 def parse_owl_classes(graph: Graph, make_compliant: bool = False, language: str = "en") -> pd.DataFrame:

cognite/neat/legacy/rules/importers/_owl2rules/_owl2metadata.py

@@ -10,7 +10,8 @@ from cognite.neat.legacy.rules.models.rules import (
     prefix_compliance_regex,
     version_compliance_regex,
 )
-from cognite.neat.utils.utils import convert_rdflib_content, remove_none_elements_from_set
+from cognite.neat.utils.collection_ import remove_none_elements_from_set
+from cognite.neat.utils.rdf_ import convert_rdflib_content
 
 
 def parse_owl_metadata(graph: Graph, make_compliant: bool = False) -> pd.DataFrame:

cognite/neat/legacy/rules/importers/_owl2rules/_owl2properties.py

@@ -4,7 +4,7 @@ import numpy as np
 import pandas as pd
 from rdflib import Graph
 
-from cognite.neat.utils.utils import remove_namespace_from_uri
+from cognite.neat.utils.rdf_ import remove_namespace_from_uri
 
 from ._owl2classes import _data_type_property_class, _object_property_class, _thing_class
 

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

@@ -24,7 +24,7 @@ from cognite.neat.legacy.rules.models.tables import Tables
 
 # importers:
 from cognite.neat.rules import exceptions
-from cognite.neat.utils.utils import generate_exception_report
+from cognite.neat.utils.auxiliary import generate_exception_report
 
 __all__ = ["RawRules"]
 

cognite/neat/rules/analysis/_asset.py

@@ -1,4 +1,5 @@
 import warnings
+from graphlib import TopologicalSorter
 from typing import cast
 
 from cognite.neat.rules.models import AssetRules
@@ -6,6 +7,7 @@ from cognite.neat.rules.models._rdfpath import RDFPath
 from cognite.neat.rules.models.asset import AssetClass, AssetProperty
 from cognite.neat.rules.models.entities import (
     AssetEntity,
+    AssetFields,
     ClassEntity,
     EntityTypes,
     ReferenceEntity,
@@ -95,6 +97,19 @@ class AssetAnalysis(BaseAnalysis[AssetRules, AssetClass, AssetProperty, ClassEnt
 
         return class_property_pairs
 
+    def class_topological_sort(self) -> list[ClassEntity]:
+        child_parent_asset: dict[ClassEntity, set[ClassEntity]] = {}
+        for class_, properties in self.asset_definition().items():
+            child_parent_asset[class_] = set()
+            for property_ in properties.values():
+                if any(
+                    cast(AssetEntity, implementation).property_ == AssetFields.parentExternalId
+                    for implementation in property_.implementation
+                ):
+                    child_parent_asset[property_.class_].add(cast(ClassEntity, property_.value_type))
+
+        return list(TopologicalSorter(child_parent_asset).static_order())
+
     def asset_definition(
         self, only_rdfpath: bool = False, consider_inheritance: bool = False
     ) -> dict[ClassEntity, dict[str, AssetProperty]]:

cognite/neat/rules/analysis/_base.py

@@ -17,7 +17,7 @@ from cognite.neat.rules.models.entities import (
     ReferenceEntity,
 )
 from cognite.neat.rules.models.information import InformationProperty
-from cognite.neat.utils.utils import get_inheritance_path
+from cognite.neat.utils.rdf_ import get_inheritance_path
 
 T_Rules = TypeVar("T_Rules", bound=BaseRules)
 T_Property = TypeVar("T_Property", bound=BaseModel)

cognite/neat/rules/analysis/_information.py

@@ -3,16 +3,22 @@ import warnings
 from typing import Any, cast
 
 from pydantic import ValidationError
+from rdflib import URIRef
 
 from cognite.neat.rules.models import SchemaCompleteness
-from cognite.neat.rules.models._rdfpath import Hop, RDFPath, SingleProperty
+from cognite.neat.rules.models._rdfpath import (
+    Hop,
+    RDFPath,
+    SelfReferenceProperty,
+    SingleProperty,
+)
 from cognite.neat.rules.models.entities import ClassEntity, ReferenceEntity
 from cognite.neat.rules.models.information import (
     InformationClass,
     InformationProperty,
     InformationRules,
 )
-from cognite.neat.utils.utils import get_inheritance_path
+from cognite.neat.utils.rdf_ import get_inheritance_path
 
 from ._base import BaseAnalysis
 
@@ -56,24 +62,46 @@ class InformationAnalysis(BaseAnalysis[InformationRules, InformationClass, Infor
             prop_.transformation and isinstance(prop_.transformation.traversal, Hop) for prop_ in self.rules.properties
         )
 
-    def define_property_renaming_config(self, class_: ClassEntity) -> dict[str, str]:
-        property_renaming_configuration = {}
+    def has_self_reference_property_transformations(self):
+        return any(
+            prop_.transformation and isinstance(prop_.transformation.traversal, SelfReferenceProperty)
+            for prop_ in self.rules.properties
+        )
+
+    def all_reference_transformations(self):
+        return [
+            prop_
+            for prop_ in self.rules.properties
+            if prop_.transformation and isinstance(prop_.transformation.traversal, SelfReferenceProperty)
+        ]
+
+    def define_property_renaming_config(self, class_: ClassEntity) -> dict[str | URIRef, str]:
+        property_renaming_configuration: dict[str | URIRef, str] = {}
 
         if definitions := self.class_property_pairs(only_rdfpath=True, consider_inheritance=True).get(class_, None):
             for property_id, definition in definitions.items():
+                transformation = cast(RDFPath, definition.transformation)
+
+                # use case we have a single property rdf path, and defined prefix
+                # in either metadata or prefixes of rules
                 if isinstance(
-                    cast(RDFPath, definition.transformation).traversal,
+                    transformation.traversal,
                     SingleProperty,
+                ) and (
+                    transformation.traversal.property.prefix in self.rules.prefixes
+                    or transformation.traversal.property.prefix == self.rules.metadata.prefix
                 ):
-                    graph_property = cast(
-                        SingleProperty,
-                        cast(RDFPath, definition.transformation).traversal,
-                    ).property.suffix
+                    namespace = (
+                        self.rules.metadata.namespace
+                        if transformation.traversal.property.prefix == self.rules.metadata.prefix
+                        else self.rules.prefixes[transformation.traversal.property.prefix]
+                    )
 
-                else:
-                    graph_property = property_id
+                    property_renaming_configuration[namespace[transformation.traversal.property.suffix]] = property_id
 
-                property_renaming_configuration[graph_property] = property_id
+                # otherwise we default to the property id
+                else:
+                    property_renaming_configuration[property_id] = property_id
 
         return property_renaming_configuration
 

cognite/neat/rules/exporters/_rules2dms.py

@@ -20,7 +20,7 @@ from cognite.neat.rules._shared import Rules
 from cognite.neat.rules.issues import IssueList
 from cognite.neat.rules.models import InformationRules
 from cognite.neat.rules.models.dms import DMSRules, DMSSchema, PipelineSchema
-from cognite.neat.utils.cdf_loaders import (
+from cognite.neat.utils.cdf.loaders import (
     ContainerLoader,
     DataModelingLoader,
     DataModelLoader,

cognite/neat/rules/exporters/_rules2ontology.py

@@ -20,7 +20,8 @@ from cognite.neat.rules.models.information import (
     InformationProperty,
     InformationRules,
 )
-from cognite.neat.utils.utils import generate_exception_report, remove_namespace_from_uri
+from cognite.neat.utils.auxiliary import generate_exception_report
+from cognite.neat.utils.rdf_ import remove_namespace_from_uri
 
 from ._base import BaseExporter
 from ._validation import are_properties_redefined

cognite/neat/rules/importers/_dms2rules.py

@@ -8,6 +8,7 @@ from cognite.client import CogniteClient
 from cognite.client import data_modeling as dm
 from cognite.client.data_classes.data_modeling import DataModelId, DataModelIdentifier
 from cognite.client.data_classes.data_modeling.containers import BTreeIndex, InvertedIndex
+from cognite.client.data_classes.data_modeling.data_types import ListablePropertyType
 from cognite.client.data_classes.data_modeling.views import (
     MultiEdgeConnectionApply,
     MultiReverseDirectRelationApply,
@@ -345,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,
@@ -401,9 +403,16 @@ 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):
-            return self._container_prop_unsafe(prop).type.is_list
+            prop_type = self._container_prop_unsafe(prop).type
+            return isinstance(prop_type, ListablePropertyType) and prop_type.is_list
         elif isinstance(prop, MultiEdgeConnectionApply | MultiReverseDirectRelationApply):
             return True
         elif isinstance(prop, SingleEdgeConnectionApply | SingleReverseDirectRelationApply):

cognite/neat/rules/importers/_inference2rules.py

@@ -17,11 +17,7 @@ from cognite.neat.rules.models.information import (
     InformationMetadata,
     InformationRulesInput,
 )
-from cognite.neat.utils.utils import (
-    get_namespace,
-    remove_namespace_from_uri,
-    uri_to_short_form,
-)
+from cognite.neat.utils.rdf_ import get_namespace, remove_namespace_from_uri, uri_to_short_form
 
 ORDERED_CLASSES_QUERY = """SELECT ?class (count(?s) as ?instances )
                            WHERE { ?s a ?class . }

cognite/neat/rules/importers/_owl2rules/_owl2classes.py

@@ -5,7 +5,7 @@ import pandas as pd
 from rdflib import OWL, Graph
 
 from cognite.neat.rules.models._base import MatchType
-from cognite.neat.utils.utils import remove_namespace_from_uri
+from cognite.neat.utils.rdf_ import remove_namespace_from_uri
 
 
 def parse_owl_classes(graph: Graph, language: str = "en") -> list[dict]:

cognite/neat/rules/importers/_owl2rules/_owl2metadata.py

@@ -9,7 +9,8 @@ from cognite.neat.rules.models._types._base import (
     PREFIX_COMPLIANCE_REGEX,
     VERSION_COMPLIANCE_REGEX,
 )
-from cognite.neat.utils.utils import convert_rdflib_content, remove_none_elements_from_set
+from cognite.neat.utils.collection_ import remove_none_elements_from_set
+from cognite.neat.utils.rdf_ import convert_rdflib_content
 
 
 def parse_owl_metadata(graph: Graph) -> dict:

cognite/neat/rules/importers/_owl2rules/_owl2properties.py

@@ -5,7 +5,7 @@ import pandas as pd
 from rdflib import Graph
 
 from cognite.neat.rules.models._base import MatchType
-from cognite.neat.utils.utils import remove_namespace_from_uri
+from cognite.neat.utils.rdf_ import remove_namespace_from_uri
 
 from ._owl2classes import _data_type_property_class, _object_property_class, _thing_class