cognite-neat 0.127.24__py3-none-any.whl → 0.127.26__py3-none-any.whl

cognite/neat/_store/_provenance.py

@@ -1,10 +1,11 @@
+import itertools
 from collections import UserList
 from dataclasses import dataclass, field
 from datetime import datetime
 from typing import Any
 
 from cognite.neat._data_model.deployer.data_classes import DeploymentResult
-from cognite.neat._issues import IssueList
+from cognite.neat._issues import ConsistencyError, IssueList, ModelSyntaxError
 from cognite.neat._state_machine import State
 
 
@@ -35,6 +36,15 @@ class Change:
         """Check if change was successful"""
         return not self.errors
 
+    @property
+    def error_count(self) -> int:
+        """Get number of errors"""
+        return sum(
+            1
+            for issue in itertools.chain(self.issues or [], self.errors or [])
+            if isinstance(issue, ModelSyntaxError | ConsistencyError)
+        )
+
     def as_mixpanel_event(self) -> dict[str, Any]:
         """Convert change to mixpanel event format"""
         return {

cognite/neat/_store/_store.py

@@ -62,6 +62,7 @@ class NeatStore:
     def _can_agent_do_activity(self, agent: Agents) -> None:
         """Validate if activity can be performed in the current state and considering provenance"""
         if not self.state.can_transition(agent):
+            # specific error messages for common mistakes
             if isinstance(agent, DMSImporter) and isinstance(self.state, PhysicalState):
                 raise RuntimeError(
                     "⚠️ Cannot read data model, there is already a data model in the session!"
@@ -75,6 +76,17 @@ class NeatStore:
                 )
             raise RuntimeError(f"Cannot run {type(agent).__name__} in state {self.state}")
 
+        if (
+            isinstance(agent, DMSExporter)
+            and self.provenance.last_change
+            and (error_count := self.provenance.last_change.error_count) > 0
+        ):
+            raise RuntimeError(
+                f"⚠️ Cannot write data model, the model has {error_count} errors!"
+                f"{NEWLINE}Resolve issues before exporting the data model."
+                f"{NEWLINE}You can inspect issues using neat.issues"
+            )
+
         # need implementation of checking if required predecessor activities have been done
         # this will be done by running self.provenance.can_agent_do_activity(agent)
 

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.127.24"
+__version__ = "0.127.26"
 __engine__ = "^2.0.4"

cognite/neat/v0/core/_data_model/importers/_rdf/_owl2data_model.py

@@ -27,33 +27,53 @@ CLASSES_QUERY = """SELECT ?concept  ?name ?description ?implements
 
 CLASSES_QUERY_PARAMETERS = {"concept", "name", "description", "implements"}
 
-PROPERTIES_QUERY = """
-
-    SELECT ?concept  ?property_ ?name ?description ?value_type ?minCount ?maxCount ?default
+PROPERTIES_QUERY = """ SELECT ?concept ?property_ ?name ?description ?value_type ?min_count ?max_count ?default
     WHERE {{
         ?property_ a ?property_Type.
         FILTER (?property_Type IN (owl:ObjectProperty, owl:DatatypeProperty ) )
 
+        # --- 1. Explicit Domain Discovery ---
 
+        # A. Handling owl:domain when it is expressed as owl restriction
+        OPTIONAL {{
+            ?property_ rdfs:domain ?domain_exp_node .
+            FILTER(isBlank(?domain_exp_node))
+            ?domain_exp_node owl:unionOf|owl:intersectionOf ?exp_concepts_list .
+            ?exp_concepts_list rdf:rest*/rdf:first ?explicit_concept.
+        }}
 
-        # Handling owl:domain when it is expressed as
-        # owl restriction
+        # B. Handling the domain when it is a single concept
         OPTIONAL {{
-            ?property_ rdfs:domain ?domain .
-            FILTER(isBlank(?domain))
-            ?domain owl:unionOf|owl:intersectionOf ?concepts .
-            ?concepts rdf:rest*/rdf:first ?concept.
+            ?property_ rdfs:domain ?domain_exp_node .
+            FILTER(!isBlank(?domain_exp_node))
+            BIND(?domain_exp_node AS ?explicit_concept)
         }}
 
-        # Handling the domain when it is a single concept
+        # --- 2. Inherited Domain Discovery (Fallback) ---
+
+        # C. Handling inherited domain when parent domain is a restriction
         OPTIONAL {{
-            ?property_ rdfs:domain ?domain .
-            FILTER(!isBlank(?domain))
-            BIND(?domain AS ?concept)
+            ?property_ rdfs:subPropertyOf ?parent_property .
+            ?parent_property rdfs:domain ?parent_domain_node .
+            FILTER(isBlank(?parent_domain_node))
+            ?parent_domain_node owl:unionOf|owl:intersectionOf ?parent_concepts_list .
+            ?parent_concepts_list rdf:rest*/rdf:first ?inherited_concept.
         }}
 
-        # Handling owl:range when it is expressed as
-        # owl restriction
+        # D. Handling inherited domain when parent domain is a single concept
+        OPTIONAL {{
+            ?property_ rdfs:subPropertyOf ?parent_property .
+            ?parent_property rdfs:domain ?parent_domain_node .
+            FILTER(!isBlank(?parent_domain_node))
+            BIND(?parent_domain_node AS ?inherited_concept)
+        }}
+
+        # Final Concept Assignment with Priority ---
+        # COALESCE prioritizes ?explicit_concept over ?inherited_concept
+        BIND(COALESCE(?explicit_concept, ?inherited_concept) AS ?concept)
+
+
+        # Handling owl:range when it is expressed as owl restriction
         OPTIONAL {{
             ?property_ rdfs:range ?range .
             FILTER(isBlank(?range))
@@ -70,8 +90,8 @@ PROPERTIES_QUERY = """
 
         OPTIONAL {{?property_ rdfs:label|skos:prefLabel ?name }}.
         OPTIONAL {{?property_ rdfs:comment|skos:definition ?description}}.
-        OPTIONAL {{?property_ owl:maxCardinality ?maxCount}}.
-        OPTIONAL {{?property_ owl:minCardinality ?minCount}}.
+        OPTIONAL {{?property_ owl:maxCardinality ?max_count}}.
+        OPTIONAL {{?property_ owl:minCardinality ?min_count}}.
 
         # FILTERS
         FILTER (!isBlank(?property_))
@@ -85,8 +105,8 @@ PROPERTIES_QUERY_PARAMETERS = {
     "name",
     "description",
     "value_type",
-    "minCount",
-    "maxCount",
+    "min_count",
+    "max_count",
     "default",
 }
 

{cognite_neat-0.127.24.dist-info → cognite_neat-0.127.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 0.127.24
+Version: 0.127.26
 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.127.24.dist-info → cognite_neat-0.127.26.dist-info}/RECORD

@@ -1,7 +1,7 @@
 cognite/neat/__init__.py,sha256=Lo4DbjDOwnhCYUoAgPp5RG1fDdF7OlnomalTe7n1ydw,211
 cognite/neat/_exceptions.py,sha256=ox-5hXpee4UJlPE7HpuEHV2C96aLbLKo-BhPDoOAzhA,1650
 cognite/neat/_issues.py,sha256=wH1mnkrpBsHUkQMGUHFLUIQWQlfJ_qMfdF7q0d9wNhY,1871
-cognite/neat/_version.py,sha256=LNaUX8rigYyV0YJJO1DIZXt21i_AUALgOhe4snlff6o,47
+cognite/neat/_version.py,sha256=zp1q6MhRkZE6P6k0LZ7xa5KjU1ZbL4JI5oVv8qlg_5Q,47
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/v1.py,sha256=owqW5Mml2DSZx1AvPvwNRTBngfhBNrQ6EH-7CKL7Jp0,61
 cognite/neat/_client/__init__.py,sha256=75Bh7eGhaN4sOt3ZcRzHl7pXaheu1z27kmTHeaI05vo,114
@@ -108,8 +108,8 @@ cognite/neat/_state_machine/__init__.py,sha256=wrtQUHETiLzYM0pFo7JC6pJCiXetHADQb
 cognite/neat/_state_machine/_base.py,sha256=-ZpeAhM6l6N6W70dET25tAzOxaaK5aa474eabwZVzjA,1112
 cognite/neat/_state_machine/_states.py,sha256=nmj4SmunpDYcBsNx8A284xnXGS43wuUuWpMMORha2DE,1170
 cognite/neat/_store/__init__.py,sha256=TvM9CcFbtOSrxydPAuJi6Bv_iiGard1Mxfx42ZFoTl0,55
-cognite/neat/_store/_provenance.py,sha256=WGRRLVmYrYEOjeouZj7GvoAlMzCN6vchzpSEKsKNYe0,2772
-cognite/neat/_store/_store.py,sha256=RiMJccn44gWxpM1SqPbnt3nzgMgYBeUaapfk4fY9Ikg,6250
+cognite/neat/_store/_provenance.py,sha256=tWQGa2QNPyW7FfHQBRto9eHXCxeOTzlz7DvYjAwHfuY,3102
+cognite/neat/_store/_store.py,sha256=Ql1nZvq2UtNoI-L1OmIUFQGXQ4i5-Zche28-YHnBkyg,6775
 cognite/neat/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/_utils/_reader.py,sha256=9dXrODNNqWU0Gx1zXjRTOiiByFuDZlpQkQEzx3HAxYQ,5390
 cognite/neat/_utils/auxiliary.py,sha256=Cx-LP8dfN782R3iUcm--q26zdzQ0k_RFnVbJ0bwVZMI,1345
@@ -166,7 +166,7 @@ cognite/neat/v0/core/_data_model/importers/_spreadsheet2data_model.py,sha256=ksD
 cognite/neat/v0/core/_data_model/importers/_rdf/__init__.py,sha256=1yOjV2PKCxwH7uCTXVZhSdxtn5etmFX40cksvwtKcZ8,199
 cognite/neat/v0/core/_data_model/importers/_rdf/_base.py,sha256=Rv24TQQDZqAuFD8Qh0yRBiB7-JvoMVj3mGoPBm-xBFs,6052
 cognite/neat/v0/core/_data_model/importers/_rdf/_inference2rdata_model.py,sha256=w8LsdkzgoTXN3LZyjEL_5grWZGlf7PPj8qOu370_K6M,28976
-cognite/neat/v0/core/_data_model/importers/_rdf/_owl2data_model.py,sha256=JsL2gpVs4ntLyzncgRYic-4qSiDhXT-6xN3jTLo629U,4031
+cognite/neat/v0/core/_data_model/importers/_rdf/_owl2data_model.py,sha256=6fS2IhmRjsQdENYb47bSvRcqTzp7zr0YUuRIsYY-EPc,5200
 cognite/neat/v0/core/_data_model/importers/_rdf/_shared.py,sha256=lcMnGIvqYZJ41JPjzanZHi9uG826EzYHpQXSMYVRK8A,9839
 cognite/neat/v0/core/_data_model/models/__init__.py,sha256=whWV0FrdUi01Du2mgan3_kZHQ9T2tGrGb2xRxoFDhNo,1258
 cognite/neat/v0/core/_data_model/models/_base_unverified.py,sha256=1Wfbp-tJaEF6hd1bFdp2FhTgPkInf-1ZokuEoVJRPxQ,6842
@@ -312,7 +312,7 @@ cognite/neat/v0/session/engine/__init__.py,sha256=D3MxUorEs6-NtgoICqtZ8PISQrjrr4
 cognite/neat/v0/session/engine/_import.py,sha256=1QxA2_EK613lXYAHKQbZyw2yjo5P9XuiX4Z6_6-WMNQ,169
 cognite/neat/v0/session/engine/_interface.py,sha256=3W-cYr493c_mW3P5O6MKN1xEQg3cA7NHR_ev3zdF9Vk,533
 cognite/neat/v0/session/engine/_load.py,sha256=u0x7vuQCRoNcPt25KJBJRn8sJabonYK4vtSZpiTdP4k,5201
-cognite_neat-0.127.24.dist-info/METADATA,sha256=MAWzw07h5PAWRf-4uH9i42Ljqj4n5f_DUI29VJ8ka_I,9150
-cognite_neat-0.127.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cognite_neat-0.127.24.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.127.24.dist-info/RECORD,,
+cognite_neat-0.127.26.dist-info/METADATA,sha256=W1EY7XRW7rN7oqdEfS1UMJW1drv2KQyTFuDIH8V1Yh4,9150
+cognite_neat-0.127.26.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cognite_neat-0.127.26.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.127.26.dist-info/RECORD,,