cognite-neat 0.123.26__py3-none-any.whl → 1.0.22__py3-none-any.whl

cognite/neat/{core → _v0/core}/_instances/extractors/_dict.py

@@ -7,8 +7,8 @@ from cognite.client import data_modeling as dm
 from cognite.client.data_classes.data_modeling.instances import Instance
 from rdflib import XSD, Literal, Namespace, URIRef
 
-from cognite.neat.core._shared import Triple
-from cognite.neat.core._utils.auxiliary import string_to_ideal_type
+from cognite.neat._v0.core._shared import Triple
+from cognite.neat._v0.core._utils.auxiliary import string_to_ideal_type
 
 from ._base import BaseExtractor
 
@@ -43,9 +43,12 @@ class DictExtractor(BaseExtractor):
         self, key: str, value: Any, unpack_json: bool
     ) -> Iterable[tuple[str, Literal | URIRef]]:
         if key in self.uri_ref_keys and not isinstance(value, dict | list):
+            # exist if key is meant to form a URIRef
             yield key, URIRef(self.namespace[urllib.parse.quote(value)])
-        if isinstance(value, str | float | bool | int):
+        elif isinstance(value, float | bool | int):
             yield key, Literal(value)
+        elif isinstance(value, str):
+            yield key, Literal(string_to_ideal_type(value)) if self.str_to_ideal_type else Literal(value)
         elif isinstance(value, dict) and unpack_json:
             yield from self._unpack_json(value)
         elif isinstance(value, dict):

cognite/neat/{core → _v0/core}/_instances/extractors/_dms.py

@@ -9,12 +9,12 @@ from cognite.client.data_classes.data_modeling.instances import Edge, Instance,
 from cognite.client.utils.useful_types import SequenceNotStr
 from rdflib import RDF, Literal, Namespace, URIRef
 
-from cognite.neat.core._client import NeatClient
-from cognite.neat.core._config import GLOBAL_CONFIG
-from cognite.neat.core._constants import DEFAULT_SPACE_URI, is_readonly_property
-from cognite.neat.core._issues.errors import ResourceRetrievalError
-from cognite.neat.core._shared import Triple
-from cognite.neat.core._utils.collection_ import iterate_progress_bar
+from cognite.neat._v0.core._client import NeatClient
+from cognite.neat._v0.core._config import GLOBAL_CONFIG
+from cognite.neat._v0.core._constants import DEFAULT_SPACE_URI, is_readonly_property
+from cognite.neat._v0.core._issues.errors import ResourceRetrievalError
+from cognite.neat._v0.core._shared import Triple
+from cognite.neat._v0.core._utils.collection_ import iterate_progress_bar
 
 from ._base import BaseExtractor
 from ._dict import DEFAULT_EMPTY_VALUES, DMSPropertyExtractor

cognite/neat/{core → _v0/core}/_instances/extractors/_dms_graph.py

@@ -5,24 +5,24 @@ from cognite.client.exceptions import CogniteAPIError
 from cognite.client.utils.useful_types import SequenceNotStr
 from rdflib import Namespace, URIRef
 
