21
21
import octobot .strategy_optimizer .fitness_parameter as fitness_parameter
22
22
import octobot .strategy_optimizer .optimizer_filter as optimizer_filter
23
23
import octobot .strategy_optimizer .optimizer_constraint as optimizer_constraint
24
+ import octobot_backtesting .constants as backtesting_constants
24
25
25
26
26
27
class OptimizerSettings :
@@ -31,7 +32,24 @@ def __init__(self, settings_dict=None):
31
32
self .optimizer_config = settings_dict .get (enums .OptimizerConfig .OPTIMIZER_CONFIG .value , None )
32
33
self .randomly_chose_runs = settings_dict .get (enums .OptimizerConfig .RANDOMLY_CHOSE_RUNS .value ,
33
34
constants .OPTIMIZER_DEFAULT_RANDOMLY_CHOSE_RUNS )
34
- self .data_files = settings_dict .get (enums .OptimizerConfig .DATA_FILES .value )
35
+ self .data_files = settings_dict .get (
36
+ enums .OptimizerConfig .DATA_FILES .value ,
37
+ [backtesting_constants .CONFIG_CURRENT_BOT_DATA ],
38
+ )
39
+ if not isinstance (self .data_files , list ):
40
+ self .data_files = [self .data_files ]
41
+ if backtesting_constants .CONFIG_CURRENT_BOT_DATA in self .data_files :
42
+ self .data_files = [backtesting_constants .CONFIG_CURRENT_BOT_DATA ]
43
+ self .exchange_ids = settings_dict .get (
44
+ enums .OptimizerConfig .EXCHANGE_IDS .value ,
45
+ )
46
+ if not self .exchange_ids :
47
+ self .exchange_ids = [
48
+ settings_dict .get (enums .OptimizerConfig .EXCHANGE_ID .value )
49
+ ]
50
+ self .exchange_type = settings_dict .get (
51
+ enums .OptimizerConfig .EXCHANGE_TYPE .value
52
+ )
35
53
self .start_timestamp = settings_dict .get (enums .OptimizerConfig .START_TIMESTAMP .value , None )
36
54
self .end_timestamp = settings_dict .get (enums .OptimizerConfig .END_TIMESTAMP .value , None )
37
55
self .required_idle_cores = int (settings_dict .get (enums .OptimizerConfig .IDLE_CORES .value ,
0 commit comments