Merge pull request #670 from voxel51/develop

Release 0.15.1

Author: afoley587

eta/core/models.py

@@ -1040,6 +1040,7 @@ class Model(Serializable):
         requirements: the ModelRequirements for the model (if any)
         tags: a list of tags for the model (if any)
         date_added: the datetime that the model was added (if any)
+        training_data: the training data information for the model (if any)
     """
 
     # An optional error message to append to any error messages resulting from
@@ -1063,6 +1064,7 @@ def __init__(
         requirements=None,
         tags=None,
         date_added=None,
+        training_data=None,
     ):
         """Creates a Model instance.
 
@@ -1084,6 +1086,7 @@ def __init__(
             requirements: (optional) a ModelRequirements for the model
             tags: (optional) a list of tags for the model
             date_added: (optional) the datetime that the model was created
+            training_data: (optional) the training data information for the model
         """
         self.base_name = base_name
         self.base_filename = base_filename
@@ -1100,6 +1103,7 @@ def __init__(
         self.requirements = requirements
         self.tags = tags
         self.date_added = date_added
+        self.training_data = training_data
 
     @property
     def name(self):
@@ -1429,6 +1433,7 @@ def attributes(self):
             "requirements",
             "tags",
             "date_added",
+            "training_data",
         ]
 
     @classmethod
@@ -1450,8 +1455,6 @@ def from_dict(cls, d, subdir=None):
         if requirements is not None:
             requirements = ModelRequirements.from_dict(requirements)
 
-        tags = d.get("tags", None)
-
         date_added = etau.parse_isotime(d.get("date_added"))
 
         return cls(
@@ -1470,8 +1473,9 @@ def from_dict(cls, d, subdir=None):
                 "default_deployment_config_dict", None
             ),
             requirements=requirements,
-            tags=tags,
+            tags=d.get("tags", None),
             date_added=date_added,
+            training_data=d.get("training_data", None),
         )
 
 

setup.py

@@ -13,7 +13,7 @@
 from wheel.bdist_wheel import bdist_wheel
 
 
-VERSION = "0.15.0"
+VERSION = "0.15.1"
 
 
 class BdistWheelCustom(bdist_wheel):