cognite-neat 0.77.10__py3-none-any.whl → 0.78.0__py3-none-any.whl

cognite/neat/_version.py

@@ -1 +1 @@
-__version__ = "0.77.10"
+__version__ = "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/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/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.10.dist-info → cognite_neat-0.78.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-neat
-Version: 0.77.10
+Version: 0.78.0
 Summary: Knowledge graph transformation
 Home-page: https://cognite-neat.readthedocs-hosted.com/
 License: Apache-2.0

{cognite_neat-0.77.10.dist-info → cognite_neat-0.78.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cognite/neat/__init__.py,sha256=v-rRiDOgZ3sQSMQKq0vgUQZvpeOkoHFXissAx6Ktg84,61
-cognite/neat/_version.py,sha256=-swOEBp1OmcqYEuvtO9gV117lIY0GkQSzACgRA9L1AE,24
+cognite/neat/_version.py,sha256=c66Ro55TMfP42f5YzH82UTnUBBvi0RwfY4nXmvb0W50,23
 cognite/neat/app/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/app/api/asgi/metrics.py,sha256=nxFy7L5cChTI0a-zkCiJ59Aq8yLuIJp5c9Dg0wRXtV0,152
 cognite/neat/app/api/configuration.py,sha256=2U5M6M252swvQPQyooA1EBzFUZNtcTmuSaywfJDgckM,4232
@@ -178,7 +178,7 @@ cognite/neat/rules/importers/_dtdl2rules/_unit_lookup.py,sha256=wW4saKva61Q_i17g
 cognite/neat/rules/importers/_dtdl2rules/dtdl_converter.py,sha256=ysmWUxZ0npwrTB0uiH5jA0v37sfCwowGaYk17IyxPUU,12663
 cognite/neat/rules/importers/_dtdl2rules/dtdl_importer.py,sha256=QDyGt5YBaxzF4v_oCFSgKRSpwVdVruDU3-VW0DEiHbY,6718
 cognite/neat/rules/importers/_dtdl2rules/spec.py,sha256=tim_MfN1J0F3Oeqk3BMgIA82d_MZvhRuRMsLK3B4PYc,11897
-cognite/neat/rules/importers/_inference2rules.py,sha256=VYs4SCYQk3OMJnCkpJ-fTsK73OfK8cOyYXBAdYI3_WU,9389
+cognite/neat/rules/importers/_inference2rules.py,sha256=Jkq058al1NNGvVxrYZsv5y2-hFXt3CtGq9S1V5Vqbj8,10765
 cognite/neat/rules/importers/_owl2rules/__init__.py,sha256=tdGcrgtozdQyST-pTlxIa4cLBNTLvtk1nNYR4vOdFSw,63
 cognite/neat/rules/importers/_owl2rules/_owl2classes.py,sha256=LInFeBq-NbBIuMEAwgWch2a4DbBUt4_OMqPkwehW-sw,7591
 cognite/neat/rules/importers/_owl2rules/_owl2metadata.py,sha256=NdPN0dBB0NYkAcfC0yrYdIrGfdPbl5gfeGnSV3EtUPM,7786
@@ -210,7 +210,7 @@ cognite/neat/rules/models/dms/_schema.py,sha256=A4z8CINmLQgWzHoScxejRPMRo40ngKly
 cognite/neat/rules/models/dms/_serializer.py,sha256=iqp2zyyf8jEcU-R3PERuN8nu248xIqyxiWj4owAn92g,6406
 cognite/neat/rules/models/dms/_validation.py,sha256=nPSyfM1vGZ7d9Uv_2vF2HvMetygtehXW7eNtPD6eW8E,13937
 cognite/neat/rules/models/domain.py,sha256=tkKcHvDXnZ5IkOr1wHiuNBtE1h8OCFmf6GZSqzHzxjI,2814
-cognite/neat/rules/models/entities.py,sha256=iBG84Jr1qQ7PvkMJUJzJ1oWApeONb1IACixdJSztUhk,16395
+cognite/neat/rules/models/entities.py,sha256=SuVPDVZdf18Mx7h5BgrF8HVojWq_X3cFyCDoTA_sOIU,16686
 cognite/neat/rules/models/information/__init__.py,sha256=HR6g8xgyU53U7Ck8pPdbT70817Q4NC1r1pCRq5SA8iw,291
 cognite/neat/rules/models/information/_converter.py,sha256=JN63_G5bygdL5WCz-q0_ygiU0NHkzUxm5mZ3WD8yUes,11029
 cognite/neat/rules/models/information/_rules.py,sha256=tdCjvAtqnFzEo2zcx-BZHmvjSs28gVun2wz8UaT-AOA,13268
@@ -230,7 +230,7 @@ cognite/neat/utils/cdf_loaders/data_classes.py,sha256=0apspfwVlFltYOZfmk_PNknS3Z
 cognite/neat/utils/exceptions.py,sha256=-w4cAcvcoWLf-_ZwAl7QV_NysfqtQzIOd1Ti-mpxJgM,981
 cognite/neat/utils/spreadsheet.py,sha256=LI0c7dlW0zXHkHw0NvB-gg6Df6cDcE3FbiaHBYLXdzQ,2714
 cognite/neat/utils/text.py,sha256=4bg1_Q0lg7KsoxaDOvXrVyeY78BJN8i-27BlyDzUCls,3082
-cognite/neat/utils/utils.py,sha256=VlMRlnpncvf7B4ccQzY91nLkErgYg_mAetS6zu2Yj3o,12818
+cognite/neat/utils/utils.py,sha256=gcbBbuUSm7xJhgU7ZRzeNc4eJtDVCS2CdNhbGP9gLq4,12919
 cognite/neat/utils/xml.py,sha256=ppLT3lQKVp8wOP-m8-tFY8uB2P4R76l7R_-kUtsABng,992
 cognite/neat/workflows/__init__.py,sha256=oiKub_U9f5cA0I1nKl5dFkR4BD8_6Be9eMzQ_50PwP0,396
 cognite/neat/workflows/_exceptions.py,sha256=ugI_X1XNpikAiL8zIggBjcx6q7WvOpRIgvxHrj2Rhr4,1348
@@ -276,8 +276,8 @@ cognite/neat/workflows/steps_registry.py,sha256=fkTX14ZA7_gkUYfWIlx7A1XbCidvqR23
 cognite/neat/workflows/tasks.py,sha256=dqlJwKAb0jlkl7abbY8RRz3m7MT4SK8-7cntMWkOYjw,788
 cognite/neat/workflows/triggers.py,sha256=_BLNplzoz0iic367u1mhHMHiUrCwP-SLK6_CZzfODX0,7071
 cognite/neat/workflows/utils.py,sha256=gKdy3RLG7ctRhbCRwaDIWpL9Mi98zm56-d4jfHDqP1E,453
-cognite_neat-0.77.10.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.77.10.dist-info/METADATA,sha256=ioQ2hIZ3OVqhuHAAeHK1WePxy_c5Hu_n231b-m8E2R4,9307
-cognite_neat-0.77.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cognite_neat-0.77.10.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
-cognite_neat-0.77.10.dist-info/RECORD,,
+cognite_neat-0.78.0.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.78.0.dist-info/METADATA,sha256=I1IHVLVE_UkRsT2HM3vP3OtoE2AmEe_XaAi8wxFl1sY,9306
+cognite_neat-0.78.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cognite_neat-0.78.0.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
+cognite_neat-0.78.0.dist-info/RECORD,,