cognite-neat 0.123.24__py3-none-any.whl → 0.123.26__py3-none-any.whl

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.123.24"
+__version__ = "0.123.26"
 __engine__ = "^2.0.4"

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

@@ -33,8 +33,41 @@ PROPERTIES_QUERY = """
     WHERE {{
         ?property_ a ?property_Type.
         FILTER (?property_Type IN (owl:ObjectProperty, owl:DatatypeProperty ) )
-        OPTIONAL {{?property_ rdfs:domain ?concept  }}.
-        OPTIONAL {{?property_ rdfs:range ?value_type }}.
+
+
+
+        # Handling owl:domain when it is expressed as
+        # owl restriction
+        OPTIONAL {{
+            ?property_ rdfs:domain ?domain .
+            FILTER(isBlank(?domain))
+            ?domain owl:unionOf|owl:intersectionOf ?concepts .
+            ?concepts rdf:rest*/rdf:first ?concept.
+        }}
+
+        # Handling the domain when it is a single concept
+        OPTIONAL {{
+            ?property_ rdfs:domain ?domain .
+            FILTER(!isBlank(?domain))
+            BIND(?domain AS ?concept)
+        }}
+
+        # Handling owl:range when it is expressed as
+        # owl restriction
+        OPTIONAL {{
+            ?property_ rdfs:range ?range .
+            FILTER(isBlank(?range))
+            ?range owl:unionOf|owl:intersectionOf ?value_types .
+            ?value_types rdf:rest*/rdf:first ?value_type.
+        }}
+
+        # Handling the range when it is a single concept
+        OPTIONAL {{
+            ?property_ rdfs:range ?range .
+            FILTER(!isBlank(?range))
+            BIND(?range AS ?value_type)
+        }}
+
         OPTIONAL {{?property_ rdfs:label|skos:prefLabel ?name }}.
         OPTIONAL {{?property_ rdfs:comment|skos:definition ?description}}.
         OPTIONAL {{?property_ owl:maxCardinality ?maxCount}}.

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

@@ -183,15 +183,19 @@ def handle_meta(
     if not resources[resource_id][feature] and res[feature]:
         resources[resource_id][feature] = res[feature]
 
-    # RAISE warning only if the feature is being redefined
-    elif resources[resource_id][feature] and res[feature]:
+    current_value = resources[resource_id][feature]
+    new_value = res[feature]
+
+    if not current_value and new_value:
+        resources[resource_id][feature] = new_value
+    elif current_value and new_value and current_value != new_value:
         issue_list.append(
             ResourceRedefinedWarning(
                 identifier=resource_id,
                 resource_type=resource_type,
                 feature=feature,
-                current_value=resources[resource_id][feature],
-                new_value=res[feature],
+                current_value=current_value,
+                new_value=new_value,
             )
         )
 

{cognite_neat-0.123.24.dist-info → cognite_neat-0.123.26.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 cognite/neat/__init__.py,sha256=12StS1dzH9_MElqxGvLWrNsxCJl9Hv8A2a9D0E5OD_U,193
-cognite/neat/_version.py,sha256=OytVcoxwDZLLp2GXMnYRY7ndUvjFG3i1kpKci4_8cyc,47
+cognite/neat/_version.py,sha256=ZRJQU5AqGl89hbyhyolzPHb6kKhu67DqV9zYl0ab7Nw,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
@@ -44,8 +44,8 @@ cognite/neat/core/_data_model/importers/_spreadsheet2data_model.py,sha256=wPb1ie
 cognite/neat/core/_data_model/importers/_rdf/__init__.py,sha256=1yOjV2PKCxwH7uCTXVZhSdxtn5etmFX40cksvwtKcZ8,199
 cognite/neat/core/_data_model/importers/_rdf/_base.py,sha256=XTdKqN4nf0d2Vvk56LShrDoyCQCg9MXvKwxXT0uMnGg,6016
 cognite/neat/core/_data_model/importers/_rdf/_inference2rdata_model.py,sha256=PCgM9-qGSLlupN7tYCFLHjivgICtMiahNry1ub8JCYk,28934
-cognite/neat/core/_data_model/importers/_rdf/_owl2data_model.py,sha256=l_89N1LewZVjSttcJkFAJj63JW8wI-THKJYjAxcNiDg,3093
-cognite/neat/core/_data_model/importers/_rdf/_shared.py,sha256=2w7TDkAFFoNuL3ewFlTseXLscvOaGP_tXYdFeZVYxKw,9670
+cognite/neat/core/_data_model/importers/_rdf/_owl2data_model.py,sha256=BVXECneCZE5xNDV79Q0WHEjEPdsRKjQOITvjUSpEdZQ,4025
+cognite/neat/core/_data_model/importers/_rdf/_shared.py,sha256=Cni9yaIKnKh6tHngxhxgseVveB7ZV_doA92fUbMd8gY,9774
 cognite/neat/core/_data_model/models/__init__.py,sha256=hmF7MDR1XmpLxYdMkOEuPuHUqOQKE4AgsuUqdc-ySSQ,1249
 cognite/neat/core/_data_model/models/_base_unverified.py,sha256=1Wfbp-tJaEF6hd1bFdp2FhTgPkInf-1ZokuEoVJRPxQ,6842
 cognite/neat/core/_data_model/models/_base_verified.py,sha256=nzPrlj7ZvYull_Fdh2zeDXz98hux-eQOdTGy9jhUtYA,15127
@@ -195,7 +195,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.24.dist-info/METADATA,sha256=6IsxLYDhU0BYxDDn-dxMtYT8owbMgt2HcOLr9fxzcSA,9172
-cognite_neat-0.123.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cognite_neat-0.123.24.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.123.24.dist-info/RECORD,,
+cognite_neat-0.123.26.dist-info/METADATA,sha256=_X-TDE3Cg0RJyvXEA2xzG6Dld67JV1-p7VDXuqDkFFw,9172
+cognite_neat-0.123.26.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cognite_neat-0.123.26.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.123.26.dist-info/RECORD,,