cognite-neat 0.92.3__py3-none-any.whl → 0.93.0__py3-none-any.whl

cognite/neat/{rules → _rules}/models/asset/_rules.py

@@ -4,15 +4,15 @@ from typing import Any, ClassVar, cast
 from pydantic import Field, field_validator, model_validator
 from rdflib import Namespace
 
-from cognite.neat.constants import get_default_prefixes
-from cognite.neat.rules.models._base_rules import BaseRules, RoleTypes, SheetList
-from cognite.neat.rules.models.entities import (
+from cognite.neat._constants import get_default_prefixes
+from cognite.neat._rules.models._base_rules import BaseRules, RoleTypes, SheetList
+from cognite.neat._rules.models.entities import (
     CdfResourceEntityList,
     ClassEntity,
     MultiValueTypeInfo,
     Undefined,
 )
-from cognite.neat.rules.models.information import (
+from cognite.neat._rules.models.information import (
     InformationClass,
     InformationMetadata,
     InformationProperty,

cognite/neat/{rules → _rules}/models/asset/_rules_input.py

@@ -3,15 +3,15 @@ from typing import Any
 
 from rdflib import Namespace
 
-from cognite.neat.rules.models._base_input import InputComponent, InputRules
-from cognite.neat.rules.models.data_types import DataType
-from cognite.neat.rules.models.entities import (
+from cognite.neat._rules.models._base_input import InputComponent, InputRules
+from cognite.neat._rules.models.data_types import DataType
+from cognite.neat._rules.models.entities import (
     ClassEntity,
     MultiValueTypeInfo,
     UnknownEntity,
     load_value_type,
 )
-from cognite.neat.rules.models.information._rules_input import InformationInputClass, InformationInputMetadata
+from cognite.neat._rules.models.information._rules_input import InformationInputClass, InformationInputMetadata
 
 from ._rules import AssetClass, AssetMetadata, AssetProperty, AssetRules
 

cognite/neat/{rules → _rules}/models/asset/_validation.py

@@ -1,12 +1,12 @@
 from graphlib import CycleError
 from typing import cast
 
-from cognite.neat.issues import IssueList
-from cognite.neat.issues.errors import NeatValueError, PropertyDefinitionError
-from cognite.neat.rules.models._base_rules import SheetList
-from cognite.neat.rules.models.asset._rules import AssetProperty, AssetRules
-from cognite.neat.rules.models.entities import AssetEntity, AssetFields, ClassEntity
-from cognite.neat.rules.models.information._validation import InformationPostValidation
+from cognite.neat._issues import IssueList
+from cognite.neat._issues.errors import NeatValueError, PropertyDefinitionError
+from cognite.neat._rules.models._base_rules import SheetList
+from cognite.neat._rules.models.asset._rules import AssetProperty, AssetRules
+from cognite.neat._rules.models.entities import AssetEntity, AssetFields, ClassEntity
+from cognite.neat._rules.models.information._validation import InformationPostValidation
 
 
 class AssetPostValidation(InformationPostValidation):
@@ -35,7 +35,7 @@ class AssetPostValidation(InformationPostValidation):
                     )
 
     def _circular_dependency(self) -> None:
-        from cognite.neat.rules.analysis import AssetAnalysis
+        from cognite.neat._rules.analysis import AssetAnalysis
 
         try:
             _ = AssetAnalysis(cast(AssetRules, self.rules)).class_topological_sort()

cognite/neat/{rules → _rules}/models/data_types.py

@@ -9,8 +9,8 @@ from cognite.client.data_classes.data_modeling.data_types import Enum as DMSEnum
 from pydantic import BaseModel, Field, model_serializer, model_validator
 from pydantic.functional_validators import ModelWrapValidatorHandler
 
-from cognite.neat.rules.models.entities._single_value import ClassEntity, UnitEntity
-from cognite.neat.utils.regex_patterns import SPLIT_ON_COMMA_PATTERN, SPLIT_ON_EQUAL_PATTERN
+from cognite.neat._rules._constants import SPLIT_ON_COMMA_PATTERN, SPLIT_ON_EQUAL_PATTERN
+from cognite.neat._rules.models.entities._single_value import ClassEntity, UnitEntity
 
 if sys.version_info >= (3, 11):
     from typing import Self
@@ -28,13 +28,13 @@ class DataType(BaseModel):
     graphql: ClassVar[str]
     xsd: ClassVar[str]
     sql: ClassVar[str]
-    _dms_loaded: bool = False
     # Repeat all here, just to make mypy happy
     name: typing.Literal[
         "boolean",
         "token",
         "float",
         "double",
+        "decimal",
         "integer",
         "nonPositiveInteger",
         "nonNegativeInteger",
@@ -75,10 +75,8 @@ class DataType(BaseModel):
             cls_: type[DataType]
             if name in _DATA_TYPE_BY_DMS_TYPE:
                 cls_ = _DATA_TYPE_BY_DMS_TYPE[name]
-                dms_loaded = True
             elif name in _DATA_TYPE_BY_NAME:
                 cls_ = _DATA_TYPE_BY_NAME[name]
-                dms_loaded = False
             else:
                 raise ValueError(f"Unknown data type: {value}") from None
             extra_args: dict[str, Any] = {}
@@ -89,8 +87,6 @@ class DataType(BaseModel):
                 # Todo? Raise warning if extra_args contains keys that are not in the model fields
             instance = cls_(**extra_args)
             created = handler(instance)
-            # Private attributes are not validated or set. We need to set it manually
-            created._dms_loaded = dms_loaded
             return created
         raise ValueError(f"Cannot load {cls.__name__} from {value}")
 
@@ -99,11 +95,7 @@ class DataType(BaseModel):
         return str(self)
 
     def __str__(self) -> str:
-        if self._dms_loaded:
-            base = self.dms._type
-        else:
-            base = self.model_fields["name"].default
-        return self._suffix_extra_args(base)
+        return self._suffix_extra_args(self.model_fields["name"].default)
 
     def _suffix_extra_args(self, base: str) -> str:
         extra_fields: dict[str, str] = {}
@@ -164,6 +156,17 @@ class Double(DataType):
     unit: UnitEntity | None = None
 
 
+class Decimal(DataType):
+    python = float
+    dms = dms.Float64
+    graphql = "Float"
+    xsd = "decimal"
+    sql = "FLOAT"
+
+    name: typing.Literal["decimal"] = "decimal"
+    unit: UnitEntity | None = None
+
+
 class Integer(DataType):
     python = int
     dms = dms.Int32

cognite/neat/{rules → _rules}/models/dms/_exporter.py

@@ -1,6 +1,6 @@
 import warnings
 from collections import defaultdict
-from collections.abc import Collection, Sequence
+from collections.abc import Collection, Hashable, Sequence
 from typing import Any, cast
 
 from cognite.client.data_classes import data_modeling as dm
@@ -13,17 +13,17 @@ from cognite.client.data_classes.data_modeling.views import (
     ViewPropertyApply,
 )
 
-from cognite.neat.issues.errors import NeatTypeError, ResourceNotFoundError
-from cognite.neat.issues.warnings import NotSupportedWarning, PropertyNotFoundWarning
-from cognite.neat.issues.warnings.user_modeling import (
+from cognite.neat._issues.errors import NeatTypeError, ResourceNotFoundError
+from cognite.neat._issues.warnings import NotSupportedWarning, PropertyNotFoundWarning
+from cognite.neat._issues.warnings.user_modeling import (
     EmptyContainerWarning,
     HasDataFilterOnNoPropertiesViewWarning,
     HasDataFilterOnViewWithReferencesWarning,
     NodeTypeFilterOnParentViewWarning,
 )
-from cognite.neat.rules.models._base_rules import DataModelType, ExtensionCategory, SchemaCompleteness
-from cognite.neat.rules.models.data_types import DataType, Double, Enum, Float
-from cognite.neat.rules.models.entities import (
+from cognite.neat._rules.models._base_rules import DataModelType, ExtensionCategory, SchemaCompleteness
+from cognite.neat._rules.models.data_types import DataType, Double, Enum, Float
+from cognite.neat._rules.models.entities import (
     ClassEntity,
     ContainerEntity,
     DMSFilter,
@@ -37,7 +37,7 @@ from cognite.neat.rules.models.entities import (
     UnitEntity,
     ViewEntity,
 )
-from cognite.neat.utils.cdf.data_classes import ContainerApplyDict, NodeApplyDict, SpaceApplyDict, ViewApplyDict
+from cognite.neat._utils.cdf.data_classes import ContainerApplyDict, NodeApplyDict, SpaceApplyDict, ViewApplyDict
 
 from ._rules import DMSEnum, DMSMetadata, DMSProperty, DMSRules, DMSView
 from ._schema import DMSSchema, PipelineSchema
@@ -120,7 +120,13 @@ class _DMSExporter:
 
         containers = self._create_containers(container_properties_by_id, rules.enum)  # type: ignore[arg-type]
 
-        views, view_node_type_filters = self._create_views_with_node_types(view_properties_by_id)
+        view_properties_with_ancestors_by_id = self._gather_properties_with_ancestors(
+            view_properties_by_id, rules.views
+        )
+
+        views, view_node_type_filters = self._create_views_with_node_types(
+            view_properties_by_id, view_properties_with_ancestors_by_id
+        )
         if rules.nodes:
             node_types = NodeApplyDict(
                 [node.as_node() for node in rules.nodes]
@@ -198,6 +204,7 @@ class _DMSExporter:
     def _create_views_with_node_types(
         self,
         view_properties_by_id: dict[dm.ViewId, list[DMSProperty]],
+        view_properties_with_ancestors_by_id: dict[dm.ViewId, list[DMSProperty]],
     ) -> tuple[ViewApplyDict, set[dm.NodeId]]:
         input_views = list(self.rules.views)
         if self.rules.last:
@@ -217,7 +224,7 @@ class _DMSExporter:
             if not (view_properties := view_properties_by_id.get(view_id)):
                 continue
             for prop in view_properties:
-                view_property = self._create_view_property(prop, view_properties_by_id)
+                view_property = self._create_view_property(prop, view_properties_with_ancestors_by_id)
                 if view_property is not None:
                     view.properties[prop.view_property] = view_property
 
@@ -395,6 +402,43 @@ class _DMSExporter:
 
         return container_properties_by_id, view_properties_by_id
 
+    @staticmethod
+    def _gather_properties_with_ancestors(
+        view_properties_by_id: dict[dm.ViewId, list[DMSProperty]],
+        views: Sequence[DMSView],
+    ) -> dict[dm.ViewId, list[DMSProperty]]:
+        view_properties_with_parents_by_id: dict[dm.ViewId, list[DMSProperty]] = defaultdict(list)
+        view_by_view_id = {view.view.as_id(): view for view in views}
+        for view in views:
+            view_id = view.view.as_id()
+            seen: set[Hashable] = set()
+            if view_properties := view_properties_by_id.get(view_id):
+                view_properties_with_parents_by_id[view_id].extend(view_properties)
+                seen.update(prop._identifier() for prop in view_properties)
+            if not view.implements:
+                continue
+            parents = view.implements.copy()
+            seen_parents = set(parents)
+            while parents:
+                parent = parents.pop()
+                parent_view_id = parent.as_id()
+                if parent_view := view_by_view_id.get(parent_view_id):
+                    for grandparent in parent_view.implements or []:
+                        if grandparent not in seen_parents:
+                            parents.append(grandparent)
+                            seen_parents.add(grandparent)
+
+                if not (parent_view_properties := view_properties_by_id.get(parent_view_id)):
+                    continue
+                for prop in parent_view_properties:
+                    new_prop = prop.model_copy(update={"view": view.view})
+
+                    if new_prop._identifier() not in seen:
+                        view_properties_with_parents_by_id[view_id].append(new_prop)
+                        seen.add(new_prop._identifier())
+
+        return view_properties_with_parents_by_id
+
     @classmethod
     def _update_with_properties(
         cls,
@@ -472,7 +516,7 @@ class _DMSExporter:
 
     @classmethod
     def _create_view_property(
-        cls, prop: DMSProperty, view_properties_by_id: dict[dm.ViewId, list[DMSProperty]]
+        cls, prop: DMSProperty, view_properties_with_ancestors_by_id: dict[dm.ViewId, list[DMSProperty]]
     ) -> ViewPropertyApply | None:
         if prop.container and prop.container_property:
             container_prop_identifier = prop.container_property
@@ -538,7 +582,11 @@ class _DMSExporter:
                 )
             edge_source = None
             reverse_prop = next(
-                (prop for prop in view_properties_by_id.get(source_view_id, []) if prop.property_ == reverse_prop_id),
+                (
+                    prop
+                    for prop in view_properties_with_ancestors_by_id.get(source_view_id, [])
+                    if prop.property_ == reverse_prop_id
+                ),
                 None,
             )
             if (

cognite/neat/{rules → _rules}/models/dms/_rules.py

@@ -9,12 +9,12 @@ from cognite.client import data_modeling as dm
 from pydantic import Field, field_serializer, field_validator, model_validator
 from pydantic_core.core_schema import SerializationInfo, ValidationInfo
 
-from cognite.neat.issues import MultiValueError
-from cognite.neat.issues.warnings import (
+from cognite.neat._issues import MultiValueError
+from cognite.neat._issues.warnings import (
     PrincipleMatchingSpaceAndVersionWarning,
     PrincipleSolutionBuildsOnEnterpriseWarning,
 )
-from cognite.neat.rules.models._base_rules import (
+from cognite.neat._rules.models._base_rules import (
     BaseMetadata,
     BaseRules,
     DataModelType,
@@ -24,16 +24,19 @@ from cognite.neat.rules.models._base_rules import (
     SheetList,
     SheetRow,
 )
-from cognite.neat.rules.models._types import (
-    ExternalIdType,
-    PropertyType,
+from cognite.neat._rules.models._types import (
+    ClassEntityType,
+    ContainerEntityType,
+    DataModelExternalIdType,
+    DmsPropertyType,
+    InformationPropertyType,
+    SpaceType,
     StrListType,
     VersionType,
+    ViewEntityType,
 )
-from cognite.neat.rules.models.data_types import DataType
-from cognite.neat.rules.models.entities import (
-    ClassEntity,
-    ContainerEntity,
+from cognite.neat._rules.models.data_types import DataType
+from cognite.neat._rules.models.entities import (
     ContainerEntityList,
     DMSEntity,
     DMSNodeEntity,
@@ -68,7 +71,7 @@ class DMSMetadata(BaseMetadata):
     data_model_type: DataModelType = Field(DataModelType.enterprise, alias="dataModelType")
     schema_: SchemaCompleteness = Field(alias="schema")
     extension: ExtensionCategory = ExtensionCategory.addition
-    space: ExternalIdType
+    space: SpaceType
     name: str | None = Field(
         None,
         description="Human readable name of the data model",
@@ -76,7 +79,7 @@ class DMSMetadata(BaseMetadata):
         max_length=255,
     )
     description: str | None = Field(None, min_length=1, max_length=1024)
-    external_id: ExternalIdType = Field(alias="externalId")
+    external_id: DataModelExternalIdType = Field(alias="externalId")
     version: VersionType
     creator: StrListType
     created: datetime = Field(
@@ -152,8 +155,8 @@ def _metadata(context: Any) -> DMSMetadata | None:
 
 
 class DMSProperty(SheetRow):
-    view: ViewEntity = Field(alias="View")
-    view_property: str = Field(alias="View Property")
+    view: ViewEntityType = Field(alias="View")
+    view_property: DmsPropertyType = Field(alias="View Property")
     name: str | None = Field(alias="Name", default=None)
     description: str | None = Field(alias="Description", default=None)
     connection: Literal["direct"] | ReverseConnectionEntity | EdgeEntity | None = Field(None, alias="Connection")
@@ -163,12 +166,12 @@ class DMSProperty(SheetRow):
     is_list: bool | None = Field(default=None, alias="Is List")
     default: str | int | dict | None = Field(None, alias="Default")
     reference: URLEntity | ReferenceEntity | None = Field(default=None, alias="Reference", union_mode="left_to_right")
-    container: ContainerEntity | None = Field(None, alias="Container")
-    container_property: str | None = Field(None, alias="Container Property")
+    container: ContainerEntityType | None = Field(None, alias="Container")
+    container_property: DmsPropertyType | None = Field(None, alias="Container Property")
     index: StrListType | None = Field(None, alias="Index")
     constraint: StrListType | None = Field(None, alias="Constraint")
-    class_: ClassEntity = Field(alias="Class (linage)")
-    property_: PropertyType = Field(alias="Property (linage)")
+    class_: ClassEntityType = Field(alias="Class (linage)")
+    property_: InformationPropertyType = Field(alias="Property (linage)")
 
     def _identifier(self) -> tuple[Hashable, ...]:
         return self.view, self.view_property
@@ -233,13 +236,13 @@ class DMSProperty(SheetRow):
 
 
 class DMSContainer(SheetRow):
-    container: ContainerEntity = Field(alias="Container")
+    container: ContainerEntityType = Field(alias="Container")
     name: str | None = Field(alias="Name", default=None)
     description: str | None = Field(alias="Description", default=None)
     reference: URLEntity | ReferenceEntity | None = Field(alias="Reference", default=None, union_mode="left_to_right")
     constraint: ContainerEntityList | None = Field(None, alias="Constraint")
     used_for: Literal["node", "edge", "all"] | None = Field("all", alias="Used For")
-    class_: ClassEntity = Field(alias="Class (linage)")
+    class_: ClassEntityType = Field(alias="Class (linage)")
 
     def _identifier(self) -> tuple[Hashable, ...]:
         return (self.container,)
@@ -289,14 +292,14 @@ class DMSContainer(SheetRow):
 
 
 class DMSView(SheetRow):
-    view: ViewEntity = Field(alias="View")
+    view: ViewEntityType = Field(alias="View")
     name: str | None = Field(alias="Name", default=None)
     description: str | None = Field(alias="Description", default=None)
     implements: ViewEntityList | None = Field(None, alias="Implements")
     reference: URLEntity | ReferenceEntity | None = Field(alias="Reference", default=None, union_mode="left_to_right")
     filter_: HasDataFilter | NodeTypeFilter | RawFilter | None = Field(None, alias="Filter")
     in_model: bool = Field(True, alias="In Model")
-    class_: ClassEntity = Field(alias="Class (linage)")
+    class_: ClassEntityType = Field(alias="Class (linage)")
 
     def _identifier(self) -> tuple[Hashable, ...]:
         return (self.view,)
@@ -369,7 +372,7 @@ class DMSNode(SheetRow):
 
 
 class DMSEnum(SheetRow):
-    collection: ClassEntity = Field(alias="Collection")
+    collection: ClassEntityType = Field(alias="Collection")
     value: str = Field(alias="Value")
     name: str | None = Field(alias="Name", default=None)
     description: str | None = Field(alias="Description", default=None)

cognite/neat/{rules → _rules}/models/dms/_rules_input.py

@@ -5,9 +5,9 @@ from typing import Any, Literal
 
 from cognite.client import data_modeling as dm
 
-from cognite.neat.rules.models._base_input import InputComponent, InputRules
-from cognite.neat.rules.models.data_types import DataType
-from cognite.neat.rules.models.entities import (
+from cognite.neat._rules.models._base_input import InputComponent, InputRules
+from cognite.neat._rules.models.data_types import DataType
+from cognite.neat._rules.models.entities import (
     ClassEntity,
     ContainerEntity,
     DMSNodeEntity,
@@ -267,7 +267,7 @@ class DMSInputRules(InputRules[DMSRules]):
 
     def dump(self) -> dict[str, Any]:
         default_space = self.metadata.space
-        default_version = self.metadata.version
+        default_version = str(self.metadata.version)
         reference: dict[str, Any] | None = None
         if isinstance(self.reference, DMSInputRules):
             reference = self.reference.dump()

cognite/neat/{rules → _rules}/models/dms/_schema.py

@@ -25,23 +25,23 @@ from cognite.client.data_classes.data_modeling.views import (
 )
 from cognite.client.data_classes.transformations.common import Edges, EdgeType, Nodes, ViewInfo
 
-from cognite.neat.issues import NeatError
-from cognite.neat.issues.errors import (
+from cognite.neat._issues import NeatError
+from cognite.neat._issues.errors import (
     NeatYamlError,
     PropertyMappingDuplicatedError,
     PropertyNotFoundError,
     ResourceDuplicatedError,
     ResourceNotFoundError,
 )
-from cognite.neat.issues.warnings import (
+from cognite.neat._issues.warnings import (
     FileTypeUnexpectedWarning,
     ResourceNotFoundWarning,
     ResourceRetrievalWarning,
     ResourcesDuplicatedWarning,
 )
-from cognite.neat.issues.warnings.user_modeling import DirectRelationMissingSourceWarning
-from cognite.neat.rules.models.data_types import _DATA_TYPE_BY_DMS_TYPE
-from cognite.neat.utils.cdf.data_classes import (
+from cognite.neat._issues.warnings.user_modeling import DirectRelationMissingSourceWarning
+from cognite.neat._rules.models.data_types import _DATA_TYPE_BY_DMS_TYPE
+from cognite.neat._utils.cdf.data_classes import (
     CogniteResourceDict,
     ContainerApplyDict,
     NodeApplyDict,
@@ -50,9 +50,9 @@ from cognite.neat.utils.cdf.data_classes import (
     SpaceApplyDict,
     ViewApplyDict,
 )
-from cognite.neat.utils.cdf.loaders import ViewLoader
-from cognite.neat.utils.rdf_ import get_inheritance_path
-from cognite.neat.utils.text import to_camel
+from cognite.neat._utils.cdf.loaders import ViewLoader
+from cognite.neat._utils.rdf_ import get_inheritance_path
+from cognite.neat._utils.text import to_camel
 
 if sys.version_info >= (3, 11):
     from typing import Self
@@ -461,7 +461,7 @@ class DMSSchema:
                         )
                 else:
                     try:
-                        loaded[attr.name] = attr.type.load(items)
+                        loaded[attr.name] = attr.type.load(items)  # type: ignore[union-attr]
                     except Exception as e:
                         loaded[attr.name] = cls._load_individual_resources(
                             items, attr, str(e), context.get(attr.name, [])
@@ -470,14 +470,15 @@ class DMSSchema:
 
     @classmethod
     def _load_individual_resources(cls, items: list, attr: Field, trigger_error: str, resource_context) -> list[Any]:
-        resources = attr.type([])
-        if not hasattr(attr.type, "_RESOURCE"):
+        type_ = cast(type, attr.type)
+        resources = type_([])
+        if not hasattr(type_, "_RESOURCE"):
             warnings.warn(
-                FileTypeUnexpectedWarning(Path("UNKNOWN"), frozenset([attr.type.__name__]), trigger_error), stacklevel=2
+                FileTypeUnexpectedWarning(Path("UNKNOWN"), frozenset([type_.__name__]), trigger_error), stacklevel=2
             )
             return resources
         # Fallback to load individual resources.
-        single_cls = attr.type._RESOURCE
+        single_cls = type_._RESOURCE
         for no, item in enumerate(items):
             try:
                 loaded_instance = single_cls.load(item)

cognite/neat/{rules → _rules}/models/dms/_validation.py

@@ -3,24 +3,24 @@ from typing import Any, ClassVar
 
 from cognite.client import data_modeling as dm
 
-from cognite.neat.constants import DMS_CONTAINER_PROPERTY_SIZE_LIMIT
-from cognite.neat.issues import IssueList, NeatError, NeatIssue, NeatIssueList
-from cognite.neat.issues.errors import (
+from cognite.neat._constants import DMS_CONTAINER_PROPERTY_SIZE_LIMIT
+from cognite.neat._issues import IssueList, NeatError, NeatIssue, NeatIssueList
+from cognite.neat._issues.errors import (
     PropertyDefinitionDuplicatedError,
     ResourceChangedError,
     ResourceNotDefinedError,
 )
-from cognite.neat.issues.warnings import (
+from cognite.neat._issues.warnings import (
     NotSupportedHasDataFilterLimitWarning,
     NotSupportedViewContainerLimitWarning,
 )
-from cognite.neat.issues.warnings.user_modeling import (
+from cognite.neat._issues.warnings.user_modeling import (
     NotNeatSupportedFilterWarning,
     ViewPropertyLimitWarning,
 )
-from cognite.neat.rules.models._base_rules import DataModelType, ExtensionCategory, SchemaCompleteness
-from cognite.neat.rules.models.data_types import DataType
-from cognite.neat.rules.models.entities import ContainerEntity, RawFilter
+from cognite.neat._rules.models._base_rules import DataModelType, ExtensionCategory, SchemaCompleteness
+from cognite.neat._rules.models.data_types import DataType
+from cognite.neat._rules.models.entities import ContainerEntity, RawFilter
 
 from ._rules import DMSProperty, DMSRules
 from ._schema import DMSSchema

cognite/neat/{rules → _rules}/models/domain.py

@@ -5,8 +5,8 @@ from typing import ClassVar
 
 from pydantic import Field, field_serializer, field_validator
 
-from cognite.neat.rules.models.data_types import DataType
-from cognite.neat.rules.models.entities import ClassEntity, ClassEntityList
+from cognite.neat._rules.models.data_types import DataType
+from cognite.neat._rules.models.entities import ClassEntity, ClassEntityList
 
 from ._base_input import InputComponent, InputRules
 from ._base_rules import (
@@ -16,7 +16,7 @@ from ._base_rules import (
     SheetList,
     SheetRow,
 )
-from ._types import PropertyType, StrOrListType
+from ._types import ClassEntityType, InformationPropertyType, StrOrListType
 
 
 class DomainMetadata(BaseMetadata):
@@ -31,8 +31,8 @@ class DomainMetadata(BaseMetadata):
 
 
 class DomainProperty(SheetRow):
-    class_: ClassEntity = Field(alias="Class")
-    property_: PropertyType = Field(alias="Property")
+    class_: ClassEntityType = Field(alias="Class")
+    property_: InformationPropertyType = Field(alias="Property")
     name: str | None = Field(alias="Name", default=None)
     description: str | None = Field(alias="Description", default=None)
     value_type: DataType | ClassEntity = Field(alias="Value Type")
@@ -56,7 +56,7 @@ class DomainProperty(SheetRow):
 
 
 class DomainClass(SheetRow):
-    class_: ClassEntity = Field(alias="Class")
+    class_: ClassEntityType = Field(alias="Class")
     name: str | None = Field(alias="Name", default=None)
     description: str | None = Field(None, alias="Description")
     parent: ClassEntityList | None = Field(alias="Parent Class")

cognite/neat/{rules → _rules}/models/entities/__init__.py

@@ -1,4 +1,4 @@
-from ._constants import EntityTypes, Undefined, Unknown
+from ._constants import Undefined, Unknown
 from ._loaders import load_connection, load_dms_value_type, load_value_type
 from ._multi_value import MultiValueTypeInfo
 from ._single_value import (
@@ -34,7 +34,6 @@ __all__ = [
     "ClassEntity",
     "ViewEntityList",
     "UnknownEntity",
-    "EntityTypes",
     "Unknown",
     "Undefined",
     "T_Entity",

cognite/neat/_rules/models/entities/_constants.py

@@ -0,0 +1,15 @@
+from pydantic import BaseModel
+
+
+class _UndefinedType(BaseModel): ...
+
+
+class _UnknownType(BaseModel):
+    def __str__(self) -> str:
+        return "#N/A"
+
+
+# This is a trick to make Undefined and Unknown singletons
+Undefined = _UndefinedType()
+Unknown = _UnknownType()
+_PARSE = object()

cognite/neat/{rules → _rules}/models/entities/_loaders.py

@@ -1,7 +1,7 @@
 from typing import Literal
 
-from cognite.neat.issues.errors import NeatTypeError
-from cognite.neat.rules.models.data_types import DataType
+from cognite.neat._issues.errors import NeatTypeError
+from cognite.neat._rules.models.data_types import DataType
 
 from ._multi_value import MultiValueTypeInfo
 from ._single_value import (

cognite/neat/{rules → _rules}/models/entities/_multi_value.py

@@ -6,9 +6,10 @@ from pydantic import (
     model_validator,
 )
 
-from cognite.neat.rules.models.data_types import DataType
+from cognite.neat._rules._constants import EntityTypes
+from cognite.neat._rules.models.data_types import DataType
 
-from ._constants import _PARSE, EntityTypes, Undefined
+from ._constants import _PARSE, Undefined
 from ._single_value import ClassEntity, UnknownEntity
 
 
@@ -65,3 +66,15 @@ class MultiValueTypeInfo(BaseModel):
         for type_ in self.types:
             if isinstance(type_, ClassEntity) and type_.prefix is Undefined:
                 type_.prefix = prefix
+
+    def is_multi_object_type(self) -> bool:
+        """Will signalize to DMS converter to create connection to unknown Node type"""
+        return all(isinstance(t, ClassEntity) for t in self.types)
+
+    def is_multi_data_type(self) -> bool:
+        """Will signalize to DMS converter to attempt to find the best data type for value"""
+        return all(isinstance(t, DataType) for t in self.types)
+
+    def is_mixed_type(self) -> bool:
+        """Will signalize to DMS converter to fall back to string"""
+        return not self.is_multi_object_type() and not self.is_multi_data_type()