cognite-neat 0.117.6__tar.gz → 0.117.8__tar.gz

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cognite-neat
-Version: 0.117.6
+Version: 0.117.8
 Summary: Knowledge graph transformation
 License: Apache-2.0
 Author: Nikola Vasiljevic

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_client/data_classes/schema.py

@@ -279,7 +279,9 @@ class DMSSchema:
         return cls(**loaded)
 
     @classmethod
-    def _load_individual_resources(cls, items: list, attr: Field, trigger_error: str, resource_context) -> list[Any]:
+    def _load_individual_resources(
+        cls: Any, items: list, attr: Field, trigger_error: str, resource_context: list[Path]
+    ) -> list[Any]:
         type_ = cast(type, attr.type)
         resources = type_([])
         if not hasattr(type_, "_RESOURCE"):

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_graph/extractors/_classic_cdf/_base.py

@@ -15,6 +15,7 @@ from cognite.client.data_classes._base import WriteableCogniteResource
 from cognite.client.exceptions import CogniteAPIError
 from pydantic import AnyHttpUrl, ValidationError
 from rdflib import RDF, XSD, Literal, Namespace, URIRef
+from typing_extensions import Self
 
 from cognite.neat._constants import DEFAULT_NAMESPACE
 from cognite.neat._graph.extractors._base import BaseExtractor
@@ -321,7 +322,7 @@ class ClassicCDFBaseExtractor(BaseExtractor, ABC, Generic[T_CogniteResource]):
         as_write: bool = False,
         prefix: str | None = None,
         identifier: typing.Literal["id", "externalId"] = "id",
