remove random attributes dict everywhere + add name to data object

Author: tomvanmele

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 * Added `compas.dtastructures.Network` as alias of `compas.datastructures.Graph`.
+* Added `compas.data.Data.name` and included it in serialisation in case `compas.data.Data._name is not None`.
 
 ### Changed
 
@@ -22,6 +23,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Removed `compas.datastructures.Network`.
 * Removed `compas.datastructures.Halfedge`.
 * Removed `compas.datastructures.Halfface`.
+* Removed `compas.data.Data.attributes`.
+* Removed `compas.data.Datastructure.attributes`.
+* Removed `attributes` from `compas.datastructures.Assembly.data`.
+* Removed `attributes` from `compas.datastructures.CellNetwork.data`.
+* Removed `attributes` from `compas.datastructures.Graph.data`.
+* Removed `attributes` from `compas.datastructures.Mesh.data`.
+* Removed `attributes` from `compas.datastructures.Tree.data`.
+* Removed `attributes` from `compas.datastructures.VolMesh.data`.
 
 ## [2.0.0-beta.2] 2024-01-12
 

src/compas/data/data.py

@@ -39,12 +39,6 @@ class Data(object):
 
     Attributes
     ----------
-    dtype : str, read-only
-        The type of the object in the form of a fully qualified module name and a class name, separated by a forward slash ("/").
-        For example: ``"compas.datastructures/Mesh"``.
-    data : dict
-        The representation of the object as a dictionary containing only built-in Python data types.
-        The structure of the dict is described by the data schema.
     guid : str, read-only
         The globally unique identifier of the object.
         The guid is generated with ``uuid.uuid4()``.
@@ -97,7 +91,8 @@ def __jsondump__(self, minimal=False):
         }
         if minimal:
             return state
-        state["name"] = self.name
+        if self._name is not None:
+            state["name"] = self._name
         state["guid"] = str(self.guid)
         return state
 

src/compas/data/encoders.py

@@ -237,6 +237,6 @@ def object_hook(self, o):
         if IDictionary and isinstance(o, IDictionary[str, object]):
             data = {key: data[key] for key in data.Keys}
 
-        obj = cls.__jsonload__(data, guid, name)
+        obj = cls.__jsonload__(data, guid=guid, name=name)
 
         return obj

src/compas/datastructures/assembly/assembly.py

@@ -17,8 +17,6 @@ class Assembly(Datastructure):
 
     Attributes
     ----------
-    attributes : dict[str, Any]
-        General attributes of the data structure that will be included in the data dict and serialization.
     graph : :class:`compas.datastructures.Graph`
         The graph that is used under the hood to store the parts and their connections.
 
@@ -33,16 +31,13 @@ class Assembly(Datastructure):
     DATASCHEMA = {
         "type": "object",
         "properties": {
-            "attributes": {"type": "object"},
             "graph": Graph.DATASCHEMA,
         },
         "required": ["graph"],
     }
 
-    def __init__(self, name=None, **kwargs):
-        super(Assembly, self).__init__()
-        self.attributes = {"name": name or "Assembly"}
-        self.attributes.update(kwargs)
+    def __init__(self, name=None):
+        super(Assembly, self).__init__(name=name)
         self.graph = Graph()
         self._parts = {}
 
@@ -57,30 +52,16 @@ def __str__(self):
     @property
     def data(self):
         return {
-            "attributes": self.attributes,
             "graph": self.graph.data,
         }
 
     @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
 
-    # ==========================================================================
-    # Properties
-    # ==========================================================================
-
-    @property
-    def name(self):
-        return self.attributes.get("name") or self.__class__.__name__
-
-    @name.setter
-    def name(self, value):
-        self.attributes["name"] = value
-
     # ==========================================================================
     # Constructors
     # ==========================================================================

src/compas/datastructures/cell_network/cell_network.py

@@ -52,13 +52,11 @@ class CellNetwork(Datastructure):
         Default values for face attributes.
     default_cell_attributes: dict, optional
         Default values for cell attributes.
-    **kwargs : dict, optional
-        Additional attributes for the data structure itself.
+    name : str, optional
+        The name of the cell network.
 
     Attributes
     ----------
-    attributes : dict[str, Any]
-        General attributes of the data structure which will be included in the data representation.
     default_vertex_attributes : dict[str, Any]
         Default attributes of the vertices.
     default_edge_attributes: dict[str, Any]
@@ -85,7 +83,6 @@ class CellNetwork(Datastructure):
     DATASCHEMA = {
         "type": "object",
         "properties": {
-            "attributes": {"type": "object"},
             "dva": {"type": "object"},
             "dea": {"type": "object"},
             "dfa": {"type": "object"},
@@ -169,9 +166,9 @@ def __init__(
         default_edge_attributes=None,
         default_face_attributes=None,
         default_cell_attributes=None,
-        **kwargs
+        name=None,
     ):
-        super(CellNetwork, self).__init__(**kwargs)
+        super(CellNetwork, self).__init__(name=name)
         self._max_vertex = -1
         self._max_face = -1
         self._max_cell = -1
@@ -233,7 +230,6 @@ def data(self):
             cell[c] = sorted(list(faces))
 
         return {
-            "attributes": self.attributes,
             "dva": self.default_vertex_attributes,
             "dea": self.default_edge_attributes,
             "dfa": self.default_face_attributes,
@@ -256,14 +252,11 @@ def from_data(cls, data):
         dfa = data.get("dfa") or {}
         dca = data.get("dca") or {}
 
-        attributes = data.get("attributes") or {}
-
         cell_network = cls(
             default_vertex_attributes=dva,
             default_edge_attributes=dea,
             default_face_attributes=dfa,
             default_cell_attributes=dca,
-            **attributes
         )
 
         vertex = data["vertex"] or {}