rebase on golem 0.4.0

fedot/api/main.py

@@ -8,7 +8,7 @@
 from golem.core.log import Log, default_log
 from golem.core.optimisers.opt_history_objects.opt_history import OptHistory
 from golem.core.tuning.simultaneous import SimultaneousTuner
-from golem.core.utilities.data_structures import ensure_wrapped_in_sequence
+from golem.utilities.data_structures import ensure_wrapped_in_sequence
 from golem.visualisation.opt_viz_extra import visualise_pareto
 
 from fedot.api.api_utils.api_composer import ApiComposer

fedot/core/caching/base_cache.py

@@ -1,7 +1,7 @@
 from typing import Union
 
 from golem.core.log import default_log
-from golem.core.utilities.singleton_meta import SingletonMeta
+from golem.utilities.singleton_meta import SingletonMeta
 
 from fedot.core.caching.pipelines_cache_db import OperationsCacheDB
 from fedot.core.caching.preprocessing_cache_db import PreprocessingCacheDB

fedot/core/caching/pipelines_cache.py

@@ -1,7 +1,7 @@
 import sqlite3
 from typing import List, Optional, TYPE_CHECKING, Union
 
-from golem.core.utilities.data_structures import ensure_wrapped_in_sequence
+from golem.utilities.data_structures import ensure_wrapped_in_sequence
 
 from fedot.core.caching.base_cache import BaseCache
 from fedot.core.caching.pipelines_cache_db import OperationsCacheDB

fedot/core/composer/composer_builder.py

@@ -8,7 +8,7 @@
 from golem.core.optimisers.genetic.gp_params import GPAlgorithmParameters
 from golem.core.optimisers.initial_graphs_generator import InitialPopulationGenerator, GenerationFunction
 from golem.core.optimisers.optimizer import GraphOptimizer, AlgorithmParameters, GraphGenerationParams
-from golem.core.utilities.data_structures import ensure_wrapped_in_sequence
+from golem.utilities.data_structures import ensure_wrapped_in_sequence
 
 from fedot.core.caching.pipelines_cache import OperationsCache
 from fedot.core.caching.preprocessing_cache import PreprocessingCache

fedot/core/data/merge/data_merger.py

@@ -1,7 +1,7 @@
 from typing import List, Iterable, Union
 
 from golem.core.log import default_log
-from golem.core.utilities.data_structures import are_same_length
+from golem.utilities.data_structures import are_same_length
 
 from fedot.core.data.array_utilities import *
 from fedot.core.data.data import OutputData, InputData

fedot/core/optimisers/objective/metrics_objective.py

@@ -1,7 +1,7 @@
 from typing import Union, Iterable, Callable
 
 from golem.core.optimisers.objective import Objective
-from golem.core.utilities.data_structures import ensure_wrapped_in_sequence
+from golem.utilities.data_structures import ensure_wrapped_in_sequence
 
 from fedot.core.repository.quality_metrics_repository import MetricType, MetricsRepository, ComplexityMetricsEnum
 

fedot/core/pipelines/pipeline.py

@@ -12,7 +12,7 @@
 from golem.core.log import default_log
 from golem.core.optimisers.timer import Timer
 from golem.core.paths import copy_doc
-from golem.core.utilities.serializable import Serializable
+from golem.utilities.serializable import Serializable
 from golem.visualisation.graph_viz import NodeColorType
 
 from fedot.core.caching.pipelines_cache import OperationsCache

fedot/core/pipelines/tuning/tuner_builder.py

@@ -4,7 +4,7 @@
 from golem.core.tuning.optuna_tuner import OptunaTuner
 from golem.core.tuning.simultaneous import SimultaneousTuner
 from golem.core.tuning.tuner_interface import BaseTuner
-from golem.core.utilities.data_structures import ensure_wrapped_in_sequence
+from golem.utilities.data_structures import ensure_wrapped_in_sequence
 
 from fedot.core.constants import DEFAULT_TUNING_ITERATIONS_NUMBER
 from fedot.core.data.data import InputData

fedot/core/repository/dataset_types.py

@@ -1,4 +1,4 @@
-from golem.core.utilities.data_structures import ComparableEnum as Enum
+from golem.utilities.data_structures import ComparableEnum as Enum
 
 
 class DataTypesEnum(Enum):

fedot/core/repository/operation_types_repository.py