-    ):
+    ) -> Self:
         total, items = cls._handle_no_access(lambda: cls._from_dataset(client, data_set_external_id))
         return cls(
             items,
@@ -356,7 +357,7 @@ class ClassicCDFBaseExtractor(BaseExtractor, ABC, Generic[T_CogniteResource]):
         as_write: bool = False,
         prefix: str | None = None,
         identifier: typing.Literal["id", "externalId"] = "id",
-    ):
+    ) -> BaseExtractor:
         total, items = cls._handle_no_access(lambda: cls._from_hierarchy(client, root_asset_external_id))
         return cls(
             items,
@@ -390,7 +391,7 @@ class ClassicCDFBaseExtractor(BaseExtractor, ABC, Generic[T_CogniteResource]):
         as_write: bool = False,
         prefix: str | None = None,
         identifier: typing.Literal["id", "externalId"] = "id",
-    ):
+    ) -> BaseExtractor:
         total, items = cls._from_file(file_path)
         return cls(
             items,

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_graph/extractors/_classic_cdf/_classic.py

@@ -2,12 +2,12 @@ import typing
 import urllib.parse
 import warnings
 from collections import defaultdict
-from collections.abc import Iterable, Sequence
-from typing import ClassVar, NamedTuple, cast
+from collections.abc import Generator, Iterable, Sequence
+from typing import Any, ClassVar, NamedTuple, cast
 
 from cognite.client import CogniteClient
 from cognite.client.exceptions import CogniteAPIError
-from rdflib import Literal, Namespace, URIRef
+from rdflib import Namespace, URIRef
 
 from cognite.neat._constants import CLASSIC_CDF_NAMESPACE, DEFAULT_NAMESPACE, get_default_prefixes_and_namespaces
 from cognite.neat._graph.extractors._base import KnowledgeGraphExtractor
@@ -265,16 +265,16 @@ class ClassicGraphExtractor(KnowledgeGraphExtractor):
         else:
             raise ValueError("Exactly one of data_set_external_id or root_asset_external_id must be set.")
 
-    def _extract_core_start_nodes(self):
+    def _extract_core_start_nodes(self) -> Generator[Triple, None, None]:
         for core_node in self._classic_node_types:
             kwargs = self._extractor_args.copy()
             if core_node.extractor_cls == SequencesExtractor and self._skip_sequence_rows:
                 kwargs["skip_rows"] = True
 
             if self._data_set_external_id:
-                extractor = core_node.extractor_cls.from_dataset(self._client, self._data_set_external_id, **kwargs)
+                extractor = core_node.extractor_cls.from_dataset(self._client, self._data_set_external_id, **kwargs)  # type: ignore
             elif self._root_asset_external_id:
-                extractor = core_node.extractor_cls.from_hierarchy(self._client, self._root_asset_external_id, **kwargs)
+                extractor = core_node.extractor_cls.from_hierarchy(self._client, self._root_asset_external_id, **kwargs)  # type: ignore
             else:
                 raise ValueError("Exactly one of data_set_external_id or root_asset_external_id must be set.")
 
@@ -296,14 +296,17 @@ class ClassicGraphExtractor(KnowledgeGraphExtractor):
                 self._asset_parent_uri_by_id.update(extractor.asset_parent_uri_by_id)
                 self._asset_parent_uri_by_external_id.update(extractor.asset_parent_uri_by_external_id)
 
-    def _extract_start_node_relationships(self):
+    def _extract_start_node_relationships(self) -> Generator[Triple, None, None]:
         for start_resource_type, source_external_ids in self._source_external_ids_by_type.items():
             start_type = start_resource_type.removesuffix("_")
             for chunk in self._chunk(list(source_external_ids), description=f"Extracting {start_type} relationships"):
                 relationship_iterator = self._client.relationships(
                     source_external_ids=list(chunk), source_types=[start_type]
                 )
-                extractor = RelationshipsExtractor(relationship_iterator, **self._extractor_args)
+                # this needs some further attention. Duplicated code + untyped dict when unpacking the parameters.
+                # I am deliberately adding type ignore now, needs to be checked later.
+                extractor = RelationshipsExtractor(relationship_iterator, **self._extractor_args)  # type: ignore
+
                 # This is a private attribute, but we need to set it to log the target nodes.
                 extractor._log_target_nodes = True
                 if self._identifier == "id":
@@ -337,7 +340,7 @@ class ClassicGraphExtractor(KnowledgeGraphExtractor):
                     self._asset_parent_uri_by_id.update(extractor.asset_parent_uri_by_id)
                     self._asset_parent_uri_by_external_id.update(extractor.asset_parent_uri_by_external_id)
 
-    def _extract_core_end_nodes(self):
+    def _extract_core_end_nodes(self) -> Generator[Triple, None, None]:
         for core_node in self._classic_node_types:
             target_external_ids = self._target_external_ids_by_type[core_node.resource_type]
             api = getattr(self._client, core_node.api_name)
@@ -345,8 +348,12 @@ class ClassicGraphExtractor(KnowledgeGraphExtractor):
                 list(target_external_ids),
                 description=f"Extracting end nodes {core_node.resource_type.removesuffix('_')}",
             ):
+                # TO DO: this should be typed.
                 resource_iterator = api.retrieve_multiple(external_ids=list(chunk), ignore_unknown_ids=True)
-                extractor = core_node.extractor_cls(resource_iterator, **self._extractor_args)
+
+                # this needs some further attention. Duplicated code + untyped dict when unpacking the parameters.
+                # I am deliberately adding type ignore now, needs to be checked later.
+                extractor = core_node.extractor_cls(resource_iterator, **self._extractor_args)  # type: ignore
 
                 extractor.asset_external_ids_by_id = self._asset_external_ids_by_id
                 extractor.lookup_dataset_external_id = self._lookup_dataset
@@ -358,7 +365,7 @@ class ClassicGraphExtractor(KnowledgeGraphExtractor):
                 if self._identifier == "id":
                     self._uris_by_external_id_by_type[core_node.resource_type].update(extractor._uriref_by_external_id)
 
-    def _extract_relationship_target_triples(self):
+    def _extract_relationship_target_triples(self) -> Generator[tuple[URIRef, URIRef, URIRef], None, None]:
         for id_, predicate, type_, external_id in self._relationship_subject_predicate_type_external_id:
             try:
                 object_uri = self._uris_by_external_id_by_type[InstanceIdPrefix.from_str(type_)][external_id]
