cognite-neat 0.121.0__py3-none-any.whl → 0.121.1__py3-none-any.whl

cognite/neat/core/{_rules → _data_model}/models/_types.py

@@ -14,21 +14,21 @@ from pydantic import (
 )
 from pydantic.functional_serializers import PlainSerializer
 
-from cognite.neat.core._issues.errors import RegexViolationError
-from cognite.neat.core._issues.warnings import RegexViolationWarning
-from cognite.neat.core._rules._constants import (
+from cognite.neat.core._data_model._constants import (
     DATA_MODEL_COMPLIANCE_REGEX,
     PATTERNS,
     PREFIX_COMPLIANCE_REGEX,
     VERSION_COMPLIANCE_REGEX,
     EntityTypes,
 )
-from cognite.neat.core._rules.models.entities._multi_value import MultiValueTypeInfo
-from cognite.neat.core._rules.models.entities._single_value import (
+from cognite.neat.core._data_model.models.entities._multi_value import MultiValueTypeInfo
+from cognite.neat.core._data_model.models.entities._single_value import (
     ClassEntity,
     ContainerEntity,
     ViewEntity,
 )
+from cognite.neat.core._issues.errors import RegexViolationError
+from cognite.neat.core._issues.warnings import RegexViolationWarning
 
 Entities: TypeAlias = ClassEntity | ViewEntity | ContainerEntity
 T_Entities = TypeVar("T_Entities", bound=Entities)
@@ -135,9 +135,9 @@ SpaceType = Annotated[
     AfterValidator(_external_id_validation_factory(EntityTypes.space, "")),
 ]
 
-InformationPropertyType = Annotated[
+ConceptualPropertyType = Annotated[
     str,
-    AfterValidator(_external_id_validation_factory(EntityTypes.information_property, "Property column in properties")),
+    AfterValidator(_external_id_validation_factory(EntityTypes.conceptual_property, "Property column in properties")),
 ]
 DmsPropertyType = Annotated[
     str,

cognite/neat/core/_data_model/models/conceptual/__init__.py

@@ -0,0 +1,25 @@
+from ._unverified import (
+    UnverifiedConceptualClass,
+    UnverifiedConceptualDataModel,
+    UnverifiedConceptualMetadata,
+    UnverifiedConceptualProperty,
+)
+from ._validation import InformationValidation
+from ._verified import (
+    ConceptualClass,
+    ConceptualDataModel,
+    ConceptualMetadata,
+    ConceptualProperty,
+)
+
+__all__ = [
+    "ConceptualClass",
+    "ConceptualDataModel",
+    "ConceptualMetadata",
+    "ConceptualProperty",
+    "InformationValidation",
+    "UnverifiedConceptualClass",
+    "UnverifiedConceptualDataModel",
+    "UnverifiedConceptualMetadata",
+    "UnverifiedConceptualProperty",
+]

cognite/neat/core/{_rules/models/information/_rules_input.py → _data_model/models/conceptual/_unverified.py}

@@ -7,9 +7,12 @@ from cognite.client import data_modeling as dm
 from rdflib import Namespace, URIRef
 
 from cognite.neat.core._constants import DEFAULT_NAMESPACE
-from cognite.neat.core._rules.models._base_input import InputComponent, InputRules
-from cognite.neat.core._rules.models.data_types import DataType
-from cognite.neat.core._rules.models.entities import (
+from cognite.neat.core._data_model.models._base_unverified import (
+    UnverifiedComponent,
+    UnverifiedDataModel,
+)
+from cognite.neat.core._data_model.models.data_types import DataType
+from cognite.neat.core._data_model.models.entities import (
     ClassEntity,
     MultiValueTypeInfo,
     UnknownEntity,
@@ -17,16 +20,16 @@ from cognite.neat.core._rules.models.entities import (
 )
 from cognite.neat.core._utils.rdf_ import uri_display_name
 
-from ._rules import (
-    InformationClass,
-    InformationMetadata,
-    InformationProperty,
-    InformationRules,
+from ._verified import (
+    ConceptualClass,
+    ConceptualDataModel,
+    ConceptualMetadata,
+    ConceptualProperty,
 )
 
 
 @dataclass
-class InformationInputMetadata(InputComponent[InformationMetadata]):
+class UnverifiedConceptualMetadata(UnverifiedComponent[ConceptualMetadata]):
     space: str
     external_id: str
     version: str
@@ -36,12 +39,11 @@ class InformationInputMetadata(InputComponent[InformationMetadata]):
     created: datetime | str | None = None
     updated: datetime | str | None = None
     physical: str | URIRef | None = None
-    conceptual: str | URIRef | None = None
     source_id: str | URIRef | None = None
 
     @classmethod
-    def _get_verified_cls(cls) -> type[InformationMetadata]:
-        return InformationMetadata
+    def _get_verified_cls(cls) -> type[ConceptualMetadata]:
+        return ConceptualMetadata
 
     def dump(self, **kwargs: Any) -> dict[str, Any]:
         output = super().dump()
@@ -75,7 +77,7 @@ class InformationInputMetadata(InputComponent[InformationMetadata]):
 
 
 @dataclass
-class InformationInputProperty(InputComponent[InformationProperty]):
+class UnverifiedConceptualProperty(UnverifiedComponent[ConceptualProperty]):
     class_: ClassEntity | str
     property_: str
     value_type: DataType | ClassEntity | MultiValueTypeInfo | UnknownEntity | str
@@ -91,11 +93,10 @@ class InformationInputProperty(InputComponent[InformationProperty]):
 
     # linking
     physical: str | URIRef | None = None
-    conceptual: str | URIRef | None = None
 
     @classmethod
-    def _get_verified_cls(cls) -> type[InformationProperty]:
-        return InformationProperty
+    def _get_verified_cls(cls) -> type[ConceptualProperty]:
+        return ConceptualProperty
 
     def dump(self, default_prefix: str, **kwargs) -> dict[str, Any]:  # type: ignore
         output = super().dump()
@@ -103,12 +104,15 @@ class InformationInputProperty(InputComponent[InformationProperty]):
         output["Value Type"] = load_value_type(self.value_type, default_prefix)
         return output
 
-    def copy(self, update: dict[str, Any], default_prefix: str) -> "InformationInputProperty":
-        return cast(InformationInputProperty, type(self)._load({**self.dump(default_prefix), **update}))
+    def copy(self, update: dict[str, Any], default_prefix: str) -> "UnverifiedConceptualProperty":
+        return cast(
+            UnverifiedConceptualProperty,
+            type(self)._load({**self.dump(default_prefix), **update}),
+        )
 
 
 @dataclass
-class InformationInputClass(InputComponent[InformationClass]):
+class UnverifiedConceptualClass(UnverifiedComponent[ConceptualClass]):
     class_: ClassEntity | str
     name: str | None = None
     description: str | None = None
@@ -117,11 +121,10 @@ class InformationInputClass(InputComponent[InformationClass]):
     neatId: str | URIRef | None = None
     # linking
     physical: str | URIRef | None = None
-    conceptual: str | URIRef | None = None
 
     @classmethod
-    def _get_verified_cls(cls) -> type[InformationClass]:
-        return InformationClass
+    def _get_verified_cls(cls) -> type[ConceptualClass]:
+        return ConceptualClass
 
     @property
     def class_str(self) -> str:
@@ -141,15 +144,15 @@ class InformationInputClass(InputComponent[InformationClass]):
 
 
 @dataclass
-class InformationInputRules(InputRules[InformationRules]):
-    metadata: InformationInputMetadata
-    properties: list[InformationInputProperty] = field(default_factory=list)
-    classes: list[InformationInputClass] = field(default_factory=list)
+class UnverifiedConceptualDataModel(UnverifiedDataModel[ConceptualDataModel]):
+    metadata: UnverifiedConceptualMetadata
+    properties: list[UnverifiedConceptualProperty] = field(default_factory=list)
+    classes: list[UnverifiedConceptualClass] = field(default_factory=list)
     prefixes: dict[str, Namespace] | None = None
 
     @classmethod
-    def _get_verified_cls(cls) -> type[InformationRules]:
-        return InformationRules
+    def _get_verified_cls(cls) -> type[ConceptualDataModel]:
+        return ConceptualDataModel
 
     def dump(self) -> dict[str, Any]:
         default_prefix = self.metadata.prefix

cognite/neat/core/{_rules/models/information → _data_model/models/conceptual}/_validation.py

@@ -1,6 +1,9 @@
 import itertools
 from collections import Counter, defaultdict
 
+from cognite.neat.core._data_model._constants import PATTERNS, EntityTypes
+from cognite.neat.core._data_model.models.entities import ClassEntity, UnknownEntity
+from cognite.neat.core._data_model.models.entities._multi_value import MultiValueTypeInfo
 from cognite.neat.core._issues import IssueList
 from cognite.neat.core._issues.errors import NeatValueError
 from cognite.neat.core._issues.errors._resources import (
@@ -12,20 +15,21 @@ from cognite.neat.core._issues.warnings._resources import (
     ResourceNotDefinedWarning,
     ResourceRegexViolationWarning,
 )
-from cognite.neat.core._rules._constants import PATTERNS, EntityTypes
-from cognite.neat.core._rules.models.entities import ClassEntity, UnknownEntity
-from cognite.neat.core._rules.models.entities._multi_value import MultiValueTypeInfo
 from cognite.neat.core._utils.spreadsheet import SpreadsheetRead
 from cognite.neat.core._utils.text import humanize_collection
 
-from ._rules import InformationRules
+from ._verified import ConceptualDataModel
 
 
 class InformationValidation:
     """This class does all the validation of the Information rules that have dependencies
     between components."""
 
-    def __init__(self, rules: InformationRules, read_info_by_spreadsheet: dict[str, SpreadsheetRead] | None = None):
+    def __init__(
+        self,
+        rules: ConceptualDataModel,
+        read_info_by_spreadsheet: dict[str, SpreadsheetRead] | None = None,
+    ):
         self.rules = rules
         self._read_info_by_spreadsheet = read_info_by_spreadsheet or {}
         self._metadata = rules.metadata

cognite/neat/core/{_rules/models/information/_rules.py → _data_model/models/conceptual/_verified.py}

@@ -8,52 +8,51 @@ from pydantic_core.core_schema import SerializationInfo
 from rdflib import Namespace, URIRef
 
 from cognite.neat.core._constants import get_default_prefixes_and_namespaces
-from cognite.neat.core._issues.errors import PropertyDefinitionError
-from cognite.neat.core._rules._constants import EntityTypes
-from cognite.neat.core._rules.models._base_rules import (
-    BaseMetadata,
-    BaseRules,
-    DataModelAspect,
+from cognite.neat.core._data_model._constants import EntityTypes
+from cognite.neat.core._data_model.models._base_verified import (
+    BaseVerifiedDataModel,
+    BaseVerifiedMetadata,
+    DataModelLevel,
     RoleTypes,
     SheetList,
     SheetRow,
 )
-from cognite.neat.core._rules.models._types import (
+from cognite.neat.core._data_model.models._types import (
     ClassEntityType,
-    InformationPropertyType,
+    ConceptualPropertyType,
     MultiValueTypeType,
     URIRefType,
 )
 
 # NeatIdType,
-from cognite.neat.core._rules.models.data_types import DataType
-from cognite.neat.core._rules.models.entities import (
+from cognite.neat.core._data_model.models.data_types import DataType
+from cognite.neat.core._data_model.models.entities import (
     ClassEntity,
     ClassEntityList,
     Entity,
     UnknownEntity,
 )
+from cognite.neat.core._issues.errors import PropertyDefinitionError
 
 if TYPE_CHECKING:
-    from cognite.neat.core._rules.models import DMSRules
+    from cognite.neat.core._data_model.models import DMSRules
 
 
-class InformationMetadata(BaseMetadata):
+class ConceptualMetadata(BaseVerifiedMetadata):
     role: ClassVar[RoleTypes] = RoleTypes.information
-    aspect: ClassVar[DataModelAspect] = DataModelAspect.logical
+    level: ClassVar[DataModelLevel] = DataModelLevel.conceptual
 
     # Linking to Conceptual and Physical data model aspects
     physical: URIRef | str | None = Field(None, description="Link to the physical data model aspect")
-    conceptual: URIRef | str | None = Field(None, description="Link to the conceptual data model aspect")
 
 
-def _get_metadata(context: Any) -> InformationMetadata | None:
-    if isinstance(context, dict) and isinstance(context.get("metadata"), InformationMetadata):
+def _get_metadata(context: Any) -> ConceptualMetadata | None:
+    if isinstance(context, dict) and isinstance(context.get("metadata"), ConceptualMetadata):
         return context["metadata"]
     return None
 
 
-class InformationClass(SheetRow):
+class ConceptualClass(SheetRow):
     """
     Class is a category of things that share a common set of attributes and relationships.
 
@@ -82,7 +81,6 @@ class InformationClass(SheetRow):
         None,
         description="Link to the class representation in the physical data model aspect",
     )
-    conceptual: URIRefType | None = Field(None, description="Link to the conceptual data model aspect")
 
     def _identifier(self) -> tuple[Hashable, ...]:
         return (self.class_,)
@@ -107,7 +105,7 @@ class InformationClass(SheetRow):
         return ",".join(str(value) for value in value)
 
 
-class InformationProperty(SheetRow):
+class ConceptualProperty(SheetRow):
     """
     A property is a characteristic of a class. It is a named attribute of a class that describes a range of values
     or a relationship to another class.
@@ -127,8 +125,9 @@ class InformationProperty(SheetRow):
     class_: ClassEntityType = Field(
         alias="Class", description="Class id that the property is defined for, strongly advise `PascalCase` usage."
     )
-    property_: InformationPropertyType = Field(
-        alias="Property", description="Property id, strongly advised to `camelCase` usage."
+    property_: ConceptualPropertyType = Field(
+        alias="Property",
+        description="Property id, strongly advised to `camelCase` usage.",
     )
     name: str | None = Field(alias="Name", default=None, description="Human readable name of the property.")
     description: str | None = Field(alias="Description", default=None, description="Short description of the property.")
@@ -168,7 +167,6 @@ class InformationProperty(SheetRow):
         None,
         description="Link to the class representation in the physical data model aspect",
     )
-    conceptual: URIRefType | None = Field(None, description="Link to the conceptual data model aspect")
 
     def _identifier(self) -> tuple[Hashable, ...]:
         return self.class_, self.property_
@@ -239,14 +237,14 @@ class InformationProperty(SheetRow):
             return EntityTypes.undefined
 
 
-class InformationRules(BaseRules):
-    metadata: InformationMetadata = Field(alias="Metadata", description="Metadata for the logical data model")
-    properties: SheetList[InformationProperty] = Field(alias="Properties", description="List of properties")
-    classes: SheetList[InformationClass] = Field(alias="Classes", description="List of classes")
+class ConceptualDataModel(BaseVerifiedDataModel):
+    metadata: ConceptualMetadata = Field(alias="Metadata", description="Metadata for the conceptual data model")
+    properties: SheetList[ConceptualProperty] = Field(alias="Properties", description="List of properties")
+    classes: SheetList[ConceptualClass] = Field(alias="Classes", description="List of classes")
     prefixes: dict[str, Namespace] = Field(
         alias="Prefixes",
         default_factory=get_default_prefixes_and_namespaces,
-        description="the definition of the prefixes that are used in the semantic data model",
+        description="the definition of the prefixes that are used in the conceptual data model",
     )
 
     @field_validator("prefixes", mode="before")
@@ -258,7 +256,7 @@ class InformationRules(BaseRules):
         return values
 
     @model_validator(mode="after")
-    def set_neat_id(self) -> "InformationRules":
+    def set_neat_id(self) -> "ConceptualDataModel":
         namespace = self.metadata.namespace
 
         for class_ in self.classes:
@@ -280,7 +278,7 @@ class InformationRules(BaseRules):
         for property_ in self.properties:
             property_.neatId = namespace[f"{property_.class_.suffix}/{property_.property_}"]
 
-    def sync_with_dms_rules(self, dms_rules: "DMSRules") -> None:
+    def sync_with_physical_data_model(self, dms_rules: "DMSRules") -> None:
         # Sync at the metadata level
         if dms_rules.metadata.logical == self.metadata.identifier:
             self.metadata.physical = dms_rules.metadata.identifier
@@ -288,20 +286,20 @@ class InformationRules(BaseRules):
             # if models are not linked to start with, we skip
             return None
 
-        info_properties_by_neat_id = {prop.neatId: prop for prop in self.properties}
-        dms_properties_by_neat_id = {prop.neatId: prop for prop in dms_rules.properties}
-        for neat_id, prop in dms_properties_by_neat_id.items():
-            if prop.logical in info_properties_by_neat_id:
-                info_properties_by_neat_id[prop.logical].physical = neat_id
+        conceptual_properties_by_neat_id = {prop.neatId: prop for prop in self.properties}
+        physical_properties_by_neat_id = {prop.neatId: prop for prop in dms_rules.properties}
+        for neat_id, prop in physical_properties_by_neat_id.items():
+            if prop.logical in conceptual_properties_by_neat_id:
+                conceptual_properties_by_neat_id[prop.logical].physical = neat_id
 
-        info_classes_by_neat_id = {cls.neatId: cls for cls in self.classes}
-        dms_views_by_neat_id = {view.neatId: view for view in dms_rules.views}
-        for neat_id, view in dms_views_by_neat_id.items():
-            if view.logical in info_classes_by_neat_id:
-                info_classes_by_neat_id[view.logical].physical = neat_id
+        classes_by_neat_id = {cls.neatId: cls for cls in self.classes}
+        views_by_neat_id = {view.neatId: view for view in dms_rules.views}
+        for neat_id, view in views_by_neat_id.items():
+            if view.logical in classes_by_neat_id:
+                classes_by_neat_id[view.logical].physical = neat_id
 
     def as_dms_rules(self) -> "DMSRules":
-        from cognite.neat.core._rules.transformers._converters import (
+        from cognite.neat.core._data_model.transformers._converters import (
             _InformationRulesConverter,
         )
 
@@ -309,11 +307,11 @@ class InformationRules(BaseRules):
 
     @classmethod
     def display_type_name(cls) -> str:
-        return "VerifiedInformationModel"
+        return "VerifiedConceptualDataModel"
 
     def _repr_html_(self) -> str:
         summary = {
-            "type": "Logical Data Model",
+            "type": "Conceptual Data Model",
             "intended for": "Information Architect",
             "name": self.metadata.name,
             "external_id": self.metadata.external_id,

cognite/neat/core/{_rules → _data_model}/models/data_types.py

@@ -11,11 +11,11 @@ from pydantic.functional_validators import ModelWrapValidatorHandler
 from rdflib import URIRef
 
 from cognite.neat.core._constants import XML_SCHEMA_NAMESPACE
-from cognite.neat.core._rules._constants import (
+from cognite.neat.core._data_model._constants import (
     SPLIT_ON_COMMA_PATTERN,
     SPLIT_ON_EQUAL_PATTERN,
 )
-from cognite.neat.core._rules.models.entities._single_value import (
+from cognite.neat.core._data_model.models.entities._single_value import (
     ClassEntity,
     UnitEntity,
 )

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

@@ -25,6 +25,20 @@ from cognite.neat.core._constants import (
     DMS_DIRECT_RELATION_LIST_DEFAULT_LIMIT,
     DMS_PRIMITIVE_LIST_DEFAULT_LIMIT,
 )
+from cognite.neat.core._data_model.models.data_types import DataType, Double, Enum, Float
+from cognite.neat.core._data_model.models.entities import (
+    ClassEntity,
+    ContainerEntity,
+    DMSFilter,
+    DMSNodeEntity,
+    DMSUnknownEntity,
+    EdgeEntity,
+    HasDataFilter,
+    NodeTypeFilter,
+    ReverseConnectionEntity,
+    UnitEntity,
+    ViewEntity,
+)
 from cognite.neat.core._issues.errors import (
     NeatTypeError,
     NeatValueError,
@@ -38,20 +52,6 @@ from cognite.neat.core._issues.warnings.user_modeling import (
     EmptyContainerWarning,
     HasDataFilterOnNoPropertiesViewWarning,
 )
-from cognite.neat.core._rules.models.data_types import DataType, Double, Enum, Float
-from cognite.neat.core._rules.models.entities import (
-    ClassEntity,
-    ContainerEntity,
-    DMSFilter,
-    DMSNodeEntity,
-    DMSUnknownEntity,
-    EdgeEntity,
-    HasDataFilter,
-    NodeTypeFilter,
-    ReverseConnectionEntity,
-    UnitEntity,
-    ViewEntity,
-)
 
 from ._rules import DMSEnum, DMSMetadata, DMSProperty, DMSRules, DMSView
 

cognite/neat/core/{_rules → _data_model}/models/dms/_rules.py

@@ -10,20 +10,18 @@ from pydantic_core.core_schema import SerializationInfo, ValidationInfo
 
 from cognite.neat.core._client.data_classes.schema import DMSSchema
 from cognite.neat.core._constants import DMS_CONTAINER_LIST_MAX_LIMIT
-from cognite.neat.core._issues.errors import NeatValueError
-from cognite.neat.core._issues.warnings._general import NeatValueWarning
-from cognite.neat.core._rules.models._base_rules import (
-    BaseMetadata,
-    BaseRules,
+from cognite.neat.core._data_model.models._base_verified import (
+    BaseVerifiedDataModel,
+    BaseVerifiedMetadata,
     ContainerProperty,
-    DataModelAspect,
+    DataModelLevel,
     RoleTypes,
     SheetList,
     SheetRow,
     ViewProperty,
     ViewRef,
 )
-from cognite.neat.core._rules.models._types import (
+from cognite.neat.core._data_model.models._types import (
     ClassEntityType,
     ContainerEntityType,
     DmsPropertyType,
@@ -31,8 +29,8 @@ from cognite.neat.core._rules.models._types import (
     URIRefType,
     ViewEntityType,
 )
-from cognite.neat.core._rules.models.data_types import DataType
-from cognite.neat.core._rules.models.entities import (
+from cognite.neat.core._data_model.models.data_types import DataType
+from cognite.neat.core._data_model.models.entities import (
     ContainerEntityList,
     DMSEntity,
     DMSNodeEntity,
@@ -46,16 +44,18 @@ from cognite.neat.core._rules.models.entities import (
     ViewEntity,
     ViewEntityList,
 )
+from cognite.neat.core._issues.errors import NeatValueError
+from cognite.neat.core._issues.warnings._general import NeatValueWarning
 
 if TYPE_CHECKING:
-    from cognite.neat.core._rules.models import InformationRules
+    from cognite.neat.core._data_model.models import ConceptualDataModel
 
 _DEFAULT_VERSION = "1"
 
 
-class DMSMetadata(BaseMetadata):
+class DMSMetadata(BaseVerifiedMetadata):
     role: ClassVar[RoleTypes] = RoleTypes.dms
-    aspect: ClassVar[DataModelAspect] = DataModelAspect.physical
+    level: ClassVar[DataModelLevel] = DataModelLevel.physical
     logical: URIRefType | None = None
 
     def as_space(self) -> dm.SpaceApply:
@@ -453,7 +453,7 @@ class DMSEnum(SheetRow):
         return str(value)
 
 
-class DMSRules(BaseRules):
+class DMSRules(BaseVerifiedDataModel):
     metadata: DMSMetadata = Field(alias="Metadata", description="Contains information about the data model.")
     properties: SheetList[DMSProperty] = Field(
         alias="Properties", description="Contains the properties of the data model."
@@ -494,7 +494,7 @@ class DMSRules(BaseRules):
         for property_ in self.properties:
             property_.neatId = namespace[f"{property_.view.suffix}/{property_.view_property}"]
 
-    def sync_with_info_rules(self, info_rules: "InformationRules") -> None:
+    def sync_with_info_rules(self, info_rules: "ConceptualDataModel") -> None:
         # Sync at the metadata level
         if info_rules.metadata.physical == self.metadata.identifier:
             self.metadata.logical = info_rules.metadata.identifier
@@ -525,7 +525,7 @@ class DMSRules(BaseRules):
 
     def _repr_html_(self) -> str:
         summary = {
-            "aspect": self.metadata.aspect,
+            "aspect": self.metadata.level,
             "intended for": "DMS Architect",
             "name": self.metadata.name,
             "space": self.metadata.space,

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

@@ -14,10 +14,12 @@ from cognite.neat.core._constants import (
     DEFAULT_NAMESPACE,
     DMS_DIRECT_RELATION_LIST_DEFAULT_LIMIT,
 )
-from cognite.neat.core._issues.warnings import DeprecatedWarning
-from cognite.neat.core._rules.models._base_input import InputComponent, InputRules
-from cognite.neat.core._rules.models.data_types import DataType
-from cognite.neat.core._rules.models.entities import (
+from cognite.neat.core._data_model.models._base_unverified import (
+    UnverifiedComponent,
+    UnverifiedDataModel,
+)
+from cognite.neat.core._data_model.models.data_types import DataType
+from cognite.neat.core._data_model.models.entities import (
     ContainerEntity,
     DMSNodeEntity,
     DMSUnknownEntity,
@@ -27,7 +29,8 @@ from cognite.neat.core._rules.models.entities import (
     load_connection,
     load_dms_value_type,
 )
-from cognite.neat.core._rules.models.entities._wrapped import DMSFilter
+from cognite.neat.core._data_model.models.entities._wrapped import DMSFilter
+from cognite.neat.core._issues.warnings import DeprecatedWarning
 from cognite.neat.core._utils.rdf_ import uri_display_name
 
 from ._rules import _DEFAULT_VERSION, DMSContainer, DMSEnum, DMSMetadata, DMSNode, DMSProperty, DMSRules, DMSView
@@ -39,7 +42,7 @@ else:
 
 
 @dataclass
-class DMSInputMetadata(InputComponent[DMSMetadata]):
+class DMSInputMetadata(UnverifiedComponent[DMSMetadata]):
     space: str
     external_id: str
     creator: str
@@ -110,7 +113,7 @@ class DMSInputMetadata(InputComponent[DMSMetadata]):
 
 
 @dataclass
-class DMSInputProperty(InputComponent[DMSProperty]):
+class DMSInputProperty(UnverifiedComponent[DMSProperty]):
     view: str
     view_property: str | None
     value_type: str | DataType | ViewEntity | DMSUnknownEntity
@@ -203,7 +206,7 @@ class DMSInputProperty(InputComponent[DMSProperty]):
 
 
 @dataclass
-class DMSInputContainer(InputComponent[DMSContainer]):
+class DMSInputContainer(UnverifiedComponent[DMSContainer]):
     container: str
     name: str | None = None
     description: str | None = None
@@ -246,7 +249,7 @@ class DMSInputContainer(InputComponent[DMSContainer]):
 
 
 @dataclass
-class DMSInputView(InputComponent[DMSView]):
+class DMSInputView(UnverifiedComponent[DMSView]):
     view: str
     name: str | None = None
     description: str | None = None
@@ -304,7 +307,7 @@ class DMSInputView(InputComponent[DMSView]):
 
 
 @dataclass
-class DMSInputNode(InputComponent[DMSNode]):
+class DMSInputNode(UnverifiedComponent[DMSNode]):
     node: str
     usage: Literal["type", "collocation"]
     name: str | None = None
@@ -326,7 +329,7 @@ class DMSInputNode(InputComponent[DMSNode]):
 
 
 @dataclass
-class DMSInputEnum(InputComponent[DMSEnum]):
+class DMSInputEnum(UnverifiedComponent[DMSEnum]):
     collection: str
     value: str
     name: str | None = None
@@ -339,7 +342,7 @@ class DMSInputEnum(InputComponent[DMSEnum]):
 
 
 @dataclass
-class DMSInputRules(InputRules[DMSRules]):
+class DMSInputRules(UnverifiedDataModel[DMSRules]):
     metadata: DMSInputMetadata
     properties: list[DMSInputProperty]
     views: list[DMSInputView]