cognite-neat 0.114.0__py3-none-any.whl → 0.115.0__py3-none-any.whl

cognite/neat/_rules/transformers/_converters.py

@@ -716,9 +716,9 @@ class ToEnterpriseModel(ToExtensionModel):
                 view=view_entity,
                 view_property=property_id,
                 value_type=String(),
-                nullable=True,
+                min_count=0,
                 immutable=False,
-                is_list=False,
+                max_count=1,
                 container=container_entity,
                 container_property=property_id,
             )
@@ -923,9 +923,9 @@ class ToSolutionModel(ToExtensionModel):
                         view=view.view,
                         view_property=f"{prefix}{self.dummy_property}",
                         value_type=String(),
-                        nullable=True,
+                        min_count=0,
+                        max_count=1,
                         immutable=False,
-                        is_list=False,
                         container=container_entity,
                         container_property=f"{prefix}{self.dummy_property}",
                     )
@@ -942,9 +942,9 @@ class ToSolutionModel(ToExtensionModel):
                         view=view.view,
                         view_property=self.direct_property,
                         value_type=read_view,
-                        nullable=True,
+                        min_count=0,
+                        max_count=1,
                         immutable=False,
-                        is_list=False,
                         container=container_entity,
                         container_property=self.direct_property,
                     )
@@ -1528,12 +1528,17 @@ class _InformationRulesConverter:
 
         container: ContainerEntity | None = None
         container_property: str | None = None
-        is_list: bool | None = info_property.is_list
-        nullable: bool | None = not info_property.is_mandatory
+        # DMS should have min count of either 0 or 1
+        min_count = min(1, max(0, info_property.min_count or 0))
+        max_count = info_property.max_count
         if isinstance(connection, EdgeEntity):
-            nullable = None
+            min_count = 0
+            max_count = 1 if max_count == 1 else float("inf")
+        elif isinstance(connection, ReverseConnectionEntity):
+            min_count = 0
+            max_count = 1 if max_count == 1 else float("inf")
         elif connection == "direct":
-            nullable = True
+            min_count = 0
             container, container_property = self._get_container(info_property, default_space)
         else:
             container, container_property = self._get_container(info_property, default_space)
@@ -1541,8 +1546,8 @@ class _InformationRulesConverter:
         dms_property = DMSProperty(
             name=info_property.name,
             value_type=value_type,
-            nullable=nullable,
-            is_list=is_list,
+            min_count=min_count,
+            max_count=max_count,
             connection=connection,
             default=info_property.default,
             container=container,
@@ -1570,7 +1575,9 @@ class _InformationRulesConverter:
         ):
             edge_value_type = edge_value_types_by_class_property_pair[(prop.class_, prop.property_)]
             return EdgeEntity(properties=edge_value_type.as_view_entity(default_space, default_version))
-        if isinstance(value_type, ViewEntity) and prop.is_list:
+        if isinstance(value_type, ViewEntity) and (
+            prop.max_count in {float("inf"), None} or (isinstance(prop.max_count, int | float) and prop.max_count > 1)
+        ):
             return EdgeEntity()
         elif isinstance(value_type, ViewEntity):
             return "direct"
@@ -1759,8 +1766,8 @@ class _DMSRulesConverter:
                 property_=property_.view_property,
                 value_type=value_type,
                 description=property_.description,
-                min_count=(0 if property_.nullable or property_.nullable is None else 1),
-                max_count=(float("inf") if property_.is_list or property_.nullable is None else 1),
+                min_count=property_.min_count,
+                max_count=property_.max_count,
             )
 
             # Linking

cognite/neat/_rules/transformers/_mapping.py

