Merge branch 'master' into add-empty-initialization-for-models

force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_model.py

-from traits.api import HasStrictTraits, Int, String
+from traits.api import Int, String
 
+from force_bdss.data_sources.base_data_source_model import BaseDataSourceModel
 
-class CSVExtractorModel(HasStrictTraits):
+
+class CSVExtractorModel(BaseDataSourceModel):
     filename = String()
     row = Int()
     column = Int()

force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_model.py

-from traits.api import HasStrictTraits, String
+from traits.api import String
 
+from force_bdss.kpi.base_kpi_calculator_model import BaseKPICalculatorModel
 
-class KPIAdderModel(HasStrictTraits):
+
+class KPIAdderModel(BaseKPICalculatorModel):
     cuba_type_in = String()
     cuba_type_out = String()
 

force_bdss/core_plugins/test_mco/dakota/dakota_model.py

-from traits.api import HasStrictTraits, List, String
+from traits.api import List, String
 
+from force_bdss.mco.base_mco_model import BaseMCOModel
 
-class DakotaModel(HasStrictTraits):
+
+class DakotaModel(BaseMCOModel):
     value_types = List(String)
 
     @classmethod

force_bdss/data_sources/base_data_source_model.py

+import abc
+from traits.api import ABCHasStrictTraits
+
+
+class BaseDataSourceModel(ABCHasStrictTraits):
+    @classmethod
+    @abc.abstractmethod
+    def from_json(self, model_data):
+        pass

force_bdss/kpi/base_kpi_calculator_model.py

+import abc
+from traits.has_traits import ABCHasStrictTraits
+
+
+class BaseKPICalculatorModel(ABCHasStrictTraits):
+    @classmethod
+    @abc.abstractmethod
+    def from_json(self, model_data):
+        pass

force_bdss/mco/base_mco_model.py

+import abc
+from traits.api import ABCHasStrictTraits
+
+
+class BaseMCOModel(ABCHasStrictTraits):
+    @classmethod
+    @abc.abstractmethod
+    def from_json(self, model_data):
+        pass