Reworked plugins to honor the new interface

force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py

@@ -12,9 +12,9 @@ class CSVExtractorBundle(HasStrictTraits):
 
     def create_model(self, model_data=None):
         if model_data is None:
-            return CSVExtractorModel()
-        else:
-            return CSVExtractorModel.from_json(model_data)
+            model_data = {}
+
+        return CSVExtractorModel(self, **model_data)
 
     def create_data_source(self, application, model):
         return CSVExtractorDataSource(self, application, model)

force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_bundle.py

@@ -13,9 +13,9 @@ class KPIAdderBundle(HasStrictTraits):
 
     def create_model(self, model_data=None):
         if model_data is None:
-            return KPIAdderModel()
-        else:
-            return KPIAdderModel.from_json(model_data)
+            model_data = {}
+
+        return KPIAdderModel(self, **model_data)
 
     def create_data_source(self, application, model):
         return KPIAdderCalculator(self, application, model)

force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py

@@ -12,9 +12,8 @@ class DakotaBundle(HasStrictTraits):
 
     def create_model(self, model_data=None):
         if model_data is None:
-            return DakotaModel()
-        else:
-            return DakotaModel.from_json(model_data)
+            model_data = {}
+        return DakotaModel(self, **model_data)
 
     def create_optimizer(self, application, model):
         return DakotaOptimizer(self, application, model)

force_bdss/data_sources/base_data_source_model.py

@@ -8,4 +8,4 @@ class BaseDataSourceModel(ABCHasStrictTraits):
 
     def __init__(self, bundle, *args, **kwargs):
         self.bundle = bundle
-        super(BaseDataSourceModel, self).__init__(self, *args, **kwargs)
+        super(BaseDataSourceModel, self).__init__(*args, **kwargs)

force_bdss/kpi/base_kpi_calculator_model.py

@@ -8,4 +8,4 @@ class BaseKPICalculatorModel(ABCHasStrictTraits):
 
     def __init__(self, bundle, *args, **kwargs):
         self.bundle = bundle
-        super(BaseKPICalculatorModel, self).__init__(self, *args, **kwargs)
+        super(BaseKPICalculatorModel, self).__init__(*args, **kwargs)

force_bdss/mco/base_mco_model.py

@@ -8,4 +8,4 @@ class BaseMCOModel(ABCHasStrictTraits):
 
     def __init__(self, bundle, *args, **kwargs):
         self.bundle = bundle
-        super(BaseMCOModel, self).__init__(self, *args, **kwargs)
+        super(BaseMCOModel, self).__init__(*args, **kwargs)