cognite-neat 0.85.5__py3-none-any.whl → 0.85.7__py3-none-any.whl

cognite/neat/_version.py

@@ -1 +1 @@
-__version__ = "0.85.5"
+__version__ = "0.85.7"

cognite/neat/app/api/routers/data_exploration.py

@@ -17,7 +17,7 @@ from cognite.neat.app.api.data_classes.rest import (
 from cognite.neat.app.api.utils.data_mapping import rdf_result_to_api_response
 from cognite.neat.app.api.utils.query_templates import query_templates
 from cognite.neat.legacy.graph.transformations import query_generator
-from cognite.neat.utils.utils import remove_namespace
+from cognite.neat.utils.utils import remove_namespace_from_uri
 from cognite.neat.workflows.steps.data_contracts import RulesData, SolutionGraph, SourceGraph
 
 router = APIRouter()
@@ -51,7 +51,7 @@ def get_datatype_properties(request: DatatypePropertyRequest):
             {
                 "id": row[rdflib.Variable("property")],
                 "count": int(row[rdflib.Variable("occurrence")]),
-                "name": remove_namespace(row[rdflib.Variable("property")]),
+                "name": remove_namespace_from_uri(row[rdflib.Variable("property")]),
             }
             for row in results["rows"]
         ]

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

@@ -1,4 +1,4 @@
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from datetime import datetime, timezone
 from pathlib import Path
 from typing import cast
@@ -19,15 +19,19 @@ class AssetsExtractor(BaseExtractor):
     Args:
         assets (Iterable[Asset]): An iterable of assets.
         namespace (Namespace, optional): The namespace to use. Defaults to DEFAULT_NAMESPACE.
+        to_type (Callable[[Asset], str | None], optional): A function to convert an asset to a type. Defaults to None.
+            If None or if the function returns None, the asset will be set to the default type "Asset".
     """
 
     def __init__(
         self,
         assets: Iterable[Asset],
         namespace: Namespace | None = None,
+        to_type: Callable[[Asset], str | None] | None = None,
     ):
         self.namespace = namespace or DEFAULT_NAMESPACE
         self.assets = assets
+        self.to_type = to_type
 
     @classmethod
     def from_dataset(
@@ -35,29 +39,42 @@ class AssetsExtractor(BaseExtractor):
         client: CogniteClient,
         data_set_external_id: str,
         namespace: Namespace | None = None,
+        to_type: Callable[[Asset], str | None] | None = None,
     ):
-        return cls(cast(Iterable[Asset], client.assets(data_set_external_ids=data_set_external_id)), namespace)
+        return cls(cast(Iterable[Asset], client.assets(data_set_external_ids=data_set_external_id)), namespace, to_type)
 
     @classmethod
-    def from_hierarchy(cls, client: CogniteClient, root_asset_external_id: str, namespace: Namespace | None = None):
-        return cls(cast(Iterable[Asset], client.assets(asset_subtree_external_ids=root_asset_external_id)), namespace)
+    def from_hierarchy(
+        cls,
+        client: CogniteClient,
+        root_asset_external_id: str,
+        namespace: Namespace | None = None,
+        to_type: Callable[[Asset], str | None] | None = None,
+    ):
+        return cls(
+            cast(Iterable[Asset], client.assets(asset_subtree_external_ids=root_asset_external_id)), namespace, to_type
+        )
 
     @classmethod
-    def from_file(cls, file_path: str, namespace: Namespace | None = None):
-        return cls(AssetList.load(Path(file_path).read_text()), namespace)
+    def from_file(
+        cls, file_path: str, namespace: Namespace | None = None, to_type: Callable[[Asset], str] | None = None
+    ):
+        return cls(AssetList.load(Path(file_path).read_text()), namespace, to_type)
 
     def extract(self) -> Iterable[Triple]:
         """Extracts an asset with the given asset_id."""
         for asset in self.assets:
             yield from self._asset2triples(asset, self.namespace)
 
-    @classmethod
-    def _asset2triples(cls, asset: Asset, namespace: Namespace) -> list[Triple]:
+    def _asset2triples(self, asset: Asset, namespace: Namespace) -> list[Triple]:
         """Converts an asset to triples."""
         id_ = namespace[f"Asset_{asset.id}"]
 
         # Set rdf type
-        triples: list[Triple] = [(id_, RDF.type, namespace["Asset"])]
+        type_ = "Asset"
+        if self.to_type:
+            type_ = self.to_type(asset) or type_
+        triples: list[Triple] = [(id_, RDF.type, namespace[type_])]
 
         # Create attributes
         if asset.name:

cognite/neat/graph/extractors/_mock_graph_generator.py

@@ -17,7 +17,7 @@ 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, EntityTypes
 from cognite.neat.rules.models.information import InformationProperty
-from cognite.neat.utils.utils import remove_namespace
+from cognite.neat.utils.utils import remove_namespace_from_uri
 
 from ._base import BaseExtractor
 
@@ -258,7 +258,11 @@ def _generate_mock_data_property_triples(
         # generate string
         else:
             triples.append(
-                (id_, URIRef(namespace[property_]), Literal(f"{property_}-{remove_namespace(id_).split('-')[-1]}"))
+                (
+                    id_,
+                    URIRef(namespace[property_]),
+                    Literal(f"{property_}-{remove_namespace_from_uri(id_).split('-')[-1]}"),
+                )
             )
     return triples
 

cognite/neat/graph/loaders/_base.py

@@ -65,11 +65,11 @@ class CDFLoader(BaseLoader[T_Output]):
                 items.append(result)
 
             if len(items) >= self._UPLOAD_BATCH_SIZE:
-                yield self._upload_to_cdf(client, items, dry_run, issues)
+                yield from self._upload_to_cdf(client, items, dry_run, issues)
                 issues = NeatIssueList[NeatIssue]()
                 items = []
         if items:
-            yield self._upload_to_cdf(client, items, dry_run, issues)
+            yield from self._upload_to_cdf(client, items, dry_run, issues)
 
     @abstractmethod
     def _get_required_capabilities(self) -> list[Capability]:
@@ -82,5 +82,5 @@ class CDFLoader(BaseLoader[T_Output]):
         items: list[T_Output],
         dry_run: bool,
         read_issues: NeatIssueList,
-    ) -> UploadResult:
+    ) -> Iterable[UploadResult]:
         raise NotImplementedError

cognite/neat/graph/loaders/_rdf2dms.py

@@ -1,4 +1,3 @@
-import itertools
 import json
 from collections import defaultdict
 from collections.abc import Iterable, Sequence
@@ -263,8 +262,7 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
         items: list[dm.InstanceApply],
         dry_run: bool,
         read_issues: NeatIssueList,
-    ) -> UploadResult:
-        result = UploadResult[InstanceId](name=type(self).__name__, issues=read_issues)
+    ) -> Iterable[UploadResult]:
         try:
             nodes = [item for item in items if isinstance(item, dm.NodeApply)]
             edges = [item for item in items if isinstance(item, dm.EdgeApply)]
@@ -276,18 +274,22 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
                 skip_on_version_conflict=True,
             )
         except CogniteAPIError as e:
+            result = UploadResult[InstanceId](name="Instances", issues=read_issues)
             result.error_messages.append(str(e))
             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)
+            yield result
         else:
-            for instance in itertools.chain(upserted.nodes, upserted.edges):
-                if instance.was_modified and instance.created_time == instance.last_updated_time:
-                    result.created.add(instance.as_id())
-                elif instance.was_modified:
-                    result.changed.add(instance.as_id())
-                else:
-                    result.unchanged.add(instance.as_id())
-        return result
+            for instance_type, instances in {"Nodes": upserted.nodes, "Edges": upserted.edges}.items():
+                result = UploadResult[InstanceId](name=instance_type, issues=read_issues)
+                for instance in instances:  # type: ignore[attr-defined]
+                    if instance.was_modified and instance.created_time == instance.last_updated_time:
+                        result.created.add(instance.as_id())
+                    elif instance.was_modified:
+                        result.changed.add(instance.as_id())
+                    else:
+                        result.unchanged.add(instance.as_id())
+                yield result
 
 
 def _triples2dictionary(

cognite/neat/graph/queries/_base.py

@@ -1,12 +1,12 @@
 import warnings
-from typing import cast
+from typing import Literal, cast, overload
 
 from rdflib import RDF, Graph, URIRef
 from rdflib.query import ResultRow
 
 from cognite.neat.rules.models.entities import ClassEntity
 from cognite.neat.rules.models.information import InformationRules
-from cognite.neat.utils.utils import remove_namespace
+from cognite.neat.utils.utils import remove_namespace_from_uri
 
 from ._construct import build_construct_query
 
@@ -66,7 +66,7 @@ class Queries:
             result = self.graph.query(query)
 
             # We cannot include the RDF.type in case there is a neat:type property
-            return [remove_namespace(*triple) for triple in result if triple[1] != RDF.type]  # type: ignore[misc, index]
+            return [remove_namespace_from_uri(*triple) for triple in result if triple[1] != RDF.type]  # type: ignore[misc, index]
         else:
             warnings.warn("No rules found for the graph store, returning empty list.", stacklevel=2)
             return []
@@ -93,7 +93,7 @@ class Queries:
             result = self.graph.query(query)
 
             # We cannot include the RDF.type in case there is a neat:type property
-            return [remove_namespace(*triple) for triple in result if triple[1] != RDF.type]  # type: ignore[misc, index]
+            return [remove_namespace_from_uri(*triple) for triple in result if triple[1] != RDF.type]  # type: ignore[misc, index]
         else:
             warnings.warn("No rules found for the graph store, returning empty list.", stacklevel=2)
             return []
@@ -110,14 +110,24 @@ class Queries:
         query = f"SELECT ?subject ?predicate ?object WHERE {{ ?subject ?predicate ?object }} LIMIT {limit}"
         return cast(list[ResultRow], list(self.graph.query(query)))
 
-    def list_types(self, limit: int = 25) -> list[ResultRow]:
+    @overload
+    def list_types(self, remove_namespace: Literal[False] = False, limit: int = 25) -> list[ResultRow]: ...
+
+    @overload
+    def list_types(self, remove_namespace: Literal[True], limit: int = 25) -> list[str]: ...
+
+    def list_types(self, remove_namespace: bool = False, limit: int = 25) -> list[ResultRow] | list[str]:
         """List types in the graph store
 
         Args:
             limit: Max number of types to return, by default 25
