cognite-neat 0.97.2__py3-none-any.whl → 0.97.3__py3-none-any.whl

cognite/neat/_graph/queries/_base.py

@@ -42,6 +42,27 @@ class Queries:
             for res in list(self.graph.query(query_statement))
         ]
 
+    @property
+    def types(self) -> dict[URIRef, str]:
+        """Types and their short form in the graph"""
+        query = """SELECT DISTINCT ?type
+                   WHERE {?s a ?type .}"""
+        return {type_: remove_namespace_from_uri(cast(URIRef, type_)) for (type_,) in list(self.graph.query(query))}  # type: ignore[misc, index, arg-type]
+
+    def type_uri(self, type_: str) -> list[URIRef]:
+        """Get the URIRef of a type"""
+        return [k for k, v in self.types.items() if v == type_]
+
+    @property
+    def properties(self) -> dict[URIRef, str]:
+        query = """SELECT DISTINCT ?property
+               WHERE {?s ?property ?o . FILTER(?property != rdf:type)}"""
+        return {type_: remove_namespace_from_uri(cast(URIRef, type_)) for (type_,) in list(self.graph.query(query))}  # type: ignore[misc, index, arg-type]
+
+    def property_uri(self, property_: str) -> list[URIRef]:
+        """Get the URIRef of a type"""
+        return [k for k, v in self.properties.items() if v == property_]
+
     def list_instances_ids_of_class(self, class_uri: URIRef, limit: int = -1) -> list[URIRef]:
         """Get instances ids for a given class
 
@@ -101,7 +122,7 @@ class Queries:
         # We cannot include the RDF.type in case there is a neat:type property
         return [remove_namespace_from_uri(list(triple)) for triple in result if triple[1] != RDF.type]  # type: ignore[misc, index, arg-type]
 
-    def types_with_property(self, property_uri: URIRef) -> list[URIRef]:
+    def type_with_property(self, type_: URIRef, property_uri: URIRef) -> bool:
         """Check if a property exists in the graph store
 
         Args:
@@ -110,8 +131,8 @@ class Queries:
         Returns:
             True if property exists, False otherwise
         """
-        query = f"SELECT DISTINCT ?t WHERE {{ ?s <{property_uri}> ?o ; a ?t}} Limit 1"
-        return cast(list[URIRef], [t[0] for t in self.graph.query(query)])  # type: ignore[index]
+        query = f"SELECT ?o WHERE {{ ?s a <{type_}> ; <{property_uri}> ?o .}} Limit 1"
+        return bool(list(self.graph.query(query)))
 
     def has_namespace(self, namespace: Namespace) -> bool:
         """Check if a namespace exists in the graph store
@@ -250,7 +271,7 @@ class Queries:
             result = self.graph.query(query)
 
             # We cannot include the RDF.type in case there is a neat:type property
-            return [remove_namespace_from_uri(cast(ResultRow, triple)) for triple in result if triple[1] != RDF.type]  # type: ignore[misc, index]
+            return [remove_namespace_from_uri(cast(ResultRow, triple)) for triple in result if triple[1] != RDF.type]  # type: ignore[misc, index, arg-type]
         else:
             warnings.warn(
                 "No rules found for the graph store, returning empty list.",

cognite/neat/_rules/models/dms/_validation.py

@@ -157,21 +157,6 @@ class DMSPostValidation:
                     )
                 )
 
-            # This sets the container definition for all the properties where it is not defined.
-            # This allows the user to define the container only once.
-            value_type = next(iter(value_types))
-            list_definition = next(iter(list_definitions)) if list_definitions else None
-            nullable_definition = next(iter(nullable_definitions)) if nullable_definitions else None
-            default_definition = next(iter(default_definitions)) if default_definitions else None
-            index_definition = next(iter(index_definitions)).split(",") if index_definitions else None
-            constraint_definition = next(iter(constraint_definitions)).split(",") if constraint_definitions else None
-            for _, prop in properties:
-                prop.value_type = value_type
-                prop.is_list = prop.is_list or list_definition
-                prop.nullable = prop.nullable or nullable_definition
-                prop.default = prop.default or default_definition
-                prop.index = prop.index or index_definition
-                prop.constraint = prop.constraint or constraint_definition
         self.issue_list.extend(errors)
 
     def _referenced_views_and_containers_are_existing_and_proper_size(self) -> None:

