cognite-neat 0.73.4__py3-none-any.whl → 0.75.1__py3-none-any.whl

cognite/neat/rules/exporters/_base.py

@@ -6,7 +6,7 @@ from typing import Generic, TypeVar
 from cognite.client import CogniteClient
 
 from cognite.neat.rules._shared import Rules
-from cognite.neat.rules.models._rules import DMSRules, InformationRules, RoleTypes
+from cognite.neat.rules.models.rules import DMSRules, InformationRules, RoleTypes
 
 from ._models import UploadResult
 

cognite/neat/rules/exporters/_rules2dms.py

@@ -8,10 +8,10 @@ from cognite.client.data_classes._base import CogniteResourceList
 from cognite.client.exceptions import CogniteAPIError
 
 from cognite.neat.rules._shared import Rules
-from cognite.neat.rules.models._rules import InformationRules
-from cognite.neat.rules.models._rules.base import ExtensionCategory, SheetList
-from cognite.neat.rules.models._rules.dms_architect_rules import DMSContainer, DMSRules
-from cognite.neat.rules.models._rules.dms_schema import DMSSchema, PipelineSchema
+from cognite.neat.rules.models.rules import InformationRules
+from cognite.neat.rules.models.rules._base import ExtensionCategory, SheetList
+from cognite.neat.rules.models.rules._dms_architect_rules import DMSContainer, DMSRules
+from cognite.neat.rules.models.rules._dms_schema import DMSSchema, PipelineSchema
 from cognite.neat.utils.cdf_loaders import (
     ContainerLoader,
     DataModelingLoader,

cognite/neat/rules/exporters/_rules2excel.py

@@ -12,8 +12,8 @@ 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 import DMSRules, DomainRules, InformationRules
-from cognite.neat.rules.models._rules.base import RoleTypes, SchemaCompleteness, 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
 

cognite/neat/rules/exporters/_rules2ontology.py

@@ -10,15 +10,15 @@ from rdflib.collection import Collection as GraphCollection
 
 from cognite.neat.constants import DEFAULT_NAMESPACE as NEAT_NAMESPACE
 from cognite.neat.rules import exceptions
-from cognite.neat.rules._analysis._information_rules import InformationArchitectRulesAnalysis
-from cognite.neat.rules.models._rules import DMSRules
-from cognite.neat.rules.models._rules._types import XSD_VALUE_TYPE_MAPPINGS, EntityTypes
-from cognite.neat.rules.models._rules.information_rules import (
+from cognite.neat.rules.analysis import InformationArchitectRulesAnalysis
+from cognite.neat.rules.models.rules import DMSRules
+from cognite.neat.rules.models.rules._information_rules import (
     InformationClass,
     InformationMetadata,
     InformationProperty,
     InformationRules,
 )
+from cognite.neat.rules.models.rules._types import XSD_VALUE_TYPE_MAPPINGS, EntityTypes
 from cognite.neat.utils.utils import generate_exception_report, remove_namespace
 
 from ._base import BaseExporter

cognite/neat/rules/exporters/_rules2yaml.py

@@ -6,7 +6,7 @@ from typing import Literal, get_args
 import yaml
 
 from cognite.neat.rules._shared import Rules
-from cognite.neat.rules.models._rules.base import RoleTypes
+from cognite.neat.rules.models.rules._base import RoleTypes
 
 from ._base import BaseExporter
 

cognite/neat/rules/exporters/_validation.py

@@ -4,8 +4,8 @@ from typing import Literal, overload
 
 from cognite.neat.exceptions import wrangle_warnings
 from cognite.neat.rules import exceptions
-from cognite.neat.rules.models._rules import InformationRules
-from cognite.neat.rules.models._rules._types._base import DMS_PROPERTY_ID_COMPLIANCE_REGEX, VIEW_ID_COMPLIANCE_REGEX
+from cognite.neat.rules.models.rules import InformationRules
+from cognite.neat.rules.models.rules._types._base import DMS_PROPERTY_ID_COMPLIANCE_REGEX, VIEW_ID_COMPLIANCE_REGEX
 
 
 @overload

cognite/neat/rules/importers/_base.py

@@ -11,7 +11,7 @@ from rdflib import Namespace
 
 from cognite.neat.rules._shared import Rules
 from cognite.neat.rules.issues.base import IssueList, NeatValidationError, ValidationWarning
-from cognite.neat.rules.models._rules import DMSRules, InformationRules, RoleTypes
+from cognite.neat.rules.models.rules import DMSRules, InformationRules, RoleTypes
 
 
 class BaseImporter(ABC):

cognite/neat/rules/importers/_dms2rules.py

@@ -10,8 +10,16 @@ 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 (
+from cognite.neat.rules.models.rules import DMSRules, DMSSchema, RoleTypes
+from cognite.neat.rules.models.rules._base import ExtensionCategory, SchemaCompleteness
+from cognite.neat.rules.models.rules._dms_architect_rules import (
+    DMSContainer,
+    DMSMetadata,
+    DMSProperty,
+    DMSView,
+    SheetList,
+)
+from cognite.neat.rules.models.rules._types import (
     ClassEntity,
     ContainerEntity,
     DMSValueType,
@@ -20,14 +28,6 @@ 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,
-    DMSProperty,
-    DMSView,
-    SheetList,
-)
 
 
 class DMSImporter(BaseImporter):

cognite/neat/rules/importers/_dtdl2rules/dtdl_converter.py

@@ -20,13 +20,13 @@ from cognite.neat.rules.importers._dtdl2rules.spec import (
     TelemetryV2,
 )
 from cognite.neat.rules.issues import IssueList, ValidationIssue
-from cognite.neat.rules.models._rules._types import (
+from cognite.neat.rules.models.rules._information_rules import InformationClass, InformationProperty
+from cognite.neat.rules.models.rules._types import (
     XSD_VALUE_TYPE_MAPPINGS,
     ClassEntity,
     ParentClassEntity,
     XSDValueType,
 )
-from cognite.neat.rules.models._rules.information_rules import InformationClass, InformationProperty
 
 
 class _DTDLConverter:

cognite/neat/rules/importers/_dtdl2rules/dtdl_importer.py

@@ -12,9 +12,9 @@ from cognite.neat.rules.importers._base import BaseImporter, _handle_issues
 from cognite.neat.rules.importers._dtdl2rules.dtdl_converter import _DTDLConverter
 from cognite.neat.rules.importers._dtdl2rules.spec import DTDL_CLS_BY_TYPE_BY_SPEC, DTDLBase, Interface
 from cognite.neat.rules.issues import IssueList, ValidationIssue
-from cognite.neat.rules.models._rules import InformationRules, RoleTypes
-from cognite.neat.rules.models._rules.base import SchemaCompleteness, SheetList
-from cognite.neat.rules.models._rules.information_rules import InformationClass, InformationProperty
+from cognite.neat.rules.models.rules import InformationRules, RoleTypes
+from cognite.neat.rules.models.rules._base import SchemaCompleteness, SheetList
+from cognite.neat.rules.models.rules._information_rules import InformationClass, InformationProperty
 from cognite.neat.utils.text import to_pascal
 
 

cognite/neat/rules/importers/_dtdl2rules/spec.py

@@ -14,7 +14,7 @@ from typing import TYPE_CHECKING, Any, ClassVar, Literal, TypeAlias
 
 from pydantic import BaseModel, Field, field_validator, model_serializer, model_validator
 
-from cognite.neat.rules.models._rules._types import ClassEntity
+from cognite.neat.rules.models.rules._types import ClassEntity
 
 if TYPE_CHECKING:
     from pydantic.type_adapter import IncEx

cognite/neat/rules/importers/_owl2rules/_owl2classes.py

@@ -4,7 +4,7 @@ import numpy as np
 import pandas as pd
 from rdflib import OWL, Graph
 
-from cognite.neat.rules.models._rules.base import MatchType
+from cognite.neat.rules.models.rules._base import MatchType
 from cognite.neat.utils.utils import remove_namespace
 
 

cognite/neat/rules/importers/_owl2rules/_owl2metadata.py

@@ -4,10 +4,10 @@ import re
 from rdflib import Graph, Namespace
 
 from cognite.neat.constants import DEFAULT_NAMESPACE
-from cognite.neat.rules.models._rules.base import RoleTypes, SchemaCompleteness
-from cognite.neat.rules.models.rules import (
-    prefix_compliance_regex,
-    version_compliance_regex,
+from cognite.neat.rules.models.rules._base import RoleTypes, SchemaCompleteness
+from cognite.neat.rules.models.rules._types._base import (
+    PREFIX_COMPLIANCE_REGEX,
+    VERSION_COMPLIANCE_REGEX,
 )
 from cognite.neat.utils.utils import convert_rdflib_content, remove_none_elements_from_set
 
@@ -148,7 +148,7 @@ def fix_description(metadata: dict, default: str = "This model has been inferred
 
 def fix_prefix(metadata: dict, default: str = "neat") -> dict:
     if prefix := metadata.get("prefix", None):
-        if not isinstance(prefix, str) or not re.match(prefix_compliance_regex, prefix):
+        if not isinstance(prefix, str) or not re.match(PREFIX_COMPLIANCE_REGEX, prefix):
             metadata["prefix"] = default
     else:
         metadata["prefix"] = default
@@ -193,7 +193,7 @@ def fix_date(
 
 def fix_version(metadata: dict, default: str = "1.0.0") -> dict:
     if version := metadata.get("version", None):
-        if not re.match(version_compliance_regex, version):
+        if not re.match(VERSION_COMPLIANCE_REGEX, version):
             metadata["version"] = default
     else:
         metadata["version"] = default

cognite/neat/rules/importers/_owl2rules/_owl2properties.py

@@ -4,7 +4,7 @@ import numpy as np
 import pandas as pd
 from rdflib import Graph
 
-from cognite.neat.rules.models._rules.base import MatchType
+from cognite.neat.rules.models.rules._base import MatchType
 from cognite.neat.utils.utils import remove_namespace
 
 from ._owl2classes import _data_type_property_class, _object_property_class, _thing_class

cognite/neat/rules/importers/_owl2rules/_owl2rules.py

@@ -10,8 +10,8 @@ from rdflib import DC, DCTERMS, OWL, RDF, RDFS, SKOS, Graph
 
 from cognite.neat.rules.importers._base import BaseImporter, Rules
 from cognite.neat.rules.issues import IssueList
-from cognite.neat.rules.models._rules import InformationRules, RoleTypes
-from cognite.neat.rules.models._rules._types import XSD_VALUE_TYPE_MAPPINGS
+from cognite.neat.rules.models.rules import InformationRules, RoleTypes
+from cognite.neat.rules.models.rules._types import XSD_VALUE_TYPE_MAPPINGS
 
 from ._owl2classes import parse_owl_classes
 from ._owl2metadata import parse_owl_metadata

cognite/neat/rules/importers/_spreadsheet2rules.py

@@ -13,8 +13,8 @@ from pandas import ExcelFile
 
 from cognite.neat.rules import issues
 from cognite.neat.rules.issues import IssueList
-from cognite.neat.rules.models._rules import RULES_PER_ROLE, DMSRules, DomainRules, InformationRules
-from cognite.neat.rules.models._rules.base import RoleTypes, SchemaCompleteness
+from cognite.neat.rules.models.rules import RULES_PER_ROLE, DMSRules, DomainRules, InformationRules
+from cognite.neat.rules.models.rules._base import RoleTypes, SchemaCompleteness
 from cognite.neat.utils.auxiliary import local_import
 from cognite.neat.utils.spreadsheet import SpreadsheetRead, read_individual_sheet
 

cognite/neat/rules/importers/_yaml2rules.py

@@ -5,7 +5,7 @@ import yaml
 
 from cognite.neat.rules import issues
 from cognite.neat.rules.issues import IssueList, NeatValidationError, ValidationIssue
-from cognite.neat.rules.models._rules import RULES_PER_ROLE, RoleTypes
+from cognite.neat.rules.models.rules import RULES_PER_ROLE, RoleTypes
 
 from ._base import BaseImporter, Rules, _handle_issues
 

cognite/neat/rules/models/_entity.py

@@ -0,0 +1,142 @@
+import re
+import sys
+from functools import total_ordering
+from typing import ClassVar
+
+from pydantic import BaseModel
+
+if sys.version_info >= (3, 11):
+    from enum import StrEnum
+    from typing import Self
+else:
+    from backports.strenum import StrEnum
+    from typing_extensions import Self
+
+
+class EntityTypes(StrEnum):
+    subject = "subject"
+    predicate = "predicate"
+    object = "object"
+    class_ = "class"
+    parent_class = "parent_class"
+    property_ = "property"
+    object_property = "ObjectProperty"
+    data_property = "DatatypeProperty"
+    annotation_property = "AnnotationProperty"
+    object_value_type = "object_value_type"
+    data_value_type = "data_value_type"  # these are strings, floats, ...
+    xsd_value_type = "xsd_value_type"
+    dms_value_type = "dms_value_type"
+    view = "view"
+    view_prop = "view_prop"
+    reference_entity = "reference_entity"
+    container = "container"
+    datamodel = "datamodel"
+    undefined = "undefined"
+
+
+# ALLOWED
+ALLOWED_PATTERN = r"[^a-zA-Z0-9-_.]"
+
+# FOR PARSING STRINGS:
+PREFIX_REGEX = r"[a-zA-Z]+[a-zA-Z0-9-_.]*[a-zA-Z0-9]+"
+SUFFIX_REGEX = r"[a-zA-Z0-9-_.]+[a-zA-Z0-9]|[-_.]*[a-zA-Z0-9]+"
+VERSION_REGEX = r"[a-zA-Z0-9]([.a-zA-Z0-9_-]{0,41}[a-zA-Z0-9])?"
+PROPERTY_REGEX = r"[a-zA-Z0-9][a-zA-Z0-9_-]*[a-zA-Z0-9]?"
+ENTITY_ID_REGEX = rf"{PREFIX_REGEX}:({SUFFIX_REGEX})"
+ENTITY_ID_REGEX_COMPILED = re.compile(rf"^(?P<prefix>{PREFIX_REGEX}):(?P<suffix>{SUFFIX_REGEX})$")
+VERSIONED_ENTITY_REGEX_COMPILED = re.compile(
+    rf"^(?P<prefix>{PREFIX_REGEX}):(?P<suffix>{SUFFIX_REGEX})\(version=(?P<version>{VERSION_REGEX})\)$"
+)
+CLASS_ID_REGEX = rf"(?P<{EntityTypes.class_}>{ENTITY_ID_REGEX})"
+CLASS_ID_REGEX_COMPILED = re.compile(rf"^{CLASS_ID_REGEX}$")
+PROPERTY_ID_REGEX = rf"\((?P<{EntityTypes.property_}>{ENTITY_ID_REGEX})\)"
+
+Undefined = type(object())
+Unknown = type(object())
+
+
+# mypy does not like the sentinel value, and it is not possible to ignore only the line with it below.
+# so we ignore all errors beyond this point.
+# mypy: ignore-errors
+@total_ordering
+class Entity(BaseModel, arbitrary_types_allowed=True):
+    """Entity is a class or property in OWL/RDF sense."""
+
+    type_: ClassVar[EntityTypes] = EntityTypes.undefined
+    prefix: str | Undefined = Undefined
+    suffix: str | Unknown
+    version: str | None = None
+    name: str | None = None
+    description: str | None = None
+
+    def __lt__(self, other: object) -> bool:
+        if type(self) is not type(other) or not isinstance(other, Entity):
+            return NotImplemented
+        return self.versioned_id < other.versioned_id
+
+    def __eq__(self, other: object) -> bool:
+        if type(self) is not type(other) or not isinstance(other, Entity):
+            return NotImplemented
+        return self.versioned_id == other.versioned_id
+
+    def __hash__(self) -> int:
+        return hash(self.versioned_id)
+
+    def as_non_versioned_entity(self) -> Self:
+        return self.from_string(f"{self.prefix}:{self.suffix}")
+
+    @property
+    def id(self) -> str:
+        if self.suffix is Unknown:
+            return "#N/A"
+        elif self.prefix is Undefined:
+            return self.suffix
+        else:
+            return f"{self.prefix}:{self.suffix}"
+
+    @property
+    def versioned_id(self) -> str:
+        if self.version is None:
+            return self.id
+        else:
+            return f"{self.id}(version={self.version})"
+
+    @property
+    def space(self) -> str:
+        """Returns entity space in CDF."""
+        return self.prefix
+
+    @property
+    def external_id(self) -> str:
+        """Returns entity external id in CDF."""
+        return self.suffix
+
+    def __repr__(self):
+        return self.versioned_id
+
+    def __str__(self):
+        return self.versioned_id
+
+    @classmethod
+    def from_string(cls, entity_string: str, base_prefix: str | None = None) -> Self:
+        if entity_string == "#N/A":
+            return cls(prefix=Undefined, suffix=Unknown)
+        elif result := VERSIONED_ENTITY_REGEX_COMPILED.match(entity_string):
+            return cls(
+                prefix=result.group("prefix"),
+                suffix=result.group("suffix"),
+                version=result.group("version"),
+            )
+        elif result := ENTITY_ID_REGEX_COMPILED.match(entity_string):
+            return cls(prefix=result.group("prefix"), suffix=result.group("suffix"))
+        elif base_prefix and re.match(SUFFIX_REGEX, entity_string) and re.match(PREFIX_REGEX, base_prefix):
+            return cls(prefix=base_prefix, suffix=entity_string)
+        else:
+            raise ValueError(f"{cls.__name__} is expected to be prefix:suffix, got {entity_string}")
+
+    @classmethod
+    def from_list(cls, entity_strings: list[str], base_prefix: str | None = None) -> list[Self]:
+        return [
+            cls.from_string(entity_string=entity_string, base_prefix=base_prefix) for entity_string in entity_strings
+        ]

cognite/neat/rules/models/rdfpath.py

@@ -10,7 +10,7 @@ from pydantic import BaseModel, field_validator
 
 from cognite.neat.rules import exceptions
 
-from ._base import (
+from ._entity import (
     CLASS_ID_REGEX,
     CLASS_ID_REGEX_COMPILED,
     ENTITY_ID_REGEX,
@@ -83,8 +83,8 @@ class Step(BaseModel):
     def from_string(cls, raw: str, **kwargs) -> Self:
         if result := STEP_CLASS_AND_PROPERTY_REGEX_COMPILED.match(raw):
             return cls(
-                class_=Entity.from_string(result.group(EntityTypes.class_), type_="class"),
-                property=Entity.from_string(result.group(EntityTypes.property_), type_="property"),
+                class_=Entity.from_string(result.group(EntityTypes.class_)),
+                property=Entity.from_string(result.group(EntityTypes.property_)),
                 direction=_direction_by_symbol[result.group("direction")],
                 **kwargs,
             )
@@ -107,21 +107,19 @@ class SingleProperty(Traversal):
 
     @classmethod
     def from_string(cls, class_: str, property_: str) -> Self:
-        return cls(
-            class_=Entity.from_string(class_, type_="class"), property=Entity.from_string(property_, type_="property")
-        )
+        return cls(class_=Entity.from_string(class_), property=Entity.from_string(property_))
 
 
 class AllReferences(Traversal):
     @classmethod
     def from_string(cls, class_: str) -> Self:
-        return cls(class_=Entity.from_string(class_, type_="class"))
+        return cls(class_=Entity.from_string(class_))
 
 
 class AllProperties(Traversal):
     @classmethod
     def from_string(cls, class_: str) -> Self:
-        return cls(class_=Entity.from_string(class_, type_="class"))
+        return cls(class_=Entity.from_string(class_))
 
 
 class Origin(BaseModel):

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

@@ -1,8 +1,8 @@
-from .base import RoleTypes
-from .dms_architect_rules import DMSRules
-from .dms_schema import DMSSchema
-from .domain_rules import DomainRules
-from .information_rules import InformationRules
+from ._base import RoleTypes
+from ._dms_architect_rules import DMSRules
+from ._dms_schema import DMSSchema
+from ._domain_rules import DomainRules
+from ._information_rules import InformationRules
 
 RULES_PER_ROLE: dict[RoleTypes, type[DomainRules] | type[InformationRules] | type[DMSRules]] = {
     RoleTypes.domain_expert: DomainRules,

cognite/neat/rules/models/{_rules/base.py → rules/_base.py}

@@ -27,7 +27,7 @@ from pydantic import (
 )
 from pydantic.fields import FieldInfo
 
-from cognite.neat.rules.models._rules._types import ClassType
+from cognite.neat.rules.models.rules._types import ClassType
 
 if sys.version_info >= (3, 11):
     from enum import StrEnum

cognite/neat/rules/models/{_rules/dms_architect_rules.py → rules/_dms_architect_rules.py}

@@ -17,8 +17,10 @@ from rdflib import Namespace
 
 import cognite.neat.rules.issues.spreadsheet
 from cognite.neat.rules import issues
-from cognite.neat.rules.models._rules.domain_rules import DomainRules
+from cognite.neat.rules.models.rules._domain_rules import DomainRules
 
+from ._base import BaseMetadata, BaseRules, ExtensionCategory, RoleTypes, SchemaCompleteness, SheetEntity, SheetList
+from ._dms_schema import DMSSchema, PipelineSchema
 from ._types import (
     CdfValueType,
     ClassEntity,
@@ -40,11 +42,9 @@ from ._types import (
     ViewType,
     XSDValueType,
 )
-from .base import BaseMetadata, BaseRules, ExtensionCategory, RoleTypes, SchemaCompleteness, SheetEntity, SheetList
-from .dms_schema import DMSSchema, PipelineSchema
 
 if TYPE_CHECKING:
-    from .information_rules import InformationRules
+    from ._information_rules import InformationRules
 
 if sys.version_info >= (3, 11):
     from typing import Self
@@ -1063,7 +1063,7 @@ class _DMSRulesConverter:
         name: str | None = None,
         namespace: Namespace | None = None,
     ) -> "InformationRules":
-        from .information_rules import InformationClass, InformationMetadata, InformationProperty, InformationRules
+        from ._information_rules import InformationClass, InformationMetadata, InformationProperty, InformationRules
 
         dms = self.dms.metadata
         prefix = dms.space

cognite/neat/rules/models/{_rules/dms_schema.py → rules/_dms_schema.py}

@@ -27,7 +27,7 @@ from cognite.neat.rules.issues.dms import (
     MissingSpaceError,
     MissingViewError,
 )
-from cognite.neat.rules.models._rules._types._value import DMS_VALUE_TYPE_MAPPINGS
+from cognite.neat.rules.models.rules._types._value import DMS_VALUE_TYPE_MAPPINGS
 from cognite.neat.utils.cdf_loaders import ViewLoader
 from cognite.neat.utils.cdf_loaders.data_classes import RawTableWrite, RawTableWriteList
 from cognite.neat.utils.text import to_camel

cognite/neat/rules/models/{_rules/domain_rules.py → rules/_domain_rules.py}

@@ -4,14 +4,14 @@ from typing import Any, ClassVar
 from pydantic import Field, field_serializer, field_validator, model_serializer
 from pydantic_core.core_schema import SerializationInfo
 
-from ._types import ParentClassType, PropertyType, SemanticValueType, StrOrListType
-from .base import (
+from ._base import (
     BaseMetadata,
     RoleTypes,
     RuleModel,
     SheetEntity,
     SheetList,
 )
+from ._types import ParentClassType, PropertyType, SemanticValueType, StrOrListType
 
 
 class DomainMetadata(BaseMetadata):

cognite/neat/rules/models/{_rules/information_rules.py → rules/_information_rules.py}

@@ -24,6 +24,18 @@ from cognite.neat.rules.models.rdfpath import (
     parse_rule,
 )
 
+from ._base import (
+    BaseMetadata,
+    ExtensionCategory,
+    ExtensionCategoryType,
+    MatchType,
+    RoleTypes,
+    RuleModel,
+    SchemaCompleteness,
+    SheetEntity,
+    SheetList,
+)
+from ._domain_rules import DomainRules
 from ._types import (
     ClassEntity,
     ContainerEntity,
@@ -45,21 +57,9 @@ from ._types import (
     XSDValueType,
 )
 from ._types._base import Unknown
-from .base import (
-    BaseMetadata,
-    ExtensionCategory,
-    ExtensionCategoryType,
-    MatchType,
-    RoleTypes,
-    RuleModel,
-    SchemaCompleteness,
-    SheetEntity,
-    SheetList,
-)
-from .domain_rules import DomainRules
 
 if TYPE_CHECKING:
-    from .dms_architect_rules import DMSProperty, DMSRules
+    from ._dms_architect_rules import DMSProperty, DMSRules
 
 
 if sys.version_info >= (3, 11):
@@ -380,7 +380,7 @@ class _InformationRulesConverter:
         raise NotImplementedError("DomainRules not implemented yet")
 
     def as_dms_architect_rules(self, created: datetime | None = None, updated: datetime | None = None) -> "DMSRules":
-        from .dms_architect_rules import DMSContainer, DMSMetadata, DMSProperty, DMSRules, DMSView
+        from ._dms_architect_rules import DMSContainer, DMSMetadata, DMSProperty, DMSRules, DMSView
 
         info_metadata = self.information.metadata
 
@@ -404,6 +404,7 @@ class _InformationRulesConverter:
         views: list[DMSView] = [
             DMSView(
                 class_=cls_.class_,
+                name=cls_.name,
                 view=ViewPropEntity(prefix=cls_.class_.prefix, suffix=cls_.class_.suffix, version=cls_.class_.version),
                 description=cls_.description,
                 reference=cls_.reference,
@@ -427,6 +428,7 @@ class _InformationRulesConverter:
             containers.append(
                 DMSContainer(
                     class_=class_.class_,
+                    name=class_.name,
                     container=ContainerEntity(prefix=class_.class_.prefix, suffix=class_.class_.suffix),
                     description=class_.description,
                     constraint=[
@@ -456,7 +458,7 @@ class _InformationRulesConverter:
     def _as_dms_property(cls, prop: InformationProperty) -> "DMSProperty":
         """This creates the first"""
 
-        from .dms_architect_rules import DMSProperty
+        from ._dms_architect_rules import DMSProperty
 
         # returns property type, which can be ObjectProperty or DatatypeProperty
         if isinstance(prop.value_type, XSDValueType):
@@ -487,6 +489,7 @@ class _InformationRulesConverter:
 
         return DMSProperty(
             class_=prop.class_,
+            name=prop.name,
             property_=prop.property_,
             value_type=value_type,
             nullable=nullable,