cognite-neat 0.121.1__py3-none-any.whl → 0.121.2__py3-none-any.whl

cognite/neat/core/_data_model/importers/{_dms2rules.py → _dms2data_model.py}

@@ -33,34 +33,34 @@ from cognite.neat.core._constants import (
     DMS_DIRECT_RELATION_LIST_DEFAULT_LIMIT,
     DMS_PRIMITIVE_LIST_DEFAULT_LIMIT,
 )
-from cognite.neat.core._data_model._shared import ReadRules
+from cognite.neat.core._data_model._shared import ImportedDataModel
 from cognite.neat.core._data_model.importers._base import BaseImporter
 from cognite.neat.core._data_model.models import (
-    DMSInputRules,
     DMSSchema,
+    UnverifiedPhysicalDataModel,
 )
 from cognite.neat.core._data_model.models.conceptual import (
-    UnverifiedConceptualClass,
+    UnverifiedConcept,
     UnverifiedConceptualProperty,
 )
 from cognite.neat.core._data_model.models.data_types import DataType, Enum, String
-from cognite.neat.core._data_model.models.dms import (
-    DMSInputContainer,
-    DMSInputEnum,
-    DMSInputMetadata,
-    DMSInputNode,
-    DMSInputProperty,
-    DMSInputView,
-)
 from cognite.neat.core._data_model.models.entities import (
-    ClassEntity,
+    ConceptEntity,
     ContainerEntity,
     DMSNodeEntity,
-    DMSUnknownEntity,
     EdgeEntity,
+    PhysicalUnknownEntity,
     ReverseConnectionEntity,
     ViewEntity,
 )
