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

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

@@ -21,6 +21,11 @@ from cognite.neat.core._constants import (
     DMS_CONTAINER_PROPERTY_SIZE_LIMIT,
     DMS_VIEW_CONTAINER_SIZE_LIMIT,
 )
+from cognite.neat.core._data_model.models.data_types import DataType
+from cognite.neat.core._data_model.models.entities import ContainerEntity, RawFilter
+from cognite.neat.core._data_model.models.entities._single_value import (
+    ViewEntity,
+)
 from cognite.neat.core._issues import IssueList, NeatError
 from cognite.neat.core._issues.errors import (
     CDFMissingClientError,
@@ -35,6 +40,7 @@ from cognite.neat.core._issues.errors._external import CDFMissingResourcesError
 from cognite.neat.core._issues.warnings import (
     NotSupportedHasDataFilterLimitWarning,
     NotSupportedViewContainerLimitWarning,
+    ReversedConnectionNotFeasibleWarning,
     UndefinedViewWarning,
     user_modeling,
 )
@@ -43,11 +49,6 @@ from cognite.neat.core._issues.warnings.user_modeling import (
     DirectRelationMissingSourceWarning,
     NotNeatSupportedFilterWarning,
 )
-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.core._utils.spreadsheet import SpreadsheetRead
 from cognite.neat.core._utils.text import humanize_collection
 
@@ -589,7 +590,7 @@ class DMSValidation:
                 )
             ):
                 issue_list.append(
-                    ReversedConnectionNotFeasibleError(
+                    ReversedConnectionNotFeasibleWarning(
                         view_id,
                         "reversed connection",
                         prop_id,

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

@@ -1,7 +1,7 @@
 from typing import Literal
 
+from cognite.neat.core._data_model.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/core/{_rules → _data_model}/models/entities/_multi_value.py

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

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

@@ -32,7 +32,7 @@ else:
     from backports.strenum import StrEnum
     from typing_extensions import Self
 
-from cognite.neat.core._rules._constants import (
+from cognite.neat.core._data_model._constants import (
     ENTITY_PATTERN,
     SPLIT_ON_COMMA_PATTERN,
     SPLIT_ON_EDGE_ENTITY_ARGS_PATTERN,

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

@@ -3,9 +3,9 @@ from pathlib import Path
 
 import yaml
 
+from cognite.neat.core._data_model._shared import ReadRules
+from cognite.neat.core._data_model.models.dms import DMSInputRules, DMSRules
 from cognite.neat.core._issues.errors import NeatValueError
-from cognite.neat.core._rules._shared import ReadRules
-from cognite.neat.core._rules.models.dms import DMSInputRules, DMSRules
 
 _CLASSIC_TO_CORE_MAPPING = Path(__file__).resolve().parent / "_classic2core.yaml"
 
@@ -16,8 +16,8 @@ def _read_source_file() -> str:
 
 
 def load_classic_to_core_mapping(org_name: str | None, source_space: str, source_version: str) -> DMSRules:
-    from cognite.neat.core._rules.importers import YAMLImporter
-    from cognite.neat.core._rules.transformers import VerifyDMSRules
+    from cognite.neat.core._data_model.importers import YAMLImporter
+    from cognite.neat.core._data_model.transformers import VerifyDMSRules
 
     raw_str = _read_source_file()
     if org_name is not None:

cognite/neat/core/{_rules → _data_model}/transformers/_base.py

@@ -5,8 +5,11 @@ from types import UnionType
 from typing import Generic, TypeVar, Union, get_args, get_origin
 
 from cognite.neat.core._constants import DEFAULT_NAMESPACE
-from cognite.neat.core._rules._shared import ReadRules, Rules, VerifiedRules
-from cognite.neat.core._rules.models import DMSInputRules, InformationInputRules
+from cognite.neat.core._data_model._shared import ReadRules, Rules, VerifiedRules
+from cognite.neat.core._data_model.models import (
+    DMSInputRules,
+    UnverifiedConceptualDataModel,
+)
 from cognite.neat.core._store._provenance import Agent as ProvenanceAgent
 
 T_RulesIn = TypeVar("T_RulesIn", bound=Rules)
@@ -61,7 +64,7 @@ class RulesTransformer(ABC, Generic[T_RulesIn, T_RulesOut]):
 
         if get_origin(annotation) is ReadRules and isinstance(get_args(annotation)[0], TypeVar):
             # Hardcoded for now, as we only have two types of ReadRules
-            return ReadRules[DMSInputRules], ReadRules[InformationInputRules]
+            return ReadRules[DMSInputRules], ReadRules[UnverifiedConceptualDataModel]
 
         return (annotation,)