cognite-neat 0.77.9__tar.gz → 0.78.0__tar.gz

{cognite_neat-0.77.9 → cognite_neat-0.78.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-neat
-Version: 0.77.9
+Version: 0.78.0
 Summary: Knowledge graph transformation
 Home-page: https://cognite-neat.readthedocs-hosted.com/
 License: Apache-2.0
@@ -50,7 +50,7 @@ Requires-Dist: schedule (>=1,<2)
 Requires-Dist: tomli (>=2.0.1,<3.0.0) ; python_version < "3.11"
 Requires-Dist: typing_extensions (>=4.8,<5.0) ; python_version < "3.11"
 Requires-Dist: urllib3 (>=2,<3)
-Requires-Dist: uvicorn[standard] (>=0.29.0,<0.30.0)
+Requires-Dist: uvicorn[standard] (>=0,<1)
 Project-URL: Documentation, https://cognite-neat.readthedocs-hosted.com/
 Project-URL: Repository, https://github.com/cognitedata/neat
 Description-Content-Type: text/markdown

cognite_neat-0.78.0/cognite/neat/_version.py

@@ -0,0 +1 @@
+__version__ = "0.78.0"

{cognite_neat-0.77.9 → cognite_neat-0.78.0}/cognite/neat/rules/importers/_inference2rules.py

@@ -11,11 +11,12 @@ from cognite.neat.rules.importers._base import BaseImporter, Rules, _handle_issu
 from cognite.neat.rules.issues import IssueList
 from cognite.neat.rules.models import InformationRules, RoleTypes
 from cognite.neat.rules.models._base import MatchType
+from cognite.neat.rules.models.entities import ClassEntity
 from cognite.neat.rules.models.information import (
     InformationMetadata,
     InformationRulesInput,
 )
-from cognite.neat.utils.utils import get_namespace, remove_namespace
+from cognite.neat.utils.utils import get_namespace, remove_namespace, replace_non_alphanumeric_with_underscore
 
 ORDERED_CLASSES_QUERY = """SELECT ?class (count(?s) as ?instances )
                            WHERE { ?s a ?class . }
@@ -106,7 +107,7 @@ class InferenceImporter(BaseImporter):
             return self._return_or_raise(self.issue_list, errors)
 
         if self.make_compliant and rules:
-            rules = self._make_dms_compliant_rules(rules)
+            self._make_dms_compliant_rules(rules)
 
         return self._to_output(
             rules,
@@ -172,7 +173,7 @@ class InferenceImporter(BaseImporter):
                     definition = {
                         "class_": class_id,
                         "property_": property_id,
-                        "max_occurrence": cast(RdfLiteral, occurrence).value,
+                        "max_count": cast(RdfLiteral, occurrence).value,
                         "value_type": value_type_id,
                         "reference": property_uri,
                     }
@@ -180,7 +181,6 @@ class InferenceImporter(BaseImporter):
                     # USE CASE 1: If property is not present in properties
                     if id_ not in properties:
                         properties[id_] = definition
-
                     # USE CASE 2: If property is present in properties but with different max count
                     elif id_ in properties and not (properties[id_]["max_count"] == definition["max_count"]):
                         properties[id_]["max_count"] = max(properties[id_]["max_count"], definition["max_count"])
@@ -217,5 +217,36 @@ class InferenceImporter(BaseImporter):
         )
 
     @classmethod
-    def _make_dms_compliant_rules(cls, rules: InformationRules) -> InformationRules:
-        raise NotImplementedError("Compliance with DMS is not supported yet.")
+    def _make_dms_compliant_rules(cls, rules: InformationRules) -> None:
+        cls._fix_property_redefinition(rules)
+        cls._fix_naming_of_entities(rules)
+
+    @classmethod
+    def _fix_property_redefinition(cls, rules: InformationRules) -> None:
+        seen = set()
+        for i, property_ in enumerate(rules.properties.data):
+            prop_id = f"{property_.class_}.{property_.property_}"
+            if prop_id in seen:
+                property_.property_ = f"{property_.property_}_{i+1}"
+                seen.add(f"{property_.class_}.{property_.property_}")
+            else:
+                seen.add(prop_id)
+
+    @classmethod
+    def _fix_naming_of_entities(cls, rules: InformationRules) -> None:
+        # Fixing class ids
+        for class_ in rules.classes:
+            class_.class_ = class_.class_.as_dms_compliant_entity()
+            class_.parent = [parent.as_dms_compliant_entity() for parent in class_.parent] if class_.parent else None
+
+        # Fixing property definitions
+        for property_ in rules.properties:
+            # fix class id
+            property_.class_ = property_.class_.as_dms_compliant_entity()
+
+            # fix property id
+            property_.property_ = replace_non_alphanumeric_with_underscore(property_.property_)
+
+            # fix value type
+            if isinstance(property_.value_type, ClassEntity):
+                property_.value_type = property_.value_type.as_dms_compliant_entity()

{cognite_neat-0.77.9 → cognite_neat-0.78.0}/cognite/neat/rules/models/entities.py

@@ -7,6 +7,8 @@ from typing import Annotated, Any, ClassVar, Generic, TypeVar, cast
 from cognite.client.data_classes.data_modeling.ids import ContainerId, DataModelId, NodeId, PropertyId, ViewId
 from pydantic import AnyHttpUrl, BaseModel, BeforeValidator, Field, PlainSerializer, model_serializer, model_validator
 
+from cognite.neat.utils.utils import replace_non_alphanumeric_with_underscore
+
 if sys.version_info >= (3, 11):
     from enum import StrEnum
     from typing import Self
@@ -231,6 +233,11 @@ class ClassEntity(Entity):
         space = default_space if isinstance(self.prefix, _UndefinedType) else self.prefix
         return ContainerEntity(space=space, externalId=str(self.suffix))
 
+    def as_dms_compliant_entity(self) -> "Self":
+        new_entity = self.model_copy(deep=True)
+        new_entity.suffix = replace_non_alphanumeric_with_underscore(new_entity.suffix)
+        return new_entity
+
 
 class ParentClassEntity(ClassEntity):
     type_: ClassVar[EntityTypes] = EntityTypes.parent_class

{cognite_neat-0.77.9 → cognite_neat-0.78.0}/cognite/neat/utils/utils.py

@@ -1,5 +1,6 @@
 import hashlib
 import logging
+import re
 import sys
 import time
 from collections import OrderedDict
@@ -350,3 +351,7 @@ def get_inheritance_path(child: Any, child_parent: dict[Any, list[Any]]) -> list
         for parent in child_parent[child]:
             path.extend(get_inheritance_path(parent, child_parent))
     return path
+
+
+def replace_non_alphanumeric_with_underscore(text):
+    return re.sub(r"\W+", "_", text)

{cognite_neat-0.77.9 → cognite_neat-0.78.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cognite-neat"
-version = "0.77.9"
+version = "0.78.0"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [
@@ -71,7 +71,7 @@ exceptiongroup = { version = "^1.1.3", python = "<3.11" }
 typing_extensions = { version = "^4.8", python = "<3.11" }
 tomli = { version = "^2.0.1", python = "<3.11" }
 
-uvicorn = { extras = ["standard"], version = "^0.29.0" }
+uvicorn = { extras = ["standard"], version = "^0" }
 prometheus-client = "^0.20.0"
 cognite-sdk = "^7.37.0"
 deepdiff = "*"

cognite_neat-0.77.9/cognite/neat/_version.py

@@ -1 +0,0 @@
-__version__ = "0.77.9"