temp unstructured stuff for data structures

Author: tomvanmele

src/compas/datastructures/assembly/assembly.py

@@ -34,19 +34,22 @@ class Assembly(Datastructure):
         "type": "object",
         "properties": {
             "graph": Graph.DATASCHEMA,
+            "attributes": {"type": "object"},
         },
-        "required": ["graph"],
+        "required": ["graph", "attributes"],
     }
 
     @property
     def __data__(self):
         return {
             "graph": self.graph.__data__,
+            "attributes": self.attributes,
         }
 
     @classmethod
     def __from_data__(cls, data):
         assembly = cls()
+        assembly.attributes.update(data["attributes"] or {})
         assembly.graph = Graph.__from_data__(data["graph"])
         assembly._parts = {part.guid: part.key for part in assembly.parts()}  # type: ignore
         return assembly

src/compas/datastructures/cell_network/cell_network.py

@@ -85,6 +85,7 @@ class CellNetwork(Datastructure):
     DATASCHEMA = {
         "type": "object",
         "properties": {
+            "attributes": {"type": "object"},
             "default_vertex_attributes": {"type": "object"},
             "default_edge_attributes": {"type": "object"},
             "default_face_attributes": {"type": "object"},
@@ -146,6 +147,7 @@ class CellNetwork(Datastructure):
             "max_cell": {"type": "number", "minimum": -1},
         },
         "required": [
+            "attributes",
             "default_vertex_attributes",
             "default_edge_attributes",
             "default_face_attributes",
@@ -173,6 +175,7 @@ def __data__(self):
             cell[c] = sorted(list(faces))
 
         return {
+            "attributes": self.attributes,
             "default_vertex_attributes": self.default_vertex_attributes,
             "default_edge_attributes": self.default_edge_attributes,
             "default_face_attributes": self.default_face_attributes,
@@ -196,6 +199,7 @@ def __from_data__(cls, data):
             default_face_attributes=data.get("default_face_attributes"),
             default_cell_attributes=data.get("default_cell_attributes"),
         )
+        cell_network.attributes.update(data.get("attributes") or {})
 
         vertex = data["vertex"] or {}
         edge = data["edge"] or {}

src/compas/datastructures/graph/graph.py

@@ -90,6 +90,7 @@ class Graph(Datastructure):
     DATASCHEMA = {
         "type": "object",
         "properties": {
+            "attributes": {"type": "object"},
             "default_node_attributes": {"type": "object"},
             "default_edge_attributes": {"type": "object"},
             "node": {
@@ -106,6 +107,7 @@ class Graph(Datastructure):
             "max_node": {"type": "integer", "minimum": -1},
         },
         "required": [
+            "attributes",
             "default_node_attributes",
             "default_edge_attributes",
             "node",
@@ -118,6 +120,7 @@ class Graph(Datastructure):
     def __data__(self):
         return self.__before_json_dump__(
             {
+                "attributes": self.attributes,
                 "default_node_attributes": self.default_node_attributes,
                 "default_edge_attributes": self.default_edge_attributes,
                 "node": self.node,
@@ -145,6 +148,7 @@ def __from_data__(cls, data):
             default_node_attributes=data.get("default_node_attributes"),
             default_edge_attributes=data.get("default_edge_attributes"),
         )
+        graph.attributes.update(data["attributes"] or {})
         data = graph.__after_json_load__(data)
         for node, attr in iter(data["node"].items()):
             graph.add_node(key=node, attr_dict=attr)

src/compas/datastructures/mesh/mesh.py

@@ -138,6 +138,7 @@ class Mesh(Datastructure):
     DATASCHEMA = {
         "type": "object",
         "properties": {
+            "attributes": {"type": "object"},
             "default_vertex_attributes": {"type": "object"},
             "default_edge_attributes": {"type": "object"},
             "default_face_attributes": {"type": "object"},
@@ -171,6 +172,7 @@ class Mesh(Datastructure):
             "max_face": {"type": "integer", "minimum": -1},
         },
         "required": [
+            "attributes",
             "default_vertex_attributes",
             "default_edge_attributes",
             "default_face_attributes",
@@ -187,6 +189,7 @@ class Mesh(Datastructure):
     def __data__(self):
         return self.__before_json_dump__(
             {
+                "attributes": self.attributes,
                 "default_vertex_attributes": self.default_vertex_attributes,
                 "default_edge_attributes": self.default_edge_attributes,
                 "default_face_attributes": self.default_face_attributes,
@@ -212,6 +215,7 @@ def __from_data__(cls, data):
             default_face_attributes=data.get("default_face_attributes"),
             default_edge_attributes=data.get("default_edge_attributes"),
         )
+        mesh.attributes.update(data.get("attributes") or {})
 
         vertex = data["vertex"] or {}
         face = data["face"] or {}

src/compas/datastructures/tree/tree.py

@@ -246,19 +246,22 @@ class Tree(Datastructure):
         "type": "object",
         "properties": {
             "root": TreeNode.DATASCHEMA,
+            "attributes": {"type": "object"},
         },
-        "required": ["root"],
+        "required": ["root", "attributes"],
     }
 
     @property
     def __data__(self):
         return {
+            "attributes": self.attributes,
             "root": self.root.__data__,  # type: ignore
         }
 
     @classmethod
     def __from_data__(cls, data):
         tree = cls()
+        tree.attributes.update(data["attributes"] or {})
         root = TreeNode.__from_data__(data["root"])
         tree.add(root)
         return tree

src/compas/datastructures/volmesh/volmesh.py

@@ -80,6 +80,7 @@ class VolMesh(Datastructure):
     DATASCHEMA = {
         "type": "object",
         "properties": {
+            "attributes": {"type": "object"},
             "default_vertex_attributes": {"type": "object"},
             "default_edge_attributes": {"type": "object"},
             "default_face_attributes": {"type": "object"},
@@ -124,6 +125,7 @@ class VolMesh(Datastructure):
             "max_cell": {"type": "number", "minimum": -1},
         },
         "required": [
+            "attributes",
             "default_vertex_attributes",
             "default_edge_attributes",
             "default_face_attributes",
@@ -149,6 +151,7 @@ def __data__(self):
             _cell[c] = faces
 
         return {
+            "attributes": self.attributes,
             "default_vertex_attributes": self.default_vertex_attributes,
             "default_edge_attributes": self.default_edge_attributes,
             "default_face_attributes": self.default_face_attributes,
@@ -171,6 +174,7 @@ def __from_data__(cls, data):
             default_face_attributes=data.get("default_face_attributes"),
             default_cell_attributes=data.get("default_cell_attributes"),
         )
+        volmesh.attributes.update(data["attributes"] or {})
 
         vertex = data["vertex"] or {}
         cell = data["cell"] or {}

tests/compas/data/test_dataschema.py

@@ -596,20 +596,23 @@ def test_schema_pointcloud_invalid(pointcloud):
         "graph",
         [
             {
+                "attributes": {},
                 "default_node_attributes": {},
                 "default_edge_attributes": {},
                 "node": {},
                 "edge": {},
                 "max_node": -1,
             },
             {
+                "attributes": {},
                 "default_node_attributes": {},
                 "default_edge_attributes": {},
                 "node": {},
                 "edge": {},
                 "max_node": 0,
             },
             {
+                "attributes": {},
                 "default_node_attributes": {},
                 "default_edge_attributes": {},
                 "node": {},