cognite-neat 0.123.41__tar.gz → 0.123.43__tar.gz

{cognite_neat-0.123.41 → cognite_neat-0.123.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 0.123.41
+Version: 0.123.43
 Summary: Knowledge graph transformation
 Project-URL: Documentation, https://cognite-neat.readthedocs-hosted.com/
 Project-URL: Homepage, https://cognite-neat.readthedocs-hosted.com/

cognite_neat-0.123.43/cognite/neat/_data_model/models/conceptual/_data_model.py

@@ -0,0 +1,51 @@
+from collections import Counter
+
+from pydantic import Field, ValidationInfo, field_validator
+
+from cognite.neat._data_model.models.entities._constants import PREFIX_PATTERN, SUFFIX_PATTERN, VERSION_PATTERN
+from cognite.neat._utils.text import humanize_collection
+from cognite.neat.v0.core._data_model.models.entities._single_value import ConceptEntity
+
+from ._base import ResourceMetadata
+from ._concept import Concept
+
+
+class DataModel(ResourceMetadata):
+    space: str = Field(
+        description="Id of the space that the concept belongs to.",
+        min_length=1,
+        max_length=43,
+        pattern=PREFIX_PATTERN,
+        alias="prefix",
+    )
+    external_id: str = Field(
+        description="External-id of the concept.",
+        min_length=1,
+        max_length=255,
+        pattern=SUFFIX_PATTERN,
+        alias="suffix",
+    )
+    version: str = Field(
+        description="Version of the concept.",
+        max_length=43,
+        pattern=VERSION_PATTERN,
+    )
+
+    concepts: list[Concept] = Field(
+        description="References to the concepts from where this concept will inherit properties.",
+    )
+
+    @field_validator("concepts", mode="after")
+    def cannot_have_duplicates(cls, value: list[Concept], info: ValidationInfo) -> list[Concept]:
+        concept_ids = [
+            ConceptEntity(prefix=concept.space, suffix=concept.external_id, version=concept.version)
+            for concept in value
+        ]
+
+        counts = Counter(concept_ids)
+        duplicates = {concept for concept, count in counts.items() if count > 1}
+
+        if duplicates:
+            raise ValueError(f"Duplicate concepts found: {humanize_collection(duplicates)}")
+
+        return value

{cognite_neat-0.123.41 → cognite_neat-0.123.43}/cognite/neat/_data_model/models/conceptual/_property.py

@@ -78,11 +78,12 @@ class Property(ResourceMetadata):
             return value
 
         max_count = info.data.get("max_count")
+        min_count = info.data.get("min_count")
 
-        if max_count is None or max_count > 1:
+        if max_count is None or max_count > 1 or (min_count and min_count > 1):
             raise ValueError(
                 "Setting default value is only supported for single-valued properties."
-                f" Property has max_count={max_count or 'Inf'}."
+                f" Property has min_count={info.data.get('min_count')} and max_count={info.data.get('max_count')}."
             )
         return value
 

cognite_neat-0.123.43/cognite/neat/_version.py

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

{cognite_neat-0.123.41 → cognite_neat-0.123.43}/cognite/neat/v0/core/_constants.py

@@ -274,3 +274,5 @@ DMS_RESERVED_PROPERTIES = frozenset(
         "endNode",
     }
 )
+
+NAMED_GRAPH_NAMESPACE = Namespace("http://thisisneat.io/namedgraph/")

{cognite_neat-0.123.41 → cognite_neat-0.123.43}/cognite/neat/v0/session/_read.py

@@ -1,15 +1,19 @@
+import re
 import warnings
 from typing import Any, Literal, cast
 
 from cognite.client.data_classes.data_modeling import DataModelId, DataModelIdentifier
 from cognite.client.utils.useful_types import SequenceNotStr
+from rdflib import URIRef
 
 from cognite.neat.v0.core._client import NeatClient
 from cognite.neat.v0.core._constants import (
     CLASSIC_CDF_NAMESPACE,
+    NAMED_GRAPH_NAMESPACE,
     get_default_prefixes_and_namespaces,
 )
 from cognite.neat.v0.core._data_model import catalog, importers
