cognite-neat 0.85.8__py3-none-any.whl → 0.85.9__py3-none-any.whl

cognite/neat/_version.py

@@ -1 +1 @@
-__version__ = "0.85.8"
+__version__ = "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/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/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/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/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/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/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.dist-info → cognite_neat-0.85.9.dist-info}/METADATA

@@ -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.8.dist-info → cognite_neat-0.85.9.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cognite/neat/__init__.py,sha256=AiexNcHdAHFbrrbo9c65gtil1dqx_SGraDH1PSsXjKE,126
 cognite/neat/_shared.py,sha256=RSaHm2eJceTlvb-hMMe4nHgoHdPYDfN3XcxDXo24k3A,1530
-cognite/neat/_version.py,sha256=XNxvWbbG3Du3rtKNhMT-MnhnUVoPrUHeH989x6qqhYo,23
+cognite/neat/_version.py,sha256=JP9pWIPLDxMPiu0_QxO-aYb83pueDfD_SMEnM6AHb9Q,23
 cognite/neat/app/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/app/api/asgi/metrics.py,sha256=nxFy7L5cChTI0a-zkCiJ59Aq8yLuIJp5c9Dg0wRXtV0,152
 cognite/neat/app/api/configuration.py,sha256=2U5M6M252swvQPQyooA1EBzFUZNtcTmuSaywfJDgckM,4232
@@ -57,13 +57,13 @@ cognite/neat/graph/exceptions.py,sha256=R6pyOH774n9w2x_X_nrUr8OMAdjJMf_XPIqAvxIQ
 cognite/neat/graph/extractors/__init__.py,sha256=nXcNp6i3-1HteIkr8Ujxk4b09W5jk27Q3eWuwjcnGnM,1647
 cognite/neat/graph/extractors/_base.py,sha256=8IWygpkQTwo0UOmbbwWVI7540_klTVdUVX2JjVPFRIs,498
 cognite/neat/graph/extractors/_classic_cdf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite/neat/graph/extractors/_classic_cdf/_assets.py,sha256=ZLLiHlN0RB4Drx0b0uBLLiV8gowlMleamRBSKUrCgyI,7854
-cognite/neat/graph/extractors/_classic_cdf/_events.py,sha256=UiysU7AGlWMQuEMObaJN1JvMNWWtXmjBzFsk3SLg8V4,5112
-cognite/neat/graph/extractors/_classic_cdf/_files.py,sha256=TPjDF6VfRImhrJlfFNne3Plm6NmrGwtaGKqP_vZ8s6Y,6289
+cognite/neat/graph/extractors/_classic_cdf/_assets.py,sha256=6lz1AfElB6eURmyRSFKNU7KQcSUS5tYBP_KsB3D79JQ,7850
+cognite/neat/graph/extractors/_classic_cdf/_events.py,sha256=wjbavqqz4_0D2Xpcof9lxgQ_RHNHK-gd4PHpKxoHgJM,5109
+cognite/neat/graph/extractors/_classic_cdf/_files.py,sha256=Vic90IsZN1N7woZ5-F9625Vdij42dgX9vaspBUJ7nN8,6286
 cognite/neat/graph/extractors/_classic_cdf/_labels.py,sha256=9DQ1hblU3gbLTbWuthKLWkSL_eNH69izitzMSQ1FdD8,3011
 cognite/neat/graph/extractors/_classic_cdf/_relationships.py,sha256=GzxnvIflmHVnWdlNFoLrnxJjM8c2YuMzzMC7IL7Q4cg,6040
-cognite/neat/graph/extractors/_classic_cdf/_sequences.py,sha256=3L2c7z1I4LQZYgA8CScsOGfvamIdCc19I5ZIzPVVgsM,4680
-cognite/neat/graph/extractors/_classic_cdf/_timeseries.py,sha256=HCUjTTLqj9rTxb7xemyxNXYRqsKVUzRAXi0BLyo2Ctc,6125
+cognite/neat/graph/extractors/_classic_cdf/_sequences.py,sha256=rhMEPY5PCxLnErwPPzdHH02c9o7rn0whLtnvcrLDjr8,4677
+cognite/neat/graph/extractors/_classic_cdf/_timeseries.py,sha256=rxhAe7BcJFg2-eFgBSTb6Trkw53XgZfU5-wLrjqZHEQ,6122
 cognite/neat/graph/extractors/_dexpi.py,sha256=xIw3kSaQ17k_bAuecvrVRic70PUhFHtcyy-ReLt36Q4,9385
 cognite/neat/graph/extractors/_mock_graph_generator.py,sha256=w6lIgwvVwkvK725S9MLFZU8lLxjxXt_621_nChupAkQ,14791
 cognite/neat/graph/extractors/_rdf_file.py,sha256=ialMCLv9WH5k6v1YMfozfcmAYhz8OVo9jVhsKMyQkDA,763
