Skip to content

Commit 1a7f7bc

Browse files
committed
[Context] add live id and rename analysis_settings
1 parent 658792e commit 1a7f7bc

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

octobot_trading/modes/script_keywords/context_management.py

+11-7
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,10 @@ def __init__(
8282
backtesting_id,
8383
optimizer_id,
8484
optimization_campaign_name=None,
85-
backtesting_analysis_settings=None,
85+
analysis_settings=None,
86+
live_id=None,
8687
):
87-
# no cache if live trading to ensure cache is always writen
88+
# no cache if live trading to ensure cache is always written
8889
super().__init__(
8990
tentacle,
9091
exchange_name,
@@ -93,13 +94,14 @@ def __init__(
9394
exchange_manager.tentacles_setup_config if exchange_manager else None,
9495
not exchange_manager.is_backtesting if exchange_manager else False
9596
)
96-
self.backtesting_analysis_settings = backtesting_analysis_settings
97+
self.analysis_settings = analysis_settings
9798
self.exchange_manager = exchange_manager
9899
self.trader = trader
99100
self.matrix_id = matrix_id
100101
self.cryptocurrency = cryptocurrency
101102
self.signal_symbol = signal_symbol
102103
self.logger = logger
104+
self.live_id = live_id
103105
bot_id = exchange_manager.bot_id if \
104106
(exchange_manager is not None) \
105107
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
222224

223225
@staticmethod
224226
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):
226228
return Context(
227229
None,
228230
None,
@@ -241,7 +243,8 @@ def minimal(trading_mode_class, logger, exchange_name, traded_pair, backtesting_
241243
backtesting_id,
242244
optimizer_id,
243245
optimization_campaign_name,
244-
backtesting_analysis_settings,
246+
analysis_settings,
247+
live_id=live_id,
245248
)
246249

247250
@contextlib.asynccontextmanager
@@ -262,7 +265,7 @@ async def nested_call_context(self, tentacle):
262265
self.trigger_source,
263266
self.trigger_value,
264267
self.backtesting_id,
265-
self.optimizer_id
268+
self.optimizer_id,
266269
)
267270
context.is_nested_tentacle = self.is_nested_tentacle
268271
context.config_name = self.config_name
@@ -503,10 +506,11 @@ async def backtesting_results(self, with_lock=False, cache_size=None, database_a
503506
display = commons_display.display_translator_factory()
504507
run_dbs_identifier = databases.RunDatabasesIdentifier(
505508
self.trading_mode_class,
506-
self.optimization_campaign_name or optimization_campaign.OptimizationCampaign.get_campaign_name(),
509+
self.optimization_campaign_name,
507510
database_adaptor=database_adaptor,
508511
backtesting_id=self.backtesting_id,
509512
optimizer_id=self.optimizer_id,
513+
live_id=self.live_id,
510514
context=self
511515
)
512516
if not await run_dbs_identifier.exchange_base_identifier_exists(self.exchange_name):

0 commit comments

Comments
 (0)