cognite-neat 0.75.1__tar.gz → 0.75.3__tar.gz

{cognite_neat-0.75.1 → cognite_neat-0.75.3}/PKG-INFO

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

cognite_neat-0.75.3/cognite/neat/_version.py

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

{cognite_neat-0.75.1 → cognite_neat-0.75.3}/cognite/neat/rules/importers/_dms2rules.py

@@ -152,6 +152,7 @@ class DMSImporter(BaseImporter):
                             class_=class_entity,
                             property_=prop_id,
                             description=prop.description,
+                            name=prop.name,
                             value_type=cast(ViewPropEntity | DMSValueType, direct_value_type),
                             relation="direct",
                             nullable=container_prop.nullable,
@@ -169,6 +170,7 @@ class DMSImporter(BaseImporter):
                             class_=ClassEntity(prefix=view.space, suffix=view.external_id, version=view.version),
                             property_=prop_id,
                             description=prop.description,
+                            name=prop.name,
                             value_type=cast(ViewPropEntity | DMSValueType, container_prop.type._type),
                             nullable=container_prop.nullable,
                             is_list=container_prop.type.is_list,
@@ -187,6 +189,7 @@ class DMSImporter(BaseImporter):
                         property_=prop_id,
                         relation="multiedge",
                         description=prop.description,
+                        name=prop.name,
                         value_type=view_entity,
                         view=ViewEntity.from_id(view.as_id()),
                         view_property=prop_id,

{cognite_neat-0.75.1 → cognite_neat-0.75.3}/cognite/neat/rules/issues/dms.py

@@ -206,7 +206,7 @@ class DirectRelationMissingSourceWarning(DMSSchemaWarning):
 
 @dataclass(frozen=True)
 class ContainerPropertyUsedMultipleTimesError(DMSSchemaError):
-    description = "The container property is used multiple times by the same view"
+    description = "The container property is used multiple times by the same view property"
     fix = "Use unique container properties for when mapping to the same container"
     error_name: ClassVar[str] = "ContainerPropertyUsedMultipleTimes"
     container: dm.ContainerId

{cognite_neat-0.75.1 → cognite_neat-0.75.3}/cognite/neat/rules/models/rules/_dms_architect_rules.py

@@ -266,6 +266,7 @@ class DMSView(SheetEntity):
             class_=ClassEntity(prefix=view.space, suffix=view.external_id),
             view=ViewType(prefix=view.space, suffix=view.external_id, version=view.version),
             description=view.description,
+            name=view.name,
             implements=[
                 ViewType(prefix=parent.space, suffix=parent.external_id, version=parent.version)
                 for parent in view.implements
@@ -802,6 +803,8 @@ class _DMSExporter:
                         ),
                         source=source,
                         direction="outwards",
+                        name=prop.name,
+                        description=prop.description,
                     )
                 elif prop.container and prop.container_property and prop.view_property:
                     container_prop_identifier = prop.container_property
@@ -816,6 +819,8 @@ class _DMSExporter:
                     view_property = dm.MappedPropertyApply(
                         container=prop.container.as_id(default_space),
                         container_property_identifier=container_prop_identifier,
+                        name=prop.name,
+                        description=prop.description,
                         **extra_args,
                     )
                 elif prop.view and prop.view_property and prop.relation == "multiedge":
@@ -842,6 +847,8 @@ class _DMSExporter:
                         type=edge_type,
                         source=source,
                         direction="outwards",
+                        name=prop.name,
+                        description=prop.description,
                     )
                 elif prop.view and prop.view_property and prop.relation == "reversedirect":
                     if isinstance(prop.value_type, ViewPropEntity):
@@ -880,6 +887,8 @@ class _DMSExporter:
                             type=edge_type,
                             source=source,
                             direction="inwards",
+                            name=prop.name,
+                            description=prop.description,
                         )
                     else:
                         args: dict[str, Any] = dict(
@@ -905,8 +914,8 @@ class _DMSExporter:
                     continue
                 else:
                     continue
-                prop_name = prop.view_property
-                view.properties[prop_name] = view_property
+                prop_id = prop.view_property
+                view.properties[prop_id] = view_property
 
         node_types = dm.NodeApplyList([])
         parent_views = {parent for view in views for parent in view.implements or []}
@@ -971,10 +980,10 @@ class _DMSExporter:
                 else:
                     type_cls = dm.DirectRelation
 
-                prop_name = prop.container_property
+                prop_id = prop.container_property
 
                 if type_cls is dm.DirectRelation:
-                    container.properties[prop_name] = dm.ContainerProperty(
+                    container.properties[prop_id] = dm.ContainerProperty(
                         type=dm.DirectRelation(),
                         nullable=prop.nullable if prop.nullable is not None else True,
                         default_value=prop.default,
@@ -984,7 +993,7 @@ class _DMSExporter:
                 else:
                     type_: CognitePropertyType
                     type_ = type_cls(is_list=prop.is_list or False)
-                    container.properties[prop_name] = dm.ContainerProperty(
+                    container.properties[prop_id] = dm.ContainerProperty(
                         type=type_,
                         nullable=prop.nullable if prop.nullable is not None else True,
                         default_value=prop.default,

{cognite_neat-0.75.1 → cognite_neat-0.75.3}/cognite/neat/rules/models/rules/_dms_schema.py

@@ -332,12 +332,20 @@ class DMSSchema:
                 ):
                     errors.add(MissingEdgeViewError(view=prop.edge_source, property=prop_name, referred_by=view_id))
 
+            # This allows for multiple view properties to be mapped to the same container property,
+            # as long as they have different external_id, otherwise this will lead to raising
+            # error ContainerPropertyUsedMultipleTimesError
             property_count = Counter(
-                (prop.container, prop.container_property_identifier)
-                for prop in (view.properties or {}).values()
+                (prop.container, prop.container_property_identifier, view_property_identifier)
+                for view_property_identifier, prop in (view.properties or {}).items()
                 if isinstance(prop, dm.MappedPropertyApply)
             )
-            for (container_id, container_property_identifier), count in property_count.items():
+
+            for (
+                container_id,
+                container_property_identifier,
+                _,
+            ), count in property_count.items():
                 if count > 1:
                     view_properties = [
                         prop_name

{cognite_neat-0.75.1 → cognite_neat-0.75.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cognite-neat"
-version = "0.75.1"
+version = "0.75.3"
 readme = "README.md"
 description = "Knowledge graph transformation"
 authors = [

cognite_neat-0.75.1/cognite/neat/_version.py

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