@@ -367,24 +374,28 @@ class ClassicGraphExtractor(KnowledgeGraphExtractor):
             else:
                 yield id_, predicate, object_uri
 
-    def _extract_labels(self):
+    def _extract_labels(self) -> Generator[Triple, None, None]:
+        # this needs some further attention. Duplicated code + untyped dict when unpacking the parameters.
+        # I am deliberately adding type ignore now, needs to be checked later.
         for chunk in self._chunk(list(self._labels), description="Extracting labels"):
             label_iterator = self._client.labels.retrieve(external_id=list(chunk), ignore_unknown_ids=True)
-            extractor = LabelsExtractor(label_iterator, **self._extractor_args)
+            extractor = LabelsExtractor(label_iterator, **self._extractor_args)  # type: ignore
             extractor.lookup_dataset_external_id = self._lookup_dataset
             yield from extractor.extract()
 
-    def _extract_data_sets(self):
+    def _extract_data_sets(self) -> Generator[Triple, None, None]:
+        # this needs some further attention. Duplicated code + untyped dict when unpacking the parameters.
+        # I am deliberately adding type ignore now, needs to be checked later.
         for chunk in self._chunk(list(self._data_set_ids), description="Extracting data sets"):
             data_set_iterator = self._client.data_sets.retrieve_multiple(ids=list(chunk), ignore_unknown_ids=True)
-            yield from DataSetExtractor(data_set_iterator, **self._extractor_args).extract()
+            yield from DataSetExtractor(data_set_iterator, **self._extractor_args).extract()  # type: ignore
         for chunk in self._chunk(list(self._data_set_external_ids), description="Extracting data sets"):
             data_set_iterator = self._client.data_sets.retrieve_multiple(
                 external_ids=list(chunk), ignore_unknown_ids=True
             )
-            yield from DataSetExtractor(data_set_iterator, **self._extractor_args).extract()
+            yield from DataSetExtractor(data_set_iterator, **self._extractor_args).extract()  # type: ignore
 
