From d2f6632a6a59807076a49eea5244ccbe9339374f Mon Sep 17 00:00:00 2001 From: Stefano Borini <sborini@enthought.com> Date: Wed, 19 Jul 2017 15:11:25 +0100 Subject: [PATCH] Introduced API module --- force_bdss/api.py | 15 +++++++++++++++ .../csv_extractor/csv_extractor_bundle.py | 6 ++---- .../csv_extractor/csv_extractor_data_source.py | 4 ++-- .../csv_extractor/csv_extractor_model.py | 2 +- .../csv_extractor/csv_extractor_plugin.py | 2 +- .../test_kpi/kpi_adder/kpi_adder_bundle.py | 7 +++---- .../test_kpi/kpi_adder/kpi_adder_calculator.py | 4 ++-- .../test_kpi/kpi_adder/kpi_adder_model.py | 2 +- .../test_kpi/test_kpi_calculator_plugin.py | 2 +- .../core_plugins/test_mco/dakota/dakota_bundle.py | 11 +++-------- .../test_mco/dakota/dakota_communicator.py | 3 +-- .../core_plugins/test_mco/dakota/dakota_model.py | 2 +- .../test_mco/dakota/dakota_optimizer.py | 4 +--- .../test_mco/multi_criteria_optimizers_plugin.py | 2 +- 14 files changed, 35 insertions(+), 31 deletions(-) create mode 100644 force_bdss/api.py diff --git a/force_bdss/api.py b/force_bdss/api.py new file mode 100644 index 0000000..1a5aeed --- /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 295c44d..3ef2128 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 0d25380..f2835f8 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 8732d1f..91682ad 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 dad0765..9020fc8 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 e23e441..a76456c 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 3bb01b9..f6bbfe0 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 f343fdf..3d57563 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 136fa47..9c7ca3a 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 0e376ed..1388051 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 ae9677f..ee349e8 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 55b3794..6b3ab63 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 edd177d..6b607cf 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 f05ba19..1fe302b 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 -- GitLab