cognite-neat 0.85.8__tar.gz → 0.85.9__tar.gz

{cognite_neat-0.85.8 → cognite_neat-0.85.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-neat
-Version: 0.85.8
+Version: 0.85.9
 Summary: Knowledge graph transformation
 Home-page: https://cognite-neat.readthedocs-hosted.com/
 License: Apache-2.0

cognite_neat-0.85.9/cognite/neat/_version.py

@@ -0,0 +1 @@
+__version__ = "0.85.9"

{cognite_neat-0.85.8 → cognite_neat-0.85.9}/cognite/neat/graph/extractors/_classic_cdf/_assets.py

@@ -41,7 +41,7 @@ class AssetsExtractor(BaseExtractor):
         to_type: Callable[[Asset], str | None] | None = None,
         total: int | None = None,
         limit: int | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         self.namespace = namespace or DEFAULT_NAMESPACE
         self.assets = assets
@@ -58,7 +58,7 @@ class AssetsExtractor(BaseExtractor):
         namespace: Namespace | None = None,
         to_type: Callable[[Asset], str | None] | None = None,
         limit: int | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         total = client.assets.aggregate_count(filter=AssetFilter(data_set_ids=[{"externalId": data_set_external_id}]))
 
@@ -82,7 +82,7 @@ class AssetsExtractor(BaseExtractor):
         namespace: Namespace | None = None,
         to_type: Callable[[Asset], str | None] | None = None,
         limit: int | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         total = client.assets.aggregate_count(
             filter=AssetFilter(asset_subtree_ids=[{"externalId": root_asset_external_id}])
@@ -107,7 +107,7 @@ class AssetsExtractor(BaseExtractor):
         namespace: Namespace | None = None,
         to_type: Callable[[Asset], str] | None = None,
         limit: int | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         return cls(
             AssetList.load(Path(file_path).read_text()),

{cognite_neat-0.85.8 → cognite_neat-0.85.9}/cognite/neat/graph/extractors/_classic_cdf/_events.py

@@ -29,7 +29,7 @@ class EventsExtractor(BaseExtractor):
         self,
         events: Iterable[Event],
         namespace: Namespace | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         self.namespace = namespace or DEFAULT_NAMESPACE
         self.events = events
@@ -41,7 +41,7 @@ class EventsExtractor(BaseExtractor):
         client: CogniteClient,
         data_set_external_id: str,
         namespace: Namespace | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         return cls(
             cast(
@@ -57,7 +57,7 @@ class EventsExtractor(BaseExtractor):
         cls,
         file_path: str,
         namespace: Namespace | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         return cls(EventList.load(Path(file_path).read_text()), namespace, unpack_metadata)
 

{cognite_neat-0.85.8 → cognite_neat-0.85.9}/cognite/neat/graph/extractors/_classic_cdf/_files.py

@@ -30,7 +30,7 @@ class FilesExtractor(BaseExtractor):
         self,
         files_metadata: Iterable[FileMetadata],
         namespace: Namespace | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         self.namespace = namespace or DEFAULT_NAMESPACE
         self.files_metadata = files_metadata
@@ -42,7 +42,7 @@ class FilesExtractor(BaseExtractor):
         client: CogniteClient,
         data_set_external_id: str,
         namespace: Namespace | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         return cls(
             cast(
@@ -58,7 +58,7 @@ class FilesExtractor(BaseExtractor):
         cls,
         file_path: str,
         namespace: Namespace | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         return cls(
             FileMetadataList.load(Path(file_path).read_text()),

{cognite_neat-0.85.8 → cognite_neat-0.85.9}/cognite/neat/graph/extractors/_classic_cdf/_sequences.py

@@ -29,7 +29,7 @@ class SequencesExtractor(BaseExtractor):
         self,
         sequence: Iterable[Sequence],
         namespace: Namespace | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         self.namespace = namespace or DEFAULT_NAMESPACE
         self.sequence = sequence
@@ -41,7 +41,7 @@ class SequencesExtractor(BaseExtractor):
         client: CogniteClient,
         data_set_external_id: str,
         namespace: Namespace | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         return cls(
             cast(
@@ -57,7 +57,7 @@ class SequencesExtractor(BaseExtractor):
         cls,
         file_path: str,
         namespace: Namespace | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         return cls(SequenceList.load(Path(file_path).read_text()), namespace, unpack_metadata)
 

{cognite_neat-0.85.8 → cognite_neat-0.85.9}/cognite/neat/graph/extractors/_classic_cdf/_timeseries.py

@@ -29,7 +29,7 @@ class TimeSeriesExtractor(BaseExtractor):
         self,
         timeseries: Iterable[TimeSeries],
         namespace: Namespace | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         self.namespace = namespace or DEFAULT_NAMESPACE
         self.timeseries = timeseries
@@ -41,7 +41,7 @@ class TimeSeriesExtractor(BaseExtractor):
         client: CogniteClient,
         data_set_external_id: str,
         namespace: Namespace | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         return cls(
             cast(
@@ -57,7 +57,7 @@ class TimeSeriesExtractor(BaseExtractor):
         cls,
         file_path: str,
         namespace: Namespace | None = None,
-        unpack_metadata: bool = False,
+        unpack_metadata: bool = True,
     ):
         return cls(TimeSeriesList.load(Path(file_path).read_text()), namespace, unpack_metadata)
 

{cognite_neat-0.85.8 → cognite_neat-0.85.9}/cognite/neat/rules/importers/_inference2rules.py

@@ -17,7 +17,11 @@ from cognite.neat.rules.models.information import (
     InformationMetadata,
     InformationRulesInput,
 )
-from cognite.neat.utils.utils import get_namespace, remove_namespace_from_uri, uri_to_short_form
+from cognite.neat.utils.utils import (
+    get_namespace,
+    remove_namespace_from_uri,
+    uri_to_short_form,
+)
 
 ORDERED_CLASSES_QUERY = """SELECT ?class (count(?s) as ?instances )
                            WHERE { ?s a ?class . }
@@ -25,9 +29,21 @@ ORDERED_CLASSES_QUERY = """SELECT ?class (count(?s) as ?instances )
 
 INSTANCES_OF_CLASS_QUERY = """SELECT ?s WHERE { ?s a <class> . }"""
 
+INSTANCE_PROPERTIES_JSON_DEFINITION = """SELECT ?property (count(?property) as ?occurrence) ?dataType ?objectType
+                                    WHERE {<instance_id> ?property ?value .
+
+                                           BIND(IF(REGEX(?value, "^\u007b(.*)\u007d$"),
+                                           <http://www.w3.org/2001/XMLSchema#json>,
+                                           datatype(?value)) AS ?dataType)
+
+                                           OPTIONAL {?value rdf:type ?objectType .}}
+                                    GROUP BY ?property ?dataType ?objectType"""
+
 INSTANCE_PROPERTIES_DEFINITION = """SELECT ?property (count(?property) as ?occurrence) ?dataType ?objectType
                                     WHERE {<instance_id> ?property ?value .
+
                                            BIND(datatype(?value) AS ?dataType)
+
                                            OPTIONAL {?value rdf:type ?objectType .}}
                                     GROUP BY ?property ?dataType ?objectType"""
 
@@ -44,27 +60,48 @@ class InferenceImporter(BaseImporter):
         graph: Knowledge graph
         max_number_of_instance: Maximum number of instances to be used in inference
         prefix: Prefix to be used for the inferred model
+        check_for_json_string: Check if values are JSON strings
     """
 
     def __init__(
-        self, issue_list: IssueList, graph: Graph, max_number_of_instance: int = -1, prefix: str = "inferred"
+        self,
+        issue_list: IssueList,
+        graph: Graph,
+        max_number_of_instance: int = -1,
+        prefix: str = "inferred",
+        check_for_json_string: bool = False,
     ) -> None:
         self.issue_list = issue_list
         self.graph = graph
         self.max_number_of_instance = max_number_of_instance
         self.prefix = prefix
+        self.check_for_json_string = check_for_json_string
 
     @classmethod
     def from_graph_store(
-        cls, store: NeatGraphStore, max_number_of_instance: int = -1, prefix: str = "inferred"
+        cls,
+        store: NeatGraphStore,
+        max_number_of_instance: int = -1,
+        prefix: str = "inferred",
+        check_for_json_string: bool = False,
     ) -> "InferenceImporter":
         issue_list = IssueList(title="Inferred from graph store")
 
-        return cls(issue_list, store.graph, max_number_of_instance=max_number_of_instance, prefix=prefix)
+        return cls(
+            issue_list,
+            store.graph,
+            max_number_of_instance=max_number_of_instance,
+            prefix=prefix,
+            check_for_json_string=check_for_json_string,
+        )
 
     @classmethod
     def from_rdf_file(
-        cls, filepath: Path, max_number_of_instance: int = -1, prefix: str = "inferred"
+        cls,
+        filepath: Path,
+        max_number_of_instance: int = -1,
+        prefix: str = "inferred",
+        check_for_json_string: bool = False,
     ) -> "InferenceImporter":
         issue_list = IssueList(title=f"'{filepath.name}'")
 
@@ -74,23 +111,41 @@ class InferenceImporter(BaseImporter):
         except Exception:
             issue_list.append(issues.fileread.FileReadError(filepath))
 
-        return cls(issue_list, graph, max_number_of_instance=max_number_of_instance, prefix=prefix)
+        return cls(
+            issue_list,
+            graph,
+            max_number_of_instance=max_number_of_instance,
+            prefix=prefix,
+            check_for_json_string=check_for_json_string,
+        )
 
     @classmethod
     def from_json_file(
-        cls, filepath: Path, max_number_of_instance: int = -1, prefix: str = "inferred"
+        cls,
+        filepath: Path,
+        max_number_of_instance: int = -1,
+        prefix: str = "inferred",
+        check_for_json_string: bool = False,
     ) -> "InferenceImporter":
         raise NotImplementedError("JSON file format is not supported yet.")
 
     @classmethod
     def from_yaml_file(
-        cls, filepath: Path, max_number_of_instance: int = -1, prefix: str = "inferred"
+        cls,
+        filepath: Path,
+        max_number_of_instance: int = -1,
+        prefix: str = "inferred",
+        check_for_json_string: bool = False,
     ) -> "InferenceImporter":
         raise NotImplementedError("YAML file format is not supported yet.")
 
     @classmethod
     def from_xml_file(
-        cls, filepath: Path, max_number_of_instance: int = -1, prefix: str = "inferred"
+        cls,
+        filepath: Path,
+        max_number_of_instance: int = -1,
+        prefix: str = "inferred",
+        check_for_json_string: bool = False,
     ) -> "InferenceImporter":
         raise NotImplementedError("JSON file format is not supported yet.")
 
@@ -149,6 +204,7 @@ class InferenceImporter(BaseImporter):
         properties: dict[str, dict] = {}
         prefixes: dict[str, Namespace] = PREFIXES.copy()
 
+        query = INSTANCE_PROPERTIES_JSON_DEFINITION if self.check_for_json_string else INSTANCE_PROPERTIES_DEFINITION
         # Adds default namespace to prefixes
         prefixes[self._default_metadata().prefix] = self._default_metadata().namespace
 
@@ -176,7 +232,7 @@ class InferenceImporter(BaseImporter):
                 + f" LIMIT {self.max_number_of_instance}"
             ):
                 for property_uri, occurrence, data_type_uri, object_type_uri in self.graph.query(  # type: ignore[misc]
-                    INSTANCE_PROPERTIES_DEFINITION.replace("instance_id", instance)
+                    query.replace("instance_id", instance)
                 ):  # type: ignore[misc]
                     property_id = remove_namespace_from_uri(property_uri)
                     self._add_uri_namespace_to_prefixes(cast(URIRef, property_uri), prefixes)

{cognite_neat-0.85.8 → cognite_neat-0.85.9}/cognite/neat/rules/models/data_types.py

@@ -267,7 +267,7 @@ class Json(DataType):
     python = dms.Json
     dms = dms.Json
     graphql = "Json"
-    xsd = "string"
+    xsd = "json"
     sql = "STRING"
 
 

{cognite_neat-0.85.8 → cognite_neat-0.85.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cognite-neat"
-version = "0.85.8"
+version = "0.85.9"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [

cognite_neat-0.85.8/cognite/neat/_version.py

@@ -1 +0,0 @@
-__version__ = "0.85.8"