cognite-neat 0.119.8__py3-none-any.whl → 0.120.0__py3-none-any.whl

cognite/neat/{_rules → core/_rules}/importers/_dtdl2rules/dtdl_converter.py

@@ -1,14 +1,17 @@
 from collections import Counter
 from collections.abc import Callable, Sequence
 
-from cognite.neat._issues import IssueList
-from cognite.neat._issues.errors import (
+from cognite.neat.core._issues import IssueList
+from cognite.neat.core._issues.errors import (
     PropertyTypeNotSupportedError,
     ResourceMissingIdentifierError,
     ResourceNotFoundError,
 )
-from cognite.neat._issues.warnings import PropertyTypeNotSupportedWarning, ResourceTypeNotSupportedWarning
-from cognite.neat._rules.importers._dtdl2rules.spec import (
+from cognite.neat.core._issues.warnings import (
+    PropertyTypeNotSupportedWarning,
+    ResourceTypeNotSupportedWarning,
+)
+from cognite.neat.core._rules.importers._dtdl2rules.spec import (
     DTMI,
     Command,
     CommandV2,
@@ -25,9 +28,14 @@ from cognite.neat._rules.importers._dtdl2rules.spec import (
     Telemetry,
     TelemetryV2,
 )
-from cognite.neat._rules.models.data_types import _DATA_TYPE_BY_NAME, DataType, Json, String
-from cognite.neat._rules.models.entities import ClassEntity
-from cognite.neat._rules.models.information import (
+from cognite.neat.core._rules.models.data_types import (
+    _DATA_TYPE_BY_NAME,
+    DataType,
+    Json,
+    String,
+)
+from cognite.neat.core._rules.models.entities import ClassEntity
+from cognite.neat.core._rules.models.information import (
     InformationInputClass,
     InformationInputProperty,
 )

cognite/neat/{_rules → core/_rules}/importers/_dtdl2rules/dtdl_importer.py

@@ -5,21 +5,25 @@ from pathlib import Path
 
 from pydantic import ValidationError
 
-from cognite.neat._issues import IssueList, MultiValueError, NeatIssue
-from cognite.neat._issues.warnings import (
+from cognite.neat.core._issues import IssueList, MultiValueError, NeatIssue
+from cognite.neat.core._issues.warnings import (
     FileItemNotSupportedWarning,
     FileMissingRequiredFieldWarning,
     FileReadWarning,
     FileTypeUnexpectedWarning,
     NeatValueWarning,
 )
-from cognite.neat._rules._shared import ReadRules
-from cognite.neat._rules.importers._base import BaseImporter
-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.models import InformationInputRules
-from cognite.neat._rules.models.information import InformationInputMetadata
-from cognite.neat._utils.text import humanize_collection, to_pascal_case
+from cognite.neat.core._rules._shared import ReadRules
+from cognite.neat.core._rules.importers._base import BaseImporter
+from cognite.neat.core._rules.importers._dtdl2rules.dtdl_converter import _DTDLConverter
+from cognite.neat.core._rules.importers._dtdl2rules.spec import (
+    DTDL_CLS_BY_TYPE_BY_SPEC,
+    DTDLBase,
+    Interface,
+)
+from cognite.neat.core._rules.models import InformationInputRules
+from cognite.neat.core._rules.models.information import InformationInputMetadata
+from cognite.neat.core._utils.text import humanize_collection, to_pascal_case
 
 
 class DTDLImporter(BaseImporter[InformationInputRules]):

cognite/neat/{_rules → core/_rules}/importers/_dtdl2rules/spec.py

@@ -15,7 +15,7 @@ from typing import TYPE_CHECKING, Any, ClassVar, Literal, TypeAlias
 from pydantic import BaseModel, Field, field_validator, model_serializer, model_validator
 from pydantic.fields import FieldInfo
 
-from cognite.neat._rules.models.entities import ClassEntity
+from cognite.neat.core._rules.models.entities import ClassEntity
 
 if TYPE_CHECKING:
     from pydantic.type_adapter import IncEx

cognite/neat/{_rules → core/_rules}/importers/_rdf/_base.py

@@ -6,18 +6,18 @@ from cognite.client import data_modeling as dm
 from rdflib import Graph, Namespace, URIRef
 from typing_extensions import Self
 
-from cognite.neat._constants import get_default_prefixes_and_namespaces
-from cognite.neat._issues import IssueList, MultiValueError
-from cognite.neat._issues.errors import FileReadError
-from cognite.neat._issues.errors._general import NeatValueError
-from cognite.neat._rules._shared import ReadRules
-from cognite.neat._rules.importers._base import BaseImporter
-from cognite.neat._rules.models._base_rules import RoleTypes
-from cognite.neat._rules.models.data_types import AnyURI
-from cognite.neat._rules.models.entities import UnknownEntity
-from cognite.neat._rules.models.information import InformationInputRules
-from cognite.neat._store import NeatGraphStore
-from cognite.neat._utils.rdf_ import get_namespace
+from cognite.neat.core._constants import get_default_prefixes_and_namespaces
+from cognite.neat.core._issues import IssueList, MultiValueError
+from cognite.neat.core._issues.errors import FileReadError
+from cognite.neat.core._issues.errors._general import NeatValueError
+from cognite.neat.core._rules._shared import ReadRules
+from cognite.neat.core._rules.importers._base import BaseImporter
+from cognite.neat.core._rules.models._base_rules import RoleTypes
+from cognite.neat.core._rules.models.data_types import AnyURI
+from cognite.neat.core._rules.models.entities import UnknownEntity
+from cognite.neat.core._rules.models.information import InformationInputRules
+from cognite.neat.core._store import NeatGraphStore
+from cognite.neat.core._utils.rdf_ import get_namespace
 
 DEFAULT_NON_EXISTING_NODE_TYPE = AnyURI()
 

cognite/neat/{_rules → core/_rules}/importers/_rdf/_imf2rules.py

@@ -1,8 +1,11 @@
 """This module performs importing of various formats to one of serializations for which
 there are loaders to TransformationRules pydantic class."""
 
-from cognite.neat._rules.importers._rdf._base import BaseRDFImporter
-from cognite.neat._rules.importers._rdf._shared import parse_classes, parse_properties
+from cognite.neat.core._rules.importers._rdf._base import BaseRDFImporter
+from cognite.neat.core._rules.importers._rdf._shared import (
+    parse_classes,
+    parse_properties,
+)
 
 CLASSES_QUERY = """
     SELECT ?class_ ?name ?description ?implements

cognite/neat/{_rules → core/_rules}/importers/_rdf/_inference2rules.py

@@ -10,25 +10,25 @@ from cognite.client import data_modeling as dm
 from rdflib import RDF, RDFS, Graph, Namespace, URIRef
 from rdflib import Literal as RdfLiteral
 
-from cognite.neat._config import GLOBAL_CONFIG
-from cognite.neat._constants import NEAT, get_default_prefixes_and_namespaces
-from cognite.neat._issues import IssueList
-from cognite.neat._issues.warnings import PropertyValueTypeUndefinedWarning
-from cognite.neat._rules.analysis import RulesAnalysis
-from cognite.neat._rules.models import InformationRules, data_types
-from cognite.neat._rules.models.data_types import AnyURI
-from cognite.neat._rules.models.entities._single_value import UnknownEntity
-from cognite.neat._rules.models.information import (
+from cognite.neat.core._config import GLOBAL_CONFIG
+from cognite.neat.core._constants import NEAT, get_default_prefixes_and_namespaces
+from cognite.neat.core._issues import IssueList
+from cognite.neat.core._issues.warnings import PropertyValueTypeUndefinedWarning
+from cognite.neat.core._rules.analysis import RulesAnalysis
+from cognite.neat.core._rules.models import InformationRules, data_types
+from cognite.neat.core._rules.models.data_types import AnyURI
+from cognite.neat.core._rules.models.entities._single_value import UnknownEntity
+from cognite.neat.core._rules.models.information import (
     InformationClass,
     InformationInputClass,
     InformationInputProperty,
     InformationMetadata,
 )
-from cognite.neat._store import NeatGraphStore
-from cognite.neat._store._provenance import INSTANCES_ENTITY
-from cognite.neat._utils.collection_ import iterate_progress_bar
-from cognite.neat._utils.rdf_ import remove_namespace_from_uri, uri_to_short_form
-from cognite.neat._utils.text import NamingStandardization
+from cognite.neat.core._store import NeatGraphStore
+from cognite.neat.core._store._provenance import INSTANCES_ENTITY
+from cognite.neat.core._utils.collection_ import iterate_progress_bar
+from cognite.neat.core._utils.rdf_ import remove_namespace_from_uri, uri_to_short_form
+from cognite.neat.core._utils.text import NamingStandardization
 
 from ._base import DEFAULT_NON_EXISTING_NODE_TYPE, BaseRDFImporter
 

cognite/neat/{_rules → core/_rules}/importers/_rdf/_owl2rules.py

@@ -1,8 +1,11 @@
 """This module performs importing of various formats to one of serializations for which
 there are loaders to TransformationRules pydantic class."""
 
-from cognite.neat._rules.importers._rdf._base import BaseRDFImporter
-from cognite.neat._rules.importers._rdf._shared import parse_classes, parse_properties
+from cognite.neat.core._rules.importers._rdf._base import BaseRDFImporter
+from cognite.neat.core._rules.importers._rdf._shared import (
+    parse_classes,
+    parse_properties,
+)
 
 CLASSES_QUERY = """SELECT ?class_ ?name ?description ?implements
         WHERE {{

cognite/neat/{_rules → core/_rules}/importers/_rdf/_shared.py

@@ -4,13 +4,13 @@ from rdflib import BNode, Graph
 from rdflib.plugins.sparql import prepareQuery
 from rdflib.query import ResultRow
 
-from cognite.neat._issues._base import IssueList
-from cognite.neat._issues.errors._general import NeatValueError
-from cognite.neat._issues.warnings._resources import (
+from cognite.neat.core._issues._base import IssueList
+from cognite.neat.core._issues.errors._general import NeatValueError
+from cognite.neat.core._issues.warnings._resources import (
     ResourceRedefinedWarning,
     ResourceRetrievalWarning,
 )
-from cognite.neat._utils.rdf_ import convert_rdflib_content
+from cognite.neat.core._utils.rdf_ import convert_rdflib_content
 
 
 def parse_classes(graph: Graph, query: str, language: str, issue_list: IssueList) -> tuple[dict, IssueList]:

cognite/neat/{_rules → core/_rules}/importers/_spreadsheet2rules.py

@@ -13,22 +13,22 @@ from cognite.client.utils._importing import local_import
 from pandas import ExcelFile
 from rdflib import Namespace, URIRef
 
-from cognite.neat._issues import IssueList, MultiValueError
-from cognite.neat._issues.errors import (
+from cognite.neat.core._issues import IssueList, MultiValueError
+from cognite.neat.core._issues.errors import (
     FileMissingRequiredFieldError,
     FileNotFoundNeatError,
     FileReadError,
 )
-from cognite.neat._issues.warnings import FileMissingRequiredFieldWarning
-from cognite.neat._rules._shared import ReadRules, T_InputRules
-from cognite.neat._rules.models import (
+from cognite.neat.core._issues.warnings import FileMissingRequiredFieldWarning
+from cognite.neat.core._rules._shared import ReadRules, T_InputRules
+from cognite.neat.core._rules.models import (
     INPUT_RULES_BY_ROLE,
     VERIFIED_RULES_BY_ROLE,
     RoleTypes,
     SchemaCompleteness,
 )
-from cognite.neat._utils.spreadsheet import SpreadsheetRead, read_individual_sheet
-from cognite.neat._utils.text import humanize_collection
+from cognite.neat.core._utils.spreadsheet import SpreadsheetRead, read_individual_sheet
+from cognite.neat.core._utils.text import humanize_collection
 
 from ._base import BaseImporter
 

cognite/neat/{_rules → core/_rules}/importers/_yaml2rules.py

@@ -3,17 +3,17 @@ from typing import Any, cast
 
 import yaml
 
-from cognite.neat._issues import IssueList, MultiValueError, NeatIssue
-from cognite.neat._issues.errors import (
+from cognite.neat.core._issues import IssueList, MultiValueError, NeatIssue
+from cognite.neat.core._issues.errors import (
     FileMissingRequiredFieldError,
     FileNotAFileError,
     FileNotFoundNeatError,
     FileReadError,
     FileTypeUnexpectedError,
 )
-from cognite.neat._issues.warnings import NeatValueWarning
-from cognite.neat._rules._shared import ReadRules, T_InputRules
-from cognite.neat._rules.models import INPUT_RULES_BY_ROLE, RoleTypes
+from cognite.neat.core._issues.warnings import NeatValueWarning
+from cognite.neat.core._rules._shared import ReadRules, T_InputRules
+from cognite.neat.core._rules.models import INPUT_RULES_BY_ROLE, RoleTypes
 
 from ._base import BaseImporter
 

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

@@ -1,6 +1,8 @@
-from cognite.neat._client.data_classes.schema import DMSSchema
-from cognite.neat._rules.models.information._rules import InformationRules
-from cognite.neat._rules.models.information._rules_input import InformationInputRules
+from cognite.neat.core._client.data_classes.schema import DMSSchema
+from cognite.neat.core._rules.models.information._rules import InformationRules
+from cognite.neat.core._rules.models.information._rules_input import (
+    InformationInputRules,
+)
 
 from ._base_rules import DataModelType, ExtensionCategory, RoleTypes, SchemaCompleteness, SheetList, SheetRow
 from .dms._rules import DMSRules

cognite/neat/{_rules → core/_rules}/models/_base_rules.py

@@ -26,8 +26,8 @@ from pydantic.main import IncEx
 from pydantic_core import core_schema
 from rdflib import Namespace, URIRef
 
-from cognite.neat._constants import DEFAULT_NAMESPACE
-from cognite.neat._rules.models._types import (
+from cognite.neat.core._constants import DEFAULT_NAMESPACE
+from cognite.neat.core._rules.models._types import (
     ContainerEntityType,
     DataModelExternalIdType,
     DmsPropertyType,
@@ -37,9 +37,13 @@ from cognite.neat._rules.models._types import (
     VersionType,
     ViewEntityType,
 )
-from cognite.neat._rules.models.data_types import DataType
-from cognite.neat._rules.models.entities import EdgeEntity, ReverseConnectionEntity, ViewEntity
-from cognite.neat._utils.rdf_ import uri_display_name
+from cognite.neat.core._rules.models.data_types import DataType
+from cognite.neat.core._rules.models.entities import (
+    EdgeEntity,
+    ReverseConnectionEntity,
+    ViewEntity,
+)
+from cognite.neat.core._utils.rdf_ import uri_display_name
 
 if sys.version_info >= (3, 11):
     from enum import StrEnum
@@ -102,7 +106,6 @@ class DataModelAspect(StrEnum):
 
 
 class RoleTypes(StrEnum):
-    domain_expert = "domain expert"
     information = "information architect"
     dms = "DMS Architect"
 

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

@@ -14,17 +14,17 @@ from pydantic import (
 )
 from pydantic.functional_serializers import PlainSerializer
 
-from cognite.neat._issues.errors import RegexViolationError
-from cognite.neat._issues.warnings import RegexViolationWarning
-from cognite.neat._rules._constants import (
+from cognite.neat.core._issues.errors import RegexViolationError
+from cognite.neat.core._issues.warnings import RegexViolationWarning
+from cognite.neat.core._rules._constants import (
     DATA_MODEL_COMPLIANCE_REGEX,
     PATTERNS,
     PREFIX_COMPLIANCE_REGEX,
     VERSION_COMPLIANCE_REGEX,
     EntityTypes,
 )
-from cognite.neat._rules.models.entities._multi_value import MultiValueTypeInfo
-from cognite.neat._rules.models.entities._single_value import (
+from cognite.neat.core._rules.models.entities._multi_value import MultiValueTypeInfo
+from cognite.neat.core._rules.models.entities._single_value import (
     ClassEntity,
     ContainerEntity,
     ViewEntity,

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

@@ -10,9 +10,15 @@ from pydantic import BaseModel, Field, model_serializer, model_validator
 from pydantic.functional_validators import ModelWrapValidatorHandler
 from rdflib import URIRef
 
-from cognite.neat._constants import XML_SCHEMA_NAMESPACE
-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
+from cognite.neat.core._constants import XML_SCHEMA_NAMESPACE
+from cognite.neat.core._rules._constants import (
+    SPLIT_ON_COMMA_PATTERN,
+    SPLIT_ON_EQUAL_PATTERN,
+)
+from cognite.neat.core._rules.models.entities._single_value import (
+    ClassEntity,
+    UnitEntity,
+)
 
 if sys.version_info >= (3, 11):
     from typing import Self

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

@@ -1,4 +1,4 @@
-from cognite.neat._client.data_classes.schema import DMSSchema
+from cognite.neat.core._client.data_classes.schema import DMSSchema
 
 from ._rules import DMSContainer, DMSEnum, DMSMetadata, DMSNode, DMSProperty, DMSRules, DMSView
 from ._rules_input import (

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

@@ -13,26 +13,33 @@ from cognite.client.data_classes.data_modeling.views import (
     ViewPropertyApply,
 )
 
-from cognite.neat._client.data_classes.data_modeling import (
+from cognite.neat.core._client.data_classes.data_modeling import (
     ContainerApplyDict,
     NodeApplyDict,
     SpaceApplyDict,
     ViewApplyDict,
 )
-from cognite.neat._client.data_classes.schema import DMSSchema
-from cognite.neat._constants import (
+from cognite.neat.core._client.data_classes.schema import DMSSchema
+from cognite.neat.core._constants import (
     COGNITE_SPACES,
     DMS_DIRECT_RELATION_LIST_DEFAULT_LIMIT,
     DMS_PRIMITIVE_LIST_DEFAULT_LIMIT,
 )
-from cognite.neat._issues.errors import NeatTypeError, NeatValueError, ResourceNotFoundError
-from cognite.neat._issues.warnings import NotSupportedWarning, PropertyNotFoundWarning
-from cognite.neat._issues.warnings.user_modeling import (
+from cognite.neat.core._issues.errors import (
+    NeatTypeError,
+    NeatValueError,
+    ResourceNotFoundError,
+)
+from cognite.neat.core._issues.warnings import (
+    NotSupportedWarning,
+    PropertyNotFoundWarning,
+)
+from cognite.neat.core._issues.warnings.user_modeling import (
     EmptyContainerWarning,
     HasDataFilterOnNoPropertiesViewWarning,
 )
-from cognite.neat._rules.models.data_types import DataType, Double, Enum, Float
-from cognite.neat._rules.models.entities import (
+from cognite.neat.core._rules.models.data_types import DataType, Double, Enum, Float
+from cognite.neat.core._rules.models.entities import (
     ClassEntity,
     ContainerEntity,
     DMSFilter,

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

@@ -8,11 +8,11 @@ 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._client.data_classes.schema import DMSSchema
-from cognite.neat._constants import DMS_CONTAINER_LIST_MAX_LIMIT
-from cognite.neat._issues.errors import NeatValueError
-from cognite.neat._issues.warnings._general import NeatValueWarning
-from cognite.neat._rules.models._base_rules import (
+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,
     ContainerProperty,
@@ -23,7 +23,7 @@ from cognite.neat._rules.models._base_rules import (
     ViewProperty,
     ViewRef,
 )
-from cognite.neat._rules.models._types import (
+from cognite.neat.core._rules.models._types import (
     ClassEntityType,
     ContainerEntityType,
     DmsPropertyType,
@@ -31,8 +31,8 @@ from cognite.neat._rules.models._types import (
     URIRefType,
     ViewEntityType,
 )
-from cognite.neat._rules.models.data_types import DataType
-from cognite.neat._rules.models.entities import (
+from cognite.neat.core._rules.models.data_types import DataType
+from cognite.neat.core._rules.models.entities import (
     ContainerEntityList,
     DMSEntity,
     DMSNodeEntity,
@@ -48,7 +48,7 @@ from cognite.neat._rules.models.entities import (
 )
 
 if TYPE_CHECKING:
-    from cognite.neat._rules.models import InformationRules
+    from cognite.neat.core._rules.models import InformationRules
 
 _DEFAULT_VERSION = "1"
 

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

@@ -10,11 +10,14 @@ from cognite.client import data_modeling as dm
 from cognite.client.data_classes.data_modeling import ContainerId, ViewId
 from rdflib import Namespace, URIRef
 
-from cognite.neat._constants import DEFAULT_NAMESPACE, DMS_DIRECT_RELATION_LIST_DEFAULT_LIMIT
-from cognite.neat._issues.warnings import DeprecatedWarning
-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.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 (
     ContainerEntity,
     DMSNodeEntity,
     DMSUnknownEntity,
@@ -24,8 +27,8 @@ from cognite.neat._rules.models.entities import (
     load_connection,
     load_dms_value_type,
 )
-from cognite.neat._rules.models.entities._wrapped import DMSFilter
-from cognite.neat._utils.rdf_ import uri_display_name
+from cognite.neat.core._rules.models.entities._wrapped import DMSFilter
+from cognite.neat.core._utils.rdf_ import uri_display_name
 
 from ._rules import _DEFAULT_VERSION, DMSContainer, DMSEnum, DMSMetadata, DMSNode, DMSProperty, DMSRules, DMSView
 

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

@@ -12,17 +12,17 @@ from cognite.client.data_classes.data_modeling.views import (
     ViewPropertyApply,
 )
 
-from cognite.neat._client import NeatClient
-from cognite.neat._client.data_classes.data_modeling import ViewApplyDict
-from cognite.neat._client.data_classes.schema import DMSSchema
-from cognite.neat._constants import (
+from cognite.neat.core._client import NeatClient
+from cognite.neat.core._client.data_classes.data_modeling import ViewApplyDict
+from cognite.neat.core._client.data_classes.schema import DMSSchema
+from cognite.neat.core._constants import (
     COGNITE_MODELS,
     COGNITE_SPACES,
     DMS_CONTAINER_PROPERTY_SIZE_LIMIT,
     DMS_VIEW_CONTAINER_SIZE_LIMIT,
 )
-from cognite.neat._issues import IssueList, NeatError
-from cognite.neat._issues.errors import (
+from cognite.neat.core._issues import IssueList, NeatError
+from cognite.neat.core._issues.errors import (
     CDFMissingClientError,
     PropertyDefinitionDuplicatedError,
     PropertyMappingDuplicatedError,
@@ -31,25 +31,25 @@ from cognite.neat._issues.errors import (
     ResourceNotFoundError,
     ReversedConnectionNotFeasibleError,
 )
-from cognite.neat._issues.errors._external import CDFMissingResourcesError
-from cognite.neat._issues.warnings import (
+from cognite.neat.core._issues.errors._external import CDFMissingResourcesError
+from cognite.neat.core._issues.warnings import (
     NotSupportedHasDataFilterLimitWarning,
     NotSupportedViewContainerLimitWarning,
     UndefinedViewWarning,
     user_modeling,
 )
-from cognite.neat._issues.warnings.user_modeling import (
+from cognite.neat.core._issues.warnings.user_modeling import (
     ContainerPropertyLimitWarning,
     DirectRelationMissingSourceWarning,
     NotNeatSupportedFilterWarning,
 )
-from cognite.neat._rules.models.data_types import DataType
-from cognite.neat._rules.models.entities import ContainerEntity, RawFilter
-from cognite.neat._rules.models.entities._single_value import (
+from cognite.neat.core._rules.models.data_types import DataType
+from cognite.neat.core._rules.models.entities import ContainerEntity, RawFilter
+from cognite.neat.core._rules.models.entities._single_value import (
     ViewEntity,
 )
-from cognite.neat._utils.spreadsheet import SpreadsheetRead
-from cognite.neat._utils.text import humanize_collection
+from cognite.neat.core._utils.spreadsheet import SpreadsheetRead
+from cognite.neat.core._utils.text import humanize_collection
 
 from ._rules import DMSProperty, DMSRules
 

cognite/neat/{_rules → core/_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.core._issues.errors import NeatTypeError
+from cognite.neat.core._rules.models.data_types import DataType
 
 from ._multi_value import MultiValueTypeInfo
 from ._single_value import (

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

@@ -6,8 +6,8 @@ from pydantic import (
     model_validator,
 )
 
-from cognite.neat._rules._constants import EntityTypes
-from cognite.neat._rules.models.data_types import DataType
+from cognite.neat.core._rules._constants import EntityTypes
+from cognite.neat.core._rules.models.data_types import DataType
 
 from ._constants import _PARSE, Undefined
 from ._single_value import ClassEntity, UnknownEntity

cognite/neat/{_rules → core/_rules}/models/entities/_single_value.py

@@ -22,8 +22,8 @@ from pydantic import (
     model_validator,
 )
 
-from cognite.neat._issues.errors import NeatValueError
-from cognite.neat._utils.text import replace_non_alphanumeric_with_underscore
+from cognite.neat.core._issues.errors import NeatValueError
+from cognite.neat.core._utils.text import replace_non_alphanumeric_with_underscore
 
 if sys.version_info >= (3, 11):
     from enum import StrEnum
@@ -32,7 +32,7 @@ else:
     from backports.strenum import StrEnum
     from typing_extensions import Self
 
-from cognite.neat._rules._constants import (
+from cognite.neat.core._rules._constants import (
     ENTITY_PATTERN,
     SPLIT_ON_COMMA_PATTERN,
     SPLIT_ON_EDGE_ENTITY_ARGS_PATTERN,

cognite/neat/{_rules → core/_rules}/models/entities/_wrapped.py

@@ -107,12 +107,20 @@ class DMSFilter(WrappedEntity):
             (body := dumped.get(dm.filters.Equals._filter_name))
             and (value := body.get("value"))
             and isinstance(value, dict)
+            and (space := value.get("space"))
+            and (external_id := value.get("externalId"))
+        ):
+            return NodeTypeFilter(inner=[DMSNodeEntity(space=space, externalId=external_id)])
+        elif (
+            (body := dumped.get(dm.filters.In._filter_name))
+            and (values := body.get("values"))
+            and all(
+                [
+                    (True if isinstance(entry, dict) and "space" in entry and "externalId" in entry else False)
+                    for entry in values
+                ]
+            )
         ):
-            space = value.get("space")
-            external_id = value.get("externalId")
-            if space is not None and external_id is not None:
-                return NodeTypeFilter(inner=[DMSNodeEntity(space=space, externalId=external_id)])
-        elif (body := dumped.get(dm.filters.In._filter_name)) and (values := body.get("values")):
             return NodeTypeFilter(
                 inner=[
                     DMSNodeEntity(space=entry["space"], externalId=entry["externalId"])