cognite-neat 0.85.11__py3-none-any.whl → 0.86.0__py3-none-any.whl

cognite/neat/_version.py

@@ -1 +1 @@
-__version__ = "0.85.11"
+__version__ = "0.86.0"

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

@@ -31,21 +31,21 @@ async def convert_data_model_to_rules(file: UploadFile):
 
     # read as Excel rules
     if suffix == ".xlsx":
-        rules, issues = importers.ExcelImporter(filepath=temp_filepath).to_rules(role=RoleTypes.dms_architect)
+        rules, issues = importers.ExcelImporter(filepath=temp_filepath).to_rules(role=RoleTypes.dms)
 
     # load as OWL
     elif suffix in [".ttl", ".owl"]:
-        rules, issues = importers.OWLImporter(filepath=temp_filepath).to_rules(role=RoleTypes.dms_architect)
+        rules, issues = importers.OWLImporter(filepath=temp_filepath).to_rules(role=RoleTypes.dms)
 
     # load as YAML
     elif suffix in [".yml", ".yaml"]:
-        rules, issues = importers.YAMLImporter.from_file(temp_filepath).to_rules(role=RoleTypes.dms_architect)
+        rules, issues = importers.YAMLImporter.from_file(temp_filepath).to_rules(role=RoleTypes.dms)
 
     # load as JSON
     elif suffix == ".json":
         with temp_filepath.open() as temp:
             json_data = json.load(temp)
-        rules, issues = importers.YAMLImporter(raw_data=json.loads(json_data)).to_rules(role=RoleTypes.dms_architect)
+        rules, issues = importers.YAMLImporter(raw_data=json.loads(json_data)).to_rules(role=RoleTypes.dms)
 
     # Remove the temporary file
     temp_filepath.unlink()

cognite/neat/graph/extractors/_mock_graph_generator.py

@@ -42,7 +42,7 @@ class MockGraphGenerator(BaseExtractor):
         allow_isolated_classes: bool = True,
     ):
         if isinstance(rules, DMSRules):
-            self.rules = rules.as_information_architect_rules()
+            self.rules = rules.as_information_rules()
         elif isinstance(rules, InformationRules):
             self.rules = rules
         else:

cognite/neat/graph/loaders/_rdf2dms.py

@@ -1,8 +1,7 @@
 import json
-from collections import defaultdict
 from collections.abc import Iterable, Sequence
 from pathlib import Path
-from typing import Any
+from typing import Any, get_args
 
 import yaml
 from cognite.client import CogniteClient
@@ -20,7 +19,7 @@ from cognite.neat.graph.issues import loader as loader_issues
 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.rules.models.data_types import _DATA_TYPE_BY_DMS_TYPE, Json
 from cognite.neat.utils.upload import UploadResult
 from cognite.neat.utils.utils import create_sha256_hash
 
@@ -106,8 +105,8 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
             yield from issues
             tracker.issue(issues)
             class_name = self.class_by_view_id.get(view.as_id(), view.external_id)
-            triples = self.graph_store.read(class_name)
-            for identifier, properties in _triples2dictionary(triples).items():
+
+            for identifier, properties in self.graph_store.read(class_name):
                 try:
                     yield self._create_node(identifier, properties, pydantic_cls, view_id)
                 except ValueError as e:
@@ -145,7 +144,9 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
         issues = NeatIssueList[NeatIssue]()
         field_definitions: dict[str, tuple[type, Any]] = {}
         edge_by_property: dict[str, dm.EdgeConnection] = {}
+        validators: dict[str, classmethod] = {}
         direct_relation_by_property: dict[str, dm.DirectRelation] = {}
+        json_fields: list[str] = []
         for prop_name, prop in view.properties.items():
             if isinstance(prop, dm.EdgeConnection):
                 edge_by_property[prop_name] = prop
@@ -163,6 +164,9 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
                             )
                         )
                         continue
+
+                    if data_type == Json:
+                        json_fields.append(prop_name)
                     python_type = data_type.python
                 if prop.type.is_list:
                     python_type = list[python_type]
@@ -175,13 +179,29 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
                 field_definitions[prop_name] = (python_type, default_value)
 
         def parse_list(cls, value: Any, info: ValidationInfo) -> list[str]:
-            if isinstance(value, list) and cls.model_fields[info.field_name].annotation is not list:
+            if isinstance(value, list) and list.__name__ not in _get_field_value_types(cls, info):
                 if len(value) == 1:
                     return value[0]
                 raise ValueError(f"Got multiple values for {info.field_name}: {value}")
+
             return value
 
-        validators: dict[str, classmethod] = {"parse_list": field_validator("*", mode="before")(parse_list)}  # type: ignore[dict-item,arg-type]
+        def parse_json_string(cls, value: Any, info: ValidationInfo) -> dict:
+            if isinstance(value, dict):
+                return value
+            elif isinstance(value, str):
+                try:
+                    return json.loads(value)
+                except json.JSONDecodeError as error:
+                    raise ValueError(f"Not valid JSON string for {info.field_name}: {value}, error {error}") from error
+            else:
+                raise ValueError(f"Expect valid JSON string or dict for {info.field_name}: {value}")
+
+        if json_fields:
+            validators["parse_json_string"] = field_validator(*json_fields, mode="before")(parse_json_string)  # type: ignore[assignment, arg-type]
+
+        validators["parse_list"] = field_validator("*", mode="before")(parse_list)  # type: ignore[assignment, arg-type]
+
         if direct_relation_by_property:
 
             def parse_direct_relation(cls, value: list, info: ValidationInfo) -> dict | list[dict]:
@@ -280,7 +300,10 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
             result.created.update(item.as_id() for item in e.successful)
             yield result
         else:
-            for instance_type, instances in {"Nodes": upserted.nodes, "Edges": upserted.edges}.items():
+            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:
@@ -292,13 +315,5 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
                 yield result
 
 
-def _triples2dictionary(
-    triples: Iterable[tuple[str, str, str]],
-) -> dict[str, dict[str, list[str]]]:
-    """Converts list of triples to dictionary"""
-    values_by_property_by_identifier: dict[str, dict[str, list[str]]] = defaultdict(lambda: defaultdict(list))
-    for id_, property_, value in triples:
-        # avoid issue with strings "None", "nan", "null" being treated as values
-        if value.lower() not in ["", "None", "nan", "null"]:
-            values_by_property_by_identifier[id_][property_].append(value)
-    return values_by_property_by_identifier
+def _get_field_value_types(cls, info):
+    return [type_.__name__ for type_ in get_args(cls.model_fields[info.field_name].annotation)]

