diff --git a/cases/credit_scoring/credit_scoring_problem.py b/cases/credit_scoring/credit_scoring_problem.py index fedeff2397..e6818f866a 100644 --- a/cases/credit_scoring/credit_scoring_problem.py +++ b/cases/credit_scoring/credit_scoring_problem.py @@ -2,7 +2,7 @@ from sklearn.metrics import roc_auc_score as roc_auc -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.pipelines.pipeline import Pipeline from fedot.core.utils import fedot_project_root diff --git a/cases/kc2_sourcecode_defects_classification.py b/cases/kc2_sourcecode_defects_classification.py index dbe3fbfeb2..5ec2f20df7 100644 --- a/cases/kc2_sourcecode_defects_classification.py +++ b/cases/kc2_sourcecode_defects_classification.py @@ -1,6 +1,6 @@ from os.path import join -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.data.data_split import train_test_data_setup from fedot.core.repository.tasks import TaskTypesEnum, Task diff --git a/cases/metocean_forecasting_problem.py b/cases/metocean_forecasting_problem.py index c48408d215..87bb65c5bc 100644 --- a/cases/metocean_forecasting_problem.py +++ b/cases/metocean_forecasting_problem.py @@ -4,7 +4,7 @@ import numpy as np import pandas as pd -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.repository.tasks import TsForecastingParams from fedot.core.utils import fedot_project_root diff --git a/cases/multi_target_levels_forecasting.py b/cases/multi_target_levels_forecasting.py index 316d12f2c9..24aa988c4f 100644 --- a/cases/multi_target_levels_forecasting.py +++ b/cases/multi_target_levels_forecasting.py @@ -4,7 +4,7 @@ from matplotlib import pyplot as plt from sklearn.metrics import mean_absolute_error -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.data.data_split import train_test_data_setup from fedot.core.utils import fedot_project_root diff --git a/cases/multi_ts_level_forecasting.py b/cases/multi_ts_level_forecasting.py index 5518e233dc..2d7ddb46c7 100644 --- a/cases/multi_ts_level_forecasting.py +++ b/cases/multi_ts_level_forecasting.py @@ -4,7 +4,7 @@ from sklearn.metrics import mean_absolute_error, mean_squared_error, mean_absolute_percentage_error from examples.simple.time_series_forecasting.ts_pipelines import ts_complex_ridge_smoothing_pipeline -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.data.data_split import train_test_data_setup from fedot.core.repository.tasks import TsForecastingParams, Task, TaskTypesEnum diff --git a/cases/multivariate_ts_forecasting.py b/cases/multivariate_ts_forecasting.py index 00a38396ca..7893a4b705 100644 --- a/cases/multivariate_ts_forecasting.py +++ b/cases/multivariate_ts_forecasting.py @@ -2,7 +2,7 @@ import numpy as np import pandas as pd -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.repository.tasks import TsForecastingParams from fedot.core.utils import fedot_project_root diff --git a/examples/advanced/additional_learning.py b/examples/advanced/additional_learning.py index 299ac11b8f..0d40a56a23 100644 --- a/examples/advanced/additional_learning.py +++ b/examples/advanced/additional_learning.py @@ -3,7 +3,7 @@ import pandas as pd -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.operations.atomized_model import AtomizedModel from fedot.core.pipelines.node import PipelineNode from fedot.core.pipelines.pipeline import Pipeline diff --git a/examples/advanced/fedot_based_solutions/external_optimizer.py b/examples/advanced/fedot_based_solutions/external_optimizer.py index 9e27dc84dc..498d461b09 100644 --- a/examples/advanced/fedot_based_solutions/external_optimizer.py +++ b/examples/advanced/fedot_based_solutions/external_optimizer.py @@ -2,7 +2,7 @@ from golem.core.optimisers.random.random_mutation_optimizer import RandomMutationSearchOptimizer -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.utils import fedot_project_root diff --git a/examples/advanced/gpu_example.py b/examples/advanced/gpu_example.py index 464e12adf9..abd78bd92a 100644 --- a/examples/advanced/gpu_example.py +++ b/examples/advanced/gpu_example.py @@ -4,7 +4,7 @@ from sklearn.datasets import make_moons from examples.simple.classification.classification_pipelines import classification_svc_complex_pipeline -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.pipelines.node import PipelineNode from fedot.core.pipelines.pipeline import Pipeline diff --git a/examples/advanced/multi_modal_pipeline.py b/examples/advanced/multi_modal_pipeline.py index 933e9e05ab..0c79ca9a12 100644 --- a/examples/advanced/multi_modal_pipeline.py +++ b/examples/advanced/multi_modal_pipeline.py @@ -4,7 +4,7 @@ from sklearn.metrics import f1_score as f1 from cases.dataset_preparation import unpack_archived_data -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData, OutputData from fedot.core.data.data_split import train_test_data_setup from fedot.core.data.multi_modal import MultiModalData diff --git a/examples/advanced/multimodal_text_num_example.py b/examples/advanced/multimodal_text_num_example.py index f59097a845..6198a9b1af 100644 --- a/examples/advanced/multimodal_text_num_example.py +++ b/examples/advanced/multimodal_text_num_example.py @@ -1,4 +1,4 @@ -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data_split import train_test_data_setup from fedot.core.data.multi_modal import MultiModalData from fedot.core.utils import fedot_project_root diff --git a/examples/advanced/multiobj_optimisation.py b/examples/advanced/multiobj_optimisation.py index d09dcbbc14..e3a58a3b54 100644 --- a/examples/advanced/multiobj_optimisation.py +++ b/examples/advanced/multiobj_optimisation.py @@ -1,6 +1,6 @@ import pandas as pd -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.utils import fedot_project_root from fedot.core.utils import set_random_seed diff --git a/examples/advanced/parallelization_comparison.py b/examples/advanced/parallelization_comparison.py index 0e911e8e5b..2776213ef3 100644 --- a/examples/advanced/parallelization_comparison.py +++ b/examples/advanced/parallelization_comparison.py @@ -8,7 +8,7 @@ from golem.core.optimisers.opt_history_objects.opt_history import OptHistory from matplotlib import cm, colors, pyplot as plt -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.utils import fedot_project_root diff --git a/examples/advanced/remote_execution/ts_composer_with_integration.py b/examples/advanced/remote_execution/ts_composer_with_integration.py index 0859923ccd..c43f6b0fb8 100644 --- a/examples/advanced/remote_execution/ts_composer_with_integration.py +++ b/examples/advanced/remote_execution/ts_composer_with_integration.py @@ -1,4 +1,4 @@ -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.multi_modal import MultiModalData from fedot.core.utils import fedot_project_root from fedot.core.utils import set_random_seed diff --git a/examples/advanced/surrogate_optimization.py b/examples/advanced/surrogate_optimization.py index c5fa5276af..0a44cf42cf 100644 --- a/examples/advanced/surrogate_optimization.py +++ b/examples/advanced/surrogate_optimization.py @@ -5,7 +5,7 @@ from golem.core.optimisers.meta.surrogate_optimizer import SurrogateEachNgenOptimizer from examples.simple.time_series_forecasting.api_forecasting import get_ts_data -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.repository.tasks import Task, TaskTypesEnum, TsForecastingParams diff --git a/examples/advanced/time_series_forecasting/exogenous.py b/examples/advanced/time_series_forecasting/exogenous.py index c0f521edf0..b956e6fba6 100644 --- a/examples/advanced/time_series_forecasting/exogenous.py +++ b/examples/advanced/time_series_forecasting/exogenous.py @@ -4,7 +4,7 @@ import numpy as np import pandas as pd -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.data.data_split import train_test_data_setup from fedot.core.data.multi_modal import MultiModalData diff --git a/examples/advanced/time_series_forecasting/prediction_intervals.py b/examples/advanced/time_series_forecasting/prediction_intervals.py index 9d33cc6113..90fc5ee14e 100644 --- a/examples/advanced/time_series_forecasting/prediction_intervals.py +++ b/examples/advanced/time_series_forecasting/prediction_intervals.py @@ -2,7 +2,7 @@ import pandas as pd import matplotlib.pyplot as plt -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.repository.dataset_types import DataTypesEnum from fedot.core.data.data import InputData from fedot.core.repository.tasks import TsForecastingParams, Task, TaskTypesEnum diff --git a/examples/simple/classification/api_classification.py b/examples/simple/classification/api_classification.py index 74c195e813..a75dafbb18 100644 --- a/examples/simple/classification/api_classification.py +++ b/examples/simple/classification/api_classification.py @@ -1,4 +1,4 @@ -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.utils import fedot_project_root, set_random_seed diff --git a/examples/simple/interpretable/api_explain.py b/examples/simple/interpretable/api_explain.py index 77ea23b0e6..ee3b97acb9 100644 --- a/examples/simple/interpretable/api_explain.py +++ b/examples/simple/interpretable/api_explain.py @@ -1,6 +1,6 @@ import pandas as pd -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.utils import fedot_project_root diff --git a/examples/simple/regression/api_regression.py b/examples/simple/regression/api_regression.py index b1af03701f..b1a905982a 100644 --- a/examples/simple/regression/api_regression.py +++ b/examples/simple/regression/api_regression.py @@ -1,6 +1,6 @@ import logging -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.data.data_split import train_test_data_setup from fedot.core.repository.tasks import TaskTypesEnum, Task diff --git a/examples/simple/time_series_forecasting/api_forecasting.py b/examples/simple/time_series_forecasting/api_forecasting.py index dbb2c52b5d..a026e72dde 100644 --- a/examples/simple/time_series_forecasting/api_forecasting.py +++ b/examples/simple/time_series_forecasting/api_forecasting.py @@ -3,7 +3,7 @@ import pandas as pd from examples.advanced.time_series_forecasting.multistep import TS_DATASETS -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.data.data_split import train_test_data_setup from fedot.core.repository.dataset_types import DataTypesEnum diff --git a/fedot/__init__.py b/fedot/__init__.py index 02f871335a..ab175fa022 100644 --- a/fedot/__init__.py +++ b/fedot/__init__.py @@ -1,4 +1,5 @@ "This file is part of the FEDOT framework for automated machine learning." from fedot import * +from fedot.api import Fedot from fedot.version import __version__ diff --git a/fedot/api/__init__.py b/fedot/api/__init__.py index e69de29bb2..f7c4ee2051 100644 --- a/fedot/api/__init__.py +++ b/fedot/api/__init__.py @@ -0,0 +1 @@ +from fedot.api.main import Fedot \ No newline at end of file diff --git a/fedot/api/fedot_cli.py b/fedot/api/fedot_cli.py index 00b9c32ab8..bf4d5f8b0d 100644 --- a/fedot/api/fedot_cli.py +++ b/fedot/api/fedot_cli.py @@ -2,7 +2,7 @@ from argparse import RawTextHelpFormatter from pathlib import Path -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.repository.tasks import TsForecastingParams diff --git a/fedot/core/pipelines/prediction_intervals/main.py b/fedot/core/pipelines/prediction_intervals/main.py index efbc7d5497..7ed16a46e6 100644 --- a/fedot/core/pipelines/prediction_intervals/main.py +++ b/fedot/core/pipelines/prediction_intervals/main.py @@ -4,7 +4,7 @@ import numpy as np from golem.core.log import default_log, Log -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.pipelines.prediction_intervals.params import PredictionIntervalsParams from fedot.core.pipelines.prediction_intervals.solvers.best_pipelines_quantiles import solver_best_pipelines_quantiles diff --git a/fedot/core/pipelines/prediction_intervals/utils.py b/fedot/core/pipelines/prediction_intervals/utils.py index 5d723ff150..6fde674125 100644 --- a/fedot/core/pipelines/prediction_intervals/utils.py +++ b/fedot/core/pipelines/prediction_intervals/utils.py @@ -3,7 +3,7 @@ from fedot.core.pipelines.ts_wrappers import fitted_values from fedot.core.pipelines.pipeline import Pipeline -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.repository.tasks import Task, TaskTypesEnum from fedot.core.repository.operation_types_repository import get_operations_for_task diff --git a/test/integration/api/test_api_utils.py b/test/integration/api/test_api_utils.py index fd2f7877ce..089628cc65 100644 --- a/test/integration/api/test_api_utils.py +++ b/test/integration/api/test_api_utils.py @@ -6,7 +6,7 @@ from examples.simple.classification.classification_pipelines import (classification_pipeline_with_balancing, classification_pipeline_without_balancing) from fedot.api.api_utils.assumptions.assumptions_builder import AssumptionsBuilder -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data_split import train_test_data_setup from fedot.core.pipelines.node import PipelineNode from fedot.core.pipelines.pipeline import Pipeline diff --git a/test/integration/api/test_main_api.py b/test/integration/api/test_main_api.py index 9b1fa2c82b..4195a53361 100644 --- a/test/integration/api/test_main_api.py +++ b/test/integration/api/test_main_api.py @@ -14,7 +14,7 @@ from cases.metocean_forecasting_problem import prepare_input_data from examples.simple.time_series_forecasting.ts_pipelines import ts_complex_ridge_smoothing_pipeline from fedot.api.api_utils.api_data import ApiDataProcessor -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.data.data_split import train_test_data_setup from fedot.core.data.multi_modal import MultiModalData diff --git a/test/integration/api_params/test_main_api_params.py b/test/integration/api_params/test_main_api_params.py index dda026be41..f49fc4d2bd 100644 --- a/test/integration/api_params/test_main_api_params.py +++ b/test/integration/api_params/test_main_api_params.py @@ -6,7 +6,7 @@ from golem.core.optimisers.genetic.operators.inheritance import GeneticSchemeTypesEnum from golem.core.optimisers.opt_history_objects.opt_history import OptHistory -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.repository.tasks import TsForecastingParams from test.integration.api.test_main_api import get_dataset diff --git a/test/integration/composer/test_composer.py b/test/integration/composer/test_composer.py index f5fc5e603b..a30d2a933b 100644 --- a/test/integration/composer/test_composer.py +++ b/test/integration/composer/test_composer.py @@ -10,7 +10,7 @@ from golem.core.optimisers.random.random_search import RandomSearchOptimizer from sklearn.metrics import roc_auc_score as roc_auc -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.caching.pipelines_cache import OperationsCache from fedot.core.composer.composer_builder import ComposerBuilder from fedot.core.composer.random_composer import RandomSearchComposer diff --git a/test/integration/composer/test_history.py b/test/integration/composer/test_history.py index 9987be5232..70807c14ad 100644 --- a/test/integration/composer/test_history.py +++ b/test/integration/composer/test_history.py @@ -11,7 +11,7 @@ from golem.core.optimisers.opt_history_objects.individual import Individual from golem.core.optimisers.opt_history_objects.opt_history import OptHistory -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.operations.model import Model from fedot.core.optimisers.objective import PipelineObjectiveEvaluate diff --git a/test/integration/models/test_custom_model_introduction.py b/test/integration/models/test_custom_model_introduction.py index 704247e94c..c5514f2b5b 100644 --- a/test/integration/models/test_custom_model_introduction.py +++ b/test/integration/models/test_custom_model_introduction.py @@ -9,7 +9,7 @@ from examples.advanced.time_series_forecasting.custom_model_tuning import get_fitting_custom_pipeline from examples.simple.pipeline_import_export import create_correct_path -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.data.data_split import train_test_data_setup from fedot.core.data.multi_modal import MultiModalData diff --git a/test/integration/quality/test_quality_improvement.py b/test/integration/quality/test_quality_improvement.py index 74cde3056b..6ea71cf4b0 100644 --- a/test/integration/quality/test_quality_improvement.py +++ b/test/integration/quality/test_quality_improvement.py @@ -4,7 +4,7 @@ import numpy as np -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.utils import fedot_project_root warnings.filterwarnings("ignore") diff --git a/test/integration/quality/test_synthetic_tasks.py b/test/integration/quality/test_synthetic_tasks.py index 55eb01894c..9555b8d879 100644 --- a/test/integration/quality/test_synthetic_tasks.py +++ b/test/integration/quality/test_synthetic_tasks.py @@ -4,7 +4,7 @@ from sklearn.metrics import mean_squared_error -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.data.data_split import train_test_data_setup from fedot.core.pipelines.node import PipelineNode diff --git a/test/integration/real_applications/test_model_result_reproducing.py b/test/integration/real_applications/test_model_result_reproducing.py index 97db702321..7e4f58ad6b 100644 --- a/test/integration/real_applications/test_model_result_reproducing.py +++ b/test/integration/real_applications/test_model_result_reproducing.py @@ -2,7 +2,7 @@ import numpy as np -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.data.data_split import train_test_data_setup from fedot.core.repository.dataset_types import DataTypesEnum diff --git a/test/integration/remote/test_remote_composer.py b/test/integration/remote/test_remote_composer.py index 15e51004c0..e327b58b04 100644 --- a/test/integration/remote/test_remote_composer.py +++ b/test/integration/remote/test_remote_composer.py @@ -3,7 +3,7 @@ import pytest -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.repository.tasks import TsForecastingParams from fedot.core.utils import fedot_project_root from fedot.remote.infrastructure.clients.test_client import TestClient diff --git a/test/integration/utilities/test_pipeline_import_export.py b/test/integration/utilities/test_pipeline_import_export.py index f10983ef3c..1fa7fae267 100644 --- a/test/integration/utilities/test_pipeline_import_export.py +++ b/test/integration/utilities/test_pipeline_import_export.py @@ -6,7 +6,7 @@ import pytest from sklearn.metrics import mean_absolute_error -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.pipelines.node import PipelineNode from fedot.core.pipelines.pipeline import Pipeline from fedot.core.pipelines.template import PipelineTemplate, extract_subtree_root diff --git a/test/integration/utilities/test_project_import_export.py b/test/integration/utilities/test_project_import_export.py index 2b381e58b2..b25697c9ce 100644 --- a/test/integration/utilities/test_project_import_export.py +++ b/test/integration/utilities/test_project_import_export.py @@ -5,7 +5,7 @@ import pytest -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.utils import fedot_project_root from fedot.utilities.project_import_export import export_project_to_zip, import_project_from_zip, DEFAULT_PROJECTS_PATH from test.integration.models.test_atomized_model import create_pipeline diff --git a/test/unit/api/test_api_safety.py b/test/unit/api/test_api_safety.py index 8c929280c5..2828048d3e 100644 --- a/test/unit/api/test_api_safety.py +++ b/test/unit/api/test_api_safety.py @@ -2,7 +2,7 @@ from fedot.api.api_utils.api_data import ApiDataProcessor from fedot.api.api_utils.input_analyser import InputAnalyser -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.repository.dataset_types import DataTypesEnum from fedot.core.repository.tasks import TaskTypesEnum, Task diff --git a/test/unit/api/test_presets.py b/test/unit/api/test_presets.py index f495be6aff..7e820ef0f2 100644 --- a/test/unit/api/test_presets.py +++ b/test/unit/api/test_presets.py @@ -1,6 +1,6 @@ from fedot.api.api_utils.api_params_repository import ApiParamsRepository from fedot.api.api_utils.presets import OperationsPreset -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.constants import FAST_TRAIN_PRESET_NAME from fedot.core.pipelines.node import PipelineNode from fedot.core.pipelines.pipeline import Pipeline diff --git a/test/unit/data/test_multimodal_data.py b/test/unit/data/test_multimodal_data.py index 4ecdafb931..efc6abf57b 100644 --- a/test/unit/data/test_multimodal_data.py +++ b/test/unit/data/test_multimodal_data.py @@ -3,7 +3,7 @@ import pytest from pathlib import Path -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.data.multi_modal import MultiModalData from fedot.core.repository.dataset_types import DataTypesEnum diff --git a/test/unit/multimodal/test_multimodal.py b/test/unit/multimodal/test_multimodal.py index c2c19b93ec..f52f7bba68 100644 --- a/test/unit/multimodal/test_multimodal.py +++ b/test/unit/multimodal/test_multimodal.py @@ -1,4 +1,4 @@ -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.pipelines.node import PipelineNode from fedot.core.pipelines.pipeline import Pipeline from fedot.core.repository.tasks import TaskTypesEnum diff --git a/test/unit/optimizer/test_external.py b/test/unit/optimizer/test_external.py index 39434b1f3f..00b83ade23 100644 --- a/test/unit/optimizer/test_external.py +++ b/test/unit/optimizer/test_external.py @@ -9,7 +9,7 @@ from golem.core.optimisers.optimization_parameters import OptimizationParameters from golem.core.optimisers.optimizer import GraphGenerationParams, GraphOptimizer, AlgorithmParameters -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data_split import train_test_data_setup from fedot.core.pipelines.node import PipelineNode from fedot.core.pipelines.pipeline import Pipeline diff --git a/test/unit/pipelines/prediction_intervals/data/generate_data.py b/test/unit/pipelines/prediction_intervals/data/generate_data.py index 6bc29d1516..79bf9f219b 100644 --- a/test/unit/pipelines/prediction_intervals/data/generate_data.py +++ b/test/unit/pipelines/prediction_intervals/data/generate_data.py @@ -8,7 +8,7 @@ from fedot.core.repository.tasks import TsForecastingParams, Task, TaskTypesEnum from fedot.core.data.data import InputData -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.repository.dataset_types import DataTypesEnum diff --git a/test/unit/preprocessing/test_preprocessing_through_api.py b/test/unit/preprocessing/test_preprocessing_through_api.py index 1f0285552b..c1bbed9592 100644 --- a/test/unit/preprocessing/test_preprocessing_through_api.py +++ b/test/unit/preprocessing/test_preprocessing_through_api.py @@ -1,6 +1,6 @@ import numpy as np -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.data.data_split import train_test_data_setup from fedot.core.data.supplementary_data import SupplementaryData @@ -244,7 +244,7 @@ def test_correct_api_dataset_with_pseudo_text_preprocessing(): input_data = data_with_pseudo_text_features() fedot_model = Fedot(problem='classification') fedot_model.fit(input_data, predefined_model='auto') - predicted = fedot_model.predict(input_data) + fedot_model.predict(input_data) # Check there are no text nodes in the pipeline node_tags = [node.tags for node in fedot_model.current_pipeline.nodes] diff --git a/test/unit/tasks/test_regression.py b/test/unit/tasks/test_regression.py index 8952c78c32..e63ba6473c 100644 --- a/test/unit/tasks/test_regression.py +++ b/test/unit/tasks/test_regression.py @@ -2,7 +2,7 @@ from sklearn.datasets import make_regression from sklearn.metrics import mean_squared_error as mse -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.data.data_split import train_test_data_setup from fedot.core.pipelines.node import PipelineNode diff --git a/test/unit/validation/test_table_cv.py b/test/unit/validation/test_table_cv.py index 3fae970126..61d8f5bfef 100644 --- a/test/unit/validation/test_table_cv.py +++ b/test/unit/validation/test_table_cv.py @@ -4,7 +4,7 @@ import pytest from golem.core.tuning.simultaneous import SimultaneousTuner -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.data.data import InputData from fedot.core.data.data_split import train_test_data_setup from fedot.core.optimisers.objective import PipelineObjectiveEvaluate diff --git a/test/unit/validation/test_time_series_cv.py b/test/unit/validation/test_time_series_cv.py index dac782f062..2c3b17089d 100644 --- a/test/unit/validation/test_time_series_cv.py +++ b/test/unit/validation/test_time_series_cv.py @@ -8,7 +8,7 @@ from fedot.core.pipelines.pipeline_composer_requirements import PipelineComposerRequirements from examples.advanced.time_series_forecasting.composing_pipelines import get_available_operations -from fedot.api.main import Fedot +from fedot import Fedot from fedot.core.composer.composer_builder import ComposerBuilder from fedot.core.pipelines.pipeline import Pipeline from fedot.core.pipelines.tuning.tuner_builder import TunerBuilder