cognite/neat/_session/_base.py

@@ -21,6 +21,7 @@ from cognite.neat._store._provenance import (
     INSTANCES_ENTITY,
     Change,
 )
+from cognite.neat._utils.auth import _CLIENT_NAME
 
 from ._inspect import InspectAPI
 from ._prepare import PrepareAPI
@@ -51,6 +52,8 @@ class NeatSession:
         self.show = ShowAPI(self._state)
         self.set = SetAPI(self._state, verbose)
         self.inspect = InspectAPI(self._state)
+        if self._client is not None and self._client._config is not None:
+            self._client._config.client_name = _CLIENT_NAME
         if load_engine != "skip" and (engine_version := load_neat_engine(client, load_engine)):
             print(f"Neat Engine {engine_version} loaded.")
 

cognite/neat/_session/_prepare.py

@@ -12,7 +12,7 @@ from cognite.neat._rules.transformers import ReduceCogniteModel, ToCompliantEnti
 from cognite.neat._store._provenance import Change
 
 from ._state import SessionState
-from .exceptions import intercept_session_exceptions
+from .exceptions import NeatSessionError, intercept_session_exceptions
 
 
 @intercept_session_exceptions
@@ -32,18 +32,18 @@ class InstancePrepareAPI:
 
     def make_connection_on_exact_match(
         self,
-        source: tuple[URIRef, URIRef],
-        target: tuple[URIRef, URIRef],
-        connection: URIRef | None = None,
+        source: tuple[str, str],
+        target: tuple[str, str],
+        connection: str | None = None,
         limit: int | None = 100,
     ) -> None:
         """Make connection on exact match.
 
         Args:
-            source: The source of the connection. A tuple of (rdf type, property) where
+            source: The source of the connection. A tuple of (type, property) where
                     where property is the property that should be matched on the source
                     to make the connection with the target.
-            target: The target of the connection. A tuple of (rdf type, property) where
+            target: The target of the connection. A tuple of (type, property) where
                     where property is the property that should be matched on the target
                     to make the connection with the source.
 
@@ -51,11 +51,19 @@ class InstancePrepareAPI:
                     will be made by lowercasing the target type.
             limit: The maximum number of connections to make. If None, all connections
 
+        !!! note "Make Connection on Exact Match"
+            This method will make a connection between the source and target based on the exact match:
+            (SourceType)-[sourceProperty]->(sourceValue) == (TargetType)-[targetProperty]->(targetValue)
+
+            The connection will be made by creating a new property on the source type that will contain the
+            target value, as follows:
+            (SourceType)-[connection]->(TargetType)
+
 
         """
 