+            remove_namespace: Whether to remove the namespace from the type, by default False
 
         Returns:
             List of types
         """
         query = f"SELECT DISTINCT ?type WHERE {{ ?subject a ?type }} LIMIT {limit}"
-        return cast(list[ResultRow], list(self.graph.query(query)))
+        result = cast(list[ResultRow], list(self.graph.query(query)))
+        if remove_namespace:
+            return [remove_namespace_from_uri(res[0]) for res in result]
+        return result

cognite/neat/graph/queries/_shared.py

@@ -11,7 +11,7 @@ from cognite.neat.rules.models._rdfpath import (
     Hop,
     Step,
 )
-from cognite.neat.utils.utils import remove_namespace, uri_to_short_form
+from cognite.neat.utils.utils import remove_namespace_from_uri, uri_to_short_form
 
 if sys.version_info >= (3, 11):
     from typing import Self
@@ -146,7 +146,7 @@ def triples2dictionary(triples: Iterable[tuple[URIRef, URIRef, str | URIRef]]) -
         value: str
         uri: URIRef
 
-        id_, property_, value = remove_namespace(*triple)  # type: ignore[misc]
+        id_, property_, value = remove_namespace_from_uri(*triple)  # type: ignore[misc]
         uri = triple[0]
 
         if uri not in dictionary:

cognite/neat/legacy/graph/extractors/_mock_graph_generator.py

@@ -20,7 +20,7 @@ from cognite.neat.legacy.rules.analysis import (
 from cognite.neat.legacy.rules.exporters._rules2rules import subset_rules
 from cognite.neat.legacy.rules.models import Rules
 from cognite.neat.legacy.rules.models.value_types import XSD_VALUE_TYPE_MAPPINGS
-from cognite.neat.utils.utils import remove_namespace
+from cognite.neat.utils.utils import remove_namespace_from_uri
 
 from ._base import BaseExtractor
 
@@ -247,7 +247,9 @@ def _generate_mock_data_property_triples(
             triples.append((id_, URIRef(namespace[property_]), Literal(numpy.float32(random.uniform(1, 1983)))))
         # generate string
         else:
-            triples.append((id_, URIRef(namespace[property_]), Literal(remove_namespace(id_).replace("-", " "))))
+            triples.append(
+                (id_, URIRef(namespace[property_]), Literal(remove_namespace_from_uri(id_).replace("-", " ")))
+            )
     return triples
 
 

cognite/neat/legacy/graph/loaders/_asset_loader.py

@@ -15,7 +15,7 @@ from rdflib.query import ResultRow
 from cognite.neat.legacy.graph.stores import NeatGraphStoreBase
 from cognite.neat.legacy.rules.models import Rules
 from cognite.neat.legacy.rules.models.rules import Property
-from cognite.neat.utils import remove_namespace
+from cognite.neat.utils import remove_namespace_from_uri
 from cognite.neat.utils.utils import epoch_now_ms
 
 from ._base import CogniteLoader
@@ -166,7 +166,7 @@ class AssetLoader(CogniteLoader[AssetResource]):
             logging.debug(f"Class <{class_name}> has {len(result)} instances")
 
             for instance_uri, properties_values in groupby(result, lambda x: x[0]):
-                instance_id = remove_namespace(instance_uri)
+                instance_id = remove_namespace_from_uri(instance_uri)
                 values_by_property = self._prepare_instance_data(instance_id, properties_values)
                 try:
                     asset = self._load_asset(
@@ -195,7 +195,7 @@ class AssetLoader(CogniteLoader[AssetResource]):
                     relationships = self._load_relationships(
                         properties_by_class_name[class_name],
                         values_by_property,
-                        remove_namespace(instance_id),
+                        remove_namespace_from_uri(instance_id),
                         class_name,
                     )
                 except Exception as e:
@@ -342,11 +342,11 @@ class AssetLoader(CogniteLoader[AssetResource]):
             A dictionary with property type as key and a list of values as value.
         """
         properties_value_tuples: list[tuple[str, str]] = [
-            remove_namespace(prop, value)  # type: ignore[misc]
+            remove_namespace_from_uri(prop, value)  # type: ignore[misc]
             for _, prop, value in properties_values
         ]
         # We add an identifier which will be used as fallback for external_id
-        properties_value_tuples.append((self._identifier, remove_namespace(instance_id)))
+        properties_value_tuples.append((self._identifier, remove_namespace_from_uri(instance_id)))
         values_by_property: dict[str, str | list[str]] = {}
         for prop, values in groupby(sorted(properties_value_tuples), lambda x: x[0]):
             values_list: list[str] = [value for _, value in values]  # type: ignore[misc, has-type]

cognite/neat/legacy/graph/loaders/core/rdf_to_assets.py

@@ -18,7 +18,7 @@ from rdflib.term import URIRef
 from cognite.neat.legacy.graph.loaders.core.models import AssetTemplate
 from cognite.neat.legacy.graph.stores import NeatGraphStoreBase
 from cognite.neat.legacy.rules.models.rules import Property, Rules
-from cognite.neat.utils.utils import chunker, datetime_utc_now, remove_namespace, retry_decorator
+from cognite.neat.utils.utils import chunker, datetime_utc_now, remove_namespace_from_uri, retry_decorator
 
 if sys.version_info >= (3, 11):
     from datetime import UTC
@@ -320,13 +320,13 @@ def _list2dict(class_instance: list) -> dict[str, Any]:
 
     class_instance_dict: dict[str, Any] = {}
     for property_value_pair in class_instance:
-        property_ = remove_namespace(property_value_pair[0])
+        property_ = remove_namespace_from_uri(property_value_pair[0])
 
         # Remove namespace from URIRef values, otherwise convert Literal to string
         # ideally this should react upon property type provided in sheet
         # however Assets only support string values
         value = (
-            remove_namespace(property_value_pair[1])
+            remove_namespace_from_uri(property_value_pair[1])
             if isinstance(property_value_pair[1], URIRef)
             else str(property_value_pair[1])
         )
