cognite-neat 0.123.41__py3-none-any.whl → 0.123.43__py3-none-any.whl

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/_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/_version.py

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

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/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.41.dist-info → cognite_neat-0.123.43.dist-info}/METADATA

@@ -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.41.dist-info → cognite_neat-0.123.43.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cognite/neat/__init__.py,sha256=Lo4DbjDOwnhCYUoAgPp5RG1fDdF7OlnomalTe7n1ydw,211
 cognite/neat/_issues.py,sha256=uv0fkkWwTKqNmTmHqyoBB3L6yMCh42EZpEkLGmIJYOY,812
-cognite/neat/_version.py,sha256=ufRXfLAZOiccgiTU2G1cLrNuGEalUnTHSuR_tpkSN2w,47
+cognite/neat/_version.py,sha256=dEWoG_6PogUbhTlc8CLubWeLvGWXiuXTv6Q2rLO3bJs,47
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/_data_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/_data_model/_constants.py,sha256=NGGvWHlQqhkkSBP_AqoofGYjNph3SiZX6QPINlMsy04,107
@@ -11,8 +11,9 @@ cognite/neat/_data_model/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 cognite/neat/_data_model/models/conceptual/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/_data_model/models/conceptual/_base.py,sha256=SFkoBJDM51pqew_isHFJoB20OgfofpwVRnTrg-rKkNY,710
 cognite/neat/_data_model/models/conceptual/_concept.py,sha256=0Pk4W2TJ_Y0Z7oPHpzely1kPXrAkmkyqw6a0n3il6LY,2248
+cognite/neat/_data_model/models/conceptual/_data_model.py,sha256=mSX0z8i29ufcRUhvC_NPeo2xGidlK3B1n89kngY_SqQ,1695
 cognite/neat/_data_model/models/conceptual/_properties.py,sha256=CpF37vJYBTLT4DH4ZOu2U-JyWtkb_27V8fw52qiaE_k,4007
-cognite/neat/_data_model/models/conceptual/_property.py,sha256=CpF37vJYBTLT4DH4ZOu2U-JyWtkb_27V8fw52qiaE_k,4007
+cognite/neat/_data_model/models/conceptual/_property.py,sha256=blSZQxX52zaILAtjUkldPzPeysz7wnG-UGSNU5tacI8,4138
 cognite/neat/_data_model/models/dms/__init__.py,sha256=I_yw2GoEjUdLk8VOiLSlU4BWgE3u_GgCHJayeEa1w1w,3583
 cognite/neat/_data_model/models/dms/_base.py,sha256=R8SP3Zi9daTBqewYKGjuNEkrWc-j91f-6t34CN-9YJ0,719
 cognite/neat/_data_model/models/dms/_constants.py,sha256=wBkLjAPwufPc2naxOfPA1XC0CM2RbDbo6Dpiv9dPrew,1344
@@ -45,7 +46,7 @@ cognite/neat/_utils/http_client/_tracker.py,sha256=EBBnd-JZ7nc_jYNFJokCHN2UZ9sx0
 cognite/neat/v0/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/v0/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/v0/core/_config.py,sha256=WT1BS8uADcFvGoUYOOfwFOVq_VBl472TisdoA3wLick,280
-cognite/neat/v0/core/_constants.py,sha256=J0avfxWcipJup-pv9MvFIaO8NC0heDaNAsmSPMFEP3U,9063
+cognite/neat/v0/core/_constants.py,sha256=mNNHu-QAD54DEA9A1yHd9Fk19SbqZAE6DoCfYxDRvbM,9134
 cognite/neat/v0/core/_shared.py,sha256=Ov59SWYboRRsncB_5V1ZC_BAoACfNLjo80vqE5Ru6wo,2325
 cognite/neat/v0/core/_client/__init__.py,sha256=RQ7MwL8mwGqGHokRzsPqO3XStDzmI4-c12_gz1UPJ74,177
 cognite/neat/v0/core/_client/_api_client.py,sha256=ZIipNVjd0kVts5Gh-PcV96DhA-RyT0v5EwZHa77hdXg,863
@@ -217,7 +218,7 @@ cognite/neat/v0/session/_inspect.py,sha256=6xC-tLJfP7sbSQpIlpPmCQWklGxK_rEXBE41j
 cognite/neat/v0/session/_mapping.py,sha256=9lQFnB0wpizo4ySIEDMWh183qpHh8TlVL7uOgAtJUxE,2904
 cognite/neat/v0/session/_plugin.py,sha256=TqEeUYDiZmOyl33h44J5OlqkH7VzgGi63nJFidpBV4M,2235
 cognite/neat/v0/session/_prepare.py,sha256=HFdDmBnYRpaCm90s_A0byHLJIZwKrt2ve6i3EyN0V6w,12802
-cognite/neat/v0/session/_read.py,sha256=2pdlWa-OHQ4j2gRKNTeBzWBOipDPnznnqyys-yzUq2s,34658
+cognite/neat/v0/session/_read.py,sha256=jMviC69NLxaGqHFBcqHLNA_XPmIl2vOTTAchTOxR5nw,35288
 cognite/neat/v0/session/_set.py,sha256=qFi3YrYBd09MfHVJ2Ak0PCGigTAhGttfnA2iWSYwUt4,4617
 cognite/neat/v0/session/_show.py,sha256=O6Vcp5BNWfp2hpWuyqsdFhN0WAl29ot-QrC5iKBGe5Y,10758
 cognite/neat/v0/session/_state.py,sha256=2t1DBybamq67CuNZo_a1AQfDfYWnKS-MATFFuJf_h4M,7454
@@ -231,7 +232,7 @@ cognite/neat/v0/session/engine/__init__.py,sha256=D3MxUorEs6-NtgoICqtZ8PISQrjrr4
 cognite/neat/v0/session/engine/_import.py,sha256=1QxA2_EK613lXYAHKQbZyw2yjo5P9XuiX4Z6_6-WMNQ,169
 cognite/neat/v0/session/engine/_interface.py,sha256=3W-cYr493c_mW3P5O6MKN1xEQg3cA7NHR_ev3zdF9Vk,533
 cognite/neat/v0/session/engine/_load.py,sha256=u0x7vuQCRoNcPt25KJBJRn8sJabonYK4vtSZpiTdP4k,5201
-cognite_neat-0.123.41.dist-info/METADATA,sha256=x1il3bStkdRMLwIwGMK5UABcb2tkCyc3Zr63dkY27Vw,9148
-cognite_neat-0.123.41.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cognite_neat-0.123.41.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.123.41.dist-info/RECORD,,
+cognite_neat-0.123.43.dist-info/METADATA,sha256=R09xC2ziQsAEfmEMQ9tnUDA57fIpJstPhY7GUVqrFWc,9148
+cognite_neat-0.123.43.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cognite_neat-0.123.43.dist-info/licenses/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.123.43.dist-info/RECORD,,