cognite-neat 0.90.2__py3-none-any.whl → 0.92.0__py3-none-any.whl

cognite/neat/rules/models/information/_validation.py

@@ -151,7 +151,7 @@ class InformationPostValidation:
     def _class_parent_pairs(self) -> dict[ClassEntity, list[ClassEntity]]:
         class_subclass_pairs: dict[ClassEntity, list[ClassEntity]] = {}
 
-        classes = self.rules.model_copy(deep=True).classes.data
+        classes = self.rules.model_copy(deep=True).classes
 
         # USE CASE: Solution model being extended (user + last + reference = complete)
         if (
@@ -159,8 +159,8 @@ class InformationPostValidation:
             and self.metadata.data_model_type == DataModelType.solution
         ):
             classes += (
-                cast(InformationRules, self.rules.last).model_copy(deep=True).classes.data
-                + cast(InformationRules, self.rules.reference).model_copy(deep=True).classes.data
+                cast(InformationRules, self.rules.last).model_copy(deep=True).classes
+                + cast(InformationRules, self.rules.reference).model_copy(deep=True).classes
             )
 
         # USE CASE: Solution model being created from scratch (user + reference = complete)
@@ -168,14 +168,14 @@ class InformationPostValidation:
             self.metadata.schema_ == SchemaCompleteness.complete
             and self.metadata.data_model_type == DataModelType.solution
         ):
-            classes += cast(InformationRules, self.rules.reference).model_copy(deep=True).classes.data
+            classes += cast(InformationRules, self.rules.reference).model_copy(deep=True).classes
 
         # USE CASE: Enterprise model being extended (user + last = complete)
         elif (
             self.metadata.schema_ == SchemaCompleteness.extended
             and self.metadata.data_model_type == DataModelType.enterprise
         ):
-            classes += cast(InformationRules, self.rules.last).model_copy(deep=True).classes.data
+            classes += cast(InformationRules, self.rules.last).model_copy(deep=True).classes
 
         for class_ in classes:
             class_subclass_pairs[class_.class_] = []

cognite/neat/rules/transformers/_converters.py

@@ -138,7 +138,7 @@ class _InformationRulesConverter:
         from cognite.neat.rules.models.asset._rules import AssetClass, AssetMetadata, AssetProperty, AssetRules
 
         classes: SheetList[AssetClass] = SheetList[AssetClass](
-            data=[AssetClass(**class_.model_dump()) for class_ in self.rules.classes]
+            [AssetClass(**class_.model_dump()) for class_ in self.rules.classes]
         )
         properties: SheetList[AssetProperty] = SheetList[AssetProperty]()
         for prop_ in self.rules.properties:
@@ -227,11 +227,9 @@ class _InformationRulesConverter:
 
         return DMSRules(
             metadata=metadata,
-            properties=SheetList[DMSProperty](
-                data=[prop for prop_set in properties_by_class.values() for prop in prop_set]
-            ),
-            views=SheetList[DMSView](data=views),
-            containers=SheetList[DMSContainer](data=containers),
+            properties=SheetList[DMSProperty]([prop for prop_set in properties_by_class.values() for prop in prop_set]),
+            views=SheetList[DMSView](views),
+            containers=SheetList[DMSContainer](containers),
             last=last_dms_rules,
             reference=ref_dms_rules,
         )
@@ -481,8 +479,8 @@ class _DMSRulesConverter:
 
         return InformationRules(
             metadata=metadata,
-            properties=SheetList[InformationProperty](data=properties),
-            classes=SheetList[InformationClass](data=classes),
+            properties=SheetList[InformationProperty](properties),
+            classes=SheetList[InformationClass](classes),
             last=_DMSRulesConverter(self.dms.last).as_information_rules() if self.dms.last else None,
             reference=_DMSRulesConverter(self.dms.reference).as_information_rules() if self.dms.reference else None,
         )

cognite/neat/rules/transformers/_pipelines.py

@@ -55,7 +55,11 @@ class ImporterPipeline(RulesPipeline[InputRules, VerifiedRules]):
     def execute(self) -> VerifiedRules:
         """Execute the pipeline from importer to rules."""
         rules = self._importer.to_rules()
-        out = self.transform(rules).get_rules()
-        if out is None:
-            raise NeatValueError("Failed to convert rules")
-        return out
+        out = self.transform(rules)
+        if isinstance(out, MaybeRules) and out.rules is None:
+            raise out.issues.as_errors("Failed to convert rules")
+
+        rules = out.get_rules()
+        if rules is None:
+            raise NeatValueError("Rules is missing cannot convert")
+        return rules

cognite/neat/store/_base.py

@@ -182,7 +182,7 @@ class NeatGraphStore:
 
         class_entity = ClassEntity(prefix=self.rules.metadata.prefix, suffix=class_)
 
-        if class_entity not in [definition.class_ for definition in self.rules.classes.data]:
+        if class_entity not in [definition.class_ for definition in self.rules.classes]:
             warnings.warn("Desired type not found in graph!", stacklevel=2)
             return None
 

cognite/neat/utils/collection_.py

@@ -1,5 +1,5 @@
 from collections import Counter
-from collections.abc import Sequence
+from collections.abc import Iterable, Sequence
 from typing import TypeVar
 
 T_Element = TypeVar("T_Element")
@@ -14,5 +14,6 @@ def most_occurring_element(list_of_elements: list[T_Element]) -> T_Element:
     return counts.most_common(1)[0][0]
 
 
