cognite-neat 0.96.3__py3-none-any.whl → 0.96.4__py3-none-any.whl

cognite/neat/_rules/models/dms/_rules.py

@@ -231,7 +231,9 @@ class DMSProperty(SheetRow):
     @field_serializer("connection", when_used="unless-none")
     def remove_defaults(self, value: Any, info: SerializationInfo) -> str:
         if isinstance(value, Entity) and (metadata := _metadata(info.context)):
-            default_type = f"{metadata.space}{self.view.external_id}.{self.view_property}"
+            default_type = f"{self.view.external_id}.{self.view_property}"
+            if isinstance(value, EdgeEntity) and value.edge_type and value.edge_type.space != metadata.space:
+                default_type = f"{metadata.space}{default_type}"
             return value.dump(space=metadata.space, version=metadata.version, type=default_type)
         return str(value)
 

cognite/neat/_rules/models/entities/_single_value.py

@@ -187,10 +187,10 @@ class Entity(BaseModel, extra="ignore"):
         }
         if isinstance(defaults, dict):
             for key, value in defaults.items():
-                if key in model_dump and value == defaults.get(key):
+                if key in model_dump and model_dump[key] == value:
                     del model_dump[key]
-
-        args = ",".join(f"{k}={v}" for k, v in model_dump.items())
+        # Sorting to ensure deterministic order
+        args = ",".join(f"{k}={v}" for k, v in sorted(model_dump.items(), key=lambda x: x[0]))
         if self.prefix == Undefined or (isinstance(defaults, dict) and self.prefix == defaults.get("prefix")):
             base_id = str(self.suffix)
         else:

cognite/neat/_version.py

@@ -1 +1 @@
-__version__ = "0.96.3"
+__version__ = "0.96.4"

{cognite_neat-0.96.3.dist-info → cognite_neat-0.96.4.dist-info}/METADATA

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

{cognite_neat-0.96.3.dist-info → cognite_neat-0.96.4.dist-info}/RECORD

@@ -186,7 +186,7 @@ cognite/neat/_rules/models/asset/_validation.py,sha256=6u86qLlr1ehG1I5kIZhfCYTqU
 cognite/neat/_rules/models/data_types.py,sha256=ACQjS9vs7EjaNSO8R1kHiiNYbdeVQLCvxJYfZhWF8mM,9620
 cognite/neat/_rules/models/dms/__init__.py,sha256=CUqUlVjz4yZX_-61F-2ofSoV7N9MlSYx2N7vM-omp7E,640
 cognite/neat/_rules/models/dms/_exporter.py,sha256=u9lLHwa6DUsh-xlaSbuU1YV5-xvbXObAocWvsRphGfc,29438
-cognite/neat/_rules/models/dms/_rules.py,sha256=JCYss9Nqf2tloyZj4gZktaW_45gMCjw7aLf5XeD_kRk,19980
+cognite/neat/_rules/models/dms/_rules.py,sha256=k0jCcfndWCJeBoA31wr2wBNCZkboEiAPbCfIreNo9vU,20139
 cognite/neat/_rules/models/dms/_rules_input.py,sha256=MjkkoEa5lRzQE0NUJ7TyQsrelWSoyGCCDFjMVG5pQvc,11530
 cognite/neat/_rules/models/dms/_schema.py,sha256=HSmSDvOm5S0x4Vb9tH9Jvd5i9tXiiM08E_Sdu6q_iA8,50783
 cognite/neat/_rules/models/dms/_validation.py,sha256=2KL1_GNnJ5cjsdk9uJTBV691_o8ZehqmgXSiaN5q8aw,15798
@@ -195,7 +195,7 @@ cognite/neat/_rules/models/entities/__init__.py,sha256=QD-h79HhjqCsgscNU5kuf1ieR
 cognite/neat/_rules/models/entities/_constants.py,sha256=ToiLaaF-hGLPfn3AsKIIrfB4ZdTk4cY1RjM9gA1Qjkg,288
 cognite/neat/_rules/models/entities/_loaders.py,sha256=mb_iKnwGn1FOa4bcqIuvh4oy5tuUpOWF6pFOOB_9ndE,2693
 cognite/neat/_rules/models/entities/_multi_value.py,sha256=5RgZBrJfw7VSE-6F50-Lqtio_xVo4vbezKmoyiDdcw8,2692
-cognite/neat/_rules/models/entities/_single_value.py,sha256=JLX8t-Uft0qeY_honmv0GbIip59gtBvsaPQ9oNfZJis,17416
+cognite/neat/_rules/models/entities/_single_value.py,sha256=tRu5jmCPnN35qxt0iJEVz_THcDUW6hShNCN_8DbREBE,17489
 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
@@ -242,7 +242,7 @@ cognite/neat/_utils/text.py,sha256=PvTEsEjaTu8SE8yYaKUrce4msboMj933dK7-0Eey_rE,3
 cognite/neat/_utils/time_.py,sha256=O30LUiDH9TdOYz8_a9pFqTtJdg8vEjC3qHCk8xZblG8,345
 cognite/neat/_utils/upload.py,sha256=qd8NA46fMvhCIDh66WNj8MiXv1ewDiFjvy59pSFkmG0,4604
 cognite/neat/_utils/xml_.py,sha256=FQkq84u35MUsnKcL6nTMJ9ajtG9D5i1u4VBnhGqP2DQ,1710
-cognite/neat/_version.py,sha256=1gkTRvSK17IZwde2Tt6sJcTPl4ubmaCGSAZ3Q7IekVg,23
+cognite/neat/_version.py,sha256=-WRL9Kr5U8AJBJFauUkNo0TydWNSEsmomFHBDvlk0Uk,23
 cognite/neat/_workflows/__init__.py,sha256=S0fZq7kvoqDKodHu1UIPsqcpdvXoefUWRPt1lqeQkQs,420
 cognite/neat/_workflows/base.py,sha256=O1pcmfbme2gIVF2eOGrKZSUDmhZc8L9rI8UfvLN2YAM,26839
 cognite/neat/_workflows/cdf_store.py,sha256=3pebnATPo6In4-1srpa3wzstynTOi3T6hwFX5uaie4c,18050
@@ -271,8 +271,8 @@ cognite/neat/_workflows/tasks.py,sha256=dr2xuIb8P5e5e9p_fjzRlvDbKsre2xGYrkc3wnRx
 cognite/neat/_workflows/triggers.py,sha256=u69xOsaTtM8_WD6ZeIIBB-XKwvlZmPHAsZQh_TnyHcM,7073
 cognite/neat/_workflows/utils.py,sha256=gKdy3RLG7ctRhbCRwaDIWpL9Mi98zm56-d4jfHDqP1E,453
 cognite/neat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cognite_neat-0.96.3.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.96.3.dist-info/METADATA,sha256=AHJg2VF9eKy4MS9KhW19ePHxxdv7nkKP9MOQlTSTSWs,9573
-cognite_neat-0.96.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-cognite_neat-0.96.3.dist-info/entry_points.txt,sha256=SsQlnl8SNMSSjE3acBI835JYFtsIinLSbVmHmMEXv6E,51
-cognite_neat-0.96.3.dist-info/RECORD,,
+cognite_neat-0.96.4.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.96.4.dist-info/METADATA,sha256=hQ8Xbxh2CawmdxuSiWPCFe9VhSc6A1uiT4wTuvoFNq4,9573
+cognite_neat-0.96.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+cognite_neat-0.96.4.dist-info/entry_points.txt,sha256=SsQlnl8SNMSSjE3acBI835JYFtsIinLSbVmHmMEXv6E,51
+cognite_neat-0.96.4.dist-info/RECORD,,