Add central registry for classes; add metaclass for DictSerializable

Author: kroenlein

gemd/builders/tests/test_builders.py

@@ -16,7 +16,7 @@
 from typing import Union
 
 
-class UnsupportedBounds(BaseBounds):
+class UnsupportedBounds(BaseBounds, typ="unsupported_bounds"):
     """Dummy object to test Bounds type checking."""
 
     def contains(self, bounds):  # pragma: no cover
@@ -32,15 +32,15 @@ def update(self, *others: Union["BaseBounds", "BaseValue"]):  # pragma: no cover
         pass
 
 
-class UnsupportedAttribute(BaseAttribute):
+class UnsupportedAttribute(BaseAttribute, typ="unsupported_attribute"):
     """Dummy object to test Attribute type checking."""
 
     def _template_type(self):  # pragma: no cover
         """Only here to satisfy abstract method."""
         return str
 
 
-class UnsupportedAttributeTemplate(AttributeTemplate):
+class UnsupportedAttributeTemplate(AttributeTemplate, typ="unsupported_template"):
     """Dummy object to test Attribute type checking."""
 
 

gemd/entity/attribute/condition.py

@@ -4,7 +4,7 @@
 from typing import Type
 
 
-class Condition(BaseAttribute):
+class Condition(BaseAttribute, typ="condition"):
     """
     Condition of a property, process, or measurement.
 
@@ -31,8 +31,6 @@ class Condition(BaseAttribute):
 
     """
 
-    typ = "condition"
-
     @staticmethod
     def _template_type() -> Type:
         return ConditionTemplate

gemd/entity/attribute/parameter.py

@@ -4,7 +4,7 @@
 from typing import Type
 
 
-class Parameter(BaseAttribute):
+class Parameter(BaseAttribute, typ="parameter"):
     """
     Parameter of a process or measurement.
 
@@ -32,8 +32,6 @@ class Parameter(BaseAttribute):
 
     """
 
-    typ = "parameter"
-
     @staticmethod
     def _template_type() -> Type:
         return ParameterTemplate

gemd/entity/attribute/property.py

@@ -4,7 +4,7 @@
 from typing import Type
 
 
-class Property(BaseAttribute):
+class Property(BaseAttribute, typ="property"):
     """
     Property of a material, measured in a MeasurementRun or specified in a MaterialSpec.
 
@@ -31,8 +31,6 @@ class Property(BaseAttribute):
 
     """
 
-    typ = "property"
-
     @staticmethod
     def _template_type() -> Type:
         return PropertyTemplate

gemd/entity/attribute/property_and_conditions.py

@@ -9,7 +9,7 @@
 from typing import Optional, Union, Iterable, List
 
 
-class PropertyAndConditions(DictSerializable):
+class PropertyAndConditions(DictSerializable, typ="property_and_conditions"):
     """
     A property and the conditions under which that property was determined.
 
@@ -24,8 +24,6 @@ class PropertyAndConditions(DictSerializable):
 
     """
 
-    typ = "property_and_conditions"
-
     def __init__(self,
                  property: Property = None,
                  conditions: Union[Iterable[Condition], Condition] = None):

gemd/entity/base_entity.py

@@ -24,8 +24,6 @@ class BaseEntity(DictSerializable):
 
     """
 
-    typ = "base"
-
     def __init__(self, uids: Mapping[str, str], tags: Iterable[str]):
         self._tags = None
         self.tags = tags

gemd/entity/bounds/categorical_bounds.py

@@ -5,7 +5,7 @@
 from typing import Union, Set, Optional, Iterable
 
 
-class CategoricalBounds(BaseBounds):
+class CategoricalBounds(BaseBounds, typ="categorical_bounds"):
     """
     Categorical bounds, parameterized by a set of string-valued category labels.
 
@@ -16,8 +16,6 @@ class CategoricalBounds(BaseBounds):
 
     """
 
-    typ = "categorical_bounds"
-
     def __init__(self, categories: Optional[Iterable[str]] = None):
         self._categories = None
         self.categories = categories

gemd/entity/bounds/composition_bounds.py

@@ -5,7 +5,7 @@
 from typing import Union
 
 
-class CompositionBounds(BaseBounds):
+class CompositionBounds(BaseBounds, typ="composition_bounds"):
     """
     Composition bounds, parameterized by a set of string-valued category labels.
 
@@ -16,8 +16,6 @@ class CompositionBounds(BaseBounds):
 
     """
 
-    typ = "composition_bounds"
-
     def __init__(self, components=None):
         self._components = None
         self.components = components

gemd/entity/bounds/integer_bounds.py

@@ -4,7 +4,7 @@
 from typing import Union
 
 
-class IntegerBounds(BaseBounds):
+class IntegerBounds(BaseBounds, typ="integer_bounds"):
     """
     Bounded subset of the integers, parameterized by a lower and upper bound.
 
@@ -17,8 +17,6 @@ class IntegerBounds(BaseBounds):
 
     """
 
-    typ = "integer_bounds"
-
     def __init__(self, lower_bound=None, upper_bound=None):
         self.lower_bound = lower_bound
         self.upper_bound = upper_bound

gemd/entity/bounds/molecular_structure_bounds.py

@@ -8,14 +8,9 @@
 from typing import Union
 
 
-class MolecularStructureBounds(BaseBounds):
+class MolecularStructureBounds(BaseBounds, typ="molecular_structure_bounds"):
     """Molecular bounds, with no component or substructural restrictions (yet)."""
 
-    typ = "molecular_structure_bounds"
-
-    def __init__(self):
-        pass
-
     def contains(self, bounds: Union[BaseBounds, "BaseValue"]) -> bool:
         """
         Check if another bounds or value object is contained by this bounds.