cognite-neat 0.72.3__py3-none-any.whl → 0.73.0__py3-none-any.whl

cognite/neat/_version.py

@@ -1 +1 @@
-__version__ = "0.72.3"
+__version__ = "0.73.0"

cognite/neat/graph/extractor/_graph_capturing_sheet.py

@@ -11,6 +11,7 @@ from openpyxl.cell import Cell
 from openpyxl.styles import Alignment, Border, Font, NamedStyle, PatternFill, Side
 from openpyxl.utils import get_column_letter
 from openpyxl.worksheet.datavalidation import DataValidation
+from openpyxl.worksheet.worksheet import Worksheet
 from rdflib import RDF, XSD, Literal, Namespace, URIRef
 
 from cognite.neat.graph import exceptions
@@ -321,7 +322,7 @@ def rules2graph_capturing_sheet(
         workbook.create_sheet(title=class_)
 
         # Add header rows
-        workbook[class_].append(["identifier", *list(properties.keys())])
+        cast(Worksheet, workbook[class_]).append(["identifier", *list(properties.keys())])
 
         if auto_identifier_type and auto_identifier_type == "index-based":  # default, easy to read
             logging.debug(f"Configuring index-based automatic identifiers for sheet {class_}")
@@ -350,35 +351,35 @@ def _add_index_identifiers(workbook: Workbook, sheet: str, no_rows: int):
     """Adds index-based auto identifier to a sheet identifier column"""
     for i in range(no_rows):
         prefix = to_dms_name(sheet, "class", True)
-        workbook[sheet][f"A{i+2}"] = f'=IF(ISBLANK(B{i+2}), "","{prefix}-{i+1}")'
+        workbook[sheet][f"A{i+2}"] = f'=IF(ISBLANK(B{i+2}), "","{prefix}-{i+1}")'  # type: ignore[index]
 
 
 def _add_uuid_identifiers(workbook: Workbook, sheet: str, no_rows: int):
     """Adds UUID-based auto identifier to a sheet identifier column"""
     for i in range(no_rows):
         prefix = to_dms_name(sheet, "class", True)
-        workbook[sheet][f"A{i+2}"] = f'=IF(ISBLANK(B{i+2}), "","{prefix}-{uuid.uuid4()}")'
+        workbook[sheet][f"A{i+2}"] = f'=IF(ISBLANK(B{i+2}), "","{prefix}-{uuid.uuid4()}")'  # type: ignore[index]
 
 
 def _add_drop_down_list(workbook: Workbook, sheet: str, column: str, no_rows: int, value_sheet: str, value_column: str):
     """Adds a drop down list to a column"""
     drop_down_list = DataValidation(type="list", formula1=f"={value_sheet}!{value_column}$2:{value_column}${no_rows}")
 
-    workbook[sheet].add_data_validation(drop_down_list)
+    cast(Worksheet, workbook[sheet]).add_data_validation(drop_down_list)
 
     for i in range(no_rows):
-        drop_down_list.add(workbook[sheet][f"{column}{i+2}"])
+        drop_down_list.add(workbook[sheet][f"{column}{i+2}"])  # type: ignore[index, misc]
 
 
 def _adjust_column_width(workbook: Workbook):
     """Adjusts the column width based on the content"""
     for sheet in workbook.sheetnames:
-        for cell_tuple in workbook[sheet].columns:
+        for cell_tuple in cast(Worksheet, workbook[sheet]).columns:
             # Wrong type annotation in openpyxl
             cell = cast(Cell, cell_tuple[0])  # type: ignore[index]
             if cell.value:
                 adjusted_width = (len(str(cell.value)) + 5) * 1.2
-                workbook[sheet].column_dimensions[cell.column_letter].width = adjusted_width
+                cast(Worksheet, workbook[sheet]).column_dimensions[cell.column_letter].width = adjusted_width
 
 
 def _set_header_style(workbook: Workbook):
@@ -390,12 +391,13 @@ def _set_header_style(workbook: Workbook):
     workbook.add_named_style(style)
 
     for sheet in workbook.sheetnames:
-        for cell_tuple in workbook[sheet].columns:
+        for cell_tuple in cast(Worksheet, workbook[sheet]).columns:
             # Wrong type annotation in openpyxl
             cell = cast(Cell, cell_tuple[0])  # type: ignore[index]
-            workbook[sheet][f"{cell.column_letter}1"].style = style
+            worksheet = cast(Worksheet, workbook[sheet])
+            worksheet[f"{cell.column_letter}1"].style = style
             if f"{cell.column_letter}1" == "A1":
-                workbook[sheet][f"{cell.column_letter}1"].fill = PatternFill("solid", start_color="2FB5F2")
+                worksheet[f"{cell.column_letter}1"].fill = PatternFill("solid", start_color="2FB5F2")
             else:
-                workbook[sheet][f"{cell.column_letter}1"].fill = PatternFill("solid", start_color="FFB202")
-            workbook[sheet][f"{cell.column_letter}1"].alignment = Alignment(horizontal="center", vertical="center")
+                worksheet[f"{cell.column_letter}1"].fill = PatternFill("solid", start_color="FFB202")
+            worksheet[f"{cell.column_letter}1"].alignment = Alignment(horizontal="center", vertical="center")

cognite/neat/rules/examples/power-grid-containers.yaml

@@ -53,6 +53,7 @@
       type:
         container: null
         type: direct
+        list: false
   space: workshop
   usedFor: node
 - externalId: SubGeographicalRegion
@@ -81,6 +82,7 @@
       type:
         container: null
         type: direct
+        list: false
   space: workshop
   usedFor: node
 - externalId: Substation
@@ -109,5 +111,6 @@
       type:
         container: null
         type: direct
+        list: false
   space: workshop
   usedFor: node

cognite/neat/rules/examples/power-grid-model.yaml

@@ -81,6 +81,7 @@ views:
         type:
           container: null
           type: direct
+          list: false
           source:
             space: workshop
             externalId: GeographicalRegion
@@ -132,6 +133,7 @@ views:
         type:
           container: null
           type: direct
+          list: false
           source:
             space: workshop
             externalId: SubGeographicalRegion
@@ -195,6 +197,7 @@ views:
         type:
           container: null
           type: direct
+          list: false
           source:
             space: workshop
             externalId: Substation

cognite/neat/rules/exporter/_rules2dms.py

@@ -34,7 +34,6 @@ from cognite.client.data_classes.data_modeling import (
     ViewApply,
     ViewId,
 )
-from cognite.client.data_classes.data_modeling.data_types import ListablePropertyType
 from cognite.client.data_classes.data_modeling.views import (
     ConnectionDefinitionApply,
     SingleHopConnectionDefinitionApply,
@@ -284,12 +283,9 @@ class DMSSchemaComponents(BaseModel):
                     if (
                         not isinstance(existing_property.type, DirectRelation)
                         and not isinstance(api_container_property.type, DirectRelation)
-                        and cast(ListablePropertyType, existing_property.type).is_list
-                        != cast(ListablePropertyType, api_container_property.type).is_list
+                        and existing_property.type.is_list != api_container_property.type.is_list
                     ):
-                        cast(
-                            ListablePropertyType, containers[container_id].properties[container_property_id].type
-                        ).is_list = True
+                        containers[container_id].properties[container_property_id].type.is_list = True
 
         if errors:
             raise ExceptionGroup("Properties value types have been redefined! This is prohibited! Aborting!", errors)
@@ -302,10 +298,7 @@ class DMSSchemaComponents(BaseModel):
 
         # Literal, i.e. Node attribute
         if property_.property_type is EntityTypes.data_property:
-            property_type = cast(
-                type[ListablePropertyType],
-                cast(ValueTypeMapping, property_.expected_value_type.mapping).dms,
-            )
+            property_type = cast(ValueTypeMapping, property_.expected_value_type.mapping).dms
             return ContainerProperty(
                 type=property_type(is_list=is_one_to_many),
                 nullable=property_.min_count == 0,

cognite/neat/rules/exporter/_rules2excel.py

@@ -4,6 +4,7 @@ from typing import cast
 from openpyxl import Workbook
 from openpyxl.cell import Cell
 from openpyxl.styles import Alignment, Border, Font, NamedStyle, PatternFill, Side
+from openpyxl.worksheet.worksheet import Worksheet
 
 from cognite.neat.rules.models._base import EntityTypes
 
@@ -190,7 +191,7 @@ class ExcelExporter(BaseExporter[Workbook]):
             if sheet == "Metadata":
                 continue
             if sheet == "Classes" or sheet == "Properties":
-                sheet_obj = data[sheet]
+                sheet_obj = cast(Worksheet, data[sheet])
                 if sheet == "Classes":
                     sheet_obj.freeze_panes = "A3"
                 else:
@@ -207,6 +208,6 @@ class ExcelExporter(BaseExporter[Workbook]):
                     cell.fill = PatternFill("solid", start_color="D5DBD5")
                     cell.alignment = Alignment(horizontal="center", vertical="center")
                     adjusted_width = (len(str(cell.value)) + 5) * 1.2
-                    data[sheet].column_dimensions[cell.column_letter].width = adjusted_width
+                    cast(Worksheet, data[sheet]).column_dimensions[cell.column_letter].width = adjusted_width
 
         return data

cognite/neat/rules/exporters/_rules2excel.py

@@ -1,16 +1,19 @@
 from __future__ import annotations
 
 import itertools
+from datetime import datetime
 from pathlib import Path
 from types import GenericAlias
-from typing import Any, ClassVar, Literal, get_args
+from typing import Any, ClassVar, Literal, cast, get_args
 
 from openpyxl import Workbook
 from openpyxl.cell import MergedCell
 from openpyxl.styles import Alignment, Border, Font, PatternFill, Side
+from openpyxl.worksheet.worksheet import Worksheet
 
 from cognite.neat.rules._shared import Rules
-from cognite.neat.rules.models._rules.base import RoleTypes, SheetEntity
+from cognite.neat.rules.models._rules import DMSRules, DomainRules, InformationRules
+from cognite.neat.rules.models._rules.base import RoleTypes, SchemaCompleteness, SheetEntity
 
 from ._base import BaseExporter
 
@@ -23,6 +26,9 @@ class ExcelExporter(BaseExporter[Workbook]):
             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 following styles are available:
 
@@ -43,12 +49,18 @@ class ExcelExporter(BaseExporter[Workbook]):
     }
     style_options = get_args(Style)
 
-    def __init__(self, styling: Style = "default", output_role: RoleTypes | None = None):
+    def __init__(
+        self,
+        styling: Style = "default",
+        output_role: RoleTypes | None = None,
+        new_model_id: tuple[str, str, str] | None = None,
+    ):
         if styling not in self.style_options:
             raise ValueError(f"Invalid styling: {styling}. Valid options are {self.style_options}")
         self.styling = styling
         self._styling_level = self.style_options.index(styling)
         self.output_role = output_role
+        self.new_model_id = new_model_id
 
     def export_to_file(self, rules: Rules, filepath: Path) -> None:
         """Exports transformation rules to excel file."""
@@ -70,7 +82,7 @@ class ExcelExporter(BaseExporter[Workbook]):
         if rules.is_reference:
             # Writes empty reference sheets
             dumped_rules = {
-                "Metadata": {field_alias: None for field_alias in rules.metadata.model_dump(by_alias=True).keys()},
+                "Metadata": self._create_metadata_sheet_user_rules(rules),
             }
             dumped_rules["Metadata"]["role"] = (
                 self.output_role and self.output_role.value
@@ -155,6 +167,12 @@ class ExcelExporter(BaseExporter[Workbook]):
                     cell.font = Font(bold=True, size=14)
 
     def _write_metadata_sheet(self, workbook: Workbook, metadata: dict[str, Any], is_reference: bool = False) -> None:
+        # Excel does not support timezone in datetime strings
+        if isinstance(metadata.get("created"), datetime):
+            metadata["created"] = metadata["created"].replace(tzinfo=None)
+        if isinstance(metadata.get("updated"), datetime):
+            metadata["updated"] = metadata["updated"].replace(tzinfo=None)
+
         if is_reference:
             metadata_sheet = workbook.create_sheet("RefMetadata")
         else:
@@ -181,6 +199,7 @@ class ExcelExporter(BaseExporter[Workbook]):
     @classmethod
     def _adjust_column_widths(cls, workbook: Workbook) -> None:
         for sheet in workbook:
+            sheet = cast(Worksheet, sheet)
             for column_cells in sheet.columns:
                 try:
                     max_length = max(len(str(cell.value)) for cell in column_cells if cell.value is not None)
@@ -194,3 +213,74 @@ class ExcelExporter(BaseExporter[Workbook]):
                 current = sheet.column_dimensions[selected_column.column_letter].width or (max_length + 0.5)
                 sheet.column_dimensions[selected_column.column_letter].width = max(current, max_length + 0.5)
         return None
+
+    def _create_metadata_sheet_user_rules(self, rules: Rules) -> dict[str, Any]:
+        metadata: dict[str, Any] = {
+            field_alias: None for field_alias in rules.metadata.model_dump(by_alias=True).keys()
+        }
+        if "creator" in metadata:
+            metadata["creator"] = "YOUR NAME"
+
+        if isinstance(rules, DomainRules):
+            return metadata
+        elif isinstance(rules, DMSRules):
+            existing_model_id = (rules.metadata.space, rules.metadata.external_id, rules.metadata.version)
+        elif isinstance(rules, InformationRules):
+            existing_model_id = (rules.metadata.prefix, rules.metadata.name, rules.metadata.version)
+        else:
+            raise ValueError(f"Unsupported rules type: {type(rules)}")
+        existing_metadata = rules.metadata.model_dump(by_alias=True)
+        if isinstance(existing_metadata["created"], datetime):
+            metadata["created"] = existing_metadata["created"].replace(tzinfo=None)
+        if isinstance(existing_metadata["updated"], datetime):
+            metadata["updated"] = existing_metadata["updated"].replace(tzinfo=None)
+        # Excel does not support timezone in datetime strings
+        now_iso = datetime.now().replace(tzinfo=None).isoformat()
+        is_info = isinstance(rules, InformationRules)
+        is_dms = not is_info
+        is_extension = self.new_model_id is not None
+        is_solution = is_extension and self.new_model_id != existing_model_id
+
+        if is_solution:
+            metadata["prefix" if is_info else "space"] = self.new_model_id[0]  # type: ignore[index]
+            metadata["title" if is_info else "externalId"] = self.new_model_id[1]  # type: ignore[index]
+            metadata["version"] = self.new_model_id[2]  # type: ignore[index]
+        else:
+            metadata["prefix" if is_info else "space"] = existing_model_id[0]
+            metadata["title" if is_info else "externalId"] = existing_model_id[1]
+            metadata["version"] = existing_model_id[2]
+
+        if is_solution and is_info:
+            metadata["namespace"] = f"http://purl.org/{self.new_model_id[0]}/"  # type: ignore[index]
+        elif is_info:
+            metadata["namespace"] = existing_metadata["namespace"]
+
+        if is_solution and is_dms:
+            metadata["name"] = self.new_model_id[1]  # type: ignore[index]
+
+        if is_solution:
+            metadata["created"] = now_iso
+        else:
+            metadata["created"] = existing_metadata["created"]
+
+        if is_solution or is_extension:
+            metadata["updated"] = now_iso
+        else:
+            metadata["updated"] = existing_metadata["updated"]
+
+        if is_solution:
+            metadata["creator"] = "YOUR NAME"
+        else:
+            metadata["creator"] = existing_metadata["creator"]
+
+        if not is_solution:
+            metadata["description"] = existing_metadata["description"]
+
+        if is_extension:
+            metadata["schema"] = SchemaCompleteness.extended.value
+        else:
+            metadata["schema"] = SchemaCompleteness.complete.value
+
+        metadata["extension"] = "addition"
+
+        return metadata

cognite/neat/rules/importer/_dms2rules.py

@@ -13,7 +13,6 @@ from cognite.client.data_classes.data_modeling import (
     SingleHopConnectionDefinition,
     View,
 )
-from cognite.client.data_classes.data_modeling.data_types import ListablePropertyType
 from cognite.client.data_classes.data_modeling.ids import DataModelIdentifier, ViewId
 
 from cognite.neat.rules.models.tables import Tables
@@ -132,9 +131,7 @@ class DMSImporter(BaseImporter):
 
                 max_count: str | float = "1"
                 if isinstance(prop, SingleHopConnectionDefinition) or (
-                    isinstance(prop, MappedProperty)
-                    and isinstance(prop.type, ListablePropertyType)
-                    and prop.type.is_list
+                    isinstance(prop, MappedProperty) and prop.type.is_list
                 ):
                     max_count = float("nan")
 

cognite/neat/rules/importers/_dms2rules.py

@@ -5,9 +5,10 @@ from cognite.client import CogniteClient
 from cognite.client import data_modeling as dm
 from cognite.client.data_classes.data_modeling import DataModelIdentifier
 from cognite.client.data_classes.data_modeling.containers import BTreeIndex, InvertedIndex
-from cognite.client.data_classes.data_modeling.data_types import ListablePropertyType
+from cognite.client.utils import ms_to_datetime
 
 from cognite.neat.rules import issues
+from cognite.neat.rules.importers._base import BaseImporter, Rules
 from cognite.neat.rules.issues import IssueList
 from cognite.neat.rules.models._rules import DMSRules, DMSSchema, RoleTypes
 from cognite.neat.rules.models._rules._types import (
@@ -19,6 +20,7 @@ from cognite.neat.rules.models._rules._types import (
     ViewEntity,
     ViewPropEntity,
 )
+from cognite.neat.rules.models._rules.base import ExtensionCategory, SchemaCompleteness
 from cognite.neat.rules.models._rules.dms_architect_rules import (
     DMSContainer,
     DMSMetadata,
@@ -27,16 +29,47 @@ from cognite.neat.rules.models._rules.dms_architect_rules import (
     SheetList,
 )
 
-from ._base import BaseImporter, Rules
-
 
 class DMSImporter(BaseImporter):
-    def __init__(self, schema: DMSSchema):
+    def __init__(self, schema: DMSSchema, metadata: DMSMetadata | None = None):
         self.schema = schema
+        self.metadata = metadata
 
     @classmethod
     def from_data_model_id(cls, client: CogniteClient, data_model_id: DataModelIdentifier) -> "DMSImporter":
-        return cls(DMSSchema.from_model_id(client, data_model_id))
+        """Create a DMSImporter ready to convert the given data model to rules.
+
+        Args:
+            client: Instantiated CogniteClient to retrieve data model.
+            data_model_id: Data Model to retrieve.
+
+        Returns:
+            DMSImporter: DMSImporter instance
+        """
+        data_models = client.data_modeling.data_models.retrieve(data_model_id, inline_views=True)
+        if len(data_models) == 0:
+            raise ValueError(f"Data model {data_model_id} not found")
+        data_model = data_models.latest_version()
+        schema = DMSSchema.from_data_model(client, data_model)
+        description, creator = DMSMetadata._get_description_and_creator(data_model.description)
+
+        created = ms_to_datetime(data_model.created_time)
+        updated = ms_to_datetime(data_model.last_updated_time)
+
+        metadata = DMSMetadata(
+            schema_=SchemaCompleteness.complete,
+            extension=ExtensionCategory.addition,
+            space=data_model.space,
+            external_id=data_model.external_id,
+            name=data_model.name or data_model.external_id,
+            version=data_model.version or "0.1.0",
+            updated=updated,
+            created=created,
+            creator=creator,
+            description=description,
+            default_view_version=data_model.version or "0.1.0",
+        )
+        return cls(schema, metadata)
 
     @classmethod
     def from_directory(cls, directory: str | Path) -> "DMSImporter":
@@ -138,11 +171,7 @@ class DMSImporter(BaseImporter):
                             description=prop.description,
                             value_type=cast(ViewPropEntity | DMSValueType, container_prop.type._type),
                             nullable=container_prop.nullable,
-                            is_list=(
-                                container_prop.type.is_list
-                                if isinstance(container_prop.type, ListablePropertyType)
-                                else False
-                            ),
+                            is_list=container_prop.type.is_list,
                             default=container_prop.default_value,
                             container=ContainerEntity.from_id(container.as_id()),
                             container_property=prop.container_property_identifier,
@@ -172,7 +201,7 @@ class DMSImporter(BaseImporter):
         }
 
         dms_rules = DMSRules(
-            metadata=DMSMetadata.from_data_model(data_model),
+            metadata=self.metadata or DMSMetadata.from_data_model(data_model),
             properties=properties,
             containers=SheetList[DMSContainer](
                 data=[DMSContainer.from_container(container) for container in self.schema.containers]

cognite/neat/rules/issues/base.py

@@ -68,7 +68,15 @@ class NeatValidationError(ValidationIssue, ABC):
 
         This is intended to be overridden in subclasses to handle specific error types.
         """
-        return [DefaultPydanticError.from_pydantic_error(error) for error in errors]
+        all_errors = []
+        for error in errors:
+            if isinstance(ctx := error.get("ctx"), dict) and isinstance(
+                multi_error := ctx.get("error"), MultiValueError
+            ):
+                all_errors.extend(multi_error.errors)
+            else:
+                all_errors.append(DefaultPydanticError.from_pydantic_error(error))
+        return all_errors
 
 
 @dataclass(frozen=True)

cognite/neat/rules/issues/dms.py

@@ -26,6 +26,8 @@ __all__ = [
     "MultipleReferenceWarning",
     "HasDataFilterOnNoPropertiesViewWarning",
     "NodeTypeFilterOnParentViewWarning",
+    "ChangingContainerError",
+    "ChangingViewError",
 ]
 
 
@@ -225,6 +227,78 @@ class ContainerPropertyUsedMultipleTimesError(DMSSchemaError):
         return output
 
 
+@dataclass(frozen=True)
+class ChangingContainerError(DMSSchemaError):
+    description = "You are adding to an existing model. "
+    fix = "Keep the container the same"
+    error_name: ClassVar[str] = "ChangingContainerError"
+    container_id: dm.ContainerId
+    changed_properties: list[str] | None = None
+    changed_attributes: list[str] | None = None
+
+    def __post_init__(self):
+        # Sorting for deterministic output
+        if self.changed_properties:
+            self.changed_properties.sort()
+        if self.changed_attributes:
+            self.changed_attributes.sort()
+
+    def message(self) -> str:
+        if self.changed_properties:
+            changed = f" properties {self.changed_properties}."
+        elif self.changed_attributes:
+            changed = f" attributes {self.changed_attributes}."
+        else:
+            changed = "."
+        return (
+            f"The container {self.container_id} has changed{changed}"
+            "When extending model with extension set to addition or reshape, the container "
+            "properties must remain the same"
+        )
+
+    def dump(self) -> dict[str, Any]:
+        output = super().dump()
+        output["container_id"] = self.container_id.dump()
+        output["changed_properties"] = self.changed_properties
+        return output
+
+
+@dataclass(frozen=True)
+class ChangingViewError(DMSSchemaError):
+    description = "You are adding to an existing model. "
+    fix = "Keep the view the same"
+    error_name: ClassVar[str] = "ChangingViewError"
+    view_id: dm.ViewId
+    changed_properties: list[str] | None = None
+    changed_attributes: list[str] | None = None
+
+    def __post_init__(self):
+        # Sorting for deterministic output
+        if self.changed_properties:
+            self.changed_properties.sort()
+        if self.changed_attributes:
+            self.changed_attributes.sort()
+
+    def message(self) -> str:
+        if self.changed_properties:
+            changed = f" properties {self.changed_properties}."
+        elif self.changed_attributes:
+            changed = f" attributes {self.changed_attributes}."
+        else:
+            changed = "."
+
+        return (
+            f"The view {self.view_id} has changed{changed}"
+            "When extending model with extension set to addition, the view properties must remain the same"
+        )
+
+    def dump(self) -> dict[str, Any]:
+        output = super().dump()
+        output["view_id"] = self.view_id.dump()
+        output["difference"] = self.changed_properties
+        return output
+
+
 @dataclass(frozen=True)
 class DirectRelationListWarning(DMSSchemaWarning):
     description = "The container property is set to a direct relation list, which is not supported by the CDF API"

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

@@ -10,10 +10,21 @@ import types
 from abc import abstractmethod
 from collections.abc import Callable, Iterator
 from functools import wraps
-from typing import Any, ClassVar, Generic, TypeAlias, TypeVar
+from typing import Annotated, Any, ClassVar, Generic, TypeAlias, TypeVar
 
 import pandas as pd
-from pydantic import BaseModel, ConfigDict, Field, HttpUrl, constr, field_validator, model_serializer, model_validator
+from pydantic import (
+    BaseModel,
+    BeforeValidator,
+    ConfigDict,
+    Field,
+    HttpUrl,
+    PlainSerializer,
+    constr,
+    field_validator,
+    model_serializer,
+    model_validator,
+)
 from pydantic.fields import FieldInfo
 
 from cognite.neat.rules.models._rules._types import ClassType
@@ -318,3 +329,14 @@ class SheetList(BaseModel, Generic[T_Entity]):
     def mandatory_fields(cls, use_alias=False) -> set[str]:
         """Returns a set of mandatory fields for the model."""
         return _get_required_fields(cls, use_alias)
+
+
+ExtensionCategoryType = Annotated[
+    ExtensionCategory,
+    PlainSerializer(
+        lambda v: v.value if isinstance(v, ExtensionCategory) else v,
+        return_type=str,
+        when_used="unless-none",
+    ),
+    BeforeValidator(lambda v: ExtensionCategory(v) if isinstance(v, str) else v),
+]

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

@@ -10,7 +10,6 @@ from typing import TYPE_CHECKING, Any, ClassVar, Literal, cast
 from cognite.client import data_modeling as dm
 from cognite.client.data_classes.data_modeling import PropertyType as CognitePropertyType
 from cognite.client.data_classes.data_modeling.containers import BTreeIndex
-from cognite.client.data_classes.data_modeling.data_types import ListablePropertyType
 from cognite.client.data_classes.data_modeling.views import SingleReverseDirectRelationApply, ViewPropertyApply
 from pydantic import Field, field_validator, model_serializer, model_validator
 from pydantic_core.core_schema import SerializationInfo, ValidationInfo
@@ -134,18 +133,21 @@ class DMSMetadata(BaseMetadata):
         )
 
     @classmethod
-    def from_data_model(cls, data_model: dm.DataModelApply) -> "DMSMetadata":
-        description = None
-        if data_model.description and (description_match := re.search(r"Creator: (.+)", data_model.description)):
+    def _get_description_and_creator(cls, description_raw: str | None) -> tuple[str | None, list[str]]:
+        if description_raw and (description_match := re.search(r"Creator: (.+)", description_raw)):
             creator = description_match.group(1).split(", ")
-            data_model.description.replace(f" Creator: {', '.join(creator)}", "")
-        elif data_model.description:
+            description = description_raw.replace(description_match.string, "").strip() or None
+        elif description_raw:
             creator = ["MISSING"]
-            description = data_model.description
+            description = description_raw
         else:
             creator = ["MISSING"]
-            description = "Missing description"
+            description = None
+        return description, creator
 
+    @classmethod
+    def from_data_model(cls, data_model: dm.DataModelApply) -> "DMSMetadata":
+        description, creator = cls._get_description_and_creator(data_model.description)
         return cls(
             schema_=SchemaCompleteness.complete,
             space=data_model.space,
@@ -490,12 +492,117 @@ class DMSRules(BaseRules):
             raise issues.MultiValueError(errors)
         return self
 
+    @model_validator(mode="after")
+    def validate_extension(self) -> "DMSRules":
+        if self.metadata.schema_ is not SchemaCompleteness.extended:
+            return self
+        if not self.reference:
+            raise ValueError("The schema is set to 'extended', but no reference rules are provided to validate against")
+        is_solution = self.metadata.space != self.reference.metadata.space
+        if is_solution:
+            return self
+        if self.metadata.extension is ExtensionCategory.rebuild:
+            # Everything is allowed
+            return self
+        # Is an extension of an existing model.
+        user_schema = self.as_schema()
+        ref_schema = self.reference.as_schema()
+        new_containers = {container.as_id(): container for container in user_schema.containers}
+        existing_containers = {container.as_id(): container for container in ref_schema.containers}
+
+        errors: list[issues.NeatValidationError] = []
+        for container_id, container in new_containers.items():
+            existing_container = existing_containers.get(container_id)
+            if not existing_container or existing_container == container:
+                # No problem
+                continue
+            new_dumped = container.dump()
+            existing_dumped = existing_container.dump()
+            changed_attributes, changed_properties = self._changed_attributes_and_properties(
+                new_dumped, existing_dumped
+            )
+            errors.append(
+                issues.dms.ChangingContainerError(
+                    container_id=container_id,
+                    changed_properties=changed_properties or None,
+                    changed_attributes=changed_attributes or None,
+                )
+            )
+
+        if self.metadata.extension is ExtensionCategory.reshape and errors:
+            raise issues.MultiValueError(errors)
+        elif self.metadata.extension is ExtensionCategory.reshape:
+            # Reshape allows changes to views
+            return self
+
+        new_views = {view.as_id(): view for view in user_schema.views}
+        existing_views = {view.as_id(): view for view in ref_schema.views}
+        for view_id, view in new_views.items():
+            existing_view = existing_views.get(view_id)
+            if not existing_view or existing_view == view:
+                # No problem
+                continue
+            changed_attributes, changed_properties = self._changed_attributes_and_properties(
+                view.dump(), existing_view.dump()
+            )
+            errors.append(
+                issues.dms.ChangingViewError(
+                    view_id=view_id,
+                    changed_properties=changed_properties or None,
+                    changed_attributes=changed_attributes or None,
+                )
+            )
+
+        if errors:
+            raise issues.MultiValueError(errors)
+        return self
+
+    @staticmethod
+    def _changed_attributes_and_properties(
+        new_dumped: dict[str, Any], existing_dumped: dict[str, Any]
+    ) -> tuple[list[str], list[str]]:
+        """Helper method to find the changed attributes and properties between two containers or views."""
+        new_attributes = {key: value for key, value in new_dumped.items() if key != "properties"}
+        existing_attributes = {key: value for key, value in existing_dumped.items() if key != "properties"}
+        changed_attributes = [key for key in new_attributes if new_attributes[key] != existing_attributes.get(key)]
+        new_properties = new_dumped.get("properties", {})
+        existing_properties = existing_dumped.get("properties", {})
+        changed_properties = [prop for prop in new_properties if new_properties[prop] != existing_properties.get(prop)]
+        return changed_attributes, changed_properties
+
     @model_validator(mode="after")
     def validate_schema(self) -> "DMSRules":
-        if self.metadata.schema_ is not SchemaCompleteness.complete:
+        if self.metadata.schema_ is SchemaCompleteness.partial:
             return self
+        elif self.metadata.schema_ is SchemaCompleteness.complete:
+            rules: DMSRules = self
+        elif self.metadata.schema_ is SchemaCompleteness.extended:
+            if not self.reference:
+                raise ValueError(
+                    "The schema is set to 'extended', but no reference rules are provided to validate against"
+                )
+            # This is an extension of the reference rules, we need to merge the two
+            rules = self.copy(deep=True)
+            rules.properties.extend(self.reference.properties.data)
+            existing_views = {view.view.as_id(False) for view in rules.views}
+            rules.views.extend([view for view in self.reference.views if view.view.as_id(False) not in existing_views])
+            if rules.containers and self.reference.containers:
+                existing_containers = {
+                    container.container.as_id(self.metadata.space) for container in rules.containers.data
+                }
+                rules.containers.extend(
+                    [
+                        container
+                        for container in self.reference.containers
+                        if container.container.as_id(self.reference.metadata.space) not in existing_containers
+                    ]
+                )
+            elif not rules.containers and self.reference.containers:
+                rules.containers = self.reference.containers
+        else:
+            raise ValueError("Unknown schema completeness")
 
-        schema = self.as_schema()
+        schema = rules.as_schema()
         errors = schema.validate()
         if errors:
             raise issues.MultiValueError(errors)
@@ -553,12 +660,16 @@ class DMSRules(BaseRules):
                     )
             containers.append(dumped)
 
-        return {
+        output = {
             "Metadata" if info.by_alias else "metadata": self.metadata.model_dump(**kwargs),
             "Properties" if info.by_alias else "properties": properties,
             "Views" if info.by_alias else "views": views,
             "Containers" if info.by_alias else "containers": containers,
+            "is_reference": self.is_reference,
         }
+        if self.reference is not None:
+            output["Reference" if info.by_alias else "reference"] = self.reference.model_dump(**kwargs)
+        return output
 
     def as_schema(self, include_pipeline: bool = False, instance_space: str | None = None) -> DMSSchema:
         return _DMSExporter(include_pipeline, instance_space).to_schema(self)
@@ -872,10 +983,7 @@ class _DMSExporter:
                     )
                 else:
                     type_: CognitePropertyType
-                    if issubclass(type_cls, ListablePropertyType):
-                        type_ = type_cls(is_list=prop.is_list or False)
-                    else:
-                        type_ = cast(CognitePropertyType, type_cls())
+                    type_ = type_cls(is_list=prop.is_list or False)
                     container.properties[prop_name] = dm.ContainerProperty(
                         type=type_,
                         nullable=prop.nullable if prop.nullable is not None else True,

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

@@ -63,6 +63,10 @@ class DMSSchema:
         if len(data_models) == 0:
             raise ValueError(f"Data model {data_model_id} not found")
         data_model = data_models.latest_version()
+        return cls.from_data_model(client, data_model)
+
+    @classmethod
+    def from_data_model(cls, client: CogniteClient, data_model: dm.DataModel) -> "DMSSchema":
         views = dm.ViewList(data_model.views)
         container_ids = views.referenced_containers()
         containers = client.data_modeling.containers.retrieve(list(container_ids))
@@ -267,7 +271,7 @@ class DMSSchema:
         if isinstance(item, dm.ContainerApply | dm.ViewApply | dm.DataModelApply | dm.NodeApply | RawTableWrite):
             identifier = item.as_id().as_tuple()
             if len(identifier) == 3 and identifier[2] is None:
-                return identifier[:2]
+                return identifier[:2]  # type: ignore[misc]
             return cast(tuple[str, str] | tuple[str, str, str], identifier)
         elif isinstance(item, dm.SpaceApply):
             return item.space

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

@@ -1,6 +1,7 @@
+import math
 from typing import Any, ClassVar
 
-from pydantic import Field, model_serializer
+from pydantic import Field, field_serializer, field_validator, model_serializer
 from pydantic_core.core_schema import SerializationInfo
 
 from ._types import ParentClassType, PropertyType, SemanticValueType, StrOrListType
@@ -24,6 +25,18 @@ class DomainProperty(SheetEntity):
     min_count: int | None = Field(alias="Min Count", default=None)
     max_count: int | float | None = Field(alias="Max Count", default=None)
 
+    @field_serializer("max_count", when_used="json-unless-none")
+    def serialize_max_count(self, value: int | float | None) -> int | float | None | str:
+        if isinstance(value, float) and math.isinf(value):
+            return None
+        return value
+
+    @field_validator("max_count", mode="before")
+    def parse_max_count(cls, value: int | float | None) -> int | float | None:
+        if value is None:
+            return float("inf")
+        return value
+
 
 class DomainClass(SheetEntity):
     description: str | None = Field(None, alias="Description")

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

@@ -1,3 +1,4 @@
+import math
 import re
 import sys
 import warnings
@@ -5,7 +6,7 @@ from collections import defaultdict
 from datetime import datetime
 from typing import TYPE_CHECKING, Any, ClassVar, Literal, cast
 
-from pydantic import Field, field_validator, model_serializer, model_validator
+from pydantic import Field, field_serializer, field_validator, model_serializer, model_validator
 from pydantic_core.core_schema import SerializationInfo
 from rdflib import Namespace
 
@@ -47,6 +48,7 @@ from ._types._base import Unknown
 from .base import (
     BaseMetadata,
     ExtensionCategory,
+    ExtensionCategoryType,
     MatchType,
     RoleTypes,
     RuleModel,
@@ -69,7 +71,7 @@ else:
 class InformationMetadata(BaseMetadata):
     role: ClassVar[RoleTypes] = RoleTypes.information_architect
     schema_: SchemaCompleteness = Field(alias="schema")
-    extension: ExtensionCategory | None = ExtensionCategory.addition
+    extension: ExtensionCategoryType | None = ExtensionCategory.addition
     prefix: PrefixType
     namespace: NamespaceType
 
@@ -156,6 +158,18 @@ class InformationProperty(SheetEntity):
     )
     comment: str | None = Field(alias="Comment", default=None)
 
+    @field_serializer("max_count", when_used="json-unless-none")
+    def serialize_max_count(self, value: int | float | None) -> int | float | None | str:
+        if isinstance(value, float) and math.isinf(value):
+            return None
+        return value
+
+    @field_validator("max_count", mode="before")
+    def parse_max_count(cls, value: int | float | None) -> int | float | None:
+        if value is None:
+            return float("inf")
+        return value
+
     @model_validator(mode="after")
     def is_valid_rule(self):
         # TODO: Can we skip rule_type and simply try to parse the rule and if it fails, raise an error?

cognite/neat/utils/spreadsheet.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import Literal, overload
+from typing import Literal, cast, overload
 
 import pandas as pd
 from openpyxl import load_workbook
@@ -58,7 +58,7 @@ def read_individual_sheet(
     expected_headers: list[str] | None = None,
 ) -> tuple[list[dict], SpreadsheetRead] | list[dict]:
     if expected_headers:
-        target_row = _get_row_number(load_workbook(excel_file)[sheet_name], expected_headers)
+        target_row = _get_row_number(cast(Worksheet, load_workbook(excel_file)[sheet_name]), expected_headers)
         skiprows = target_row - 1 if target_row is not None else 0
     else:
         skiprows = 0

{cognite_neat-0.72.3.dist-info → cognite_neat-0.73.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-neat
-Version: 0.72.3
+Version: 0.73.0
 Summary: Knowledge graph transformation
 Home-page: https://cognite-neat.readthedocs-hosted.com/
 License: Apache-2.0
@@ -19,7 +19,7 @@ Provides-Extra: graphql
 Provides-Extra: oxi
 Requires-Dist: PyYAML
 Requires-Dist: backports.strenum (>=1.2,<2.0) ; python_version < "3.11"
-Requires-Dist: cognite-sdk (>=7.28.2,<8.0.0)
+Requires-Dist: cognite-sdk (>=7.37.0,<8.0.0)
 Requires-Dist: deepdiff
 Requires-Dist: exceptiongroup (>=1.1.3,<2.0.0) ; python_version < "3.11"
 Requires-Dist: fastapi (>=0.100,<0.101)

{cognite_neat-0.72.3.dist-info → cognite_neat-0.73.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cognite/neat/__init__.py,sha256=v-rRiDOgZ3sQSMQKq0vgUQZvpeOkoHFXissAx6Ktg84,61
-cognite/neat/_version.py,sha256=AZKRaRERnGxRM4Vpp2s8T1LNhTACd4GALrf4Zjj-jCM,23
+cognite/neat/_version.py,sha256=TEb-1D6cIr_qgLP1HaUQ8hIQZ7HNg_9m8A0caIDWuDQ,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=xnKdBE_dtq1nRvKa79YGA_wimI5UhoSRuBQz4LkLzQw,4606
@@ -50,7 +50,7 @@ cognite/neat/graph/exceptions.py,sha256=G899CjKepLB2dxgwH4585cqqtjvbyH6MLTM2aaqZ
 cognite/neat/graph/extractor/__init__.py,sha256=wqCiqz-sXhUpTL5LRcrl_KFTNF0yTBRY4EzXT8pyCvA,258
 cognite/neat/graph/extractor/_base.py,sha256=TOXDnlqske8DgnJwA0THDVRgmR79Acjm56yF0E-2w7I,356
 cognite/neat/graph/extractor/_dexpi.py,sha256=oq7SzCQF4ocMEoPcWV6zDJ7UhtlhNp55rwcGiplFxVY,11232
-cognite/neat/graph/extractor/_graph_capturing_sheet.py,sha256=m07oSLJjZXDUwR70hEuVnb9OEcnMKw309bpSlBrT0uw,17408
+cognite/neat/graph/extractor/_graph_capturing_sheet.py,sha256=JCxzapFxdp4MF8rLMrDfOvHw7YOigLabCk1nv_Lr8so,17652
 cognite/neat/graph/extractor/_mock_graph_generator.py,sha256=C-6jP4CBtaTWHhk03mSdFEO0eAPPZ8orL5WSt0w-5FA,14872
 cognite/neat/graph/extractors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/graph/extractors/_base.py,sha256=TOXDnlqske8DgnJwA0THDVRgmR79Acjm56yF0E-2w7I,356
@@ -79,7 +79,6 @@ cognite/neat/graph/transformation/entity_matcher.py,sha256=RdOz6WQ2VApmFpaztTXNl
 cognite/neat/graph/transformation/query_generator/__init__.py,sha256=9N7RIlM8Pf-mJXzK8ulBe-eAa3yeHYBsBFQF7geTgWE,73
 cognite/neat/graph/transformation/query_generator/sparql.py,sha256=-611a0KlanTDfUUFlk2un2pRmN1UkBT0gPtBcoO-StA,18659
 cognite/neat/graph/transformation/transformer.py,sha256=ED_nCTBLh0kx-jbZMYHDsWj3X-RUqxJXbrogWZCMlnM,14673
-cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/rules/_analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/rules/_analysis/_base.py,sha256=xzRf52rKf5P1EajWS2MoBhzO_FZG3qjNRKlIffCFMpU,674
@@ -89,9 +88,9 @@ cognite/neat/rules/analysis.py,sha256=UL3cvd5jaUkIOXX0nNE5WQ7zr3VvdJFpW_1q2i869F
 cognite/neat/rules/examples/Rules-Nordic44-to-TNT.xlsx,sha256=pT2skrX3uWZtw-HIfIipVuPVr3bgb8zOAIqkguVjhCI,58987
 cognite/neat/rules/examples/Rules-Nordic44-to-graphql.xlsx,sha256=eo6K177Xrz0CKyUFsbsGF8qZJsJI1Qf1JrzozdbmkeU,80226
 cognite/neat/rules/examples/__init__.py,sha256=rLVPMLdcxpiW6LzfIgJodDKXfpdoYbD4Q60nmK_wAqU,858
-cognite/neat/rules/examples/power-grid-containers.yaml,sha256=r5q9t9nTFRQMwmm8ptY7f0yr6VgtEhEC26xhoS4QKC0,2538
+cognite/neat/rules/examples/power-grid-containers.yaml,sha256=5Q_TCM8YuLOEOxoCWqosvYJeB4NYBA1EqlE7pyo0AOA,2598
 cognite/neat/rules/examples/power-grid-example.xlsx,sha256=gUklgEhawhJ-EquwZpNp7dFvrLGAOzbKIGh8hTObxMg,77055
-cognite/neat/rules/examples/power-grid-model.yaml,sha256=e9Z5_HFWn8l_h4nUL3fABhoifoKFaYhus6dtgkCrj5o,5501
+cognite/neat/rules/examples/power-grid-model.yaml,sha256=ttCtAuQYrOkWBHttQo0w5WHWpzbnM0Z7MxG_ubtwTh0,5567
 cognite/neat/rules/examples/rules-template.xlsx,sha256=buyxUbY5N5H52LgKST-D2FVvpjEMW4jC2chAHToknNI,75865
 cognite/neat/rules/examples/sheet2cdf-transformation-rules.xlsx,sha256=_a93q8Yu7nv7Bq3I__RHD7pcdbfrv7urlp_AdgP2o3o,52433
 cognite/neat/rules/examples/skos-rules.xlsx,sha256=XjdBpbfUrJnniTCCQLOBW-8OmJyGpIT1Ig-DHQG3x04,26008
@@ -102,8 +101,8 @@ cognite/neat/rules/exporter/__init__.py,sha256=StzV_2Kx5e1GaZOW8ZGMgKZpdzq12rWsc
 cognite/neat/rules/exporter/_base.py,sha256=ohF0ri6wvxLMylZD7FNTmXdcjf-9p9vZgOd_Fl1I154,1439
 cognite/neat/rules/exporter/_core/__init__.py,sha256=XpimbyjA-Tub7ndk2r8yp__aXwdMwtKMuYMNsMKkAL8,102
 cognite/neat/rules/exporter/_core/rules2labels.py,sha256=oXr-J4-rN5QdnigK45ydWwaXrCEdVBbykkmUx7Aw8tY,764
-cognite/neat/rules/exporter/_rules2dms.py,sha256=SOb8AYfj-r-VGDxXgxlR7pQvNXWg8m4Yi79uOvetYCY,37099
-cognite/neat/rules/exporter/_rules2excel.py,sha256=WFN56mB6MNmEjUpvDfiQ8P-RpENePixKC4cJl9imvcg,8220
+cognite/neat/rules/exporter/_rules2dms.py,sha256=ytXspz0jl42tQEUcrfrEnogpmOeNyKIqZVrA0K5nqD0,36770
+cognite/neat/rules/exporter/_rules2excel.py,sha256=igThjNoFclPUBd8j_bP9OEPDXNiTgtdTD-ZxvtyZcqE,8305
 cognite/neat/rules/exporter/_rules2graphql.py,sha256=5MLWDw-7YfRwonUjqlLjxhgZOYzkU_GnyKuOvxAEEh4,6215
 cognite/neat/rules/exporter/_rules2ontology.py,sha256=WD-Lu-1MPRU1HNCzQ3DjxX9XUtF8675rERGqJAFXD0s,18414
 cognite/neat/rules/exporter/_rules2pydantic_models.py,sha256=VEjwGvleqkaSmNcve-2YKZ9Z2Np5KnX0tASphmOpZpo,28745
@@ -114,14 +113,14 @@ cognite/neat/rules/exporters/__init__.py,sha256=Gn3CjkVKHJF9Po1ZPH4wAJ-sRW9up7b2
 cognite/neat/rules/exporters/_base.py,sha256=aRCzRjGDoXILkGvASev2UjVvLXrVCRTFiKgYwzJZqAo,1518
 cognite/neat/rules/exporters/_models.py,sha256=f_RbFhoyD27z6Dsk4upYMHp7JHZRCfIvZsEzH5JSvtc,1645
 cognite/neat/rules/exporters/_rules2dms.py,sha256=JPwaD42STCLi3N2zH8fKeKhWTNUsT-KsM3t56Pzap3A,11854
-cognite/neat/rules/exporters/_rules2excel.py,sha256=uK-aS9sBwXUCFQLIO1jciBQrB4w7ySF6MafDqG23hrQ,9080
+cognite/neat/rules/exporters/_rules2excel.py,sha256=JdEEutD0y80KLRAeWoo2GB-1-UtAughN8cTS8AJIjr8,13146
 cognite/neat/rules/exporters/_rules2ontology.py,sha256=PqE62FIPWFWUkivyxzOUVFf9Nx8yVJghZBB9A_7us4Q,19922
 cognite/neat/rules/exporters/_rules2yaml.py,sha256=HKgFlpgD7U2vWLQC_VdSvkDk19QgeVAd_J8wQ9ZgrN8,3038
 cognite/neat/rules/exporters/_validation.py,sha256=E6nn1QicaJpDFiXrYRzwTqsJ5VULVzzeqhCBVlRxH4M,4092
 cognite/neat/rules/importer/__init__.py,sha256=h1owL8pBPEtOmlIFAdkqAABH1A_Op5plh8C53og0uag,636
 cognite/neat/rules/importer/_base.py,sha256=xNFBe33fwJnq3pp2dKqyKnNinwJG7liXvmEUvjtHqB8,2316
 cognite/neat/rules/importer/_dict2rules.py,sha256=nZuF26CXG8lX_Si5krYLq-CLCKUtvmvfvsV5fky0EPk,6469
-cognite/neat/rules/importer/_dms2rules.py,sha256=SHvwQdascUJUqxup7R3kFOv7xksPhEVk16GYHGIRzPs,7890
+cognite/neat/rules/importer/_dms2rules.py,sha256=jDvKkaztBh0TfaKbOmPsM9I7CwJEd6ZAGTnRVIcho6U,7713
 cognite/neat/rules/importer/_graph2rules.py,sha256=yZqgmNFKWbG-QXfuumn6MgQrCWc3MMgyFj8uXcVSAOs,12097
 cognite/neat/rules/importer/_json2rules.py,sha256=ko0sC3-xO3ne_PQn5aF0L5SsA8m48SN2bnqmBgjkylc,1610
 cognite/neat/rules/importer/_owl2rules/__init__.py,sha256=tdGcrgtozdQyST-pTlxIa4cLBNTLvtk1nNYR4vOdFSw,63
@@ -134,7 +133,7 @@ cognite/neat/rules/importer/_xsd2rules.py,sha256=iKglhTX8u61j1GqNNKh_67qaw8-ZIam
 cognite/neat/rules/importer/_yaml2rules.py,sha256=BnuEbhatcJrLMfPNgzLFwNWbwbIib-kIArcoC6aRMGI,1628
 cognite/neat/rules/importers/__init__.py,sha256=zqNbGpvdVhYkLjWx1i9dJ3FXzYGtuQyTydUYsj-BndQ,408
 cognite/neat/rules/importers/_base.py,sha256=qd9jg9n87lOTzNGdPp5p4taE4vncPAGwTm-1Vfbgj3s,4268
-cognite/neat/rules/importers/_dms2rules.py,sha256=E8nhnFzBPtehmPt2gAgDPY6ZVL2mXgUIQ24m-i3VahE,9138
+cognite/neat/rules/importers/_dms2rules.py,sha256=QN7fD-bld9e8eU-xS8R0g4A8cQf1MItLOyhwbAX2yGc,10427
 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=o-n9KBWvA5Y7Fj0nW9KCnR1sz_PLtLKn2MTJPRnTcFc,12554
@@ -148,8 +147,8 @@ cognite/neat/rules/importers/_owl2rules/_owl2rules.py,sha256=xVGOo5wnoXLI3E9OUID
 cognite/neat/rules/importers/_spreadsheet2rules.py,sha256=QIYTW-3Uc5ffFp3rJNyiqigWvc6x2eZTvhxqrXlGGSs,11481
 cognite/neat/rules/importers/_yaml2rules.py,sha256=sIaYY3Zo--v1cXSu65n4ZPv47cS-5InvSbpkw3Ahov4,4198
 cognite/neat/rules/issues/__init__.py,sha256=Ms6jgCxCezc5IgTOwCFtXQPtoVFfOvdcXj84_rs917I,563
-cognite/neat/rules/issues/base.py,sha256=dS4lmbW9VQ8awgOIB-Ah9z9LdNbCa-fPd8tbyPb8sM4,5856
-cognite/neat/rules/issues/dms.py,sha256=WB8N6MPbLFxdScJLGGY_zdErcrEXJnAsMladMB5aKa4,12722
+cognite/neat/rules/issues/base.py,sha256=qgoZ3qr35XLtdmkWWewf3sCYOW0sCkJrN9VpFvX-WzY,6158
+cognite/neat/rules/issues/dms.py,sha256=O4JBbxOchv9wa9MGnoo1JGtc-H5Jo77izjEo3RaF7Ck,15314
 cognite/neat/rules/issues/fileread.py,sha256=n-GZaULOJF_MKkBIh1maaOuGZXOvZYw7Y6fDAS0jrBI,4492
 cognite/neat/rules/issues/formatters.py,sha256=_pSogWtfkt2JK0PZgWQffbj2On8vumFNshxOKAi5fYw,3346
 cognite/neat/rules/issues/importing.py,sha256=GqUywhBD840Fbc4DD5L2I0oEllJ78MTjpmXogVEjihA,7493
@@ -162,11 +161,11 @@ cognite/neat/rules/models/_rules/_types/__init__.py,sha256=Px0uB5fqk-8qH-HRi0Zvg
 cognite/neat/rules/models/_rules/_types/_base.py,sha256=okf8ebEcKrXf1rZQNp_cMsTS4pNKdJk2QMz_8-wi_so,16681
 cognite/neat/rules/models/_rules/_types/_field.py,sha256=dOVAU1jWCupFVnrYYwLfI-nNUC4rv4vXHMzpiObtWiw,10295
 cognite/neat/rules/models/_rules/_types/_value.py,sha256=ubyWmU6neyNxx17fqcciIjyB-CIpYNUuM97Xh2sVrYo,6308
-cognite/neat/rules/models/_rules/base.py,sha256=9DgtdCmpz84sMFxZB_stWkalVbjA4HQKsTMpSjjOVLU,10635
-cognite/neat/rules/models/_rules/dms_architect_rules.py,sha256=bsuwCFiVFnDQuoAdwTu_-kp5oJGepuD24kLO9B_5YYc,50424
-cognite/neat/rules/models/_rules/dms_schema.py,sha256=-ru40beGY2WJvf9_sd5eO2Wh8x2qLQ2UmgzExloBWac,30229
-cognite/neat/rules/models/_rules/domain_rules.py,sha256=mOE4M6wOurmnAehxbnxvP9vIVXsFuKSiyMmD1shXKpA,2051
-cognite/neat/rules/models/_rules/information_rules.py,sha256=kETaZ3HsPw0EFXIeU-YhfEZeK4FhAh5RvNQAWbrcE-E,21026
+cognite/neat/rules/models/_rules/base.py,sha256=F79FX1qCIqXlAPg0yAlpC6753dcRqoy9UB5BB3zWbDY,11025
+cognite/neat/rules/models/_rules/dms_architect_rules.py,sha256=K5S9Us4hlaOVkqd4IzxsZXsuYv_4M3H107HWm3M_Sao,55886
+cognite/neat/rules/models/_rules/dms_schema.py,sha256=dOzOr5iZyiOWFROo6706Z8aRvR6FSvPgRxWXSuuje3s,30418
+cognite/neat/rules/models/_rules/domain_rules.py,sha256=HSZWk4NTfnzX_LlOdA5HAMkiHA5r4BZxRkGOWTFp79Y,2566
+cognite/neat/rules/models/_rules/information_rules.py,sha256=sCqWt0OEPT8Ygqc7VfRwYVLcbJMOHUzDuhVWnQ4XO6A,21555
 cognite/neat/rules/models/raw_rules.py,sha256=Y7ZVKyvLhX0s6WdwztbFiYFj4EijGEfjtBmv0ibRmmg,12368
 cognite/neat/rules/models/rdfpath.py,sha256=kk1dqxl3n2W_vSQtpSJri2O4nCXnCDZB2lhLsLV1PN0,7344
 cognite/neat/rules/models/rules.py,sha256=ECKrQEtoiQqtR8W-rKMAWmODpHeHhI8Qzf3TwCa3dy8,51063
@@ -181,7 +180,7 @@ cognite/neat/utils/cdf_loaders/_data_modeling.py,sha256=JQO0E1_PSibUP0JiaX4Kdljw
 cognite/neat/utils/cdf_loaders/_ingestion.py,sha256=GqIJ7JsFuM4TYK_AFysEwS1e5CaVWfq5NqYPEUnId5s,6319
 cognite/neat/utils/cdf_loaders/data_classes.py,sha256=0apspfwVlFltYOZfmk_PNknS3Z3SCxVr3kkvXH0bfPA,3844
 cognite/neat/utils/exceptions.py,sha256=-w4cAcvcoWLf-_ZwAl7QV_NysfqtQzIOd1Ti-mpxJgM,981
-cognite/neat/utils/spreadsheet.py,sha256=tp9HSuzMWik69iHRCspw8zUy-U2LLAFYaV4biiKm-zU,2699
+cognite/neat/utils/spreadsheet.py,sha256=e9btpmZ68rrbc2h4ML44cpOyA7PQM0qCqMfxqHaKLr4,2722
 cognite/neat/utils/text.py,sha256=4bg1_Q0lg7KsoxaDOvXrVyeY78BJN8i-27BlyDzUCls,3082
 cognite/neat/utils/utils.py,sha256=E7CmZzPEYmfjsEiAxN9thNrCDCvw16r8PKODUgBR2Fk,12826
 cognite/neat/utils/xml.py,sha256=ppLT3lQKVp8wOP-m8-tFY8uB2P4R76l7R_-kUtsABng,992
@@ -227,8 +226,8 @@ cognite/neat/workflows/steps_registry.py,sha256=PZVoHX4d6Vmjz6XzUFnFFWMCnrVnqkUC
 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.72.3.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.72.3.dist-info/METADATA,sha256=4KC49y0DSL83A7qqb5OkxQv78ryoxQR22uLNhJs24Js,9321
-cognite_neat-0.72.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cognite_neat-0.72.3.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
-cognite_neat-0.72.3.dist-info/RECORD,,
+cognite_neat-0.73.0.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.73.0.dist-info/METADATA,sha256=M-VcOy7BmI2OfbtquJljKUwpda3GrWrV2P_GkyR5MwE,9321
+cognite_neat-0.73.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cognite_neat-0.73.0.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
+cognite_neat-0.73.0.dist-info/RECORD,,