cognite-neat 0.100.1__py3-none-any.whl → 0.102.0__py3-none-any.whl

cognite/neat/_constants.py

@@ -71,7 +71,7 @@ UNKNOWN_TYPE = DEFAULT_NAMESPACE.UnknownType
 XML_SCHEMA_NAMESPACE = Namespace("http://www.w3.org/2001/XMLSchema#")
 
 
-def get_default_prefixes() -> dict[str, Namespace]:
+def get_default_prefixes_and_namespaces() -> dict[str, Namespace]:
     return {
         "owl": OWL._NS,
         "rdf": RDF._NS,
@@ -84,6 +84,10 @@ def get_default_prefixes() -> dict[str, Namespace]:
         "imf": Namespace("http://ns.imfid.org/imf#"),
         "pav": Namespace("http://purl.org/pav/"),
         "foaf": FOAF._NS,
+        "dexpi": Namespace("http://sandbox.dexpi.org/rdl/"),
+        "qudt": Namespace("https://qudt.org/vocab/unit/"),
+        "iodd": Namespace("http://www.io-link.com/IODD/2010/10/"),
+        "aml": Namespace("https://www.automationml.org/"),
     }
 
 

cognite/neat/_graph/loaders/_rdf2dms.py

@@ -156,7 +156,6 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
 
             for identifier, properties in reader:
                 try:
-                    print(view_id)
                     yield self._create_node(identifier, properties, pydantic_cls, view_id)
                 except ValueError as e:
                     error_node = ResourceCreationError(identifier, "node", error=str(e))
@@ -198,7 +197,7 @@ class DMSLoader(CDFLoader[dm.InstanceApply]):
         json_fields: list[str] = []
         for prop_name, prop in view.properties.items():
             if isinstance(prop, dm.EdgeConnection):
-                edge_by_property[prop.type.external_id] = prop_name, prop
+                edge_by_property[prop_name] = prop_name, prop
             if isinstance(prop, dm.MappedProperty):
                 if isinstance(prop.type, dm.DirectRelation):
                     direct_relation_by_property[prop_name] = prop.type

cognite/neat/_graph/queries/_base.py

@@ -209,7 +209,10 @@ class Queries:
             elif (
                 isinstance(object_, URIRef)
                 and property_types
-                and property_types.get(property_, None) == EntityTypes.object_property
+                and (
+                    property_types.get(property_, None) == EntityTypes.object_property
+                    or property_types.get(property_, None) == EntityTypes.undefined
+                )
             ):
                 value = remove_namespace_from_uri(object_, validation="prefix")
 
@@ -233,7 +236,6 @@ class Queries:
                 else:
                     # we should not have multiple rdf:type values
                     continue