@@ -203,7 +203,7 @@ cognite/neat/rules/importers/_dtdl2rules/_unit_lookup.py,sha256=wW4saKva61Q_i17g
 cognite/neat/rules/importers/_dtdl2rules/dtdl_converter.py,sha256=ysmWUxZ0npwrTB0uiH5jA0v37sfCwowGaYk17IyxPUU,12663
 cognite/neat/rules/importers/_dtdl2rules/dtdl_importer.py,sha256=Psj3C2jembY_Wu7WWJIFIwrMawvjISjeqfBnoRy_csw,6740
 cognite/neat/rules/importers/_dtdl2rules/spec.py,sha256=tim_MfN1J0F3Oeqk3BMgIA82d_MZvhRuRMsLK3B4PYc,11897
-cognite/neat/rules/importers/_inference2rules.py,sha256=S_U2M8z5oZaFD3yPDSG__xUJSCmFkQyrKleHixrzYlU,12204
+cognite/neat/rules/importers/_inference2rules.py,sha256=U2fNqBtN_NMtFAm7uSiejfxNFWIvUjHv5JriOEI5Z3I,13704
 cognite/neat/rules/importers/_owl2rules/__init__.py,sha256=tdGcrgtozdQyST-pTlxIa4cLBNTLvtk1nNYR4vOdFSw,63
 cognite/neat/rules/importers/_owl2rules/_owl2classes.py,sha256=dACjYeCa_OhpQgqccI4w478dEINbISUMzpVkCOoRRL8,7384
 cognite/neat/rules/importers/_owl2rules/_owl2metadata.py,sha256=nwnUaBNAAYMoBre2UmsnkJXUuaqGEpR3U3txDrH2w6g,7527
@@ -232,7 +232,7 @@ cognite/neat/rules/models/asset/_rules.py,sha256=fYp1pMJtioUtT747fo5NX69lgvPiPtH
 cognite/neat/rules/models/asset/_rules_input.py,sha256=LiT-85CVgDz2ng65CtrRa77r4rnmg3E4Q6DC7-gv0dE,6257
 cognite/neat/rules/models/asset/_serializer.py,sha256=ixqRf9qEzvChgysRaDX4g_vHVDtRBCsPYC9sOn0-ShE,3365
 cognite/neat/rules/models/asset/_validation.py,sha256=86ymEgMZpG1eWu53PviUyUFnQBUJmYDZggUDXufBYLI,148
-cognite/neat/rules/models/data_types.py,sha256=lanwkhwG8iHKfjYfia4v2SBTJrMeXOsqaVkVEP2QMXs,6078
+cognite/neat/rules/models/data_types.py,sha256=xAjm8UVEQlSylfkUJWiWP2NaK6dLYRDABF9g8CNWLTc,6076
 cognite/neat/rules/models/dms/__init__.py,sha256=Wzyqzz2ZIjpUbDg04CMuuIAw-f2A02DayNeqO9R-2Hw,491
 cognite/neat/rules/models/dms/_converter.py,sha256=QaJT0z0Yo4gkG9tHPZkU8idF8PK7c-tDahbyIT-WJQU,5959
 cognite/neat/rules/models/dms/_exporter.py,sha256=DRL5ahcBEdBltHLA2rzLyUfqG5SZkqINkqmYGDkQVg0,24785
@@ -310,8 +310,8 @@ cognite/neat/workflows/steps_registry.py,sha256=fkTX14ZA7_gkUYfWIlx7A1XbCidvqR23
 cognite/neat/workflows/tasks.py,sha256=dqlJwKAb0jlkl7abbY8RRz3m7MT4SK8-7cntMWkOYjw,788
 cognite/neat/workflows/triggers.py,sha256=_BLNplzoz0iic367u1mhHMHiUrCwP-SLK6_CZzfODX0,7071
 cognite/neat/workflows/utils.py,sha256=gKdy3RLG7ctRhbCRwaDIWpL9Mi98zm56-d4jfHDqP1E,453
-cognite_neat-0.85.8.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.85.8.dist-info/METADATA,sha256=LMGF9Z866Ni01TGc12LHk09EjNbbSxjiZS-gzMtvGsY,9493
-cognite_neat-0.85.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cognite_neat-0.85.8.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
-cognite_neat-0.85.8.dist-info/RECORD,,
+cognite_neat-0.85.9.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.85.9.dist-info/METADATA,sha256=5qSjm9GMnwHMFSr2a2ECKRoei-cwE8esuk529j16nYM,9493
+cognite_neat-0.85.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cognite_neat-0.85.9.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
+cognite_neat-0.85.9.dist-info/RECORD,,