Add method breakouts to package imports

Author: kroenlein

taurus/entity/attribute/__init__.py

@@ -1 +1,6 @@
 """Attribute objects."""
+# flake8: noqa
+from .condition import Condition
+from .parameter import Parameter
+from .property import Property
+from .property_and_conditions import PropertyAndConditions

taurus/entity/bounds/__init__.py

@@ -1 +1,6 @@
 """Bounds on a value."""
+# flake8: noqa
+from .categorical_bounds import CategoricalBounds
+from .composition_bounds import CompositionBounds
+from .integer_bounds import IntegerBounds
+from .real_bounds import RealBounds

taurus/entity/object/__init__.py

@@ -1,3 +1,4 @@
+"""Run and Spec Objects"""
 # flake8: noqa
 from .material_run import MaterialRun
 from .measurement_run import MeasurementRun

taurus/entity/template/__init__.py

@@ -1 +1,8 @@
-# flake8: noqa
+"""Attribute and Object Templates"""
+# flake8: noqa
+from .property_template import PropertyTemplate
+from .condition_template import ConditionTemplate
+from .parameter_template import ParameterTemplate
+from .material_template import MaterialTemplate
+from .measurement_template import MeasurementTemplate
+from .process_template import ProcessTemplate

taurus/entity/value/__init__.py

@@ -1 +1,11 @@
-# flake8: noqa
+"""Value objects"""
+# flake8: noqa
+from .nominal_real import NominalReal
+from .normal_real import NormalReal
+from .uniform_real import UniformReal
+from .nominal_integer import NominalInteger
+from .uniform_integer import UniformInteger
+from .discrete_categorical import DiscreteCategorical
+from .nominal_categorical import NominalCategorical
+from .empirical_formula import EmpiricalFormula
+from .nominal_composition import NominalComposition

taurus/util/__init__.py

@@ -1,2 +1,3 @@
 # flake8: noqa
-from .impl import *
+from .impl import set_uuids, substitute_links, substitute_objects, flatten, recursive_foreach, \
+    recursive_flatmap, writable_sort_order

taurus/util/impl.py

@@ -7,15 +7,6 @@
 from taurus.entity.link_by_uid import LinkByUID
 from toolz import concatv
 
-from taurus.entity.object import MeasurementSpec, ProcessSpec, MaterialSpec, IngredientSpec, \
-    MeasurementRun, IngredientRun, MaterialRun, ProcessRun
-from taurus.entity.template.condition_template import ConditionTemplate
-from taurus.entity.template.material_template import MaterialTemplate
-from taurus.entity.template.measurement_template import MeasurementTemplate
-from taurus.entity.template.parameter_template import ParameterTemplate
-from taurus.entity.template.process_template import ProcessTemplate
-from taurus.entity.template.property_template import PropertyTemplate
-
 
 def set_uuids(obj, name="auto"):
     """
@@ -248,6 +239,11 @@ def recursive_flatmap(obj, func, seen=None, unidirectional=True):
 
 def writable_sort_order(key: Union[BaseEntity, str]) -> int:
     """Sort order for flattening such that the objects can be read back and re-nested."""
+    from taurus.entity.object import MeasurementSpec, ProcessSpec, MaterialSpec, IngredientSpec, \
+        MeasurementRun, IngredientRun, MaterialRun, ProcessRun
+    from taurus.entity.template import ConditionTemplate, MaterialTemplate, MeasurementTemplate, \
+        ParameterTemplate, ProcessTemplate, PropertyTemplate
+
     if isinstance(key, BaseEntity):
         typ = key.typ
     elif isinstance(key, str):