+from cognite.neat.core._data_model.models.physical import (
+    UnverifiedPhysicalContainer,
+    UnverifiedPhysicalEnum,
+    UnverifiedPhysicalMetadata,
+    UnverifiedPhysicalNodeType,
+    UnverifiedPhysicalProperty,
+    UnverifiedPhysicalView,
+)
 from cognite.neat.core._issues import (
     IssueList,
     MultiValueError,
@@ -85,7 +85,7 @@ from cognite.neat.core._issues.warnings import (
 )
 
 
-class DMSImporter(BaseImporter[DMSInputRules]):
+class DMSImporter(BaseImporter[UnverifiedPhysicalDataModel]):
     """Imports a Data Model from Cognite Data Fusion.
 
     Args:
@@ -99,7 +99,7 @@ class DMSImporter(BaseImporter[DMSInputRules]):
         self,
         schema: DMSSchema,
         read_issues: Sequence[NeatIssue] | None = None,
-        metadata: DMSInputMetadata | None = None,
+        metadata: UnverifiedPhysicalMetadata | None = None,
         referenced_containers: Iterable[dm.ContainerApply] | None = None,
     ):
         self.schema = schema
@@ -127,7 +127,7 @@ class DMSImporter(BaseImporter[DMSInputRules]):
         client: NeatClient,
         data_model_id: DataModelIdentifier,
     ) -> "DMSImporter":
-        """Create a DMSImporter ready to convert the given data model to rules.
+        """Create a DMSImporter ready to convert the given DMS data model to neat representation.
 
         Args:
             client: Instantiated CogniteClient to retrieve data model.
@@ -188,8 +188,8 @@ class DMSImporter(BaseImporter[DMSInputRules]):
     def _create_metadata_from_model(
         cls,
         model: dm.DataModel[dm.View] | dm.DataModelApply,
-    ) -> DMSInputMetadata:
-        description, creator = DMSInputMetadata._get_description_and_creator(model.description)
+    ) -> UnverifiedPhysicalMetadata:
+        description, creator = UnverifiedPhysicalMetadata._get_description_and_creator(model.description)
 
         if isinstance(model, dm.DataModel):
             created = ms_to_datetime(model.created_time)
@@ -198,7 +198,8 @@ class DMSImporter(BaseImporter[DMSInputRules]):
             now = datetime.now().replace(microsecond=0)
             created = now
             updated = now
-        return DMSInputMetadata(
+
+        return UnverifiedPhysicalMetadata(
             space=model.space,
             external_id=model.external_id,
             name=model.name or model.external_id,
@@ -213,7 +214,7 @@ class DMSImporter(BaseImporter[DMSInputRules]):
     def from_directory(cls, directory: str | Path, client: NeatClient | None = None) -> "DMSImporter":
         with catch_issues() as issue_list:
             schema = DMSSchema.from_directory(directory)
-        # If there were errors during the import, the to_rules will raise them.
+        # If there were errors during the import, the to_data_model will raise them.
         return cls(
             schema, issue_list, referenced_containers=cls._lookup_referenced_containers(schema, issue_list, client)
         )
@@ -255,9 +256,9 @@ class DMSImporter(BaseImporter[DMSInputRules]):
         else:
             raise NeatValueError(f"Unsupported YAML format: {format}")
 
-    def to_rules(self) -> ReadRules[DMSInputRules]:
+    def to_data_model(self) -> ImportedDataModel[UnverifiedPhysicalDataModel]:
         if self.issue_list.has_errors:
-            # In case there were errors during the import, the to_rules method will return None
+            # In case there were errors during the import, the to_data_model method will return None
             self.issue_list.trigger_warnings()
             raise MultiValueError(self.issue_list.errors)
 
@@ -268,25 +269,25 @@ class DMSImporter(BaseImporter[DMSInputRules]):
 
         model = self.schema.data_model
 
-        user_rules = self._create_rule_components(model, self.schema, self.metadata)
+        user_data_model = self._create_rule_components(model, self.schema, self.metadata)
 
         self.issue_list.trigger_warnings()
         if self.issue_list.has_errors:
             raise MultiValueError(self.issue_list.errors)
-        return ReadRules(user_rules, {})
+        return ImportedDataModel(user_data_model, {})
 
     def _create_rule_components(
         self,
         data_model: dm.DataModelApply,
         schema: DMSSchema,
-        metadata: DMSInputMetadata | None = None,
-    ) -> DMSInputRules:
+        metadata: UnverifiedPhysicalMetadata | None = None,
+    ) -> UnverifiedPhysicalDataModel:
         enum_by_container_property = self._create_enum_collections(self._all_containers_by_id.values())
         enum_collection_by_container_property = {
             key: enum_list[0].collection for key, enum_list in enum_by_container_property.items() if enum_list
         }
 
-        properties: list[DMSInputProperty] = []
+        properties: list[UnverifiedPhysicalProperty] = []
         for view_id, view in schema.views.items():
             view_entity = ViewEntity.from_id(view_id)
             for prop_id, prop in (view.properties or {}).items():
@@ -300,17 +301,19 @@ class DMSImporter(BaseImporter[DMSInputRules]):
             view.as_id() if isinstance(view, dm.View | dm.ViewApply) else view for view in data_model.views or []
         }
 
-        metadata = metadata or DMSInputMetadata.from_data_model(data_model)
+        metadata = metadata or UnverifiedPhysicalMetadata.from_data_model(data_model)
 
-        return DMSInputRules(
+        return UnverifiedPhysicalDataModel(
             metadata=metadata,
             properties=properties,
-            containers=[DMSInputContainer.from_container(container) for container in schema.containers.values()],
+            containers=[
+                UnverifiedPhysicalContainer.from_container(container) for container in schema.containers.values()
+            ],
             views=[
-                DMSInputView.from_view(view, in_model=view_id in data_model_view_ids)
+                UnverifiedPhysicalView.from_view(view, in_model=view_id in data_model_view_ids)
                 for view_id, view in schema.views.items()
             ],
-            nodes=[DMSInputNode.from_node_type(node_type) for node_type in schema.node_types.values()],
+            nodes=[UnverifiedPhysicalNodeType.from_node_type(node_type) for node_type in schema.node_types.values()],
             enum=[enum for enum_list in enum_by_container_property.values() for enum in enum_list] or None,
         )
 
@@ -320,7 +323,7 @@ class DMSImporter(BaseImporter[DMSInputRules]):
         prop: ViewPropertyApply,
         view_entity: ViewEntity,
         enum_collection_by_container_property: dict[tuple[dm.ContainerId, str], str],
-    ) -> DMSInputProperty | None:
+    ) -> UnverifiedPhysicalProperty | None:
         if isinstance(prop, dm.MappedPropertyApply) and prop.container not in self._all_containers_by_id:
             self.issue_list.append(
                 ResourceNotFoundWarning[dm.ContainerId, dm.PropertyId](
@@ -364,7 +367,7 @@ class DMSImporter(BaseImporter[DMSInputRules]):
         if isinstance(value_type, ViewEntity) and value_type.as_id() not in self._all_views_by_id:
             self.issue_list.append(ResourceUnknownWarning(prop.source, "view", view_entity.as_id(), "view"))
 
-        return DMSInputProperty(
+        return UnverifiedPhysicalProperty(
             description=prop.description,
             name=prop.name,
             connection=self._get_connection_type(prop),
@@ -411,8 +414,8 @@ class DMSImporter(BaseImporter[DMSInputRules]):
         cls,
         prop: ViewPropertyApply | ViewProperty,
         container_property: dm.ContainerProperty | None = None,
-        enum_collection_by_container_property: dict[tuple[dm.ContainerId, str], str] | None = None,
-    ) -> DataType | ViewEntity | DMSUnknownEntity | None:
+        enum_collection_by_container_property: (dict[tuple[dm.ContainerId, str], str] | None) = None,
+    ) -> DataType | ViewEntity | PhysicalUnknownEntity | None:
         if isinstance(
             prop,
             SingleEdgeConnectionApply
@@ -434,7 +437,7 @@ class DMSImporter(BaseImporter[DMSInputRules]):
                 prop_type = prop.type
             if isinstance(prop_type, dm.DirectRelation):
                 if prop.source is None:
-                    return DMSUnknownEntity()
+                    return PhysicalUnknownEntity()
                 else:
                     return ViewEntity.from_id(prop.source)
             elif isinstance(prop_type, PropertyTypeWithUnit) and prop_type.unit:
@@ -451,7 +454,10 @@ class DMSImporter(BaseImporter[DMSInputRules]):
                         f"BUG in Neat: Enum for {prop.container}.{prop.container_property_identifier} not found."
                     )
 
-                return Enum(collection=ClassEntity(suffix=collection), unknownValue=prop_type.unknown_value)
+                return Enum(
+                    collection=ConceptEntity(suffix=collection),
+                    unknownValue=prop_type.unknown_value,
+                )
             else:
                 return DataType.load(prop_type._type)
         else:
@@ -614,8 +620,8 @@ class DMSImporter(BaseImporter[DMSInputRules]):
     @staticmethod
     def _create_enum_collections(
         containers: Collection[dm.ContainerApply],
-    ) -> dict[tuple[dm.ContainerId, str], list[DMSInputEnum]]:
-        enum_by_container_property: dict[tuple[dm.ContainerId, str], list[DMSInputEnum]] = defaultdict(list)
+    ) -> dict[tuple[dm.ContainerId, str], list[UnverifiedPhysicalEnum]]:
+        enum_by_container_property: dict[tuple[dm.ContainerId, str], list[UnverifiedPhysicalEnum]] = defaultdict(list)
 
         is_external_id_unique = len({container.external_id for container in containers}) == len(containers)
 
@@ -630,15 +636,18 @@ class DMSImporter(BaseImporter[DMSInputRules]):
                     collection = f"{container.space}:{container.external_id}.{prop_id}"
                 for identifier, value in prop.type.values.items():
                     enum_by_container_property[(container_id, prop_id)].append(
-                        DMSInputEnum(
-                            collection=collection, value=identifier, name=value.name, description=value.description
+                        UnverifiedPhysicalEnum(
+                            collection=collection,
+                            value=identifier,
+                            name=value.name,
+                            description=value.description,
                         )
                     )
         return enum_by_container_property
 
     @classmethod
-    def as_information_input_property(
-        cls, entity: ClassEntity, prop_id: str, view_property: ViewProperty
+    def as_unverified_conceptual_property(
+        cls, entity: ConceptEntity, prop_id: str, view_property: ViewProperty
     ) -> UnverifiedConceptualProperty:
         if not isinstance(view_property, dm.MappedProperty | dm.EdgeConnection | ReverseDirectRelation):
             raise PropertyTypeNotSupportedError(
@@ -653,7 +662,7 @@ class DMSImporter(BaseImporter[DMSInputRules]):
             raise NeatValueError(f"Failed to get value type for {entity} property {prop_id}")
 
         return UnverifiedConceptualProperty(
-            class_=entity,
+            concept=entity,
             property_=prop_id,
             value_type=str(value_type),
             name=view_property.name,
@@ -664,13 +673,13 @@ class DMSImporter(BaseImporter[DMSInputRules]):
         )
 
     @classmethod
-    def as_information_input_class(cls, view: View) -> UnverifiedConceptualClass:
-        return UnverifiedConceptualClass(
-            class_=ClassEntity(prefix=view.space, suffix=view.external_id, version=view.version),
+    def as_unverified_concept(cls, view: View) -> UnverifiedConcept:
+        return UnverifiedConcept(
+            concept=ConceptEntity(prefix=view.space, suffix=view.external_id, version=view.version),
             name=view.name,
             description=view.description,
             implements=[
-                ClassEntity(
+                ConceptEntity(
                     prefix=parent.space,
                     suffix=parent.external_id,
                     version=parent.version,

cognite/neat/core/_data_model/importers/{_dtdl2rules → _dtdl2data_model}/dtdl_converter.py

@@ -1,7 +1,7 @@
 from collections import Counter
 from collections.abc import Callable, Sequence
 
-from cognite.neat.core._data_model.importers._dtdl2rules.spec import (
+from cognite.neat.core._data_model.importers._dtdl2data_model.spec import (
     DTMI,
     Command,
     CommandV2,
@@ -19,7 +19,7 @@ from cognite.neat.core._data_model.importers._dtdl2rules.spec import (
     TelemetryV2,
 )
 from cognite.neat.core._data_model.models.conceptual import (
-    UnverifiedConceptualClass,
+    UnverifiedConcept,
     UnverifiedConceptualProperty,
 )
 from cognite.neat.core._data_model.models.data_types import (
@@ -28,7 +28,7 @@ from cognite.neat.core._data_model.models.data_types import (
     Json,
     String,
 )
-from cognite.neat.core._data_model.models.entities import ClassEntity
+from cognite.neat.core._data_model.models.entities import ConceptEntity
 from cognite.neat.core._issues import IssueList
 from cognite.neat.core._issues.errors import (
     PropertyTypeNotSupportedError,
@@ -45,7 +45,7 @@ class _DTDLConverter:
     def __init__(self, issues: IssueList | None = None) -> None:
         self.issues = IssueList(issues or [])
         self.properties: list[UnverifiedConceptualProperty] = []
-        self.classes: list[UnverifiedConceptualClass] = []
+        self.classes: list[UnverifiedConcept] = []
         self._item_by_id: dict[DTMI, DTDLBase] = {}
 
         self._method_by_type = {
@@ -66,8 +66,8 @@ class _DTDLConverter:
             raise ValueError("No classes found")
         counted = Counter(
             class_.prefix
-            for class_ in (cls_.class_ for cls_ in self.classes)
-            if isinstance(class_, ClassEntity) and isinstance(class_.prefix, str)
+            for class_ in (cls_.concept for cls_ in self.classes)
+            if isinstance(class_, ConceptEntity) and isinstance(class_.prefix, str)
         )
         if not counted:
             raise ValueError("No prefixes found")
@@ -103,11 +103,11 @@ class _DTDLConverter:
             )
 
     def convert_interface(self, item: Interface, _: str | None) -> None:
-        class_ = UnverifiedConceptualClass(
-            class_=item.id_.as_class_id(),
+        class_ = UnverifiedConcept(
+            concept=item.id_.as_concept_entity(),
             name=item.display_name,
             description=item.description,
-            implements=[parent.as_class_id() for parent in item.extends or []] or None,
+            implements=[parent.as_concept_entity() for parent in item.extends or []] or None,
         )
         self.classes.append(class_)
         for sub_item_or_id in item.contents or []:
@@ -122,9 +122,9 @@ class _DTDLConverter:
                 )
             elif isinstance(sub_item_or_id, DTMI):
                 sub_item = self._item_by_id[sub_item_or_id]
-                self.convert_item(sub_item, class_.class_str)
+                self.convert_item(sub_item, class_.concept_str)
             else:
-                self.convert_item(sub_item_or_id, class_.class_str)
+                self.convert_item(sub_item_or_id, class_.concept_str)
         # interface.schema objects are handled in the convert method
 
     def convert_property(
@@ -138,7 +138,7 @@ class _DTDLConverter:
             return None
 
         prop = UnverifiedConceptualProperty(
-            class_=ClassEntity.load(parent),
+            concept=ConceptEntity.load(parent),
             property_=item.name,
             name=item.display_name,
             description=item.description,
@@ -183,7 +183,7 @@ class _DTDLConverter:
         if value_type is None:
             return
         prop = UnverifiedConceptualProperty(
-            class_=ClassEntity.load(parent),
+            concept=ConceptEntity.load(parent),
             property_=item.name,
             name=item.display_name,
             description=item.description,
@@ -202,7 +202,7 @@ class _DTDLConverter:
         if value_type is None:
             return
         prop = UnverifiedConceptualProperty(
-            class_=ClassEntity.load(parent),
+            concept=ConceptEntity.load(parent),
             property_=item.name,
             name=item.display_name,
             description=item.description,
@@ -217,9 +217,9 @@ class _DTDLConverter:
             self._missing_parent_warning(item)
             return None
         if item.target is not None:
-            value_type: DataType | ClassEntity
+            value_type: DataType | ConceptEntity
             if item.target in self._item_by_id:
-                value_type = item.target.as_class_id()
+                value_type = item.target.as_concept_entity()
             else:
                 # Falling back to json
                 self.issues.append(
@@ -231,7 +231,7 @@ class _DTDLConverter:
                 value_type = Json()
 
             prop = UnverifiedConceptualProperty(
-                class_=ClassEntity.load(parent),
+                concept=ConceptEntity.load(parent),
                 property_=item.name,
                 name=item.display_name,
                 description=item.description,
@@ -254,8 +254,8 @@ class _DTDLConverter:
             )
             return None
 
-        class_ = UnverifiedConceptualClass(
-            class_=item.id_.as_class_id(),
+        class_ = UnverifiedConcept(
+            concept=item.id_.as_concept_entity(),
             name=item.display_name,
             description=item.description,
         )
@@ -266,7 +266,7 @@ class _DTDLConverter:
             if value_type is None:
                 continue
             prop = UnverifiedConceptualProperty(
-                class_=class_.class_,
+                concept=class_.concept,
                 name=field_.name,
                 description=field_.description,
                 property_=field_.name,
@@ -278,7 +278,7 @@ class _DTDLConverter:
 
     def schema_to_value_type(
         self, schema: Schema | Interface | DTMI | None, item: DTDLBase
-    ) -> DataType | ClassEntity | None:
+    ) -> DataType | ConceptEntity | None:
         input_type = self._item_by_id.get(schema) if isinstance(schema, DTMI) else schema
 
         if isinstance(input_type, Enum):
@@ -307,7 +307,7 @@ class _DTDLConverter:
             else:
                 if isinstance(input_type, Object):
                     self.convert_object(input_type, None)
-                return input_type.id_.as_class_id()
+                return input_type.id_.as_concept_entity()
         else:
             self.issues.append(
                 PropertyTypeNotSupportedWarning(

cognite/neat/core/_data_model/importers/{_dtdl2rules → _dtdl2data_model}/dtdl_importer.py

@@ -5,10 +5,10 @@ from pathlib import Path
 
 from pydantic import ValidationError
 
-from cognite.neat.core._data_model._shared import ReadRules
+from cognite.neat.core._data_model._shared import ImportedDataModel
 from cognite.neat.core._data_model.importers._base import BaseImporter
-from cognite.neat.core._data_model.importers._dtdl2rules.dtdl_converter import _DTDLConverter
-from cognite.neat.core._data_model.importers._dtdl2rules.spec import (
+from cognite.neat.core._data_model.importers._dtdl2data_model.dtdl_converter import _DTDLConverter
+from cognite.neat.core._data_model.importers._dtdl2data_model.spec import (
     DTDL_CLS_BY_TYPE_BY_SPEC,
     DTDLBase,
     Interface,
@@ -126,7 +126,7 @@ class DTDLImporter(BaseImporter[UnverifiedConceptualDataModel]):
                             items.append(item)
         return cls(items, zip_file.stem, read_issues=issues)
 
-    def to_rules(self) -> ReadRules[UnverifiedConceptualDataModel]:
+    def to_data_model(self) -> ImportedDataModel[UnverifiedConceptualDataModel]:
         converter = _DTDLConverter(self._read_issues)
 
         converter.convert(self._items)
@@ -143,13 +143,13 @@ class DTDLImporter(BaseImporter[UnverifiedConceptualDataModel]):
         else:
             metadata["space"] = most_common_prefix
 
-        rules = UnverifiedConceptualDataModel(
+        data_model = UnverifiedConceptualDataModel(
             metadata=UnverifiedConceptualMetadata.load(metadata),
             properties=converter.properties,
-            classes=converter.classes,
+            concepts=converter.classes,
         )
         converter.issues.trigger_warnings()
         if converter.issues.has_errors:
             raise MultiValueError(converter.issues.errors)
 
-        return ReadRules(rules, {})
+        return ImportedDataModel(data_model, {})

cognite/neat/core/_data_model/importers/{_dtdl2rules → _dtdl2data_model}/spec.py

@@ -15,7 +15,7 @@ from typing import TYPE_CHECKING, Any, ClassVar, Literal, TypeAlias
 from pydantic import BaseModel, Field, field_validator, model_serializer, model_validator
 from pydantic.fields import FieldInfo
 
-from cognite.neat.core._data_model.models.entities import ClassEntity
+from cognite.neat.core._data_model.models.entities import ConceptEntity
 
 if TYPE_CHECKING:
     from pydantic.type_adapter import IncEx
@@ -35,8 +35,8 @@ class DTMI(BaseModel):
     path: list[str]
     version: str
 
-    def as_class_id(self) -> ClassEntity:
-        return ClassEntity(prefix="_".join(self.path[:-1]), suffix=self.path[-1], version=self.version)
+    def as_concept_entity(self) -> ConceptEntity:
+        return ConceptEntity(prefix="_".join(self.path[:-1]), suffix=self.path[-1], version=self.version)
 
     def __hash__(self) -> int:
         return hash(self.to_string())

cognite/neat/core/_data_model/importers/_rdf/_base.py

@@ -7,7 +7,7 @@ from rdflib import Graph, Namespace, URIRef
 from typing_extensions import Self
 
 from cognite.neat.core._constants import get_default_prefixes_and_namespaces
-from cognite.neat.core._data_model._shared import ReadRules
+from cognite.neat.core._data_model._shared import ImportedDataModel
 from cognite.neat.core._data_model.importers._base import BaseImporter
 from cognite.neat.core._data_model.models._base_verified import RoleTypes
 from cognite.neat.core._data_model.models.conceptual import (
@@ -18,7 +18,7 @@ from cognite.neat.core._data_model.models.entities import UnknownEntity
 from cognite.neat.core._issues import IssueList, MultiValueError
 from cognite.neat.core._issues.errors import FileReadError
 from cognite.neat.core._issues.errors._general import NeatValueError
-from cognite.neat.core._store import NeatGraphStore
+from cognite.neat.core._store import NeatInstanceStore
 from cognite.neat.core._utils.rdf_ import get_namespace
 
 DEFAULT_NON_EXISTING_NODE_TYPE = AnyURI()
@@ -68,7 +68,7 @@ class BaseRDFImporter(BaseImporter[UnverifiedConceptualDataModel]):
     @classmethod
     def from_graph_store(
         cls,
-        store: NeatGraphStore,
+        store: NeatInstanceStore,
         data_model_id: (dm.DataModelId | tuple[str, str, str]) = DEFAULT_RDF_DATA_MODEL_ID,
         max_number_of_instance: int = -1,
         non_existing_node_type: UnknownEntity | AnyURI = DEFAULT_NON_EXISTING_NODE_TYPE,
@@ -115,24 +115,24 @@ class BaseRDFImporter(BaseImporter[UnverifiedConceptualDataModel]):
             source_name=source_name,
         )
 
-    def to_rules(
+    def to_data_model(
         self,
-    ) -> ReadRules[UnverifiedConceptualDataModel]:
+    ) -> ImportedDataModel[UnverifiedConceptualDataModel]:
         """
         Creates `Rules` object from the data for target role.
         """
         if self.issue_list.has_errors:
-            # In case there were errors during the import, the to_rules method will return None
+            # In case there were errors during the import, the to_data_model method will return None
             self.issue_list.trigger_warnings()
             raise MultiValueError(self.issue_list.errors)
 
-        rules_dict = self._to_rules_components()
+        rules_dict = self._to_data_model_components()
 
         rules = UnverifiedConceptualDataModel.load(rules_dict)
         self.issue_list.trigger_warnings()
-        return ReadRules(rules, {})
+        return ImportedDataModel(rules, {})
 
-    def _to_rules_components(self) -> dict:
+    def _to_data_model_components(self) -> dict:
         raise NotImplementedError()
 
     @classmethod

cognite/neat/core/_data_model/importers/_rdf/_imf2rules.py

@@ -3,26 +3,26 @@ there are loaders to TransformationRules pydantic class."""
 
 from cognite.neat.core._data_model.importers._rdf._base import BaseRDFImporter
 from cognite.neat.core._data_model.importers._rdf._shared import (
-    parse_classes,
+    parse_concepts,
     parse_properties,
 )
 
 CLASSES_QUERY = """
-    SELECT ?class_ ?name ?description ?implements
+    SELECT ?concept ?name ?description ?implements
     WHERE {{
         VALUES ?type {{ imf:BlockType imf:TerminalType imf:AttributeType }}
-        ?class_ a ?type .
+        ?concept a ?type .
 
-        OPTIONAL {{?class_ rdfs:subClassOf ?parent }}.
-        OPTIONAL {{?class_ rdfs:label|skos:prefLabel ?name }}.
-        OPTIONAL {{?class_ rdfs:comment|skos:definition ?description}}.
+        OPTIONAL {{?concept rdfs:subClassOf ?parent }}.
+        OPTIONAL {{?concept rdfs:label|skos:prefLabel ?name }}.
+        OPTIONAL {{?concept rdfs:comment|skos:definition ?description}}.
 
 
         # Add imf:Attribute as parent class when no parent is found
         BIND(IF(!bound(?parent) && ?type = imf:AttributeType, imf:Attribute, ?parent) AS ?implements)
 
         # FILTERS
-        FILTER (!isBlank(?class_))
+        FILTER (!isBlank(?concept))
         FILTER (!bound(?implements) || !isBlank(?implements))
 
         FILTER (!bound(?name) || LANG(?name) = "" || LANGMATCHES(LANG(?name), "{language}"))
@@ -31,13 +31,13 @@ CLASSES_QUERY = """
     """
 
 PROPERTIES_QUERY = """
-    SELECT ?class_ ?property_ ?name ?description ?value_type ?min_count ?max_count ?default
+    SELECT ?concept ?property_ ?name ?description ?value_type ?min_count ?max_count ?default
     WHERE
     {{
         # CASE 1: Handling Blocks and Terminals
         {{
             VALUES ?type {{ imf:BlockType imf:TerminalType }}
-            ?class_ a ?type ;
+            ?concept a ?type ;
                 sh:property ?propertyShape .
                 ?propertyShape sh:path ?property_ .
 
@@ -55,10 +55,10 @@ PROPERTIES_QUERY = """
 
         # CASE 2: Handling Attributes
         {{
-            ?class_ a imf:AttributeType .
+            ?concept a imf:AttributeType .
             BIND(xsd:anyURI AS ?valueShape)
             BIND(imf:predicate AS ?property_)
-            ?class_  ?property_ ?defaultURI .
+            ?concept  ?property_ ?defaultURI .
             BIND(STR(?defaultURI) AS ?default)
 
         }}
@@ -67,7 +67,7 @@ PROPERTIES_QUERY = """
         BIND(IF(BOUND(?valueShape), ?valueShape, IF(BOUND(?range) , ?range , ?valueShape)) AS ?value_type)
 
         FILTER (!isBlank(?property_))
-        FILTER (!bound(?class_) || !isBlank(?class_))
+        FILTER (!bound(?concept) || !isBlank(?concept))
         FILTER (!bound(?name) || LANG(?name) = "" || LANGMATCHES(LANG(?name), "{language}"))
         FILTER (!bound(?description) || LANG(?description) = "" || LANGMATCHES(LANG(?description), "{language}"))
     }}
@@ -81,17 +81,17 @@ class IMFImporter(BaseRDFImporter):
     def description(self) -> str:
         return f"IMF Types {self.source_name} read as unverified data model"
 
-    def _to_rules_components(
+    def _to_data_model_components(
         self,
     ) -> dict:
-        classes, issue_list = parse_classes(self.graph, CLASSES_QUERY, self.language, self.issue_list)
+        classes, issue_list = parse_concepts(self.graph, CLASSES_QUERY, self.language, self.issue_list)
         self.issue_list = issue_list
         properties, issue_list = parse_properties(self.graph, PROPERTIES_QUERY, self.language, self.issue_list)
         self.issue_list = issue_list
 
         components = {
             "Metadata": self._metadata,
-            "Classes": list(classes.values()) if classes else [],
+            "Concepts": list(classes.values()) if classes else [],
             "Properties": list(properties.values()) if properties else [],
         }