cognite-neat 0.123.34__tar.gz → 0.123.36__tar.gz

cognite_neat-0.123.36/.github/CODEOWNERS

@@ -0,0 +1,2 @@
+* @cognitedata/iknow @cognitedata/accelerate
+

{cognite_neat-0.123.34 → cognite_neat-0.123.36}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: cognite-neat
-Version: 0.123.34
+Version: 0.123.36
 Summary: Knowledge graph transformation
 Project-URL: Documentation, https://cognite-neat.readthedocs-hosted.com/
 Project-URL: Homepage, https://cognite-neat.readthedocs-hosted.com/
 Project-URL: GitHub, https://github.com/cognitedata/neat
 Project-URL: Changelog, https://github.com/cognitedata/neat/releases
-Author-email: Nikola Vasiljevic <nikola.vasiljevic@cognite.com>, Anders Albert <anders.albert@cognite.com>, Rogerio Júnior <rogerio.junior@cognite.com>
+Author-email: Nikola Vasiljevic <nikola.vasiljevic@cognite.com>, Anders Albert <anders.albert@cognite.com>
 License-Expression: Apache-2.0
 License-File: LICENSE
 Requires-Python: >=3.10
@@ -96,16 +96,15 @@ The plot below shows the NEAT authorship from the start until present day.
 #### Current authors
 - [Nikola Vasiljević](www.linkedin.com/in/thisisnikola)
 - [Anders Albert](https://www.linkedin.com/in/anders-albert-00790483/)
-- [Rogerio Júnior](https://www.linkedin.com/in/rogerio-saboia-j%C3%BAnior-087118a7/)
 
 #### Former authors
 - [Aleksandrs Livincovs](https://www.linkedin.com/in/aleksandrslivincovs/)
 - [Julia Graham](https://www.linkedin.com/in/julia-graham-959a78a7/)
+- [Rogerio Júnior](https://www.linkedin.com/in/rogerio-saboia-j%C3%BAnior-087118a7/)
 
 ### Contributors
 We are very grateful for the contributions made by:
 
-
 - [Marie Solvik Lepoutre](https://www.linkedin.com/in/mslepoutre/), who improved RDF triples projections to Cognite Data Fusion
 - [Bård Henning Tvedt](https://www.linkedin.com/in/bhtvedt/), who implemented IMF importer
 - [Hassan Gomaa](https://www.linkedin.com/in/dr-hassan-gomaa-232638121/), who extended the DEXPI extractor

{cognite_neat-0.123.34 → cognite_neat-0.123.36}/README.md

@@ -41,16 +41,15 @@ The plot below shows the NEAT authorship from the start until present day.
 #### Current authors
 - [Nikola Vasiljević](www.linkedin.com/in/thisisnikola)
 - [Anders Albert](https://www.linkedin.com/in/anders-albert-00790483/)
-- [Rogerio Júnior](https://www.linkedin.com/in/rogerio-saboia-j%C3%BAnior-087118a7/)
 
 #### Former authors
 - [Aleksandrs Livincovs](https://www.linkedin.com/in/aleksandrslivincovs/)
 - [Julia Graham](https://www.linkedin.com/in/julia-graham-959a78a7/)
+- [Rogerio Júnior](https://www.linkedin.com/in/rogerio-saboia-j%C3%BAnior-087118a7/)
 
 ### Contributors
 We are very grateful for the contributions made by:
 
-
 - [Marie Solvik Lepoutre](https://www.linkedin.com/in/mslepoutre/), who improved RDF triples projections to Cognite Data Fusion
 - [Bård Henning Tvedt](https://www.linkedin.com/in/bhtvedt/), who implemented IMF importer
 - [Hassan Gomaa](https://www.linkedin.com/in/dr-hassan-gomaa-232638121/), who extended the DEXPI extractor

cognite_neat-0.123.36/cognite/neat/_version.py

@@ -0,0 +1,2 @@
+__version__ = "0.123.36"
+__engine__ = "^2.0.4"

{cognite_neat-0.123.34 → cognite_neat-0.123.36}/cognite/neat/v0/core/_data_model/_constants.py

@@ -128,6 +128,8 @@ SPLIT_ON_EQUAL_PATTERN = re.compile(r"=(?![^(]*\))")
 # Very special Edge Entity parsing
 SPLIT_ON_EDGE_ENTITY_ARGS_PATTERN = re.compile(r"(\btype\b|\bproperties\b|\bdirection\b)\s*=\s*([^,]+)")
 
+CONSTRAINT_ID_MAX_LENGTH = 43
+
 
 class _Patterns:
     @cached_property

{cognite_neat-0.123.34 → cognite_neat-0.123.36}/cognite/neat/v0/core/_data_model/models/physical/_exporter.py

@@ -1,3 +1,4 @@
+import hashlib
 import warnings
 from collections import defaultdict
 from collections.abc import Collection, Hashable, Sequence
@@ -25,6 +26,7 @@ from cognite.neat.v0.core._constants import (
     DMS_DIRECT_RELATION_LIST_DEFAULT_LIMIT,
     DMS_PRIMITIVE_LIST_DEFAULT_LIMIT,
 )
+from cognite.neat.v0.core._data_model._constants import CONSTRAINT_ID_MAX_LENGTH
 from cognite.neat.v0.core._data_model.models.data_types import DataType, Double, Enum, Float, LangString, String
 from cognite.neat.v0.core._data_model.models.entities import (
     ConceptEntity,
@@ -409,12 +411,19 @@ class _DMSExporter:
         for container in containers:
             if container.constraints:
                 container.constraints = {
-                    name: const
+                    self._truncate_constraint_name(name): const
                     for name, const in container.constraints.items()
                     if not (isinstance(const, dm.RequiresConstraint) and const.require in container_to_drop)
                 }
         return ContainerApplyDict([container for container in containers if container.as_id() not in container_to_drop])
 
+    @staticmethod
+    def _truncate_constraint_name(name: str) -> str:
+        if len(name) <= CONSTRAINT_ID_MAX_LENGTH:
+            return name
+        half_length = int(CONSTRAINT_ID_MAX_LENGTH / 2)
+        return f"{name[: half_length - 1]}{hashlib.md5(name.encode()).hexdigest()[:half_length]}"
+
     @staticmethod
     def _gather_properties(
         properties: Sequence[PhysicalProperty],

cognite_neat-0.123.36/cognite/neat/v0/plugins/__init__.py

@@ -0,0 +1,4 @@
+from ._data_model import DataModelImporterPlugin, DataModelTransformerPlugin
+from ._manager import get_plugin_manager
+
+__all__ = ["DataModelImporterPlugin", "DataModelTransformerPlugin", "get_plugin_manager"]

cognite_neat-0.123.36/cognite/neat/v0/plugins/_base.py

@@ -0,0 +1,9 @@
+from abc import ABC, abstractmethod
+from typing import Any
+
+
+class NeatPlugin(ABC):
+    @abstractmethod
+    def configure(self, *args: Any, **kwargs: Any) -> Any:
+        """A method that all plugins must implement."""
+        raise NotImplementedError()

cognite_neat-0.123.36/cognite/neat/v0/plugins/_data_model.py

@@ -0,0 +1,48 @@
+from pathlib import Path
+from typing import Any
+
+from cognite.neat.v0.core._data_model.importers._base import BaseImporter
+from cognite.neat.v0.core._data_model.transformers._base import VerifiedDataModelTransformer
+
+from ._base import NeatPlugin
+
+
+class DataModelImporterPlugin(NeatPlugin):
+    """This class is used an interface for data model import plugins.
+    Any plugin that is used for importing data models should inherit from this class.
+    It is expected to implement the `configure` method which returns a configured importer.
+    """
+
+    def configure(self, io: str | Path | None, **kwargs: Any) -> BaseImporter:
+        """Return a configure plugin for data model import.
+        Args:
+            io (str | Path | None): The input/output interface for the plugin.
+            **kwargs (Any): Additional keyword arguments for configuration.
+        Returns:
+            BaseImporter: A configured instance of the BaseImporter.
+        !!! note "Returns"
+            The method must return an instance of `BaseImporter` or its subclasses
+            meaning it must implement the `BaseImporter` interface.
+        """
+
+        raise NotImplementedError()
+
+
+class DataModelTransformerPlugin(NeatPlugin):
+    """This class is used as an interface for data model transformer plugins.
+    Any plugin that is used for transforming data models should inherit from this class.
+    It is expected to implement the `configure` method which returns a configured transformer.
+    """
+
+    def configure(self, **kwargs: Any) -> VerifiedDataModelTransformer:
+        """Return a configure plugin for data model import.
+        Args:
+            **kwargs (Any): Additional keyword arguments for configuration.
+        Returns:
+            VerifiedDataModelTransformer: A configured instance of the VerifiedDataModelTransformer.
+        !!! note "Returns"
+            The method must return an instance of `VerifiedDataModelTransformer` or its subclasses
+            meaning it must implement the `VerifiedDataModelTransformer` interface.
+        """
+
+        raise NotImplementedError()

{cognite_neat-0.123.34 → cognite_neat-0.123.36}/cognite/neat/v0/plugins/_manager.py

@@ -1,21 +1,11 @@
 """Plugin manager for external plugins."""
 
 from importlib import metadata
-from typing import Any, ClassVar, TypeAlias, TypeVar, cast
+from typing import Any, ClassVar
 
+from ._base import NeatPlugin
+from ._data_model import DataModelImporterPlugin, DataModelTransformerPlugin
 from ._issues import PluginDuplicateError, PluginError, PluginLoadingError
-from .data_model.importers import DataModelImporterPlugin
-
-# Here we configure entry points where external plugins are going to be registered.
-plugins_entry_points = {
-    "cognite.neat.v0.plugins.data_model.importers": DataModelImporterPlugin,
-}
-
-#: Type alias for all supported plugin types
-NeatPlugin: TypeAlias = DataModelImporterPlugin
-
-# Generic type variable for plugin types
-T_NeatPlugin = TypeVar("T_NeatPlugin", bound=NeatPlugin)
 
 
 class Plugin:
@@ -48,12 +38,13 @@ class PluginManager:
 
     _plugins_entry_points: ClassVar[dict[str, type[NeatPlugin]]] = {
         "cognite.neat.v0.plugins.data_model.importers": DataModelImporterPlugin,
+        "cognite.neat.v0.plugins.data_model.transformers": DataModelTransformerPlugin,
     }
 
     def __init__(self, plugins: dict[tuple[str, type[NeatPlugin]], Any]) -> None:
         self._plugins = plugins
 
-    def get(self, name: str, type_: type[T_NeatPlugin]) -> type[T_NeatPlugin]:
+    def get(self, name: str, type_: type[NeatPlugin]) -> type[NeatPlugin]:
         """
         Returns desired plugin
 
@@ -63,7 +54,7 @@ class PluginManager:
         """
         try:
             plugin_class = self._plugins[(name, type_)]
-            return cast(type[T_NeatPlugin], plugin_class)
+            return plugin_class
         except KeyError:
             raise PluginError(plugin_name=name, plugin_type=type_.__name__) from None
 

{cognite_neat-0.123.34 → cognite_neat-0.123.36}/cognite/neat/v0/session/_plugin.py

@@ -4,8 +4,7 @@ from typing import Any
 
 from cognite.neat.v0.core._issues._base import IssueList
 from cognite.neat.v0.core._utils.reader._base import NeatReader
-from cognite.neat.v0.plugins import get_plugin_manager
-from cognite.neat.v0.plugins.data_model.importers._base import DataModelImporterPlugin
+from cognite.neat.v0.plugins import DataModelImporterPlugin, get_plugin_manager
 from cognite.neat.v0.session._experimental import ExperimentalFlags
 
 from ._state import SessionState

{cognite_neat-0.123.34 → cognite_neat-0.123.36}/docs/index.md

@@ -41,11 +41,11 @@ The plot below shows the NEAT authorship from the start until present day.
 #### Current authors
 - [Nikola Vasiljević](www.linkedin.com/in/thisisnikola)
 - [Anders Albert](https://www.linkedin.com/in/anders-albert-00790483/)
-- [Rogerio Júnior](https://www.linkedin.com/in/rogerio-saboia-j%C3%BAnior-087118a7/)
 
 #### Former authors
 - [Aleksandrs Livincovs](https://www.linkedin.com/in/aleksandrslivincovs/)
 - [Julia Graham](https://www.linkedin.com/in/julia-graham-959a78a7/)
+- [Rogerio Júnior](https://www.linkedin.com/in/rogerio-saboia-j%C3%BAnior-087118a7/)
 
 ### Contributors
 We are very grateful for the contributions made by:

cognite_neat-0.123.36/last_changelog_entry.md

@@ -0,0 +1,4 @@
+
+### Fixed
+
+- Constraint IDs >=43 chars are now replace 1/2 original 1/2 MD5-hashed

cognite_neat-0.123.36/last_git_message.txt

@@ -0,0 +1,19 @@
+THIS-363 MD5 hashing of long constraint ids (#1295)
+
+# Description
+
+Fixes an issue where container constraint IDs longer than 43 characters
+caused errors.
+Now, such IDs are hashed using MD5, we keep 1/2 of the original id,
+remaining is replaced by MD5 hash.
+
+## Bump
+
+- [x] Patch
+- [ ] Minor
+- [ ] Skip
+
+## Changelog
+### Fixed
+
+- Constraint IDs >=43 chars are now replace 1/2 original 1/2 MD5-hashed

cognite_neat-0.123.36/last_version.txt

@@ -0,0 +1 @@
+0.123.35

{cognite_neat-0.123.34 → cognite_neat-0.123.36}/pyproject.toml

@@ -1,12 +1,11 @@
 [project]
 name = "cognite-neat"
-version = "0.123.34"
+version = "0.123.36"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [
     {name="Nikola Vasiljevic", email="nikola.vasiljevic@cognite.com"},
     {name="Anders Albert", email="anders.albert@cognite.com"},
-    {name="Rogerio Júnior", email="rogerio.junior@cognite.com"},
 ]
 license = "Apache-2.0"
 requires-python = ">=3.10"

{cognite_neat-0.123.34 → cognite_neat-0.123.36}/tests/v0/tests_unit/test_plugins.py

@@ -11,13 +11,12 @@ from cognite.neat.v0.core._data_model.importers._spreadsheet2data_model import E
 from cognite.neat.v0.core._data_model.models.conceptual._verified import (
     ConceptualDataModel,
 )
-from cognite.neat.v0.plugins import _manager
+from cognite.neat.v0.plugins import DataModelImporterPlugin, _manager
 from cognite.neat.v0.plugins._issues import (
     PluginDuplicateError,
     PluginLoadingError,
 )
 from cognite.neat.v0.plugins._manager import PluginManager
-from cognite.neat.v0.plugins.data_model.importers import DataModelImporterPlugin
 from tests.v0.data import SchemaData
 
 

{cognite_neat-0.123.34 → cognite_neat-0.123.36}/tests/v0/tests_unit/test_rules/test_exporters/test_rules2dms.py

@@ -13,6 +13,7 @@ from cognite.neat.v0.core._client.testing import monkeypatch_neat_client
 from cognite.neat.v0.core._data_model import importers
 from cognite.neat.v0.core._data_model.exporters import DMSExporter
 from cognite.neat.v0.core._data_model.models import ConceptualDataModel
+from cognite.neat.v0.core._data_model.models.entities._single_value import ContainerEntity
 from cognite.neat.v0.core._data_model.models.physical import PhysicalDataModel
 from cognite.neat.v0.core._data_model.transformers import (
     ConceptualToPhysical,
@@ -42,6 +43,31 @@ class TestDMSExporter:
         first_container = next(iter(schema.containers.values()))
         assert first_container.properties["geoLocation"].default_value is None
 
+    def test_export_dms_schema_with_constraint_above_43_characters(self, alice_rules: PhysicalDataModel) -> None:
+        rules = alice_rules.model_copy(deep=True)
+
+        # purposely making the constraint name above 43 characters
+        rules.containers[0].constraint = [
+            ContainerEntity(
+                space="super-long-space-name-that-leads-to-a-very-long-container-constraint-identifier-that-exceeds-43-characters",
+                externalId="AlsoVeryLongContainerNameBecauseWhyNotSinceWeAreTestingEdgeCases",
+            )
+        ]
+        rules.containers[1].constraint = [
+            ContainerEntity(
+                space="super-long-space-name-that-leads-to-a-very-long-container-constraint-identifier-that-exceeds-43-characters",
+                externalId="AlsoVeryLongContainerNameBecauseWhyNotSinceWeAreTestingEdgeCasesW",
+            )
+        ]
+
+        exporter = DMSExporter()
+        schema = exporter.export(rules)
+        first_container = schema.containers[rules.containers[0].container.as_id()]
+        assert list(first_container.constraints.keys()) == ["super-long-space-nam9ca8737c0d83dc22406be"]
+
+        second_container = schema.containers[rules.containers[1].container.as_id()]
+        assert next(iter(second_container.constraints.keys())) != next(iter(first_container.constraints.keys()))
+
     def test_export_dms_schema_to_zip(self, alice_rules: PhysicalDataModel, tmp_path: Path) -> None:
         exporter = DMSExporter()
         schema = exporter.export(alice_rules)

{cognite_neat-0.123.34 → cognite_neat-0.123.36}/uv.lock

@@ -346,7 +346,7 @@ wheels = [
 
 [[package]]
 name = "cognite-neat"
-version = "0.123.34"
+version = "0.123.36"
 source = { editable = "." }
 dependencies = [
     { name = "backports-strenum", marker = "python_full_version < '3.11'" },

cognite_neat-0.123.34/.github/CODEOWNERS

@@ -1,2 +0,0 @@
-* @cognitedata/iknow
-

cognite_neat-0.123.34/cognite/neat/_version.py

@@ -1,2 +0,0 @@
-__version__ = "0.123.34"
-__engine__ = "^2.0.4"

cognite_neat-0.123.34/cognite/neat/v0/plugins/__init__.py

@@ -1,3 +0,0 @@
-from ._manager import get_plugin_manager
-
-__all__ = ["get_plugin_manager"]

cognite_neat-0.123.34/cognite/neat/v0/plugins/data_model/importers/__init__.py

@@ -1,5 +0,0 @@
-from ._base import DataModelImporterPlugin
-
-__all__ = [
-    "DataModelImporterPlugin",
-]

cognite_neat-0.123.34/cognite/neat/v0/plugins/data_model/importers/_base.py

@@ -1,28 +0,0 @@
-from pathlib import Path
-from typing import Any
-
-from cognite.neat.v0.core._data_model.importers._base import BaseImporter
-
-
-class DataModelImporterPlugin:
-    """This class is used an interface for data model import plugins.
-    Any plugin that is used for importing data models should inherit from this class.
-    It is expected to implement the `configure` method which returns a configured importer.
-    """
-
-    def configure(self, io: str | Path | None, **kwargs: Any) -> BaseImporter:
-        """Return a configure plugin for data model import.
-
-        Args:
-            io (str | Path | None): The input/output interface for the plugin.
-            **kwargs (Any): Additional keyword arguments for configuration.
-
-        Returns:
-            BaseImporter: A configured instance of the BaseImporter.
-
-        !!! note "Returns"
-            The method must return an instance of `BaseImporter` or its subclasses
-            meaning it must implement the `BaseImporter` interface.
-        """
-
-        raise NotImplementedError()

cognite_neat-0.123.34/last_changelog_entry.md

@@ -1,3 +0,0 @@
-### Added
-
-- Entities, data types, constants to new data_model module

cognite_neat-0.123.34/last_git_message.txt

@@ -1,30 +0,0 @@
-Refactoring dm adding key entities datatypes (#1281)
-
-# Description
-
-This is **2** of a number of PR that are focused on refactoring neat
-data model features to be exposed as Toolkit plugin. In this specific PR
-important parts of _constants.py has been copied, _identifies.py has
-been moved to better place, necessary pydantic models have been moved
-from `_single_values.py` and `data_types.py` are moved and simplified to
-_base.py and _data_types.py. Major change is dropping of parsing of
-strings, as now we have dedicated AST for that (in review).
-
-To Risk Reviewers: No new features added, only pieces of code moved to
-the new module. Added roughly 150 lines of code for tests. This is
-stacked PR!
-
-## Bump
-
-- [x] Patch
-- [ ] Minor
-- [ ] Skip
-
-## Changelog
-### Added
-
-- Entities, data types, constants to new data_model module
-
----------
-
-Co-authored-by: Anders Albert <60234212+doctrino@users.noreply.github.com>

cognite_neat-0.123.34/last_version.txt

@@ -1 +0,0 @@
-0.123.33