-    def _extract_asset_parent_data_sets(self):
+    def _extract_asset_parent_data_sets(self) -> Generator[tuple[URIRef, Any, Any], None, None]:
         if self._asset_parent_uri_by_id:
             for chunk in self._chunk(
                 list(self._asset_parent_uri_by_id.keys()), description="Extracting asset parent data sets"
@@ -393,11 +404,12 @@ class ClassicGraphExtractor(KnowledgeGraphExtractor):
                 for asset in assets:
                     if asset.data_set_id is None:
                         continue
-                    object_ = (
-                        Literal(self._lookup_dataset(asset.data_set_id))
+                    data_set_id = (
+                        self._lookup_dataset(asset.data_set_id)
                         if self._identifier == "externalId"
-                        else Literal(asset.data_set_id)
+                        else asset.data_set_id
                     )
+                    object_ = self._namespace[f"{InstanceIdPrefix.data_set}{data_set_id}"]
                     yield self._asset_parent_uri_by_id[asset.id], self._namespace.dataSetId, object_
         if self._asset_parent_uri_by_external_id:
             for chunk in self._chunk(
@@ -407,12 +419,18 @@ class ClassicGraphExtractor(KnowledgeGraphExtractor):
                 for asset in assets:
                     if asset.data_set_id is None:
                         continue
-                    object_ = (
-                        Literal(self._lookup_dataset(asset.data_set_id))
+                    data_set_id = (
+                        self._lookup_dataset(asset.data_set_id)
                         if self._identifier == "externalId"
-                        else Literal(asset.data_set_id)
+                        else asset.data_set_id
                     )
-                    yield self._asset_parent_uri_by_external_id[asset.external_id], self._namespace.dataSetId, object_
+                    object_ = self._namespace[f"{InstanceIdPrefix.data_set}{data_set_id}"]
+                    if asset.external_id:
+                        yield (
+                            self._asset_parent_uri_by_external_id[asset.external_id],
+                            self._namespace.dataSetId,
+                            object_,
+                        )
 
     def _extract_with_logging_label_dataset(
         self, extractor: ClassicCDFBaseExtractor, resource_type: InstanceIdPrefix | None = None

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_graph/extractors/_classic_cdf/_sequences.py

@@ -8,6 +8,7 @@ from typing import Any
 from cognite.client import CogniteClient
 from cognite.client.data_classes import Sequence, SequenceFilter
 from rdflib import RDF, XSD, Literal, Namespace, URIRef
+from typing_extensions import Self
 
 from cognite.neat._client.data_classes.neat_sequence import NeatSequence, NeatSequenceList
 from cognite.neat._shared import Triple
@@ -83,7 +84,7 @@ class SequencesExtractor(ClassicCDFBaseExtractor[NeatSequence]):
         identifier: typing.Literal["id", "externalId"] = "id",
         unpack_columns: bool = False,
         skip_rows: bool = False,
-    ):
+    ) -> Self:
         total, items = cls._handle_no_access(lambda: cls._from_dataset(client, data_set_external_id, skip_rows))
         return cls(
             items,
@@ -114,7 +115,7 @@ class SequencesExtractor(ClassicCDFBaseExtractor[NeatSequence]):
         identifier: typing.Literal["id", "externalId"] = "id",
         unpack_columns: bool = False,
         skip_rows: bool = False,
-    ):
+    ) -> ClassicCDFBaseExtractor:
         total, items = cls._handle_no_access(lambda: cls._from_hierarchy(client, root_asset_external_id, skip_rows))
         return cls(
             items,
@@ -143,7 +144,7 @@ class SequencesExtractor(ClassicCDFBaseExtractor[NeatSequence]):
         prefix: str | None = None,
         identifier: typing.Literal["id", "externalId"] = "id",
         unpack_columns: bool = False,
-    ):
+    ) -> ClassicCDFBaseExtractor:
         total, items = cls._from_file(file_path)
         return cls(
             items,

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_graph/extractors/_dexpi.py

@@ -5,6 +5,7 @@ from pathlib import Path
 from xml.etree.ElementTree import Element
 
 from rdflib import RDF, RDFS, XSD, Literal, Namespace, URIRef
+from typing_extensions import Self
 
 from cognite.neat._constants import DEFAULT_NAMESPACE
 from cognite.neat._graph.extractors._base import BaseExtractor
@@ -35,11 +36,11 @@ class DexpiExtractor(BaseExtractor):
         self.namespace = namespace or DEFAULT_NAMESPACE
 
     @classmethod
-    def from_file(cls, filepath: str | Path, namespace: Namespace | None = None):
+    def from_file(cls, filepath: str | Path, namespace: Namespace | None = None) -> Self:
         return cls(ET.parse(filepath).getroot(), namespace)
 
     @classmethod
-    def from_url(cls, url: str, namespace: Namespace | None = None):
+    def from_url(cls, url: str, namespace: Namespace | None = None) -> Self:
         from io import BytesIO
 
         import requests
@@ -119,7 +120,7 @@ class DexpiExtractor(BaseExtractor):
         return triples
 
     @classmethod
-    def _to_uri_friendly_association_type(cls, association: Element):
+    def _to_uri_friendly_association_type(cls, association: Element) -> str:
         association_type = "".join(
             [word.capitalize() if i != 0 else word for i, word in enumerate(association.attrib["Type"].split(" "))]
         )

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_graph/extractors/_iodd.py

@@ -8,6 +8,7 @@ from typing import Literal as LiteralType
 from xml.etree.ElementTree import Element
 
 from rdflib import RDF, XSD, Literal, Namespace, URIRef
+from typing_extensions import Self
 
 from cognite.neat._constants import DEFAULT_NAMESPACE
 from cognite.neat._graph.extractors._base import BaseExtractor
@@ -90,7 +91,7 @@ class IODDExtractor(BaseExtractor):
         return mapping
 
     @classmethod
-    def from_file(cls, filepath: Path, namespace: Namespace | None = None, device_id: str | None = None):
+    def from_file(cls, filepath: Path, namespace: Namespace | None = None, device_id: str | None = None) -> Self:
         if filepath.suffix != ".xml":
             raise FileReadError(filepath, "File is not XML.")
         return cls(ET.parse(filepath).getroot(), namespace, device_id)
@@ -273,7 +274,7 @@ class IODDExtractor(BaseExtractor):
         return triples
 
     @classmethod
-    def _process_data_in_records2triples(cls, pc_in_root: Element, process_data_in_id: URIRef):
+    def _process_data_in_records2triples(cls, pc_in_root: Element, process_data_in_id: URIRef) -> list[Triple]:
         """
         Extract RecordItems related to a ProcessDataIn element. Each record item is indexed. Will use this index
         as the identifier for the time series in CDF.
@@ -355,7 +356,7 @@ class IODDExtractor(BaseExtractor):
 
         return record_dict
 
-    def _extract_enhanced_ts_information(self, json_file_path: Path):
+    def _extract_enhanced_ts_information(self, json_file_path: Path) -> None:
         """
         Extract additional information like name, description and data type for Variables and ProcessDataIn
         record elements in the IODD. The purpose is for the result gile to be used for enhancing time series with more

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_graph/extractors/_mock_graph_generator.py

@@ -206,7 +206,7 @@ def _traverse(hierarchy: dict, graph: dict, names: list[str]) -> dict:
     return hierarchy
 
 
-def _prettify_generation_order(generation_order: dict, depth: dict | None = None, start=-1) -> dict:
+def _prettify_generation_order(generation_order: dict, depth: dict | None = None, start: int = -1) -> dict:
     """Prettifies generation order dictionary for easier consumption."""
     depth = depth or {}
     for key, value in generation_order.items():

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_graph/extractors/_rdf_file.py

@@ -5,6 +5,7 @@ from typing import cast, get_args
 
 from rdflib import URIRef
 from rdflib.util import guess_format
+from typing_extensions import Self
 
 from cognite.neat._constants import DEFAULT_BASE_URI
 from cognite.neat._graph._shared import RDFTypes
@@ -57,7 +58,7 @@ class RdfFileExtractor(BaseExtractor):
         filename: str = "neat-session/instances/instances.trig",
         base_uri: URIRef = DEFAULT_BASE_URI,
         issue_list: IssueList | None = None,
-    ):
+    ) -> Self:
         if not filepath.exists():
             raise FileNotFoundNeatError(filepath)
         if filepath.suffix not in {".zip"}:

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_graph/loaders/_rdf2dms.py

