[Context] add live id and rename analysis_settings

Drakkar-Software · Jan 29, 2023 · 9c80d8a · 9c80d8a
1 parent b5a51b4
commit 9c80d8a
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/octobot_trading/modes/script_keywords/context_management.py b/octobot_trading/modes/script_keywords/context_management.py
@@ -81,9 +81,10 @@ def __init__(
         backtesting_id,
         optimizer_id,
         optimization_campaign_name=None,
-        backtesting_analysis_settings=None,
+        analysis_settings=None,
+        live_id=None,
     ):
-        # no cache if live trading to ensure cache is always writen
+        # no cache if live trading to ensure cache is always written
         super().__init__(
             tentacle,
             exchange_name,
@@ -92,13 +93,14 @@ def __init__(
             exchange_manager.tentacles_setup_config if exchange_manager else None,
             not exchange_manager.is_backtesting if exchange_manager else False
         )
-        self.backtesting_analysis_settings = backtesting_analysis_settings
+        self.analysis_settings = analysis_settings
         self.exchange_manager = exchange_manager
         self.trader = trader
         self.matrix_id = matrix_id
         self.cryptocurrency = cryptocurrency
         self.signal_symbol = signal_symbol
         self.logger = logger
+        self.live_id = live_id
         bot_id = exchange_manager.bot_id if \
             (exchange_manager is not None) \
             and (exchange_manager.bot_id is not None) \
@@ -211,7 +213,7 @@ async def local_nested_tentacle_config(self, tentacle_class, config_name, is_nes
 
     @staticmethod
     def minimal(trading_mode_class, logger, exchange_name, traded_pair, backtesting_id,
-                optimizer_id, optimization_campaign_name, backtesting_analysis_settings):
+                optimizer_id, optimization_campaign_name, analysis_settings, live_id=None):
         return Context(
             None,
             None,
@@ -230,7 +232,8 @@ def minimal(trading_mode_class, logger, exchange_name, traded_pair, backtesting_
             backtesting_id,
             optimizer_id,
             optimization_campaign_name,
-            backtesting_analysis_settings,
+            analysis_settings,
+            live_id=live_id,
         )
 
     @contextlib.asynccontextmanager
@@ -251,7 +254,7 @@ async def nested_call_context(self, tentacle):
             self.trigger_source,
             self.trigger_value,
             self.backtesting_id,
-            self.optimizer_id
+            self.optimizer_id,
         )
         context.is_nested_tentacle = self.is_nested_tentacle
         context.config_name = self.config_name
@@ -492,10 +495,11 @@ async def backtesting_results(self, with_lock=False, cache_size=None, database_a
         display = commons_display.display_translator_factory()
         run_dbs_identifier = databases.RunDatabasesIdentifier(
             self.trading_mode_class,
-            self.optimization_campaign_name or optimization_campaign.OptimizationCampaign.get_campaign_name(),
+            self.optimization_campaign_name,
             database_adaptor=database_adaptor,
             backtesting_id=self.backtesting_id,
             optimizer_id=self.optimizer_id,
+            live_id=self.live_id,
             context=self
         )
         if not await run_dbs_identifier.exchange_base_identifier_exists(self.exchange_name):