cognite-neat 0.81.6__py3-none-any.whl → 0.81.7__py3-none-any.whl

cognite/neat/_version.py

@@ -1 +1 @@
-__version__ = "0.81.6"
+__version__ = "0.81.7"

cognite/neat/graph/stores/_base.py

@@ -234,15 +234,13 @@ class NeatGraphStore:
         else:
             _start = datetime.now(timezone.utc)
             transformer.transform(self.graph)
-            self.provenance = Provenance(
-                [
-                    Change.record(
-                        activity=f"{type(transformer).__name__}",
-                        start=_start,
-                        end=datetime.now(timezone.utc),
-                        description=transformer.description,
-                    )
-                ]
+            self.provenance.append(
+                Change.record(
+                    activity=f"{type(transformer).__name__}",
+                    start=_start,
+                    end=datetime.now(timezone.utc),
+                    description=transformer.description,
+                )
             )
 
 

cognite/neat/graph/transformers/__init__.py

@@ -1,5 +1,5 @@
-from ._classic_cdf import AddAssetDepth
+from ._classic_cdf import AddAssetDepth, AssetTimeSeriesConnector
 
-__all__ = ["AddAssetDepth"]
+__all__ = ["AddAssetDepth", "AssetTimeSeriesConnector"]
 
-Transformers = AddAssetDepth
+Transformers = AddAssetDepth | AssetTimeSeriesConnector

cognite/neat/graph/transformers/_classic_cdf.py

@@ -3,7 +3,7 @@ from typing import cast
 from rdflib import Graph, Literal, URIRef
 
 from cognite.neat.constants import DEFAULT_NAMESPACE
-from cognite.neat.graph.extractors import AssetsExtractor
+from cognite.neat.graph import extractors
 
 from ._base import BaseTransformer
 
@@ -11,7 +11,7 @@ from ._base import BaseTransformer
 class AddAssetDepth(BaseTransformer):
     description: str = "Adds depth of asset in the asset hierarchy to the graph"
     _use_only_once: bool = True
-    _need_changes = frozenset({str(AssetsExtractor.__name__)})
+    _need_changes = frozenset({str(extractors.AssetsExtractor.__name__)})
 
     _parent_template: str = """SELECT ?child ?parent WHERE {{
                               <{asset_id}> <{parent_prop}> ?child .
@@ -45,15 +45,53 @@ class AddAssetDepth(BaseTransformer):
         """Get asset depth in the asset hierarchy."""
 
         # Handles non-root assets
-        if res := list(graph.query(cls._parent_template.format(asset_id=asset_id, parent_prop=parent_prop))):
-            return len(cast(list[tuple], res)) + 2 if cast(list[tuple], res)[0][1] else 2
+        if result := list(graph.query(cls._parent_template.format(asset_id=asset_id, parent_prop=parent_prop))):
+            return len(cast(list[tuple], result)) + 2 if cast(list[tuple], result)[0][1] else 2
 
         # Handles root assets
         elif (
-            (res := list(graph.query(cls._root_template.format(asset_id=asset_id, root_prop=root_prop))))
-            and len(cast(list[tuple], res)) == 1
-            and cast(list[tuple], res)[0][0] == asset_id
+            (result := list(graph.query(cls._root_template.format(asset_id=asset_id, root_prop=root_prop))))
+            and len(cast(list[tuple], result)) == 1
+            and cast(list[tuple], result)[0][0] == asset_id
         ):
             return 1
         else:
             return None
+
+
+class AssetTimeSeriesConnector(BaseTransformer):
+    description: str = "Connects assets to timeseries, thus forming bi-directional connection"
+    _use_only_once: bool = True
+    _need_changes = frozenset({str(extractors.AssetsExtractor.__name__), str(extractors.TimeSeriesExtractor.__name__)})
+    _asset_template: str = """SELECT ?asset_id WHERE {{
+                              <{timeseries_id}> <{asset_prop}> ?asset_id .
+                              ?asset_id a <{asset_type}>}}"""
+
+    def __init__(
+        self,
+        asset_type: URIRef | None = None,
+        timeseries_type: URIRef | None = None,
+        asset_prop: URIRef | None = None,
+    ):
+        self.asset_type = asset_type or DEFAULT_NAMESPACE.Asset
+        self.timeseries_type = timeseries_type or DEFAULT_NAMESPACE.TimeSeries
+        self.asset_prop = asset_prop or DEFAULT_NAMESPACE.asset
+
+    def transform(self, graph: Graph) -> None:
+        for ts_id_result in graph.query(
+            f"SELECT DISTINCT ?timeseries_id WHERE {{?timeseries_id a <{self.timeseries_type}>}}"
+        ):
+            timeseries_id: URIRef = cast(tuple, ts_id_result)[0]
+
+            if asset_id_res := list(
+                graph.query(
+                    self._asset_template.format(
+                        timeseries_id=timeseries_id,
+                        asset_prop=self.asset_prop,
+                        asset_type=self.asset_type,
+                    )
+                )
+            ):
+                # timeseries can be connected to only one asset in the graph
+                asset_id = cast(list[tuple], asset_id_res)[0][0]
+                graph.add((asset_id, DEFAULT_NAMESPACE.timeSeries, timeseries_id))

{cognite_neat-0.81.6.dist-info → cognite_neat-0.81.7.dist-info}/METADATA

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

{cognite_neat-0.81.6.dist-info → cognite_neat-0.81.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cognite/neat/__init__.py,sha256=v-rRiDOgZ3sQSMQKq0vgUQZvpeOkoHFXissAx6Ktg84,61
-cognite/neat/_version.py,sha256=e7O10boUUc4c_SZ-XfiRdSDfFwkMDM5VoLRzOeZKfWc,23
+cognite/neat/_version.py,sha256=PtP0Hej8fz6jEW0rAYtnpncSgq-Zo4KnEW-y7gZEHdA,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
@@ -73,12 +73,12 @@ cognite/neat/graph/loaders/_base.py,sha256=bdYC6CwsHVqnQa1QzOhL68qQhF1OtrsearqH6
 cognite/neat/graph/loaders/_rdf2dms.py,sha256=w0y2ECKw7RrQndGyTVIWeFF2WDxs9yvl_eWNqg-tKO8,13018
 cognite/neat/graph/models.py,sha256=AtLgZh2qyRP6NRetjQCy9qLMuTQB0CH52Zsev-qa2sk,149
 cognite/neat/graph/stores/__init__.py,sha256=G-VG_YwfRt1kuPao07PDJyZ3w_0-eguzLUM13n-Z_RA,64
-cognite/neat/graph/stores/_base.py,sha256=9ZPNNzcmq2shAN6akpOasJIriHjqKwikNhs2Hy2Buc8,11067
+cognite/neat/graph/stores/_base.py,sha256=-MwqfVCBd4j4xWaI7zOvypsGqtbET-2eKQKf36DO0A0,11001
 cognite/neat/graph/stores/_oxrdflib.py,sha256=A5zeRm5_e8ui_ihGpgstRDg_N7qcLZ3QZBRGrOXSGI0,9569
 cognite/neat/graph/stores/_provenance.py,sha256=Hr9WBhFj-eoet4czL8XSBGYnu9Yn66YsTgH_G0n3QpY,3293
-cognite/neat/graph/transformers/__init__.py,sha256=1m6nrdCjHx479kxiZeFbqH8Tntyv2mzmrVFLjyJibxE,99
+cognite/neat/graph/transformers/__init__.py,sha256=P304fcH6U9tV049DMxxHMzUoRnTTER_GdAzcFfrOSc4,180
 cognite/neat/graph/transformers/_base.py,sha256=b37Ek-9njuM5pTR_3XhnxCMrg_ip_2BMwM7ZhKpAAlw,328
-cognite/neat/graph/transformers/_classic_cdf.py,sha256=Wlrj1tBQ_1R-RIh95WrPm0izqJMqoI1zEMVG3OWR0iM,2331
+cognite/neat/graph/transformers/_classic_cdf.py,sha256=qeF5untGEM1DL8vg75SIPE0vZn0TN8DL9n3OWNJuJ9A,4029
 cognite/neat/issues.py,sha256=pxQfqfBseMDE8JM0iqZnkLXngeyeFfT0TFtu1UuAd4c,4629
 cognite/neat/legacy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/legacy/graph/__init__.py,sha256=31uTeejWOSd-I8iUG8GOZFhHZcQCsBitJ6X8vu2r1nU,73
@@ -297,8 +297,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.81.6.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.81.6.dist-info/METADATA,sha256=CGnTy7pQcU5Ux7BW6xOpT4US3mqZHgilYyo-P7B1jTs,9290
-cognite_neat-0.81.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cognite_neat-0.81.6.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
-cognite_neat-0.81.6.dist-info/RECORD,,
+cognite_neat-0.81.7.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.81.7.dist-info/METADATA,sha256=Y6mWnpldS0Lex_kygQrZX-ODmiPmPqhfVAPWURhElEo,9290
+cognite_neat-0.81.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cognite_neat-0.81.7.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
+cognite_neat-0.81.7.dist-info/RECORD,,