-from cognite.neat.core._client import NeatClient
-from cognite.neat.core._constants import COGNITE_SPACES, DEFAULT_NAMESPACE
-from cognite.neat.core._data_model.importers import DMSImporter
-from cognite.neat.core._data_model.models import ConceptualDataModel, PhysicalDataModel
-from cognite.neat.core._data_model.models.conceptual import ConceptualProperty
-from cognite.neat.core._data_model.models.data_types import Json
-from cognite.neat.core._data_model.models.entities import UnknownEntity
-from cognite.neat.core._data_model.transformers import (
+from cognite.neat._v0.core._client import NeatClient
+from cognite.neat._v0.core._constants import COGNITE_SPACES, DEFAULT_NAMESPACE
+from cognite.neat._v0.core._data_model.importers import DMSImporter
+from cognite.neat._v0.core._data_model.models import ConceptualDataModel, PhysicalDataModel
+from cognite.neat._v0.core._data_model.models.conceptual import ConceptualProperty
+from cognite.neat._v0.core._data_model.models.data_types import Json
+from cognite.neat._v0.core._data_model.models.entities import UnknownEntity
+from cognite.neat._v0.core._data_model.transformers import (
     PhysicalToConceptual,
     VerifyPhysicalDataModel,
 )
-from cognite.neat.core._issues import IssueList, NeatIssue, catch_warnings
-from cognite.neat.core._issues.warnings import (
+from cognite.neat._v0.core._issues import IssueList, NeatIssue, catch_warnings
+from cognite.neat._v0.core._issues.warnings import (
     CDFAuthWarning,
     ResourceNotFoundWarning,
     ResourceRetrievalWarning,
 )
-from cognite.neat.core._shared import Triple
+from cognite.neat._v0.core._shared import Triple
 
 from ._base import KnowledgeGraphExtractor
 from ._dms import DMSExtractor

cognite/neat/{core → _v0/core}/_instances/extractors/_mock_graph_generator.py

@@ -11,15 +11,15 @@ import numpy
 import pandas as pd
 from rdflib import RDF, Literal, Namespace, URIRef
 
-from cognite.neat.core._data_model._constants import EntityTypes
-from cognite.neat.core._data_model.analysis import DataModelAnalysis
-from cognite.neat.core._data_model.models import ConceptualDataModel, PhysicalDataModel
-from cognite.neat.core._data_model.models.conceptual import ConceptualProperty
-from cognite.neat.core._data_model.models.data_types import DataType
-from cognite.neat.core._data_model.models.entities import ConceptEntity
-from cognite.neat.core._data_model.transformers import SubsetConceptualDataModel
-from cognite.neat.core._shared import Triple
-from cognite.neat.core._utils.rdf_ import remove_namespace_from_uri
+from cognite.neat._v0.core._data_model._constants import EntityTypes
+from cognite.neat._v0.core._data_model.analysis import DataModelAnalysis
+from cognite.neat._v0.core._data_model.models import ConceptualDataModel, PhysicalDataModel
+from cognite.neat._v0.core._data_model.models.conceptual import ConceptualProperty
+from cognite.neat._v0.core._data_model.models.data_types import DataType
+from cognite.neat._v0.core._data_model.models.entities import ConceptEntity
+from cognite.neat._v0.core._data_model.transformers import SubsetConceptualDataModel
+from cognite.neat._v0.core._shared import Triple
+from cognite.neat._v0.core._utils.rdf_ import remove_namespace_from_uri
 
 from ._base import BaseExtractor
 
@@ -45,7 +45,7 @@ class MockGraphGenerator(BaseExtractor):
     ):
         if isinstance(data_model, PhysicalDataModel):
             # fixes potential issues with circular dependencies
-            from cognite.neat.core._data_model.transformers import PhysicalToConceptual
+            from cognite.neat._v0.core._data_model.transformers import PhysicalToConceptual
 
             self.data_model = PhysicalToConceptual().transform(data_model)
         elif isinstance(data_model, ConceptualDataModel):

cognite/neat/{core → _v0/core}/_instances/extractors/_raw.py

@@ -6,9 +6,9 @@ from cognite.client.data_classes import Row, RowList
 from cognite.client.utils.useful_types import SequenceNotStr
 from rdflib import RDF, Namespace, URIRef
 
-from cognite.neat.core._client import NeatClient
-from cognite.neat.core._constants import DEFAULT_RAW_URI
-from cognite.neat.core._shared import Triple
+from cognite.neat._v0.core._client import NeatClient
+from cognite.neat._v0.core._constants import DEFAULT_RAW_URI
+from cognite.neat._v0.core._shared import Triple
 
 from ._base import BaseExtractor
 from ._dict import DEFAULT_EMPTY_VALUES, DictExtractor

cognite/neat/{core → _v0/core}/_instances/extractors/_rdf_file.py

@@ -7,16 +7,16 @@ from rdflib import URIRef
 from rdflib.util import guess_format
 from typing_extensions import Self
 
-from cognite.neat.core._constants import DEFAULT_BASE_URI
-from cognite.neat.core._instances._shared import RDFTypes
-from cognite.neat.core._instances.extractors._base import BaseExtractor
-from cognite.neat.core._issues._base import IssueList
-from cognite.neat.core._issues.errors import (
+from cognite.neat._v0.core._constants import DEFAULT_BASE_URI
+from cognite.neat._v0.core._instances._shared import RDFTypes
+from cognite.neat._v0.core._instances.extractors._base import BaseExtractor
+from cognite.neat._v0.core._issues._base import IssueList
+from cognite.neat._v0.core._issues.errors import (
     FileNotFoundNeatError,
     FileTypeUnexpectedError,
 )
-from cognite.neat.core._issues.errors._general import NeatValueError
-from cognite.neat.core._shared import Triple
+from cognite.neat._v0.core._issues.errors._general import NeatValueError
+from cognite.neat._v0.core._shared import Triple
 
 
 class RdfFileExtractor(BaseExtractor):

cognite/neat/{core → _v0/core}/_instances/loaders/_base.py

@@ -5,11 +5,11 @@ from typing import ClassVar, Generic, TypeVar
 
 from cognite.client.data_classes.capabilities import Capability
 
-from cognite.neat.core._client import NeatClient
-from cognite.neat.core._issues import IssueList, NeatIssue
-from cognite.neat.core._issues.errors import AuthorizationError
-from cognite.neat.core._utils.auxiliary import class_html_doc
-from cognite.neat.core._utils.upload import UploadResult, UploadResultList
+from cognite.neat._v0.core._client import NeatClient
+from cognite.neat._v0.core._issues import IssueList, NeatIssue
+from cognite.neat._v0.core._issues.errors import AuthorizationError
+from cognite.neat._v0.core._utils.auxiliary import class_html_doc
+from cognite.neat._v0.core._utils.upload import UploadResult, UploadResultList
 
 T_Output = TypeVar("T_Output")
 

cognite/neat/{core → _v0/core}/_instances/loaders/_rdf2dms.py

@@ -19,46 +19,46 @@ from cognite.client.exceptions import CogniteAPIError
 from pydantic import BaseModel, ValidationInfo, create_model, field_validator
 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 (
+from cognite.neat._v0.core._client import NeatClient
+from cognite.neat._v0.core._client._api_client import SchemaAPI
+from cognite.neat._v0.core._constants import (
     COGNITE_SPACES,
     DMS_DIRECT_RELATION_LIST_DEFAULT_LIMIT,
     is_readonly_property,
 )
-from cognite.neat.core._data_model.analysis import DataModelAnalysis
-from cognite.neat.core._data_model.analysis._base import ViewQuery, ViewQueryDict
-from cognite.neat.core._data_model.models import PhysicalDataModel
-from cognite.neat.core._data_model.models.conceptual._verified import (
+from cognite.neat._v0.core._data_model.analysis import DataModelAnalysis
+from cognite.neat._v0.core._data_model.analysis._base import ViewQuery, ViewQueryDict
+from cognite.neat._v0.core._data_model.models import PhysicalDataModel
+from cognite.neat._v0.core._data_model.models.conceptual._verified import (
     ConceptualDataModel,
 )
-from cognite.neat.core._data_model.models.data_types import (
+from cognite.neat._v0.core._data_model.models.data_types import (
     _DATA_TYPE_BY_DMS_TYPE,
     Json,
     String,
 )
-from cognite.neat.core._issues import IssueList, NeatError, NeatIssue, catch_issues
-from cognite.neat.core._issues.errors import (
+from cognite.neat._v0.core._issues import IssueList, NeatError, NeatIssue, catch_issues
+from cognite.neat._v0.core._issues.errors import (
     ResourceCreationError,
     ResourceDuplicatedError,
     ResourceNotFoundError,
 )
-from cognite.neat.core._issues.warnings import (
+from cognite.neat._v0.core._issues.warnings import (
     PropertyDirectRelationLimitWarning,
     PropertyMultipleValueWarning,
     PropertyTypeNotSupportedWarning,
     ResourceNeatWarning,
 )
-from cognite.neat.core._shared import InstanceType
-from cognite.neat.core._store import NeatInstanceStore
-from cognite.neat.core._utils.auxiliary import create_sha256_hash
-from cognite.neat.core._utils.collection_ import (
+from cognite.neat._v0.core._shared import InstanceType
+from cognite.neat._v0.core._store import NeatInstanceStore
+from cognite.neat._v0.core._utils.auxiliary import create_sha256_hash
+from cognite.neat._v0.core._utils.collection_ import (
     iterate_progress_bar_if_above_config_threshold,
 )
-from cognite.neat.core._utils.rdf_ import (
+from cognite.neat._v0.core._utils.rdf_ import (
     remove_namespace_from_uri,
 )
-from cognite.neat.core._utils.upload import UploadResult
+from cognite.neat._v0.core._utils.upload import UploadResult
 
 from ._base import _END_OF_CLASS, _START_OF_CLASS, CDFLoader
 

cognite/neat/{core → _v0/core}/_instances/loaders/_rdf_to_instance_space.py

@@ -10,17 +10,17 @@ from cognite.client import data_modeling as dm
 from cognite.client.data_classes.capabilities import Capability, DataModelsAcl
 from rdflib import URIRef
 
-from cognite.neat.core._client import NeatClient
-from cognite.neat.core._client._api.data_modeling_loaders import MultiCogniteAPIError
-from cognite.neat.core._constants import COGNITE_SPACES
-from cognite.neat.core._issues import IssueList, NeatIssue
-from cognite.neat.core._issues.errors import ResourceCreationError, ResourceNotFoundError
-from cognite.neat.core._issues.warnings import NeatValueWarning
-from cognite.neat.core._store import NeatInstanceStore
-from cognite.neat.core._utils.collection_ import iterate_progress_bar_if_above_config_threshold
-from cognite.neat.core._utils.rdf_ import namespace_as_space, split_uri
-from cognite.neat.core._utils.text import NamingStandardization
-from cognite.neat.core._utils.upload import UploadResult
+from cognite.neat._v0.core._client import NeatClient
+from cognite.neat._v0.core._client._api.data_modeling_loaders import MultiCogniteAPIError
+from cognite.neat._v0.core._constants import COGNITE_SPACES
+from cognite.neat._v0.core._issues import IssueList, NeatIssue
+from cognite.neat._v0.core._issues.errors import ResourceCreationError, ResourceNotFoundError
+from cognite.neat._v0.core._issues.warnings import NeatValueWarning
+from cognite.neat._v0.core._store import NeatInstanceStore
+from cognite.neat._v0.core._utils.collection_ import iterate_progress_bar_if_above_config_threshold
+from cognite.neat._v0.core._utils.rdf_ import namespace_as_space, split_uri
+from cognite.neat._v0.core._utils.text import NamingStandardization
+from cognite.neat._v0.core._utils.upload import UploadResult
 
 from ._base import _END_OF_CLASS, _START_OF_CLASS, CDFLoader
 

cognite/neat/{core → _v0/core}/_instances/queries/_select.py

@@ -7,9 +7,9 @@ from rdflib import RDF, XSD, Namespace, URIRef
 from rdflib import Literal as RdfLiteral
 from rdflib.query import ResultRow
 
-from cognite.neat.core._constants import NEAT
-from cognite.neat.core._shared import InstanceType
-from cognite.neat.core._utils.rdf_ import remove_namespace_from_uri
+from cognite.neat._v0.core._constants import NEAT
+from cognite.neat._v0.core._shared import InstanceType
+from cognite.neat._v0.core._utils.rdf_ import remove_namespace_from_uri
 
 from ._base import BaseQuery
 
@@ -450,3 +450,29 @@ class SelectQueries(BaseQuery):
                 yield instance_id, str(space.toPython())
             else:
                 yield instance_id, str(space)
+
+    def get_graph_diff(
+        self, source_graph: URIRef, target_graph: URIRef
+    ) -> Iterable[tuple[URIRef, URIRef, URIRef | RdfLiteral]]:
+        """Return triples that exist in the source graph but not in the target graph.
+
+        This method compares two named graphs within the dataset and identifies all triples
+        that are present in the `source_graph` but are missing from the `target_graph`.
+
+        Args:
+            source_graph: URI of the graph to compare from.
+            target_graph: URI of the graph to compare against.
+
+        Returns:
+            Iterable of triples (subject, predicate, object)
+        """
+        query = f"""
+        SELECT ?s ?p ?o
+        WHERE {{
+        GRAPH <{source_graph}> {{ ?s ?p ?o }}
+        FILTER NOT EXISTS {{
+            GRAPH <{target_graph}> {{ ?s ?p ?o }}
+        }}
+        }}
+        """
+        return cast(Iterable[tuple[URIRef, URIRef, URIRef | RdfLiteral]], self.dataset.query(query))

cognite/neat/{core → _v0/core}/_instances/queries/_update.py

@@ -1,6 +1,6 @@
 from rdflib import Dataset, URIRef
 
-from cognite.neat.core._utils.rdf_ import remove_instance_ids_in_batch
+from cognite.neat._v0.core._utils.rdf_ import remove_instance_ids_in_batch
 
 from ._base import BaseQuery
 from ._select import SelectQueries

cognite/neat/{core → _v0/core}/_instances/transformers/_base.py

@@ -7,12 +7,12 @@ from typing import ClassVar, TypeAlias, cast
 from rdflib import Graph
 from rdflib.query import ResultRow
 
-from cognite.neat.core._issues.warnings import NeatValueWarning
-from cognite.neat.core._shared import Triple
-from cognite.neat.core._utils.collection_ import (
+from cognite.neat._v0.core._issues.warnings import NeatValueWarning
+from cognite.neat._v0.core._shared import Triple
+from cognite.neat._v0.core._utils.collection_ import (
     iterate_progress_bar_if_above_config_threshold,
 )
-from cognite.neat.core._utils.graph_transformations_report import (
+from cognite.neat._v0.core._utils.graph_transformations_report import (
     GraphTransformationResult,
 )
 

cognite/neat/{core → _v0/core}/_instances/transformers/_classic_cdf.py

@@ -8,12 +8,12 @@ from typing import cast
 from rdflib import RDF, Graph, Literal, Namespace, URIRef
 from rdflib.query import ResultRow
 
-from cognite.neat.core._constants import CLASSIC_CDF_NAMESPACE, DEFAULT_NAMESPACE
-from cognite.neat.core._instances import extractors
-from cognite.neat.core._issues.errors import NeatValueError
-from cognite.neat.core._issues.warnings import ResourceNotFoundWarning
-from cognite.neat.core._utils.collection_ import iterate_progress_bar
-from cognite.neat.core._utils.rdf_ import (
+from cognite.neat._v0.core._constants import CLASSIC_CDF_NAMESPACE, DEFAULT_NAMESPACE
+from cognite.neat._v0.core._instances import extractors
+from cognite.neat._v0.core._issues.errors import NeatValueError
+from cognite.neat._v0.core._issues.warnings import ResourceNotFoundWarning
+from cognite.neat._v0.core._utils.collection_ import iterate_progress_bar
+from cognite.neat._v0.core._utils.rdf_ import (
     Triple,
     add_triples_in_batch,
     get_namespace,

cognite/neat/{core → _v0/core}/_instances/transformers/_prune_graph.py

@@ -3,10 +3,10 @@ from typing import Any, cast
 from rdflib import Graph, Namespace, URIRef
 from rdflib.query import ResultRow
 
-from cognite.neat.core._constants import DEFAULT_NAMESPACE
-from cognite.neat.core._shared import Triple
-from cognite.neat.core._utils.rdf_ import as_neat_compliant_uri
-from cognite.neat.core._utils.text import sentence_or_string_to_camel
+from cognite.neat._v0.core._constants import DEFAULT_NAMESPACE
+from cognite.neat._v0.core._shared import Triple
+from cognite.neat._v0.core._utils.rdf_ import as_neat_compliant_uri
+from cognite.neat._v0.core._utils.text import sentence_or_string_to_camel
 
 from ._base import BaseTransformer, BaseTransformerStandardised, RowTransformationOutput
 

cognite/neat/{core → _v0/core}/_instances/transformers/_rdfpath.py

@@ -4,7 +4,7 @@ from urllib.parse import quote
 from rdflib import Namespace, URIRef
 from rdflib.query import ResultRow
 
-from cognite.neat.core._utils.rdf_ import get_namespace, remove_namespace_from_uri
+from cognite.neat._v0.core._utils.rdf_ import get_namespace, remove_namespace_from_uri
 
 from ._base import BaseTransformerStandardised, RowTransformationOutput
 

cognite/neat/{core → _v0/core}/_instances/transformers/_value_type.py

@@ -7,10 +7,10 @@ import rdflib
 from rdflib import RDF, RDFS, Graph, Literal, Namespace, URIRef
 from rdflib.query import ResultRow
 
-from cognite.neat.core._constants import NEAT
-from cognite.neat.core._issues.warnings import PropertyDataTypeConversionWarning
-from cognite.neat.core._utils.auxiliary import string_to_ideal_type
-from cognite.neat.core._utils.rdf_ import Triple, get_namespace, remove_namespace_from_uri, uri_to_cdf_id
+from cognite.neat._v0.core._constants import NEAT
+from cognite.neat._v0.core._issues.warnings import PropertyDataTypeConversionWarning
+from cognite.neat._v0.core._utils.auxiliary import string_to_ideal_type
+from cognite.neat._v0.core._utils.rdf_ import Triple, get_namespace, remove_namespace_from_uri, uri_to_cdf_id
 
 from ._base import BaseTransformerStandardised, RowTransformationOutput
 

cognite/neat/{core → _v0/core}/_issues/_base.py

@@ -16,7 +16,7 @@ from cognite.client.data_classes.data_modeling import (
     ViewId,
 )
 
-from cognite.neat.core._utils.text import (
+from cognite.neat._v0.core._utils.text import (
     humanize_collection,
     to_camel_case,
     to_snake_case,
@@ -119,7 +119,7 @@ class NeatIssue:
 
     @classmethod
     def _dump_value(cls, value: Any) -> list | int | bool | float | str | dict:
-        from cognite.neat.core._data_model.models.entities import ConceptualEntity
+        from cognite.neat._v0.core._data_model.models.entities import ConceptualEntity
 
         if isinstance(value, str | int | bool | float):
             return value
@@ -144,11 +144,11 @@ class NeatIssue:
     @classmethod
     def load(cls, data: dict[str, Any]) -> "NeatIssue":
         """Create an instance of the issue from a dictionary."""
-        from cognite.neat.core._issues.errors import (
+        from cognite.neat._v0.core._issues.errors import (
             _NEAT_ERRORS_BY_NAME,
             NeatValueError,
         )
-        from cognite.neat.core._issues.warnings import _NEAT_WARNINGS_BY_NAME
+        from cognite.neat._v0.core._issues.warnings import _NEAT_WARNINGS_BY_NAME
 
         if "NeatIssue" not in data:
             raise NeatValueError("The data does not contain a NeatIssue key.")
@@ -173,7 +173,7 @@ class NeatIssue:
 
     @classmethod
     def _load_value(cls, type_: Any, value: Any) -> Any:
-        from cognite.neat.core._data_model.models.entities import ConceptualEntity
+        from cognite.neat._v0.core._data_model.models.entities import ConceptualEntity
 
         if isinstance(type_, UnionType) or get_origin(type_) is UnionType:
             args = get_args(type_)

cognite/neat/{core → _v0/core}/_issues/_contextmanagers.py

@@ -9,7 +9,7 @@ from ._base import IssueList, MultiValueError, NeatError
 from ._factory import from_pydantic_errors, from_warning
 
 if TYPE_CHECKING:
-    from cognite.neat.core._data_model.models._import_contexts import ImportContext
+    from cognite.neat._v0.core._data_model.models._import_contexts import ImportContext
 
 
 @contextmanager

cognite/neat/{core → _v0/core}/_issues/_factory.py

@@ -3,17 +3,17 @@ from warnings import WarningMessage
 
 from pydantic_core import ErrorDetails
 
-from cognite.neat.core._issues._base import NeatError, NeatWarning
+from cognite.neat._v0.core._issues._base import NeatError, NeatWarning
 
 from .errors import NeatValueError, SpreadsheetError
 
 if TYPE_CHECKING:
-    from cognite.neat.core._data_model.models._import_contexts import ImportContext, SpreadsheetContext
+    from cognite.neat._v0.core._data_model.models._import_contexts import ImportContext, SpreadsheetContext
 
 
 def from_pydantic_errors(errors: list[ErrorDetails], context: "ImportContext | None" = None) -> list[NeatError]:
     # To avoid circular import, we import SpreadsheetContext here.
-    from cognite.neat.core._data_model.models._import_contexts import SpreadsheetContext
+    from cognite.neat._v0.core._data_model.models._import_contexts import SpreadsheetContext
 
     read_info_by_sheet = context if isinstance(context, SpreadsheetContext) else SpreadsheetContext({})
     return [

cognite/neat/{core → _v0/core}/_issues/errors/__init__.py

@@ -1,4 +1,4 @@
-from cognite.neat.core._issues._base import NeatError, _get_subclasses
+from cognite.neat._v0.core._issues._base import NeatError, _get_subclasses
 
 from ._external import (
     AuthorizationError,

cognite/neat/{core → _v0/core}/_issues/errors/_external.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from cognite.client import data_modeling as dm
 from yaml import YAMLError
 
-from cognite.neat.core._issues import NeatError
+from cognite.neat._v0.core._issues import NeatError
 
 
 @dataclass(unsafe_hash=True)

cognite/neat/{core → _v0/core}/_issues/errors/_general.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Literal
 
-from cognite.neat.core._issues import NeatError
+from cognite.neat._v0.core._issues import NeatError
 
 
 @dataclass(unsafe_hash=True)

cognite/neat/{core → _v0/core}/_issues/errors/_properties.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Generic
 
-from cognite.neat.core._issues._base import ResourceType
+from cognite.neat._v0.core._issues._base import ResourceType
 
 from ._resources import ResourceError, T_Identifier, T_ReferenceIdentifier
 

cognite/neat/{core → _v0/core}/_issues/errors/_resources.py

@@ -1,13 +1,13 @@
 from dataclasses import dataclass
 from typing import Generic
 
-from cognite.neat.core._issues._base import (
+from cognite.neat._v0.core._issues._base import (
     NeatError,
     ResourceType,
     T_Identifier,
     T_ReferenceIdentifier,
 )
-from cognite.neat.core._utils.text import humanize_collection
+from cognite.neat._v0.core._utils.text import humanize_collection
 
 
 @dataclass(unsafe_hash=True)

cognite/neat/{core → _v0/core}/_issues/errors/_wrapper.py

@@ -2,8 +2,8 @@ from abc import ABC
 from dataclasses import dataclass
 from typing import ClassVar, cast
 
-from cognite.neat.core._issues import NeatError
-from cognite.neat.core._utils.spreadsheet import SpreadsheetRead
+from cognite.neat._v0.core._issues import NeatError
+from cognite.neat._v0.core._utils.spreadsheet import SpreadsheetRead
 
 
 @dataclass(unsafe_hash=True)
@@ -20,7 +20,11 @@ class SpreadsheetError(NeatError, ValueError, ABC):
         spreadsheet_name = cast(str, location[0])
         if spreadsheet_name not in ERROR_CLS_BY_SPREADSHEET_NAME:
             # This happens for the metadata sheet, which are individual fields
-            return MetadataValueError(error, field_name=spreadsheet_name)
+            if spreadsheet_name == "Metadata" and len(location) >= 2 and isinstance(location[1], str):
+                field_name = cast(str, location[1])
+            else:
+                field_name = spreadsheet_name
+            return MetadataValueError(error, field_name=field_name)
 
         error_cls = ERROR_CLS_BY_SPREADSHEET_NAME[spreadsheet_name]
         row, column = cast(tuple[int, str], location[2:4])

cognite/neat/{core → _v0/core}/_issues/warnings/__init__.py

@@ -2,7 +2,7 @@
 conflicts with the built-in Python warnings module. However, it is expected to always be used in an absolute
 import, and should thus not cause a naming conflict."""
 
-from cognite.neat.core._issues._base import NeatWarning, _get_subclasses
+from cognite.neat._v0.core._issues._base import NeatWarning, _get_subclasses
 
 from . import user_modeling
 from ._external import (

cognite/neat/{core → _v0/core}/_issues/warnings/_external.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from pathlib import Path
 
-from cognite.neat.core._issues import NeatWarning
+from cognite.neat._v0.core._issues import NeatWarning
 
 
 @dataclass(unsafe_hash=True)

cognite/neat/{core → _v0/core}/_issues/warnings/_general.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from cognite.neat.core._issues import NeatWarning
+from cognite.neat._v0.core._issues import NeatWarning
 
 
 @dataclass(unsafe_hash=True)

cognite/neat/{core → _v0/core}/_issues/warnings/_models.py

@@ -4,8 +4,8 @@ from typing import ClassVar
 
 from cognite.client.data_classes.data_modeling import DataModelId, ViewId
 
-from cognite.neat.core._constants import DMS_VIEW_CONTAINER_SIZE_LIMIT
-from cognite.neat.core._issues import NeatWarning
+from cognite.neat._v0.core._constants import DMS_VIEW_CONTAINER_SIZE_LIMIT
+from cognite.neat._v0.core._issues import NeatWarning
 
 _BASE_URL = "https://cognite-neat.readthedocs-hosted.com/en/latest/data-modeling-principles.html"
 

cognite/neat/{core → _v0/core}/_issues/warnings/_properties.py

@@ -1,8 +1,8 @@
 from dataclasses import dataclass
 from typing import Generic
 
-from cognite.neat.core._constants import DMS_DIRECT_RELATION_LIST_DEFAULT_LIMIT
-from cognite.neat.core._issues._base import ResourceType
+from cognite.neat._v0.core._constants import DMS_DIRECT_RELATION_LIST_DEFAULT_LIMIT
+from cognite.neat._v0.core._issues._base import ResourceType
 
 from ._resources import ResourceNeatWarning, T_Identifier, T_ReferenceIdentifier
 

cognite/neat/{core → _v0/core}/_issues/warnings/_resources.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Generic
 
-from cognite.neat.core._issues._base import (
+from cognite.neat._v0.core._issues._base import (
     NeatWarning,
     ResourceType,
     T_Identifier,

cognite/neat/{core → _v0/core}/_issues/warnings/user_modeling.py

@@ -7,7 +7,7 @@ from dataclasses import dataclass
 
 from cognite.client.data_classes.data_modeling import ContainerId, ViewId
 
-from cognite.neat.core._constants import DMS_CONTAINER_PROPERTY_SIZE_LIMIT
+from cognite.neat._v0.core._constants import DMS_CONTAINER_PROPERTY_SIZE_LIMIT
 
 from ._models import UserModelingWarning