cognite-neat 0.122.0__tar.gz → 0.122.1__tar.gz

{cognite_neat-0.122.0 → cognite_neat-0.122.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 0.122.0
+Version: 0.122.1
 Summary: Knowledge graph transformation
 Project-URL: Documentation, https://cognite-neat.readthedocs-hosted.com/
 Project-URL: Homepage, https://cognite-neat.readthedocs-hosted.com/
@@ -47,9 +47,9 @@ Requires-Dist: google-auth-oauthlib<2.0.0,>=1.0.0; extra == 'google'
 Requires-Dist: gspread<6.0.0,>=5.0.0; extra == 'google'
 Provides-Extra: lxml
 Requires-Dist: lxml<6.0.0,>=5.3.0; extra == 'lxml'
-Provides-Extra: pyoxigraph
-Requires-Dist: oxrdflib<0.5.0,>=0.4.0; extra == 'pyoxigraph'
-Requires-Dist: pyoxigraph<0.5.0,>=0.4.3; extra == 'pyoxigraph'
+Provides-Extra: oxi
+Requires-Dist: oxrdflib<0.5.0,>=0.4.0; extra == 'oxi'
+Requires-Dist: pyoxigraph<0.5.0,>=0.4.3; extra == 'oxi'
 Description-Content-Type: text/markdown
 
 # kNowlEdge grAph Transformer (NEAT)

cognite_neat-0.122.1/cognite/neat/_version.py

@@ -0,0 +1,2 @@
+__version__ = "0.122.1"
+__engine__ = "^2.0.4"

{cognite_neat-0.122.0 → cognite_neat-0.122.1}/cognite/neat/core/_instances/loaders/_rdf2dms.py

@@ -22,6 +22,7 @@ from rdflib import RDF, URIRef
 from cognite.neat.core._client import NeatClient
 from cognite.neat.core._client._api_client import SchemaAPI
 from cognite.neat.core._constants import (
+    COGNITE_SPACES,
     DMS_DIRECT_RELATION_LIST_DEFAULT_LIMIT,
     is_readonly_property,
 )
@@ -585,7 +586,12 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
             yield dm.NodeApply(
                 space=space,
                 external_id=external_id,
-                type=(projection.view_id.space, projection.view_id.external_id),
+                # Currently there are no node types for schemas in cognite schema spaces
+                type=(
+                    (projection.view_id.space, projection.view_id.external_id)
+                    if projection.view_id.space not in COGNITE_SPACES
+                    else None
+                ),
                 sources=sources,
             )
         yield from self._create_edges_without_properties(space, external_id, properties, projection, stop_on_exception)

{cognite_neat-0.122.0 → cognite_neat-0.122.1}/cognite/neat/session/exceptions.py

@@ -1,7 +1,7 @@
 import functools
 import warnings
 from collections.abc import Callable
-from typing import Any
+from typing import Any, TypeVar
 
 from cognite.neat.core._issues.errors import CDFMissingClientError, NeatImportError
 from cognite.neat.core._issues.errors._external import OxigraphStorageLockedError
@@ -68,7 +68,10 @@ def _session_method_wrapper(func: Callable, cls_name: str) -> Any:
     return wrapper
 
 
-def session_class_wrapper(cls: type) -> type:
+T_Class = TypeVar("T_Class", bound=object)
+
+
+def session_class_wrapper(cls: type[T_Class]) -> type[T_Class]:
     """This decorator wraps all methods of a class.
 
     It should be used with all composition classes used with the NeatSession class.

cognite_neat-0.122.1/last_changelog_entry.md

@@ -0,0 +1,5 @@
+
+### Fixed
+
+- When generating instances through views from system space(s) node type
+is no longer set

cognite_neat-0.122.1/last_git_message.txt

@@ -0,0 +1,21 @@
+Neat 1007 skip setting node type for instances of system space views (#1220)
+
+# Description
+
+CDF system (schema) space (e.g. cdm) does not contain definition of node
+types. This leads to error when we try to create instances with neat, as
+neat is automatically set node type for every instance , where node type
+has same id (space,external_id) of view instances is being written
+through.
+
+## Bump
+
+- [x] Patch
+- [ ] Minor
+- [ ] Skip
+
+## Changelog
+### Fixed
+
+- When generating instances through views from system space(s) node type
+is no longer set

cognite_neat-0.122.1/last_version.txt

@@ -0,0 +1 @@
+0.122.0

{cognite_neat-0.122.0 → cognite_neat-0.122.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cognite-neat"
-version = "0.122.0"
+version = "0.122.1"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [
@@ -39,7 +39,7 @@ dependencies = [
 lxml = [
     "lxml>=5.3.0, <6.0.0",
 ]
-pyoxigraph = [
+oxi = [
     "oxrdflib>=0.4.0, <0.5.0",
     "pyoxigraph>=0.4.3, <0.5.0",
 ]

{cognite_neat-0.122.0 → cognite_neat-0.122.1}/tests/tests_integration/test_session/test_graph_flow.py

@@ -14,6 +14,7 @@ from cognite.client.data_classes.data_modeling import (
 from pytest_regressions.data_regression import DataRegressionFixture
 
 from cognite.neat import NeatSession
+from cognite.neat.core._constants import COGNITE_SPACES
 from cognite.neat.core._data_model.models.entities import ContainerEntity
 from cognite.neat.core._instances.loaders import DMSLoader
 from tests.data import GraphData, SchemaData
@@ -153,6 +154,24 @@ class TestExtractToLoadFlow:
         errors = {res.name: res.error_messages for res in instance_result if res.error_messages}
         assert not errors, errors
 
+    def test_no_node_type_on_system_views_instances(self, cognite_client: CogniteClient) -> None:
+        neat = NeatSession(cognite_client, storage="oxigraph")
+        neat.read.cdf._graph(
+            ("sp_windfarm", "WindFarm", "v1"),
+            instance_space=["sp_windfarm_dataset", "usecase_01", "source_ds", "maintenance"],
+            unpack_json=True,
+            str_to_ideal_type=True,
+            skip_cognite_views=False,
+        )
+        instances, _ = neat.to._python.instances(use_source_space=True)
+
+        check = []
+        for instance in instances:
+            if instance.instance_type == "node" and instance.sources[0].source.space in COGNITE_SPACES:
+                check.append(instance.type is None)
+
+        assert all(check), "System views should not have node type"
+
     def test_convert_info_with_cdm_ref(self, cognite_client: CogniteClient) -> None:
         neat = NeatSession(cognite_client, storage="oxigraph")
         neat.read.excel(SchemaData.Conceptual.info_with_cdm_ref_xlsx)

{cognite_neat-0.122.0 → cognite_neat-0.122.1}/uv.lock

@@ -346,7 +346,7 @@ wheels = [
 
 [[package]]
 name = "cognite-neat"
-version = "0.122.0"
+version = "0.122.1"
 source = { editable = "." }
 dependencies = [
     { name = "backports-strenum", marker = "python_full_version < '3.11'" },
@@ -392,7 +392,7 @@ google = [
 lxml = [
     { name = "lxml" },
 ]
-pyoxigraph = [
+oxi = [
     { name = "oxrdflib" },
     { name = "pyoxigraph" },
 ]
@@ -448,12 +448,12 @@ requires-dist = [
     { name = "mkdocstrings", extras = ["python"], marker = "extra == 'docs'", specifier = ">=0.25.2,<1.0.0" },
     { name = "networkx", specifier = ">=3.4.2,<4.0.0" },
     { name = "openpyxl", specifier = ">=3.0.10,<4.0.0" },
-    { name = "oxrdflib", marker = "extra == 'pyoxigraph'", specifier = ">=0.4.0,<0.5.0" },
+    { name = "oxrdflib", marker = "extra == 'oxi'", specifier = ">=0.4.0,<0.5.0" },
     { name = "packaging", specifier = ">=22.0,<25.0" },
     { name = "pandas", specifier = ">=1.5.3,<3.0.0" },
     { name = "pydantic", specifier = ">=2.0.0,<3.0.0" },
     { name = "pymdown-extensions", marker = "extra == 'docs'", specifier = ">=10.14.3,<11.0.0" },
-    { name = "pyoxigraph", marker = "extra == 'pyoxigraph'", specifier = ">=0.4.3,<0.5.0" },
+    { name = "pyoxigraph", marker = "extra == 'oxi'", specifier = ">=0.4.3,<0.5.0" },
     { name = "pyvis", specifier = ">=0.3.2,<1.0.0" },
     { name = "pyyaml", specifier = ">=6.0.1,<7.0.0" },
     { name = "rdflib", specifier = ">=7.0.0,<8.0.0" },
@@ -463,7 +463,7 @@ requires-dist = [
     { name = "typing-extensions", marker = "python_full_version < '3.11'", specifier = ">=4.8.0,<5.0.0" },
     { name = "urllib3", specifier = ">=1.26.15,<3.0.0" },
 ]
-provides-extras = ["lxml", "pyoxigraph", "google", "docs"]
+provides-extras = ["lxml", "oxi", "google", "docs"]
 
 [package.metadata.requires-dev]
 dev = [

cognite_neat-0.122.0/cognite/neat/_version.py

@@ -1,2 +0,0 @@
-__version__ = "0.122.0"
-__engine__ = "^2.0.4"

cognite_neat-0.122.0/last_changelog_entry.md

@@ -1,6 +0,0 @@
-
-### Improved
-
-- Docs and tutorials to reflect latest terminology
-- Fix remaining naming of internal variables and methods to use latest
-terminology

cognite_neat-0.122.0/last_git_message.txt

@@ -1,32 +0,0 @@
-Neat 984 update doc and release package (#1202)
-
-# Description
-
-Update docs and tutorials with the latest terminology:
-
-* *Rules* -> *Data Model*
-* *Information Rules* -> *Conceptual Data Model*
-* *DMS Rules* -> *Physical Data Model*
-* *Class* -> *Concept*
-* *Graph* -> *Instances*
-* *Instances* + *Data Model* -> *Knowledge Graph*
-
-Last bits of renaming of internal variables and methods of neat that
-were missed in the previous PRs. No new functionality added!
-
-**TO RISK REVIEWERS**: large number of lines is due to generation of
-graph visualization for docs (html) file, docs, docstrings, and missed
-renaming of internal vars/methods form the previous PRs.
-
-## Bump
-
-- [ ] Patch
-- [x] Minor
-- [ ] Skip
-
-## Changelog
-### Improved
-
-- Docs and tutorials to reflect latest terminology
-- Fix remaining naming of internal variables and methods to use latest
-terminology

cognite_neat-0.122.0/last_version.txt

@@ -1 +0,0 @@
-0.121.2