Merge branch 'main' into geometry-refactor

CHANGELOG.md

@@ -145,6 +145,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Changed `compas.data.DataEncoder` and `compas.data.DataDecoder` to support `to_jsondata` and `from_jsondata`.
 * Moved all API level docstrings from the `__init__.py` to the correspoding `.rst` file in the docs.
 * Fixed `AttributeError` in Plotter's `PolylineArtist` and `SegementArtist`.
+* Fixed wrong key type when de-serializing `Graph` with integer keys leading to node not found.
 * Changed base class for `compas.geometry.Transformation` to `compas.data.Data`.
 * Moved all core transformation functions to `compas.geometry._core`.
 * Changed base class of `compas.geometry.Arc` to `compas.geometry.Curve.`

src/compas/datastructures/assembly/assembly.py

@@ -60,14 +60,14 @@ def JSONSCHEMANAME(self):
     def data(self):
         data = {
             "attributes": self.attributes,
-            "graph": self.graph.data,
+            "graph": self.graph,
         }
         return data
 
     @data.setter
     def data(self, data):
         self.attributes.update(data["attributes"] or {})
-        self.graph.data = data["graph"]
+        self.graph = data["graph"]
         self._parts = {part.guid: part.key for part in self.parts()}
 
     # ==========================================================================

tests/compas/datastructures/test_assembly.py

@@ -1,5 +1,7 @@
 import pytest
 
+from compas.data import json_dumps
+from compas.data import json_loads
 from compas.datastructures import Assembly
 from compas.datastructures import AssemblyError
 from compas.datastructures import Part
@@ -69,9 +71,22 @@ def test_find_by_key():
     assert assembly.find_by_key("100") is None
 
 
-def test_find_by_key_after_deserialization():
+def test_find_by_key_after_from_data():
     assembly = Assembly()
     part = Part()
     assembly.add_part(part, key=2)
     assembly = Assembly.from_data(assembly.to_data())
     assert assembly.find_by_key(2) == part
+
+
+def test_find_by_key_after_deserialization():
+    assembly = Assembly()
+    part = Part(name="test_part")
+    assembly.add_part(part, key=2)
+    assembly = json_loads(json_dumps(assembly))
+
+    deserialized_part = assembly.find_by_key(2)
+    assert deserialized_part.name == part.name
+    assert deserialized_part.key == part.key
+    assert deserialized_part.guid == part.guid
+    assert deserialized_part.attributes == part.attributes