cognite-neat 0.84.1__py3-none-any.whl → 0.85.0__py3-none-any.whl

cognite/neat/__init__.py

@@ -1,3 +1,4 @@
 from ._version import __version__
+from .utils.auth import get_cognite_client
 
-__all__ = ["__version__"]
+__all__ = ["__version__", "get_cognite_client"]

cognite/neat/_shared.py

@@ -17,8 +17,24 @@ class NeatObject:
         """Return a dictionary representation of the object."""
         raise NotImplementedError()
 
+    def _repr_html_(self) -> str:
+        return pd.Series(self.dump(aggregate=True)).to_frame(name="value")._repr_html_()
+
+
+@dataclass(frozen=True)
+class FrozenNeatObject:
+    """A frozen neat object can be dumped to a dictionary."""
+
+    @abstractmethod
+    def dump(self, aggregate: bool = True) -> dict[str, Any]:
+        """Return a dictionary representation of the object."""
+        raise NotImplementedError()
+
+    def _repr_html_(self) -> str:
+        return pd.Series(self.dump(aggregate=True)).to_frame(name="value")._repr_html_()
+
 
-T_NeatObject = TypeVar("T_NeatObject", bound=NeatObject)
+T_NeatObject = TypeVar("T_NeatObject", bound=NeatObject | FrozenNeatObject)
 
 
 class NeatList(list, Sequence[T_NeatObject]):

cognite/neat/_version.py

@@ -1 +1 @@
-__version__ = "0.84.1"
+__version__ = "0.85.0"

cognite/neat/graph/extractors/__init__.py

@@ -1,3 +1,4 @@
+from ._base import BaseExtractor
 from ._classic_cdf._assets import AssetsExtractor
 from ._classic_cdf._events import EventsExtractor
 from ._classic_cdf._files import FilesExtractor
