Merge pull request #50 from CitrineInformatics/release/0.3.0

Taurus v0.3.0 is released!

Author: maxhutch

setup.py

@@ -36,7 +36,7 @@ def run(self):
 
 
 setup(name='taurus-citrine',
-      version='0.2.1',
+      version='0.3.0',
       url='http://github.com/CitrineInformatics/taurus',
       description='Python library for the Citrine Platform',
       author='Max Hutchinson',
@@ -45,7 +45,8 @@ def run(self):
       package_data={
           'taurus': [
               'demo/strehlow_and_cook.json',
-              'units/citrine_en.txt'
+              'units/citrine_en.txt',
+              'units/constants_en.txt'
           ]
       },
       install_requires=[

taurus/client/tests/test_json.py

@@ -11,6 +11,7 @@
 from taurus.entity.object import MeasurementRun, MaterialRun, ProcessRun, MeasurementSpec
 from taurus.entity.object.ingredient_run import IngredientRun
 from taurus.entity.object.ingredient_spec import IngredientSpec
+from taurus.entity.value.nominal_integer import NominalInteger
 from taurus.entity.value.nominal_real import NominalReal
 from taurus.entity.value.normal_real import NormalReal
 from taurus.enumeration.origin import Origin
@@ -52,6 +53,12 @@ def test_deserialize():
     assert(copy_meas.uids["auto"] == measurement.uids["auto"])
 
 
+def test_deserialize_extra_fields():
+    """Extra JSON fields should be ignored in deserialization."""
+    json_data = '[[], {"nominal": 5, "type": "nominal_integer", "extra garbage": "foo"}]'
+    assert(loads(json_data) == NominalInteger(nominal=5))
+
+
 def test_enumeration_serde():
     """An enumeration should get serialized as a string."""
     condition = Condition(name="A condition", notes=Origin.UNKNOWN)

taurus/entity/dict_serializable.py

@@ -1,5 +1,12 @@
 from abc import ABC
+from logging import getLogger
+
 import json
+import inspect
+
+# There are some weird (probably resolvable) errors during object cloning if this is an
+# instance variable of DictSerializable.
+logger = getLogger(__name__)
 
 
 class DictSerializable(ABC):
@@ -24,10 +31,18 @@ def from_dict(cls, d):
             The deserialized object.
 
         """
+        expected_arg_names = inspect.getfullargspec(cls.__init__).args
+        kwargs = {}
+        for name, arg in d.items():
+            if name in expected_arg_names:
+                kwargs[name] = arg
+            else:
+                logger.warning('Ignoring unexpected keyword argument in {}: {}'.format(
+                    cls.__name__, name))
         # noinspection PyArgumentList
         # DictSerializable's constructor is not intended for use,
         # but all of its children will use from_dict like this.
-        return cls(**d)
+        return cls(**kwargs)
 
     def as_dict(self):
         """