Merge pull request #915 from compas-dev/clr_support_for_encoders

Decode from CLR data types as well as python dictionaries

Author: gonzalocasas

CHANGELOG.md

@@ -25,7 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `compas_blender.geometry.booleans` as plugin for boolean pluggables.
 * Added version-based installation for Blender.
 * Added several shape artists to `compas_ghpython`: `BoxArtist`, `CapsuleArtist`, `ConeArtist`, `CylinderArtist`, `PolygonArtist`, `PolyhedronArtist`, `SphereArtist`, `TorusArtist` and `VectorArtist`.
-
+* Added support for CLR generic dictionaries to the `compas.data` decoders.
 
 ### Changed
 

src/compas/data/encoders.py

@@ -3,9 +3,19 @@
 from __future__ import division
 
 import json
+import sys
 
 from compas.data.exceptions import DecoderError
 
+# We don't do this from `compas.IPY` to avoid circular imports
+if 'ironpython' in sys.version.lower():
+    try:
+        from System.Collections.Generic import IDictionary
+    except:                 # noqa: E722
+        IDictionary = None
+else:
+    IDictionary = None
+
 
 def cls_from_dtype(dtype):
     """Get the class object corresponding to a COMPAS data type specification.
@@ -102,4 +112,10 @@ def object_hook(self, o):
         except AttributeError:
             raise DecoderError("The data type can't be found in the specified module: {}.".format(o['dtype']))
 
-        return cls.from_data(o['value'])
+        obj_value = o['value']
+
+        # Kick-off from_data from a rebuilt Python dictionary instead of the C# data type
+        if IDictionary and isinstance(o, IDictionary[str, object]):
+            obj_value = {key: obj_value[key] for key in obj_value.Keys}
+
+        return cls.from_data(obj_value)