@@ -112,7 +112,7 @@ class RuleMapper(VerifiedRulesTransformer[DMSRules, DMSRules]):
     """
 
     _mapping_fields: ClassVar[frozenset[str]] = frozenset(
-        ["connection", "value_type", "nullable", "immutable", "is_list", "default", "index", "constraint"]
+        ["connection", "value_type", "min_count", "immutable", "max_count", "default", "index", "constraint"]
     )
 
     def __init__(self, mapping: DMSRules, data_type_conflict: Literal["overwrite"] = "overwrite") -> None:

cognite/neat/_session/_state.py

@@ -33,7 +33,6 @@ class SessionState:
     def rule_transform(self, *transformer: VerifiedRulesTransformer) -> IssueList:
         if not transformer:
             raise NeatSessionError("No transformers provided.")
-
         start = self.rule_store.provenance[-1].target_entity.display_name
         issues = self.rule_store.transform(*transformer)
         last_entity = self.rule_store.provenance[-1].target_entity

cognite/neat/_version.py

@@ -1,2 +1,2 @@
-__version__ = "0.114.0"
+__version__ = "0.115.0"
 __engine__ = "^2.0.4"

{cognite_neat-0.114.0.dist-info → cognite_neat-0.115.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cognite-neat
-Version: 0.114.0
+Version: 0.115.0
 Summary: Knowledge graph transformation
 License: Apache-2.0
 Author: Nikola Vasiljevic

{cognite_neat-0.114.0.dist-info → cognite_neat-0.115.0.dist-info}/RECORD

@@ -11,7 +11,7 @@ cognite/neat/_client/data_classes/neat_sequence.py,sha256=QZWSfWnwk6KlYJvsInco4W
 cognite/neat/_client/data_classes/schema.py,sha256=jPFTIKrZI0qZtwu1Bc1m3aLu_VbxIEkhZCneHpIbNkc,23205
 cognite/neat/_client/testing.py,sha256=M5WUzi3YbtZAN22TXas0SjvMSxmjPFT5m3lNwR0MVkI,1077
 cognite/neat/_config.py,sha256=WT1BS8uADcFvGoUYOOfwFOVq_VBl472TisdoA3wLick,280
-cognite/neat/_constants.py,sha256=5yqCdCckVDu4uVycN3gPrYNpoe8XLEhdzxiXt9X-LQs,6300
+cognite/neat/_constants.py,sha256=7kVPHMxOHRxa1WYZ0yybnPc2ksWyN_lYzqAhj2sXtd8,6500
 cognite/neat/_graph/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/_graph/_shared.py,sha256=6avH6mtjxjHI7JDLkXwICxGvZwooGBr6APs1_w1To-A,940
 cognite/neat/_graph/_tracking/__init__.py,sha256=WOwsYieZtCW-iW15YkxUFrfKVVdLWdXHOGGStTwvE8A,91
@@ -44,7 +44,7 @@ cognite/neat/_graph/extractors/_raw.py,sha256=xU3SmeLBCeqbs1WBdGCge8ZMnlOU6wgkKX
 cognite/neat/_graph/extractors/_rdf_file.py,sha256=vz145N1_ZDAlAzCuMiv2z5-7Z4nG2fciLMnl9OpEc3M,2857
 cognite/neat/_graph/loaders/__init__.py,sha256=XS6vwmxgBzntg7UuG_ct_1hfhShVnFH5u0gGrdA8WfA,699
 cognite/neat/_graph/loaders/_base.py,sha256=Xq91-4GeQF2XN90-QgEFCU4aJabBXkeFeFXS2k4mWU4,4472
-cognite/neat/_graph/loaders/_rdf2dms.py,sha256=2EpuElmYFjfDFp7DCccV4ruQvhFefdb5cSTz5OnMuag,32400
+cognite/neat/_graph/loaders/_rdf2dms.py,sha256=6vra-B4jtMzVjV7d_c1Oxa6SNo6Nhzpc8oz5lsPE2mA,32432
 cognite/neat/_graph/queries/__init__.py,sha256=BgDd-037kvtWwAoGAy8eORVNMiZ5-E9sIV0txIpeaN4,50
 cognite/neat/_graph/queries/_base.py,sha256=xs_kCiqQFJfaPyYrKhpyPIAvyDOf19RgYcdg3WxjB6s,19344
 cognite/neat/_graph/transformers/__init__.py,sha256=YzC1Z8BuT77NwagWX4Z-F9R9BARLSS7zM4bCdxBbqKg,1761
@@ -65,11 +65,11 @@ cognite/neat/_issues/errors/_properties.py,sha256=T_nquQeEQS3DQY--DQ13acxhGX_-gp
 cognite/neat/_issues/errors/_resources.py,sha256=qndhGGPdulWpU7G4PkFHsF4Bjflf3lehGV4A0l-BeNI,3966
 cognite/neat/_issues/errors/_wrapper.py,sha256=QkAjvryW5RFZV8sSRXu-EFtnZaxH2GO5g67rxXwPFUo,2307
 cognite/neat/_issues/formatters.py,sha256=XgtfnnDkXY_LE8xPpFfm2N9yXN6aY4d9NZhsix_WgHo,3315
-cognite/neat/_issues/warnings/__init__.py,sha256=dkrlKW0ykp0mw5uwN12oBeYFtb-KDefdt1uP-ak-1Ug,2941
+cognite/neat/_issues/warnings/__init__.py,sha256=gzDoEUMXSZ9E7sTlh7w5Bwqo82aYTGCoSvPmWpsoJuA,3010
 cognite/neat/_issues/warnings/_external.py,sha256=O5GSRmIsAC6HyToQ7itpFFNILWCAg0OehPTVUy8pTuc,1319
-cognite/neat/_issues/warnings/_general.py,sha256=idZZZDbeSrDJJ1PomdmIO40QsZQNn_lWztWvMA-9q50,782
+cognite/neat/_issues/warnings/_general.py,sha256=nQEWlYuF3VRAb51l6TnsxpsGtUUGhR1n0bwuS_GRho4,967
 cognite/neat/_issues/warnings/_models.py,sha256=cowgEjD7OMgTY7OpJT5WGxMFrCjdM3YUWYsw7lzroeI,4373
-cognite/neat/_issues/warnings/_properties.py,sha256=PWACBtbMEeWuSp1tcgoGmTHS2Nd-rJ4I-t5mEewzexc,3206
+cognite/neat/_issues/warnings/_properties.py,sha256=cHJs2sO7P2YA2ss07o9pgV9o6mFr7__Kv5Wpc0UXyq4,3222
 cognite/neat/_issues/warnings/_resources.py,sha256=oyKVzwpMKFMaG4A-ei-5md4ap7rvvSA5RW7ZTJVwC68,3552
 cognite/neat/_issues/warnings/user_modeling.py,sha256=V6ZzRVGMxiNq9EeIqzohLxTsBEsVGdyicDDM28hNTPQ,4139
 cognite/neat/_rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -84,14 +84,14 @@ cognite/neat/_rules/catalog/info-rules-imf.xlsx,sha256=vrE5g8vBtsGpwJqygxG3t9I3x
 cognite/neat/_rules/exporters/__init__.py,sha256=IYBa0DIYlx8cFItgYRw9W4FY_LmVEjuaqMz3JORZZX0,1204
 cognite/neat/_rules/exporters/_base.py,sha256=VkNMy8wsH-x4tAjS44cXgzzNH0CM2k_4RhkMwK50J7g,2284
 cognite/neat/_rules/exporters/_rules2dms.py,sha256=c3ZaiQ0sGqgH-p6nIKW1QOVIdXxofMWoCTEXkDeXh2c,19618
-cognite/neat/_rules/exporters/_rules2excel.py,sha256=TWtiF18Vp1sekGRwTCvfxw6IBt7u41xXpDE9e-aj3no,19382
+cognite/neat/_rules/exporters/_rules2excel.py,sha256=rFIyO8cmNi2QAJCP4Af1pHBT5DoSrKHrhbWkOgc_XZc,18746
 cognite/neat/_rules/exporters/_rules2instance_template.py,sha256=gI0tWFKzAhuFtnxVA7A9_AGYyL9lH_Yst-OYPNtTguA,5937
 cognite/neat/_rules/exporters/_rules2ontology.py,sha256=8GIawhTeNIS59zWYX2j3F63Ix9-xNGxgTzU1HiGkN98,22105
 cognite/neat/_rules/exporters/_rules2yaml.py,sha256=ggaPR8FO8PwZk1_nhwb5wVHk_C4s6qh1RrlbPkNcbBo,3160
 cognite/neat/_rules/exporters/_validation.py,sha256=DVJGdNNU2WtAFgUg0h4SWVhveRErEPOcYdT65y5toV0,682
 cognite/neat/_rules/importers/__init__.py,sha256=KiTNglSK6OVCdvPiGmO2dTKEGQJWT5Yxa6XWqm7YClQ,1408
 cognite/neat/_rules/importers/_base.py,sha256=yLrrOgjtkSPfLACmtRXGlHmaeGkk0kGnowregWbIPUo,1940
-cognite/neat/_rules/importers/_dms2rules.py,sha256=34ts_ohJVtbHa6tKWu_G_m7YeqSoRo5M9FFZ85yfbHA,22774
+cognite/neat/_rules/importers/_dms2rules.py,sha256=zAUL10Lj5o_bS_P0WSanAx1vpt6clK3HutFK_XP5huc,23388
 cognite/neat/_rules/importers/_dtdl2rules/__init__.py,sha256=CNR-sUihs2mnR1bPMKs3j3L4ds3vFTsrl6YycExZTfU,68
 cognite/neat/_rules/importers/_dtdl2rules/_unit_lookup.py,sha256=wW4saKva61Q_i17guY0dc4OseJDQfqHy_QZBtm0OD6g,12134
 cognite/neat/_rules/importers/_dtdl2rules/dtdl_converter.py,sha256=j38U0um1ZWI-yRvEUR3z33vOvMCYXJxSO9L_B7m9xDE,11707
@@ -111,9 +111,9 @@ cognite/neat/_rules/models/_base_rules.py,sha256=2jvkHZpPLanZHZAXz-IO8EZhb2whjzu
 cognite/neat/_rules/models/_types.py,sha256=6fHLiVPRlk5QsFjmvDFFqw1htPcPp-RfnUzYoMWNfeg,5418
 cognite/neat/_rules/models/data_types.py,sha256=157IlIAuzZfLUsEXBx8AKwszxztk_Ogqny4W-hmik94,10013
 cognite/neat/_rules/models/dms/__init__.py,sha256=fRaUH0IwG0YwWd_DNKM6j-jHHFyiIVz4_8DPiS1KR0Y,695
-cognite/neat/_rules/models/dms/_exporter.py,sha256=tQeRZg0xHSTjG4BGB1BxNdewWaPVIi_8cAp0Mh0Isa4,27894
-cognite/neat/_rules/models/dms/_rules.py,sha256=dY4JYAtoy_TbYf1DIi1RYWjqoYxpR9FeVTXRJe9IfC0,21509
-cognite/neat/_rules/models/dms/_rules_input.py,sha256=a7Wfq6KR-L3yjc9J_aX1PUQZSJ7JISuOxziaqcKx0vY,13722
+cognite/neat/_rules/models/dms/_exporter.py,sha256=2QiTLX4UF89jGd_YRz9EczDFprBphdO_oyaQWMBmSiM,28576
+cognite/neat/_rules/models/dms/_rules.py,sha256=BX65py8dD8l5_55-A1SjLqpK8It6R7puCyZc5yMOs9A,23249
+cognite/neat/_rules/models/dms/_rules_input.py,sha256=QGQH6SADokPkvHFgR_j59oTLqWHxpICcLAl_dMF62ZM,16390
 cognite/neat/_rules/models/dms/_validation.py,sha256=Uh6DaCywdpTljy3trmVGaHrRI1wqZSAHRBpSi1hemsU,32165
 cognite/neat/_rules/models/entities/__init__.py,sha256=Hlucp3LyV6ncLl79aqRTbSy2qgiGzoyN8x54D_zaJCY,1469
 cognite/neat/_rules/models/entities/_constants.py,sha256=g52-pFP_Qghp86NYk76pLDM52b3T4MXMztxhpeDW3Oc,344
@@ -123,16 +123,16 @@ cognite/neat/_rules/models/entities/_single_value.py,sha256=ODRUD5T1Upyd6Pijaouq
 cognite/neat/_rules/models/entities/_types.py,sha256=df9rnXJJKciv2Bp-Ve2q4xdEJt6WWniq12Z0hW2d6sk,1917
 cognite/neat/_rules/models/entities/_wrapped.py,sha256=SLATzXXxw3ag_BhadK1P34NP13fs9O3V_quOXmmc9uo,7753
 cognite/neat/_rules/models/information/__init__.py,sha256=lV7l8RTfWBvN_DFkzea8OzADjq0rZGgWe_0Fiwtfje0,556
-cognite/neat/_rules/models/information/_rules.py,sha256=BOFRHpxB7IAXv21a7Hae2QU4pS1YdhPoQbt3-wYv9FU,13805
+cognite/neat/_rules/models/information/_rules.py,sha256=Nw-iKUpuC1dAqy6Uc9Z8rqv1YiaVp0GYAMJQQF0xZLw,13398
 cognite/neat/_rules/models/information/_rules_input.py,sha256=Du4Ll1K7DxCKbBGfez02vSyB4VuYBwrsE8oKSG4nktM,6045
 cognite/neat/_rules/models/information/_validation.py,sha256=8o1rQ8lGY5yXP-ZiDX64opx7mHZGofHSxr-6972xEmI,12170
 cognite/neat/_rules/models/mapping/__init__.py,sha256=T68Hf7rhiXa7b03h4RMwarAmkGnB-Bbhc1H07b2PyC4,100
 cognite/neat/_rules/models/mapping/_classic2core.py,sha256=AhLWoXk4PlBVA6SgBtY9dcLcpqEMaYcsiEatI19miPk,1211
-cognite/neat/_rules/models/mapping/_classic2core.yaml,sha256=jodkmcTborWJmG3At16OChtnol696X6D4lgAa7aaQ78,20491
+cognite/neat/_rules/models/mapping/_classic2core.yaml,sha256=ei-nuivNWVW9HmvzDBKIPF6ZdgaMq64XHw_rKm0CMxg,22584
 cognite/neat/_rules/transformers/__init__.py,sha256=vp6OQnRUGdIrPVDOsY_tM2KBzis-IldaoVkAQEFgvVM,1563
 cognite/neat/_rules/transformers/_base.py,sha256=9LnjKbYIf9238PQXedkTZsMXAyEND6glUD187iEaHfc,2783
-cognite/neat/_rules/transformers/_converters.py,sha256=-Tp7CTqNWVDENil-y5QVnh5EUgFbmVI7V-SaaIhtwAI,85966
-cognite/neat/_rules/transformers/_mapping.py,sha256=lf-RKN__5Bg3-tZjEOCa1Sf_JtM_ScQ_TYcnciEnaYQ,18189
+cognite/neat/_rules/transformers/_converters.py,sha256=AoCOn6t6FVvCJVUOM6dr_9p-JhuVYLCnihslSuAM3tw,86236
+cognite/neat/_rules/transformers/_mapping.py,sha256=lIMWNnqZoyOfOGlc2k7FgasZJqudBklcHoH1qW5EeAw,18192
 cognite/neat/_rules/transformers/_verification.py,sha256=coZjoLqdfS8yrPP62T_xEKrDZc9ETbPWrLuwEVBSLZQ,4370
 cognite/neat/_session/__init__.py,sha256=fxQ5URVlUnmEGYyB8Baw7IDq-uYacqkigbc4b-Pr9Fw,58
 cognite/neat/_session/_base.py,sha256=h-zJdzvDGz8aOFwgyMmzolX5MFp4qf1VrF8XwiI_dAg,12157
@@ -147,7 +147,7 @@ cognite/neat/_session/_prepare.py,sha256=BZ1NurenrsZDU4tg629wnt1Iuw_zVLRA58FNTQM
 cognite/neat/_session/_read.py,sha256=daLeRbFvW6aUZSktTDfmEMaFtfgTx0mW1AOGs_SpIIA,26732
 cognite/neat/_session/_set.py,sha256=dCZ5zEmNAw8tiqOGT7-EigSXOIGlfVP2ldA7nmC8LJ8,4451
 cognite/neat/_session/_show.py,sha256=2lnkud996ouwf6-aKGvU0cU0ttfMeQ3vcb__g_7Yko4,10539
-cognite/neat/_session/_state.py,sha256=fwFICVL5RxXU7f7DjvTP9yfQel2UobgavNJRyVxK8bY,5572
+cognite/neat/_session/_state.py,sha256=BzDrkhxD65fXo9eUVnPz64Rzj7y1yG8CzGMcpVie_ps,5571
 cognite/neat/_session/_subset.py,sha256=vKtBiEnOruqe_749Nd8vzRS5HIZMR-sXSxyEH9Fa6Gk,2673
 cognite/neat/_session/_to.py,sha256=_SCvLnZZqGDWypDRzOvdEfbGjTqUBVh6yrg6F3uN26M,19097
 cognite/neat/_session/_wizard.py,sha256=9idlzhZy54h2Iwupe9iXKX3RDb5jJQuBZFEouni50L0,1476
@@ -176,10 +176,10 @@ cognite/neat/_utils/text.py,sha256=BFJoEOQBFgpelysL92FdF0OVRVFl0q9tRNoz-oRanNc,7
 cognite/neat/_utils/time_.py,sha256=O30LUiDH9TdOYz8_a9pFqTtJdg8vEjC3qHCk8xZblG8,345
 cognite/neat/_utils/upload.py,sha256=xWtM6mFuD2QYQHaZ7zCAuGptbEpPIxcH-raWQu93-Ug,5845
 cognite/neat/_utils/xml_.py,sha256=FQkq84u35MUsnKcL6nTMJ9ajtG9D5i1u4VBnhGqP2DQ,1710
-cognite/neat/_version.py,sha256=45tToTaIOk_QoVPWd5DVtbbEWx_VLaJF23QAdVi_JHY,46
+cognite/neat/_version.py,sha256=GLo0KGogAVNDPksL8ypcrOwW7_DTQdOnHqI9DgVtSao,46
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite_neat-0.114.0.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.114.0.dist-info/METADATA,sha256=hBoV5zVHDTcifrzh9bRA3FWokJe_8e8qTPbHXklSXTI,5361
-cognite_neat-0.114.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-cognite_neat-0.114.0.dist-info/entry_points.txt,sha256=SsQlnl8SNMSSjE3acBI835JYFtsIinLSbVmHmMEXv6E,51
-cognite_neat-0.114.0.dist-info/RECORD,,
+cognite_neat-0.115.0.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.115.0.dist-info/METADATA,sha256=_AkiioB7cTY4N1ChU0Rx_cXpgmwvPzFqhKYx3jZ15xY,5361
+cognite_neat-0.115.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+cognite_neat-0.115.0.dist-info/entry_points.txt,sha256=SsQlnl8SNMSSjE3acBI835JYFtsIinLSbVmHmMEXv6E,51
+cognite_neat-0.115.0.dist-info/RECORD,,