@@ -374,7 +374,7 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
 
                 field_definitions[prop_id] = (python_type, default_value)
 
-        def parse_list(cls, value: Any, info: ValidationInfo) -> list[str]:
+        def parse_list(cls: Any, value: Any, info: ValidationInfo) -> list[str]:
             if isinstance(value, list) and list.__name__ not in _get_field_value_types(cls, info):
                 if len(value) > 1:
                     warnings.warn(
@@ -388,7 +388,7 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
 
             return value
 
-        def parse_json_string(cls, value: Any, info: ValidationInfo) -> dict | list:
+        def parse_json_string(cls: Any, value: Any, info: ValidationInfo) -> dict | list:
             if isinstance(value, dict):
                 return value
             elif isinstance(value, list):
@@ -411,7 +411,7 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
 
         if direct_relation_by_property:
 
-            def parse_direct_relation(cls, value: list, info: ValidationInfo) -> dict | list[dict]:
+            def parse_direct_relation(cls: Any, value: list, info: ValidationInfo) -> dict | list[dict]:
                 # We validate above that we only get one value for single direct relations.
                 if list.__name__ in _get_field_value_types(cls, info):
                     ids = (self._create_instance_id(v, "node", stop_on_exception=True) for v in value)
@@ -443,7 +443,7 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
 
         if unit_properties:
 
-            def parse_direct_relation_to_unit(cls, value: Any, info: ValidationInfo) -> dict | list[dict]:
+            def parse_direct_relation_to_unit(cls: Any, value: Any, info: ValidationInfo) -> dict | list[dict]:
                 if value:
                     external_id = remove_namespace_from_uri(value[0])
                     if self._unquote_external_ids:
@@ -457,7 +457,7 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
 
         if text_fields:
 
-            def parse_text(cls, value: Any, info: ValidationInfo) -> str | list[str]:
+            def parse_text(cls: Any, value: Any, info: ValidationInfo) -> str | list[str]:
                 if isinstance(value, list):
                     return [remove_namespace_from_uri(v) if isinstance(v, URIRef) else str(v) for v in value]
                 return remove_namespace_from_uri(value) if isinstance(value, URIRef) else str(value)
@@ -701,5 +701,5 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
             yield result
 
 
-def _get_field_value_types(cls, info):
+def _get_field_value_types(cls: Any, info: ValidationInfo) -> Any:
     return [type_.__name__ for type_ in get_args(cls.model_fields[info.field_name].annotation)]

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_graph/transformers/_iodd.py

@@ -14,7 +14,7 @@ class IODDAttachPropertyFromTargetToSource(AttachPropertyFromTargetToSource):
         }
     )
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__(
             target_node_type=IODD.TextObject,
             target_property=IODD.value,
@@ -26,5 +26,5 @@ class IODDAttachPropertyFromTargetToSource(AttachPropertyFromTargetToSource):
 class IODDPruneDanglingNodes(PruneDanglingNodes):
     _need_changes = frozenset({str(IODDExtractor.__name__), str(IODDAttachPropertyFromTargetToSource.__name__)})
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__(node_prune_types=[IODD.TextObject])

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_graph/transformers/_prune_graph.py

@@ -1,4 +1,4 @@
-from typing import cast
+from typing import Any, cast
 
 from rdflib import Graph, Namespace, URIRef
 from rdflib.query import ResultRow
@@ -101,8 +101,8 @@ class AttachPropertyFromTargetToSource(BaseTransformer):
         self.convert_literal_to_uri = convert_literal_to_uri
         self.namespace = namespace or DEFAULT_NAMESPACE
 
-    def transform(self, graph) -> None:
-        nodes_to_delete: list[tuple] = []
+    def transform(self, graph: Graph) -> None:
+        nodes_to_delete: list[Any] = []
 
         if self.target_property_holding_new_property is not None:
             query = self._query_template_use_case_b.format(
@@ -116,7 +116,7 @@ class AttachPropertyFromTargetToSource(BaseTransformer):
                 target_property=self.target_property,
             )
 
-        for (
+        for (  # type: ignore
             source_node,
             old_predicate,
             target_node,
@@ -128,7 +128,8 @@ class AttachPropertyFromTargetToSource(BaseTransformer):
                 new_predicate_value_string = sentence_or_string_to_camel(str(new_predicate_value))
                 predicate = as_neat_compliant_uri(self.namespace[new_predicate_value_string])
             else:
-                predicate = old_predicate
+                # this assign seems dangerous
+                predicate = old_predicate  # type: ignore
             # Create new connection from source node to value
             graph.add(
                 (
@@ -142,12 +143,13 @@ class AttachPropertyFromTargetToSource(BaseTransformer):
 
             nodes_to_delete.append(target_node)
 
+        # this seems a bit funky. Need to check further.
         if self.delete_target_node:
             for target_node in nodes_to_delete:
                 # Remove triples with edges to target_node
-                graph.remove((None, None, target_node))
+                graph.remove((None, None, target_node))  # type: ignore
                 # Remove target node triple and its properties
-                graph.remove((target_node, None, None))
+                graph.remove((target_node, None, None))  # type: ignore
 
 
 # TODO: Remove or adapt IODD

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_graph/transformers/_value_type.py

@@ -4,7 +4,7 @@ from typing import Any, cast
 from urllib.parse import quote
 
 import rdflib
-from rdflib import RDF, RDFS, Literal, Namespace, URIRef
+from rdflib import RDF, RDFS, Graph, Literal, Namespace, URIRef
 from rdflib.query import ResultRow
 
 from cognite.neat._constants import NEAT
@@ -68,9 +68,10 @@ class SplitMultiValueProperty(BaseTransformerStandardised):
 
         return query.format(unknownType=self.unknown_type, subject_uri=type_, property_uri=property_)
 
-    def _iterator(self, graph) -> Iterator:
-        for type_, property_, _ in graph.query(self._iterate_query()):
-            yield from graph.query(self._sub_iterate_query(type_, property_))
+    def _iterator(self, graph: Graph) -> Iterator:
+        # this method is doing some funky stuff, we should review this.
+        for type_, property_, _ in graph.query(self._iterate_query()):  # type: ignore
+            yield from graph.query(self._sub_iterate_query(type_, property_))  # type: ignore
 
     def operation(self, query_result_row: ResultRow) -> RowTransformationOutput:
         row_output = RowTransformationOutput()

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_issues/formatters.py

@@ -37,7 +37,7 @@ class Formatter(ABC):
 class BasicHTML(Formatter):
     file_suffix = ".html"
 
-    def __init__(self):
+    def __init__(self) -> None:
         self._doc = ET.Element("html")
         self._body = ET.SubElement(self._doc, "body")
 

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_rules/_shared.py

@@ -28,7 +28,7 @@ class ReadRules(Generic[T_InputRules]):
         return "UnverifiedModel"
 
     @property
-    def display_name(self):
+    def display_name(self) -> str:
         if self.rules is None:
             return "FailedRead"
         return self.rules.display_name

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_rules/exporters/_rules2dms.py

@@ -142,7 +142,7 @@ class DMSExporter(CDFExporter[DMSRules, DMSSchema]):
         exclude = self._create_exclude_set()
         schema.to_zip(filepath, exclude=exclude)
 
-    def _create_exclude_set(self):
+    def _create_exclude_set(self) -> set:
         if self.export_components is None:
             exclude = set()
         else:

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_rules/exporters/_rules2excel.py

@@ -242,7 +242,7 @@ class ExcelExporter(BaseExporter[VerifiedRules, Workbook]):
         dumped_rules: dict[str, Any],
         rules: VerifiedRules,
         sheet_prefix: str = "",
-    ):
+    ) -> None:
         for sheet_name, headers in rules.headers_by_sheet(by_alias=True).items():
             if sheet_name in ("Metadata", "Prefixes", "Reference", "Last"):
                 continue

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_rules/exporters/_rules2instance_template.py

@@ -49,7 +49,7 @@ class InstanceTemplateExporter(BaseExporter[InformationRules, Workbook]):
     def export(
         self,
         rules: InformationRules,
-    ):
+    ) -> Workbook:
         workbook = Workbook()
 
         # Remove default sheet named "Sheet"
@@ -93,13 +93,13 @@ class InstanceTemplateExporter(BaseExporter[InformationRules, Workbook]):
         return None
 
 
-def _add_index_identifiers(workbook: Workbook, sheet: str, no_rows: int):
+def _add_index_identifiers(workbook: Workbook, sheet: str, no_rows: int) -> None:
     """Adds index-based auto identifier to a sheet identifier column"""
     for i in range(no_rows):
         workbook[sheet][f"A{i + 2}"] = f'=IF(ISBLANK(B{i + 2}), "","{sheet}-{i + 1}")'
 
 
-def _add_uuid_identifiers(workbook: Workbook, sheet: str, no_rows: int):
+def _add_uuid_identifiers(workbook: Workbook, sheet: str, no_rows: int) -> None:
     """Adds UUID-based auto identifier to a sheet identifier column"""
     for i in range(no_rows):
         workbook[sheet][f"A{i + 2}"] = f'=IF(ISBLANK(B{i + 2}), "","{sheet}-{uuid.uuid4()}")'
@@ -112,7 +112,7 @@ def _add_drop_down_list(
     no_rows: int,
     value_sheet: str,
     value_column: str,
-):
+) -> None:
     """Adds a drop down list to a column"""
     drop_down_list = DataValidation(
         type="list",
@@ -125,7 +125,7 @@ def _add_drop_down_list(
         drop_down_list.add(workbook[sheet][f"{column}{i + 2}"])
 
 
-def _adjust_column_width(workbook: Workbook):
+def _adjust_column_width(workbook: Workbook) -> None:
     """Adjusts the column width based on the content"""
     for sheet in workbook.sheetnames:
         for cell_tuple in workbook[sheet].columns:
@@ -136,7 +136,7 @@ def _adjust_column_width(workbook: Workbook):
                 workbook[sheet].column_dimensions[cell.column_letter].width = adjusted_width
 
 
-def _set_header_style(workbook: Workbook):
+def _set_header_style(workbook: Workbook) -> None:
     """Sets the header style for all sheets in the workbook"""
     style = NamedStyle(name="header style")
     style.font = Font(bold=True, size=16)

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_rules/exporters/_rules2ontology.py

@@ -2,7 +2,7 @@ import sys
 import warnings
 from abc import ABC
 from pathlib import Path
-from typing import ClassVar
+from typing import Any, ClassVar
 
 from pydantic import BaseModel, ConfigDict, ValidationInfo, field_validator
 from rdflib import DCTERMS, OWL, RDF, RDFS, XSD, BNode, Graph, Literal, Namespace, URIRef
@@ -355,7 +355,7 @@ class OWLProperty(OntologyModel):
         return owl_property
 
     @field_validator("type_")
-    def is_multi_type(cls, v, info: ValidationInfo):
+    def is_multi_type(cls, v: Any, info: ValidationInfo) -> Any:
         if len(v) > 1:
             warnings.warn(
                 PropertyDefinitionDuplicatedWarning(
@@ -373,7 +373,7 @@ class OWLProperty(OntologyModel):
         return v
 
     @field_validator("range_")
-    def is_multi_range(cls, v, info: ValidationInfo):
+    def is_multi_range(cls, v: Any, info: ValidationInfo) -> Any:
         if len(v) > 1:
             warnings.warn(
                 PropertyDefinitionDuplicatedWarning(
@@ -390,7 +390,7 @@ class OWLProperty(OntologyModel):
         return v
 
     @field_validator("domain")
-    def is_multi_domain(cls, v, info: ValidationInfo):
+    def is_multi_domain(cls, v: Any, info: ValidationInfo) -> Any:
         if len(v) > 1:
             warnings.warn(
                 PropertyDefinitionDuplicatedWarning(
@@ -408,7 +408,7 @@ class OWLProperty(OntologyModel):
         return v
 
     @field_validator("label")
-    def has_multi_name(cls, v, info: ValidationInfo):
+    def has_multi_name(cls, v: Any, info: ValidationInfo) -> Any:
         if len(v) > 1:
             warnings.warn(
                 PropertyDefinitionDuplicatedWarning(
@@ -423,7 +423,7 @@ class OWLProperty(OntologyModel):
         return v
 
     @field_validator("comment")
-    def has_multi_comment(cls, v, info: ValidationInfo):
+    def has_multi_comment(cls, v: Any, info: ValidationInfo) -> Any:
         if len(v) > 1:
             warnings.warn(
                 PropertyDefinitionDuplicatedWarning(

{cognite_neat-0.117.6 → cognite_neat-0.117.8}/cognite/neat/_rules/importers/_dms2rules.py

@@ -465,7 +465,7 @@ class DMSImporter(BaseImporter[DMSInputRules]):
                 return str(default)
         return None
 
-    def _get_index(self, prop: ViewPropertyApply, prop_id) -> list[str] | None:
+    def _get_index(self, prop: ViewPropertyApply, prop_id: str) -> list[str] | None:
         if not isinstance(prop, dm.MappedPropertyApply):
             return None
         container = self._all_containers_by_id[prop.container]