cognite-neat 0.123.25__tar.gz → 0.123.26__tar.gz

{cognite_neat-0.123.25 → cognite_neat-0.123.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 0.123.25
+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.26/cognite/neat/_version.py

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

{cognite_neat-0.123.25 → cognite_neat-0.123.26}/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-0.123.26/last_changelog_entry.md

@@ -0,0 +1,4 @@
+### Added
+
+- Parsing of OWL restrictions for domain and range when those as
+expressed as blank nodes (i.e. using owl:unionOf , owl:intersectionOf)

cognite_neat-0.123.26/last_git_message.txt

@@ -0,0 +1,26 @@
+Handling of OWL restriction for domain and range (#1266)
+
+# Description
+
+Often a property is not only defined for a single concept, but re-used
+for multiple concepts. In case of ontological modeling this is achieved
+by applying owl restrictions on rdfs:domain and rdfs:range when defining
+an owl property. Now we are able to parse these restrictions, which
+leads to step closer to lossless importing of ontologies into neat
+expression of data model.
+
+## Bump
+
+- [x] Patch
+- [ ] Minor
+- [ ] Skip
+
+## Changelog
+### Added
+
+- Parsing of OWL restrictions for domain and range when those as
+expressed as blank nodes (i.e. using owl:unionOf , owl:intersectionOf)
+
+---------
+
+Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

cognite_neat-0.123.26/last_version.txt

@@ -0,0 +1 @@
+0.123.25

{cognite_neat-0.123.25 → cognite_neat-0.123.26}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cognite-neat"
-version = "0.123.25"
+version = "0.123.26"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [

{cognite_neat-0.123.25 → cognite_neat-0.123.26}/tests/data/_schema/conceptual/ontology.ttl

@@ -47,6 +47,22 @@
                                                                         rdfs:label "logs raw data stream" .
 
 
+###  http://example.com/industrial/is.Controlled-By(Panel):Safety~?@!$&'*+,;=%[]
+<http://example.com/industrial/multiConnect> rdf:type owl:ObjectProperty ;
+                                             rdfs:domain [ owl:unionOf ( <http://example.com/industrial/Sensor.Unit_01(Temp)~?@!$&'*+,;=%[]>
+                                                                         <http://example.com/industrial/Sensor>
+                                                                        ) ;
+                                                         rdf:type owl:Class
+                                                         ] ;
+                                                                              rdfs:range [ owl:unionOf ( <http://example.com/industrial/Sensor.Unit_01(Temp)~?@!$&'*+,;=%[]>
+                                                                         <http://example.com/industrial/Sensor>
+                                                                             ) ;
+                                                         rdf:type owl:Class
+                                                         ] ;
+                                                                              rdfs:label "is multi connect" .
+
+
+
 #################################################################
 #    Data properties
 #################################################################

{cognite_neat-0.123.25 → cognite_neat-0.123.26}/tests/tests_unit/test_rules/test_importers/test_owl_importer.py

@@ -74,6 +74,7 @@ def test_owl_enitity_quoting():
         "links.Interface-Module%2802%29%3AIO~%3F%40%21%24%26%27%2A%2B%2C%3B%3D%25%5B%5D",
         "logs.Data-Stream%2801%29%3ARaw~%3F%40%21%24%26%27%2A%2B%2C%3B%3D%25%5B%5D",
         "reports.Status-Flag%28OK%29%3A1~%3F%40%21%24%26%27%2A%2B%2C%3B%3D%25%5B%5D",
+        "multiConnect",
     }
 
     actual_concepts = {concept.concept: concept for concept in conceptual_data_model.concepts}

{cognite_neat-0.123.25 → cognite_neat-0.123.26}/uv.lock

@@ -346,7 +346,7 @@ wheels = [
 
 [[package]]
 name = "cognite-neat"
-version = "0.123.25"
+version = "0.123.26"
 source = { editable = "." }
 dependencies = [
     { name = "backports-strenum", marker = "python_full_version < '3.11'" },

cognite_neat-0.123.25/cognite/neat/_version.py

@@ -1,2 +0,0 @@
-__version__ = "0.123.25"
-__engine__ = "^2.0.4"

cognite_neat-0.123.25/last_changelog_entry.md

@@ -1,3 +0,0 @@
-### Improved
-
-- Redefinition warning only occurs when redefinition actually take place

cognite_neat-0.123.25/last_git_message.txt

@@ -1,21 +0,0 @@
-trigger warning when redefinition occurs (#1265)
-
-# Description
-
-We were triggering redefinition warning irrespect if the redefinition
-took change or not.
-
-## Bump
-
-- [x] Patch
-- [ ] Minor
-- [ ] Skip
-
-## Changelog
-### Improved
-
-- Redefinition warning only occurs when redefinition actually take place
-
----------
-
-Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

cognite_neat-0.123.25/last_version.txt

@@ -1 +0,0 @@
-0.123.24