cognite-neat 0.123.13__py3-none-any.whl → 0.123.14__py3-none-any.whl

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.123.13"
+__version__ = "0.123.14"
 __engine__ = "^2.0.4"

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

@@ -25,6 +25,8 @@ 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
@@ -44,34 +46,36 @@ PROPERTIES_QUERY = """
         FILTER (!bound(?description) || LANG(?description) = "" || LANGMATCHES(LANG(?description), "{language}"))
     }}
     """
+PROPERTIES_QUERY_PARAMETERS = {
+    "concept",
+    "property_",
+    "name",
+    "description",
+    "value_type",
+    "minCount",
+    "maxCount",
+    "default",
+}
 
 
 class OWLImporter(BaseRDFImporter):
     """Convert OWL ontology to unverified data model.
 
-        Args:
-            filepath: Path to OWL ontology
-
-    !!! Note
-        OWL Ontologies are information models which completeness varies. As such, constructing functional
-        data model directly will often be impossible, therefore the produced data model object will be ill formed.
-        To avoid this, neat will automatically attempt to make the imported data model compliant by adding default
-        values for missing information, attaching dangling properties to default containers based on the
-        property type, etc.
-
-        One has to be aware that NEAT will be opinionated about how to make the ontology
-        compliant, and that the resulting data model may not be what you expect.
-
+    Args:
+        filepath: Path to OWL ontology
     """
 
     def _to_data_model_components(
         self,
     ) -> dict:
-        concepts, issue_list = parse_concepts(self.graph, CLASSES_QUERY, self.language, self.issue_list)
+        concepts, issue_list = parse_concepts(
+            self.graph, CLASSES_QUERY, CLASSES_QUERY_PARAMETERS, self.language, self.issue_list
+        )
         self.issue_list = issue_list
 
