@@ -82,9 +82,10 @@ def __init__(
82
82
backtesting_id ,
83
83
optimizer_id ,
84
84
optimization_campaign_name = None ,
85
- backtesting_analysis_settings = None ,
85
+ analysis_settings = None ,
86
+ live_id = None ,
86
87
):
87
- # no cache if live trading to ensure cache is always writen
88
+ # no cache if live trading to ensure cache is always written
88
89
super ().__init__ (
89
90
tentacle ,
90
91
exchange_name ,
@@ -93,13 +94,14 @@ def __init__(
93
94
exchange_manager .tentacles_setup_config if exchange_manager else None ,
94
95
not exchange_manager .is_backtesting if exchange_manager else False
95
96
)
96
- self .backtesting_analysis_settings = backtesting_analysis_settings
97
+ self .analysis_settings = analysis_settings
97
98
self .exchange_manager = exchange_manager
98
99
self .trader = trader
99
100
self .matrix_id = matrix_id
100
101
self .cryptocurrency = cryptocurrency
101
102
self .signal_symbol = signal_symbol
102
103
self .logger = logger
104
+ self .live_id = live_id
103
105
bot_id = exchange_manager .bot_id if \
104
106
(exchange_manager is not None ) \
105
107
and (exchange_manager .bot_id is not None ) \
@@ -222,7 +224,7 @@ async def local_nested_tentacle_config(self, tentacle_class, config_name, is_nes
222
224
223
225
@staticmethod
224
226
def minimal (trading_mode_class , logger , exchange_name , traded_pair , backtesting_id ,
225
- optimizer_id , optimization_campaign_name , backtesting_analysis_settings ):
227
+ optimizer_id , optimization_campaign_name , analysis_settings , live_id = None ):
226
228
return Context (
227
229
None ,
228
230
None ,
@@ -241,7 +243,8 @@ def minimal(trading_mode_class, logger, exchange_name, traded_pair, backtesting_
241
243
backtesting_id ,
242
244
optimizer_id ,
243
245
optimization_campaign_name ,
244
- backtesting_analysis_settings ,
246
+ analysis_settings ,
247
+ live_id = live_id ,
245
248
)
246
249
247
250
@contextlib .asynccontextmanager
@@ -262,7 +265,7 @@ async def nested_call_context(self, tentacle):
262
265
self .trigger_source ,
263
266
self .trigger_value ,
264
267
self .backtesting_id ,
265
- self .optimizer_id
268
+ self .optimizer_id ,
266
269
)
267
270
context .is_nested_tentacle = self .is_nested_tentacle
268
271
context .config_name = self .config_name
@@ -503,10 +506,11 @@ async def backtesting_results(self, with_lock=False, cache_size=None, database_a
503
506
display = commons_display .display_translator_factory ()
504
507
run_dbs_identifier = databases .RunDatabasesIdentifier (
505
508
self .trading_mode_class ,
506
- self .optimization_campaign_name or optimization_campaign . OptimizationCampaign . get_campaign_name () ,
509
+ self .optimization_campaign_name ,
507
510
database_adaptor = database_adaptor ,
508
511
backtesting_id = self .backtesting_id ,
509
512
optimizer_id = self .optimizer_id ,
513
+ live_id = self .live_id ,
510
514
context = self
511
515
)
512
516
if not await run_dbs_identifier .exchange_base_identifier_exists (self .exchange_name ):
0 commit comments