Refactor json interface

CHANGELOG.md

@@ -11,39 +11,46 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Added `create_id` to `compas_ghpython.utilities`. (moved from `compas_fab`)
 * Added representation for features in `compas.datastructures.Part`.
-* Added  `split` and `split_by_length` to `compas.geometry.Polyline`.
+* Added `split` and `split_by_length` to `compas.geometry.Polyline`.
 * Added `compas.rpc.XFunc`.
-* Added `compas.data.Data.validate_jsonstring`.
-* Added `compas.data.Data.validate_jsondata`.
-* Added `compas.data.Data.JSONSCHEMA`.
-* Added `compas.data.json_validate`.
-* Added `compas.datastructures.Graph.JSONSCHEMA`.
+* Added attribute `compas.color.Color.DATASCHEMA`.
+* Added attribute `compas.data.Data.DATASCHEMA`.
+* Added attribute `compas.datastructures.Graph.DATASCHEMA`.
+* Added attribute `compas.datastructures.Halfedge.DATASCHEMA`.
+* Added attribute `compas.datastructures.Halfface.DATASCHEMA`.
+* Added attribute `compas.geometry.Arc.DATASCHEMA`.
+* Added attribute `compas.geometry.Bezier.DATASCHEMA`.
+* Added attribute `compas.geometry.Box.DATASCHEMA`.
+* Added attribute `compas.geometry.Capsule.DATASCHEMA`.
+* Added attribute `compas.geometry.Circle.DATASCHEMA`.
+* Added attribute `compas.geometry.Cone.DATASCHEMA`.
+* Added attribute `compas.geometry.Cylinder.DATASCHEMA`.
+* Added attribute `compas.geometry.Ellipse.DATASCHEMA`.
+* Added attribute `compas.geometry.Frame.DATASCHEMA`.
+* Added attribute `compas.geometry.Line.DATASCHEMA`.
+* Added attribute `compas.geometry.NurbsCurve.DATASCHEMA`.
+* Added attribute `compas.geometry.NurbsSurface.DATASCHEMA`.
+* Added attribute `compas.geometry.Plane.DATASCHEMA`.
+* Added attribute `compas.geometry.Point.DATASCHEMA`.
+* Added attribute `compas.geometry.Pointcloud.DATASCHEMA`.
+* Added attribute `compas.geometry.Polygon.DATASCHEMA`.
+* Added attribute `compas.geometry.Polyhedron.DATASCHEMA`.
+* Added attribute `compas.geometry.Polyline.DATASCHEMA`.
+* Added attribute `compas.geometry.Sphere.DATASCHEMA`.
+* Added attribute `compas.geometry.Torus.DATASCHEMA`.
+* Added attribute `compas.geometry.Quaternion.DATASCHEMA`.
+* Added attribute `compas.geometry.Vector.DATASCHEMA`.
+* Added implementation of property `compas.color.Color.data`.
+* Added `compas.data.Data.validate_data`.
+* Added `compas.data.Data.__jsondump__`.
+* Added `compas.data.Data.__jsonload__`.
+* Added `compas.data.schema.dataclass_dataschema`.
+* Added `compas.data.schema.dataclass_typeschema`.
+* Added `compas.data.schema.dataclass_jsonschema`.
+* Added `compas.data.schema.compas_jsonschema`.
+* Added `compas.data.schema.compas_dataclasses`.
 * Added `compas.datastructures.Graph.to_jsondata`.
 * Added `compas.datastructures.Graph.from_jsondata`.