+from cognite.neat.v0.core._data_model._constants import SPACE_COMPLIANCE_REGEX
 from cognite.neat.v0.core._data_model.importers import BaseImporter
 from cognite.neat.v0.core._data_model.models.entities._single_value import ViewEntity
 from cognite.neat.v0.core._data_model.transformers import ClassicPrepareCore
@@ -826,13 +830,21 @@ class RDFReadAPI(BaseReadAPI):
         importer = importers.OWLImporter.from_file(reader.materialize_path(), source_name=f"file {reader!s}")
         return self._state.data_model_import(importer)
 
-    def instances(self, io: Any) -> IssueList:
+    def instances(self, io: Any, named_graph: str | None = None) -> IssueList:
         self._state._raise_exception_if_condition_not_met(
             "Read RDF Instances",
             empty_data_model_store_required=True,
         )
         reader = NeatReader.create(io)
-        self._state.instances.store.write(extractors.RdfFileExtractor(reader.materialize_path()))
+
+        # validate and convert named_graph to URI
+        named_graph_uri: URIRef | None = None
+        if named_graph:
+            if not re.match(SPACE_COMPLIANCE_REGEX, named_graph):
+                raise NeatValueError(f"Named graph '{named_graph}' does not comply with naming requirements. ")
+            named_graph_uri = NAMED_GRAPH_NAMESPACE[named_graph]
+
+        self._state.instances.store.write(extractors.RdfFileExtractor(reader.materialize_path()), named_graph_uri)
         return IssueList()
 
     def __call__(
@@ -840,6 +852,7 @@ class RDFReadAPI(BaseReadAPI):
         io: Any,
         type: NeatObjectType | None = None,
         source: RDFFileType | None = None,
+        named_graph: str | URIRef | None = None,
     ) -> IssueList:
         if type is None:
             type = object_wizard()
@@ -858,7 +871,7 @@ class RDFReadAPI(BaseReadAPI):
                 raise ValueError(f"Expected ontology, imf types or instances, got {source}")
 
         elif type == "instances":
-            return self.instances(io)
+            return self.instances(io, named_graph=named_graph)
 
         else:
             raise NeatSessionError(f"Expected data model or instances, got {type}")

cognite_neat-0.123.43/last_changelog_entry.md

@@ -0,0 +1,4 @@
+
+### Added
+
+- Added conceptual data model pydantic representation.

cognite_neat-0.123.43/last_git_message.txt