-
         if property_values:
             return (
                 identifier,
@@ -358,3 +360,21 @@ class Queries:
             dropped_types[t] = len(instance_ids)
             remove_instance_ids_in_batch(self.graph, instance_ids)
         return dropped_types
+
+    def multi_type_instances(self) -> dict[str, list[str]]:
+        """Find instances with multiple types"""
+
+        query = """
+        SELECT ?instance (GROUP_CONCAT(str(?type); SEPARATOR=",") AS ?types)
+        WHERE {
+            ?instance a ?type .
+        }
+        GROUP BY ?instance
+        HAVING (COUNT(?type) > 1)
+        """
+
+        result = {}
+        for instance, types in self.graph.query(query):  # type: ignore
+            result[remove_namespace_from_uri(instance)] = remove_namespace_from_uri(types.split(","))
+
+        return result

cognite/neat/_graph/queries/_shared.py

@@ -6,7 +6,7 @@ from pydantic import BaseModel, ConfigDict, Field
 from rdflib import Graph, Literal, Namespace
 from rdflib.term import URIRef
 
-from cognite.neat._constants import get_default_prefixes
+from cognite.neat._constants import get_default_prefixes_and_namespaces
 from cognite.neat._rules.models._rdfpath import (
     Hop,
     Step,
@@ -51,7 +51,7 @@ def generate_prefix_header(prefixes: dict[str, Namespace] | None = None) -> str:
         Prefix header
     """
 
-    prefixes = prefixes or get_default_prefixes()
+    prefixes = prefixes or get_default_prefixes_and_namespaces()
 
     return "".join(f"PREFIX {key}:<{value}>\n" for key, value in prefixes.items())
 
@@ -81,7 +81,7 @@ def get_predicate_id(
         ID of predicate (aka property) connecting subject and object
     """
 
-    prefixes = prefixes or get_default_prefixes()
+    prefixes = prefixes or get_default_prefixes_and_namespaces()
 
     query = """
 
@@ -123,7 +123,7 @@ def hop2property_path(
     str
         Property path string for hop traversal (e.g. ^rdf:type/rdfs:subClassOf)
     """
-    prefixes = prefixes if prefixes else get_default_prefixes()
+    prefixes = prefixes if prefixes else get_default_prefixes_and_namespaces()
 
     # setting previous step to origin, as we are starting from there
     previous_step = Step(class_=hop.class_, direction="origin")

cognite/neat/_graph/transformers/__init__.py

@@ -7,6 +7,13 @@ from ._classic_cdf import (
     AssetTimeSeriesConnector,
     RelationshipAsEdgeTransformer,
 )
+from ._prune_graph import (
+    AttachPropertyFromTargetToSource,
+    PruneDanglingNodes,
+    PruneDeadEndEdges,
+    PruneInstancesOfUnknownType,
+    PruneTypes,
+)
 from ._rdfpath import AddSelfReferenceProperty, MakeConnectionOnExactMatch
 from ._value_type import SplitMultiValueProperty
 
@@ -21,6 +28,11 @@ __all__ = [
     "SplitMultiValueProperty",
     "RelationshipAsEdgeTransformer",
     "MakeConnectionOnExactMatch",
+    "AttachPropertyFromTargetToSource",
+    "PruneDanglingNodes",
+    "PruneTypes",
+    "PruneDeadEndEdges",
+    "PruneInstancesOfUnknownType",
 ]
 
 Transformers = (
@@ -34,4 +46,9 @@ Transformers = (
     | SplitMultiValueProperty
     | RelationshipAsEdgeTransformer
     | MakeConnectionOnExactMatch
+    | AttachPropertyFromTargetToSource
+    | PruneDanglingNodes
+    | PruneTypes
+    | PruneDeadEndEdges
+    | PruneInstancesOfUnknownType
 )

cognite/neat/_graph/transformers/_base.py

@@ -6,7 +6,7 @@ from rdflib import Graph
 
 class BaseTransformer(ABC):
     description: str
-    _use_only_once: bool
+    _use_only_once: bool = False
     _need_changes: ClassVar[frozenset[str]] = frozenset()
 
     @abstractmethod

cognite/neat/_graph/transformers/_iodd.py

@@ -2,12 +2,12 @@ from rdflib import Namespace
 
 from cognite.neat._graph.extractors import IODDExtractor
 
-from ._prune_graph import PruneDanglingNodes, TwoHopFlattener
+from ._prune_graph import AttachPropertyFromTargetToSource, PruneDanglingNodes
 
 IODD = Namespace("http://www.io-link.com/IODD/2010/10/")
 
 
-class IODDTwoHopFlattener(TwoHopFlattener):
+class IODDAttachPropertyFromTargetToSource(AttachPropertyFromTargetToSource):
     _need_changes = frozenset(
         {
             str(IODDExtractor.__name__),
@@ -15,11 +15,16 @@ class IODDTwoHopFlattener(TwoHopFlattener):
     )
 
     def __init__(self):
-        super().__init__(destination_node_type=IODD.TextObject, property_predicate=IODD.value, property_name="value")
+        super().__init__(
+            target_node_type=IODD.TextObject,
+            target_property=IODD.value,
+            delete_target_node=True,
+            namespace=IODD,
+        )
 
 
 class IODDPruneDanglingNodes(PruneDanglingNodes):
-    _need_changes = frozenset({str(IODDExtractor.__name__), str(IODDTwoHopFlattener.__name__)})
+    _need_changes = frozenset({str(IODDExtractor.__name__), str(IODDAttachPropertyFromTargetToSource.__name__)})
 
     def __init__(self):
         super().__init__(node_prune_types=[IODD.TextObject])

cognite/neat/_graph/transformers/_prune_graph.py

@@ -1,84 +1,151 @@
+from typing import cast
+
 from rdflib import Graph, Namespace, URIRef
-from rdflib.query import ResultRow
-from rdflib.term import Identifier
+
+from cognite.neat._constants import DEFAULT_NAMESPACE
+from cognite.neat._shared import Triple
+from cognite.neat._utils.rdf_ import as_neat_compliant_uri
+from cognite.neat._utils.text import sentence_or_string_to_camel
 
 from ._base import BaseTransformer
 
 
-# TODO: Handle the cse when value is None, which will not make the TextObject resolve
-class TwoHopFlattener(BaseTransformer):
+class AttachPropertyFromTargetToSource(BaseTransformer):
     """
-    Transformer that will flatten the distance between a source node, an intermediate connecting node, and a
-    target property that is connected to the intermediate node.
-    The transformation result is that the target property is attached directly to the source node, instead of having
-    to go via the intermediate node.
-    The user can also provide a flag to decide if the intermediate node should be removed from the graph or not
-    after connecting the target property to the source node.
+    Transformer that considers a TargetNode and SourceNode relationship, to extract a property that is attached to
+    the TargetNode, and attaches it to the SourceNode instead, while also deleting the edge between
+    the SourceNode and TargetNode.
+    This means that you no longer have to go via the SourceNode to TargetNode to extract
+    the desired property from TargetNode, you can get it directly from the SourceNode instead.
+    Further, there are two ways of defining the predicate for the new property to attach to
+    the SourceNode. The predicate that is used will either be the old predicate between the SourceNode and TargetNode,
+    or, the TargetNode may hold a property with a value for the new predicate to use.
+    In this case, the user must specify the name of this predicate property connected to the TargetNode.
+    Consider the following example for illustration:
+
+        Ex. AttachPropertyFromTargetToSource
+        Graph before transformation:
+
+            :SourceNode a :SourceType .
+            :SourceNode :sourceProperty :TargetNode .
+
+            :TargetNode a :TargetType .
+            :TargetNode :propertyWhichValueWeWant 'Target Value' .
+            :TargetNode :propertyWhichValueWeMightWantAsNameForNewProperty 'PropertyName'
+
+        Use case A after transformation - attach new property to SourceNode using old predicate:
+
+            :SourceNode a :SourceType .
+            :SourceNode :sourceProperty 'Target Value' .
 
-        Ex. TwoHopFlattener:
+        Use case B after transformation - extract new predicate from one of the properties of the TargetNode:
 
-        Graph before flattening (with deletion of intermediate node):
-        node(A, rdf:type(Pump)) -(predicate("vendor"))>
-                                node(B, rdf:type(TextObject)) -(predicate("value"))> Literal("CompanyX")
+            :SourceNode a :SourceType .
+            :SourceNode :PropertyName 'Target Value' .
 
-        Graph after flattening nodes with destination_node_type = rdf:type(TextObject), property_predicate = :value,
-        and property_name = "value":
 
-        node(A, rdf:type(Pump)) -(predicate("vendor"))> Literal("CompanyX")
+    The user can provide a flag to decide if the intermediate target node should be removed from the graph or not
+    after connecting the target property to the source node. The example illustrates this.
+    The default however is False.
+
+    If delete_target_node is not set, the expected number of triples after this transformation should be the same as
+    before the transformation.
+
+    If delete_target_node is set, the expected number of triples should be:
+        #triples_before - #target_nodes * #target_nodes_properties
+
+        Number of triples after operation from above example: 5 - 1*3 = 2
 
     Args:
-        destination_node_type: RDF.type of edge Node
-        property_predicate: Predicate to use when resolving the value from the edge node
-        property_name: name of the property that the intermediate node is pointing to
-        delete_connecting_node: bool if the intermediate Node and Edge between source Node
-                                and target property should be deleted. Defaults to True.
+        target_node_type: RDF.type of edge Node
+        target_property: URIRef of the property that holds the value attached to the intermediate node
+        target_property_holding_new_property: URIRef of the property which value will be new
+        property that will be added to the source node
+        delete_target_node: bool if the intermediate Node and Edge between source Node
+                                and target property should be deleted. Defaults to False.
+        convert_literal_to_uri: bool if the value of the new property should be converted to URIRef. Defaults to False.
+        namespace: Namespace to use when converting value to URIRef. Defaults to DEFAULT_NAMESPACE.
     """
 
-    description: str = "Prunes the graph of specified node types that do not have connections to other nodes."
-    _query_template: str = """SELECT ?sourceNode ?property ?destinationNode ?value WHERE {{
-                                     ?sourceNode ?property ?destinationNode .
-                                     ?destinationNode a <{destination_node_type}> .
-                                     ?destinationNode <{property_predicate}> ?{property_name} . }}"""
+    description: str = "Attaches a target property from a target node that is connected to a source node."
+
+    _query_template_use_case_a: str = """
+    SELECT ?sourceNode ?sourceProperty ?targetNode ?newSourceProperty ?newSourcePropertyValue WHERE {{
+        ?sourceNode ?sourceProperty ?targetNode .
+        BIND( <{target_property}> as ?newSourceProperty ) .
+        ?targetNode a <{target_node_type}> .
+        ?targetNode <{target_property}> ?newSourcePropertyValue . }}"""
+
+    _query_template_use_case_b: str = """
+    SELECT ?sourceNode ?sourceProperty ?targetNode ?newSourceProperty ?newSourcePropertyValue WHERE {{
+        ?sourceNode ?sourceProperty ?targetNode .
+        ?targetNode a <{target_node_type}> .
+        ?targetNode <{target_property_holding_new_property_name}> ?newSourceProperty .
+        ?targetNode <{target_property}> ?newSourcePropertyValue . }}"""
 
     def __init__(
         self,
-        destination_node_type: URIRef,
-        property_predicate: Namespace,
-        property_name: str,
-        delete_connecting_node: bool = True,
+        target_node_type: URIRef,
+        target_property: URIRef,
+        target_property_holding_new_property: URIRef | None = None,
+        delete_target_node: bool = False,
+        convert_literal_to_uri: bool = False,
+        namespace: Namespace | None = None,
     ):
-        self.destination_node_type = destination_node_type
-        self.property_predicate = property_predicate
-        self.property_name = property_name
-        self.delete_connecting_node = delete_connecting_node
+        self.target_node_type = target_node_type
+        self.target_property = target_property
+        self.delete_target_node = delete_target_node
+        self.target_property_holding_new_property = target_property_holding_new_property
+        self.convert_literal_to_uri = convert_literal_to_uri
+        self.namespace = namespace or DEFAULT_NAMESPACE
 
-    def transform(self, graph: Graph) -> None:
-        nodes_to_delete: list[Identifier] = []
-
-        graph_traversals = list(
-            graph.query(
-                self._query_template.format(
-                    destination_node_type=self.destination_node_type,
-                    property_predicate=self.property_predicate,
-                    property_name=self.property_name,
-                )
+    def transform(self, graph) -> None:
+        nodes_to_delete: list[tuple] = []
+
+        if self.target_property_holding_new_property is not None:
+            query = self._query_template_use_case_b.format(
+                target_node_type=self.target_node_type,
+                target_property_holding_new_property_name=self.target_property_holding_new_property,
+                target_property=self.target_property,
+            )
+        else:
+            query = self._query_template_use_case_a.format(
+                target_node_type=self.target_node_type,
+                target_property=self.target_property,
             )
-        )
 
-        for path in graph_traversals:
-            if isinstance(path, ResultRow):
-                source_node, predicate, destination_node, property_value = path.asdict().values()
+        for (
+            source_node,
+            old_predicate,
+            target_node,
+            new_predicate_value,
+            new_property_value,
+        ) in graph.query(query):
+            if self.target_property_holding_new_property is not None:
+                # Ensure new predicate is URI compliant as we are creating a new predicate
+                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
+            # Create new connection from source node to value
+            graph.add(
+                (
+                    source_node,
+                    predicate,
+                    (self.namespace[new_property_value] if self.convert_literal_to_uri else new_property_value),
+                )
+            )
+            # Remove old relationship between source node and destination node
+            graph.remove((source_node, old_predicate, target_node))
 
-                # Create new connection from source node to value
-                graph.add((source_node, predicate, property_value))
-                nodes_to_delete.append(destination_node)
+            nodes_to_delete.append(target_node)
 
-            if self.delete_connecting_node:
-                for node in nodes_to_delete:
-                    # Remove edge triples to node
-                    graph.remove((None, None, node))
-                    # Remove node triple
-                    graph.remove((node, None, None))
+        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))
+                # Remove target node triple and its properties
+                graph.remove((target_node, None, None))
 
 
 class PruneDanglingNodes(BaseTransformer):
@@ -101,7 +168,7 @@ class PruneDanglingNodes(BaseTransformer):
         node_prune_types: list of RDF types to prune from the Graph if they are stand-alone Nodes
     """
 
-    description: str = "Prunes the graph of specified rdf types that do not have connections to other nodes."
+    description: str = "Prunes nodes of specific rdf types that do not have any connection to them."
     _query_template = """
                     SELECT ?subject
                     WHERE {{
@@ -117,10 +184,74 @@ class PruneDanglingNodes(BaseTransformer):
         self.node_prune_types = node_prune_types
 
     def transform(self, graph: Graph) -> None:
-        for object_type in self.node_prune_types:
-            nodes_without_neighbours = list(graph.query(self._query_template.format(rdf_type=object_type)))
+        for type_ in self.node_prune_types:
+            for (subject,) in list(graph.query(self._query_template.format(rdf_type=type_))):  # type: ignore
+                graph.remove((subject, None, None))
+
+
+class PruneTypes(BaseTransformer):
+    """
+    Removes all the instances of specific type
+    """
+
+    description: str = "Prunes nodes of specific rdf types"
+    _query_template = """
+                        SELECT ?subject
+                        WHERE {{
+                            ?subject a <{rdf_type}> .
+                            }}
+                      """
+
+    def __init__(
+        self,
+        node_prune_types: list[URIRef],
+    ):
+        self.node_prune_types = node_prune_types
+
+    def transform(self, graph: Graph) -> None:
+        for type_ in self.node_prune_types:
+            for (subject,) in list(graph.query(self._query_template.format(rdf_type=type_))):  # type: ignore
+                graph.remove((subject, None, None))
+
+
+class PruneDeadEndEdges(BaseTransformer):
+    """
+    Removes all the triples where object is a node that is not found in graph
+    """
+
+    description: str = "Prunes the graph of specified rdf types that do not have connections to other nodes."
+    _query_template = """
+                        SELECT ?subject ?predicate ?object
+                        WHERE {
+                            ?subject ?predicate ?object .
+                            FILTER (isIRI(?object) && ?predicate != rdf:type)
+                            FILTER NOT EXISTS {?object ?p ?o .}
+
+                            }
 
-            for node in nodes_without_neighbours:
-                # Remove node and its property triples in the graph
-                if isinstance(node, ResultRow):
-                    graph.remove((node["subject"], None, None))
+                      """
+
+    def transform(self, graph: Graph) -> None:
+        for triple in graph.query(self._query_template):
+            graph.remove(cast(Triple, triple))
+
+
+class PruneInstancesOfUnknownType(BaseTransformer):
+    """
+    Removes all the triples where object is a node that is not found in graph
+    """
+
+    description: str = "Prunes the graph of specified rdf types that do not have connections to other nodes."
+    _query_template = """
+                    SELECT DISTINCT ?subject
+                    WHERE {
+                        ?subject ?p ?o .
+                        FILTER NOT EXISTS {?subject a ?object .}
+
+                        }
+
+                    """
+
+    def transform(self, graph: Graph) -> None:
+        for (subject,) in graph.query(self._query_template):  # type: ignore
+            graph.remove((subject, None, None))

cognite/neat/_rules/exporters/_rules2dms.py

@@ -12,6 +12,7 @@ from cognite.client.data_classes._base import (
 from cognite.client.data_classes.data_modeling import (
     DataModelApplyList,
     DataModelId,
+    SpaceApply,
     ViewApplyList,
 )
 from cognite.client.exceptions import CogniteAPIError
@@ -200,6 +201,32 @@ class DMSExporter(CDFExporter[DMSRules, DMSSchema]):
             loader.resource_name for loader, categorized in categorized_items_by_loader.items() if categorized.to_update
         )
 
+        deleted_by_name: dict[str, UploadResult] = {}
+        if not is_failing:
+            # Deletion is done in reverse order to take care of dependencies
+            for loader, items in reversed(categorized_items_by_loader.items()):
+                issue_list = IssueList()
+
+                if items.resource_name == client.loaders.data_models.resource_name:
+                    warning_list = self._validate(list(items.item_ids()), client)
+                    issue_list.extend(warning_list)
+
+                results = UploadResult(loader.resource_name, issues=issue_list)  # type: ignore[var-annotated]
+                if dry_run:
+                    results.deleted.update(items.to_delete_ids)
+                else:
+                    if items.to_delete_ids:
+                        try:
+                            deleted = loader.delete(items.to_delete_ids)
+                        except MultiCogniteAPIError as e:
+                            results.deleted.update([loader.get_id(item) for item in e.success])
+                            results.failed_deleted.update([loader.get_id(item) for item in e.failed])
+                            for error in e.errors:
+                                results.error_messages.append(f"Failed to delete {loader.resource_name}: {error!s}")
+                        else:
+                            results.deleted.update(deleted)
+                deleted_by_name[loader.resource_name] = results
+
         for loader, items in categorized_items_by_loader.items():
             issue_list = IssueList()
 
@@ -221,28 +248,21 @@ class DMSExporter(CDFExporter[DMSRules, DMSSchema]):
 
             results.unchanged.update(items.unchanged_ids)
             results.skipped.update(items.to_skip_ids)
+            if delete_results := deleted_by_name.get(loader.resource_name):
+                results.deleted.update(delete_results.deleted)
+                results.failed_deleted.update(delete_results.failed_deleted)
+                results.error_messages.extend(delete_results.error_messages)
+
             if dry_run:
                 if self.existing in ["update", "force"]:
                     # Assume all changed are successful
                     results.changed.update(items.to_update_ids)
                 elif self.existing == "skip":
                     results.skipped.update(items.to_update_ids)
-                results.deleted.update(items.to_delete_ids)
                 results.created.update(items.to_create_ids)
                 yield results
                 continue
 
-            if items.to_delete_ids:
-                try:
-                    deleted = loader.delete(items.to_delete_ids)
-                except MultiCogniteAPIError as e:
-                    results.deleted.update([loader.get_id(item) for item in e.success])
-                    results.failed_deleted.update([loader.get_id(item) for item in e.failed])
-                    for error in e.errors:
-                        results.error_messages.append(f"Failed to delete {loader.resource_name}: {error!s}")
-                else:
-                    results.deleted.update(deleted)
-
             if items.to_create:
                 try:
                     created = loader.create(items.to_create)
@@ -308,7 +328,9 @@ class DMSExporter(CDFExporter[DMSRules, DMSSchema]):
             cdf_item = cdf_item_by_id.get(item_id)
             if cdf_item is None:
                 categorized.to_create.append(item)
-            elif is_redeploying or self.existing == "recreate":
+            elif (is_redeploying or self.existing == "recreate") and not isinstance(item, SpaceApply):
+                # Spaces are not deleted, instead they are updated. Deleting a space is an expensive operation
+                # and are seldom needed. If you need to delete the space, it should be done in a different operation.
                 if not self.drop_data and loader.has_data(item_id):
                     categorized.to_skip.append(cdf_item)
                 else:

cognite/neat/_rules/exporters/_rules2excel.py

@@ -34,8 +34,6 @@ class ExcelExporter(BaseExporter[VerifiedRules, Workbook]):
     Args:
         styling: The styling to use for the Excel file. Defaults to "default". See below for details
             on the different styles.
-        output_role: The role to use for the exported spreadsheet. If provided, the rules will be converted to
-            this role formate before being written to excel. If not provided, the role from the rules will be used.
         new_model_id: The new model ID to use for the exported spreadsheet. This is only applicable if the input
             rules have 'is_reference' set. If provided, the model ID will be used to automatically create the
             new metadata sheet in the Excel file. The model id is expected to be a tuple of (prefix, title)
@@ -120,6 +118,10 @@ class ExcelExporter(BaseExporter[VerifiedRules, Workbook]):
             main_header = self._main_header_by_sheet_name[sheet_name]
             sheet.append([main_header] + [""] * (len(headers) - 1))
             sheet.merge_cells(start_row=1, start_column=1, end_row=1, end_column=len(headers))
+            if headers[0] == "Neat ID":
+                # Move the Neat ID to the end of the columns
+                headers = headers[1:] + ["Neat ID"]
+
             sheet.append(headers)
 
             fill_colors = itertools.cycle(["CADCFC", "FFFFFF"])
@@ -127,6 +129,9 @@ class ExcelExporter(BaseExporter[VerifiedRules, Workbook]):
             last_class: str | None = None
             item: dict[str, Any]
             for item in dumped_rules.get(sheet_name) or []:
+                if "Neat ID" in item:
+                    # Move the Neat ID to the end of the columns
+                    item["Neat ID"] = item.pop("Neat ID")
                 row = list(item.values())
                 class_ = row[0]