-* Added `compas.datastructures.Halfedge.JSONSCHEMA`.
-* Added `compas.datastructures.Halfface.JSONSCHEMA`.
-* Added `compas.geometry.Arc.JSONSCHEMA`.
-* Added `compas.geometry.Bezier.JSONSCHEMA`.
-* Added `compas.geometry.Box.JSONSCHEMA`.
-* Added `compas.geometry.Capsule.JSONSCHEMA`.
-* Added `compas.geometry.Circle.JSONSCHEMA`.
-* Added `compas.geometry.Cone.JSONSCHEMA`.
-* Added `compas.geometry.Cylinder.JSONSCHEMA`.
-* Added `compas.geometry.Ellipse.JSONSCHEMA`.
-* Added `compas.geometry.Frame.JSONSCHEMA`.
-* Added `compas.geometry.Line.JSONSCHEMA`.
-* Added `compas.geometry.NurbsCurve.JSONSCHEMA`.
-* Added `compas.geometry.NurbsSurface.JSONSCHEMA`.
-* Added `compas.geometry.Plane.JSONSCHEMA`.
-* Added `compas.geometry.Point.JSONSCHEMA`.
-* Added `compas.geometry.Pointcloud.JSONSCHEMA`.
-* Added `compas.geometry.Polygon.JSONSCHEMA`.
-* Added `compas.geometry.Polyhedron.JSONSCHEMA`.
-* Added `compas.geometry.Polyline.JSONSCHEMA`.
-* Added `compas.geometry.Sphere.JSONSCHEMA`.
-* Added `compas.geometry.Torus.JSONSCHEMA`.
-* Added `compas.geometry.Quaternion.JSONSCHEMA`.
-* Added `compas.geometry.Vector.JSONSCHEMA`.
 * Added `compas.datastructures.Halfedge.halfedge_loop_vertices`.
 * Added `compas.datastructures.Halfedge.halfedge_strip_faces`.
 * Added `compas.datastructures.Mesh.vertex_point`.
@@ -59,16 +66,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `compas.datastructures.Graph.node_index` and `compas.datastructures.Graph.index_node`.
 * Added `compas.datastructures.Graph.edge_index` and `compas.datastructures.Graph.index_edge`.
 * Added `compas.datastructures.Halfedge.vertex_index` and `compas.datastructures.Halfedge.index_vertex`.
-* Added `compas.geometry.trimesh_descent_numpy`.
-* Added `compas.geometry.trimesh_gradient_numpy`.
-* Added a deprecation warning when using `Artist` for `Plotter`.
 * Added `compas.geometry.Hyperbola`.
 * Added `compas.geometry.Parabola`.
 * Added `compas.geometry.PlanarSurface`.
 * Added `compas.geometry.CylindricalSurface`.
 * Added `compas.geometry.SphericalSurface`.
 * Added `compas.geometry.ConicalSurface`.
 * Added `compas.geometry.ToroidalSurface`.
+* Added `compas.geometry.trimesh_descent_numpy`.
+* Added `compas.geometry.trimesh_gradient_numpy`.
 * Added `compas.geometry.boolean_union_polygon_polygon` pluggable.
 * Added `compas.geometry.boolean_intersection_polygon_polygon` pluggable.
 * Added `compas.geometry.boolean_difference_polygon_polygon` pluggable.
@@ -95,6 +101,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `vertices_and_faces_to_rhino` to `compas_rhino.conversions`.
 * Added `polyhedron_to_rhino` to `compas_rhino.conversions`.
 * Added `from_mesh` plugin to `compas_rhino.geometry.RhinoBrep`.
+* Added `compas.geometry.Plane.worldYZ` and `compas.geometry.Plane.worldZX`.
 
 ### Changed
 
@@ -159,7 +166,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Changed base class of `compas.geometry.Line` to `compas.geometry.Curve.`
 * Changed base class of `compas.geometry.Polyline` to `compas.geometry.Curve.`
 * Changed `compas.geometry.oriented_bounding_box_numpy` to minimize volume.
+* Fixed data interface `compas.datastructures.Assembly` and `compas.datastructures.Part`.
+* Changed data property of `compas.datastructures.Graph` to contain only JSON compatible data.
+* Changed data property of `compas.datastructures.Halfedge` to contain only JSON compatible data.
+* Changed data property of `compas.datastructures.Halfface` to contain only JSON compatible data.
+* Changed `__repr__` of `compas.geometry.Point` and `compas.geometry.Vector` to not use limited precision (`compas.PRECISION`) to ensure proper object reconstruction through `eval(repr(point))`.
 * Changed `compas.datastructures.Graph.delete_edge` to delete invalid (u, u) edges and not delete edges in opposite directions (v, u)
+* Fixed bug in `compas.datastructures.Mesh.insert_vertex`.
 * Fixed bug in `compas.geometry.angle_vectors_signed`.
 
 ### Removed
