cognite-neat 0.123.16__py3-none-any.whl → 0.123.18__py3-none-any.whl

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.123.16"
+__version__ = "0.123.18"
 __engine__ = "^2.0.4"

cognite/neat/core/_data_model/analysis/_base.py

@@ -348,6 +348,10 @@ class DataModelAnalysis:
         properties_by_view = self.properties_by_view(include_ancestors)
         return {prop.view for prop in itertools.chain.from_iterable(properties_by_view.values())}
 
+    def concepts(self) -> set[ConceptEntity]:
+        """Returns all concepts defined Concepts in the data model."""
+        return {concept.concept for concept in self.conceptual.concepts}
+
     def defined_concepts(
         self,
         include_ancestors: bool = False,

cognite/neat/core/_data_model/exporters/_data_model2ontology.py

@@ -17,10 +17,8 @@ from cognite.neat.core._data_model.models.conceptual import (
     ConceptualMetadata,
     ConceptualProperty,
 )
-from cognite.neat.core._data_model.models.conceptual._validation import duplicated_properties
 from cognite.neat.core._data_model.models.data_types import DataType
 from cognite.neat.core._data_model.models.entities import ConceptEntity
-from cognite.neat.core._issues import MultiValueError
 from cognite.neat.core._issues.errors import (
     PropertyDefinitionDuplicatedError,
 )
@@ -106,21 +104,6 @@ class Ontology(OntologyModel):
         Returns:
             An instance of Ontology.
         """
-        if duplicates := duplicated_properties(data_model.properties):
-            errors = []
-            for (concept, property_), definitions in duplicates.items():
-                errors.append(
-                    PropertyDefinitionDuplicatedError(
-                        concept,
-                        "concept",
-                        property_,
-                        frozenset({str(definition[1].value_type) for definition in definitions}),
-                        tuple(definition[0] for definition in definitions),
-                        "rows",
-                    )
-                )
-            raise MultiValueError(errors)
-
         analysis = DataModelAnalysis(data_model)
         concept_by_suffix = analysis.concept_by_suffix()
         return cls(

cognite/neat/core/_data_model/models/conceptual/_validation.py

@@ -1,6 +1,5 @@
 import itertools
 from collections import Counter, defaultdict
-from collections.abc import Iterable
 
 from cognite.neat.core._constants import get_base_concepts
 from cognite.neat.core._data_model._constants import PATTERNS, EntityTypes
@@ -14,6 +13,7 @@ from cognite.neat.core._issues.errors._resources import (
 )
 from cognite.neat.core._issues.warnings._models import (
     ConceptOnlyDataModelWarning,
+    ConversionToPhysicalModelImpossibleWarning,
     DanglingPropertyWarning,
     UndefinedConceptWarning,
 )
@@ -24,7 +24,7 @@ from cognite.neat.core._issues.warnings._resources import (
 from cognite.neat.core._utils.spreadsheet import SpreadsheetRead
 from cognite.neat.core._utils.text import humanize_collection
 
-from ._verified import ConceptualDataModel, ConceptualProperty
+from ._verified import ConceptualDataModel
 
 
 class ConceptualValidation:
@@ -62,9 +62,30 @@ class ConceptualValidation:
 
         self._concept_only_data_model()
         self._regex_compliance_with_physical_data_model()
+        self._physical_data_model_conversion()
 
         return self.issue_list
 
+    def _physical_data_model_conversion(self) -> None:
+        """Check if the conceptual data model has issues that will likely lead
+        to problems when converting to a physical data model."""
+        warning_types_preventing_conversion = [
+            ConceptOnlyDataModelWarning,
+            ResourceRegexViolationWarning,
+            ResourceNotDefinedWarning,
+            UndefinedConceptWarning,
+            DanglingPropertyWarning,
+        ]
+
+        if seen_warnings := frozenset(
+            [
+                warning_type.__name__
+                for warning_type in warning_types_preventing_conversion
+                if self.issue_list.has_warning_type(warning_type)
+            ]
+        ):
+            self.issue_list.append_if_not_exist(ConversionToPhysicalModelImpossibleWarning(issue_types=seen_warnings))
+
     def _concept_only_data_model(self) -> None:
         """Check if the data model only consists of concepts without any properties."""
         if not self._properties:
@@ -176,7 +197,6 @@ class ConceptualValidation:
         """Check if the value types of object properties are defined as concepts."""
 
         concepts = {concept.concept for concept in self._concepts}
-
         # We remove UnknownEntity from the concepts to avoid false positives
         # as `UnknownEntity` is used as a placeholder when the value type is not defined.
         value_types = {
@@ -286,12 +306,3 @@ class ConceptualValidation:
                     "\nMake sure that each unique namespace is assigned to a unique prefix"
                 )
             )
-
-
-def duplicated_properties(
-    properties: Iterable[ConceptualProperty],
-) -> dict[tuple[ConceptEntity, str], list[tuple[int, ConceptualProperty]]]:
-    concept_properties_by_id: dict[tuple[ConceptEntity, str], list[tuple[int, ConceptualProperty]]] = defaultdict(list)
-    for prop_no, prop in enumerate(properties):
-        concept_properties_by_id[(prop.concept, prop.property_)].append((prop_no, prop))
-    return {k: v for k, v in concept_properties_by_id.items() if len(v) > 1}

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

@@ -23,6 +23,7 @@ from ._general import (
 from ._models import (
     BreakingModelingPrincipleWarning,
     CDFNotSupportedWarning,
+    ConversionToPhysicalModelImpossibleWarning,
     NotSupportedHasDataFilterLimitWarning,
     NotSupportedViewContainerLimitWarning,
     PrincipleMatchingSpaceAndVersionWarning,
@@ -58,6 +59,7 @@ __all__ = [
     "CDFAuthWarning",
     "CDFMaxIterationsWarning",
     "CDFNotSupportedWarning",
+    "ConversionToPhysicalModelImpossibleWarning",
     "DeprecatedWarning",
     "FileItemNotSupportedWarning",
     "FileMissingRequiredFieldWarning",

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

@@ -109,6 +109,14 @@ class ConceptOnlyDataModelWarning(UserModelingWarning):
     fix = "Define properties for concepts or make sure that concepts implement other concepts that have properties."
 
 
+@dataclass(unsafe_hash=True)
+class ConversionToPhysicalModelImpossibleWarning(UserModelingWarning):
+    """Conceptual data model has {issue_types} that will lead to problems when converting to a physical data model."""
+
+    fix = "Fix the issues in the conceptual data model before attempting to convert it to a physical data model."
+    issue_types: frozenset[str]
+
+
 @dataclass(unsafe_hash=True)
 class DanglingPropertyWarning(UserModelingWarning):
     """Property {property_id} is not defined for any concept.

cognite/neat/session/_base.py

@@ -173,6 +173,7 @@ class NeatSession:
             "Convert to physical",
             has_physical_data_model=False,
             has_conceptual_data_model=True,
+            can_convert_to_physical_data_model=True,
         )
         converter = ConceptualToPhysical(reserved_properties=reserved_properties, client=self._state.client)
 

