diff --git a/force_bdss/api.py b/force_bdss/api.py new file mode 100644 index 0000000000000000000000000000000000000000..1a5aeedfb60db42e6d1e728a3d5a15d64350fe00 --- /dev/null +++ b/force_bdss/api.py @@ -0,0 +1,15 @@ +from .base_extension_plugin import BaseExtensionPlugin # noqa +from .id_generators import bundle_id # noqa +from .data_sources.i_data_source_bundle import IDataSourceBundle # noqa +from .mco.i_multi_criteria_optimizer_bundle import IMultiCriteriaOptimizerBundle # noqa +from .kpi.i_kpi_calculator_bundle import IKPICalculatorBundle # noqa +from .data_sources.base_data_source_model import BaseDataSourceModel # noqa +from .data_sources.data_source_result import DataSourceResult # noqa +from .data_sources.data_source_parameters import DataSourceParameters # noqa +from .data_sources.base_data_source import BaseDataSource # noqa +from .kpi.base_kpi_calculator import BaseKPICalculator # noqa +from .kpi.kpi_calculator_result import KPICalculatorResult # noqa +from .kpi.base_kpi_calculator_model import BaseKPICalculatorModel # noqa +from .mco.base_mco_model import BaseMCOModel # noqa +from .mco.base_mco_communicator import BaseMCOCommunicator # noqa +from .mco.base_multi_criteria_optimizer import BaseMultiCriteriaOptimizer # noqa diff --git a/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py b/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py index 295c44dc306b3816569845dcff7c2228f0c2b28e..3ef2128b81b8e7ce35fb32fa38a5e1fb29eaf07f 100644 --- a/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py +++ b/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py @@ -1,8 +1,6 @@ -from traits.api import provides, HasStrictTraits -from traits.trait_types import String +from traits.api import provides, HasStrictTraits, String -from force_bdss.data_sources.i_data_source_bundle import IDataSourceBundle -from force_bdss.id_generators import bundle_id +from force_bdss.api import bundle_id, IDataSourceBundle from .csv_extractor_model import CSVExtractorModel from .csv_extractor_data_source import CSVExtractorDataSource diff --git a/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_data_source.py b/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_data_source.py index 0d25380d7af689ff4f8f181e08c7d30c1bdc9d3b..f2835f8fbaeb5290aa01c53271d1c253109531f8 100644 --- a/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_data_source.py +++ b/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_data_source.py @@ -1,7 +1,7 @@ import csv import numpy -from force_bdss.data_sources.base_data_source import BaseDataSource -from force_bdss.data_sources.data_source_result import DataSourceResult +from force_bdss.api import BaseDataSource +from force_bdss.api import DataSourceResult class CSVExtractorDataSource(BaseDataSource): diff --git a/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_model.py b/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_model.py index 8732d1f553878dd8479c8925fc695a9750c21996..91682add3f7fb1ee9742f8a8b1bed64dd3595cbb 100644 --- a/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_model.py +++ b/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_model.py @@ -1,6 +1,6 @@ from traits.api import Int, String -from force_bdss.data_sources.base_data_source_model import BaseDataSourceModel +from force_bdss.api import BaseDataSourceModel class CSVExtractorModel(BaseDataSourceModel): diff --git a/force_bdss/core_plugins/csv_extractor/csv_extractor_plugin.py b/force_bdss/core_plugins/csv_extractor/csv_extractor_plugin.py index dad0765696765e252bd64f4a1dae365c3b341f31..9020fc8242456ecf6ed6a5af947e3633e010c323 100644 --- a/force_bdss/core_plugins/csv_extractor/csv_extractor_plugin.py +++ b/force_bdss/core_plugins/csv_extractor/csv_extractor_plugin.py @@ -1,4 +1,4 @@ -from force_bdss.base_extension_plugin import BaseExtensionPlugin +from force_bdss.api import BaseExtensionPlugin from .csv_extractor.csv_extractor_bundle import CSVExtractorBundle diff --git a/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_bundle.py b/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_bundle.py index e23e441e51d15344ab50d6a7ebdf2498aca2475e..a76456c24a3342b5cb15c820b99428982f2b4c5c 100644 --- a/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_bundle.py +++ b/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_bundle.py @@ -1,8 +1,7 @@ -from traits.api import provides, HasStrictTraits -from traits.trait_types import String +from traits.api import provides, HasStrictTraits, String -from force_bdss.id_generators import bundle_id -from force_bdss.kpi.i_kpi_calculator_bundle import IKPICalculatorBundle +from force_bdss.api import bundle_id +from force_bdss.api import IKPICalculatorBundle from .kpi_adder_model import KPIAdderModel from .kpi_adder_calculator import KPIAdderCalculator diff --git a/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_calculator.py b/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_calculator.py index 3bb01b9b43cd74607e2f61994526988c9dc80670..f6bbfe0de501c544cc134851f51a54e5c08b2767 100644 --- a/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_calculator.py +++ b/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_calculator.py @@ -1,7 +1,7 @@ import numpy -from force_bdss.kpi.base_kpi_calculator import BaseKPICalculator -from force_bdss.kpi.kpi_calculator_result import KPICalculatorResult +from force_bdss.api import BaseKPICalculator +from force_bdss.api import KPICalculatorResult class KPIAdderCalculator(BaseKPICalculator): diff --git a/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_model.py b/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_model.py index f343fdfedca04786a1c238e5fb4c1d7c916a29fd..3d57563f9444cde1c31175193b8b03ca3b275d85 100644 --- a/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_model.py +++ b/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_model.py @@ -1,6 +1,6 @@ from traits.api import String -from force_bdss.kpi.base_kpi_calculator_model import BaseKPICalculatorModel +from force_bdss.api import BaseKPICalculatorModel class KPIAdderModel(BaseKPICalculatorModel): diff --git a/force_bdss/core_plugins/test_kpi/test_kpi_calculator_plugin.py b/force_bdss/core_plugins/test_kpi/test_kpi_calculator_plugin.py index 136fa47d9ec5ecdc44aa22d612e835fe98413df8..9c7ca3af6aa72c21cbefff12bdc2aea96247d097 100644 --- a/force_bdss/core_plugins/test_kpi/test_kpi_calculator_plugin.py +++ b/force_bdss/core_plugins/test_kpi/test_kpi_calculator_plugin.py @@ -1,4 +1,4 @@ -from force_bdss.base_extension_plugin import BaseExtensionPlugin +from force_bdss.api import BaseExtensionPlugin from .kpi_adder.kpi_adder_bundle import KPIAdderBundle diff --git a/force_bdss/core_plugins/test_mco/dakota/dakota_bundle.py b/force_bdss/core_plugins/test_mco/dakota/dakota_bundle.py index 0e376ed702075b8da638fbc76708a08863247622..13880513717114a424861496583bcfb9f762a8bb 100644 --- a/force_bdss/core_plugins/test_mco/dakota/dakota_bundle.py +++ b/force_bdss/core_plugins/test_mco/dakota/dakota_bundle.py @@ -1,12 +1,7 @@ -from traits.has_traits import HasStrictTraits, provides -from traits.trait_types import String - -from force_bdss.core_plugins.test_mco.dakota.dakota_communicator import \ - DakotaCommunicator -from force_bdss.id_generators import bundle_id -from force_bdss.mco.i_multi_criteria_optimizer_bundle import ( - IMultiCriteriaOptimizerBundle) +from traits.api import HasStrictTraits, provides, String +from force_bdss.api import bundle_id, IMultiCriteriaOptimizerBundle +from .dakota_communicator import DakotaCommunicator from .dakota_model import DakotaModel from .dakota_optimizer import DakotaOptimizer diff --git a/force_bdss/core_plugins/test_mco/dakota/dakota_communicator.py b/force_bdss/core_plugins/test_mco/dakota/dakota_communicator.py index ae9677fdf72b409ef79956c3852163da4ba9d35c..ee349e806571d776d49a0dfc533bd53224931322 100644 --- a/force_bdss/core_plugins/test_mco/dakota/dakota_communicator.py +++ b/force_bdss/core_plugins/test_mco/dakota/dakota_communicator.py @@ -1,8 +1,7 @@ import sys import numpy -from force_bdss.data_sources.data_source_parameters import DataSourceParameters -from force_bdss.mco.base_mco_communicator import BaseMCOCommunicator +from force_bdss.api import DataSourceParameters, BaseMCOCommunicator class DakotaCommunicator(BaseMCOCommunicator): diff --git a/force_bdss/core_plugins/test_mco/dakota/dakota_model.py b/force_bdss/core_plugins/test_mco/dakota/dakota_model.py index 55b3794b6b0b937e1a982169126d83b71be59dfa..6b3ab63eb1c5491a7ef5c389c64bea074f3afd9c 100644 --- a/force_bdss/core_plugins/test_mco/dakota/dakota_model.py +++ b/force_bdss/core_plugins/test_mco/dakota/dakota_model.py @@ -1,6 +1,6 @@ from traits.api import List, String -from force_bdss.mco.base_mco_model import BaseMCOModel +from force_bdss.api import BaseMCOModel class DakotaModel(BaseMCOModel): diff --git a/force_bdss/core_plugins/test_mco/dakota/dakota_optimizer.py b/force_bdss/core_plugins/test_mco/dakota/dakota_optimizer.py index edd177d6e863c41a4e6b378926ceff92a5b3c15a..6b607cfce35432d286642465e36e90387f5a6c34 100644 --- a/force_bdss/core_plugins/test_mco/dakota/dakota_optimizer.py +++ b/force_bdss/core_plugins/test_mco/dakota/dakota_optimizer.py @@ -2,9 +2,7 @@ import subprocess import sys -from force_bdss.mco.base_multi_criteria_optimizer import ( - BaseMultiCriteriaOptimizer -) +from force_bdss.api import BaseMultiCriteriaOptimizer class DakotaOptimizer(BaseMultiCriteriaOptimizer): diff --git a/force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py b/force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py index f05ba192b0def248dcf243552453f23918be752d..1fe302b5eb40afb1ef8610b6889fac38ccf06ca4 100644 --- a/force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py +++ b/force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py @@ -1,4 +1,4 @@ -from force_bdss.base_extension_plugin import BaseExtensionPlugin +from force_bdss.api import BaseExtensionPlugin from .dakota.dakota_bundle import DakotaBundle