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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-neat
-Version: 0.96.0
+Version: 0.96.1
 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.1}/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.1}/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
@@ -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.1}/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.1/cognite/neat/_version.py

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

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

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

cognite_neat-0.96.0/cognite/neat/_version.py

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