cognite-neat 0.119.9__tar.gz → 0.121.0__tar.gz

{cognite_neat-0.119.9 → cognite_neat-0.121.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 0.119.9
+Version: 0.121.0
 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.119.9 → cognite_neat-0.121.0}/cognite/neat/__init__.py

@@ -1,5 +1,6 @@
-from ._session import NeatSession
-from ._utils.auth import get_cognite_client
+from cognite.neat.core._utils.auth import get_cognite_client
+
 from ._version import __version__
+from .session import NeatSession
 
 __all__ = ["NeatSession", "__version__", "get_cognite_client"]

cognite_neat-0.121.0/cognite/neat/_version.py

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

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_client/_api/data_modeling_loaders.py

@@ -52,13 +52,13 @@ from cognite.client.data_classes.data_modeling.views import (
 from cognite.client.exceptions import CogniteAPIError
 from cognite.client.utils.useful_types import SequenceNotStr
 
-from cognite.neat._client.data_classes.data_modeling import Component
-from cognite.neat._client.data_classes.schema import DMSSchema
-from cognite.neat._issues.warnings import CDFMaxIterationsWarning
-from cognite.neat._shared import T_ID
+from cognite.neat.core._client.data_classes.data_modeling import Component
+from cognite.neat.core._client.data_classes.schema import DMSSchema
+from cognite.neat.core._issues.warnings import CDFMaxIterationsWarning
+from cognite.neat.core._shared import T_ID
 
 if TYPE_CHECKING:
-    from cognite.neat._client._api_client import NeatClient
+    from cognite.neat.core._client._api_client import NeatClient
 
 T_WritableCogniteResourceList = TypeVar("T_WritableCogniteResourceList", bound=WriteableCogniteResourceList)
 

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_client/_api/neat_instances.py

@@ -8,7 +8,7 @@ from cognite.client.exceptions import CogniteAPIError
 from cognite.client.utils.useful_types import SequenceNotStr
 
 if TYPE_CHECKING:
-    from cognite.neat._client._api_client import NeatClient
+    from cognite.neat.core._client._api_client import NeatClient
 
 
 class NeatInstancesAPI:

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_client/_api/schema.py

@@ -5,13 +5,17 @@ from typing import TYPE_CHECKING
 
 from cognite.client import data_modeling as dm
 
-from cognite.neat._client.data_classes.data_modeling import ContainerApplyDict, SpaceApplyDict, ViewApplyDict
-from cognite.neat._client.data_classes.schema import DMSSchema
-from cognite.neat._constants import is_hierarchy_property
-from cognite.neat._issues.errors import NeatValueError
+from cognite.neat.core._client.data_classes.data_modeling import (
+    ContainerApplyDict,
+    SpaceApplyDict,
+    ViewApplyDict,
+)
+from cognite.neat.core._client.data_classes.schema import DMSSchema
+from cognite.neat.core._constants import is_hierarchy_property
+from cognite.neat.core._issues.errors import NeatValueError
 
 if TYPE_CHECKING:
-    from cognite.neat._client._api_client import NeatClient
+    from cognite.neat.core._client._api_client import NeatClient
 
 
 class SchemaAPI:

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_client/_api_client.py

@@ -1,6 +1,6 @@
 from cognite.client import ClientConfig, CogniteClient
 
-from cognite.neat._utils.auth import _CLIENT_NAME
+from cognite.neat.core._utils.auth import _CLIENT_NAME
 
 from ._api.data_modeling_loaders import DataModelLoaderAPI
 from ._api.neat_instances import NeatInstancesAPI

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_client/data_classes/schema.py

@@ -20,21 +20,21 @@ from cognite.client.data_classes.data_modeling.views import (
     ViewPropertyApply,
 )
 
-from cognite.neat._client.data_classes.data_modeling import (
+from cognite.neat.core._client.data_classes.data_modeling import (
     CogniteResourceDict,
     ContainerApplyDict,
     NodeApplyDict,
     SpaceApplyDict,
     ViewApplyDict,
 )
-from cognite.neat._issues.errors import (
+from cognite.neat.core._issues.errors import (
     NeatYamlError,
 )
-from cognite.neat._issues.warnings import (
+from cognite.neat.core._issues.warnings import (
     FileTypeUnexpectedWarning,
     ResourcesDuplicatedWarning,
 )
-from cognite.neat._utils.text import to_camel_case
+from cognite.neat.core._utils.text import to_camel_case
 
 if sys.version_info >= (3, 11):
     from typing import Self

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_client/testing.py

@@ -4,7 +4,7 @@ from typing import Any
 
 from cognite.client.testing import CogniteClientMock
 
-from cognite.neat._client._api_client import NeatClient
+from cognite.neat.core._client._api_client import NeatClient
 
 from ._api.data_modeling_loaders import DataModelLoaderAPI
 from ._api.neat_instances import NeatInstancesAPI

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_constants.py

@@ -1,7 +1,7 @@
 import re
 from collections.abc import Mapping
 from pathlib import Path
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Literal
 
 from cognite.client import data_modeling as dm
 from cognite.client.data_classes.data_modeling.ids import DataModelId
@@ -9,9 +9,10 @@ from rdflib import DC, DCTERMS, FOAF, OWL, RDF, RDFS, SH, SKOS, XSD, Namespace,
 from rdflib.namespace import DefinedNamespace
 
 from cognite import neat
+from cognite.neat.core._issues.errors._general import NeatValueError
 
 if TYPE_CHECKING:
-    from cognite.neat._rules.models.dms import DMSProperty
+    from cognite.neat.core._rules.models.dms import DMSProperty
 
 
 def _is_in_notebook() -> bool:
@@ -71,16 +72,16 @@ COGNITE_CONCEPTS = (
     "CogniteActivity",
     "CogniteTimeSeries",
     "CogniteFile",
+    "CogniteDescribable",
+    "CogniteSourceable",
+    "CogniteSchedulable",
+    "CogniteVisualizable",
+    "CogniteSourceSystem",
     "CogniteUnit",
     "CogniteAssetClass",
     "CogniteAssetType",
     "CogniteEquipmentType",
     "CogniteFileCategory",
-    "CogniteDescribable",
-    "CogniteSourceable",
-    "CogniteSourceSystem",
-    "CogniteSchedulable",
-    "CogniteVisualizable",
     "CogniteAnnotation",
     "CogniteDiagramAnnotation",
     "CogniteCubeMap",
@@ -192,14 +193,32 @@ _ASSET_PATH_PROPERTY = {
     "view_property": "path",
 }
 
+BASE_MODEL = Literal["CogniteCore"]
+
 
 def get_asset_read_only_properties_with_connection() -> "list[DMSProperty]":
     """Gets the asset read-only properties with connection, i.e. Root and Path."""
-    from cognite.neat._rules.models.dms import DMSProperty
+    from cognite.neat.core._rules.models.dms import DMSProperty
 
     return [DMSProperty.model_validate(item) for item in (_ASSET_ROOT_PROPERTY, _ASSET_PATH_PROPERTY)]
 
 
+def get_base_concepts(
+    base_model: BASE_MODEL = "CogniteCore",
+    total_concepts: int | None = None,
+) -> list[str]:
+    """Gets the base concepts for a given base model represented in the short form.
+    Args:
+        base_model: The base model to get the concepts for.
+        total_concepts: The number of concepts to get. If None, all concepts are returned.
+    """
+
+    if base_model == "CogniteCore":
+        return [f"cdf_cdm:{concept}(version=v1)" for concept in COGNITE_CONCEPTS][:total_concepts]
+    else:
+        raise NeatValueError(f"Base model <{base_model}> is not supported")
+
+
 READONLY_PROPERTIES_BY_CONTAINER: Mapping[dm.ContainerId, frozenset[str]] = {
     dm.ContainerId("cdf_cdm", "CogniteAsset"): frozenset(
         {"assetHierarchy_root", "assetHierarchy_path", "assetHierarchy_path_last_updated_time"}

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/_tracking/base.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from collections.abc import Sequence
 
-from cognite.neat._issues import NeatIssue
+from cognite.neat.core._issues import NeatIssue
 
 
 class Tracker(ABC):

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/_tracking/log.py

@@ -1,6 +1,6 @@
 from logging import getLogger
 
-from cognite.neat._issues import NeatError, NeatIssue, NeatWarning
+from cognite.neat.core._issues import NeatError, NeatIssue, NeatWarning
 
 from .base import Tracker
 

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/extractors/__init__.py

@@ -1,4 +1,4 @@
-from cognite.neat._session.engine._interface import Extractor as EngineExtractor
+from cognite.neat.session.engine._interface import Extractor as EngineExtractor
 
 from ._base import BaseExtractor, KnowledgeGraphExtractor
 from ._classic_cdf._assets import AssetsExtractor

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/extractors/_base.py

@@ -4,13 +4,13 @@ from typing import TYPE_CHECKING
 
 from rdflib import URIRef
 
-from cognite.neat._constants import DEFAULT_NAMESPACE
-from cognite.neat._rules.models import InformationRules
-from cognite.neat._shared import Triple
-from cognite.neat._utils.auxiliary import class_html_doc
+from cognite.neat.core._constants import DEFAULT_NAMESPACE
+from cognite.neat.core._rules.models import InformationRules
+from cognite.neat.core._shared import Triple
+from cognite.neat.core._utils.auxiliary import class_html_doc
 
 if TYPE_CHECKING:
-    from cognite.neat._store._provenance import Agent as ProvenanceAgent
+    from cognite.neat.core._store._provenance import Agent as ProvenanceAgent
 
 
 class BaseExtractor:
@@ -53,6 +53,6 @@ class KnowledgeGraphExtractor(BaseExtractor):
     @property
     def agent(self) -> "ProvenanceAgent":
         """Provenance agent for the importer."""
-        from cognite.neat._store._provenance import Agent as ProvenanceAgent
+        from cognite.neat.core._store._provenance import Agent as ProvenanceAgent
 
         return ProvenanceAgent(id_=DEFAULT_NAMESPACE[f"agent/{type(self).__name__}"])

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/extractors/_classic_cdf/_base.py

@@ -17,13 +17,15 @@ from pydantic import AnyHttpUrl, ValidationError
 from rdflib import RDF, XSD, Literal, Namespace, URIRef
 from typing_extensions import Self
 
-from cognite.neat._constants import DEFAULT_NAMESPACE
-from cognite.neat._graph.extractors._base import BaseExtractor
-from cognite.neat._issues.errors import NeatValueError
-from cognite.neat._issues.warnings import CDFAuthWarning, NeatValueWarning
-from cognite.neat._shared import Triple
-from cognite.neat._utils.auxiliary import string_to_ideal_type
-from cognite.neat._utils.collection_ import iterate_progress_bar_if_above_config_threshold
+from cognite.neat.core._constants import DEFAULT_NAMESPACE
+from cognite.neat.core._graph.extractors._base import BaseExtractor
+from cognite.neat.core._issues.errors import NeatValueError
+from cognite.neat.core._issues.warnings import CDFAuthWarning, NeatValueWarning
+from cognite.neat.core._shared import Triple
+from cognite.neat.core._utils.auxiliary import string_to_ideal_type
+from cognite.neat.core._utils.collection_ import (
+    iterate_progress_bar_if_above_config_threshold,
+)
 
 T_CogniteResource = TypeVar("T_CogniteResource", bound=WriteableCogniteResource)
 
@@ -76,6 +78,10 @@ class ClassicCDFBaseExtractor(BaseExtractor, ABC, Generic[T_CogniteResource]):
         as_write (bool, optional): Whether to use the write/request format of the items. Defaults to False.
         prefix (str, optional): A prefix to add to the rdf type. Defaults to None.
         identifier (Literal["id", "externalId"], optional): The identifier to use. Defaults to "id".
+        skip_connections (bool, optional): Whether to skip connections. Defaults to False. This is used
+            when you extract other resources types than Assets. For example, if you extract TimeSeries and Files,
+            we skip the connections to Assets. This is to clearly separate contextualized and non-contextualized
+            extractions.
     """
 
     _default_rdf_type: str
@@ -94,6 +100,7 @@ class ClassicCDFBaseExtractor(BaseExtractor, ABC, Generic[T_CogniteResource]):
         as_write: bool = False,
         prefix: str | None = None,
         identifier: typing.Literal["id", "externalId"] = "id",
+        skip_connections: bool = False,
     ):
         self.namespace = namespace or DEFAULT_NAMESPACE
         self.items = items
@@ -105,6 +112,7 @@ class ClassicCDFBaseExtractor(BaseExtractor, ABC, Generic[T_CogniteResource]):
         self.as_write = as_write
         self.prefix = prefix
         self.identifier = identifier
+        self.skip_connections = skip_connections
         # If identifier=externalId, we need to keep track of the external ids
         # and use them in linking of Files, Sequences, TimeSeries, and Events.
         self.asset_external_ids_by_id: dict[int, str] = {}
@@ -270,6 +278,12 @@ class ClassicCDFBaseExtractor(BaseExtractor, ABC, Generic[T_CogniteResource]):
                 # Skip it
                 return None
         elif key in {"assetId", "asset_id", "assetIds", "asset_ids", "rootId", "root_id"}:
+            if self.skip_connections:
+                warnings.warn(
+                    NeatValueWarning(f"Skipping connection to asset {raw} in {self._default_rdf_type}"), stacklevel=2
+                )
+                return None
+
             if self.identifier == "id":
                 return self.namespace[f"{InstanceIdPrefix.asset}{raw}"]
             else:
@@ -322,6 +336,7 @@ class ClassicCDFBaseExtractor(BaseExtractor, ABC, Generic[T_CogniteResource]):
         as_write: bool = False,
         prefix: str | None = None,
         identifier: typing.Literal["id", "externalId"] = "id",
+        skip_connections: bool = False,
     ) -> Self:
         total, items = cls._handle_no_access(lambda: cls._from_dataset(client, data_set_external_id))
         return cls(
@@ -335,6 +350,7 @@ class ClassicCDFBaseExtractor(BaseExtractor, ABC, Generic[T_CogniteResource]):
             as_write,
             prefix,
             identifier,
+            skip_connections,
         )
 
     @classmethod

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/extractors/_classic_cdf/_classic.py

@@ -9,17 +9,21 @@ from cognite.client import CogniteClient
 from cognite.client.exceptions import CogniteAPIError
 from rdflib import Namespace, URIRef
 
-from cognite.neat._constants import CLASSIC_CDF_NAMESPACE, DEFAULT_NAMESPACE, get_default_prefixes_and_namespaces
-from cognite.neat._graph.extractors._base import KnowledgeGraphExtractor
-from cognite.neat._issues.errors import NeatValueError, ResourceNotFoundError
-from cognite.neat._issues.warnings import CDFAuthWarning, NeatValueWarning
-from cognite.neat._rules._shared import ReadRules
-from cognite.neat._rules.catalog import classic_model
-from cognite.neat._rules.models import InformationInputRules, InformationRules
-from cognite.neat._shared import Triple
-from cognite.neat._utils.collection_ import chunker, iterate_progress_bar
-from cognite.neat._utils.rdf_ import remove_namespace_from_uri
-from cognite.neat._utils.text import to_snake_case
+from cognite.neat.core._constants import (
+    CLASSIC_CDF_NAMESPACE,
+    DEFAULT_NAMESPACE,
+    get_default_prefixes_and_namespaces,
+)
+from cognite.neat.core._graph.extractors._base import KnowledgeGraphExtractor
+from cognite.neat.core._issues.errors import NeatValueError, ResourceNotFoundError
+from cognite.neat.core._issues.warnings import CDFAuthWarning, NeatValueWarning
+from cognite.neat.core._rules._shared import ReadRules
+from cognite.neat.core._rules.catalog import classic_model
+from cognite.neat.core._rules.models import InformationInputRules, InformationRules
+from cognite.neat.core._shared import Triple
+from cognite.neat.core._utils.collection_ import chunker, iterate_progress_bar
+from cognite.neat.core._utils.rdf_ import remove_namespace_from_uri
+from cognite.neat.core._utils.text import to_snake_case
 
 from ._assets import AssetsExtractor
 from ._base import ClassicCDFBaseExtractor, InstanceIdPrefix
@@ -203,7 +207,7 @@ class ClassicGraphExtractor(KnowledgeGraphExtractor):
 
     def get_information_rules(self) -> InformationRules:
         # To avoid circular imports
-        from cognite.neat._rules.importers import ExcelImporter
+        from cognite.neat.core._rules.importers import ExcelImporter
 
         unverified = cast(ReadRules[InformationInputRules], ExcelImporter(classic_model).to_rules())
         if unverified.rules is None:

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/extractors/_classic_cdf/_files.py

@@ -20,7 +20,7 @@ class FilesExtractor(ClassicCDFBaseExtractor[FileMetadata]):
         data_set_external_id: str,
     ) -> tuple[int | None, Iterable[FileMetadata]]:
         items = client.files(data_set_external_ids=data_set_external_id)
-        return None, items
+        return None, cls._filter_out_instance_id(items)
 
     @classmethod
     def _from_hierarchy(
@@ -30,9 +30,16 @@ class FilesExtractor(ClassicCDFBaseExtractor[FileMetadata]):
             filter=FileMetadataFilter(asset_subtree_ids=[{"externalId": root_asset_external_id}])
         )[0].count
         items = client.files(asset_subtree_external_ids=root_asset_external_id)
-        return total, items
+        return total, cls._filter_out_instance_id(items)
 
     @classmethod
     def _from_file(cls, file_path: str | Path) -> tuple[int | None, Iterable[FileMetadata]]:
         file_metadata = FileMetadataList.load(Path(file_path).read_text())
-        return len(file_metadata), file_metadata
+        return len(file_metadata), cls._filter_out_instance_id(file_metadata)
+
+    @classmethod
+    def _filter_out_instance_id(cls, items: Iterable[FileMetadata]) -> Iterable[FileMetadata]:
+        """Filter out TimeSeries with InstanceId."""
+        # If the InstanceId is not None, it means that the TimeSeries is already connected to CogniteTimeSeries in DMS.
+        # We do not want to download it again.
+        return (item for item in items if item.instance_id is None)

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/extractors/_classic_cdf/_relationships.py

@@ -9,9 +9,9 @@ from cognite.client import CogniteClient
 from cognite.client.data_classes import Relationship, RelationshipList
 from rdflib import Namespace, URIRef
 
-from cognite.neat._issues.warnings import NeatValueWarning
-from cognite.neat._shared import Triple
-from cognite.neat._utils.auxiliary import create_sha256_hash
+from cognite.neat.core._issues.warnings import NeatValueWarning
+from cognite.neat.core._shared import Triple
+from cognite.neat.core._utils.auxiliary import create_sha256_hash
 
 from ._base import DEFAULT_SKIP_METADATA_VALUES, ClassicCDFBaseExtractor, InstanceIdPrefix, T_CogniteResource
 
@@ -34,6 +34,7 @@ class RelationshipsExtractor(ClassicCDFBaseExtractor[Relationship]):
         as_write: bool = False,
         prefix: str | None = None,
         identifier: typing.Literal["id", "externalId"] = "id",
+        skip_connections: bool = False,
     ):
         # This is used by the ClassicExtractor to log the target nodes, such
         # that it can extract them.
@@ -53,6 +54,7 @@ class RelationshipsExtractor(ClassicCDFBaseExtractor[Relationship]):
             as_write=as_write,
             prefix=prefix,
             identifier=identifier,
+            skip_connections=skip_connections,
         )
         self._uri_by_external_id_by_type: dict[InstanceIdPrefix, dict[str, URIRef]] = defaultdict(dict)
         self._target_triples: list[tuple[URIRef, URIRef, str, str]] = []

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/extractors/_classic_cdf/_sequences.py

@@ -10,8 +10,11 @@ from cognite.client.data_classes import Sequence, SequenceFilter
 from rdflib import RDF, XSD, Literal, Namespace, URIRef
 from typing_extensions import Self
 
-from cognite.neat._client.data_classes.neat_sequence import NeatSequence, NeatSequenceList
-from cognite.neat._shared import Triple
+from cognite.neat.core._client.data_classes.neat_sequence import (
+    NeatSequence,
+    NeatSequenceList,
+)
+from cognite.neat.core._shared import Triple
 
 from ._base import DEFAULT_SKIP_METADATA_VALUES, ClassicCDFBaseExtractor, InstanceIdPrefix
 
@@ -54,6 +57,7 @@ class SequencesExtractor(ClassicCDFBaseExtractor[NeatSequence]):
         prefix: str | None = None,
         identifier: typing.Literal["id", "externalId"] = "id",
         unpack_columns: bool = False,
+        skip_connections: bool = False,
     ):
         super().__init__(
             items,
@@ -66,6 +70,7 @@ class SequencesExtractor(ClassicCDFBaseExtractor[NeatSequence]):
             as_write,
             prefix,
             identifier,
+            skip_connections,
         )
         self.unpack_columns = unpack_columns
 

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/extractors/_classic_cdf/_timeseries.py

@@ -23,7 +23,7 @@ class TimeSeriesExtractor(ClassicCDFBaseExtractor[TimeSeries]):
             filter=TimeSeriesFilter(data_set_ids=[{"externalId": data_set_external_id}])
         )
         items = client.time_series(data_set_external_ids=data_set_external_id)
-        return total, items
+        return total, cls._filter_out_instance_id(items)
 
     @classmethod
     def _from_hierarchy(
@@ -33,9 +33,16 @@ class TimeSeriesExtractor(ClassicCDFBaseExtractor[TimeSeries]):
             filter=TimeSeriesFilter(asset_subtree_ids=[{"externalId": root_asset_external_id}])
         )
         items = client.time_series(asset_subtree_external_ids=root_asset_external_id)
-        return total, items
+        return total, cls._filter_out_instance_id(items)
 
     @classmethod
     def _from_file(cls, file_path: str | Path) -> tuple[int | None, Iterable[TimeSeries]]:
         timeseries = TimeSeriesList.load(Path(file_path).read_text())
-        return len(timeseries), timeseries
+        return len(timeseries), cls._filter_out_instance_id(timeseries)
+
+    @classmethod
+    def _filter_out_instance_id(cls, items: Iterable[TimeSeries]) -> Iterable[TimeSeries]:
+        """Filter out TimeSeries with InstanceId."""
+        # If the InstanceId is not None, it means that the TimeSeries is already connected to CogniteTimeSeries in DMS.
+        # We do not want to download it again.
+        return (item for item in items if item.instance_id is None)

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/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._shared import Triple
-from cognite.neat._utils.auxiliary import string_to_ideal_type
+from cognite.neat.core._shared import Triple
+from cognite.neat.core._utils.auxiliary import string_to_ideal_type
 
 from ._base import BaseExtractor
 

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/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._client import NeatClient
-from cognite.neat._config import GLOBAL_CONFIG
-from cognite.neat._constants import DEFAULT_SPACE_URI, is_readonly_property
-from cognite.neat._issues.errors import ResourceRetrievalError
-from cognite.neat._shared import Triple
-from cognite.neat._utils.collection_ import iterate_progress_bar
+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 ._base import BaseExtractor
 from ._dict import DEFAULT_EMPTY_VALUES, DMSPropertyExtractor

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/extractors/_dms_graph.py

@@ -5,17 +5,21 @@ from cognite.client.exceptions import CogniteAPIError
 from cognite.client.utils.useful_types import SequenceNotStr
 from rdflib import Namespace, URIRef
 
-from cognite.neat._client import NeatClient
-from cognite.neat._constants import COGNITE_SPACES, DEFAULT_NAMESPACE
-from cognite.neat._issues import IssueList, NeatIssue, catch_warnings
-from cognite.neat._issues.warnings import CDFAuthWarning, ResourceNotFoundWarning, ResourceRetrievalWarning
-from cognite.neat._rules.importers import DMSImporter
-from cognite.neat._rules.models import DMSRules, InformationRules
-from cognite.neat._rules.models.data_types import Json
-from cognite.neat._rules.models.entities import UnknownEntity
-from cognite.neat._rules.models.information import InformationProperty
-from cognite.neat._rules.transformers import DMSToInformation, VerifyDMSRules
-from cognite.neat._shared import Triple
+from cognite.neat.core._client import NeatClient
+from cognite.neat.core._constants import COGNITE_SPACES, DEFAULT_NAMESPACE
+from cognite.neat.core._issues import IssueList, NeatIssue, catch_warnings
+from cognite.neat.core._issues.warnings import (
+    CDFAuthWarning,
+    ResourceNotFoundWarning,
+    ResourceRetrievalWarning,
+)
+from cognite.neat.core._rules.importers import DMSImporter
+from cognite.neat.core._rules.models import DMSRules, InformationRules
+from cognite.neat.core._rules.models.data_types import Json
+from cognite.neat.core._rules.models.entities import UnknownEntity
+from cognite.neat.core._rules.models.information import InformationProperty
+from cognite.neat.core._rules.transformers import DMSToInformation, VerifyDMSRules
+from cognite.neat.core._shared import Triple
 
 from ._base import KnowledgeGraphExtractor
 from ._dms import DMSExtractor

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/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._rules._constants import EntityTypes
-from cognite.neat._rules.analysis import RulesAnalysis
-from cognite.neat._rules.models import DMSRules, InformationRules
-from cognite.neat._rules.models.data_types import DataType
-from cognite.neat._rules.models.entities import ClassEntity
-from cognite.neat._rules.models.information import InformationProperty
-from cognite.neat._rules.transformers import SubsetInformationRules
-from cognite.neat._shared import Triple
-from cognite.neat._utils.rdf_ import remove_namespace_from_uri
+from cognite.neat.core._rules._constants import EntityTypes
+from cognite.neat.core._rules.analysis import RulesAnalysis
+from cognite.neat.core._rules.models import DMSRules, InformationRules
+from cognite.neat.core._rules.models.data_types import DataType
+from cognite.neat.core._rules.models.entities import ClassEntity
+from cognite.neat.core._rules.models.information import InformationProperty
+from cognite.neat.core._rules.transformers import SubsetInformationRules
+from cognite.neat.core._shared import Triple
+from cognite.neat.core._utils.rdf_ import remove_namespace_from_uri
 
 from ._base import BaseExtractor
 
@@ -45,7 +45,7 @@ class MockGraphGenerator(BaseExtractor):
     ):
         if isinstance(rules, DMSRules):
             # fixes potential issues with circular dependencies
-            from cognite.neat._rules.transformers import DMSToInformation
+            from cognite.neat.core._rules.transformers import DMSToInformation
 
             self.rules = DMSToInformation().transform(rules)
         elif isinstance(rules, InformationRules):

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/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._client import NeatClient
-from cognite.neat._constants import DEFAULT_RAW_URI
-from cognite.neat._shared import Triple
+from cognite.neat.core._client import NeatClient
+from cognite.neat.core._constants import DEFAULT_RAW_URI
+from cognite.neat.core._shared import Triple
 
 from ._base import BaseExtractor
 from ._dict import DEFAULT_EMPTY_VALUES, DictExtractor

{cognite_neat-0.119.9/cognite/neat → cognite_neat-0.121.0/cognite/neat/core}/_graph/extractors/_rdf_file.py

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