cognite/neat/session/_state.py

@@ -6,11 +6,13 @@ from rdflib import URIRef
 from cognite.neat.core._client import NeatClient
 from cognite.neat.core._data_model.importers import BaseImporter, InferenceImporter
 from cognite.neat.core._data_model.models import ConceptualDataModel, PhysicalDataModel
+from cognite.neat.core._data_model.models.conceptual._validation import ConceptualValidation
 from cognite.neat.core._data_model.transformers import (
     VerifiedDataModelTransformer,
 )
 from cognite.neat.core._instances.extractors import KnowledgeGraphExtractor
 from cognite.neat.core._issues import IssueList
+from cognite.neat.core._issues.warnings._models import ConversionToPhysicalModelImpossibleWarning
 from cognite.neat.core._store import NeatDataModelStore, NeatInstanceStore
 from cognite.neat.core._utils.upload import UploadResultList
 
@@ -72,6 +74,7 @@ class SessionState:
         instances_required: bool = False,
         client_required: bool = False,
         has_conceptual_data_model: bool | None = None,
+        can_convert_to_physical_data_model: bool = False,
         has_physical_data_model: bool | None = None,
     ) -> None:
         """Set conditions for raising an error in the session that are used by various methods in the session."""
@@ -84,6 +87,17 @@ class SessionState:
         if has_conceptual_data_model is True and self.data_model_store.try_get_last_conceptual_data_model is None:
             condition.add(f"{activity} expects conceptual data model in NEAT session")
             suggestion.add("Read in conceptual data model to neat session")