@@ -0,0 +1,16 @@
+THIS-269 Add Conceptual Data Model Pydantic (#1307)
+
+# Description
+This is stacked PR on top of #1306 
+Added conceptual data model pydantic representation.
+
+## Bump
+
+- [x] Patch
+- [ ] Minor
+- [ ] Skip
+
+## Changelog
+### Added
+
+- Added conceptual data model pydantic representation.

cognite_neat-0.123.43/last_version.txt

@@ -0,0 +1 @@
+0.123.42

{cognite_neat-0.123.41 → cognite_neat-0.123.43}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cognite-neat"
-version = "0.123.41"
+version = "0.123.43"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [

cognite_neat-0.123.43/tests/tests_data_model/test_models/test_conceptual/test_data_model.py

@@ -0,0 +1,39 @@
+import pytest
+from pydantic import ValidationError
+
+from cognite.neat._data_model.models.conceptual._concept import Concept
+from cognite.neat._data_model.models.conceptual._data_model import DataModel
+
+
+class TestDataModel:
+    def test_cannot_have_duplicates_validator_with_duplicates(self) -> None:
+        """Test that validator raises error when there are duplicate concepts."""
+        concepts = [
+            Concept(space="space1", external_id="concept1", version="v1"),
+            Concept(space="space1", external_id="concept1", version="v1"),  # Duplicate
+            Concept(space="space2", external_id="concept2", version="v2"),
+        ]
+
+        with pytest.raises(ValidationError) as exc_info:
+            DataModel(space="test_space", external_id="test_model", version="v1", concepts=concepts)
+
+        error_message = str(exc_info.value)
+        assert "Duplicate concepts found" in error_message
+        assert "space1:concept1(version=v1)" in error_message
+
+    def test_cannot_have_duplicates_validator_multiple_duplicates(self) -> None:
+        """Test that validator identifies multiple duplicate concepts."""
+        concepts = [
+            Concept(space="space1", external_id="concept1", version="v1"),
+            Concept(space="space1", external_id="concept1", version="v1"),  # Duplicate
+            Concept(space="space2", external_id="concept2", version="v2"),
+            Concept(space="space2", external_id="concept2", version="v2"),  # Another duplicate
+        ]
+
+        with pytest.raises(ValidationError) as exc_info:
+            DataModel(space="test_space", external_id="test_model", version="v1", concepts=concepts)
+
+        error_message = str(exc_info.value)
+        assert "Duplicate concepts found" in error_message
+        assert "space1:concept1(version=v1)" in error_message
+        assert "space2:concept2(version=v2)" in error_message

{cognite_neat-0.123.41 → cognite_neat-0.123.43}/tests/v0/tests_unit/test_session/test_read.py

@@ -3,7 +3,7 @@ from cognite.client.data_classes.data_modeling import NodeId
 
 from cognite.neat import NeatSession
 from cognite.neat.v0.core._client.testing import monkeypatch_neat_client
-from cognite.neat.v0.core._constants import CLASSIC_CDF_NAMESPACE
+from cognite.neat.v0.core._constants import CLASSIC_CDF_NAMESPACE, NAMED_GRAPH_NAMESPACE
 from cognite.neat.v0.core._instances.extractors._classic_cdf._base import InstanceIdPrefix
 from cognite.neat.v0.core._issues import NeatIssue
 from cognite.neat.v0.core._issues.warnings import NeatValueWarning
@@ -95,3 +95,27 @@ class TestReadClassicTimeSeries:
             )
         )
         assert instances_ids == expected
+
+
+def test_read_rdf_instances_with_named_graph(tmp_path) -> None:
+    """Test reading RDF instances into a named graph"""
+
+    ttl_file = tmp_path / "test.ttl"
+    ttl_file.write_text(
+        """
+        @prefix ex: <http://example.org/> .
+        ex:subject1 ex:predicate1 "value1" .
+        ex:subject2 ex:predicate2 "value2" .
+    """
+    )
+
+    neat = NeatSession()
+
+    # Test with string named_graph
+    issues = neat.read.rdf.instances(ttl_file, named_graph="my_test_graph")
+    assert not issues.has_errors
+
+    expected_graph_uri = NAMED_GRAPH_NAMESPACE["my_test_graph"]
+    target_graph = neat._state.instances.store.graph(expected_graph_uri)
+
+    assert target_graph.identifier == expected_graph_uri

{cognite_neat-0.123.41 → cognite_neat-0.123.43}/uv.lock

@@ -346,7 +346,7 @@ wheels = [
 
 [[package]]
 name = "cognite-neat"
-version = "0.123.41"
+version = "0.123.43"
 source = { editable = "." }
 dependencies = [
     { name = "backports-strenum", marker = "python_full_version < '3.11'" },

cognite_neat-0.123.41/cognite/neat/_version.py

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

cognite_neat-0.123.41/last_changelog_entry.md

@@ -1,5 +0,0 @@
-### Added
-- Add get_triples_to_delete() method to find triples that exist in old
-graph but not in new graph
-- Add get_triples_to_add() method to find triples that exist in new
-graph but not in old graph

cognite_neat-0.123.41/last_git_message.txt

@@ -1,23 +0,0 @@
-THIS-759 Add graph diffing query methods to SelectQueries (#1317)
-
-# Description
-
-Adds graph diffing methods to SelectQueries class to support instance
-diffing by comparing named graphs.
-
-## Bump
-
-- [x] Patch
-- [ ] Minor
-- [ ] Skip
-
-## Changelog
-### Added
-- Add get_triples_to_delete() method to find triples that exist in old
-graph but not in new graph
-- Add get_triples_to_add() method to find triples that exist in new
-graph but not in old graph
-
----------
-
-Co-authored-by: Andrian Gasper <andrian.gasper@cognite.com>

cognite_neat-0.123.41/last_version.txt

@@ -1 +0,0 @@
-0.123.40