@@ -6,7 +6,7 @@
 
 import numpy as np
 from golem.core.log import default_log
-from golem.core.utilities.data_structures import ensure_wrapped_in_sequence
+from golem.utilities.data_structures import ensure_wrapped_in_sequence
 
 from fedot.core.constants import BEST_QUALITY_PRESET_NAME, AUTO_PRESET_NAME
 from fedot.core.repository.dataset_types import DataTypesEnum

fedot/core/repository/quality_metrics_repository.py

@@ -2,7 +2,7 @@
 from typing import Callable, Union, TypeVar
 
 from golem.core.dag.graph import Graph
-from golem.core.utilities.data_structures import ComparableEnum as Enum
+from golem.utilities.data_structures import ComparableEnum as Enum
 
 from fedot.core.composer.metrics import (ComputationTime, Accuracy, F1, Logloss, MAE,
                                          MAPE, SMAPE, MSE, MSLE, Metric, NodeNum, Precision, R2,

fedot/core/repository/tasks.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Any, List, Optional
 
-from golem.core.utilities.data_structures import ComparableEnum as Enum
+from golem.utilities.data_structures import ComparableEnum as Enum
 
 
 @dataclass

fedot/core/utils.py

@@ -7,7 +7,7 @@
 
 import numpy as np
 import pandas as pd
-from golem.core.utilities.random import RandomStateHandler
+from golem.utilities.random import RandomStateHandler
 from sklearn.model_selection import train_test_split
 
 DEFAULT_PARAMS_STUB = 'default_params'

fedot/remote/infrastructure/clients/client.py

@@ -3,7 +3,7 @@
 from typing import Optional, Type, TypeVar
 
 from golem.core.log import default_log
-from golem.core.utilities.serializable import Serializable
+from golem.utilities.serializable import Serializable
 
 from fedot.core.utils import default_fedot_data_dir
 

fedot/remote/remote_evaluator.py

@@ -5,7 +5,7 @@
 import numpy as np
 from golem.core.log import default_log
 from golem.core.optimisers.genetic.evaluation import DelegateEvaluator
-from golem.core.utilities.serializable import Serializable
+from golem.utilities.serializable import Serializable
 
 from fedot.core.data.data import InputData
 from fedot.remote.infrastructure.clients.client import Client

fedot/remote/run_pipeline.py

@@ -4,7 +4,7 @@
 from typing import Union
 
 from golem.core.log import default_log
-from golem.core.utilities.random import RandomStateHandler
+from golem.utilities.random import RandomStateHandler
 
 from fedot.core.data.data import InputData
 from fedot.core.data.multi_modal import MultiModalData

fedot/utilities/golem_imports_transition.py

@@ -21,7 +21,7 @@
     'fedot.core.adapter': 'golem.core.adapter',
     'fedot.core.dag': 'golem.core.dag',
     'fedot.core.optimisers': 'golem.core.optimisers',
-    'fedot.core.utilities': 'golem.core.utilities',
+    'fedot.core.utilities': 'golem.utilities',
 
     'fedot.core.serializers': 'golem.serializers',
     'fedot.core.visualisation': 'golem.visualisation',

requirements.txt

@@ -1,5 +1,5 @@
 # Base framework
-thegolem==0.3.3
+thegolem==0.0.4
 
 # Data
 numpy>=1.16.0, !=1.24.0

test/integration/pipelines/tuning/test_pipeline_tuning.py

@@ -7,7 +7,7 @@
 from golem.core.tuning.optuna_tuner import OptunaTuner
 from golem.core.tuning.sequential import SequentialTuner
 from golem.core.tuning.simultaneous import SimultaneousTuner
-from golem.core.utilities.data_structures import ensure_wrapped_in_sequence
+from golem.utilities.data_structures import ensure_wrapped_in_sequence
 from hyperopt import hp
 from hyperopt.pyll.stochastic import sample as hp_sample
 

test/unit/remote/test_remote_custom.py

@@ -4,7 +4,7 @@
 from typing import Tuple, Union, Optional, Sequence
 
 import pytest
-from golem.core.utilities.serializable import Serializable
+from golem.utilities.serializable import Serializable
 
 from fedot.remote.infrastructure.clients.client import Client
 from fedot.remote.remote_evaluator import RemoteEvaluator, RemoteTaskParams