-def chunker(sequence: Sequence[T_Element], chunk_size: int) -> list[Sequence[T_Element]]:
-    return [sequence[i : i + chunk_size] for i in range(0, len(sequence), chunk_size)]
+def chunker(sequence: Sequence[T_Element], chunk_size: int) -> Iterable[Sequence[T_Element]]:
+    for i in range(0, len(sequence), chunk_size):
+        yield sequence[i : i + chunk_size]

cognite/neat/utils/xml_.py

@@ -2,7 +2,7 @@ from collections.abc import Generator
 from xml.etree.ElementTree import Element
 
 
-def iterate_tree(node: Element) -> Generator:
+def iterate_tree(node: Element, skip_root: bool = False) -> Generator:
     """Iterate over all elements in an XML tree.
 
     Args:
@@ -11,27 +11,42 @@ def iterate_tree(node: Element) -> Generator:
     Returns:
         Generator of XML elements.
     """
-    yield node
+    if not skip_root:
+        yield node
     for child in node:
         yield from iterate_tree(child)
 
 
-def get_children(element: Element, child_tag: str, no_children: int = -1) -> list[Element]:
-    """Get children of an XML element.
+def get_children(
+    element: Element,
+    child_tag: str,
+    include_nested_children: bool = False,
+    ignore_namespace: bool = False,
+    no_children: int = -1,
+) -> Element | list[Element]:
+    """Get direct children of an XML element.
 
     Args:
         element: XML element to get children from.
         child_tag: Tag of the children to get.