@@ -172,36 +185,40 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Removed `compas.datastructures.Halfedge.get_any_vertices`.
 * Removed `compas.datastructures.Halfedge.get_any_face`.
 * Removed "schemas" folder and all contained `.json` files from `compas.data`.
-* Removed `compas.data.Data.DATASCHEMA`.
-* Removed `compas.data.Data.JSONSCHEMANAME`.
 * Removed `compas.data.Data.jsondefinititions`.
 * Removed `compas.data.Data.jsonvalidator`.
-* Removed `compas.data.Data.validate_data`.
-* Removed `compas.datastructures.Graph.DATASCHEMA` and `compas.datastructures.Graph.JSONSCHEMANAME`.
-* Removed `compas.datastructures.Halfedge.DATASCHEMA` and `compas.datastructures.Halfedge.JSONSCHEMANAME`.
-* Removed `compas.datastructures.Halfface.DATASCHEMA` and `compas.datastructures.Halfface.JSONSCHEMANAME`.
-* Removed `compas.geometry.Arc.DATASCHEMA` and `compas.geometry.Arc.JSONSCHEMANAME`.
-* Removed `compas.geometry.Bezier.DATASCHEMA` and `compas.geometry.Bezier.JSONSCHEMANAME`.
-* Removed `compas.geometry.Box.DATASCHEMA` and `compas.geometry.Box.JSONSCHEMANAME`.
-* Removed `compas.geometry.Capsule.DATASCHEMA` and `compas.geometry.Capsule.JSONSCHEMANAME`.
-* Removed `compas.geometry.Circle.DATASCHEMA` and `compas.geometry.Circle.JSONSCHEMANAME`.
-* Removed `compas.geometry.Cone.DATASCHEMA` and `compas.geometry.Cone.JSONSCHEMANAME`.
-* Removed `compas.geometry.Cylinder.DATASCHEMA` and `compas.geometry.Cylinder.JSONSCHEMANAME`.
-* Removed `compas.geometry.Ellipse.DATASCHEMA` and `compas.geometry.Ellipse.JSONSCHEMANAME`.
-* Removed `compas.geometry.Frame.DATASCHEMA` and `compas.geometry.Frame.JSONSCHEMANAME`.
-* Removed `compas.geometry.Line.DATASCHEMA` and `compas.geometry.Line.JSONSCHEMANAME`.
-* Removed `compas.geometry.NurbsCurve.DATASCHEMA` and `compas.geometry.NurbsCurve.JSONSCHEMANAME`.
-* Removed `compas.geometry.NurbsSurface.DATASCHEMA` and `compas.geometry.NurbsSurface.JSONSCHEMANAME`.
-* Removed `compas.geometry.Plane.DATASCHEMA` and `compas.geometry.Plane.JSONSCHEMANAME`.
-* Removed `compas.geometry.Point.DATASCHEMA` and `compas.geometry.Point.JSONSCHEMANAME`.
-* Removed `compas.geometry.Pointcloud.DATASCHEMA` and `compas.geometry.Pointcloud.JSONSCHEMANAME`.
-* Removed `compas.geometry.Polygon.DATASCHEMA` and `compas.geometry.Polygon.JSONSCHEMANAME`.
-* Removed `compas.geometry.Polyhedron.DATASCHEMA` and `compas.geometry.Polyhedron.JSONSCHEMANAME`.
-* Removed `compas.geometry.Polyline.DATASCHEMA` and `compas.geometry.Polyline.JSONSCHEMANAME`.
-* Removed `compas.geometry.Sphere.DATASCHEMA` and `compas.geometry.Sphere.JSONSCHEMANAME`.
-* Removed `compas.geometry.Torus.DATASCHEMA` and `compas.geometry.Torus.JSONSCHEMANAME`.
-* Removed `compas.geometry.Quaternion.DATASCHEMA` and `compas.geometry.Quaternion.JSONSCHEMANAME`.
-* Removed `compas.geometry.Vector.DATASCHEMA` and `compas.geometry.Vector.JSONSCHEMANAME`.
+* Removed `compas.data.Data.validate_json`.
+* Removed `compas.data.Data.validate_jsondata`.
+* Removed `compas.data.Data.validate_jsonstring`.
+* Removed `compas.data.Data.__getstate__`.
+* Removed `compas.data.Data.__setstate__`.
+* Removed setter of property `compas.data.Data.data` and similar setters in all data classes.
+* Removed properties `compas.data.Data.DATASCHEMA` and `compas.data.Data.JSONSCHEMANAME`.
+* Removed properties `compas.datastructures.Graph.DATASCHEMA` and `compas.datastructures.Graph.JSONSCHEMANAME`.
+* Removed properties `compas.datastructures.Halfedge.DATASCHEMA` and `compas.datastructures.Halfedge.JSONSCHEMANAME`.
+* Removed properties `compas.datastructures.Halfface.DATASCHEMA` and `compas.datastructures.Halfface.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Arc.DATASCHEMA` and `compas.geometry.Arc.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Bezier.DATASCHEMA` and `compas.geometry.Bezier.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Box.DATASCHEMA` and `compas.geometry.Box.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Capsule.DATASCHEMA` and `compas.geometry.Capsule.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Circle.DATASCHEMA` and `compas.geometry.Circle.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Cone.DATASCHEMA` and `compas.geometry.Cone.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Cylinder.DATASCHEMA` and `compas.geometry.Cylinder.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Ellipse.DATASCHEMA` and `compas.geometry.Ellipse.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Frame.DATASCHEMA` and `compas.geometry.Frame.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Line.DATASCHEMA` and `compas.geometry.Line.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.NurbsCurve.DATASCHEMA` and `compas.geometry.NurbsCurve.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.NurbsSurface.DATASCHEMA` and `compas.geometry.NurbsSurface.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Plane.DATASCHEMA` and `compas.geometry.Plane.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Point.DATASCHEMA` and `compas.geometry.Point.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Pointcloud.DATASCHEMA` and `compas.geometry.Pointcloud.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Polygon.DATASCHEMA` and `compas.geometry.Polygon.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Polyhedron.DATASCHEMA` and `compas.geometry.Polyhedron.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Polyline.DATASCHEMA` and `compas.geometry.Polyline.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Sphere.DATASCHEMA` and `compas.geometry.Sphere.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Torus.DATASCHEMA` and `compas.geometry.Torus.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Quaternion.DATASCHEMA` and `compas.geometry.Quaternion.JSONSCHEMANAME`.
+* Removed properties `compas.geometry.Vector.DATASCHEMA` and `compas.geometry.Vector.JSONSCHEMANAME`.
 * Removed `compas.datastructures.Graph.key_index`and `compas.datastructures.Graph.index_key`.
 * Removed `compas.datastructures.Graph.uv_index`and `compas.datastructures.Graph.index_uv`.
 * Removed `compas.datastructures.Halfedge.key_index` and `compas.datastructures.Halfedge.index_key`.
