Merge pull request #116 from CitrineInformatics/bugfix/dynamic-ingrun

Make names & labels dynamic

Author: kroenlein

gemd/entity/object/ingredient_run.py

@@ -71,7 +71,11 @@ def __init__(self, *, material=None, process=None, mass_fraction=None,
     @property
     def name(self):
         """Get name."""
-        return super().name
+        from gemd.entity.object.ingredient_spec import IngredientSpec
+        if isinstance(self.spec, IngredientSpec):
+            return self.spec.name
+        else:
+            return super().name
 
     @name.setter
     def name(self, name):
@@ -90,7 +94,11 @@ def _name_setter(cls, obj, name):
     @property
     def labels(self):
         """Get labels."""
-        return self._labels
+        from gemd.entity.object.ingredient_spec import IngredientSpec
+        if isinstance(self.spec, IngredientSpec):
+            return self.spec.labels
+        else:
+            return self._labels
 
     @labels.setter
     @deprecation.deprecated(deprecated_in="0.12", removed_in="0.13",
@@ -155,13 +163,15 @@ def spec(self):
     def spec(self, spec):
         from gemd.entity.object.ingredient_spec import IngredientSpec
         from gemd.entity.link_by_uid import LinkByUID
+
+        if isinstance(self._spec, IngredientSpec):  # Store values if you had them
+            self.__class__._labels_setter(self, self.spec.labels)
+            self.__class__._name_setter(self, self.spec.name)
+
         if spec is None:
             self._spec = None
         elif isinstance(spec, (IngredientSpec, LinkByUID)):
             self._spec = spec
-            if isinstance(spec, IngredientSpec):
-                self.__class__._labels_setter(self, spec.labels)
-                self.__class__._name_setter(self, spec.name)
         else:
             raise TypeError("spec must be a IngredientSpec or LinkByUID: {}".format(spec))
 

gemd/entity/object/tests/test_ingredient_run.py

@@ -57,6 +57,13 @@ def test_name_persistance():
                         process=pr_link, material=mr_link)
     assert run.name == spec.name
     assert run.labels == spec.labels
+
+    # Try changing them and make sure they change
+    spec.name = 'Frank'
+    spec.labels = ['other', 'words']
+    assert run.name == spec.name
+    assert run.labels == spec.labels
+
     run.spec = LinkByUID(scope='local', id='ing_spec')
     # Name and labels are now stashed but not stored
     assert run == je.copy(run)

setup.py

@@ -36,7 +36,7 @@ def run(self):
 
 
 setup(name='gemd',
-      version='0.12.0',
+      version='0.12.1',
       url='http://github.com/CitrineInformatics/gemd-python',
       description="Python binding for Citrine's GEMD data model",
       author='Max Hutchinson',