@@ -10,6 +11,7 @@ from ._mock_graph_generator import MockGraphGenerator
 from ._rdf_file import RdfFileExtractor
 
 __all__ = [
+    "BaseExtractor",
     "AssetsExtractor",
     "MockGraphGenerator",
     "RelationshipsExtractor",
@@ -35,3 +37,23 @@ TripleExtractors = (
     | RdfFileExtractor
     | DexpiExtractor
 )
+
+
+def _repr_html_() -> str:
+    import pandas as pd
+
+    table = pd.DataFrame(  # type: ignore[operator]
+        [
+            {
+                "Extractor": name,
+                "Description": globals()[name].__doc__.strip().split("\n")[0] if globals()[name].__doc__ else "Missing",
+            }
+            for name in __all__
+            if name != "BaseExtractor"
+        ]
+    )._repr_html_()
+
+    return (
+        "<strong>Extractor</strong> An extractor is used to read data from "
+        f"a source into Neat's internal triple storage. <br />{table}"
+    )

cognite/neat/graph/extractors/_base.py

@@ -2,6 +2,7 @@ from abc import abstractmethod
 from collections.abc import Iterable
 
 from cognite.neat.graph.models import Triple
+from cognite.neat.utils.auxiliary import class_html_doc
 
 
 class BaseExtractor:
@@ -12,3 +13,7 @@ class BaseExtractor:
     @abstractmethod
     def extract(self) -> Iterable[Triple]:
         raise NotImplementedError()
+
+    @classmethod
+    def _repr_html_(cls) -> str:
+        return class_html_doc(cls)

cognite/neat/graph/extractors/_classic_cdf/_assets.py

@@ -14,6 +14,13 @@ from cognite.neat.utils.utils import create_sha256_hash, string_to_ideal_type
 
 
 class AssetsExtractor(BaseExtractor):
+    """Extract data from Cognite Data Fusions Assets into Neat.
+
+    Args:
+        assets (Iterable[Asset]): An iterable of assets.
+        namespace (Namespace, optional): The namespace to use. Defaults to DEFAULT_NAMESPACE.
+    """
+
     def __init__(
         self,
         assets: Iterable[Asset],

cognite/neat/graph/extractors/_classic_cdf/_events.py

@@ -15,6 +15,13 @@ from cognite.neat.utils.utils import string_to_ideal_type
 
 
 class EventsExtractor(BaseExtractor):
+    """Extract data from Cognite Data Fusions Events into Neat.
+
+    Args:
+        events (Iterable[Event]): An iterable of events.
+        namespace (Namespace, optional): The namespace to use. Defaults to DEFAULT_NAMESPACE.
+    """
+
     def __init__(
         self,
         events: Iterable[Event],

cognite/neat/graph/extractors/_classic_cdf/_labels.py

@@ -14,6 +14,13 @@ from cognite.neat.utils.utils import create_sha256_hash
 
 
 class LabelsExtractor(BaseExtractor):
+    """Extract data from Cognite Data Fusions Labels into Neat.
+
+    Args:
+        labels (Iterable[LabelDefinition]): An iterable of labels.
+        namespace (Namespace, optional): The namespace to use. Defaults to DEFAULT_NAMESPACE.
+    """
+
     def __init__(
         self,
         labels: Iterable[LabelDefinition],

cognite/neat/graph/extractors/_classic_cdf/_relationships.py

@@ -15,6 +15,13 @@ from cognite.neat.utils.utils import create_sha256_hash
 
 
 class RelationshipsExtractor(BaseExtractor):
+    """Extract data from Cognite Data Fusions Relationships into Neat.
+
+    Args:
+        relationships (Iterable[Asset]): An iterable of relationships.
+        namespace (Namespace, optional): The namespace to use. Defaults to DEFAULT_NAMESPACE.
+    """
+
     def __init__(
         self,
         relationships: Iterable[Relationship],

cognite/neat/graph/extractors/_classic_cdf/_sequences.py

@@ -15,6 +15,13 @@ from cognite.neat.utils.utils import string_to_ideal_type
 
 
 class SequencesExtractor(BaseExtractor):
+    """Extract data from Cognite Data Fusions Sequences into Neat.
+
+    Args:
+        sequence (Iterable[Sequence]): An iterable of sequences.
+        namespace (Namespace, optional): The namespace to use. Defaults to DEFAULT_NAMESPACE.
+    """
+
     def __init__(
         self,
         sequence: Iterable[Sequence],

cognite/neat/graph/extractors/_classic_cdf/_timeseries.py

@@ -15,6 +15,13 @@ from cognite.neat.utils.utils import string_to_ideal_type
 
 
 class TimeSeriesExtractor(BaseExtractor):
+    """Extract data from Cognite Data Fusions TimeSeries into Neat.
+
+    Args:
+        timeseries (Iterable[TimeSeries]): An iterable of timeseries.
+        namespace (Namespace, optional): The namespace to use. Defaults to DEFAULT_NAMESPACE.
+    """
+
     def __init__(
         self,
         timeseries: Iterable[TimeSeries],

cognite/neat/graph/extractors/_dexpi.py

@@ -10,7 +10,7 @@ from cognite.neat.constants import DEFAULT_NAMESPACE
 from cognite.neat.graph.extractors._base import BaseExtractor
 from cognite.neat.graph.models import Triple
 from cognite.neat.utils.utils import as_neat_compliant_uri
-from cognite.neat.utils.xml import get_children, iterate_tree
+from cognite.neat.utils.xml_ import get_children, iterate_tree
 
 DEXPI = Namespace("http://sandbox.dexpi.org/rdl/")
 QUDT = Namespace("https://qudt.org/vocab/unit/")

cognite/neat/graph/extractors/_rdf_file.py

@@ -7,6 +7,14 @@ from cognite.neat.graph.extractors._base import BaseExtractor
 
 
 class RdfFileExtractor(BaseExtractor):
+    """Extract data from RDF files into Neat.
+
+    Args:
+        filepath (Path): The path to the RDF file.
+        mime_type (MIMETypes, optional): The MIME type of the RDF file. Defaults to "application/rdf+xml".
+        base_uri (URIRef, optional): The base URI to use. Defaults to None.
+    """
+
     def __init__(
         self,
         filepath: Path,

cognite/neat/graph/loaders/__init__.py

@@ -2,3 +2,22 @@ from ._base import BaseLoader, CDFLoader
 from ._rdf2dms import DMSLoader
 
 __all__ = ["BaseLoader", "CDFLoader", "DMSLoader"]
+
+
+def _repr_html_() -> str:
+    import pandas as pd
+
+    table = pd.DataFrame(  # type: ignore[operator]
+        [
+            {
+                "Loader": name,
+                "Description": globals()[name].__doc__.strip().split("\n")[0] if globals()[name].__doc__ else "Missing",
+            }
+            for name in __all__
+            if name not in ("BaseLoader", "CDFLoader")
+        ]
+    )._repr_html_()
+
+    return (
+        "<strong>Loader</strong> A loader writes data from Neat's triple storage into a target system" f"<br />{table}"
+    )

cognite/neat/graph/loaders/_base.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
-from collections.abc import Iterable
+from collections.abc import Hashable, Iterable
 from pathlib import Path
-from typing import ClassVar, Generic, Literal, TypeVar, overload
+from typing import ClassVar, Generic, TypeVar
 
 from cognite.client import CogniteClient
 from cognite.client.data_classes.capabilities import Capability
@@ -9,7 +9,8 @@ from cognite.client.data_classes.capabilities import Capability
 from cognite.neat.graph import NeatGraphStore
 from cognite.neat.graph.issues.loader import FailedAuthorizationError
 from cognite.neat.issues import NeatIssue, NeatIssueList
-from cognite.neat.utils.upload import UploadDiffsID, UploadResultIDs
+from cognite.neat.utils.auxiliary import class_html_doc
+from cognite.neat.utils.upload import UploadResult, UploadResultList
 
 T_Output = TypeVar("T_Output")
 
@@ -34,49 +35,25 @@ class BaseLoader(ABC, Generic[T_Output]):
         """Load the graph with data."""
         pass
 
+    @classmethod
+    def _repr_html_(cls) -> str:
+        return class_html_doc(cls)
+
 
 class CDFLoader(BaseLoader[T_Output]):
     _UPLOAD_BATCH_SIZE: ClassVar[int] = 1000
 
-    @overload
-    def load_into_cdf_iterable(
-        self, client: CogniteClient, return_diffs: Literal[False] = False, dry_run: bool = False
-    ) -> Iterable[UploadResultIDs]: ...
-
-    @overload
-    def load_into_cdf_iterable(
-        self, client: CogniteClient, return_diffs: Literal[True], dry_run: bool = False
-    ) -> Iterable[UploadDiffsID]: ...
-
-    def load_into_cdf_iterable(
-        self, client: CogniteClient, return_diffs: bool = False, dry_run: bool = False
-    ) -> Iterable[UploadResultIDs] | Iterable[UploadDiffsID]:
-        yield from self._load_into_cdf_iterable(client, return_diffs, dry_run)
-
-    @overload
-    def load_into_cdf(
-        self, client: CogniteClient, return_diffs: Literal[False] = False, dry_run: bool = False
-    ) -> list[UploadResultIDs]: ...
-
-    @overload
-    def load_into_cdf(
-        self, client: CogniteClient, return_diffs: Literal[True], dry_run: bool = False
-    ) -> list[UploadDiffsID]: ...
-
-    def load_into_cdf(
-        self, client: CogniteClient, return_diffs: bool = False, dry_run: bool = False
-    ) -> list[UploadResultIDs] | list[UploadDiffsID]:
-        return list(self._load_into_cdf_iterable(client, return_diffs, dry_run))  # type: ignore[return-value]
-
-    def _load_into_cdf_iterable(
-        self, client: CogniteClient, return_diffs: bool = False, dry_run: bool = False
-    ) -> Iterable[UploadResultIDs] | Iterable[UploadDiffsID]:
+    def load_into_cdf(self, client: CogniteClient, dry_run: bool = False) -> UploadResultList:
+        return UploadResultList(self.load_into_cdf_iterable(client, dry_run))
+
+    def load_into_cdf_iterable(self, client: CogniteClient, dry_run: bool = False) -> Iterable[UploadResult]:
         missing_capabilities = client.iam.verify_capabilities(self._get_required_capabilities())
-        result_cls = UploadDiffsID if return_diffs else UploadResultIDs
         if missing_capabilities:
-            result = result_cls(name=type(self).__name__)
-            result.issues.append(FailedAuthorizationError(action="Upload to CDF", reason=str(missing_capabilities)))
-            yield result
+            upload_result = UploadResult[Hashable](name=type(self).__name__)
+            upload_result.issues.append(
+                FailedAuthorizationError(action="Upload to CDF", reason=str(missing_capabilities))
+            )
+            yield upload_result
             return
 
         issues = NeatIssueList[NeatIssue]()
@@ -88,10 +65,11 @@ class CDFLoader(BaseLoader[T_Output]):
                 items.append(result)
 
             if len(items) >= self._UPLOAD_BATCH_SIZE:
-                yield self._upload_to_cdf(client, items, return_diffs, dry_run, issues)
-                items.clear()
+                yield self._upload_to_cdf(client, items, dry_run, issues)
+                issues = NeatIssueList[NeatIssue]()
+                items = []
         if items:
-            yield self._upload_to_cdf(client, items, return_diffs, dry_run, issues)
+            yield self._upload_to_cdf(client, items, dry_run, issues)
 
     @abstractmethod
     def _get_required_capabilities(self) -> list[Capability]:
@@ -102,8 +80,7 @@ class CDFLoader(BaseLoader[T_Output]):
         self,
         client: CogniteClient,
         items: list[T_Output],
-        return_diffs: bool,
         dry_run: bool,
         read_issues: NeatIssueList,
-    ) -> UploadResultIDs | UploadDiffsID:
+    ) -> UploadResult:
         raise NotImplementedError

cognite/neat/graph/loaders/_rdf2dms.py

@@ -10,6 +10,7 @@ from cognite.client import CogniteClient
 from cognite.client import data_modeling as dm
 from cognite.client.data_classes.capabilities import Capability, DataModelInstancesAcl
 from cognite.client.data_classes.data_modeling import ViewId
+from cognite.client.data_classes.data_modeling.ids import InstanceId
 from cognite.client.data_classes.data_modeling.views import SingleEdgeConnection
 from cognite.client.exceptions import CogniteAPIError
 from pydantic import ValidationInfo, create_model, field_validator
@@ -21,13 +22,24 @@ from cognite.neat.graph.stores import NeatGraphStore
 from cognite.neat.issues import NeatIssue, NeatIssueList
 from cognite.neat.rules.models import DMSRules
 from cognite.neat.rules.models.data_types import _DATA_TYPE_BY_DMS_TYPE
-from cognite.neat.utils.upload import UploadDiffsID
+from cognite.neat.utils.upload import UploadResult
 from cognite.neat.utils.utils import create_sha256_hash
 
 from ._base import CDFLoader
 
 
 class DMSLoader(CDFLoader[dm.InstanceApply]):
+    """Load data from Cognite Data Fusions Data Modeling Service (DMS) into Neat.
+
+    Args:
+        graph_store (NeatGraphStore): The graph store to load the data into.
+        data_model (dm.DataModel[dm.View] | None): The data model to load.
+        instance_space (str): The instance space to load the data into.
+        class_by_view_id (dict[ViewId, str] | None): A mapping from view id to class name. Defaults to None.
+        creat_issues (Sequence[NeatIssue] | None): A list of issues that occurred during reading. Defaults to None.
+        tracker (type[Tracker] | None): The tracker to use. Defaults to None.
+    """
+
     def __init__(
         self,
         graph_store: NeatGraphStore,
@@ -243,11 +255,10 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
         self,
         client: CogniteClient,
         items: list[dm.InstanceApply],
-        return_diffs: bool,
         dry_run: bool,
         read_issues: NeatIssueList,
-    ) -> UploadDiffsID:
-        result = UploadDiffsID(name=type(self).__name__, issues=read_issues)
+    ) -> UploadResult:
+        result = UploadResult[InstanceId](name=type(self).__name__, issues=read_issues)
         try:
             nodes = [item for item in items if isinstance(item, dm.NodeApply)]
             edges = [item for item in items if isinstance(item, dm.EdgeApply)]
@@ -260,16 +271,17 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
             )
         except CogniteAPIError as e:
             result.error_messages.append(str(e))
-            result.failed.append([repr(instance.as_id()) for instance in items])  # type: ignore[arg-type, attr-defined]
+            result.failed_upserted.update(item.as_id() for item in e.failed + e.unknown)
+            result.created.update(item.as_id() for item in e.successful)
         else:
             for instance in itertools.chain(upserted.nodes, upserted.edges):
                 if instance.was_modified and instance.created_time == instance.last_updated_time:
-                    result.created.append(repr(instance.as_id()))
+                    result.created.add(instance.as_id())
                 elif instance.was_modified:
-                    result.changed.append(repr(instance.as_id()))
+                    result.changed.add(instance.as_id())
                 else:
-                    result.unchanged.append(repr(instance.as_id()))
-        return result if return_diffs else result.as_upload_result_ids()  # type: ignore[return-value]
+                    result.unchanged.add(instance.as_id())
+        return result
 
 
 def _triples2dictionary(

cognite/neat/graph/stores/_base.py

@@ -282,3 +282,13 @@ class NeatGraphStore:
                     description=transformer.description,
                 )
             )
+
+    def _repr_html_(self) -> str:
+        provenance = self.provenance._repr_html_()
+
+        return (
+            f"<strong>{type(self).__name__}</strong> A graph store is a container for storing triples. "
+            "It can be queried and transformed to extract information.<br />"
+            "<strong>Provenance</strong> Provenance is a record of changes that have occurred in the graph store.<br />"
+            f"{provenance}"
+        )

cognite/neat/graph/stores/_provenance.py

@@ -8,7 +8,6 @@
 
 
 import uuid
-from collections import UserList
 from collections.abc import Sequence
 from dataclasses import dataclass
 from datetime import datetime
@@ -16,6 +15,7 @@ from typing import TypeVar
 
 from rdflib import PROV, RDF, Literal, URIRef
 
+from cognite.neat._shared import FrozenNeatObject, NeatList
 from cognite.neat.constants import DEFAULT_NAMESPACE
 
 
@@ -64,7 +64,7 @@ class Entity:
 
 
 @dataclass(frozen=True)
-class Change:
+class Change(FrozenNeatObject):
     agent: Agent
     activity: Activity
     entity: Entity
@@ -81,11 +81,19 @@ class Change:
         entity = Entity(was_generated_by=activity, was_attributed_to=agent)
         return cls(agent, activity, entity, description)
 
+    def dump(self, aggregate: bool = True) -> dict[str, str]:
+        return {
+            "Agent": self.agent.id_,
+            "Activity": self.activity.id_,
+            "Entity": self.entity.id_,
+            "Description": self.description,
+        }
+
 
 T_Change = TypeVar("T_Change", bound=Change)
 
 
-class Provenance(UserList[T_Change]):
+class Provenance(NeatList[Change]):
     def __init__(self, changes: Sequence[T_Change] | None = None):
         super().__init__(changes or [])
 

cognite/neat/rules/exporters/__init__.py

@@ -1,9 +1,11 @@
-from ._rules2dms import CDFExporter, DMSExporter
+from ._base import BaseExporter, CDFExporter
+from ._rules2dms import DMSExporter
 from ._rules2excel import ExcelExporter
 from ._rules2ontology import GraphExporter, OWLExporter, SemanticDataModelExporter, SHACLExporter
 from ._rules2yaml import YAMLExporter
 
 __all__ = [
+    "BaseExporter",
     "DMSExporter",
     "CDFExporter",
     "SemanticDataModelExporter",
@@ -13,3 +15,23 @@ __all__ = [
     "ExcelExporter",
     "YAMLExporter",
 ]
+
+
+def _repr_html_() -> str:
+    import pandas as pd
+
+    table = pd.DataFrame(  # type: ignore[operator]
+        [
+            {
+                "Exporter": name,
+                "Description": globals()[name].__doc__.strip().split("\n")[0] if globals()[name].__doc__ else "Missing",
+            }
+            for name in __all__
+            if name not in ("BaseExporter", "CDFExporter", "GraphExporter")
+        ]
+    )._repr_html_()
+
+    return (
+        "<strong>Exporter</strong> An exporter converts Neat's representation of a data model called <em>Rules</em>"
+        f" into a schema/data model for a target format.<br />{table}"
+    )

cognite/neat/rules/exporters/_base.py

@@ -7,6 +7,7 @@ from cognite.client import CogniteClient
 
 from cognite.neat.rules._shared import Rules
 from cognite.neat.rules.models import DMSRules, InformationRules, RoleTypes
+from cognite.neat.utils.auxiliary import class_html_doc
 from cognite.neat.utils.upload import UploadResult, UploadResultList
 
 T_Export = TypeVar("T_Export")
@@ -34,6 +35,10 @@ class BaseExporter(ABC, Generic[T_Export]):
         else:
             raise NotImplementedError(f"Role {output_role} is not supported for {type(rules).__name__} rules")
 
+    @classmethod
+    def _repr_html_(cls) -> str:
+        return class_html_doc(cls, include_factory_methods=False)
+
 
 class CDFExporter(BaseExporter[T_Export]):
     @abstractmethod

cognite/neat/rules/exporters/_rules2dms.py

@@ -39,7 +39,7 @@ Component: TypeAlias = Literal["all", "spaces", "data_models", "views", "contain
 
 
 class DMSExporter(CDFExporter[DMSSchema]):
-    """Class for exporting rules object to CDF Data Model Storage (DMS).
+    """Export rules to Cognite Data Fusion's Data Model Storage (DMS) service.
 
     Args:
         export_components (frozenset[Literal["all", "spaces", "data_models", "views", "containers"]], optional):

cognite/neat/rules/exporters/_rules2ontology.py

@@ -39,16 +39,22 @@ class GraphExporter(BaseExporter[Graph], ABC):
 
 
 class OWLExporter(GraphExporter):
+    """Exports rules to an OWL ontology."""
+
     def export(self, rules: Rules) -> Graph:
         return Ontology.from_rules(rules).as_owl()
 
 
 class SHACLExporter(GraphExporter):
+    """Exports rules to a SHACL graph."""
+
     def export(self, rules: Rules) -> Graph:
         return Ontology.from_rules(rules).as_shacl()
 
 
 class SemanticDataModelExporter(GraphExporter):
+    """Exports rules to a semantic data model."""
+
     def export(self, rules: Rules) -> Graph:
         return Ontology.from_rules(rules).as_semantic_data_model()
 

cognite/neat/rules/importers/__init__.py

@@ -16,3 +16,23 @@ __all__ = [
     "YAMLImporter",
     "InferenceImporter",
 ]
+
+
+def _repr_html_() -> str:
+    import pandas as pd
+
+    table = pd.DataFrame(  # type: ignore[operator]
+        [
+            {
+                "Importer": name,
+                "Description": globals()[name].__doc__.strip().split("\n")[0] if globals()[name].__doc__ else "Missing",
+            }
+            for name in __all__
+            if name != "BaseImporter"
+        ]
+    )._repr_html_()
+
+    return (
+        "<strong>Importer</strong> An importer reads data/schema/data model from a source"
+        f" and converts it into Neat's representation of a data model called <em>Rules</em>.<br />{table}"
+    )

cognite/neat/rules/importers/_base.py

@@ -12,6 +12,7 @@ from rdflib import Namespace
 from cognite.neat.rules._shared import Rules
 from cognite.neat.rules.issues.base import IssueList, NeatValidationError, ValidationWarning
 from cognite.neat.rules.models import AssetRules, DMSRules, InformationRules, RoleTypes
+from cognite.neat.utils.auxiliary import class_html_doc
 
 
 class BaseImporter(ABC):
@@ -79,6 +80,10 @@ class BaseImporter(ABC):
             "description": f"Imported using {type(self).__name__}",
         }
 
+    @classmethod
+    def _repr_html_(cls) -> str:
+        return class_html_doc(cls)
+
 
 class _FutureResult:
     def __init__(self) -> None:

cognite/neat/rules/importers/_dms2rules.py

@@ -46,6 +46,16 @@ from cognite.neat.rules.models.entities import (
 
 
 class DMSImporter(BaseImporter):
+    """Imports a Data Model from Cognite Data Fusion.
+
+    Args:
+        schema: The schema containing the data model.
+        read_issues: A list of issues that occurred during the import.
+        metadata: Metadata for the data model.
+        ref_metadata: Metadata for the reference data model.
+
+    """
+
     def __init__(
         self,
         schema: DMSSchema,

cognite/neat/rules/importers/_dtdl2rules/dtdl_importer.py

@@ -18,7 +18,7 @@ from cognite.neat.utils.text import to_pascal
 
 
 class DTDLImporter(BaseImporter):
-    """Importer for DTDL (Digital Twin Definition Language).
+    """Importer from Azure Digital Twin - DTDL (Digital Twin Definition Language).
 
     This importer supports DTDL v2.0 and v3.0.
 

cognite/neat/rules/importers/_inference2rules.py

@@ -33,7 +33,11 @@ INSTANCE_PROPERTIES_DEFINITION = """SELECT ?property (count(?property) as ?occur
 
 
 class InferenceImporter(BaseImporter):
-    """Rules inference through analysis of knowledge graph provided in various formats.
+    """Infers rules from a triple store.
+
+    Rules inference through analysis of knowledge graph provided in various formats.
+    Use the factory methods to create an triples store from sources such as
+    RDF files, JSON files, YAML files, XML files, or directly from a graph store.
 
     Args:
         issue_list: Issue list to store issues

cognite/neat/rules/importers/_spreadsheet2rules.py

@@ -205,6 +205,12 @@ class SpreadsheetReader:
 
 
 class ExcelImporter(BaseImporter):
+    """Import rules from an Excel file.
+
+    Args:
+        filepath (Path): The path to the Excel file.
+    """
+
     def __init__(self, filepath: Path):
         self.filepath = filepath
 
@@ -286,6 +292,17 @@ class ExcelImporter(BaseImporter):
 
 
 class GoogleSheetImporter(BaseImporter):
+    """Import rules from a Google Sheet.
+
+    .. warning::
+
+        This importer is experimental and may not work as expected.
+
+    Args:
+        sheet_id (str): The Google Sheet ID.
+        skiprows (int): The number of rows to skip when reading the Google Sheet.
+    """
+
     def __init__(self, sheet_id: str, skiprows: int = 1):
         self.sheet_id = sheet_id
         self.skiprows = skiprows

cognite/neat/utils/auth.py

@@ -0,0 +1,298 @@
+import os
+import subprocess
+from contextlib import suppress
+from dataclasses import dataclass, fields
+from pathlib import Path
+from typing import Literal, TypeAlias, get_args
+
+from cognite.client import CogniteClient
+from cognite.client.credentials import CredentialProvider, OAuthClientCredentials, OAuthInteractive, Token
+
+from cognite.neat import _version
+from cognite.neat.utils.auxiliary import local_import
+
+__all__ = ["get_cognite_client"]
+
+_LOGIN_FLOW: TypeAlias = Literal["infer", "client_credentials", "interactive", "token"]
+_VALID_LOGIN_FLOWS = get_args(_LOGIN_FLOW)
+_CLIENT_NAME = f"CogniteNeat:{_version.__version__}"
+
+
+def get_cognite_client() -> CogniteClient:
+    with suppress(KeyError):
+        variables = _EnvironmentVariables.create_from_environ()
+        return variables.get_client()
+
+    repo_root = _repo_root()
+    if repo_root:
+        with suppress(KeyError, FileNotFoundError, TypeError):
+            variables = _from_dotenv(repo_root / ".env")
+            client = variables.get_client()
+            print("Found .env file in repository root. Loaded variables from .env file.")
+            return client
+    variables = _prompt_user()
+    if repo_root and _env_in_gitignore(repo_root):
+        local_import("rich", "jupyter")
+        from rich.prompt import Prompt
+
+        env_file = repo_root / ".env"
+        answer = Prompt.ask(
+            "Do you store the variables in an .env file in the repository root for easy reuse?", choices=["y", "n"]
+        )
+        if env_file.exists():
+            answer = Prompt.ask(f"{env_file} already exists. Overwrite?", choices=["y", "n"])
+        if answer == "y":
+            env_file.write_text(variables.create_env_file())
+            print("Created .env file in repository root.")
+
+    return variables.get_client()
+
+
+@dataclass
+class _EnvironmentVariables:
+    CDF_CLUSTER: str
+    CDF_PROJECT: str
+    LOGIN_FLOW: _LOGIN_FLOW = "infer"
+    IDP_CLIENT_ID: str | None = None
+    IDP_CLIENT_SECRET: str | None = None
+    TOKEN: str | None = None
+
+    IDP_TENANT_ID: str | None = None
+    IDP_TOKEN_URL: str | None = None
+
+    CDF_URL: str | None = None
+    IDP_AUDIENCE: str | None = None
+    IDP_SCOPES: str | None = None
+    IDP_AUTHORITY_URL: str | None = None
+
+    def __post_init__(self):
+        if self.LOGIN_FLOW.lower() not in _VALID_LOGIN_FLOWS:
+            raise ValueError(f"LOGIN_FLOW must be one of {_VALID_LOGIN_FLOWS}")
+
+    @property
+    def cdf_url(self) -> str:
+        return self.CDF_URL or f"https://{self.CDF_CLUSTER}.cognitedata.com"
+
+    @property
+    def idp_token_url(self) -> str:
+        if self.IDP_TOKEN_URL:
+            return self.IDP_TOKEN_URL
+        if not self.IDP_TENANT_ID:
+            raise KeyError("IDP_TENANT_ID or IDP_TOKEN_URL must be set in the environment.")
+        return f"https://login.microsoftonline.com/{self.IDP_TENANT_ID}/oauth2/v2.0/token"
+
+    @property
+    def idp_audience(self) -> str:
+        return self.IDP_AUDIENCE or f"https://{self.CDF_CLUSTER}.cognitedata.com"
+
+    @property
+    def idp_scopes(self) -> list[str]:
+        if self.IDP_SCOPES:
+            return self.IDP_SCOPES.split()
+        return [f"https://{self.CDF_CLUSTER}.cognitedata.com/.default"]
+
+    @property
+    def idp_authority_url(self) -> str:
+        if self.IDP_AUTHORITY_URL:
+            return self.IDP_AUTHORITY_URL
+        if not self.IDP_TENANT_ID:
+            raise KeyError("IDP_TENANT_ID or IDP_AUTHORITY_URL must be set in the environment.")
+        return f"https://login.microsoftonline.com/{self.IDP_TENANT_ID}"
+
+    @classmethod
+    def create_from_environ(cls) -> "_EnvironmentVariables":
+        if "CDF_CLUSTER" not in os.environ or "CDF_PROJECT" not in os.environ:
+            raise KeyError("CDF_CLUSTER and CDF_PROJECT must be set in the environment.", "CDF_CLUSTER", "CDF_PROJECT")
+
+        return cls(
+            CDF_CLUSTER=os.environ["CDF_CLUSTER"],
+            CDF_PROJECT=os.environ["CDF_PROJECT"],
+            LOGIN_FLOW=os.environ.get("LOGIN_FLOW", "infer"),  # type: ignore[arg-type]
+            IDP_CLIENT_ID=os.environ.get("IDP_CLIENT_ID"),
+            IDP_CLIENT_SECRET=os.environ.get("IDP_CLIENT_SECRET"),
+            TOKEN=os.environ.get("TOKEN"),
+            CDF_URL=os.environ.get("CDF_URL"),
+            IDP_TOKEN_URL=os.environ.get("IDP_TOKEN_URL"),
+            IDP_TENANT_ID=os.environ.get("IDP_TENANT_ID"),
+            IDP_AUDIENCE=os.environ.get("IDP_AUDIENCE"),
+            IDP_SCOPES=os.environ.get("IDP_SCOPES"),
+            IDP_AUTHORITY_URL=os.environ.get("IDP_AUTHORITY_URL"),
+        )
+
+    def get_credentials(self) -> CredentialProvider:
+        method_by_flow = {
+            "client_credentials": self.get_oauth_client_credentials,
+            "interactive": self.get_oauth_interactive,
+            "token": self.get_token,
+        }
+        if self.LOGIN_FLOW in method_by_flow:
+            return method_by_flow[self.LOGIN_FLOW]()
+        key_options: list[tuple[str, ...]] = []
+        for method in method_by_flow.values():
+            try:
+                return method()
+            except KeyError as e:
+                key_options += e.args[1:]
+        raise KeyError(
+            f"LOGIN_FLOW={self.LOGIN_FLOW} requires one of the following environment set variables to be set.",
+            *key_options,
+        )
+
+    def get_oauth_client_credentials(self) -> OAuthClientCredentials:
+        if not self.IDP_CLIENT_ID or not self.IDP_CLIENT_SECRET:
+            raise KeyError(
+                "IDP_CLIENT_ID and IDP_CLIENT_SECRET must be set in the environment.",
+                "IDP_CLIENT_ID",
+                "IDP_CLIENT_SECRET",
+            )
+        return OAuthClientCredentials(
+            client_id=self.IDP_CLIENT_ID,
+            client_secret=self.IDP_CLIENT_SECRET,
+            token_url=self.idp_token_url,
+            audience=self.idp_audience,
+            scopes=self.idp_scopes,
+        )
+
+    def get_oauth_interactive(self) -> OAuthInteractive:
+        if not self.IDP_CLIENT_ID:
+            raise KeyError("IDP_CLIENT_ID must be set in the environment.", "IDP_CLIENT_ID")
+        return OAuthInteractive(
+            client_id=self.IDP_CLIENT_ID,
+            authority_url=self.idp_authority_url,
+            redirect_port=53_000,
+            scopes=self.idp_scopes,
+        )
+
+    def get_token(self) -> Token:
+        if not self.TOKEN:
+            raise KeyError("TOKEN must be set in the environment", "TOKEN")
+        return Token(self.TOKEN)
+
+    def get_client(self) -> CogniteClient:
+        return CogniteClient.default(
+            self.CDF_PROJECT, self.CDF_CLUSTER, credentials=self.get_credentials(), client_name=_CLIENT_NAME
+        )
+
+    def create_env_file(self) -> str:
+        lines: list[str] = []
+        first_optional = True
+        for field in fields(self):
+            is_optional = hasattr(self, field.name.lower())
+            if is_optional and first_optional:
+                lines.append(
+                    "# The below variables are the defaults, they are automatically " "constructed unless they are set."
+                )
+                first_optional = False
+            name = field.name.lower() if is_optional else field.name
+            value = getattr(self, name)
+            if value is not None:
+                if isinstance(value, list):
+                    value = " ".join(value)
+                lines.append(f"{field.name}={value}")
+        return "\n".join(lines)
+
+
+def _from_dotenv(evn_file: Path) -> _EnvironmentVariables:
+    if not evn_file.exists():
+        raise FileNotFoundError(f"{evn_file} does not exist.")
+    content = evn_file.read_text()
+    valid_variables = {f.name for f in fields(_EnvironmentVariables)}
+    variables: dict[str, str] = {}
+    for line in content.splitlines():
+        if line.startswith("#") or not line:
+            continue
+        key, value = line.split("=", 1)
+        if key in valid_variables:
+            variables[key] = value
+    return _EnvironmentVariables(**variables)  # type: ignore[arg-type]
+
+
+def _prompt_user() -> _EnvironmentVariables:
+    local_import("rich", "jupyter")
+    from rich.prompt import Prompt
+
+    try:
+        variables = _EnvironmentVariables.create_from_environ()
+        continue_ = Prompt.ask(
+            f"Use environment variables for CDF Cluster '{variables.CDF_CLUSTER}' "
+            f"and Project '{variables.CDF_PROJECT}'? [y/n]",
+            choices=["y", "n"],
+            default="y",
+        )
+        if continue_ == "n":
+            variables = _prompt_cluster_and_project()
+    except KeyError:
+        variables = _prompt_cluster_and_project()
+
+    login_flow = Prompt.ask("Login flow", choices=[f for f in _VALID_LOGIN_FLOWS if f != "infer"])
+    variables.LOGIN_FLOW = login_flow  # type: ignore[assignment]
+    if login_flow == "token":
+        token = Prompt.ask("Enter token")
+        variables.TOKEN = token
+        return variables
+
+    variables.IDP_CLIENT_ID = Prompt.ask("Enter IDP Client ID")
+    if login_flow == "client_credentials":
+        variables.IDP_CLIENT_SECRET = Prompt.ask("Enter IDP Client Secret", password=True)
+        tenant_id = Prompt.ask("Enter IDP_TENANT_ID (leave empty to enter IDP_TOKEN_URL instead)")
+        if tenant_id:
+            variables.IDP_TENANT_ID = tenant_id
+        else:
+            token_url = Prompt.ask("Enter IDP_TOKEN_URL")
+            variables.IDP_TOKEN_URL = token_url
+        optional = ["IDP_AUDIENCE", "IDP_SCOPES"]
+    else:
+        optional = ["IDP_TENANT_ID", "IDP_SCOPES"]
+
+    defaults = "".join(f"\n - {name}: {getattr(variables, name.lower())}" for name in optional)
+    use_defaults = Prompt.ask(
+        f"Use default values for the following variables?{defaults}", choices=["y", "n"], default="y"
+    )
+    if use_defaults:
+        return variables
+    for name in optional:
+        value = Prompt.ask(f"Enter {name}")
+        setattr(variables, name, value)
+    return variables
+
+
+def _prompt_cluster_and_project() -> _EnvironmentVariables:
+    from rich.prompt import Prompt
+
+    cluster = Prompt.ask("Enter CDF Cluster (example 'greenfield', 'bluefield', 'westeurope-1)")
+    project = Prompt.ask("Enter CDF Project")
+    return _EnvironmentVariables(cluster, project)
+
+
+def _is_notebook() -> bool:
+    try:
+        shell = get_ipython().__class__.__name__  # type: ignore[name-defined]
+        if shell == "ZMQInteractiveShell":
+            return True  # Jupyter notebook or qtconsole
+        elif shell == "TerminalInteractiveShell":
+            return False  # Terminal running IPython
+        else:
+            return False  # Other type (?)
+    except NameError:
+        return False  # Probably standard Python interpreter
+
+
+def _repo_root() -> Path | None:
+    with suppress(Exception):
+        result = subprocess.run("git rev-parse --show-toplevel".split(), stdout=subprocess.PIPE)
+        return Path(result.stdout.decode().strip())
+    return None
+
+
+def _env_in_gitignore(repo_root: Path) -> bool:
+    ignore_file = repo_root / ".gitignore"
+    if not ignore_file.exists():
+        return False
+    else:
+        ignored = {line.strip() for line in ignore_file.read_text().splitlines()}
+        return ".env" in ignored or "*.env" in ignored
+
+
+if __name__ == "__main__":
+    c = _prompt_user().get_client()
+    print(c.iam.token.inspect())

cognite/neat/utils/auxiliary.py

@@ -1,4 +1,6 @@
 import importlib
+import inspect
+from collections.abc import Callable
 from types import ModuleType
 
 from cognite.neat.exceptions import NeatImportError
@@ -9,3 +11,25 @@ def local_import(module: str, extra: str) -> ModuleType:
         return importlib.import_module(module)
     except ImportError as e:
         raise NeatImportError(module.split(".")[0], extra) from e
+
+
+def get_classmethods(cls: type) -> list[Callable]:
+    return [
+        func for _, func in inspect.getmembers(cls, lambda x: inspect.ismethod(x) and not x.__name__.startswith("_"))
+    ]
+
+
+def class_html_doc(cls: type, include_factory_methods: bool = True) -> str:
+    if cls.__doc__:
+        docstring = cls.__doc__.split("Args:")[0].strip().replace("\n", "<br />")
+    else:
+        docstring = "Missing Description"
+    if include_factory_methods:
+        factory_methods = get_classmethods(cls)
+        if factory_methods:
+            factory_methods_str = "".join(f"<li><em>.{m.__name__}</em></li>" for m in factory_methods)
+            docstring += (
+                f"<br /><strong>Available factory methods:</strong><br />"
+                f'<ul style="list-style-type:circle;">{factory_methods_str}</ul>'
+            )
+    return f"<h3>{cls.__name__}</h3><p>{docstring}</p>"

cognite/neat/utils/upload.py

@@ -41,15 +41,18 @@ class UploadResult(UploadResultCore, Generic[T_ID]):
     unchanged: set[T_ID] = field(default_factory=set)
     skipped: set[T_ID] = field(default_factory=set)
     failed_created: set[T_ID] = field(default_factory=set)
+    failed_upserted: set[T_ID] = field(default_factory=set)
     failed_changed: set[T_ID] = field(default_factory=set)
     failed_deleted: set[T_ID] = field(default_factory=set)
 
     @property
     def failed(self) -> int:
-        return len(self.failed_created) + len(self.failed_changed) + len(self.failed_deleted)
+        return (
+            len(self.failed_created) + len(self.failed_changed) + len(self.failed_deleted) + len(self.failed_upserted)
+        )
 
     @property
-    def total(self) -> int:
+    def success(self) -> int:
         return len(self.created) + len(self.deleted) + len(self.changed) + len(self.unchanged) + len(self.skipped)
 
     def dump(self, aggregate: bool = True) -> dict[str, Any]:
@@ -84,43 +87,3 @@ class UploadResult(UploadResultCore, Generic[T_ID]):
                 continue
             lines.append(f"{key}: {value}")
         return f"{self.name.title()}: {', '.join(lines)}"
-
-
-@dataclass
-class UploadResultIDs(UploadResultCore):
-    success: list[str] = field(default_factory=list)
-    failed: list[str] = field(default_factory=list)
-
-    def dump(self, aggregate: bool = True) -> dict[str, Any]:
-        output = super().dump(aggregate)
-        if self.success:
-            output["success"] = len(self.success) if aggregate else self.success
-        if self.failed:
-            output["failed"] = len(self.failed) if aggregate else self.failed
-        return output
-
-
-@dataclass
-class UploadDiffsID(UploadResultCore):
-    created: list[str] = field(default_factory=list)
-    changed: list[str] = field(default_factory=list)
-    unchanged: list[str] = field(default_factory=list)
-    failed: list[str] = field(default_factory=list)
-
-    def as_upload_result_ids(self) -> UploadResultIDs:
-        result = UploadResultIDs(name=self.name, error_messages=self.error_messages, issues=self.issues)
-        result.success = self.created + self.changed + self.unchanged
-        result.failed = self.failed
-        return result
-
-    def dump(self, aggregate: bool = True) -> dict[str, Any]:
-        output = super().dump(aggregate)
-        if self.created:
-            output["created"] = len(self.created) if aggregate else self.created
-        if self.changed:
-            output["changed"] = len(self.changed) if aggregate else self.changed
-        if self.unchanged:
-            output["unchanged"] = len(self.unchanged) if aggregate else self.unchanged
-        if self.failed:
-            output["failed"] = len(self.failed) if aggregate else self.failed
-        return output

{cognite_neat-0.84.1.dist-info → cognite_neat-0.85.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-neat
-Version: 0.84.1
+Version: 0.85.0
 Summary: Knowledge graph transformation
 Home-page: https://cognite-neat.readthedocs-hosted.com/
 License: Apache-2.0
@@ -16,6 +16,7 @@ Provides-Extra: all
 Provides-Extra: docs
 Provides-Extra: google
 Provides-Extra: graphql
+Provides-Extra: jupyter
 Provides-Extra: oxi
 Provides-Extra: service
 Requires-Dist: PyYAML
@@ -46,6 +47,7 @@ Requires-Dist: pymdown-extensions ; extra == "docs"
 Requires-Dist: pyoxigraph (==0.3.19) ; extra == "oxi" or extra == "all"
 Requires-Dist: rdflib
 Requires-Dist: requests
+Requires-Dist: rich[jupyter] (>=13.7.1,<14.0.0) ; extra == "jupyter"
 Requires-Dist: schedule (>=1,<2) ; extra == "service" or extra == "all"
 Requires-Dist: tomli (>=2.0.1,<3.0.0) ; python_version < "3.11"
 Requires-Dist: typing_extensions (>=4.8,<5.0) ; python_version < "3.11"

{cognite_neat-0.84.1.dist-info → cognite_neat-0.85.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-cognite/neat/__init__.py,sha256=v-rRiDOgZ3sQSMQKq0vgUQZvpeOkoHFXissAx6Ktg84,61
-cognite/neat/_shared.py,sha256=afQiTM0SvIKqeBRTvpfwwIvZL7QMQevt4F7lqRagAFg,968
-cognite/neat/_version.py,sha256=V73U5VqNMlTo-QuWNLjECQI8_59YjD0cHrTa5BEP1lg,23
+cognite/neat/__init__.py,sha256=AiexNcHdAHFbrrbo9c65gtil1dqx_SGraDH1PSsXjKE,126
+cognite/neat/_shared.py,sha256=RSaHm2eJceTlvb-hMMe4nHgoHdPYDfN3XcxDXo24k3A,1530
+cognite/neat/_version.py,sha256=oS_t2ihHSRa_TQs1XBgfsFFpaFOEDZAndDmjccnIF4g,23
 cognite/neat/app/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/app/api/asgi/metrics.py,sha256=nxFy7L5cChTI0a-zkCiJ59Aq8yLuIJp5c9Dg0wRXtV0,152
 cognite/neat/app/api/configuration.py,sha256=2U5M6M252swvQPQyooA1EBzFUZNtcTmuSaywfJDgckM,4232
@@ -54,34 +54,34 @@ cognite/neat/graph/examples/Knowledge-Graph-Nordic44.xml,sha256=U2Ns-M4LRjT1fBkh
 cognite/neat/graph/examples/__init__.py,sha256=yAjHVY3b5jOjmbW-iLbhvu7BG014TpGi3K4igkDqW5I,368
 cognite/neat/graph/examples/skos-capturing-sheet-wind-topics.xlsx,sha256=CV_yK5ZSbYS_ktfIZUPD8Sevs47zpswLXQUDFkGE4Gw,45798
 cognite/neat/graph/exceptions.py,sha256=R6pyOH774n9w2x_X_nrUr8OMAdjJMf_XPIqAvxIQaWo,3401
-cognite/neat/graph/extractors/__init__.py,sha256=ozXL6ZLK36wp3uX4UACRVs6rbvynQg2JQlDgL1UM1Wk,1025
-cognite/neat/graph/extractors/_base.py,sha256=TOXDnlqske8DgnJwA0THDVRgmR79Acjm56yF0E-2w7I,356
+cognite/neat/graph/extractors/__init__.py,sha256=nXcNp6i3-1HteIkr8Ujxk4b09W5jk27Q3eWuwjcnGnM,1647
+cognite/neat/graph/extractors/_base.py,sha256=8IWygpkQTwo0UOmbbwWVI7540_klTVdUVX2JjVPFRIs,498
 cognite/neat/graph/extractors/_classic_cdf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite/neat/graph/extractors/_classic_cdf/_assets.py,sha256=6e_glBuYl6ArBabOblERQ57g55qsiA0UHrmHVvBqk_s,3895
-cognite/neat/graph/extractors/_classic_cdf/_events.py,sha256=Z0vPcyOz4mCwY0Dqa5wAQZjczO1dbTUGM0X4Y10NLGQ,3995
+cognite/neat/graph/extractors/_classic_cdf/_assets.py,sha256=Hu-RoTBhn4LFm38G51L5tc0MVy4-zr1POHWyrIB-vUc,4130
+cognite/neat/graph/extractors/_classic_cdf/_events.py,sha256=SGZWKCxppECIQkwQs5M2e_SoF-eGilCW2KiyXk2PmzM,4230
 cognite/neat/graph/extractors/_classic_cdf/_files.py,sha256=-6nCkXUCAnDsv4eDFDEiQ-U4SGhmW1VLxZJFUcszqjU,4831
-cognite/neat/graph/extractors/_classic_cdf/_labels.py,sha256=nGQyrOZrZzxniIKWROzS1jYrLDT861NARyi-VM_u9-0,2587
-cognite/neat/graph/extractors/_classic_cdf/_relationships.py,sha256=w16hu_REIFEVEenhdxEInOmgCouZaBwxXSlxl9_7vTA,5398
-cognite/neat/graph/extractors/_classic_cdf/_sequences.py,sha256=o4yxkf81FGFrKkflvlyDYie05fTYsT_LcRFM63OTVCI,3406
-cognite/neat/graph/extractors/_classic_cdf/_timeseries.py,sha256=KTYmL8vhXijlmkN1UFQrGpaCllpRekr1y55SoLhlLbg,4559
-cognite/neat/graph/extractors/_dexpi.py,sha256=CYSLt0Fl7Y2RCqOfIAT0N8Cjs-Yu2lRLvB13axtAaWw,9384
+cognite/neat/graph/extractors/_classic_cdf/_labels.py,sha256=4JxQHPDciMjbk7F6GxMa-HfhOgAv8LT3VO3mRfEgQ0E,2832
+cognite/neat/graph/extractors/_classic_cdf/_relationships.py,sha256=jgIN__nztlhLwoIJw59s2-Blc9gxIm7YDha5qEoXBSg,5654
+cognite/neat/graph/extractors/_classic_cdf/_sequences.py,sha256=5FuhwpgDiGG51C0bQacQ4LD6KkutUaU1cX2NSy_krhU,3652
+cognite/neat/graph/extractors/_classic_cdf/_timeseries.py,sha256=Ui7WRAvot3KJFwpzqmEYvRs3cN0qh93ocJjYaNLfH30,4811
+cognite/neat/graph/extractors/_dexpi.py,sha256=xIw3kSaQ17k_bAuecvrVRic70PUhFHtcyy-ReLt36Q4,9385
 cognite/neat/graph/extractors/_mock_graph_generator.py,sha256=1TjgbxDVwgZjivIqx1lLKwggn_zHqWLiYM26esgDAMs,14694
-cognite/neat/graph/extractors/_rdf_file.py,sha256=w4-XgPgNsmZOkNxjO1ZQCcopTntmmtxfDBkQxn1se6E,463
+cognite/neat/graph/extractors/_rdf_file.py,sha256=ialMCLv9WH5k6v1YMfozfcmAYhz8OVo9jVhsKMyQkDA,763
 cognite/neat/graph/issues/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/graph/issues/loader.py,sha256=v8YDsehkUT1QUG61JM9BDV_lqowMUnDmGmbay0aFzN4,3085
-cognite/neat/graph/loaders/__init__.py,sha256=hHC9sfFfbnGSVFTYeuNTIEu4tdLSJ2mWV07fereLelo,125
-cognite/neat/graph/loaders/_base.py,sha256=bdYC6CwsHVqnQa1QzOhL68qQhF1OtrsearqH6D-z3E4,4037
+cognite/neat/graph/loaders/__init__.py,sha256=BteVkTklPVUB2W-bbzZug-cEUrx8ZFA-YcQPSxWVpTI,678
+cognite/neat/graph/loaders/_base.py,sha256=t33I-Olw0xYz3Icf2RJZq9cs5_dEKeY87npxsA597Sw,3012
 cognite/neat/graph/loaders/_rdf2asset.py,sha256=aFby7BwIrW253LEJ4XqGeUuf4jG9VUe8Lg7OlUnXMlM,4493
-cognite/neat/graph/loaders/_rdf2dms.py,sha256=ZijbUsKOT01LBmTxsCgTw6lW65ysyxYe5aGOzD1l_r0,12991
+cognite/neat/graph/loaders/_rdf2dms.py,sha256=xyr0SfIusfjYjlAXZcIGS1-IQ6LoVWeOB3_q6D304oo,13603
 cognite/neat/graph/models.py,sha256=AtLgZh2qyRP6NRetjQCy9qLMuTQB0CH52Zsev-qa2sk,149
 cognite/neat/graph/queries/__init__.py,sha256=BgDd-037kvtWwAoGAy8eORVNMiZ5-E9sIV0txIpeaN4,50
 cognite/neat/graph/queries/_base.py,sha256=20A7GDBdmc35VmHVz5n0YCGPcnBAmUX-bM2ImHPManc,3844
 cognite/neat/graph/queries/_construct.py,sha256=FxzSQqzCpo7lKVYerlLAY03oqCeFM5L6MozfBUblzr4,7341
 cognite/neat/graph/queries/_shared.py,sha256=EwW2RbPttt7-z7QTgfKWlthA2Nq5d3bYyyewFkCA7R4,5043
 cognite/neat/graph/stores/__init__.py,sha256=G-VG_YwfRt1kuPao07PDJyZ3w_0-eguzLUM13n-Z_RA,64
-cognite/neat/graph/stores/_base.py,sha256=7NnJUh7SQ1lDfJruOgKWc2IesT1DC81Yi6Xqp44RFwM,10140
+cognite/neat/graph/stores/_base.py,sha256=z69uhzBhzl1JQJU9U-h9zAyySn25ZQTJRXam4BavnoY,10586
 cognite/neat/graph/stores/_oxrdflib.py,sha256=A5zeRm5_e8ui_ihGpgstRDg_N7qcLZ3QZBRGrOXSGI0,9569
-cognite/neat/graph/stores/_provenance.py,sha256=Hr9WBhFj-eoet4czL8XSBGYnu9Yn66YsTgH_G0n3QpY,3293
+cognite/neat/graph/stores/_provenance.py,sha256=HIXa-p7yc2l3HFkQWMnGPhn-t_FROEG21thADGkgy0c,3590
 cognite/neat/graph/transformers/__init__.py,sha256=wXrNSyJNGnis3haaCKVPZ5y5kKSUsOUHnh-860ekatk,555
 cognite/neat/graph/transformers/_base.py,sha256=b37Ek-9njuM5pTR_3XhnxCMrg_ip_2BMwM7ZhKpAAlw,328
 cognite/neat/graph/transformers/_classic_cdf.py,sha256=ZHHJU-1-lXeufuZJSuDa2Zmu56PS9PcGeFYI91VZNI4,12214
@@ -188,28 +188,28 @@ cognite/neat/rules/analysis/_information_rules.py,sha256=fdSMyInsPJdgLHKwSkj2N9b
 cognite/neat/rules/examples/__init__.py,sha256=nxIwueAcHgZhkYriGxnDLQmIyiT8PByPHbScjYKDKe0,374
 cognite/neat/rules/examples/wind-energy.owl,sha256=NuomCA9FuuLF0JlSuG3OKqD4VBcHgSjDKFLV17G1zV8,65934
 cognite/neat/rules/exceptions.py,sha256=YLnsbXXJdDSr_szQoioEtOdqDV8PR7RdQjpMP2SWeCs,123868
-cognite/neat/rules/exporters/__init__.py,sha256=Gn3CjkVKHJF9Po1ZPH4wAJ-sRW9up7b2CpXm-eReV3Q,413
-cognite/neat/rules/exporters/_base.py,sha256=TkdpmliKjKVDITBAE4ySq_Zc8edFDQzHkbvHll4ODkg,1763
-cognite/neat/rules/exporters/_rules2dms.py,sha256=xnmq4FbMAvYVtJzDM-wwTRwVq_t3XWf8ffmhpE27BSk,14547
+cognite/neat/rules/exporters/__init__.py,sha256=nRMUBUf7yr1QPjyITeX2rTLtLLawHv24hhRE39d2-e0,1109
+cognite/neat/rules/exporters/_base.py,sha256=qZt236sNKTbiM41sgVEYcEtuK5v8Pt14LMLBNiZrNWs,1936
+cognite/neat/rules/exporters/_rules2dms.py,sha256=xK9xXJ7lLQnzrRlBUJQVLlY4SC-vnnjGUXOzaWvOKmY,14553
 cognite/neat/rules/exporters/_rules2excel.py,sha256=HvUdXYHxfLMijYWdTnfqCsw3Izf8S-XDSve-2ZbqF8Y,14248
-cognite/neat/rules/exporters/_rules2ontology.py,sha256=Od53uLdcC2Q7UiF5PA2P0gw3O14eTD3MeJ1-trd64ZM,20388
+cognite/neat/rules/exporters/_rules2ontology.py,sha256=bt8IuxaAYFRyZc1AlS-gYw9Jf6jBr5CYFOaJ3qPeoaA,20527
 cognite/neat/rules/exporters/_rules2yaml.py,sha256=GA8eUYRxUfIU6IMvlyGO5JidkOD5eUKSbH3qAiFiaCg,3026
 cognite/neat/rules/exporters/_validation.py,sha256=OlKIyf4nhSDehJwFHDQ8Zdf6HpNfW7dSe2s67eywHu4,4078
-cognite/neat/rules/importers/__init__.py,sha256=gR6_TAEa3iO5NCLKRztHg-FMiLdBnx47Z3iSzbwLfcE,481
-cognite/neat/rules/importers/_base.py,sha256=_hvxYnLiK8zf0MFes1VJ5TFisdZl-bOB6tFi3DQgYpc,4374
-cognite/neat/rules/importers/_dms2rules.py,sha256=5yJGYkM7lAMu-QfO0_r59WE4RGtMu2smMqLm16ohgLQ,18994
+cognite/neat/rules/importers/__init__.py,sha256=Vxl2Iq1dMXUsI6Wb411xPI3rromdq50xZUci-S8faSw,1097
+cognite/neat/rules/importers/_base.py,sha256=3LmDfR-f0nlLGcioWB8IbeZJ6uW5dvnzxJlqaMWc-u0,4516
+cognite/neat/rules/importers/_dms2rules.py,sha256=Dqoh4qO5IVvjRpxLHZaqCgPC99_r4y7ncEo2WYMxwqU,19302
 cognite/neat/rules/importers/_dtdl2rules/__init__.py,sha256=CNR-sUihs2mnR1bPMKs3j3L4ds3vFTsrl6YycExZTfU,68
 cognite/neat/rules/importers/_dtdl2rules/_unit_lookup.py,sha256=wW4saKva61Q_i17guY0dc4OseJDQfqHy_QZBtm0OD6g,12134
 cognite/neat/rules/importers/_dtdl2rules/dtdl_converter.py,sha256=ysmWUxZ0npwrTB0uiH5jA0v37sfCwowGaYk17IyxPUU,12663
-cognite/neat/rules/importers/_dtdl2rules/dtdl_importer.py,sha256=QDyGt5YBaxzF4v_oCFSgKRSpwVdVruDU3-VW0DEiHbY,6718
+cognite/neat/rules/importers/_dtdl2rules/dtdl_importer.py,sha256=Psj3C2jembY_Wu7WWJIFIwrMawvjISjeqfBnoRy_csw,6740
 cognite/neat/rules/importers/_dtdl2rules/spec.py,sha256=tim_MfN1J0F3Oeqk3BMgIA82d_MZvhRuRMsLK3B4PYc,11897
-cognite/neat/rules/importers/_inference2rules.py,sha256=vN3l6gfca19FHGzPb9fwolZaq4Z8KkeiR-iK1up8Kqk,11478
+cognite/neat/rules/importers/_inference2rules.py,sha256=OilV3aF3LTjFHK2Yzs8KktTGG41iPB4hh3u1aAwhNbI,11675
 cognite/neat/rules/importers/_owl2rules/__init__.py,sha256=tdGcrgtozdQyST-pTlxIa4cLBNTLvtk1nNYR4vOdFSw,63
 cognite/neat/rules/importers/_owl2rules/_owl2classes.py,sha256=QpTxvrTGczIa48X8lgXGnMN1AWPhHK0DR6uNq175xak,7357
 cognite/neat/rules/importers/_owl2rules/_owl2metadata.py,sha256=nwnUaBNAAYMoBre2UmsnkJXUuaqGEpR3U3txDrH2w6g,7527
 cognite/neat/rules/importers/_owl2rules/_owl2properties.py,sha256=eKr-e-ZTTV54PJ9UXNVPTT_c9XxszNPraS4Y43AF7qQ,7297
 cognite/neat/rules/importers/_owl2rules/_owl2rules.py,sha256=41_wZFvt0A6TI55zlT04oQkvU7V73li4aGLgc4T4Lxo,6358
-cognite/neat/rules/importers/_spreadsheet2rules.py,sha256=32Mnu74cSKQ0XcnAshwL6XTS_TxqYBUm5u29U7sirCg,12684
+cognite/neat/rules/importers/_spreadsheet2rules.py,sha256=vyYXNvP64dBGTWRWfrg7wtUcs0PdPiGLAHwE8itItAA,13072
 cognite/neat/rules/importers/_yaml2rules.py,sha256=F0uksSz1A3po5OlRM2152_w5j8D9oYTLB9NFTkSMlWI,4275
 cognite/neat/rules/issues/__init__.py,sha256=c12m0HAHHzF6oR8lKbULE3TxOPimTi9s1O9IIrtgh0g,549
 cognite/neat/rules/issues/base.py,sha256=x2YLCfmqtPlFLoURq3qHaprXCpFaQdf0iWkql-EMyps,2446
@@ -251,7 +251,8 @@ cognite/neat/rules/models/information/_serializer.py,sha256=yti9I_xJruxrib66YIBI
 cognite/neat/rules/models/information/_validation.py,sha256=Is2GzL2lZU3A5zPu3NjvlXfmIU2_Y10C5Nxi5Denz4g,7528
 cognite/neat/rules/models/wrapped_entities.py,sha256=ThhjnNNrpgz0HeORIQ8Q894trxP73P7T_TuZj6qH2CU,7157
 cognite/neat/utils/__init__.py,sha256=l5Nyqhqo25bcQXCOb_lk01cr-UXsG8cczz_y_I0u6bg,68
-cognite/neat/utils/auxiliary.py,sha256=E2-YtddzScvN7l7j0kNYIMlfqIUT9NWMqLpcJYPK4rY,309
+cognite/neat/utils/auth.py,sha256=0UeZH4nx-0LizNsBrYJiquK6ZldNYk_2frLBZzcB5JM,11270
+cognite/neat/utils/auxiliary.py,sha256=IOVbr6lPQulMJUyrrhfSsF6lIHch0Aw6KszMkBomprc,1248
 cognite/neat/utils/cdf.py,sha256=piRx-6GRz4cCfBZD5rU0OM6ixQ3cj5TMzI0yCYUveR8,2422
 cognite/neat/utils/cdf_classes.py,sha256=NEmz5UprBlqfqZnqJkRk5xjSpzazwHbhcWsMH_GNxP8,5831
 cognite/neat/utils/cdf_loaders/__init__.py,sha256=s2aPR5XLo6WZ0ybstAJlcGFYkA7CyHW1XO-NYpL0V6o,483
@@ -262,9 +263,9 @@ cognite/neat/utils/cdf_loaders/data_classes.py,sha256=0apspfwVlFltYOZfmk_PNknS3Z
 cognite/neat/utils/exceptions.py,sha256=-w4cAcvcoWLf-_ZwAl7QV_NysfqtQzIOd1Ti-mpxJgM,981
 cognite/neat/utils/spreadsheet.py,sha256=LI0c7dlW0zXHkHw0NvB-gg6Df6cDcE3FbiaHBYLXdzQ,2714
 cognite/neat/utils/text.py,sha256=4bg1_Q0lg7KsoxaDOvXrVyeY78BJN8i-27BlyDzUCls,3082
-cognite/neat/utils/upload.py,sha256=opAB8oDtpgcrugcjbUg0tjGqtFUnAS7zixtLiRYZ3TA,5084
+cognite/neat/utils/upload.py,sha256=nZEuDu22A1kTbl-ctzAJ2vx1cjiQtqdDdpC_mRRMvUI,3597
 cognite/neat/utils/utils.py,sha256=1LEwR8gpHw_6pvEeLkW_cDU_lUun4qSsw_Rr3JsKwgA,14172
-cognite/neat/utils/xml.py,sha256=ppLT3lQKVp8wOP-m8-tFY8uB2P4R76l7R_-kUtsABng,992
+cognite/neat/utils/xml_.py,sha256=ppLT3lQKVp8wOP-m8-tFY8uB2P4R76l7R_-kUtsABng,992
 cognite/neat/workflows/__init__.py,sha256=oiKub_U9f5cA0I1nKl5dFkR4BD8_6Be9eMzQ_50PwP0,396
 cognite/neat/workflows/_exceptions.py,sha256=ugI_X1XNpikAiL8zIggBjcx6q7WvOpRIgvxHrj2Rhr4,1348
 cognite/neat/workflows/base.py,sha256=2cSnxfc9GSoTluneTWLJbE9rImp0wJt8--LHkQHQfi4,26800
@@ -309,8 +310,8 @@ cognite/neat/workflows/steps_registry.py,sha256=fkTX14ZA7_gkUYfWIlx7A1XbCidvqR23
 cognite/neat/workflows/tasks.py,sha256=dqlJwKAb0jlkl7abbY8RRz3m7MT4SK8-7cntMWkOYjw,788
 cognite/neat/workflows/triggers.py,sha256=_BLNplzoz0iic367u1mhHMHiUrCwP-SLK6_CZzfODX0,7071
 cognite/neat/workflows/utils.py,sha256=gKdy3RLG7ctRhbCRwaDIWpL9Mi98zm56-d4jfHDqP1E,453
-cognite_neat-0.84.1.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.84.1.dist-info/METADATA,sha256=i54w9dUQS9DCWAsl2IR-P14CUA1uMLpjrdISbJXnL8o,9400
-cognite_neat-0.84.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cognite_neat-0.84.1.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
-cognite_neat-0.84.1.dist-info/RECORD,,
+cognite_neat-0.85.0.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.85.0.dist-info/METADATA,sha256=v0E853i0iw38J4bJSXaqj-K7ZLL9aBaTO4roAkCu-VE,9493
+cognite_neat-0.85.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cognite_neat-0.85.0.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
+cognite_neat-0.85.0.dist-info/RECORD,,