cognite/neat/graph/queries/_base.py

@@ -1,4 +1,5 @@
 import warnings
+from collections import defaultdict
 from typing import Literal, cast, overload
 
 from rdflib import RDF, Graph, URIRef
@@ -93,12 +94,63 @@ class Queries:
             )
             return []
 
-    def construct_instances_of_class(self, class_: str, properties_optional: bool = True) -> list[tuple[str, str, str]]:
+    def describe(
+        self,
+        instance_id: URIRef,
+        property_renaming_config: dict | None = None,
+    ) -> tuple[str, dict[str, list[str]]]:
+        """DESCRIBE instance for a given class from the graph store
+
+        Args:
+            instance_id: Instance id for which we want to generate query
+            property_rename_config: Dictionary to rename properties, default None
+
+        Returns:
+            Dictionary of instance properties
+        """
+
+        property_values: dict[str, list[str]] = defaultdict(list)
+
+        for subject, predicate, object_ in cast(list[ResultRow], self.graph.query(f"DESCRIBE <{instance_id}>")):
+            # We cannot include the RDF.type in case there is a neat:type property
+            # or if the object is empty
+            if predicate != RDF.type and object_.lower() not in [
+                "",
+                "none",
+                "nan",
+                "null",
+            ]:
+                # we are skipping deep validation with Pydantic to remove namespace here
+                # as it reduce time to process triples by 10-15x
+                identifier, property_, value = cast(  # type: ignore[misc]
+                    (str, str, str),
+                    remove_namespace_from_uri(*(subject, predicate, object_), validation="prefix"),
+                )  # type: ignore[misc, index]
+
+                if property_renaming_config:
+                    predicate = property_renaming_config.get(property_, property_)
+
+                property_values[property_].append(value)
+        if property_values:
+            return (
+                identifier,
+                property_values,
+            )
+        else:
+            return ()  # type: ignore [return-value]
+
+    def construct_instances_of_class(
+        self,
+        class_: str,
+        properties_optional: bool = True,
+        instance_id: URIRef | None = None,
+    ) -> list[tuple[str, str, str]]:
         """CONSTRUCT instances for a given class from the graph store
 
         Args:
             class_: Class entity for which we want to generate query
             properties_optional: Whether to make all properties optional, default True
+            instance_ids: List of instance ids to filter on, default None (all)
 
         Returns:
             List of triples for instances of the given class
@@ -106,10 +158,11 @@ class Queries:
 
         if self.rules and (
             query := build_construct_query(
-                ClassEntity(prefix=self.rules.metadata.prefix, suffix=class_),
-                self.graph,
-                self.rules,
-                properties_optional,
+                class_=ClassEntity(prefix=self.rules.metadata.prefix, suffix=class_),
+                graph=self.graph,
+                rules=self.rules,
+                properties_optional=properties_optional,
+                instance_id=instance_id,
             )
         ):
             result = self.graph.query(query)

cognite/neat/graph/queries/_construct.py

@@ -18,8 +18,8 @@ from cognite.neat.utils.utils import most_occurring_element
 from ._shared import Triple, hop2property_path
 
 _QUERY_TEMPLATE = """CONSTRUCT {{ {graph_template} }}