@@ -440,7 +440,7 @@ def rdf2assets(
                 progress_counter += 1
             except Exception as ValidationError:
                 logging.error(
-                    f"Skipping class <{class_}> instance <{remove_namespace(str(instance_id))}>, "
+                    f"Skipping class <{class_}> instance <{remove_namespace_from_uri(str(instance_id))}>, "
                     f"reason:\n{ValidationError}\n"
                 )
                 if stop_on_exception:

cognite/neat/legacy/graph/loaders/core/rdf_to_relationships.py

@@ -14,7 +14,7 @@ from cognite.neat.legacy.graph.loaders.core.models import RelationshipDefinition
 from cognite.neat.legacy.graph.loaders.core.rdf_to_assets import _categorize_cdf_assets
 from cognite.neat.legacy.graph.stores import NeatGraphStoreBase
 from cognite.neat.legacy.rules.models.rules import Rules
-from cognite.neat.utils.utils import chunker, datetime_utc_now, epoch_now_ms, remove_namespace, retry_decorator
+from cognite.neat.utils.utils import chunker, datetime_utc_now, epoch_now_ms, remove_namespace_from_uri, retry_decorator
 
 
 def define_relationships(rules: Rules, data_set_id: int, stop_on_exception: bool = False) -> RelationshipDefinitions:
@@ -150,7 +150,7 @@ def rdf2relationships(
             relationship_data_frame.rename(columns={0: "source_external_id", 1: "target_external_id"}, inplace=True)
 
             # removes namespace
-            relationship_data_frame = relationship_data_frame.map(remove_namespace)  # type: ignore[operator]
+            relationship_data_frame = relationship_data_frame.map(remove_namespace_from_uri)  # type: ignore[operator]
 
             # adding prefix
             if relationship_external_id_prefix:

cognite/neat/legacy/graph/transformations/query_generator/sparql.py

@@ -21,7 +21,7 @@ from cognite.neat.legacy.rules.models.rdfpath import (
     parse_traversal,
 )
 from cognite.neat.legacy.rules.models.rules import Rules
-from cognite.neat.utils.utils import remove_namespace
+from cognite.neat.utils.utils import remove_namespace_from_uri
 
 
 def _generate_prefix_header(prefixes: dict[str, Namespace] = PREFIXES) -> str:
@@ -529,7 +529,7 @@ def triples2dictionary(triples: Iterable[tuple[URIRef, URIRef, str | URIRef]]) -
         property_: str
         value: str
         uri: URIRef
-        id_, property_, value = remove_namespace(*triple)  # type: ignore[misc]
+        id_, property_, value = remove_namespace_from_uri(*triple)  # type: ignore[misc]
         uri = triple[0]
 
         if uri not in dictionary:

cognite/neat/legacy/graph/transformations/transformer.py

@@ -24,7 +24,7 @@ from cognite.neat.legacy.rules.models.rdfpath import (
     parse_rule,
 )
 from cognite.neat.legacy.rules.models.rules import Rules
-from cognite.neat.utils.utils import remove_namespace
+from cognite.neat.utils.utils import remove_namespace_from_uri
 
 prom_total_proc_rules_g = Gauge("neat_total_processed_rules", "Number of processed rules", ["state"])
 rules_processing_timing_metric = Gauge(
@@ -228,7 +228,7 @@ def domain2app_knowledge_graph(
                 # in the target graph then we should remove namespace from the object URI and store it as literal
                 if isinstance(rule.traversal, AllReferences) and rule_definition.property_type == "DatatypeProperty":
                     instance_df[EntityTypes.object] = instance_df[EntityTypes.object].apply(
-                        lambda x: Literal(remove_namespace(x))
+                        lambda x: Literal(remove_namespace_from_uri(x))
                     )
 
                 if isinstance(rule, RawLookup):

cognite/neat/legacy/rules/exporters/_rules2ontology.py

@@ -14,7 +14,7 @@ from cognite.neat.legacy.rules.exporters._base import BaseExporter
 from cognite.neat.legacy.rules.exporters._validation import are_properties_redefined
 from cognite.neat.legacy.rules.models.rules import Class, Metadata, Property, Rules
 from cognite.neat.legacy.rules.models.value_types import XSD_VALUE_TYPE_MAPPINGS
-from cognite.neat.utils.utils import generate_exception_report, remove_namespace
+from cognite.neat.utils.utils import generate_exception_report, remove_namespace_from_uri
 
 if sys.version_info >= (3, 11):
     from typing import Self
@@ -322,7 +322,7 @@ class OWLProperty(OntologyModel):
         if len(v) > 1:
             warnings.warn(
                 exceptions.OntologyMultiTypeProperty(
-                    remove_namespace(info.data["id_"]), [remove_namespace(t) for t in v]
+                    remove_namespace_from_uri(info.data["id_"]), [remove_namespace_from_uri(t) for t in v]
                 ).message,
                 category=exceptions.OntologyMultiTypeProperty,
                 stacklevel=2,
@@ -334,7 +334,7 @@ class OWLProperty(OntologyModel):
         if len(v) > 1:
             warnings.warn(
                 exceptions.OntologyMultiRangeProperty(
-                    remove_namespace(info.data["id_"]), [remove_namespace(t) for t in v]
+                    remove_namespace_from_uri(info.data["id_"]), [remove_namespace_from_uri(t) for t in v]
                 ).message,
                 category=exceptions.OntologyMultiRangeProperty,
                 stacklevel=2,
@@ -346,7 +346,7 @@ class OWLProperty(OntologyModel):
         if len(v) > 1:
             warnings.warn(
                 exceptions.OntologyMultiDomainProperty(
-                    remove_namespace(info.data["id_"]), [remove_namespace(t) for t in v]
+                    remove_namespace_from_uri(info.data["id_"]), [remove_namespace_from_uri(t) for t in v]
                 ).message,
                 category=exceptions.OntologyMultiDomainProperty,
                 stacklevel=2,
@@ -357,7 +357,7 @@ class OWLProperty(OntologyModel):
     def has_multi_name(cls, v, info: ValidationInfo):
         if len(v) > 1:
             warnings.warn(
-                exceptions.OntologyMultiLabeledProperty(remove_namespace(info.data["id_"]), v).message,
+                exceptions.OntologyMultiLabeledProperty(remove_namespace_from_uri(info.data["id_"]), v).message,
                 category=exceptions.OntologyMultiLabeledProperty,
                 stacklevel=2,
             )
@@ -367,7 +367,7 @@ class OWLProperty(OntologyModel):
     def has_multi_comment(cls, v, info: ValidationInfo):
         if len(v) > 1:
             warnings.warn(
-                exceptions.OntologyMultiDefinitionProperty(remove_namespace(info.data["id_"])).message,
+                exceptions.OntologyMultiDefinitionProperty(remove_namespace_from_uri(info.data["id_"])).message,
                 category=exceptions.OntologyMultiDefinitionProperty,
                 stacklevel=2,
             )

cognite/neat/legacy/rules/importers/_graph2rules.py

@@ -14,7 +14,7 @@ from cognite.neat.constants import PREFIXES
 from cognite.neat.legacy.rules import exceptions
 from cognite.neat.legacy.rules.exporters._rules2rules import to_dms_name
 from cognite.neat.legacy.rules.models.tables import Tables
-from cognite.neat.utils.utils import get_namespace, remove_namespace, uri_to_short_form
+from cognite.neat.utils.utils import get_namespace, remove_namespace_from_uri, uri_to_short_form
 
 from ._base import BaseImporter
 
@@ -173,7 +173,7 @@ def _graph_to_data_model_dict(graph: Graph, max_number_of_instance: int = -1) ->
 
     for class_ in _get_class_ids(graph):
         _add_uri_namespace_to_prefixes(class_, prefixes)
-        class_name = remove_namespace(class_)
+        class_name = remove_namespace_from_uri(class_)
 
         if class_name in data_model:
             warnings.warn(
@@ -187,7 +187,7 @@ def _graph_to_data_model_dict(graph: Graph, max_number_of_instance: int = -1) ->
 
         for instance in _get_class_instance_ids(graph, class_, max_number_of_instance):
             for property_, occurrence, data_type, object_type in _define_instance_properties(graph, instance):
-                property_name = remove_namespace(property_)
+                property_name = remove_namespace_from_uri(property_)
                 _add_uri_namespace_to_prefixes(property_, prefixes)
 
                 type_ = data_type if data_type else object_type
@@ -196,7 +196,7 @@ def _graph_to_data_model_dict(graph: Graph, max_number_of_instance: int = -1) ->
                 if not type_:
                     continue
 
-                type_name = remove_namespace(type_)
+                type_name = remove_namespace_from_uri(type_)
                 _add_uri_namespace_to_prefixes(type_, prefixes)
 
                 if property_name not in data_model[class_name]["properties"]:

cognite/neat/legacy/rules/importers/_owl2rules/_owl2classes.py

@@ -4,7 +4,7 @@ import numpy as np
 import pandas as pd
 from rdflib import OWL, Graph
 
-from cognite.neat.utils.utils import remove_namespace
+from cognite.neat.utils.utils import remove_namespace_from_uri
 
 
 def parse_owl_classes(graph: Graph, make_compliant: bool = False, language: str = "en") -> pd.DataFrame:
@@ -84,10 +84,10 @@ def _parse_raw_dataframe(query_results: list[tuple]) -> pd.DataFrame:
     df.replace(np.nan, "", regex=True, inplace=True)
 
     df.Source = df.Class
-    df.Class = df.Class.apply(lambda x: remove_namespace(x))
+    df.Class = df.Class.apply(lambda x: remove_namespace_from_uri(x))
     df["Source Entity Name"] = df.Class
     df["Match"] = len(df) * ["exact"]
-    df["Parent Class"] = df["Parent Class"].apply(lambda x: remove_namespace(x))
+    df["Parent Class"] = df["Parent Class"].apply(lambda x: remove_namespace_from_uri(x))
 
     return df
 

cognite/neat/legacy/rules/importers/_owl2rules/_owl2properties.py

@@ -4,7 +4,7 @@ import numpy as np
 import pandas as pd
 from rdflib import Graph
 
-from cognite.neat.utils.utils import remove_namespace
+from cognite.neat.utils.utils import remove_namespace_from_uri
 
 from ._owl2classes import _data_type_property_class, _object_property_class, _thing_class
 
@@ -92,12 +92,12 @@ def _parse_raw_dataframe(query_results: list[tuple]) -> pd.DataFrame:
     df.replace(np.nan, "", regex=True, inplace=True)
 
     df.Source = df.Property
-    df.Class = df.Class.apply(lambda x: remove_namespace(x))
-    df.Property = df.Property.apply(lambda x: remove_namespace(x))
-    df.Type = df.Type.apply(lambda x: remove_namespace(x))
+    df.Class = df.Class.apply(lambda x: remove_namespace_from_uri(x))
+    df.Property = df.Property.apply(lambda x: remove_namespace_from_uri(x))
+    df.Type = df.Type.apply(lambda x: remove_namespace_from_uri(x))
     df["Source Entity Name"] = df.Property
     df["Match Type"] = len(df) * ["exact"]
-    df["_property_type"] = df["_property_type"].apply(lambda x: remove_namespace(x))
+    df["_property_type"] = df["_property_type"].apply(lambda x: remove_namespace_from_uri(x))
 
     return df
 

cognite/neat/rules/analysis/__init__.py

@@ -1,3 +1,6 @@
-from ._information_rules import InformationArchitectRulesAnalysis
+from ._information_rules import (
+    AssetArchitectRulesAnalysis,
+    InformationArchitectRulesAnalysis,
+)
 
-__all__ = ["InformationArchitectRulesAnalysis"]
+__all__ = ["InformationArchitectRulesAnalysis", "AssetArchitectRulesAnalysis"]

cognite/neat/rules/analysis/_base.py

@@ -1,15 +1,9 @@
-import sys
 from abc import ABC, abstractmethod
 from typing import Generic, TypeVar
 
 from cognite.neat.rules._shared import Rules
 from cognite.neat.rules.models.entities import ClassEntity
 
-if sys.version_info >= (3, 11):
-    from enum import StrEnum
-else:
-    from backports.strenum import StrEnum
-
 T_Rules = TypeVar("T_Rules", bound=Rules)
 
 
@@ -17,9 +11,3 @@ class BaseAnalysis(ABC, Generic[T_Rules]):
     @abstractmethod
     def subset_rules(self, desired_classes: set[ClassEntity]) -> T_Rules:
         raise NotImplementedError()
-
-
-class DataModelingScenario(StrEnum):
-    from_scratch = "from scratch"
-    build_solution = "build solution"
-    extend_reference = "extend reference"

cognite/neat/rules/analysis/_information_rules.py

@@ -2,25 +2,37 @@ import itertools
 import logging
 import warnings
 from collections import defaultdict
-from typing import Any
+from typing import Any, Generic, TypeVar
 
 import pandas as pd
 from pydantic import ValidationError
 
 from cognite.neat.rules.models import SchemaCompleteness
 from cognite.neat.rules.models._rdfpath import RDFPath
-from cognite.neat.rules.models.entities import ClassEntity, EntityTypes, ParentClassEntity, ReferenceEntity
-from cognite.neat.rules.models.information import InformationClass, InformationProperty, InformationRules
+from cognite.neat.rules.models.asset import AssetClass, AssetProperty, AssetRules
+from cognite.neat.rules.models.entities import (
+    AssetEntity,
+    ClassEntity,
+    EntityTypes,
+    ParentClassEntity,
+    ReferenceEntity,
+    RelationshipEntity,
+)
+from cognite.neat.rules.models.information import (
+    InformationClass,
+    InformationProperty,
+    InformationRules,
+)
 from cognite.neat.utils.utils import get_inheritance_path
 
-from ._base import BaseAnalysis
+T_Rules = TypeVar("T_Rules", InformationRules, AssetRules)
+T_Property = TypeVar("T_Property", InformationProperty, AssetProperty)
+T_Class = TypeVar("T_Class", InformationClass, AssetClass)
 
 
-class InformationArchitectRulesAnalysis(BaseAnalysis):
-    """Assumes analysis over only the complete schema"""
-
-    def __init__(self, rules: InformationRules):
-        self.rules = rules
+class _SharedAnalysis(Generic[T_Rules, T_Property, T_Class]):
+    def __init__(self, rules: T_Rules):
+        self.rules: T_Rules = rules
 
     @property
     def directly_referred_classes(self) -> set[ClassEntity]:
@@ -65,9 +77,7 @@ class InformationArchitectRulesAnalysis(BaseAnalysis):
 
         return class_subclass_pairs
 
-    def classes_with_properties(
-        self, consider_inheritance: bool = False
-    ) -> dict[ClassEntity, list[InformationProperty]]:
+    def classes_with_properties(self, consider_inheritance: bool = False) -> dict[ClassEntity, list[T_Property]]:
         """Returns classes that have been defined in the data model.
 
         Args:
@@ -85,10 +95,10 @@ class InformationArchitectRulesAnalysis(BaseAnalysis):
             it will not be included in the returned dictionary.
         """
 
-        class_property_pairs: dict[ClassEntity, list[InformationProperty]] = defaultdict(list)
+        class_property_pairs: dict[ClassEntity, list[T_Property]] = defaultdict(list)
 
         for property_ in self.rules.properties:
-            class_property_pairs[property_.class_].append(property_)
+            class_property_pairs[property_.class_].append(property_)  # type: ignore
 
         if consider_inheritance:
             class_parent_pairs = self.class_parent_pairs()
@@ -106,7 +116,7 @@ class InformationArchitectRulesAnalysis(BaseAnalysis):
     def _add_inherited_properties(
         cls,
         class_: ClassEntity,
-        class_property_pairs: dict[ClassEntity, list[InformationProperty]],
+        class_property_pairs: dict[ClassEntity, list[T_Property]],
         class_parent_pairs: dict[ClassEntity, list[ParentClassEntity]],
     ):
         inheritance_path = get_inheritance_path(class_, class_parent_pairs)
@@ -130,7 +140,7 @@ class InformationArchitectRulesAnalysis(BaseAnalysis):
 
     def class_property_pairs(
         self, only_rdfpath: bool = False, consider_inheritance: bool = False
-    ) -> dict[ClassEntity, dict[str, InformationProperty]]:
+    ) -> dict[ClassEntity, dict[str, T_Property]]:
         """Returns a dictionary of classes with a dictionary of properties associated with them.
 
         Args:
@@ -193,7 +203,14 @@ class InformationArchitectRulesAnalysis(BaseAnalysis):
             Dataframe with the class linkage of the data model
         """
 
-        class_linkage = pd.DataFrame(columns=["source_class", "target_class", "connecting_property", "max_occurrence"])
+        class_linkage = pd.DataFrame(
+            columns=[
+                "source_class",
+                "target_class",
+                "connecting_property",
+                "max_occurrence",
+            ]
+        )
 
         class_property_pairs = self.classes_with_properties(consider_inheritance)
         properties = list(itertools.chain.from_iterable(class_property_pairs.values()))
@@ -286,21 +303,21 @@ class InformationArchitectRulesAnalysis(BaseAnalysis):
 
     def as_property_dict(
         self,
-    ) -> dict[str, list[InformationProperty]]:
+    ) -> dict[str, list[T_Property]]:
         """This is used to capture all definitions of a property in the data model."""
-        property_dict: dict[str, list[InformationProperty]] = defaultdict(list)
+        property_dict: dict[str, list[T_Property]] = defaultdict(list)
         for definition in self.rules.properties:
-            property_dict[definition.property_].append(definition)
+            property_dict[definition.property_].append(definition)  # type: ignore
         return property_dict
 
-    def as_class_dict(self) -> dict[str, InformationClass]:
+    def as_class_dict(self) -> dict[str, T_Class]:
         """This is to simplify access to classes through dict."""
-        class_dict: dict[str, InformationClass] = {}
+        class_dict: dict[str, T_Class] = {}
         for definition in self.rules.classes:
-            class_dict[str(definition.class_.suffix)] = definition
+            class_dict[str(definition.class_.suffix)] = definition  # type: ignore
         return class_dict
 
-    def subset_rules(self, desired_classes: set[ClassEntity]) -> InformationRules:
+    def subset_rules(self, desired_classes: set[ClassEntity]) -> T_Rules:
         """
         Subset rules to only include desired classes and their properties.
 
@@ -352,7 +369,8 @@ class InformationArchitectRulesAnalysis(BaseAnalysis):
         if impossible_classes:
             logging.warning(f"Could not find the following classes defined in the data model: {impossible_classes}")
             warnings.warn(
-                f"Could not find the following classes defined in the data model: {impossible_classes}", stacklevel=2
+                f"Could not find the following classes defined in the data model: {impossible_classes}",
+                stacklevel=2,
             )
 
         reduced_data_model: dict[str, Any] = {
@@ -373,8 +391,79 @@ class InformationArchitectRulesAnalysis(BaseAnalysis):
                 reduced_data_model["properties"].extend(properties)
 
         try:
-            return InformationRules(**reduced_data_model)
+            return type(self.rules)(**reduced_data_model)
         except ValidationError as e:
             warnings.warn(f"Reduced data model is not complete: {e}", stacklevel=2)
             reduced_data_model["metadata"].schema_ = SchemaCompleteness.partial
-            return InformationRules.model_construct(**reduced_data_model)
+            return type(self.rules).model_construct(**reduced_data_model)
+
+
+class InformationArchitectRulesAnalysis(_SharedAnalysis[InformationRules, InformationProperty, InformationClass]):
+    """Assumes analysis over only the complete schema"""
+
+    ...
+
+
+class AssetArchitectRulesAnalysis(_SharedAnalysis[AssetRules, AssetProperty, AssetClass]):
+    """Assumes analysis over only the complete schema"""
+
+    def class_property_pairs(
+        self,
+        only_rdfpath: bool = False,
+        consider_inheritance: bool = False,
+        implementation_type: EntityTypes = EntityTypes.asset,
+    ) -> dict[ClassEntity, dict[str, AssetProperty]]:
+        class_property_pairs = {}
+
+        T_implementation = AssetEntity if implementation_type == EntityTypes.asset else RelationshipEntity
+
+        for class_, properties in self.classes_with_properties(consider_inheritance).items():
+            processed_properties = {}
+            for property_ in properties:
+                if property_.property_ in processed_properties:
+                    # TODO: use appropriate Warning class from _exceptions.py
+                    # if missing make one !
+                    warnings.warn(
+                        f"Property {property_.property_} for {class_} has been defined more than once!"
+                        " Only the first definition will be considered, skipping the rest..",
+                        stacklevel=2,
+                    )
+                    continue
+
+                if (
+                    property_.implementation
+                    and any(isinstance(implementation, T_implementation) for implementation in property_.implementation)
+                    and (not only_rdfpath or (only_rdfpath and isinstance(property_.transformation, RDFPath)))
+                ):
+                    implementation = [
+                        implementation
+                        for implementation in property_.implementation
+                        if isinstance(implementation, T_implementation)
+                    ]
+
+                    processed_properties[property_.property_] = property_.model_copy(
+                        deep=True, update={"implementation": implementation}
+                    )
+
+            if processed_properties:
+                class_property_pairs[class_] = processed_properties
+
+        return class_property_pairs
+
+    def asset_definition(
+        self, only_rdfpath: bool = False, consider_inheritance: bool = False
+    ) -> dict[ClassEntity, dict[str, AssetProperty]]:
+        return self.class_property_pairs(
+            consider_inheritance=consider_inheritance,
+            only_rdfpath=only_rdfpath,
+            implementation_type=EntityTypes.asset,
+        )
+
+    def relationship_definition(
+        self, only_rdfpath: bool = False, consider_inheritance: bool = False
+    ) -> dict[ClassEntity, dict[str, AssetProperty]]:
+        return self.class_property_pairs(
+            consider_inheritance=consider_inheritance,
+            only_rdfpath=only_rdfpath,
+            implementation_type=EntityTypes.relationship,
+        )

cognite/neat/rules/exporters/_rules2ontology.py

@@ -20,7 +20,7 @@ from cognite.neat.rules.models.information import (
     InformationProperty,
     InformationRules,
 )
-from cognite.neat.utils.utils import generate_exception_report, remove_namespace
+from cognite.neat.utils.utils import generate_exception_report, remove_namespace_from_uri
 
 from ._base import BaseExporter
 from ._validation import are_properties_redefined
@@ -350,7 +350,7 @@ class OWLProperty(OntologyModel):
         if len(v) > 1:
             warnings.warn(
                 exceptions.OntologyMultiTypeProperty(
-                    remove_namespace(info.data["id_"]), [remove_namespace(t) for t in v]
+                    remove_namespace_from_uri(info.data["id_"]), [remove_namespace_from_uri(t) for t in v]
                 ).message,
                 category=exceptions.OntologyMultiTypeProperty,
                 stacklevel=2,
@@ -362,7 +362,7 @@ class OWLProperty(OntologyModel):
         if len(v) > 1:
             warnings.warn(
                 exceptions.OntologyMultiRangeProperty(
-                    remove_namespace(info.data["id_"]), [remove_namespace(t) for t in v]
+                    remove_namespace_from_uri(info.data["id_"]), [remove_namespace_from_uri(t) for t in v]
                 ).message,
                 category=exceptions.OntologyMultiRangeProperty,
                 stacklevel=2,
@@ -374,7 +374,7 @@ class OWLProperty(OntologyModel):
         if len(v) > 1:
             warnings.warn(
                 exceptions.OntologyMultiDomainProperty(
-                    remove_namespace(info.data["id_"]), [remove_namespace(t) for t in v]
+                    remove_namespace_from_uri(info.data["id_"]), [remove_namespace_from_uri(t) for t in v]
                 ).message,
                 category=exceptions.OntologyMultiDomainProperty,
                 stacklevel=2,
@@ -385,7 +385,7 @@ class OWLProperty(OntologyModel):
     def has_multi_name(cls, v, info: ValidationInfo):
         if len(v) > 1:
             warnings.warn(
-                exceptions.OntologyMultiLabeledProperty(remove_namespace(info.data["id_"]), v).message,
+                exceptions.OntologyMultiLabeledProperty(remove_namespace_from_uri(info.data["id_"]), v).message,
                 category=exceptions.OntologyMultiLabeledProperty,
                 stacklevel=2,
             )
@@ -395,7 +395,7 @@ class OWLProperty(OntologyModel):
     def has_multi_comment(cls, v, info: ValidationInfo):
         if len(v) > 1:
             warnings.warn(
-                exceptions.OntologyMultiDefinitionProperty(remove_namespace(info.data["id_"])).message,
+                exceptions.OntologyMultiDefinitionProperty(remove_namespace_from_uri(info.data["id_"])).message,
                 category=exceptions.OntologyMultiDefinitionProperty,
                 stacklevel=2,
             )

cognite/neat/rules/importers/_base.py

@@ -10,7 +10,11 @@ from pydantic import ValidationError
 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.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
 
@@ -30,7 +34,9 @@ class BaseImporter(ABC):
 
     @abstractmethod
     def to_rules(
-        self, errors: Literal["raise", "continue"] = "continue", role: RoleTypes | None = None
+        self,
+        errors: Literal["raise", "continue"] = "continue",
+        role: RoleTypes | None = None,
     ) -> tuple[Rules | None, IssueList] | Rules:
         """
         Creates `Rules` object from the data for target role.

cognite/neat/rules/importers/_inference2rules.py

@@ -17,7 +17,7 @@ from cognite.neat.rules.models.information import (
     InformationMetadata,
     InformationRulesInput,
 )
-from cognite.neat.utils.utils import get_namespace, remove_namespace, uri_to_short_form
+from cognite.neat.utils.utils import get_namespace, remove_namespace_from_uri, uri_to_short_form
 
 ORDERED_CLASSES_QUERY = """SELECT ?class (count(?s) as ?instances )
                            WHERE { ?s a ?class . }
@@ -142,7 +142,7 @@ class InferenceImporter(BaseImporter):
         for class_uri, no_instances in self.graph.query(ORDERED_CLASSES_QUERY):  # type: ignore[misc]
             self._add_uri_namespace_to_prefixes(cast(URIRef, class_uri), prefixes)
 
-            if (class_id := remove_namespace(class_uri)) in classes:
+            if (class_id := remove_namespace_from_uri(class_uri)) in classes:
                 # handles cases when class id is already present in classes
                 class_id = f"{class_id}_{len(classes)+1}"
 
@@ -164,7 +164,7 @@ class InferenceImporter(BaseImporter):
                 for property_uri, occurrence, data_type_uri, object_type_uri in self.graph.query(  # type: ignore[misc]
                     INSTANCE_PROPERTIES_DEFINITION.replace("instance_id", instance)
                 ):  # type: ignore[misc]
-                    property_id = remove_namespace(property_uri)
+                    property_id = remove_namespace_from_uri(property_uri)
                     self._add_uri_namespace_to_prefixes(cast(URIRef, property_uri), prefixes)
                     value_type_uri = data_type_uri if data_type_uri else object_type_uri
 
@@ -173,7 +173,7 @@ class InferenceImporter(BaseImporter):
                         continue
 
                     self._add_uri_namespace_to_prefixes(cast(URIRef, value_type_uri), prefixes)
-                    value_type_id = remove_namespace(value_type_uri)
+                    value_type_id = remove_namespace_from_uri(value_type_uri)
                     id_ = f"{class_id}:{property_id}"
 
                     definition = {

cognite/neat/rules/importers/_owl2rules/_owl2classes.py

@@ -5,7 +5,7 @@ import pandas as pd
 from rdflib import OWL, Graph
 
 from cognite.neat.rules.models._base import MatchType
-from cognite.neat.utils.utils import remove_namespace
+from cognite.neat.utils.utils import remove_namespace_from_uri
 
 
 def parse_owl_classes(graph: Graph, language: str = "en") -> list[dict]:
@@ -68,10 +68,10 @@ def _parse_raw_dataframe(query_results: list[tuple]) -> pd.DataFrame:
     df.replace(np.nan, "", regex=True, inplace=True)
 
     df.Reference = df.Class
-    df.Class = df.Class.apply(lambda x: remove_namespace(x))
+    df.Class = df.Class.apply(lambda x: remove_namespace_from_uri(x))
     df["Match Type"] = len(df) * [MatchType.exact]
     df["Comment"] = len(df) * [None]
-    df["Parent Class"] = df["Parent Class"].apply(lambda x: remove_namespace(x))
+    df["Parent Class"] = df["Parent Class"].apply(lambda x: remove_namespace_from_uri(x))
 
     return df
 

cognite/neat/rules/importers/_owl2rules/_owl2properties.py

@@ -5,7 +5,7 @@ import pandas as pd
 from rdflib import Graph
 
 from cognite.neat.rules.models._base import MatchType
-from cognite.neat.utils.utils import remove_namespace
+from cognite.neat.utils.utils import remove_namespace_from_uri
 
 from ._owl2classes import _data_type_property_class, _object_property_class, _thing_class
 
@@ -82,12 +82,12 @@ def _parse_raw_dataframe(query_results: list[tuple]) -> pd.DataFrame:
     df.replace(np.nan, "", regex=True, inplace=True)
 
     df.Reference = df.Property
-    df.Class = df.Class.apply(lambda x: remove_namespace(x))
-    df.Property = df.Property.apply(lambda x: remove_namespace(x))
-    df["Value Type"] = df["Value Type"].apply(lambda x: remove_namespace(x))
+    df.Class = df.Class.apply(lambda x: remove_namespace_from_uri(x))
+    df.Property = df.Property.apply(lambda x: remove_namespace_from_uri(x))
+    df["Value Type"] = df["Value Type"].apply(lambda x: remove_namespace_from_uri(x))
     df["Match Type"] = len(df) * [MatchType.exact]
     df["Comment"] = len(df) * [None]
-    df["_property_type"] = df["_property_type"].apply(lambda x: remove_namespace(x))
+    df["_property_type"] = df["_property_type"].apply(lambda x: remove_namespace_from_uri(x))
 
     return df
 

cognite/neat/utils/__init__.py

@@ -1,3 +1,3 @@
-from .utils import remove_namespace
+from .utils import remove_namespace_from_uri
 
-__all__ = ["remove_namespace"]
+__all__ = ["remove_namespace_from_uri"]

cognite/neat/utils/utils.py

@@ -75,14 +75,14 @@ def _get_cognite_client(config: CogniteClientConfig, credentials: CredentialProv
 
 
 @overload
-def remove_namespace(*URI: URIRef | str, special_separator: str = "#_") -> str: ...
+def remove_namespace_from_uri(*URI: URIRef | str, special_separator: str = "#_") -> str: ...
 
 
 @overload
-def remove_namespace(*URI: tuple[URIRef | str, ...], special_separator: str = "#_") -> tuple[str, ...]: ...
+def remove_namespace_from_uri(*URI: tuple[URIRef | str, ...], special_separator: str = "#_") -> tuple[str, ...]: ...
 
 
-def remove_namespace(
+def remove_namespace_from_uri(
     *URI: URIRef | str | tuple[URIRef | str, ...], special_separator: str = "#_"
 ) -> tuple[str, ...] | str:
     """Removes namespace from URI
@@ -99,9 +99,9 @@ def remove_namespace(
 
     Examples:
 
-        >>> remove_namespace("http://www.example.org/index.html#section2")
+        >>> remove_namespace_from_uri("http://www.example.org/index.html#section2")
         'section2'
-        >>> remove_namespace("http://www.example.org/index.html#section2", "http://www.example.org/index.html#section3")
+        >>> remove_namespace_from_uri("http://www.example.org/index.html#section2", "http://www.example.org/index.html#section3")
         ('section2', 'section3')
     """
     if isinstance(URI, str | URIRef):
@@ -149,7 +149,7 @@ def get_namespace(URI: URIRef, special_separator: str = "#_") -> str:
 
 def as_neat_compliant_uri(uri: URIRef) -> URIRef:
     namespace = get_namespace(uri)
-    id_ = remove_namespace(uri)
+    id_ = remove_namespace_from_uri(uri)
     compliant_uri = re.sub(r"[^a-zA-Z0-9-_.]", "", id_)
     return URIRef(f"{namespace}{compliant_uri}")
 

{cognite_neat-0.85.5.dist-info → cognite_neat-0.85.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-neat
-Version: 0.85.5
+Version: 0.85.7
 Summary: Knowledge graph transformation
 Home-page: https://cognite-neat.readthedocs-hosted.com/
 License: Apache-2.0

{cognite_neat-0.85.5.dist-info → cognite_neat-0.85.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cognite/neat/__init__.py,sha256=AiexNcHdAHFbrrbo9c65gtil1dqx_SGraDH1PSsXjKE,126
 cognite/neat/_shared.py,sha256=RSaHm2eJceTlvb-hMMe4nHgoHdPYDfN3XcxDXo24k3A,1530
-cognite/neat/_version.py,sha256=Tr9RYWtVRguPKI4me4ekNXumFuIg46vts7VTq9NDVzw,23
+cognite/neat/_version.py,sha256=hVJ3xHshW3ChykiL5r0Maacil2KmJncrUYZGRzPoqic,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
@@ -12,7 +12,7 @@ cognite/neat/app/api/explorer.py,sha256=OlLI-RbQGjXEuDgtmFfBuTXfnRVemTJDKbL9VvXL
 cognite/neat/app/api/routers/configuration.py,sha256=rg9GihPPYjgNj1n_wWqfASO4iMXWh_US5sgNJCwejCE,585
 cognite/neat/app/api/routers/core.py,sha256=cHMX0JoxFHQB65VkFCvOprSkO8tFydECYtVFfRq9yfE,3523
 cognite/neat/app/api/routers/crud.py,sha256=VCQMjvcLosELkmMZRiunyd-RK5sltQFjcCSrGk5kwXc,4597
-cognite/neat/app/api/routers/data_exploration.py,sha256=j2dEg9Hng5-wg5C_7O2Mym8pVkKJBuflshTaBGmj6Mo,13686
+cognite/neat/app/api/routers/data_exploration.py,sha256=243dZcMJU-ZE-pSu2oIJMbQQmpyo-74i4Vtd7d1mgbg,13704
 cognite/neat/app/api/routers/metrics.py,sha256=S_bUQk_GjfQq7WbEhSVdow4MUYBZ_bZNafzgcKogXK8,210
 cognite/neat/app/api/routers/rules.py,sha256=MECSzurNe7y07-GfsggBDmfNtYkFuLdAm9ogSjLbzzk,8121
 cognite/neat/app/api/routers/workflows.py,sha256=fPqNT0swH-sfcjD8PLK5NzKY1sVSU7GaCMkHfH78gxw,12393
@@ -57,7 +57,7 @@ cognite/neat/graph/exceptions.py,sha256=R6pyOH774n9w2x_X_nrUr8OMAdjJMf_XPIqAvxIQ
 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=Hu-RoTBhn4LFm38G51L5tc0MVy4-zr1POHWyrIB-vUc,4130
+cognite/neat/graph/extractors/_classic_cdf/_assets.py,sha256=xrinx9SF9WMrrbbsYr2eSi7ZGOmlia3ltPq573fAoVg,4809
 cognite/neat/graph/extractors/_classic_cdf/_events.py,sha256=SGZWKCxppECIQkwQs5M2e_SoF-eGilCW2KiyXk2PmzM,4230
 cognite/neat/graph/extractors/_classic_cdf/_files.py,sha256=o35K0_ouq7hjR_lAVRjWbuRsuAzlS78S_97am5TFU5A,5129
 cognite/neat/graph/extractors/_classic_cdf/_labels.py,sha256=4JxQHPDciMjbk7F6GxMa-HfhOgAv8LT3VO3mRfEgQ0E,2832
@@ -65,19 +65,19 @@ cognite/neat/graph/extractors/_classic_cdf/_relationships.py,sha256=jgIN__nztlhL
 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/_mock_graph_generator.py,sha256=w6lIgwvVwkvK725S9MLFZU8lLxjxXt_621_nChupAkQ,14791
 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=BteVkTklPVUB2W-bbzZug-cEUrx8ZFA-YcQPSxWVpTI,678
-cognite/neat/graph/loaders/_base.py,sha256=t33I-Olw0xYz3Icf2RJZq9cs5_dEKeY87npxsA597Sw,3012
+cognite/neat/graph/loaders/_base.py,sha256=yIXJ7H5VeVb_mqMCM36BYyEOQMbIZcV60RxqD-Xrj-Y,3032
 cognite/neat/graph/loaders/_rdf2asset.py,sha256=aFby7BwIrW253LEJ4XqGeUuf4jG9VUe8Lg7OlUnXMlM,4493
-cognite/neat/graph/loaders/_rdf2dms.py,sha256=eIev7iiNCvzmLA18L6cZb3muGlCvP_t-4Rd48BQHmvY,13825
+cognite/neat/graph/loaders/_rdf2dms.py,sha256=2PCL8De02xlEkTmgG299k5tiZcKPnoNzCQfI1AgS2Gg,14060
 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=pSc6nHpcDEStGtIeeboAI-QD2PbckWaaNMK3As04jOI,4658
+cognite/neat/graph/queries/_base.py,sha256=RL6YQu4apWG-WM-b1TDu5IKqsvskE6Cvlmo8rr1Trhk,5199
 cognite/neat/graph/queries/_construct.py,sha256=FxzSQqzCpo7lKVYerlLAY03oqCeFM5L6MozfBUblzr4,7341
-cognite/neat/graph/queries/_shared.py,sha256=EwW2RbPttt7-z7QTgfKWlthA2Nq5d3bYyyewFkCA7R4,5043
+cognite/neat/graph/queries/_shared.py,sha256=1-cBnoqyHQazOdNc7J5kk-_GrlHSSnYsBdNJcRD5QyI,5061
 cognite/neat/graph/stores/__init__.py,sha256=G-VG_YwfRt1kuPao07PDJyZ3w_0-eguzLUM13n-Z_RA,64
 cognite/neat/graph/stores/_base.py,sha256=z69uhzBhzl1JQJU9U-h9zAyySn25ZQTJRXam4BavnoY,10586
 cognite/neat/graph/stores/_oxrdflib.py,sha256=A5zeRm5_e8ui_ihGpgstRDg_N7qcLZ3QZBRGrOXSGI0,9569
@@ -97,16 +97,16 @@ cognite/neat/legacy/graph/extractors/__init__.py,sha256=wqCiqz-sXhUpTL5LRcrl_KFT
 cognite/neat/legacy/graph/extractors/_base.py,sha256=ohiuEzwZ1Fh9ers07MCbjGOGQ0HLb-ctwgEvGy7o_AQ,363
 cognite/neat/legacy/graph/extractors/_dexpi.py,sha256=KIGkMYFGRSp86DASARSk77z-qzHqf-MMZkgZjq3rRWw,1613
 cognite/neat/legacy/graph/extractors/_graph_capturing_sheet.py,sha256=sEV6P4a4OlFx_O-vtKoB1H-ex1RnD5VhqmBcazGfLwk,17695
-cognite/neat/legacy/graph/extractors/_mock_graph_generator.py,sha256=op4eN0-YNzBZoQUkU0OVmaqFNMMwzgpOEjoxqI4034U,14908
+cognite/neat/legacy/graph/extractors/_mock_graph_generator.py,sha256=v_nEpNmrpUiA3SZpv37NFjKweS8DX4ahyy-9VCfg4Bc,14956
 cognite/neat/legacy/graph/loaders/__init__.py,sha256=Nap1LGaXA3AotL5U6pwY1Yc3J92Y7GC60qVPBhGl5LA,701
-cognite/neat/legacy/graph/loaders/_asset_loader.py,sha256=aYYD4Nb8TMLc4KKYDHD-wa5pswLyg2Vlhj6yZuTCLic,23823
+cognite/neat/legacy/graph/loaders/_asset_loader.py,sha256=UqjUm7aU826pONywpUCbdGNYdpL0uUOKdOTXhvRHaZY,23868
 cognite/neat/legacy/graph/loaders/_base.py,sha256=oj1vo8dGPXxJORQXPa_kJa5G53VZBXOiIoWOngtMw5E,2383
 cognite/neat/legacy/graph/loaders/_exceptions.py,sha256=Ep59S5ExVG7phHpfcMEpHu82ApLbkIlvfQnWAt5p1sE,2835
 cognite/neat/legacy/graph/loaders/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/legacy/graph/loaders/core/labels.py,sha256=z_03w35RcAWtJFVV94jCobHlT1d2AfoJa8FgMSrHBeA,2321
 cognite/neat/legacy/graph/loaders/core/models.py,sha256=47KwgRuMAwTbDwPC_yRmyhhOVvqTiwgApQEPCFlmU24,5023
-cognite/neat/legacy/graph/loaders/core/rdf_to_assets.py,sha256=83S992R6CcK6f492bLrER2AkoUZYGu3oDZefrqXv6ek,40466
-cognite/neat/legacy/graph/loaders/core/rdf_to_relationships.py,sha256=hkjCKE7coNbNBbduzy1GCT2Lgt4dtfTrke2_Pl9S67I,22707
+cognite/neat/legacy/graph/loaders/core/rdf_to_assets.py,sha256=6ZzXwFWSQt8TFDC8osvk8kY2nuIRgtTS60Q1Bb-9Kz0,40502
+cognite/neat/legacy/graph/loaders/core/rdf_to_relationships.py,sha256=sc_a42LqANgxdVurjt-9jQll3hMr_xvDG8lfJ9-O6fA,22725
 cognite/neat/legacy/graph/loaders/rdf_to_dms.py,sha256=v1Fjsf69RCxDo_YdYNJBgsmxy5sbmjIYONQKiSUAstI,12979
 cognite/neat/legacy/graph/loaders/validator.py,sha256=JiEp3gJUzJ8JIbb2crFfFCZ_3cGviXbb31aGusXAM_Y,3328
 cognite/neat/legacy/graph/models.py,sha256=AtLgZh2qyRP6NRetjQCy9qLMuTQB0CH52Zsev-qa2sk,149
@@ -120,8 +120,8 @@ cognite/neat/legacy/graph/stores/_rdf_to_graph.py,sha256=1ezWHTPn9UkIsAlxZcYRlqW
 cognite/neat/legacy/graph/transformations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/legacy/graph/transformations/entity_matcher.py,sha256=CakXdgGMYXnyaihE1fFGWNcXSDuOV5F454m8URt00Rw,4765
 cognite/neat/legacy/graph/transformations/query_generator/__init__.py,sha256=9N7RIlM8Pf-mJXzK8ulBe-eAa3yeHYBsBFQF7geTgWE,73
-cognite/neat/legacy/graph/transformations/query_generator/sparql.py,sha256=v-o1JJiMhaCLMVI1DP7Y8iEFHvkCMRSPZ1jTgNKqwZY,18719
-cognite/neat/legacy/graph/transformations/transformer.py,sha256=FnpjVpJ5Ud6Yho57s06GPKUrgTBm9e2y4XRf03FEzek,14737
+cognite/neat/legacy/graph/transformations/query_generator/sparql.py,sha256=RtDdnqxB7-5qXHnMxYK18SeJ5-8JPwm8zALqrJjpQtc,18737
+cognite/neat/legacy/graph/transformations/transformer.py,sha256=Xb6LjDsxT5SRUTs6RhZyiE1AlKplhUKkwIfmBxkcp8s,14755
 cognite/neat/legacy/rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/legacy/rules/analysis.py,sha256=-PWaFqzvMlUA6nrZissMvoQm8xwFqniIDApZSUWs9sA,8610
 cognite/neat/legacy/rules/examples/Rules-Nordic44-to-graphql.xlsx,sha256=KxiQxBdBWaXYvVAwUwVSazpDjHaG8CXamg24ZUf9Nqw,80404
@@ -143,7 +143,7 @@ cognite/neat/legacy/rules/exporters/_core/rules2labels.py,sha256=CDcSwR7TsUGEIsY
 cognite/neat/legacy/rules/exporters/_rules2dms.py,sha256=13CptTLvY9ghcrLPhumUOg6PeeIZHFDjXjNDSQPK5B8,36813
 cognite/neat/legacy/rules/exporters/_rules2excel.py,sha256=ytHsqw2j26T9yLNZHuUSItV8Jp3AvvpIwX8D5-L9GO8,8312
 cognite/neat/legacy/rules/exporters/_rules2graphql.py,sha256=oXBU5z-qFyxG7MW83HYlW-hazhDDNAPKAbJJcsZfcU4,6251
-cognite/neat/legacy/rules/exporters/_rules2ontology.py,sha256=m6adoKOP5EVVEjFX4Qi9yw7UflrDRVgNiBxQ9QVgz6g,18458
+cognite/neat/legacy/rules/exporters/_rules2ontology.py,sha256=9rjVjLi6rbPhlRrIyJVzPBJ4piFnsEKaB4uVitokXaY,18539
 cognite/neat/legacy/rules/exporters/_rules2pydantic_models.py,sha256=YqiyTzAD0vEEhLbIPNTkK0AzKUG0yfBjz47Rg1mSTq8,28949
 cognite/neat/legacy/rules/exporters/_rules2rules.py,sha256=KlBm1hWkx4Ly5G-_gdcURUwADolMJFnueus02IW51uQ,3881
 cognite/neat/legacy/rules/exporters/_rules2triples.py,sha256=ItkLy6Rji4g5UqLtxaOeodGUvpQG-LVr_ss70PcCPZs,1085
@@ -152,12 +152,12 @@ cognite/neat/legacy/rules/importers/__init__.py,sha256=h1owL8pBPEtOmlIFAdkqAABH1
 cognite/neat/legacy/rules/importers/_base.py,sha256=L0eMYB-Lf5sssQmXAd9ZlUzT6vcAIMeEvM833bMYn0w,2273
 cognite/neat/legacy/rules/importers/_dict2rules.py,sha256=scUoMMZoc0CEfsbU999cPMyG1hMzNRDTovj8ff8Lrhk,6476
 cognite/neat/legacy/rules/importers/_dms2rules.py,sha256=0MbqBQT1oTm2ekxtPXYKHXbFGxVRWTIiufzodmFKOvw,7697
-cognite/neat/legacy/rules/importers/_graph2rules.py,sha256=RIRN7WGOH9i2sz75dPYOaXnbcHhhrRBBX5eTxLmuXLU,12179
+cognite/neat/legacy/rules/importers/_graph2rules.py,sha256=FTP28hI3gbZyCxGBW9aJwW0SZnNG2HR5Skn-9dYAJI0,12215
 cognite/neat/legacy/rules/importers/_json2rules.py,sha256=ko0sC3-xO3ne_PQn5aF0L5SsA8m48SN2bnqmBgjkylc,1610
 cognite/neat/legacy/rules/importers/_owl2rules/__init__.py,sha256=tdGcrgtozdQyST-pTlxIa4cLBNTLvtk1nNYR4vOdFSw,63
-cognite/neat/legacy/rules/importers/_owl2rules/_owl2classes.py,sha256=5N3mCff3LumdPn8L6-5WRQD6Tk_nEie1CErD0QSu8to,8304
+cognite/neat/legacy/rules/importers/_owl2rules/_owl2classes.py,sha256=OlOttWnmbez353_Oc6zgjZtgBC7zMrfoZqyUCtDiyx0,8331
 cognite/neat/legacy/rules/importers/_owl2rules/_owl2metadata.py,sha256=1glhaiJA0AuBxTgUQBgKPuFUqI-0fVmbVIZnxe8OrDY,9407
-cognite/neat/legacy/rules/importers/_owl2rules/_owl2properties.py,sha256=_3bpFi8322j-GiqXZUZI2MAjEFg9IKdWp4lYtgl3nTY,8019
+cognite/neat/legacy/rules/importers/_owl2rules/_owl2properties.py,sha256=FLg2ICJiHr3HYIYuxUIopyzzcIGDkgUMgIL_vkSlOOI,8064
 cognite/neat/legacy/rules/importers/_owl2rules/_owl2rules.py,sha256=SnfR2ZuJlrnwWTuSNNu4cQTazj2DoYdTHSEZpax1QSg,10557
 cognite/neat/legacy/rules/importers/_spreadsheet2rules.py,sha256=gaDlCqB7M0j0rud-awjlunvBOQlgbK912wabsSBqpsc,1502
 cognite/neat/legacy/rules/importers/_xsd2rules.py,sha256=ZR_FAzZUgfZVEFLEVDDJIH4GIsxo7y7-KdozVeyYlS0,421
@@ -182,9 +182,9 @@ cognite/neat/legacy/workflows/examples/Visualize_Semantic_Data_Model/workflow.ya
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/rules/_shared.py,sha256=Ak2K9YnLhvmp8womNI3bmjaooQZkY9E33-DJ97P9wZg,195
-cognite/neat/rules/analysis/__init__.py,sha256=J2yL0QWSvXOWLbaYPyA0HXHh3aqOWmkwobScdgVQpw8,115
-cognite/neat/rules/analysis/_base.py,sha256=PmN5NLgGsovsHtsnvUzc_zuarWl-Xwk1azWcYKKuWdA,669
-cognite/neat/rules/analysis/_information_rules.py,sha256=fdSMyInsPJdgLHKwSkj2N9bcEXld9ETxUIXWqeDH8L4,17478
+cognite/neat/rules/analysis/__init__.py,sha256=ne6VlpFloufvxddDMbm7pLugnRpDv6ymaxB6_1XBxXw,188
+cognite/neat/rules/analysis/_base.py,sha256=JLYWYM6ZOviH_Lfu-kMX8UYmGHKt2LHq2BMITL-Plrw,395
+cognite/neat/rules/analysis/_information_rules.py,sha256=EW0hDTsYSaWgfdndLg299q4jlq1r0dZkP2Gmnj8R2Ew,20846
 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
@@ -192,22 +192,22 @@ cognite/neat/rules/exporters/__init__.py,sha256=nRMUBUf7yr1QPjyITeX2rTLtLLawHv24
 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=bVYq0zmMLDEzSDD39_DQOL6rFGBgRMq5lE7xVMAg8i8,14328
-cognite/neat/rules/exporters/_rules2ontology.py,sha256=bt8IuxaAYFRyZc1AlS-gYw9Jf6jBr5CYFOaJ3qPeoaA,20527
+cognite/neat/rules/exporters/_rules2ontology.py,sha256=h5akLKnhVxRfIiOredA3ILqD4qr-qizyP0gd6oNmswo,20608
 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=Vxl2Iq1dMXUsI6Wb411xPI3rromdq50xZUci-S8faSw,1097
-cognite/neat/rules/importers/_base.py,sha256=3LmDfR-f0nlLGcioWB8IbeZJ6uW5dvnzxJlqaMWc-u0,4516
+cognite/neat/rules/importers/_base.py,sha256=C8_Q99H3Sxds7HO_5aLkw8PItk3Zojxbz4uwx1xgxQM,4550
 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=Psj3C2jembY_Wu7WWJIFIwrMawvjISjeqfBnoRy_csw,6740
 cognite/neat/rules/importers/_dtdl2rules/spec.py,sha256=tim_MfN1J0F3Oeqk3BMgIA82d_MZvhRuRMsLK3B4PYc,11897
-cognite/neat/rules/importers/_inference2rules.py,sha256=YJl1xlPDH4lypCQedQh6uQwGwtWTQ466p63bEo_x8Rk,11765
+cognite/neat/rules/importers/_inference2rules.py,sha256=TlzTpO1IUyeUjODuDLqnlC-LeLhT-S6V6OpL-5YSQRo,11801
 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/_owl2classes.py,sha256=dACjYeCa_OhpQgqccI4w478dEINbISUMzpVkCOoRRL8,7384
 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/_owl2properties.py,sha256=3-yiCyh5In7jLhIytEK7ktG9suuv6QMa5xCs2TQvHZM,7342
 cognite/neat/rules/importers/_owl2rules/_owl2rules.py,sha256=41_wZFvt0A6TI55zlT04oQkvU7V73li4aGLgc4T4Lxo,6358
 cognite/neat/rules/importers/_spreadsheet2rules.py,sha256=vyYXNvP64dBGTWRWfrg7wtUcs0PdPiGLAHwE8itItAA,13072
 cognite/neat/rules/importers/_yaml2rules.py,sha256=F0uksSz1A3po5OlRM2152_w5j8D9oYTLB9NFTkSMlWI,4275
@@ -250,7 +250,7 @@ cognite/neat/rules/models/information/_rules_input.py,sha256=1aVaF7VrqaLR-NOq4RR
 cognite/neat/rules/models/information/_serializer.py,sha256=yti9I_xJruxrib66YIBInhze___Io-oPTQH6uWDumPE,3503
 cognite/neat/rules/models/information/_validation.py,sha256=K4RTd1I8jrqTHUaPFtAQ8bvS8a4ES9efqXRqQX9wQ8I,8258
 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/__init__.py,sha256=xVSUPJx1FWz3KJzcp6E1KQopKT0TrK3eAAzCw8S4r-0,86
 cognite/neat/utils/auth.py,sha256=rBzx92IN4xGj3UK95UExKlK2dCwQi3svTZ_YBMWaTVo,11739
 cognite/neat/utils/auxiliary.py,sha256=IOVbr6lPQulMJUyrrhfSsF6lIHch0Aw6KszMkBomprc,1248
 cognite/neat/utils/cdf.py,sha256=piRx-6GRz4cCfBZD5rU0OM6ixQ3cj5TMzI0yCYUveR8,2422
@@ -264,7 +264,7 @@ cognite/neat/utils/exceptions.py,sha256=-w4cAcvcoWLf-_ZwAl7QV_NysfqtQzIOd1Ti-mpx
 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=nZEuDu22A1kTbl-ctzAJ2vx1cjiQtqdDdpC_mRRMvUI,3597
-cognite/neat/utils/utils.py,sha256=1LEwR8gpHw_6pvEeLkW_cDU_lUun4qSsw_Rr3JsKwgA,14172
+cognite/neat/utils/utils.py,sha256=vtrBrjMqLIdPuIPEY9MwEEvzeu7vm-regFcU8y4pzeI,14226
 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
@@ -310,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.85.5.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.85.5.dist-info/METADATA,sha256=aeXhhGATA7p_GWW8d1gcuJTSszg_CtwUrF0ORagIW0I,9493
-cognite_neat-0.85.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cognite_neat-0.85.5.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
-cognite_neat-0.85.5.dist-info/RECORD,,
+cognite_neat-0.85.7.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.85.7.dist-info/METADATA,sha256=FOumx12OP-CCVVbdM2preeoHr-pPzrxnLKzYbaGsETU,9493
+cognite_neat-0.85.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cognite_neat-0.85.7.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
+cognite_neat-0.85.7.dist-info/RECORD,,