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

cognite/neat/core/_instances/loaders/_rdf2dms.py

@@ -25,9 +25,9 @@ from cognite.neat.core._constants import (
     DMS_DIRECT_RELATION_LIST_DEFAULT_LIMIT,
     is_readonly_property,
 )
-from cognite.neat.core._data_model.analysis import RulesAnalysis
+from cognite.neat.core._data_model.analysis import DataModelAnalysis
 from cognite.neat.core._data_model.analysis._base import ViewQuery, ViewQueryDict
-from cognite.neat.core._data_model.models import DMSRules
+from cognite.neat.core._data_model.models import PhysicalDataModel
 from cognite.neat.core._data_model.models.conceptual._verified import (
     ConceptualDataModel,
 )
@@ -51,7 +51,7 @@ from cognite.neat.core._issues.warnings import (
     ResourceNeatWarning,
 )
 from cognite.neat.core._shared import InstanceType
-from cognite.neat.core._store import NeatGraphStore
+from cognite.neat.core._store import NeatInstanceStore
 from cognite.neat.core._utils.auxiliary import create_sha256_hash
 from cognite.neat.core._utils.collection_ import (
     iterate_progress_bar_if_above_config_threshold,
@@ -96,13 +96,13 @@ class _Projection:
 
 
 class DMSLoader(CDFLoader[dm.InstanceApply]):
-    """Loads Instances to Cognite Data Fusion Data Model Service from NeatGraph.
+    """Loads Instances to Cognite Data Fusion Data Model Service from NeatInstanceStore.
 
     Args:
-        dms_rules (DMSRules): The DMS rules used by the data model.
-        info_rules (InformationRules): The information rules used by the data model, used to
-            look+up the instances in the store.
-        graph_store (NeatGraphStore): The graph store to load the data from.
+        physical_data_model (PhysicalDataModel): Physical data model.
+        conceptual_data_model (ConceptualDataModel): Conceptual data model,
+            used to look+up the instances in the store.
+        instance_store (NeatInstanceStore): The instance store to load the instances from.
         instance_space (str): The instance space to load the data into.
         create_issues (Sequence[NeatIssue] | None): A list of issues that occurred during reading. Defaults to None.
         client (NeatClient | None): This is used to lookup containers such that the loader
@@ -115,9 +115,9 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
 
     def __init__(
         self,
-        dms_rules: DMSRules,
-        info_rules: ConceptualDataModel,
-        graph_store: NeatGraphStore,
+        physical_data_model: PhysicalDataModel,
+        conceptual_data_model: ConceptualDataModel,
+        instance_store: NeatInstanceStore,
         instance_space: str,
         space_property: str | None = None,
         use_source_space: bool = False,
@@ -127,9 +127,9 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
         neat_prefix_by_predicate_uri: dict[URIRef, str] | None = None,
         neat_prefix_by_type_uri: dict[URIRef, str] | None = None,
     ):
-        super().__init__(graph_store)
-        self.dms_rules = dms_rules
-        self.info_rules = info_rules
+        super().__init__(instance_store)
+        self.physical_data_model = physical_data_model
+        self.conceptual_data_model = conceptual_data_model
         self.neat_prefix_by_predicate_uri = neat_prefix_by_predicate_uri or {}
         self.neat_prefix_by_type_uri = neat_prefix_by_type_uri or {}
         self._instance_space = instance_space
@@ -192,7 +192,7 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
             projection, issues = self._create_projection(view)
             yield from issues
             query = it.query
-            reader = self.graph_store.read(
+            reader = self.instance_store.read(
                 query.rdf_type,
                 property_renaming_config=query.property_renaming_config,
                 remove_uri_namespace=False,
@@ -209,7 +209,7 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
             yield _END_OF_CLASS
 
     def _create_view_iterations(self) -> tuple[list[_ViewIterator], IssueList]:
-        view_query_by_id = RulesAnalysis(self.info_rules, self.dms_rules).view_query_by_id
+        view_query_by_id = DataModelAnalysis(self.conceptual_data_model, self.physical_data_model).view_query_by_id
         iterations_by_view_id = self._select_views_with_instances(view_query_by_id)
         if self._client:
             issues = IssueList()
@@ -224,7 +224,7 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
         else:
             views = dm.ViewList([])
             with catch_issues() as issues:
-                read_model = self.dms_rules.as_schema().as_read_model()
+                read_model = self.physical_data_model.as_schema().as_read_model()
                 views.extend(read_model.views)
             if issues.has_errors:
                 return [], issues
@@ -274,7 +274,7 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
         """Selects the views with data."""
         view_iterations: dict[dm.ViewId, _ViewIterator] = {}
         for view_id, query in view_query_by_id.items():
-            count = self.graph_store.queries.select.count_of_type(query.rdf_type)
+            count = self.instance_store.queries.select.count_of_type(query.rdf_type)
             if count > 0:
                 view_iterations[view_id] = _ViewIterator(view_id, count, query)
         return view_iterations
@@ -284,7 +284,7 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
         if self._space_property is None:
             return issues
         total = sum(it.instance_count for it in view_iterations)
-        properties_by_uriref = self.graph_store.queries.select.properties()
+        properties_by_uriref = self.instance_store.queries.select.properties()
         space_property_uri = next((k for k, v in properties_by_uriref.items() if v == self._space_property), None)
         if space_property_uri is None:
             error: ResourceNotFoundError[str, str] = ResourceNotFoundError(
@@ -297,7 +297,7 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
             issues.append(error)
             return issues
 
-        instance_iterable = self.graph_store.queries.select.list_instances_ids_by_space(space_property_uri)
+        instance_iterable = self.instance_store.queries.select.list_instances_ids_by_space(space_property_uri)
         instance_iterable = iterate_progress_bar_if_above_config_threshold(
             instance_iterable, total, f"Looking up spaces for {total} instances..."
         )
@@ -323,8 +323,8 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
         if not self.neat_prefix_by_type_uri:
             return
 
-        count = sum(count for _, count in self.graph_store.queries.select.summarize_instances())
-        instance_iterable = self.graph_store.queries.select.list_instances_ids()
+        count = sum(count for _, count in self.instance_store.queries.select.summarize_instances())
+        instance_iterable = self.instance_store.queries.select.list_instances_ids()
         instance_iterable = iterate_progress_bar_if_above_config_threshold(
             instance_iterable, count, f"Looking up identifiers for {count} instances..."
         )

cognite/neat/core/_instances/transformers/_base.py

@@ -100,10 +100,13 @@ class BaseTransformerStandardised(ABC):
         if self._skip_count_query():
             skipped_count_res = list(graph.query(self._skip_count_query()))
             skipped_count = int(skipped_count_res[0][0])  # type: ignore [index, arg-type]
-            warnings.warn(
-                NeatValueWarning(f"Skipping {skipped_count} properties in transformation {self.__class__.__name__}"),
-                stacklevel=2,
-            )
+            if skipped_count > 0:
+                warnings.warn(
+                    NeatValueWarning(
+                        f"Skipping {skipped_count} properties in transformation {self.__class__.__name__}"
+                    ),
+                    stacklevel=2,
+                )
             outcome.skipped = skipped_count
 
         if iteration_count == 0:

cognite/neat/core/_instances/transformers/_rdfpath.py

@@ -10,7 +10,7 @@ from ._base import BaseTransformerStandardised, RowTransformationOutput
 
 
 class MakeConnectionOnExactMatch(BaseTransformerStandardised):
-    description: str = "Adds property that contains id of reference to all references of given class in Rules"
+    description: str = "Adds property that contains id of reference to all references of given class in model"
     _use_only_once: bool = False
     _need_changes = frozenset({})
 

cognite/neat/core/_instances/transformers/_value_type.py

@@ -10,11 +10,7 @@ from rdflib.query import ResultRow
 from cognite.neat.core._constants import NEAT
 from cognite.neat.core._issues.warnings import PropertyDataTypeConversionWarning
 from cognite.neat.core._utils.auxiliary import string_to_ideal_type
-from cognite.neat.core._utils.rdf_ import (
-    Triple,
-    get_namespace,
-    remove_namespace_from_uri,
-)
+from cognite.neat.core._utils.rdf_ import Triple, get_namespace, remove_namespace_from_uri, uri_to_cdf_id
 
 from ._base import BaseTransformerStandardised, RowTransformationOutput
 
@@ -303,7 +299,7 @@ class ConnectionToLiteral(BaseTransformerStandardised):
         row_output = RowTransformationOutput()
 
         instance, object_entity = cast(tuple[URIRef, URIRef], query_result_row)
-        value = remove_namespace_from_uri(object_entity)
+        value = uri_to_cdf_id(object_entity)
 
         row_output.add_triples.add((instance, self.subject_predicate, rdflib.Literal(value)))
         row_output.remove_triples.add((instance, self.subject_predicate, object_entity))

cognite/neat/core/_issues/_base.py

@@ -119,7 +119,7 @@ class NeatIssue:
 
     @classmethod
     def _dump_value(cls, value: Any) -> list | int | bool | float | str | dict:
-        from cognite.neat.core._data_model.models.entities import Entity
+        from cognite.neat.core._data_model.models.entities import ConceptualEntity
 
         if isinstance(value, str | int | bool | float):
             return value
@@ -131,7 +131,7 @@ class NeatIssue:
             return [cls._dump_value(item) for item in value]
         elif isinstance(value, ViewId | ContainerId):
             return value.dump(camel_case=True, include_type=True)
-        elif isinstance(value, Entity):
+        elif isinstance(value, ConceptualEntity):
             return value.dump()
         elif isinstance(value, PropertyId):
             return value.dump(camel_case=True)
@@ -173,7 +173,7 @@ class NeatIssue:
 
     @classmethod
     def _load_value(cls, type_: Any, value: Any) -> Any:
-        from cognite.neat.core._data_model.models.entities import Entity
+        from cognite.neat.core._data_model.models.entities import ConceptualEntity
 
         if isinstance(type_, UnionType) or get_origin(type_) is UnionType:
             args = get_args(type_)
@@ -194,7 +194,7 @@ class NeatIssue:
             return PropertyId.load(value)
         elif type_ is ContainerId:
             return ContainerId.load(value)
-        elif inspect.isclass(type_) and issubclass(type_, Entity):
+        elif inspect.isclass(type_) and issubclass(type_, ConceptualEntity):
             return type_.load(value)
         elif type_ is NeatError:
             return cls.load(value)

cognite/neat/core/_issues/_factory.py

@@ -37,7 +37,7 @@ def _from_pydantic_error(error: ErrorDetails, read_info_by_sheet: dict[str, Spre
     if location:
         return SpreadsheetError.create(location, neat_error, read_info_by_sheet.get(cast(str, location[0])))
 
-    # errors that occur while for example parsing spreadsheet in input rules
+    # errors that occur while for example parsing spreadsheet in imported data model
     # will not have location information so we return neat_error as is
     # this is workaround until more elegant solution is found
     return neat_error

cognite/neat/core/_issues/errors/__init__.py

@@ -33,7 +33,7 @@ from ._resources import (
     ResourceRetrievalError,
 )
 from ._wrapper import (
-    ClassValueError,
+    ConceptValueError,
     ContainerValueError,
     EnumValueError,
     MetadataValueError,
@@ -47,7 +47,7 @@ __all__ = [
     "AuthorizationError",
     "CDFMissingClientError",
     "CDFMissingResourcesError",
-    "ClassValueError",
+    "ConceptValueError",
     "ContainerValueError",
     "EnumValueError",
     "FileMissingRequiredFieldError",

cognite/neat/core/_issues/errors/_resources.py

@@ -72,7 +72,7 @@ class ResourceNotDefinedError(ResourceError[T_Identifier]):
 class ResourceConversionError(ResourceError, ValueError):
     """Failed to convert the {resource_type} {identifier} to {target_format}: {reason}"""
 
-    fix = "Check the error message and correct the rules."
+    fix = "Check the error message and correct the data model."
     target_format: str
     reason: str
 

cognite/neat/core/_issues/errors/_wrapper.py

@@ -67,8 +67,8 @@ class PropertyValueError(SpreadsheetListError):
 
 
 @dataclass(unsafe_hash=True)
-class ClassValueError(SpreadsheetListError):
-    _name = "Classes"
+class ConceptValueError(SpreadsheetListError):
+    _name = "Concepts"
 
 
 @dataclass(unsafe_hash=True)

cognite/neat/core/_issues/warnings/_models.py

@@ -93,12 +93,12 @@ class NotSupportedHasDataFilterLimitWarning(CDFNotSupportedWarning):
 
 
 @dataclass(unsafe_hash=True)
-class UndefinedClassWarning(UserModelingWarning):
-    """Class {class_id} has no explicit properties defined neither implements other class"""
+class UndefinedConceptWarning(UserModelingWarning):
+    """Class {concept_id} has no explicit properties defined neither implements other concepts"""
 
-    fix = "Define properties for class or inherit properties by implementing another class."
+    fix = "Define properties for concept or inherit properties by implementing another concept."
 
-    class_id: str
+    concept_id: str
 
 
 @dataclass(unsafe_hash=True)

cognite/neat/core/_issues/warnings/_properties.py

@@ -48,7 +48,7 @@ class PropertyDefinitionDuplicatedWarning(PropertyWarning[T_Identifier]):
 @dataclass(unsafe_hash=True)
 class PropertyValueTypeUndefinedWarning(PropertyWarning[T_Identifier]):
     """The {resource_type} with identifier {identifier} has a property {property_name}
-    which has undefined value type. This may result in unexpected behavior when exporting rules.
+    which has undefined value type. This may result in unexpected behavior when exporting data model.
     {default_action}"""
 
     extra = "Recommended action: {recommended_action}"

cognite/neat/core/_store/__init__.py

@@ -1,4 +1,4 @@
-from ._graph_store import NeatGraphStore
-from ._rules_store import NeatRulesStore
+from ._data_model import NeatDataModelStore
+from ._instance import NeatInstanceStore
 
-__all__ = ["NeatGraphStore", "NeatRulesStore"]
+__all__ = ["NeatDataModelStore", "NeatInstanceStore"]