-        # NeatError
-        properties, issue_list = parse_properties(self.graph, PROPERTIES_QUERY, self.language, self.issue_list)
+        properties, issue_list = parse_properties(
+            self.graph, PROPERTIES_QUERY, PROPERTIES_QUERY_PARAMETERS, self.language, self.issue_list
+        )
         self.issue_list = issue_list
 
         components = {

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

@@ -14,12 +14,17 @@ from cognite.neat.core._issues.warnings._resources import (
 from cognite.neat.core._utils.rdf_ import convert_rdflib_content
 
 
-def parse_concepts(graph: Graph, query: str, language: str, issue_list: IssueList) -> tuple[dict, IssueList]:
+def parse_concepts(
+    graph: Graph, query: str, parameters: set, language: str, issue_list: IssueList
+) -> tuple[dict, IssueList]:
     """Parse concepts from graph
 
     Args:
         graph: Graph containing concept definitions
+        query: SPARQL query to use for parsing concepts
+        parameters: Set of parameters to extract from the query results
         language: Language to use for parsing, by default "en"
+        issue_list: List to collect issues during parsing
 
     Returns:
         Dataframe containing owl classes
@@ -28,11 +33,10 @@ def parse_concepts(graph: Graph, query: str, language: str, issue_list: IssueLis
     concepts: dict[str, dict] = {}
 
     query = prepareQuery(query.format(language=language), initNs={k: v for k, v in graph.namespaces()})
-    expected_keys = [str(v) for v in query.algebra._vars]
 
     for raw in graph.query(query):
         res: dict = convert_rdflib_content(cast(ResultRow, raw).asdict(), True)
-        res = {key: res.get(key, None) for key in expected_keys}
+        res = {key: res.get(key, None) for key in parameters}
 
         # Quote the concept id to ensure it is web-safe
         res["concept"] = quote(res["concept"], safe="")
@@ -75,12 +79,17 @@ def parse_concepts(graph: Graph, query: str, language: str, issue_list: IssueLis
     return concepts, issue_list
 
 
-def parse_properties(graph: Graph, query: str, language: str, issue_list: IssueList) -> tuple[dict, IssueList]:
+def parse_properties(
+    graph: Graph, query: str, parameters: set, language: str, issue_list: IssueList
+) -> tuple[dict, IssueList]:
     """Parse properties from graph
 
     Args:
-        graph: Graph containing owl classes
+        graph: Graph containing property definitions
+        query: SPARQL query to use for parsing properties
+        parameters: Set of parameters to extract from the query results
         language: Language to use for parsing, by default "en"
+        issue_list: List to collect issues during parsing
 
     Returns:
         Dataframe containing owl classes
@@ -89,41 +98,40 @@ def parse_properties(graph: Graph, query: str, language: str, issue_list: IssueL
     properties: dict[str, dict] = {}
 
     query = prepareQuery(query.format(language=language), initNs={k: v for k, v in graph.namespaces()})
-    expected_keys = [str(v) for v in query.algebra._vars]
 
     for raw in graph.query(query):
         res: dict = convert_rdflib_content(cast(ResultRow, raw).asdict(), True)
-        res = {key: res.get(key, None) for key in expected_keys}
+        res = {key: res.get(key, None) for key in parameters}
 
         # Quote the concept id to ensure it is web-safe
         res["property_"] = quote(res["property_"], safe="")
         property_id = res["property_"]
 
-        # Safeguarding against incomplete semantic definitions
-        if not res["concept"] or isinstance(res["concept"], BNode):
+        # Skip Bnode
+        if isinstance(res["concept"], BNode):
             issue_list.append(
                 ResourceRetrievalWarning(
                     property_id,
                     "property",
-                    error=("Unable to determine to what concept property is being defined"),
+                    error="Cannot determine concept of property as it is a blank node",
                 )
             )
             continue
 
-        # Safeguarding against incomplete semantic definitions
-        if not res["value_type"] or isinstance(res["value_type"], BNode):
+        # Skip Bnode
+        if isinstance(res["value_type"], BNode):
             issue_list.append(
                 ResourceRetrievalWarning(
                     property_id,
                     "property",
-                    error=("Unable to determine value type of property"),
+                    error="Unable to determine value type of property as it is a blank node",
                 )
             )
             continue
 
         # Quote the concept and value_type to ensure they are web-safe
-        res["concept"] = quote(res["concept"], safe="")
-        res["value_type"] = quote(res["value_type"], safe="")
+        res["concept"] = quote(res["concept"], safe="") if res["concept"] else "#N/A"
+        res["value_type"] = quote(res["value_type"], safe="") if res["value_type"] else "#N/A"
 
         id_ = f"{res['concept']}.{res['property_']}"
 

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

@@ -165,7 +165,7 @@ class ConceptualValidation:
     def _referenced_classes_exist(self) -> None:
         # needs to be complete for this validation to pass
         defined_concept = {concept.concept for concept in self._concepts}
-        classes_with_explicit_properties = {property_.concept for property_ in self._properties}
+        classes_with_explicit_properties = {property_.concept for property_ in self._properties} - {UnknownEntity()}
 
         # USE CASE: models are complete
         if missing_classes := classes_with_explicit_properties.difference(defined_concept):

cognite/neat/core/_utils/spreadsheet.py

@@ -98,6 +98,10 @@ def read_individual_sheet(
         # Special handling for Value Type column, #N/A is treated specially by NEAT it means Unknown
         raw["Value Type"] = raw["Value Type"].replace(float("nan"), "#N/A")
 
+    if "Concept" in raw.columns:
+        # Special handling for Concept column, #N/A is treated specially by NEAT it means Unknown
+        raw["Concept"] = raw["Concept"].replace(float("nan"), "#N/A")
+
     output = raw.replace(float("nan"), None).to_dict(orient="records")
     if return_read_info:
         # If no rows are skipped, row 1 is the header row.

{cognite_neat-0.123.13.dist-info → cognite_neat-0.123.14.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 cognite/neat/__init__.py,sha256=12StS1dzH9_MElqxGvLWrNsxCJl9Hv8A2a9D0E5OD_U,193
-cognite/neat/_version.py,sha256=_QVfpGepX4UR60nDrdZHGAkCm6OBHOLQ084t96SzBBo,47
+cognite/neat/_version.py,sha256=qLY0w9gF4NJv-QQnU8dofXCm32MMtagvnj-drOInmzU,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
@@ -43,8 +43,8 @@ cognite/neat/core/_data_model/importers/_spreadsheet2data_model.py,sha256=2QqrxQ
 cognite/neat/core/_data_model/importers/_rdf/__init__.py,sha256=1yOjV2PKCxwH7uCTXVZhSdxtn5etmFX40cksvwtKcZ8,199
 cognite/neat/core/_data_model/importers/_rdf/_base.py,sha256=FKceKumKmhEGpMZvo1BwEewnUvfAsTF3Ax9fo1nxsGE,6020
 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=WmncZNpELeZnt6mdw6X8yWnr7XsFXZGfoVe5wTd0HH4,3438
-cognite/neat/core/_data_model/importers/_rdf/_shared.py,sha256=KJz4HirSpWBXsOw8YGBJh-6Yj_pBjrMB9_K8UQ00sQg,6411
+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=qibq94dFoy_g1ED5nIFYwHC_LYI4jI67HFVcMy7abrM,6665
 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
@@ -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=tPU8IGV5eiiReF40igjs0t7rMdYnaMcshKa01CY-JKI,13868
+cognite/neat/core/_data_model/models/conceptual/_validation.py,sha256=LOnLNArteqc9TlyyRNqQgMAKx2oZ8s91WePR8fqLRlE,13888
 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
@@ -147,7 +147,7 @@ cognite/neat/core/_utils/collection_.py,sha256=zVrSmm4045pjw6Pt6y4VPTIJ4dXdMJPyO
 cognite/neat/core/_utils/graph_transformations_report.py,sha256=ORVH7lw357TPOq4elU5lH46Qx6GCLVrSj-1nX6Ggk1U,1235
 cognite/neat/core/_utils/io_.py,sha256=D2Mg8sOxfBoDg3fC0jBzaxO3vkXmr0QvZSgYIv6xRkM,386
 cognite/neat/core/_utils/rdf_.py,sha256=8AALp8H_nXEDSBo6jZ1idyT_x3K4PJT5ZyBEyxPmgxI,10403
-cognite/neat/core/_utils/spreadsheet.py,sha256=MMI_1zxeHEf9Ggu_-t_ryjj54ky085QIf8eArt5hXEY,5749
+cognite/neat/core/_utils/spreadsheet.py,sha256=VdjcCh339cKu9UwxJkYrmmnrbLguD71tdFmyd3MlIZA,5951
 cognite/neat/core/_utils/tarjan.py,sha256=IZvwaIITryGVNbo9Bv5EA9_sW3DyfUNAe7uYyPOCL0g,1357
 cognite/neat/core/_utils/text.py,sha256=ON4ihfscFJkQqQ-Rj46XXtf-9tAobwXbbfa3wuekSu4,8519
 cognite/neat/core/_utils/time_.py,sha256=7ayUm0OWZm1JDmy32E4ip8WRr2o0GLwrHwJA8sJ43Z4,357
@@ -186,7 +186,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.13.dist-info/METADATA,sha256=nvoEO8JM0qcLabmwghL9j-0ncS7LPeNB5NocH23DPsM,9172
-cognite_neat-0.123.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cognite_neat-0.123.13.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.123.13.dist-info/RECORD,,
+cognite_neat-0.123.14.dist-info/METADATA,sha256=OtegXPCjwnGT8EM8x8M1ekoHwwAhZ4NuNRKfz0uRxGM,9172
+cognite_neat-0.123.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cognite_neat-0.123.14.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.123.14.dist-info/RECORD,,