+        include_nested_children: bool to decide if only direct child elements should be extracted, or if all child
+        elements (including nested ones) should be returned.
+        ignore_namespace: bool that decides if wildcard * should be used to ignore namespace of children elements tag
         no_children: Max number of children to get. Defaults to -1 (all).
 
     Returns:
         List of XML elements if no_children > 1, otherwise XML element.
     """
-    children = []
-    for child in element:
-        if child.tag == child_tag:
-            if no_children == 1:
-                return [child]
-            else:
-                children.append(child)
-    return children
+    search_string = ""
+    if ignore_namespace:
+        if include_nested_children:
+            search_string = f".//{{*}}{child_tag}"
+        else:
+            search_string = f".{{*}}{child_tag}"
+    elif not ignore_namespace:
+        if include_nested_children:
+            search_string = f".//{child_tag}"
+        else:
+            search_string = f".{child_tag}"
+    children = element.findall(search_string)
+    return children[:no_children] if no_children > 0 else children

{cognite_neat-0.90.2.dist-info → cognite_neat-0.92.0.dist-info}/METADATA

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

{cognite_neat-0.90.2.dist-info → cognite_neat-0.92.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cognite/neat/__init__.py,sha256=AiexNcHdAHFbrrbo9c65gtil1dqx_SGraDH1PSsXjKE,126
 cognite/neat/_shared.py,sha256=RSaHm2eJceTlvb-hMMe4nHgoHdPYDfN3XcxDXo24k3A,1530
-cognite/neat/_version.py,sha256=fcsBhBSYOqMMAcHXZq1b0z3azsr6o60zMlxH4H6fDbY,23
+cognite/neat/_version.py,sha256=4oQqdZ-jW338RGQfLxI7hoQNb8tTR6y4hzWoJRPdI3o,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=L1DCtLZ1HZku8I2z-JWd5RDsXhIsboFsKwAMhkrm-bY,3600
@@ -49,19 +49,22 @@ cognite/neat/graph/examples/Knowledge-Graph-Nordic44-dirty.xml,sha256=ujJip6XBs5
 cognite/neat/graph/examples/Knowledge-Graph-Nordic44.xml,sha256=U2Ns-M4LRjT1fBkhmRj63ur7jDzlRtHK9yOLf_npZ_g,1437996
 cognite/neat/graph/examples/__init__.py,sha256=yAjHVY3b5jOjmbW-iLbhvu7BG014TpGi3K4igkDqW5I,368
 cognite/neat/graph/examples/skos-capturing-sheet-wind-topics.xlsx,sha256=CV_yK5ZSbYS_ktfIZUPD8Sevs47zpswLXQUDFkGE4Gw,45798
-cognite/neat/graph/extractors/__init__.py,sha256=timbuOI3YBPBFu1lY42KDAN5aDJ32gIseKsjT7e0fgU,1698
+cognite/neat/graph/extractors/__init__.py,sha256=9A_AsBwdbnYDo-20c18wcu__S-h9PHCeQB_fGteK5mo,1858
 cognite/neat/graph/extractors/_base.py,sha256=8IWygpkQTwo0UOmbbwWVI7540_klTVdUVX2JjVPFRIs,498
 cognite/neat/graph/extractors/_classic_cdf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite/neat/graph/extractors/_classic_cdf/_assets.py,sha256=xVqWC_lyqX5RKGfTxX0Gb96A0GAyM13d6YIjd1xEbpI,6524
-cognite/neat/graph/extractors/_classic_cdf/_base.py,sha256=oLqYxNkAgYCZlAGMqfOVTDbRnouyf72m54d1BfcpeAA,4494
-cognite/neat/graph/extractors/_classic_cdf/_events.py,sha256=8shnrQD9LZCrKPIt7xeU6ac0-lSkIwGe9KB0DdJ7Eik,5600
-cognite/neat/graph/extractors/_classic_cdf/_files.py,sha256=wa2jzbpOj4BssVY7PbgdGymFZGSrvd1GZaRVN-JjOXQ,6588
-cognite/neat/graph/extractors/_classic_cdf/_labels.py,sha256=Xvyv22jebq4s94Sl1h2SMEeBvOkoTIPujB9tczRgcDo,4359
-cognite/neat/graph/extractors/_classic_cdf/_relationships.py,sha256=VxmwnZ_vN_P14lXDuEYfR68OK-ZnLrvGqSFW9n0KHeY,7429
-cognite/neat/graph/extractors/_classic_cdf/_sequences.py,sha256=sTtVPngffQw2fyvoRG1ABC2yFkepA6skFT1XdCzg4cU,5086
-cognite/neat/graph/extractors/_classic_cdf/_timeseries.py,sha256=zmVf5pO-G4ro3elKt0sCTfTtLulkEFoEahLgP9J5kKE,6581
-cognite/neat/graph/extractors/_dexpi.py,sha256=Q3whJpEi3uFMzJGAAeUfgRnAzz6ZHmtuEdVBWqsZsTM,9384
+cognite/neat/graph/extractors/_classic_cdf/_assets.py,sha256=3zpwp4LIXf_dQgfXEQCmp0CNprBYGLC-VjNmhMXc-4k,6604
+cognite/neat/graph/extractors/_classic_cdf/_base.py,sha256=5jCegqeqQr_Bxwskt0ns7aiivzz1KyEIxqD5Xojoa7Y,5071
+cognite/neat/graph/extractors/_classic_cdf/_classic.py,sha256=Al4lO-vydyrqFjAt_OanmuIjd2fM4SS1TtukZj3YBM8,10186
+cognite/neat/graph/extractors/_classic_cdf/_data_sets.py,sha256=_jn2YM_87flrJ2pdLUKApQ3I1M02zjnhDSGKhl0vdDU,4297
+cognite/neat/graph/extractors/_classic_cdf/_events.py,sha256=08c1IavgRWdBem8YbSQnzXEYa41QYojmTilzZBbfAR0,6508
+cognite/neat/graph/extractors/_classic_cdf/_files.py,sha256=hi5Zf_-JWbRN1wEoGc-JIT81YOcWGxWwPAh162Urs4s,7554
+cognite/neat/graph/extractors/_classic_cdf/_labels.py,sha256=fNi_eqG2rfxMHyPUzAqRSARp_QRY3drYHH_WcoLzz0M,4766
+cognite/neat/graph/extractors/_classic_cdf/_relationships.py,sha256=wSYQK1QiRD9aYnjOJWXOCjpEnpH6s0LqPcqi3gC9ckU,8792
+cognite/neat/graph/extractors/_classic_cdf/_sequences.py,sha256=HMC-tmGE1Wgc7c1KeDyx0BlnYOxGbyhUHkoOHl1Yz60,6006
+cognite/neat/graph/extractors/_classic_cdf/_timeseries.py,sha256=ZO7-dgIq7EavvmVfo0gAWHHM_WoNcfPJe7zRArt4W6w,7502
+cognite/neat/graph/extractors/_dexpi.py,sha256=s3Ff3s3CMy0Xalixtfvnu-3yrEsCF26-9WVhIIZBZQI,9432
 cognite/neat/graph/extractors/_dms.py,sha256=NbqY1nrisn-dJq8_qeCatpgJwm6-cKFsTISDR5afdbU,6688
+cognite/neat/graph/extractors/_iodd.py,sha256=RiUxhVsV99YxrWjMxPQcLQzYG0xLYqZCEHduCoG6P8Q,6759
 cognite/neat/graph/extractors/_mock_graph_generator.py,sha256=ES-7__o750BJFC9rNWt5HRO5M53iZuzv-8lBqLIXdC0,15365
 cognite/neat/graph/extractors/_rdf_file.py,sha256=ialMCLv9WH5k6v1YMfozfcmAYhz8OVo9jVhsKMyQkDA,763
 cognite/neat/graph/loaders/__init__.py,sha256=TbeJqifd16JLOglPVNOeb6pN_w060UYag50KquBM_r0,769
@@ -78,7 +81,7 @@ cognite/neat/graph/transformers/_base.py,sha256=b37Ek-9njuM5pTR_3XhnxCMrg_ip_2BM
 cognite/neat/graph/transformers/_classic_cdf.py,sha256=6xX-OBSJT5DAQrTJ-nuhCfGNaSk5Iktxn-WIMfzEIqo,13189
 cognite/neat/graph/transformers/_rdfpath.py,sha256=VLtGJvTPT5SWhV98fuGGt0pptTXfzOOQSNehypsPHug,1861
 cognite/neat/issues/__init__.py,sha256=KkBEO-0Lg3vdvjrQtxKR6Wy2iV2mooc9utSO8-_9UuI,405
-cognite/neat/issues/_base.py,sha256=g-_C2zIitewZLHQkV84aBRQJU2UnT_-pl98PFcfmNy0,15183
+cognite/neat/issues/_base.py,sha256=_M2HTJpgAzoZXS6Ap-elyyzylQFXew0AKbKWvodQ_R8,15518
 cognite/neat/issues/errors/__init__.py,sha256=t23ZnbWOZEhd77Ae_gpAxMPAIWOTbt7-wi6yeCmlGZE,2077
 cognite/neat/issues/errors/_external.py,sha256=TUdihRyr5amdGSzSU49hWz7N7BSPCTVo7glKFNDrc5w,1583
 cognite/neat/issues/errors/_general.py,sha256=Dtt4kEfNyj-CxpowsVVrq2eAwWEzx68JpPnS48QoY2U,787
@@ -105,9 +108,9 @@ cognite/neat/rules/examples/wind-energy.owl,sha256=NuomCA9FuuLF0JlSuG3OKqD4VBcHg
 cognite/neat/rules/exporters/__init__.py,sha256=nRMUBUf7yr1QPjyITeX2rTLtLLawHv24hhRE39d2-e0,1109
 cognite/neat/rules/exporters/_base.py,sha256=Er8G2DRNUtD1RbDOe9_c6H8cVwXbkTQzGfqof7J9OhA,1329
 cognite/neat/rules/exporters/_rules2dms.py,sha256=UekIEl9m-ZHu7AjPr0yaDrAkE3AMJaTcL2dkYdE17Ko,14448
-cognite/neat/rules/exporters/_rules2excel.py,sha256=aSxvCINP9wzrqeqI3DaS00BQibMhFEHcRH3Ka_QHoMY,14232
+cognite/neat/rules/exporters/_rules2excel.py,sha256=BqXEDORmshvBZMMsDs8LXOPILl2gf5I0kyVmTodtanY,14223
 cognite/neat/rules/exporters/_rules2ontology.py,sha256=qrSY8se-AUABaJt_7NOH46Htoq6mXAEMO4eN3dCzvG8,21705
-cognite/neat/rules/exporters/_rules2yaml.py,sha256=2yAkU3b4P4UYdsCyAZn5K2OwphnRXAl8ZwNek4EMfGU,2899
+cognite/neat/rules/exporters/_rules2yaml.py,sha256=7N8Y5jXnt8I8TVGBP9pDtw838VCxWFeA3B-JZZou5GE,3195
 cognite/neat/rules/exporters/_validation.py,sha256=A0kyrIEu51ZXl47CXmO4ZOT0whO5iKNwMY-BwMc2scA,680
 cognite/neat/rules/importers/__init__.py,sha256=z682_ktGKDjr52DIL6cPvOercZS6-TYD_ZDo-MGqtck,1207
 cognite/neat/rules/importers/_base.py,sha256=G9apdRztiAdnzX3LyZ-SNaavXagvtta2BQXFqEOQw_g,2851
@@ -132,45 +135,42 @@ cognite/neat/rules/importers/_rdf/_owl2rules/_owl2rules.py,sha256=nH_hJGIEG9LKAj
 cognite/neat/rules/importers/_rdf/_shared.py,sha256=qZuJm2LiB_eScbRkoTOL7Qf6CJQ124Dv2Kxylo-Rzts,19771
 cognite/neat/rules/importers/_spreadsheet2rules.py,sha256=2GhBLEq6jyu2TbnX6MTlSx4LaWOdSfz213Lo45nTaM4,11036
 cognite/neat/rules/importers/_yaml2rules.py,sha256=aap5Nso_7EBNrHtG4pt8tT4jNzCYUQz4twHdmqrGya8,3139
-cognite/neat/rules/models/__init__.py,sha256=LlbugWml19SAewFRihYLW8v47zl_06cWvqX2F_R7KLw,1530
-cognite/neat/rules/models/_base_input.py,sha256=xVgdtnXkoSncWc9wXr3yMl6ugVAUn1JpFoUOyMRNzuc,5865
-cognite/neat/rules/models/_base_rules.py,sha256=hAOMx443i4jhsPKAECaepg8c1170IrpCZJ8mqMSJ8CI,10912
+cognite/neat/rules/models/__init__.py,sha256=ZqbSC2UhPtq31P1RUHoiXGO2q6FoPwqUvrTorpgLZTU,1524
+cognite/neat/rules/models/_base_input.py,sha256=fw8v9PSZO6wgVwDHvfW9m39ipX4hXvxoSmpK51kbaMU,5869
+cognite/neat/rules/models/_base_rules.py,sha256=QbcAg1cmsWzQtADyhqVEiX1PT_XsW-37YXVR1NIBtSw,12940
 cognite/neat/rules/models/_rdfpath.py,sha256=oyMpmL_t0R5Uocdm3CA9iDLT2ZJVr2BIuz4cxaUlabM,11881
 cognite/neat/rules/models/_types.py,sha256=VM40gfADOzw5UFy-olCBotComra0MsAafjyUlaIgFV8,2875
 cognite/neat/rules/models/asset/__init__.py,sha256=Z2tQEABW-q66bmHNcxMuIxPmYQBcGdiSZt7fHGe01dQ,363
-cognite/neat/rules/models/asset/_rules.py,sha256=NYQU2eXXIL2kyLk8RR0vsNamsycMk390o_UKUdsz9zE,5279
+cognite/neat/rules/models/asset/_rules.py,sha256=XVwSnThm-C4FWafo4iD28JJVynQP9VhA2JQ1107g_jk,4003
 cognite/neat/rules/models/asset/_rules_input.py,sha256=2Skh7OVk2X5k7L62O8uZvLmpogJfQeYD7lZbzejEZRw,3375
-cognite/neat/rules/models/asset/_serializer.py,sha256=ixqRf9qEzvChgysRaDX4g_vHVDtRBCsPYC9sOn0-ShE,3365
 cognite/neat/rules/models/asset/_validation.py,sha256=3goorodISq_mlyXroaivcMOZ-QV8sd27IK9-iGKnQ28,2014
 cognite/neat/rules/models/data_types.py,sha256=jTYsWqQPuvwHytInRU0Y2TGF4aVBF83v0vp_SH9KgLA,9722
 cognite/neat/rules/models/dms/__init__.py,sha256=CUqUlVjz4yZX_-61F-2ofSoV7N9MlSYx2N7vM-omp7E,640
 cognite/neat/rules/models/dms/_exporter.py,sha256=4XiFCeXZOZuj5Ke1E-_rQJvPIcyRl7lIb2dHCfkYS4M,28126
-cognite/neat/rules/models/dms/_rules.py,sha256=iwCQx0MVQVe1R0bFIIdDD5unyuzQ7tIZDQM7NmdbJp8,14871
+cognite/neat/rules/models/dms/_rules.py,sha256=Tx36M7nc0ryLMYlwBMdrKpgdGSIBTLuKjE0vbuoApVQ,19184
 cognite/neat/rules/models/dms/_rules_input.py,sha256=v5-zlb4VJi5Q610rnPLU1aHKzXmGwoUTrDzAkJFfEQY,10911
 cognite/neat/rules/models/dms/_schema.py,sha256=lc6Q0EUchOAUSTRiJnWc6UPBz7LjCW5NEvIGwNakcSI,50724
-cognite/neat/rules/models/dms/_serializer.py,sha256=2Cu9BSS5cNfOc-sUvIUc5da3vh5koKfoDcx4s_Tt-R4,8585
-cognite/neat/rules/models/dms/_validation.py,sha256=lfEUs0l21t0UL6Jjk-7E1hTwrdUT48VsHrXAhOP0LzM,15822
-cognite/neat/rules/models/domain.py,sha256=YtVb3JIkZfcA9qrMA-RapHMv-_Q40JtxrY1oLVOFev0,4298
+cognite/neat/rules/models/dms/_validation.py,sha256=EnupSDjeCi-Sqs6ube1wQ2FxL3DP5O8vUaSojWqT-I0,15790
+cognite/neat/rules/models/domain.py,sha256=zAxXb9719XJEn-s_m9JMhE7RSDW9f6LY7CJ84KAjM1E,3950
 cognite/neat/rules/models/entities/__init__.py,sha256=ORRN2bkgbotGKAzxU66ff5JrbWd9z6wCISjgICBpFdA,1501
 cognite/neat/rules/models/entities/_constants.py,sha256=r_Knlqmmb6QFgiSS0Yb_9UrhwYnaSBCYy2Wt9gODLhw,2316
 cognite/neat/rules/models/entities/_loaders.py,sha256=uzMRAULggTxrP3B27_78i6anui3br4Ck6o9vmctqxkk,2691
 cognite/neat/rules/models/entities/_multi_value.py,sha256=3DejtsIWJOA96y9wZMhjDBP5lOxJH9l27YZUxr9JIEY,2060
-cognite/neat/rules/models/entities/_single_value.py,sha256=7d4aGkIqLF9X43p_r1GIEIYxVYzlEnm8KwdkihXGtJs,16416
-cognite/neat/rules/models/entities/_types.py,sha256=lilHNUyviUHuYHZOT0ogrCqAfEpA32M1VOzr_JwdhD8,2127
+cognite/neat/rules/models/entities/_single_value.py,sha256=lqz-3LY5qB6Q4nVIZQxpKHzppq7ZJC6FRKZMcBKDqVs,17078
+cognite/neat/rules/models/entities/_types.py,sha256=df9rnXJJKciv2Bp-Ve2q4xdEJt6WWniq12Z0hW2d6sk,1917
 cognite/neat/rules/models/entities/_wrapped.py,sha256=FxC8HztW_tUUtuArAOwxyFfkdJnSEB4bgZoNmmmfiPk,7137
 cognite/neat/rules/models/information/__init__.py,sha256=fVvgXt-JuyZCP_mLgIVaeKD9pdAXe2BWUxU_BZs8e5g,480
-cognite/neat/rules/models/information/_rules.py,sha256=X-jKm1_c8ZwTrsSSS_RbF1jNlXm9dc38UIjQPk3WExQ,13051
+cognite/neat/rules/models/information/_rules.py,sha256=sPZdZ2ed7Wk0OEgi90niUXNii-tw3mf8yAw8-fRGnD4,14361
 cognite/neat/rules/models/information/_rules_input.py,sha256=wKBISvbJ5IsPhl72hsF4hmOiza8nqN-4tTczl-Mif-w,5274
-cognite/neat/rules/models/information/_serializer.py,sha256=yti9I_xJruxrib66YIBInhze___Io-oPTQH6uWDumPE,3503
-cognite/neat/rules/models/information/_validation.py,sha256=Fa5S-rQozSCkIDpS4dPQn7U0lM71DOecAMCqL8K8Uag,9230
+cognite/neat/rules/models/information/_validation.py,sha256=mOgtIUwkXn9VZIKkdbPidWn8uepPfh9pUfkldQCWB0c,9205
 cognite/neat/rules/transformers/__init__.py,sha256=Iun5-3uDmzUzcO4IFneJ453PWAx6F_c-5LhkvrIrSc0,666
 cognite/neat/rules/transformers/_base.py,sha256=FABG_8Xg_LUZPwVLQmKvxlcIDtI5phGLpEGpxNcJWNM,3269
-cognite/neat/rules/transformers/_converters.py,sha256=8qvgAbW4U7gcYEYkgFkrvOKE1P-PwNjg-nOIvOgbhnE,22763
+cognite/neat/rules/transformers/_converters.py,sha256=mFOAdERJZf_loCaCiAJLqMOh86E5cvUds6b-S-X3fJs,22703
 cognite/neat/rules/transformers/_map_onto.py,sha256=eXPhontrcJdRm2ILopwkFoPcwfM8L-BNv-CapL30klg,4824
-cognite/neat/rules/transformers/_pipelines.py,sha256=of3NJ4gsLeKr3NiTfBMQVl1J5b2IwI5JWm8FP7oQ3B4,2438
+cognite/neat/rules/transformers/_pipelines.py,sha256=O7hkHuuKiAgsjgJXnTQL8wweOXNjEUyNVj4i1hGwk_E,2599
 cognite/neat/rules/transformers/_verification.py,sha256=rPSeDKkpe-hCJ0iiBx6yycvSANwnCS78PUFTDYgmNcA,4448
 cognite/neat/store/__init__.py,sha256=G-VG_YwfRt1kuPao07PDJyZ3w_0-eguzLUM13n-Z_RA,64
-cognite/neat/store/_base.py,sha256=WcwVxRo7UpSNUJ221yq26_XtaeX6xW647qkf9xG8aK0,12471
+cognite/neat/store/_base.py,sha256=EGeG7lzmb-PdUk2q5CywAHrt37Yr6PVRd4HP2VOIDSE,12466
 cognite/neat/store/_provenance.py,sha256=sniVJhLmvj0ulKhoUZzFLwjAsp7cQyRPxunZtLmMW4A,3902
 cognite/neat/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/utils/auth.py,sha256=k0sEfTpK_bamMjAkj7jN6n9yta8TaqHTFkZUjUgpwik,12770
@@ -181,14 +181,14 @@ cognite/neat/utils/cdf/loaders/__init__.py,sha256=s2aPR5XLo6WZ0ybstAJlcGFYkA7CyH
 cognite/neat/utils/cdf/loaders/_base.py,sha256=ryNC_AMXIESWXuTVJ-02L-HSVSpD6V49XdLTRYeFg70,1764
 cognite/neat/utils/cdf/loaders/_data_modeling.py,sha256=0jynnwZ7utnG2KIkVRJBNvDshUCzwX29LZuGSlm6qUM,13216
 cognite/neat/utils/cdf/loaders/_ingestion.py,sha256=QbF4ntaGUum6yTRTq9WNg8n49TQpfzF1T7H-Bx740ws,6326
-cognite/neat/utils/collection_.py,sha256=fX4eAMau5AsUs1Dm5PlzINxR64kUjncEEHeoL_JT9rU,582
+cognite/neat/utils/collection_.py,sha256=m5pn78NRQ9vx8l-NdMTAdYDLCTB8CQLX-rqxAWt7vyg,602
 cognite/neat/utils/rdf_.py,sha256=VXDBQUt86vRntiGhejK35PlsbvKCUkuQQa1cMYz4SIc,5656
 cognite/neat/utils/regex_patterns.py,sha256=rXOBW9d-n_eAffm9zVRIPFB7ElLS8VDdsvFDsr01Q-M,2155
 cognite/neat/utils/spreadsheet.py,sha256=LI0c7dlW0zXHkHw0NvB-gg6Df6cDcE3FbiaHBYLXdzQ,2714
 cognite/neat/utils/text.py,sha256=PvTEsEjaTu8SE8yYaKUrce4msboMj933dK7-0Eey_rE,3652
 cognite/neat/utils/time_.py,sha256=O30LUiDH9TdOYz8_a9pFqTtJdg8vEjC3qHCk8xZblG8,345
 cognite/neat/utils/upload.py,sha256=7yQZZM1SFEC-Dhl12rQD_8gUoRKLwmWhNjsImVB18og,4015
-cognite/neat/utils/xml_.py,sha256=ppLT3lQKVp8wOP-m8-tFY8uB2P4R76l7R_-kUtsABng,992
+cognite/neat/utils/xml_.py,sha256=FQkq84u35MUsnKcL6nTMJ9ajtG9D5i1u4VBnhGqP2DQ,1710
 cognite/neat/workflows/__init__.py,sha256=oiKub_U9f5cA0I1nKl5dFkR4BD8_6Be9eMzQ_50PwP0,396
 cognite/neat/workflows/base.py,sha256=pWsUCtHVjdDe_N_pbQpmYLji-iN2U-H1G13aJbAXy7M,26829
 cognite/neat/workflows/cdf_store.py,sha256=Ao6YnZ5wnZtP1wdnDQM7Hj2G7NqtLzBOKn4LJQS-8AU,18047
@@ -216,8 +216,8 @@ cognite/neat/workflows/steps_registry.py,sha256=FjMsFBlFFy82ABUzDnWoFidYODV3pp3c
 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.90.2.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.90.2.dist-info/METADATA,sha256=90SwbMpyJcPoeU0D-q2bUyNa3Mz0w-v4gte0-kmZ8Jw,9441
-cognite_neat-0.90.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cognite_neat-0.90.2.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
-cognite_neat-0.90.2.dist-info/RECORD,,
+cognite_neat-0.92.0.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.92.0.dist-info/METADATA,sha256=8OGqjdL0GxN24BpF4M5sd-MVbIUCxh62V8iN_NMnz00,9441
+cognite_neat-0.92.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cognite_neat-0.92.0.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
+cognite_neat-0.92.0.dist-info/RECORD,,

cognite/neat/rules/models/asset/_serializer.py

@@ -1,73 +0,0 @@
-from typing import Any, ClassVar
-
-from cognite.neat.rules.models.entities import ClassEntity, ReferenceEntity
-
-from ._rules import AssetClass, AssetProperty, AssetRules
-
-
-class _AssetRulesSerializer:
-    # These are the fields that need to be cleaned from the default space and version
-    PROPERTIES_FIELDS: ClassVar[list[str]] = ["class_", "value_type"]
-    CLASSES_FIELDS: ClassVar[list[str]] = ["class_"]
-
-    def __init__(self, by_alias: bool, default_prefix: str) -> None:
-        self.default_prefix = f"{default_prefix}:"
-
-        self.properties_fields = self.PROPERTIES_FIELDS
-        self.classes_fields = self.CLASSES_FIELDS
-
-        self.prop_name = "properties"
-        self.class_name = "classes"
-        self.metadata_name = "metadata"
-        self.class_parent = "parent"
-
-        self.prop_property = "property_"
-        self.prop_class = "class_"
-
-        self.reference = "Reference" if by_alias else "reference"
-        if by_alias:
-            self.properties_fields = [
-                AssetProperty.model_fields[field].alias or field for field in self.properties_fields
-            ]
-            self.classes_fields = [AssetClass.model_fields[field].alias or field for field in self.classes_fields]
-            self.prop_name = AssetRules.model_fields[self.prop_name].alias or self.prop_name
-            self.class_name = AssetRules.model_fields[self.class_name].alias or self.class_name
-            self.class_parent = AssetClass.model_fields[self.class_parent].alias or self.class_parent
-            self.metadata_name = AssetRules.model_fields[self.metadata_name].alias or self.metadata_name
-
-            self.prop_property = AssetProperty.model_fields[self.prop_property].alias or self.prop_property
-            self.prop_class = AssetProperty.model_fields[self.prop_class].alias or self.prop_class
-
-    def clean(self, dumped: dict[str, Any], as_reference: bool) -> dict[str, Any]:
-        # Sorting to get a deterministic order
-        dumped[self.prop_name] = sorted(
-            dumped[self.prop_name]["data"], key=lambda p: (p[self.prop_class], p[self.prop_property])
-        )
-        dumped[self.class_name] = sorted(dumped[self.class_name]["data"], key=lambda v: v[self.prop_class])
-
-        for prop in dumped[self.prop_name]:
-            if as_reference:
-                class_entity = ClassEntity.load(prop[self.prop_class])
-                prop[self.reference] = str(
-                    ReferenceEntity(
-                        prefix=str(class_entity.prefix), suffix=class_entity.suffix, property=prop[self.prop_property]
-                    )
-                )
-
-            for field_name in self.properties_fields:
-                if value := prop.get(field_name):
-                    prop[field_name] = value.removeprefix(self.default_prefix)
-
-        for class_ in dumped[self.class_name]:
-            if as_reference:
-                class_[self.reference] = class_[self.prop_class]
-            for field_name in self.classes_fields:
-                if value := class_.get(field_name):
-                    class_[field_name] = value.removeprefix(self.default_prefix)
-
-            if value := class_.get(self.class_parent):
-                class_[self.class_parent] = ",".join(
-                    parent.strip().removeprefix(self.default_prefix) for parent in value.split(",")
-                )
-
-        return dumped

cognite/neat/rules/models/dms/_serializer.py

@@ -1,157 +0,0 @@
-from typing import Any, ClassVar, cast
-
-from cognite.neat.rules.models import DMSRules
-from cognite.neat.rules.models.dms import DMSContainer, DMSEnum, DMSNode, DMSProperty, DMSView
-from cognite.neat.rules.models.entities import ReferenceEntity, ViewEntity
-
-
-class _DMSRulesSerializer:
-    # These are the fields that need to be cleaned from the default space and version
-    PROPERTIES_FIELDS: ClassVar[list[str]] = ["class_", "view", "value_type", "container"]
-    VIEWS_FIELDS: ClassVar[list[str]] = ["class_", "view", "implements"]
-    CONTAINERS_FIELDS: ClassVar[list[str]] = ["class_", "container"]
-
-    def __init__(self, by_alias: bool, default_space: str, default_version: str) -> None:
-        self.default_space = f"{default_space}:"
-        self.default_version = f"version={default_version}"
-        self.default_version_wrapped = f"({self.default_version})"
-
-        self.properties_fields = self.PROPERTIES_FIELDS
-        self.views_fields = self.VIEWS_FIELDS
-        self.containers_fields = self.CONTAINERS_FIELDS
-        self.prop_name = "properties"
-        self.view_name = "views"
-        self.container_name = "containers"
-        self.metadata_name = "metadata"
-        self.enum_name = "enum"
-        self.nodes_name = "nodes"
-        self.prop_view = "view"
-        self.prop_container = "container"
-        self.prop_view_property = "view_property"
-        self.prop_value_type = "value_type"
-        self.prop_connection = "connection"
-        self.view_view = "view"
-        self.view_implements = "implements"
-        self.container_container = "container"
-        self.container_constraint = "constraint"
-        self.nodes_node = "node"
-        self.enum_collection = "collection"
-        self.reference = "Reference" if by_alias else "reference"
-
-        if by_alias:
-            self.properties_fields = [
-                DMSProperty.model_fields[field].alias or field for field in self.properties_fields
-            ]
-            self.views_fields = [DMSView.model_fields[field].alias or field for field in self.views_fields]
-            self.containers_fields = [
-                DMSContainer.model_fields[field].alias or field for field in self.containers_fields
-            ]
-            self.prop_view = DMSProperty.model_fields[self.prop_view].alias or self.prop_view
-            self.prop_container = DMSProperty.model_fields[self.prop_container].alias or self.prop_container
-            self.prop_view_property = DMSProperty.model_fields[self.prop_view_property].alias or self.prop_view_property
-            self.prop_value_type = DMSProperty.model_fields[self.prop_value_type].alias or self.prop_value_type
-            self.prop_connection = DMSProperty.model_fields[self.prop_connection].alias or self.prop_connection
-            self.view_view = DMSView.model_fields[self.view_view].alias or self.view_view
-            self.view_implements = DMSView.model_fields[self.view_implements].alias or self.view_implements
-            self.container_container = (
-                DMSContainer.model_fields[self.container_container].alias or self.container_container
-            )
-            self.container_constraint = (
-                DMSContainer.model_fields[self.container_constraint].alias or self.container_constraint
-            )
-            self.nodes_node = DMSNode.model_fields[self.nodes_node].alias or self.nodes_node
-
-            self.prop_name = DMSRules.model_fields[self.prop_name].alias or self.prop_name
-            self.view_name = DMSRules.model_fields[self.view_name].alias or self.view_name
-            self.container_name = DMSRules.model_fields[self.container_name].alias or self.container_name
-            self.metadata_name = DMSRules.model_fields[self.metadata_name].alias or self.metadata_name
-            self.nodes_name = DMSRules.model_fields[self.nodes_name].alias or self.nodes_name
-            self.enum_name = DMSRules.model_fields[self.enum_name].alias or self.enum_name
-            self.enum_collection = DMSEnum.model_fields[self.enum_collection].alias or self.enum_collection
-
-    def clean(self, dumped: dict[str, Any], as_reference: bool) -> dict[str, Any]:
-        # Sorting to get a deterministic order
-        dumped[self.prop_name] = sorted(
-            dumped[self.prop_name]["data"], key=lambda p: (p[self.prop_view], p[self.prop_view_property])
-        )
-        dumped[self.view_name] = sorted(dumped[self.view_name]["data"], key=lambda v: v[self.view_view])
-        if container_data := dumped.get(self.container_name):
-            dumped[self.container_name] = sorted(container_data["data"], key=lambda c: c[self.container_container])
-        else:
-            dumped.pop(self.container_name, None)
-
-        if enum_data := dumped.get(self.enum_name):
-            dumped[self.enum_name] = sorted(enum_data["data"], key=lambda e: e[self.enum_collection])
-        else:
-            dumped.pop(self.enum_name, None)
-
-        if node_types_data := dumped.get(self.nodes_name):
-            dumped[self.nodes_name] = sorted(node_types_data["data"], key=lambda n: n[self.nodes_node])
-        else:
-            dumped.pop(self.nodes_name, None)
-
-        for prop in dumped[self.prop_name]:
-            if as_reference:
-                view_entity = cast(ViewEntity, ViewEntity.load(prop[self.prop_view]))
-                prop[self.reference] = str(
-                    ReferenceEntity(
-                        prefix=view_entity.prefix,
-                        suffix=view_entity.suffix,
-                        version=view_entity.version,
-                        property=prop[self.prop_view_property],
-                    )
-                )
-            for field_name in self.properties_fields:
-                if as_reference and field_name == self.prop_container:
-                    # When dumping as reference, the container should keep the default space for easy copying
-                    # over to user sheets.
-                    continue
-                if value := prop.get(field_name):
-                    prop[field_name] = value.removeprefix(self.default_space).removesuffix(self.default_version_wrapped)
-            if isinstance(prop.get(self.prop_connection), str):
-                # Remove default values from connection (type, direction, properties)
-                default_type = f"type={self.default_space}{prop[self.view_view]}.{prop[self.prop_view_property]}"
-                default_type_space = f"type={self.default_space}"
-                default_properties = f"properties={self.default_space}"
-                default_direction = "direction=outwards"
-                prop[self.prop_connection] = (
-                    prop[self.prop_connection]
-                    .replace(self.default_version, "")
-                    .replace(default_type, "")
-                    .replace(default_type_space, "type=")
-                    .replace(default_properties, "properties=")
-                    .replace(default_direction, "")
-                    .replace("()", "")
-                    .replace("(,)", "")
-                    .replace("(,,)", "")
-                    .replace("(,", "(")
-                    .replace(",)", ")")
-                )
-
-        for view in dumped[self.view_name]:
-            if as_reference:
-                view[self.reference] = view[self.view_view]
-            for field_name in self.views_fields:
-                if value := view.get(field_name):
-                    view[field_name] = value.removeprefix(self.default_space).removesuffix(self.default_version_wrapped)
-            if value := view.get(self.view_implements):
-                view[self.view_implements] = ",".join(
-                    parent.strip().removeprefix(self.default_space).removesuffix(self.default_version_wrapped)
-                    for parent in value.split(",")
-                )
-
-        for container in dumped.get(self.container_name, []):
-            if as_reference:
-                container[self.reference] = container[self.container_container]
-            for field_name in self.containers_fields:
-                if value := container.get(field_name):
-                    container[field_name] = value.removeprefix(self.default_space)
-
-            if value := container.get(self.container_constraint):
-                container[self.container_constraint] = ",".join(
-                    constraint.strip().removeprefix(self.default_space) for constraint in value.split(",")
-                )
-
-        for node in dumped.get(self.nodes_name, []):
-            node[self.nodes_node] = node[self.nodes_node].removeprefix(self.default_space)
-        return dumped