@@ -214,6 +231,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Removed class attribute `CONTEXT` from `compas.artists.Artist`.
 * Removed class attribute `AVAILABLE_CONTEXTS` form `compas.artists.Artist`.
 * Removed `compas.geometry.Primitive`.
+* Removed classmethod `compas.color.Color.from_data`.
+* Removed `validate_data` from `compas.data.validators`.
+* Removed `json_validate` from `compas.data.json`.
 
 ## [1.17.5] 2023-02-16
 

src/compas/colors/color.py

@@ -3,7 +3,7 @@
 from __future__ import print_function
 
 try:
-    basestring
+    basestring  # type: ignore
 except NameError:
     basestring = str
 
@@ -104,6 +104,17 @@ class Color(Data):
 
     """
 
+    DATASCHEMA = {
+        "type": "object",
+        "properties": {
+            "red": {"type": "number", "minimum": 0.0, "maximum": 1.0},
+            "green": {"type": "number", "minimum": 0.0, "maximum": 1.0},
+            "blue": {"type": "number", "minimum": 0.0, "maximum": 1.0},
+            "alpha": {"type": "number", "minimum": 0.0, "maximum": 1.0},
+        },
+        "required": ["red", "green", "blue", "alpha"],
+    }
+
     def __init__(self, red, green, blue, alpha=1.0, **kwargs):
         super(Color, self).__init__(**kwargs)
         self._r = 1.0
@@ -115,27 +126,64 @@ def __init__(self, red, green, blue, alpha=1.0, **kwargs):
         self.b = blue
         self.a = alpha
 
+    def __repr__(self):
+        return "{0}({1}, {2}, {3}, alpha={4})".format(type(self).__name__, self.r, self.g, self.b, self.a)
+
+    def __getitem__(self, key):
+        if key == 0:
+            return self.r
+        if key == 1:
+            return self.g
+        if key == 2:
+            return self.b
+        raise KeyError
+
+    def __len__(self):
+        return 3
+
+    def __iter__(self):
+        return iter(self.rgb)
+
+    def __eq__(self, other):
+        return all(a == b for a, b in zip(self, other))
+
+    # --------------------------------------------------------------------------
+    # Descriptor
+    # --------------------------------------------------------------------------
+
+    def __set_name__(self, owner, name):
+        self.public_name = name
+        self.private_name = "_" + name
+
+    def __get__(self, obj, otype=None):
+        return getattr(obj, self.private_name, None) or self
+
+    def __set__(self, obj, value):
+        if not obj:
+            return
+
+        if not value:
+            return
+
+        if Color.is_rgb255(value):
+            value = Color.from_rgb255(value[0], value[1], value[2])
+        elif Color.is_hex(value):
+            value = Color.from_hex(value)
+        else:
+            value = Color(value[0], value[1], value[2])
+
+        setattr(obj, self.private_name, value)
+
     # --------------------------------------------------------------------------
-    # data
+    # Data
     # --------------------------------------------------------------------------
 
     @property
     def data(self):
         return {"red": self.r, "green": self.g, "blue": self.b, "alpha": self.a}
 
-    @data.setter
-    def data(self, data):
-        self.r = data["red"]
-        self.g = data["green"]
-        self.b = data["blue"]
-        self.a = data["alpha"]
-
-    @classmethod
-    def from_data(cls, data):
-        return cls(data["red"], data["green"], data["blue"], data["alpha"])
-
     # --------------------------------------------------------------------------
-    # properties
+    # Properties
     # --------------------------------------------------------------------------
 
     @property
@@ -272,59 +320,7 @@ def saturation(self):
         return (maxval - minval) / maxval
 
     # --------------------------------------------------------------------------
-    # descriptor
-    # --------------------------------------------------------------------------
-
-    def __set_name__(self, owner, name):
-        self.public_name = name
-        self.private_name = "_" + name
-
-    def __get__(self, obj, otype=None):
-        return getattr(obj, self.private_name, None) or self
-
-    def __set__(self, obj, value):
-        if not obj:
-            return
-
-        if not value:
-            return
-
-        if Color.is_rgb255(value):
-            value = Color.from_rgb255(value[0], value[1], value[2])
-        elif Color.is_hex(value):
-            value = Color.from_hex(value)
-        else:
-            value = Color(value[0], value[1], value[2])
-
-        setattr(obj, self.private_name, value)
-
-    # --------------------------------------------------------------------------
-    # customization
-    # --------------------------------------------------------------------------
-
-    def __repr__(self):
-        return "Color({}, {}, {}, {})".format(self.r, self.g, self.b, self.a)
-
-    def __getitem__(self, key):
-        if key == 0:
-            return self.r
-        if key == 1:
-            return self.g
-        if key == 2:
-            return self.b
-        raise KeyError
-
-    def __len__(self):
-        return 3
-
-    def __iter__(self):
-        return iter(self.rgb)
-
-    def __eq__(self, other):
-        return all(a == b for a, b in zip(self, other))
-
-    # --------------------------------------------------------------------------
-    # constructors
+    # Constructors
     # --------------------------------------------------------------------------
 
     @classmethod
@@ -529,7 +525,7 @@ def from_name(cls, name):
         return cls.from_rgb255(*rgb255)
 
     # --------------------------------------------------------------------------
-    # presets
+    # Presets
     # --------------------------------------------------------------------------
 
     @classmethod
@@ -698,7 +694,7 @@ def pink(cls):
         return cls(1.0, 0.0, 0.5)
 
     # --------------------------------------------------------------------------
-    # other presets
+    # Other presets
     # --------------------------------------------------------------------------
 
     @classmethod
@@ -786,7 +782,7 @@ def silver(cls):
     # salmon
 
     # --------------------------------------------------------------------------
-    # methods
+    # Methods
     # --------------------------------------------------------------------------
 
     @staticmethod