+        if (
+            can_convert_to_physical_data_model is True
+            and (conceptual_model := self.data_model_store.try_get_last_conceptual_data_model)
+            and ConceptualValidation(conceptual_model)
+            .validate()
+            .has_warning_type(ConversionToPhysicalModelImpossibleWarning)
+        ):
+            condition.add(f"{activity} expects conceptual data model that can be converted to physical data model")
+            suggestion.add(
+                "Read in conceptual data model and ensure that warnings that prevent conversion are resolved"
+            )
         if has_physical_data_model is False and self.data_model_store.try_get_last_physical_data_model is not None:
             condition.add(f"{activity} expects no physical data model in NEAT session")
             suggestion.add("You already have a physical data model in the session")

{cognite_neat-0.123.16.dist-info → cognite_neat-0.123.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 0.123.16
+Version: 0.123.18
 Summary: Knowledge graph transformation
 Project-URL: Documentation, https://cognite-neat.readthedocs-hosted.com/
 Project-URL: Homepage, https://cognite-neat.readthedocs-hosted.com/

{cognite_neat-0.123.16.dist-info → cognite_neat-0.123.18.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cognite/neat/__init__.py,sha256=12StS1dzH9_MElqxGvLWrNsxCJl9Hv8A2a9D0E5OD_U,193
-cognite/neat/_version.py,sha256=BlmwKmiATKYRKR7O0PuP9r182NuNd4-ke2_e5KZ6arM,47
+cognite/neat/_version.py,sha256=fuTI2lcJbM6-5HASu5MdGJw07hZcivY-3tNoqelvUs0,47
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/core/_config.py,sha256=WT1BS8uADcFvGoUYOOfwFOVq_VBl472TisdoA3wLick,280
@@ -22,7 +22,7 @@ cognite/neat/core/_data_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 cognite/neat/core/_data_model/_constants.py,sha256=ssiOprhd4bamglQnLTNjmqYn9mCBW-VOUbn08qDBbsM,5857
 cognite/neat/core/_data_model/_shared.py,sha256=gLEEMofI9prZLRNjHpwQe0uX9WoKd5qUt5pT1i_KAYo,2072
 cognite/neat/core/_data_model/analysis/__init__.py,sha256=v3hSfz7AEEqcmdjL71I09tP8Hl-gPZYOiDYMp_CW4vg,70
-cognite/neat/core/_data_model/analysis/_base.py,sha256=baqgY-66zOUxw8s-PA1KGAOs2R1gJDAo2UWWc8LlHGU,24257
+cognite/neat/core/_data_model/analysis/_base.py,sha256=VT1orVf0xSSZrKnJoc-cJR1F1mtMn9Ybjk7UDO71aFA,24448
 cognite/neat/core/_data_model/catalog/__init__.py,sha256=zWG1-GONe8m05lV3gLAK_Xp7EJvcy6qLLl2B-RHHBjw,260
 cognite/neat/core/_data_model/catalog/classic_model.xlsx,sha256=YkocpkKypizjsWYwOdn5yzIz_BSl8T8SQLxgm4GIjLQ,15014
 cognite/neat/core/_data_model/catalog/conceptual-imf-data-model.xlsx,sha256=vrE5g8vBtsGpwJqygxG3t9I3x4SUAyQsi1vtWfZ8QW4,53682
@@ -32,7 +32,7 @@ cognite/neat/core/_data_model/exporters/_base.py,sha256=PHKTUiio4PmiEjWP9E9tJiOk
 cognite/neat/core/_data_model/exporters/_data_model2dms.py,sha256=gFSWvYV71LSzDVYsGlJ_mMxhLuKK0nwBvBiwRJhbvTE,19891
 cognite/neat/core/_data_model/exporters/_data_model2excel.py,sha256=88ReyrsRqoIRJcF7ezZGtsZ_0FBL0Wq7UsGI1uCXgJ4,25457
 cognite/neat/core/_data_model/exporters/_data_model2instance_template.py,sha256=9k8A70b1paeOHjvJRtbl6Xror1GD8AIMdo3cCx5aejE,6103
-cognite/neat/core/_data_model/exporters/_data_model2ontology.py,sha256=YrLTwPAvOOyLFHFJaNs4I82HCp1llJnkF1BRdoIQMck,23409
+cognite/neat/core/_data_model/exporters/_data_model2ontology.py,sha256=sZRxvbnv2reav3xUUZl6NIX-KqngoKr4qLmzTUvkhYk,22615
 cognite/neat/core/_data_model/exporters/_data_model2yaml.py,sha256=1dlb-v4sV8BArnX_6J4wpjQT7r-FinFAvoPDoMNkHYw,3284
 cognite/neat/core/_data_model/importers/__init__.py,sha256=5KqFRDz69FlXRcmqu7ejQl3YVXrpLXx-Q-HpwAeDbfA,1184
 cognite/neat/core/_data_model/importers/_base.py,sha256=pKe2OK86Wdj6CTj5bUgjY33ejZhRfD2eJbjcCapHD58,2013
@@ -52,7 +52,7 @@ cognite/neat/core/_data_model/models/_types.py,sha256=70E8fiLdZkVF2sDUGPuDhzXNA5
 cognite/neat/core/_data_model/models/data_types.py,sha256=uQ_u9KxCetLjxo-VtFzOXSxQuuf97Kg-9lfTTGzY6hc,10150
 cognite/neat/core/_data_model/models/conceptual/__init__.py,sha256=9A6myEV8s0-LqdXejaljqPj8S0pIpUL75rNdRDZzyR8,585
 cognite/neat/core/_data_model/models/conceptual/_unverified.py,sha256=VswgnTSjSCRzBX3z5HvintBGaWBPexxIs-7z7S4J57c,6298
-cognite/neat/core/_data_model/models/conceptual/_validation.py,sha256=AeTNwoby-lHVf_-7XBMPS7I_NuR3iyCCXv5wcALaNsE,13425
+cognite/neat/core/_data_model/models/conceptual/_validation.py,sha256=u-BngcU1Bfe846CxJM-z_uu7En1bLJd7NBzeKOmS9RA,13806
 cognite/neat/core/_data_model/models/conceptual/_verified.py,sha256=BUB4Ur4kpBoWiwTf57tjxJ2l0tDTSbY7zGrg1g0yVNQ,13716
 cognite/neat/core/_data_model/models/entities/__init__.py,sha256=UsW-_6fwd-TW0WcnShPKf40h75l1elVn80VurUwRAic,1567
 cognite/neat/core/_data_model/models/entities/_constants.py,sha256=GXRzVfArwxF3C67VCkzy0JWTZRkRJUYXBQaaecrqcWc,351
@@ -129,10 +129,10 @@ cognite/neat/core/_issues/errors/_general.py,sha256=QEgTp_bvzGjmpRtr09Lj_SBeD9IV
 cognite/neat/core/_issues/errors/_properties.py,sha256=ZR2_j-TkxT8Zn5NGMNNOuKQ_bKeciaMOGZkRKg1YCvw,2924
 cognite/neat/core/_issues/errors/_resources.py,sha256=lBK65tJZMhV3z3_xi8zJeo7Nt_agXsOklH_RPKQu28s,4002
 cognite/neat/core/_issues/errors/_wrapper.py,sha256=clhuSwUuHy-FQXQopFIQRY8c_NZM5u-QB9ncoc6Hrbo,2320
-cognite/neat/core/_issues/warnings/__init__.py,sha256=lzNZrguzwXyifehsCilAXa5UL94DWHIeO-slyC-EYZc,3165
+cognite/neat/core/_issues/warnings/__init__.py,sha256=3MQS_elyRD3SG3iEWMWLRJDabth7upT3oX4WD0xxOh4,3263
 cognite/neat/core/_issues/warnings/_external.py,sha256=w-1R7ea6DXTIWqwlwMMjY0YxKDMSJ8gKAbp_nIIM1AI,1324
 cognite/neat/core/_issues/warnings/_general.py,sha256=_6dAFaMz-LIv7GsBBIBq2d-kmbuxVXKvU4jZeb7tjAo,972
-cognite/neat/core/_issues/warnings/_models.py,sha256=u9GH2i1vWet5fofB1ObDsiMxkLF7ZKj2s2a3J-oeiF4,5111
+cognite/neat/core/_issues/warnings/_models.py,sha256=zTQuj2eAQOaX4CO8NljhX50Y8i9FUy3nc3x4l42YHmM,5479
 cognite/neat/core/_issues/warnings/_properties.py,sha256=I3vqc1aL-ce_FRQNgQQy34RW7kQxcjbwhZIIVtGVmg8,3807
 cognite/neat/core/_issues/warnings/_resources.py,sha256=_iPRq0pRMmRu3LFjqZTaG3OqOzw4f8-Vc9G4Im__FHc,3578
 cognite/neat/core/_issues/warnings/user_modeling.py,sha256=Qn_S8TLw7MMYQaJcZBScJA48kz_PrTWz0NaepSR70Fk,4144
@@ -163,7 +163,7 @@ cognite/neat/plugins/data_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 cognite/neat/plugins/data_model/importers/__init__.py,sha256=d4UJNCFR1DXPY7lv5LdCW2hiStEhvXiu2g_bRSIp1y0,89
 cognite/neat/plugins/data_model/importers/_base.py,sha256=M9zXp7tEu1SfJZRAJAtLmqpssdFcoi2X-5e25q_n_h8,1034
 cognite/neat/session/__init__.py,sha256=fxQ5URVlUnmEGYyB8Baw7IDq-uYacqkigbc4b-Pr9Fw,58
-cognite/neat/session/_base.py,sha256=vg8KgzpQxFnFCR4F0yRNSsRmrgYZQ77rW6eX4w7L9M4,12884
+cognite/neat/session/_base.py,sha256=6P63Kq4JJSi3S1CpcVLiG-dfKsN9Ml3o5GqZXjcLVvo,12937
 cognite/neat/session/_collector.py,sha256=-icWXOT9YBjAOVZfpPtBx-D39kpRP2RaQKdPtcr7Xm8,4233
 cognite/neat/session/_drop.py,sha256=ipD8RS_ZebPNpeIkhC7yqSSeo7e57TXMRxrh5_6IRik,4239
 cognite/neat/session/_experimental.py,sha256=0peZPZ9JpmzQE05wHbng2tWmPPLLTAVfWZEEUhdnI6o,1274
@@ -176,7 +176,7 @@ cognite/neat/session/_prepare.py,sha256=pskEVNgcnVJVRvYKk5xI55V89vKDO_kgjszj5flY
 cognite/neat/session/_read.py,sha256=rd1MeXPt_fS50WYrpM6UqDTKOQkDrOIn8TPS0WOVoSw,34607
 cognite/neat/session/_set.py,sha256=PU4lKI-LGtKFVyvdtfZkk-zLw9e_rnFHzuV9IyrOrTM,4593
 cognite/neat/session/_show.py,sha256=YLt6K4ukG1s_I_FhuVrIVPtw_btvvOL50Rwrx-vo7VQ,10743
-cognite/neat/session/_state.py,sha256=DLEm9wn3GtOuTGhy5-M1IK2v9qvLnTYEruWPidzAP_Q,6580
+cognite/neat/session/_state.py,sha256=0fd8bS7WkzzCN_dVjxK6cInL9EYhQyPd_xIUlgtf-lE,7424
 cognite/neat/session/_subset.py,sha256=p7n6WmL0gZlUbqpVBgyPncQ6uWn_pi7FDSixDFrm7DM,2848
 cognite/neat/session/_template.py,sha256=NCgrrwLT98DpLYoo3Wybr_OUXrEXpsJZjrJ83KqfyWc,9908
 cognite/neat/session/_to.py,sha256=_R-UB3iEIQoa12kTD7tuSrRDdbySQXQg_mzbn5t-7bg,19399
@@ -187,7 +187,7 @@ cognite/neat/session/engine/__init__.py,sha256=D3MxUorEs6-NtgoICqtZ8PISQrjrr4dvc
 cognite/neat/session/engine/_import.py,sha256=1QxA2_EK613lXYAHKQbZyw2yjo5P9XuiX4Z6_6-WMNQ,169
 cognite/neat/session/engine/_interface.py,sha256=3W-cYr493c_mW3P5O6MKN1xEQg3cA7NHR_ev3zdF9Vk,533
 cognite/neat/session/engine/_load.py,sha256=g52uYakQM03VqHt_RDHtpHso1-mFFifH5M4T2ScuH8A,5198
-cognite_neat-0.123.16.dist-info/METADATA,sha256=M0gosIy1EnoQHqzCfO7Wcm_YGDpNWf0inn1iFK754Yg,9172
-cognite_neat-0.123.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cognite_neat-0.123.16.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.123.16.dist-info/RECORD,,
+cognite_neat-0.123.18.dist-info/METADATA,sha256=q22nT23r2NuAAxf3lXnDcYch4KrhEl7ZPVptlcYiGm0,9172
+cognite_neat-0.123.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cognite_neat-0.123.18.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.123.18.dist-info/RECORD,,