cognite-neat 0.96.0__tar.gz → 0.96.2__tar.gz

{cognite_neat-0.96.0 → cognite_neat-0.96.2}/PKG-INFO

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

{cognite_neat-0.96.0 → cognite_neat-0.96.2}/cognite/neat/_constants.py

@@ -19,7 +19,17 @@ def _is_in_notebook() -> bool:
     return True
 
 
-IN_NOTEBOOK = _is_in_notebook()
+def _is_in_browser() -> bool:
+    try:
+        from pyodide.ffi import IN_BROWSER  # type: ignore [import-not-found]
+    except ModuleNotFoundError:
+        return False
+    return IN_BROWSER
+
+
+IN_PYODIDE = _is_in_browser()
+IN_NOTEBOOK = _is_in_notebook() or IN_PYODIDE
+
 
 PACKAGE_DIRECTORY = Path(neat.__file__).parent
 COGNITE_MODELS = (

{cognite_neat-0.96.0 → cognite_neat-0.96.2}/cognite/neat/_rules/importers/_dms2rules.py

@@ -346,7 +346,7 @@ class DMSImporter(BaseImporter[DMSInputRules]):
             property_=prop_id,
             description=prop.description,
             name=prop.name,
-            connection=self._get_connection_type(prop_id, prop, view_entity.as_id()),
+            connection=self._get_connection_type(prop),
             value_type=str(value_type),
             is_list=self._get_is_list(prop),
             nullable=self._get_nullable(prop),
@@ -367,19 +367,13 @@ class DMSImporter(BaseImporter[DMSInputRules]):
         return self._all_containers_by_id[prop.container].properties[prop.container_property_identifier]
 
     def _get_connection_type(
-        self, prop_id: str, prop: ViewPropertyApply, view_id: dm.ViewId
+        self, prop: ViewPropertyApply
     ) -> Literal["direct"] | ReverseConnectionEntity | EdgeEntity | None:
-        if isinstance(prop, SingleEdgeConnectionApply | MultiEdgeConnectionApply) and prop.direction == "outwards":
+        if isinstance(prop, SingleEdgeConnectionApply | MultiEdgeConnectionApply):
             properties = ViewEntity.from_id(prop.edge_source) if prop.edge_source is not None else None
-            return EdgeEntity(properties=properties, type=DMSNodeEntity.from_reference(prop.type), direction="outwards")
-        elif isinstance(prop, SingleEdgeConnectionApply | MultiEdgeConnectionApply) and prop.direction == "inwards":
-            if reverse_prop := self._find_reverse_edge(prop_id, prop, view_id):
-                return ReverseConnectionEntity(property=reverse_prop)
-            else:
-                properties = ViewEntity.from_id(prop.source) if prop.edge_source is not None else None
-                return EdgeEntity(
-                    properties=properties, type=DMSNodeEntity.from_reference(prop.type), direction="inwards"
-                )
+            return EdgeEntity(
+                properties=properties, type=DMSNodeEntity.from_reference(prop.type), direction=prop.direction
+            )
         elif isinstance(prop, SingleReverseDirectRelationApply | MultiReverseDirectRelationApply):
             return ReverseConnectionEntity(property=prop.through.property)
         elif isinstance(prop, dm.MappedPropertyApply) and isinstance(

{cognite_neat-0.96.0 → cognite_neat-0.96.2}/cognite/neat/_rules/models/dms/_exporter.py

@@ -565,7 +565,7 @@ class _DMSExporter:
             return edge_cls(
                 type=cls._create_edge_type_from_prop(prop),
                 source=source_view_id,
-                direction="outwards",
+                direction=prop.connection.direction,
                 name=prop.name,
                 description=prop.description,
                 edge_source=edge_source,
@@ -580,7 +580,6 @@ class _DMSExporter:
                     "If this error occurs it is a bug in NEAT, please report"
                     f"Debug Info, Invalid valueType reverse connection: {prop.model_dump_json()}"
                 )
-            edge_source = None
             reverse_prop = next(
                 (
                     prop
@@ -589,13 +588,6 @@ class _DMSExporter:
                 ),
                 None,
             )
-            if (
-                reverse_prop
-                and isinstance(reverse_prop.connection, EdgeEntity)
-                and reverse_prop.connection.properties is not None
-            ):
-                edge_source = reverse_prop.connection.properties.as_id()
-
             if reverse_prop is None:
                 warnings.warn(
                     PropertyNotFoundWarning(
@@ -608,30 +600,17 @@ class _DMSExporter:
                     stacklevel=2,
                 )
 
-            if reverse_prop is None or isinstance(reverse_prop.connection, EdgeEntity):
-                inwards_edge_cls = (
-                    dm.MultiEdgeConnectionApply if prop.is_list in [True, None] else SingleEdgeConnectionApply
-                )
-                return inwards_edge_cls(
-                    type=cls._create_edge_type_from_prop(reverse_prop or prop),
-                    source=source_view_id,
-                    name=prop.name,
-                    description=prop.description,
-                    direction="inwards",
-                    edge_source=edge_source,
-                )
-            elif reverse_prop and reverse_prop.connection == "direct":
-                reverse_direct_cls = (
-                    dm.MultiReverseDirectRelationApply
-                    if prop.is_list in [True, None]
-                    else SingleReverseDirectRelationApply
-                )
-                return reverse_direct_cls(
+            if reverse_prop and reverse_prop.connection == "direct":
+                args: dict[str, Any] = dict(
                     source=source_view_id,
                     through=dm.PropertyId(source=source_view_id, property=reverse_prop_id),
                     name=prop.name,
                     description=prop.description,
                 )
+                if prop.is_list in [True, None]:
+                    return dm.MultiReverseDirectRelationApply(**args)
+                else:
+                    return SingleReverseDirectRelationApply(**args)
             else:
                 return None
 

{cognite_neat-0.96.0 → cognite_neat-0.96.2}/cognite/neat/_session/_base.py

@@ -1,12 +1,16 @@
 from typing import Literal, cast
 
 from cognite.client import CogniteClient
+from cognite.client import data_modeling as dm
 
 from cognite.neat import _version
 from cognite.neat._issues import IssueList
 from cognite.neat._rules import importers
 from cognite.neat._rules._shared import ReadRules
+from cognite.neat._rules.importers._rdf._base import DEFAULT_NON_EXISTING_NODE_TYPE
 from cognite.neat._rules.models import DMSRules
+from cognite.neat._rules.models.data_types import AnyURI
+from cognite.neat._rules.models.entities._single_value import UnknownEntity
 from cognite.neat._rules.models.information._rules import InformationRules
 from cognite.neat._rules.models.information._rules_input import InformationInputRules
 from cognite.neat._rules.transformers import ConvertToRules, VerifyAnyRules
@@ -51,7 +55,7 @@ class NeatSession:
                 self._state.store.add_rules(output.rules)
         self._state.issue_lists.append(output.issues)
         if output.issues:
-            print("You can inspect the issues with the .inspect attribute.")
+            print("You can inspect the issues with the .inspect.issues(...) method.")
         return output.issues
 
     def convert(self, target: Literal["dms"]) -> None:
@@ -62,15 +66,34 @@ class NeatSession:
 
     def infer(
         self,
-        space: str = "inference_space",
-        external_id: str = "InferredDataModel",
-        version: str = "v1",
+        model_id: dm.DataModelId | tuple[str, str, str] = (
+            "neat_space",
+            "NeatInferredDataModel",
+            "v1",
+        ),
+        non_existing_node_type: UnknownEntity | AnyURI = DEFAULT_NON_EXISTING_NODE_TYPE,
     ) -> IssueList:
-        input_rules: ReadRules = importers.InferenceImporter.from_graph_store(self._state.store).to_rules()
+        """Data model inference from instances.
 
-        cast(InformationInputRules, input_rules.rules).metadata.prefix = space
-        cast(InformationInputRules, input_rules.rules).metadata.name = external_id
-        cast(InformationInputRules, input_rules.rules).metadata.version = version
+        Args:
+            model_id: The ID of the inferred data model.
+            non_existing_node_type: The type of node to use when type of node is not possible to determine.
+        """
+
+        model_id = dm.DataModelId.load(model_id)
+
+        input_rules: ReadRules = importers.InferenceImporter.from_graph_store(
+            store=self._state.store,
+            non_existing_node_type=non_existing_node_type,
+        ).to_rules()
+
+        if model_id.space:
+            cast(InformationInputRules, input_rules.rules).metadata.prefix = model_id.space
+        if model_id.external_id:
+            cast(InformationInputRules, input_rules.rules).metadata.name = model_id.external_id
+
+        if model_id.version:
+            cast(InformationInputRules, input_rules.rules).metadata.version = model_id.version
 
         self.read.rdf._store_rules(self._state.store, input_rules, "Data Model Inference")
         return input_rules.issues

{cognite_neat-0.96.0 → cognite_neat-0.96.2}/cognite/neat/_session/_show.py

@@ -3,9 +3,10 @@ import random
 from typing import Any, cast
 
 import networkx as nx
+from IPython.display import HTML, display
 from pyvis.network import Network as PyVisNetwork  # type: ignore
 
-from cognite.neat._constants import IN_NOTEBOOK
+from cognite.neat._constants import IN_NOTEBOOK, IN_PYODIDE
 from cognite.neat._rules._constants import EntityTypes
 from cognite.neat._rules.models.dms._rules import DMSRules
 from cognite.neat._rules.models.entities._single_value import ClassEntity, ViewEntity
@@ -31,6 +32,9 @@ class ShowBaseAPI:
         self._state = state
 
     def _generate_visualization(self, di_graph: nx.DiGraph, name: str) -> Any:
+        if not IN_NOTEBOOK:
+            raise NeatSessionError("Visualization is only available in Jupyter notebooks!")
+
         net = PyVisNetwork(
             notebook=IN_NOTEBOOK,
             cdn_resources="remote",
@@ -50,7 +54,12 @@ class ShowBaseAPI:
         )
 
         net.from_nx(di_graph)
-        return net.show(name)
+        if IN_PYODIDE:
+            net.write_html(name)
+            return display(HTML(name))
+
+        else:
+            return net.show(name)
 
 
 @intercept_session_exceptions

{cognite_neat-0.96.0 → cognite_neat-0.96.2}/cognite/neat/_session/_to.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Any, overload
+from typing import Any, Literal, overload
 
 from cognite.client import CogniteClient
 
@@ -61,11 +61,17 @@ class CDFToAPI:
 
         return loader.load_into_cdf(self._client)
 
-    def data_model(self):
+    def data_model(self, existing_handling: Literal["fail", "skip", "update", "force"] = "skip"):
+        """Export the verified DMS data model to CDF.
+
+        Args:
+            existing_handling: How to handle if component of data model exists. Defaults to "skip".
+
+        """
         if not self._state.last_verified_dms_rules:
             raise ValueError("No verified DMS data model available")
 
-        exporter = exporters.DMSExporter()
+        exporter = exporters.DMSExporter(existing_handling=existing_handling)
 
         if not self._client:
             raise ValueError("No client provided!")

cognite_neat-0.96.2/cognite/neat/_version.py

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

{cognite_neat-0.96.0 → cognite_neat-0.96.2}/pyproject.toml

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

cognite_neat-0.96.0/cognite/neat/_version.py

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