-                     WHERE {{     {graph_pattern}
-                                  {filter}
+                     WHERE {{     {bind_instance_id}
+                                  {graph_pattern}
                      }}"""
 
 
@@ -28,7 +28,7 @@ def build_construct_query(
     graph: Graph,
     rules: InformationRules,
     properties_optional: bool = True,
-    class_instances: list[URIRef] | None = None,
+    instance_id: URIRef | None = None,
 ) -> str | None:
     """Builds a CONSTRUCT query for a given class and rules and optionally filters by class instances.
 
@@ -53,6 +53,7 @@ def build_construct_query(
         This is the reason why there is an option to make all properties optional, so that
         the query will return all instances that have at least one property defined.
     """
+
     if (
         transformations := InformationArchitectRulesAnalysis(rules)
         .class_property_pairs(only_rdfpath=True, consider_inheritance=True)
@@ -63,22 +64,20 @@ def build_construct_query(
         )
 
         return _QUERY_TEMPLATE.format(
+            bind_instance_id=(f"BIND(<{instance_id}> AS ?instance)" if instance_id else ""),
             graph_template="\n".join(triples2sparql_statement(templates)),
             graph_pattern="\n".join(triples2sparql_statement(patterns)),
-            filter="" if not class_instances else add_filter(class_instances),
         )
 
     else:
         return None
 
 
-def add_filter(class_instances: list[URIRef]):
-    class_instances_formatted = [f"<{instance}>" for instance in class_instances]
-    return f"FILTER (?instance IN ({', '.join(class_instances_formatted)}))"
-
-
 def to_construct_triples(
-    graph: Graph, transformations: list[InformationProperty], prefixes: dict, properties_optional: bool = True
+    graph: Graph,
+    transformations: list[InformationProperty],
+    prefixes: dict,
+    properties_optional: bool = True,
 ) -> tuple[list[Triple], list[Triple]]:
     """Converts transformations of a class to CONSTRUCT triples which are used to generate CONSTRUCT query
 
@@ -124,7 +123,10 @@ def to_construct_triples(
         # use case AllReferences: binding instance to certain rdf property
         if isinstance(traversal, AllReferences):
             graph_pattern_triple = Triple(
-                subject="BIND(?instance", predicate="AS", object=f"{graph_template_triple.object})", optional=False
+                subject="BIND(?instance",
+                predicate="AS",
+                object=f"{graph_template_triple.object})",
+                optional=False,
             )
 
         # use case SingleProperty: simple property traversal
@@ -133,7 +135,7 @@ def to_construct_triples(
                 subject=graph_template_triple.subject,
                 predicate=traversal.property.id,
                 object=graph_template_triple.object,
-                optional=True if properties_optional else not transformation.is_mandatory,
+                optional=(True if properties_optional else not transformation.is_mandatory),
             )
 
         # use case Hop: property traversal with multiple hops turned into property path
@@ -143,7 +145,7 @@ def to_construct_triples(
                 subject="?instance",
                 predicate=hop2property_path(graph, traversal, prefixes),
                 object=graph_template_triple.object,
-                optional=True if properties_optional else not transformation.is_mandatory,
+                optional=(True if properties_optional else not transformation.is_mandatory),
             )
 
         # other type of rdfpaths are skipped

cognite/neat/graph/stores/_base.py

@@ -15,6 +15,7 @@ from cognite.neat.graph.extractors import RdfFileExtractor, TripleExtractors
 from cognite.neat.graph.models import Triple
 from cognite.neat.graph.queries import Queries
 from cognite.neat.graph.transformers import Transformers
+from cognite.neat.rules.analysis import InformationArchitectRulesAnalysis
 from cognite.neat.rules.models import InformationRules
 from cognite.neat.rules.models.entities import ClassEntity
 from cognite.neat.utils.auxiliary import local_import
@@ -165,25 +166,32 @@ class NeatGraphStore:
             )
         )
 
-    def read(self, class_: str) -> list[tuple[str, str, str]]:
+    def read(self, class_: str) -> Iterable[tuple[str, dict[str, list[str]]]]:
         """Read instances for given view from the graph store."""
-        # PLACEHOLDER: Implement reading instances for a given view
-        # not yet developed
 
         if not self.rules:
-            warnings.warn(
-                "No rules found for the graph store, returning empty list.",
-                stacklevel=2,
-            )
-            return []
+            warnings.warn("Rules not found in graph store!", stacklevel=2)
+            return None
 
         class_entity = ClassEntity(prefix=self.rules.metadata.prefix, suffix=class_)
 
         if class_entity not in [definition.class_ for definition in self.rules.classes.data]:
             warnings.warn("Desired type not found in graph!", stacklevel=2)
-            return []
+            return None
+
+        if InformationArchitectRulesAnalysis(self.rules).has_hop_transformations():
+            warnings.warn(
+                "Rules contain Hop rdfpath, run ReduceHopTraversal transformer first!",
+                stacklevel=2,
+            )
+            return None
+
+        instance_ids = self.queries.list_instances_ids_of_class(self.rules.metadata.namespace[class_])
+
+        property_renaming_config = InformationArchitectRulesAnalysis(self.rules).define_property_renaming_config()
 
-        return self.queries.construct_instances_of_class(class_)
+        for instance_id in instance_ids:
+            yield self.queries.describe(instance_id, property_renaming_config)
 
     def _parse_file(
         self,

cognite/neat/graph/transformers/_rdfpath.py

@@ -0,0 +1,7 @@
+from ._base import BaseTransformer
+
+
+class ReduceHopTraversal(BaseTransformer):
+    """ReduceHopTraversal is a transformer that reduces the number of hops to direct connection."""
+
+    ...

cognite/neat/rules/analysis/_information_rules.py

@@ -8,7 +8,7 @@ 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._rdfpath import Hop, RDFPath
 from cognite.neat.rules.models.asset import AssetClass, AssetProperty, AssetRules
 from cognite.neat.rules.models.entities import (
     AssetEntity,
@@ -401,7 +401,14 @@ class _SharedAnalysis(Generic[T_Rules, T_Property, T_Class]):
 class InformationArchitectRulesAnalysis(_SharedAnalysis[InformationRules, InformationProperty, InformationClass]):
     """Assumes analysis over only the complete schema"""
 
-    ...
+    def has_hop_transformations(self):
+        return any(
+            prop_.transformation and isinstance(prop_.transformation.traversal, Hop) for prop_ in self.rules.properties
+        )
+
+    def define_property_renaming_config(self) -> dict[str, str]:
+        # placeholder comes in new PR
+        return {}
 
 
 class AssetArchitectRulesAnalysis(_SharedAnalysis[AssetRules, AssetProperty, AssetClass]):

cognite/neat/rules/exporters/_base.py

@@ -28,10 +28,10 @@ class BaseExporter(ABC, Generic[T_Export]):
     def _convert_to_output_role(self, rules: Rules, output_role: RoleTypes | None = None) -> Rules:
         if rules.metadata.role is output_role or output_role is None:
             return rules
-        elif output_role is RoleTypes.dms_architect and isinstance(rules, InformationRules):
-            return rules.as_dms_architect_rules()
-        elif output_role is RoleTypes.information_architect and isinstance(rules, DMSRules):
-            return rules.as_information_architect_rules()
+        elif output_role is RoleTypes.dms and isinstance(rules, InformationRules):
+            return rules.as_dms_rules()
+        elif output_role is RoleTypes.information and isinstance(rules, DMSRules):
+            return rules.as_information_rules()
         else:
             raise NotImplementedError(f"Role {output_role} is not supported for {type(rules).__name__} rules")
 

cognite/neat/rules/exporters/_rules2dms.py

@@ -118,7 +118,7 @@ class DMSExporter(CDFExporter[DMSSchema]):
         if isinstance(rules, DMSRules):
             dms_rules = rules
         elif isinstance(rules, InformationRules):
-            dms_rules = rules.as_dms_architect_rules()
+            dms_rules = rules.as_dms_rules()
         else:
             raise ValueError(f"{type(rules).__name__} cannot be exported to DMS")
         return dms_rules.as_schema(include_pipeline=self.export_pipeline, instance_space=self.instance_space)

cognite/neat/rules/exporters/_rules2ontology.py

@@ -95,7 +95,7 @@ class Ontology(OntologyModel):
         if isinstance(input_rules, InformationRules):
             rules = input_rules
         elif isinstance(input_rules, DMSRules):
-            rules = input_rules.as_information_architect_rules()
+            rules = input_rules.as_information_rules()
         else:
             raise ValueError(f"{type(input_rules).__name__} cannot be exported to Ontology")
 

cognite/neat/rules/importers/_base.py

@@ -55,10 +55,10 @@ class BaseImporter(ABC):
 
         if rules.metadata.role is role or role is None:
             output = rules
-        elif isinstance(rules, DMSRules) or isinstance(rules, AssetRules) and role is RoleTypes.information_architect:
-            output = rules.as_information_architect_rules()
-        elif isinstance(rules, InformationRules) or isinstance(rules, AssetRules) and role is RoleTypes.dms_architect:
-            output = rules.as_dms_architect_rules()
+        elif isinstance(rules, DMSRules) or isinstance(rules, AssetRules) and role is RoleTypes.information:
+            output = rules.as_information_rules()
+        elif isinstance(rules, InformationRules) or isinstance(rules, AssetRules) and role is RoleTypes.dms:
+            output = rules.as_dms_rules()
         else:
             raise NotImplementedError(f"Role {role} is not supported for {type(rules).__name__} rules")
 

cognite/neat/rules/importers/_inference2rules.py

@@ -75,7 +75,9 @@ class InferenceImporter(BaseImporter):
         self.graph = graph
         self.max_number_of_instance = max_number_of_instance
         self.prefix = prefix
-        self.check_for_json_string = check_for_json_string
+        self.check_for_json_string = (
+            check_for_json_string if graph.store.__class__.__name__ != "OxigraphStore" else False
+        )
 
     @classmethod
     def from_graph_store(
@@ -235,6 +237,7 @@ class InferenceImporter(BaseImporter):
                     query.replace("instance_id", instance)
                 ):  # type: ignore[misc]
                     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
 

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

@@ -51,7 +51,7 @@ def parse_owl_metadata(graph: Graph) -> dict:
 
     raw_metadata = convert_rdflib_content(
         {
-            "role": RoleTypes.information_architect,
+            "role": RoleTypes.information,
             "schema": SchemaCompleteness.partial,
             "prefix": results[1].pop(),
             "namespace": Namespace(results[0].pop()),

cognite/neat/rules/importers/_spreadsheet2rules.py

@@ -36,9 +36,9 @@ SOURCE_SHEET__TARGET_FIELD__HEADERS = [
         "Properties",
         {
             RoleTypes.domain_expert: "Property",
-            RoleTypes.information_architect: "Property",
-            RoleTypes.asset_architect: "Property",
-            RoleTypes.dms_architect: "View Property",
+            RoleTypes.information: "Property",
+            RoleTypes.asset: "Property",
+            RoleTypes.dms: "View Property",
         },
     ),
     ("Classes", "Classes", "Class"),
@@ -334,9 +334,9 @@ class GoogleSheetImporter(BaseImporter):
 
         if role == RoleTypes.domain_expert:
             output = rules_model.model_validate(sheets)
-        elif role == RoleTypes.information_architect:
+        elif role == RoleTypes.information:
             output = rules_model.model_validate(sheets)
-        elif role == RoleTypes.dms_architect:
+        elif role == RoleTypes.dms:
             output = rules_model.model_validate(sheets)
         else:
             raise ValueError(f"Role {role} is not valid.")

cognite/neat/rules/models/__init__.py

@@ -8,9 +8,9 @@ from .dms._schema import DMSSchema
 
 RULES_PER_ROLE: dict[RoleTypes, type[DomainRules] | type[InformationRules] | type[AssetRules] | type[DMSRules]] = {
     RoleTypes.domain_expert: DomainRules,
-    RoleTypes.information_architect: InformationRules,
-    RoleTypes.asset_architect: AssetRules,
-    RoleTypes.dms_architect: DMSRules,
+    RoleTypes.information: InformationRules,
+    RoleTypes.asset: AssetRules,
+    RoleTypes.dms: DMSRules,
 }
 
 

cognite/neat/rules/models/_base.py

@@ -150,9 +150,9 @@ class DataModelType(StrEnum):
 
 class RoleTypes(StrEnum):
     domain_expert = "domain expert"
-    information_architect = "information architect"
-    asset_architect = "asset architect"
-    dms_architect = "DMS Architect"
+    information = "information architect"
+    asset = "asset architect"
+    dms = "DMS Architect"
 
 
 class MatchType(StrEnum):

cognite/neat/rules/models/asset/_rules.py

@@ -35,7 +35,7 @@ else:
 
 
 class AssetMetadata(InformationMetadata):
-    role: ClassVar[RoleTypes] = RoleTypes.asset_architect
+    role: ClassVar[RoleTypes] = RoleTypes.asset
 
 
 class AssetClass(InformationClass): ...
@@ -148,12 +148,12 @@ class AssetRules(BaseRules):
     def as_domain_rules(self) -> DomainRules:
         from ._converter import _AssetRulesConverter
 
-        return _AssetRulesConverter(self.as_information_architect_rules()).as_domain_rules()
+        return _AssetRulesConverter(self.as_information_rules()).as_domain_rules()
 
-    def as_dms_architect_rules(self) -> "DMSRules":
+    def as_dms_rules(self) -> "DMSRules":
         from ._converter import _AssetRulesConverter
 
-        return _AssetRulesConverter(self.as_information_architect_rules()).as_dms_architect_rules()
+        return _AssetRulesConverter(self.as_information_rules()).as_dms_rules()
 
-    def as_information_architect_rules(self) -> InformationRules:
+    def as_information_rules(self) -> InformationRules:
         return InformationRules.model_validate(self.model_dump())

cognite/neat/rules/models/data_types.py

@@ -237,7 +237,7 @@ class Literal(DataType):
 
 class Timeseries(DataType):
     name = "timeseries"
-    python = dms.TimeSeriesReference
+    python = str
     dms = dms.TimeSeriesReference
     graphql = "TimeSeries"
     xsd = "string"
@@ -246,7 +246,7 @@ class Timeseries(DataType):
 
 class File(DataType):
     name = "file"
-    python = dms.FileReference
+    python = str
     dms = dms.FileReference
     graphql = "File"
     xsd = "string"
@@ -255,7 +255,7 @@ class File(DataType):
 
 class Sequence(DataType):
     name = "sequence"
-    python = dms.SequenceReference
+    python = str
     dms = dms.SequenceReference
     graphql = "Sequence"
     xsd = "string"
@@ -264,7 +264,7 @@ class Sequence(DataType):
 
 class Json(DataType):
     name = "json"
-    python = dms.Json
+    python = dict
     dms = dms.Json
     graphql = "Json"
     xsd = "json"

cognite/neat/rules/models/dms/_converter.py

@@ -32,7 +32,7 @@ class _DMSRulesConverter:
     def as_domain_rules(self) -> "DomainRules":
         raise NotImplementedError("DomainRules not implemented yet")
 
-    def as_information_architect_rules(
+    def as_information_rules(
         self,
     ) -> "InformationRules":
         from cognite.neat.rules.models.information._rules import (
@@ -94,8 +94,8 @@ class _DMSRulesConverter:
             metadata=metadata,
             properties=SheetList[InformationProperty](data=properties),
             classes=SheetList[InformationClass](data=classes),
-            last=self.dms.last.as_information_architect_rules() if self.dms.last else None,
-            reference=self.dms.reference.as_information_architect_rules() if self.dms.reference else None,
+            last=self.dms.last.as_information_rules() if self.dms.last else None,
+            reference=self.dms.reference.as_information_rules() if self.dms.reference else None,
         )
 
     @classmethod

cognite/neat/rules/models/dms/_rules.py

@@ -58,7 +58,7 @@ _DEFAULT_VERSION = "1"
 
 
 class DMSMetadata(BaseMetadata):
-    role: ClassVar[RoleTypes] = RoleTypes.dms_architect
+    role: ClassVar[RoleTypes] = RoleTypes.dms
     data_model_type: DataModelType = Field(DataModelType.enterprise, alias="dataModelType")
     schema_: SchemaCompleteness = Field(alias="schema")
     extension: ExtensionCategory = ExtensionCategory.addition
@@ -382,10 +382,10 @@ class DMSRules(BaseRules):
 
         return _DMSExporter(self, include_pipeline, instance_space).to_schema()
 
-    def as_information_architect_rules(self) -> "InformationRules":
+    def as_information_rules(self) -> "InformationRules":
         from ._converter import _DMSRulesConverter
 
-        return _DMSRulesConverter(self).as_information_architect_rules()
+        return _DMSRulesConverter(self).as_information_rules()
 
     def as_domain_expert_rules(self) -> DomainRules:
         from ._converter import _DMSRulesConverter

cognite/neat/rules/models/information/_converter.py

@@ -79,7 +79,7 @@ class _InformationRulesConverter:
             prefixes=self.rules.prefixes,
         )
 
-    def as_dms_architect_rules(self) -> "DMSRules":
+    def as_dms_rules(self) -> "DMSRules":
         from cognite.neat.rules.models.dms._rules import (
             DMSContainer,
             DMSProperty,
@@ -112,8 +112,8 @@ class _InformationRulesConverter:
             for cls_ in self.rules.classes
         ]
 
-        last_dms_rules = self.rules.last.as_dms_architect_rules() if self.rules.last else None
-        ref_dms_rules = self.rules.reference.as_dms_architect_rules() if self.rules.reference else None
+        last_dms_rules = self.rules.last.as_dms_rules() if self.rules.last else None
+        ref_dms_rules = self.rules.reference.as_dms_rules() if self.rules.reference else None
 
         class_by_entity = {cls_.class_: cls_ for cls_ in self.rules.classes}
         if self.rules.last:

cognite/neat/rules/models/information/_rules.py

@@ -59,7 +59,7 @@ else:
 
 
 class InformationMetadata(BaseMetadata):
-    role: ClassVar[RoleTypes] = RoleTypes.information_architect
+    role: ClassVar[RoleTypes] = RoleTypes.information
     data_model_type: DataModelType = Field(DataModelType.enterprise, alias="dataModelType")
     schema_: SchemaCompleteness = Field(SchemaCompleteness.partial, alias="schema")
     extension: ExtensionCategoryType | None = ExtensionCategory.addition
@@ -348,7 +348,7 @@ class InformationRules(BaseRules):
 
         return _InformationRulesConverter(self).as_asset_architect_rules()
 
-    def as_dms_architect_rules(self) -> "DMSRules":
+    def as_dms_rules(self) -> "DMSRules":
         from ._converter import _InformationRulesConverter
 
-        return _InformationRulesConverter(self).as_dms_architect_rules()
+        return _InformationRulesConverter(self).as_dms_rules()

cognite/neat/utils/utils.py

@@ -7,20 +7,30 @@ from collections import Counter, OrderedDict
 from collections.abc import Iterable
 from datetime import datetime
 from functools import wraps
-from typing import TypeAlias, cast, overload
+from typing import Literal, TypeAlias, cast, overload
 
 import pandas as pd
 from cognite.client import ClientConfig, CogniteClient
-from cognite.client.credentials import CredentialProvider, OAuthClientCredentials, OAuthInteractive, Token
+from cognite.client.credentials import (
+    CredentialProvider,
+    OAuthClientCredentials,
+    OAuthInteractive,
+    Token,
+)
 from cognite.client.exceptions import CogniteDuplicatedError, CogniteReadTimeout
 from pydantic import HttpUrl, TypeAdapter, ValidationError
 from pydantic_core import ErrorDetails
 from pyparsing import Any
-from rdflib import Literal, Namespace
+from rdflib import Literal as RdfLiteral
+from rdflib import Namespace
 from rdflib.term import URIRef
 
 from cognite.neat import _version
-from cognite.neat.utils.cdf import CogniteClientConfig, InteractiveCogniteClient, ServiceCogniteClient
+from cognite.neat.utils.cdf import (
+    CogniteClientConfig,
+    InteractiveCogniteClient,
+    ServiceCogniteClient,
+)
 
 if sys.version_info >= (3, 11):
     from datetime import UTC
@@ -30,12 +40,15 @@ else:
     UTC = timezone.utc
 
 
-Triple: TypeAlias = tuple[URIRef, URIRef, Literal | URIRef]
+Triple: TypeAlias = tuple[URIRef, URIRef, RdfLiteral | URIRef]
 
 
 def get_cognite_client_from_config(config: ServiceCogniteClient) -> CogniteClient:
     credentials = OAuthClientCredentials(
-        token_url=config.token_url, client_id=config.client_id, client_secret=config.client_secret, scopes=config.scopes
+        token_url=config.token_url,
+        client_id=config.client_id,
+        client_secret=config.client_secret,
+        scopes=config.scopes,
     )
 
     return _get_cognite_client(config, credentials)
@@ -75,15 +88,25 @@ def _get_cognite_client(config: CogniteClientConfig, credentials: CredentialProv
 
 
 @overload
-def remove_namespace_from_uri(*URI: URIRef | str, special_separator: str = "#_") -> str: ...
+def remove_namespace_from_uri(
+    *URI: URIRef | str,
+    special_separator: str = "#_",
+    validation: Literal["full", "prefix"] = "prefix",
+) -> str: ...
 
 
 @overload
-def remove_namespace_from_uri(*URI: tuple[URIRef | str, ...], special_separator: str = "#_") -> tuple[str, ...]: ...
+def remove_namespace_from_uri(
+    *URI: tuple[URIRef | str, ...],
+    special_separator: str = "#_",
+    validation: Literal["full", "prefix"] = "prefix",
+) -> tuple[str, ...]: ...
 
 
 def remove_namespace_from_uri(
-    *URI: URIRef | str | tuple[URIRef | str, ...], special_separator: str = "#_"
+    *URI: URIRef | str | tuple[URIRef | str, ...],
+    special_separator: str = "#_",
+    validation: Literal["full", "prefix"] = "prefix",
 ) -> tuple[str, ...] | str:
     """Removes namespace from URI
 
@@ -93,6 +116,9 @@ def remove_namespace_from_uri(
         special_separator : str
             Special separator to use instead of # or / if present in URI
             Set by default to "#_" which covers special client use case
+        validation: str
+            Validation type to use for URI. If set to "full", URI will be validated using pydantic
+            If set to "prefix", only check if URI starts with http or https will be made
 
     Returns
         Entities id without namespace
@@ -114,11 +140,17 @@ def remove_namespace_from_uri(
 
     output = []
     for u in uris:
-        try:
-            _ = TypeAdapter(HttpUrl).validate_python(u)
-            output.append(u.split(special_separator if special_separator in u else "#" if "#" in u else "/")[-1])
-        except ValidationError:
-            output.append(str(u))
+        if validation == "full":
+            try:
+                _ = TypeAdapter(HttpUrl).validate_python(u)
+                output.append(u.split(special_separator if special_separator in u else "#" if "#" in u else "/")[-1])
+            except ValidationError:
+                output.append(str(u))
+        else:
+            if u.lower().startswith("http"):
+                output.append(u.split(special_separator if special_separator in u else "#" if "#" in u else "/")[-1])
+            else:
+                output.append(str(u))
 
     return tuple(output) if len(output) > 1 else output[0]
 
@@ -154,8 +186,8 @@ def as_neat_compliant_uri(uri: URIRef) -> URIRef:
     return URIRef(f"{namespace}{compliant_uri}")
 
 
-def convert_rdflib_content(content: Literal | URIRef | dict | list) -> Any:
-    if isinstance(content, Literal) or isinstance(content, URIRef):
+def convert_rdflib_content(content: RdfLiteral | URIRef | dict | list) -> Any:
+    if isinstance(content, RdfLiteral) or isinstance(content, URIRef):
         return content.toPython()
     elif isinstance(content, dict):
         return {key: convert_rdflib_content(value) for key, value in content.items()}
@@ -192,7 +224,9 @@ def _traverse(hierarchy: dict, graph: dict, names: list[str]) -> dict:
 
 
 def get_generation_order(
-    class_linkage: pd.DataFrame, parent_col: str = "source_class", child_col: str = "target_class"
+    class_linkage: pd.DataFrame,
+    parent_col: str = "source_class",
+    child_col: str = "target_class",
 ) -> dict:
     parent_child_list = class_linkage[[parent_col, child_col]].values.tolist()
     # Build a directed graph and a list of all names that have no parent
@@ -318,7 +352,9 @@ def generate_exception_report(exceptions: list[dict] | list[ErrorDetails] | None
     return report
 
 
-def _order_expectations_by_type(exceptions: list[dict] | list[ErrorDetails]) -> dict[str, list[str]]:
+def _order_expectations_by_type(
+    exceptions: list[dict] | list[ErrorDetails],
+) -> dict[str, list[str]]:
     exception_dict: dict[str, list[str]] = {}
     for exception in exceptions:
         if not isinstance(exception["loc"], str) and isinstance(exception["loc"], Iterable):

{cognite_neat-0.85.11.dist-info → cognite_neat-0.86.0.dist-info}/METADATA

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

{cognite_neat-0.85.11.dist-info → cognite_neat-0.86.0.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=bVP2BELxIGHP-amVHOwETotJ5zyQqFcbe7c26GvSm-c,24
+cognite/neat/_version.py,sha256=mYct1UR8Rb7usms6EgqHp-uduOQsYVzy_Xhv8wi369Y,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
@@ -10,7 +10,7 @@ cognite/neat/app/api/data_classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 cognite/neat/app/api/data_classes/rest.py,sha256=yVWqFkBCDCGooOWaE5nun4No8B-PBa6svdenIjBINdo,1675
 cognite/neat/app/api/explorer.py,sha256=OlLI-RbQGjXEuDgtmFfBuTXfnRVemTJDKbL9VvXLr6Y,1891
 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/core.py,sha256=WznuQHzGkhBzf_GrHFiaSCXewBiQcrT4O6kYaJtaBYA,3483
 cognite/neat/app/api/routers/crud.py,sha256=VCQMjvcLosELkmMZRiunyd-RK5sltQFjcCSrGk5kwXc,4597
 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
@@ -65,26 +65,27 @@ cognite/neat/graph/extractors/_classic_cdf/_relationships.py,sha256=GzxnvIflmHVn
 cognite/neat/graph/extractors/_classic_cdf/_sequences.py,sha256=rhMEPY5PCxLnErwPPzdHH02c9o7rn0whLtnvcrLDjr8,4677
 cognite/neat/graph/extractors/_classic_cdf/_timeseries.py,sha256=rxhAe7BcJFg2-eFgBSTb6Trkw53XgZfU5-wLrjqZHEQ,6122
 cognite/neat/graph/extractors/_dexpi.py,sha256=xIw3kSaQ17k_bAuecvrVRic70PUhFHtcyy-ReLt36Q4,9385
-cognite/neat/graph/extractors/_mock_graph_generator.py,sha256=w6lIgwvVwkvK725S9MLFZU8lLxjxXt_621_nChupAkQ,14791
+cognite/neat/graph/extractors/_mock_graph_generator.py,sha256=AgP_1cY4msKB65vJlvVualGLnmB7tuVCDBOQxcBHpIo,14781
 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=yIXJ7H5VeVb_mqMCM36BYyEOQMbIZcV60RxqD-Xrj-Y,3032
 cognite/neat/graph/loaders/_rdf2asset.py,sha256=aFby7BwIrW253LEJ4XqGeUuf4jG9VUe8Lg7OlUnXMlM,4493
-cognite/neat/graph/loaders/_rdf2dms.py,sha256=2PCL8De02xlEkTmgG299k5tiZcKPnoNzCQfI1AgS2Gg,14060
+cognite/neat/graph/loaders/_rdf2dms.py,sha256=gZVtwFCnhHZeXIks_Drke6PqSICEpwX-_i1g9Dg5AiQ,14471
 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=yO1i2HPA2RiXMehANImDPxSkL6QB6LwvD22HvfdFt70,6023
-cognite/neat/graph/queries/_construct.py,sha256=FxzSQqzCpo7lKVYerlLAY03oqCeFM5L6MozfBUblzr4,7341
+cognite/neat/graph/queries/_base.py,sha256=YtYZesgiPgFP2CnvhsZyOA2LxsjyEVh7-w9T1MjLHgw,8033
+cognite/neat/graph/queries/_construct.py,sha256=glzZETFjcmtPdS0KUzWvq9bPoCcDBz1bPnD0u_Fk_F4,7214
 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=r6NShdYp7KZBQ9WBY1BUFZa5X0SPm509vZjnllmiSIo,11085
+cognite/neat/graph/stores/_base.py,sha256=JNXII_UG9adCl94-OhM5IMr-9Y8I4w7z2qc2d3QOxMA,11553
 cognite/neat/graph/stores/_oxrdflib.py,sha256=A5zeRm5_e8ui_ihGpgstRDg_N7qcLZ3QZBRGrOXSGI0,9569
 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=6xX-OBSJT5DAQrTJ-nuhCfGNaSk5Iktxn-WIMfzEIqo,13189
+cognite/neat/graph/transformers/_rdfpath.py,sha256=TAkYdT1HSyrW_ZDLv-wjaiKiyUBrl0Zjz73UVTRmMtw,189
 cognite/neat/issues.py,sha256=pxQfqfBseMDE8JM0iqZnkLXngeyeFfT0TFtu1UuAd4c,4629
 cognite/neat/legacy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/legacy/graph/__init__.py,sha256=31uTeejWOSd-I8iUG8GOZFhHZcQCsBitJ6X8vu2r1nU,73
@@ -184,32 +185,32 @@ cognite/neat/rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 cognite/neat/rules/_shared.py,sha256=Ak2K9YnLhvmp8womNI3bmjaooQZkY9E33-DJ97P9wZg,195
 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/analysis/_information_rules.py,sha256=8MLOtE91_EkSwn6CZv6GJokrs1_2yDBwrvpySOZemJI,21154
 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=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/_base.py,sha256=vJXY7qdo4blDZemfDXuuYCkUt1cTa5PsOLMdll7OcGw,1896
+cognite/neat/rules/exporters/_rules2dms.py,sha256=_2QkQhfx4c92RDaXsuX_k_Q2LkdOJ627eYgQNvCYj8s,14543
 cognite/neat/rules/exporters/_rules2excel.py,sha256=bVYq0zmMLDEzSDD39_DQOL6rFGBgRMq5lE7xVMAg8i8,14328
-cognite/neat/rules/exporters/_rules2ontology.py,sha256=h5akLKnhVxRfIiOredA3ILqD4qr-qizyP0gd6oNmswo,20608
+cognite/neat/rules/exporters/_rules2ontology.py,sha256=dMbnKni69HG5KgjTYLf7Cn_2Q3dzr9QQjII8r43y4Qk,20598
 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=C8_Q99H3Sxds7HO_5aLkw8PItk3Zojxbz4uwx1xgxQM,4550
+cognite/neat/rules/importers/_base.py,sha256=EgXF2pmJ90LbmFs5rAMwh151wGX3PGkhTTF6rC-DzOg,4510
 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=U2fNqBtN_NMtFAm7uSiejfxNFWIvUjHv5JriOEI5Z3I,13704
+cognite/neat/rules/importers/_inference2rules.py,sha256=9ndiy36aJSR-I5wTUcC9vb08zWUZshrSTiunplXtt40,13793
 cognite/neat/rules/importers/_owl2rules/__init__.py,sha256=tdGcrgtozdQyST-pTlxIa4cLBNTLvtk1nNYR4vOdFSw,63
 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/_owl2metadata.py,sha256=dojTk6NKK2STzVSuh0ithFHHAbttIY09rHGnioEY3eA,7517
 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/_spreadsheet2rules.py,sha256=ZJJiO15Br9f8HS5D0A5PgtA726XkMNzfd15PWu1tMHA,13022
 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
@@ -219,8 +220,8 @@ cognite/neat/rules/issues/formatters.py,sha256=_ag2bJ9hncOj8pAGJvTTEPs9kTtxbD7vk
 cognite/neat/rules/issues/importing.py,sha256=uSk4TXo_CO3bglBZkaiWekXLXXd31UWIZE95clVSLz4,13417
 cognite/neat/rules/issues/spreadsheet.py,sha256=Nu4yThMhQcYD1bbcTsnaz5ij8XahqzrxnWyoyw1MN58,16805
 cognite/neat/rules/issues/spreadsheet_file.py,sha256=YCp0Pk_TsiqYuOPdWpjUpre-zvi2c5_MvrC_dxw10YY,4964
-cognite/neat/rules/models/__init__.py,sha256=IqAg-h8PlcXcR_l-MECNMcVxMecF57vdg-Y488mBgWM,917
-cognite/neat/rules/models/_base.py,sha256=uZrP_TRu3aljL3XZGMyNtlQDsMPwUEsfSNjGhRdMg88,11234
+cognite/neat/rules/models/__init__.py,sha256=DHitrcmu9in2F8NqBE1O2J4UU_-MAlY6sB1MfigY4IU,887
+cognite/neat/rules/models/_base.py,sha256=KhfF5lh8xy19N0Vp5lrO9auXV7luUTO1gmCW_-dOswY,11204
 cognite/neat/rules/models/_constants.py,sha256=zPREgHT79_4FMg58QlaXc7A8XKRJrjP5SUgh63jDnTk,31
 cognite/neat/rules/models/_rdfpath.py,sha256=t7h_9LMQrcj9JaYV2AXN_sYymbAvy-iyuAOjlhaTmog,12174
 cognite/neat/rules/models/_types/__init__.py,sha256=l1tGxzE7ezNHIL72AoEvNHN2IFuitxOLxiHJG__s6t4,305
@@ -228,15 +229,15 @@ cognite/neat/rules/models/_types/_base.py,sha256=2GhLUE1ukV8X8SGL_JDxpbWGZyAvOnS
 cognite/neat/rules/models/_types/_field.py,sha256=h2RrhjxdaRbzHG5EyduyHLkCJJmQoyZb9pYCkgMcnVk,3203
 cognite/neat/rules/models/asset/__init__.py,sha256=qNon0kHleCPo2eT82TmeBAfiDDdwdKNU-Xdewuz8JRA,231
 cognite/neat/rules/models/asset/_converter.py,sha256=PrTh9ZZkqSJBviiJE4xc3pClCsaWu2tTYOdgwg6_VOk,150
-cognite/neat/rules/models/asset/_rules.py,sha256=fYp1pMJtioUtT747fo5NX69lgvPiPtHwXf_YuX--SEc,6195
+cognite/neat/rules/models/asset/_rules.py,sha256=8-_93xKjopX4iABe0k9ryn4kPYJZpzjD1IgAbwpSwk8,6135
 cognite/neat/rules/models/asset/_rules_input.py,sha256=LiT-85CVgDz2ng65CtrRa77r4rnmg3E4Q6DC7-gv0dE,6257
 cognite/neat/rules/models/asset/_serializer.py,sha256=ixqRf9qEzvChgysRaDX4g_vHVDtRBCsPYC9sOn0-ShE,3365
 cognite/neat/rules/models/asset/_validation.py,sha256=86ymEgMZpG1eWu53PviUyUFnQBUJmYDZggUDXufBYLI,148
-cognite/neat/rules/models/data_types.py,sha256=xAjm8UVEQlSylfkUJWiWP2NaK6dLYRDABF9g8CNWLTc,6076
+cognite/neat/rules/models/data_types.py,sha256=mHTjWh47VzLwrr0w6dRf59LW7pTTGRTgsxvtW9p0JWw,6020
 cognite/neat/rules/models/dms/__init__.py,sha256=Wzyqzz2ZIjpUbDg04CMuuIAw-f2A02DayNeqO9R-2Hw,491
-cognite/neat/rules/models/dms/_converter.py,sha256=QaJT0z0Yo4gkG9tHPZkU8idF8PK7c-tDahbyIT-WJQU,5959
+cognite/neat/rules/models/dms/_converter.py,sha256=7_R5F3nbknCRxLrOg02tRU4FLYM6nn46bewLl4YSr98,5929
 cognite/neat/rules/models/dms/_exporter.py,sha256=DRL5ahcBEdBltHLA2rzLyUfqG5SZkqINkqmYGDkQVg0,24785
-cognite/neat/rules/models/dms/_rules.py,sha256=M7qv4uTZ-qpnIFQtoExEDppz0m0beNPm01djZxaj0yo,20118
+cognite/neat/rules/models/dms/_rules.py,sha256=RD6951cP16PEZWeA23k46cAZ9DHkWGZwR3vMIN3oX9k,20088
 cognite/neat/rules/models/dms/_rules_input.py,sha256=M5AqwW-p6z_qAum-1HE_lmONSmg-vF1ak7Y_AiM8vnU,13525
 cognite/neat/rules/models/dms/_schema.py,sha256=balykJXJy93HJzBZN-KBYrRJJvGsaEtQeX7-z0tbX7w,49566
 cognite/neat/rules/models/dms/_serializer.py,sha256=iqp2zyyf8jEcU-R3PERuN8nu248xIqyxiWj4owAn92g,6406
@@ -244,8 +245,8 @@ cognite/neat/rules/models/dms/_validation.py,sha256=5mk9L99FSwC8Ok7weEjnFJ_OZnmq
 cognite/neat/rules/models/domain.py,sha256=wZ-DeIPFnacbNlxSrRuLzUpnhHdTpzNc22z0sDfisi4,2880
 cognite/neat/rules/models/entities.py,sha256=u8jbE7n99FKKND6U9ogoUfhjtataDtATprAyRgBNwrw,20823
 cognite/neat/rules/models/information/__init__.py,sha256=HR6g8xgyU53U7Ck8pPdbT70817Q4NC1r1pCRq5SA8iw,291
-cognite/neat/rules/models/information/_converter.py,sha256=nsfOCe13c3gqbbF1mrQHofemzYKpvg_NKjJZDwSXo5E,13960
-cognite/neat/rules/models/information/_rules.py,sha256=v8ptTif8X55wYaNHvsx65jK7PP2ClSYWyFWUyI2rbyY,13487
+cognite/neat/rules/models/information/_converter.py,sha256=J3mY5clqMY1PR_EmIT-GsTBJ16XCpHQG8EkQWvpqdnI,13930
+cognite/neat/rules/models/information/_rules.py,sha256=08iDnKI5l_kcIjtRjSANr79oMHAtHXjnX7dYN_tUo4U,13457
 cognite/neat/rules/models/information/_rules_input.py,sha256=1aVaF7VrqaLR-NOq4RR0lnzMp0USCvAPfMA9PjS_mgo,10609
 cognite/neat/rules/models/information/_serializer.py,sha256=yti9I_xJruxrib66YIBInhze___Io-oPTQH6uWDumPE,3503
 cognite/neat/rules/models/information/_validation.py,sha256=K4RTd1I8jrqTHUaPFtAQ8bvS8a4ES9efqXRqQX9wQ8I,8258
@@ -264,7 +265,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=vtrBrjMqLIdPuIPEY9MwEEvzeu7vm-regFcU8y4pzeI,14226
+cognite/neat/utils/utils.py,sha256=1EReJhllbJ-7rluI8N_0lldVx5xzpEso-cVVR01F6RI,15042
 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 +311,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.11.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.85.11.dist-info/METADATA,sha256=dofrglhVYBscSaExRgcBzxsXGN7a1cNkk1srGCk692w,9494
-cognite_neat-0.85.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cognite_neat-0.85.11.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
-cognite_neat-0.85.11.dist-info/RECORD,,
+cognite_neat-0.86.0.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.86.0.dist-info/METADATA,sha256=Ass8LW31jCG7Te930YQQNxUK8Ocl3hDmi8KacuraxLA,9493
+cognite_neat-0.86.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cognite_neat-0.86.0.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
+cognite_neat-0.86.0.dist-info/RECORD,,