-        subject_type, subject_predicate = source
-        object_type, object_predicate = target
+        subject_type, subject_predicate = self._get_type_and_property_uris(*source)
+        object_type, object_predicate = self._get_type_and_property_uris(*target)
 
         transformer = MakeConnectionOnExactMatch(
             subject_type,
@@ -68,6 +76,24 @@ class InstancePrepareAPI:
 
         self._state.instances.store.transform(transformer)
 
+    def _get_type_and_property_uris(self, type_: str, property_: str) -> tuple[URIRef, URIRef]:
+        type_uri = self._state.instances.store.queries.type_uri(type_)
+        property_uri = self._state.instances.store.queries.property_uri(property_)
+
+        if not type_uri:
+            raise NeatSessionError(f"Type {type_} does not exist in the graph.")
+        elif len(type_uri) > 1:
+            raise NeatSessionError(f"{type_} has multiple ids found in the graph: {','.join(type_uri)}.")
+
+        if not property_uri:
+            raise NeatSessionError(f"Property {property_} does not exist in the graph.")
+        elif len(type_uri) > 1:
+            raise NeatSessionError(f"{property_} has multiple ids found in the graph: {','.join(property_uri)}.")
+
+        if not self._state.instances.store.queries.type_with_property(type_uri[0], property_uri[0]):
+            raise NeatSessionError(f"Property {property_} is not defined for type {type_}. Cannot make connection")
+        return type_uri[0], property_uri[0]
+
 
 @intercept_session_exceptions
 class DataModelPrepareAPI:

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.97.2"
+__version__ = "0.97.3"
 __engine__ = "^1.0.3"

{cognite_neat-0.97.2.dist-info → cognite_neat-0.97.3.dist-info}/METADATA

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

{cognite_neat-0.97.2.dist-info → cognite_neat-0.97.3.dist-info}/RECORD

@@ -105,7 +105,7 @@ cognite/neat/_graph/loaders/_base.py,sha256=tjplRd-vbWhWyys0Ll3KgHR3F3ETlP_dXJ3e
 cognite/neat/_graph/loaders/_rdf2asset.py,sha256=OMfTVbVEx6yAUlds7c2mVcgnBV0Cq5DiQ7joW3-yy0Y,17525
 cognite/neat/_graph/loaders/_rdf2dms.py,sha256=kR5yjXS5VDHMUFff5WSTrZRqKSzX53SlEbcwHMVh8J8,15951
 cognite/neat/_graph/queries/__init__.py,sha256=BgDd-037kvtWwAoGAy8eORVNMiZ5-E9sIV0txIpeaN4,50
-cognite/neat/_graph/queries/_base.py,sha256=NuDG8H4wC7R4Py8kpgiWEbfAVZajV3L2ivaHDyYa8Iw,12714
+cognite/neat/_graph/queries/_base.py,sha256=FhRCUQ-jpVdtC6qdBWqTlh6JP29BigQJoyACkrr5bBM,13700
 cognite/neat/_graph/queries/_construct.py,sha256=CW8uHtXXACUXDj1AcEjROXtvoiuyx0CTgZ0bURY5Neo,7213
 cognite/neat/_graph/queries/_shared.py,sha256=K3svLkvw-DWPZUwIwpJRjPKg5UIRKFCn5jBLpuJjiHc,5330
 cognite/neat/_graph/transformers/__init__.py,sha256=CdlG9Bk--bLyO5S8jJOkOriZQwJtukXj7oRPXfKKJSY,984
@@ -188,7 +188,7 @@ cognite/neat/_rules/models/dms/_exporter.py,sha256=gCATniEtjhCOpofnY4jjTRnkm1s84
 cognite/neat/_rules/models/dms/_rules.py,sha256=3_cn4wIzQDwfSmIwCFRKDJLhvuXxUrz4ompDLtT3Fx0,21445
 cognite/neat/_rules/models/dms/_rules_input.py,sha256=8tOJ9XNX9qBW-PEKAyCJ1mvG1BgrEbJBk7VYTTKG_D0,11813
 cognite/neat/_rules/models/dms/_schema.py,sha256=HSmSDvOm5S0x4Vb9tH9Jvd5i9tXiiM08E_Sdu6q_iA8,50783
-cognite/neat/_rules/models/dms/_validation.py,sha256=LxufRBRUCqvO1yztbk01O5dcX4N4Elf75JHqxt6p8WM,18398
+cognite/neat/_rules/models/dms/_validation.py,sha256=63cS1troy3CBpfeIst0AtpKGYS1-IiZEbh_6Y8Pv3bQ,17256
 cognite/neat/_rules/models/domain.py,sha256=zzmurr1caPZaz6hoUwveCHlSM-bDf9Rt-S1m5HWOfRk,4295
 cognite/neat/_rules/models/entities/__init__.py,sha256=QD-h79HhjqCsgscNU5kuf1ieRCE94dOfpujLuzYbtHk,1469
 cognite/neat/_rules/models/entities/_constants.py,sha256=ToiLaaF-hGLPfn3AsKIIrfB4ZdTk4cY1RjM9gA1Qjkg,288
@@ -211,9 +211,9 @@ cognite/neat/_rules/transformers/_mapping.py,sha256=RWHKPMaP3JdeCNvoDGu9ZGHxfyeI
 cognite/neat/_rules/transformers/_pipelines.py,sha256=-E5Hgitnr6ee8R9_3sqtjmWIPJ0w1xaLErG6Fo6ExVU,2603
 cognite/neat/_rules/transformers/_verification.py,sha256=8p3cpVTfBkEeRLZSFJh_tby8ScRJodjSvrt2-_JBwQ4,2885
 cognite/neat/_session/__init__.py,sha256=fxQ5URVlUnmEGYyB8Baw7IDq-uYacqkigbc4b-Pr9Fw,58
-cognite/neat/_session/_base.py,sha256=eSMjfptLG43UFctdm7uXjAXkVjN3pwqB7NICplj8U2k,8356
+cognite/neat/_session/_base.py,sha256=NHyESFlD3N1aUW6oJ3emuUSklopQUXeXblUk9-eje8U,8540
 cognite/neat/_session/_inspect.py,sha256=42mWP2GbQPxsM8-Xt-jY3_LHH0VNikkX8I2t1D_tj5I,7058
-cognite/neat/_session/_prepare.py,sha256=AIJj28wCbZizbiCeE5wfB4RYZbyoc3bu6ESYgfb9AaY,9673
+cognite/neat/_session/_prepare.py,sha256=RnKetAX305PwdHQwOag1NHxmU1UTyAQMTAzQAw7MxLw,11219
 cognite/neat/_session/_read.py,sha256=d6O-ymlVx4o0mjKDIlrHOXiTOZxrdxhEX6mieLLETEI,9461
 cognite/neat/_session/_set.py,sha256=zNhHI-7WON3NUXCc1Ajo2ti8l5kPYmHeJ8MxJ_QLIJk,1927
 cognite/neat/_session/_show.py,sha256=-f1-f6vJKdpZODYuFv6TFmO1BuELUldfCqZqeLvr0NE,14161
@@ -247,7 +247,7 @@ cognite/neat/_utils/text.py,sha256=PvTEsEjaTu8SE8yYaKUrce4msboMj933dK7-0Eey_rE,3
 cognite/neat/_utils/time_.py,sha256=O30LUiDH9TdOYz8_a9pFqTtJdg8vEjC3qHCk8xZblG8,345
 cognite/neat/_utils/upload.py,sha256=iWKmsQgw4EHLv-11NjYu7zAj5LtqTAfNa87a1kWeuaU,5727
 cognite/neat/_utils/xml_.py,sha256=FQkq84u35MUsnKcL6nTMJ9ajtG9D5i1u4VBnhGqP2DQ,1710
-cognite/neat/_version.py,sha256=i1XG3bCI016w9QBXpZK2V7_H3qAxKFiPgn1XbWWNSmk,45
+cognite/neat/_version.py,sha256=x_rAP_QXrbMfEieOF7mnEF3qFbN1SzK4mMGniMYJCAo,45
 cognite/neat/_workflows/__init__.py,sha256=S0fZq7kvoqDKodHu1UIPsqcpdvXoefUWRPt1lqeQkQs,420
 cognite/neat/_workflows/base.py,sha256=O1pcmfbme2gIVF2eOGrKZSUDmhZc8L9rI8UfvLN2YAM,26839
 cognite/neat/_workflows/cdf_store.py,sha256=3pebnATPo6In4-1srpa3wzstynTOi3T6hwFX5uaie4c,18050
@@ -276,8 +276,8 @@ cognite/neat/_workflows/tasks.py,sha256=dr2xuIb8P5e5e9p_fjzRlvDbKsre2xGYrkc3wnRx
 cognite/neat/_workflows/triggers.py,sha256=u69xOsaTtM8_WD6ZeIIBB-XKwvlZmPHAsZQh_TnyHcM,7073
 cognite/neat/_workflows/utils.py,sha256=gKdy3RLG7ctRhbCRwaDIWpL9Mi98zm56-d4jfHDqP1E,453
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite_neat-0.97.2.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.97.2.dist-info/METADATA,sha256=6njFfu62z3vsTJ8fymHG1K7IYRqx8Lh-fvVxVDeV4Eo,9657
-cognite_neat-0.97.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-cognite_neat-0.97.2.dist-info/entry_points.txt,sha256=SsQlnl8SNMSSjE3acBI835JYFtsIinLSbVmHmMEXv6E,51
-cognite_neat-0.97.2.dist-info/RECORD,,
+cognite_neat-0.97.3.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.97.3.dist-info/METADATA,sha256=ohCmVgNuYqPUXNKeJk9sFrE9yRuxwjbroUmNoUhLj-k,9657
+cognite_neat-0.97.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+cognite_neat-0.97.3.dist-info/entry_points.txt,sha256=SsQlnl8SNMSSjE3acBI835JYFtsIinLSbVmHmMEXv6E,51
+cognite_neat-0.97.3.dist-info/RECORD,,