refactor: automatically load detailed bt data

Author: xmatthias

freqtrade/optimize/analysis/lookahead.py

@@ -129,7 +129,6 @@ def prepare_data(self, varholder: VarHolder, pairs_to_load: list[DataFrame]):
         backtesting._set_strategy(backtesting.strategylist[0])
 
         varholder.data, varholder.timerange = backtesting.load_bt_data()
-        backtesting.load_bt_data_detail()
         varholder.timeframe = backtesting.timeframe
 
         varholder.indicators = backtesting.strategy.advise_all_indicators(varholder.data)

freqtrade/optimize/analysis/recursive.py

@@ -149,7 +149,6 @@ def prepare_data(self, varholder: VarHolder, pairs_to_load: list[DataFrame]):
         backtesting._set_strategy(backtesting.strategylist[0])
 
         varholder.data, varholder.timerange = backtesting.load_bt_data()
-        backtesting.load_bt_data_detail()
         varholder.timeframe = backtesting.timeframe
 
         varholder.indicators = backtesting.strategy.advise_all_indicators(varholder.data)

freqtrade/optimize/backtesting.py

@@ -315,9 +315,10 @@ def load_bt_data(self) -> tuple[dict[str, DataFrame], TimeRange]:
         )
 
         self.progress.set_new_value(1)
+        self._load_bt_data_detail()
         return data, self.timerange
 
-    def load_bt_data_detail(self) -> None:
+    def _load_bt_data_detail(self) -> None:
         """
         Loads backtest detail data (smaller timeframe) if necessary.
         """
@@ -1767,7 +1768,6 @@ def start(self) -> None:
         data: dict[str, DataFrame] = {}
 
         data, timerange = self.load_bt_data()
-        self.load_bt_data_detail()
         logger.info("Dataload complete. Calculating indicators")
 
         self.load_prior_backtest()

freqtrade/optimize/hyperopt/hyperopt_optimizer.py

@@ -423,7 +423,6 @@ def advise_and_trim(self, data: dict[str, DataFrame]) -> dict[str, DataFrame]:
     def prepare_hyperopt_data(self) -> None:
         HyperoptStateContainer.set_state(HyperoptState.DATALOAD)
         data, self.timerange = self.backtesting.load_bt_data()
-        self.backtesting.load_bt_data_detail()
         logger.info("Dataload complete. Calculating indicators")
 
         if not self.analyze_per_epoch:

freqtrade/rpc/api_server/api_backtest.py

@@ -62,7 +62,6 @@ def __run_backtest_bg(btconfig: Config):
             from freqtrade.optimize.backtesting import Backtesting
 
             ApiBG.bt["bt"] = Backtesting(btconfig)
-            ApiBG.bt["bt"].load_bt_data_detail()
         else:
             ApiBG.bt["bt"].config = btconfig
             ApiBG.bt["bt"].init_backtest()

tests/optimize/test_backtesting.py

@@ -992,7 +992,7 @@ def custom_entry_price(proposed_rate, **kwargs):
         timerange=timerange,
         candle_type=CandleType.FUTURES,
     )
-    backtesting.load_bt_data_detail()
+    backtesting._load_bt_data_detail()
     processed = backtesting.strategy.advise_all_indicators(data)
     min_date, max_date = get_timerange(processed)
 
@@ -1120,7 +1120,7 @@ def adjust_trade_position(trade, current_time, **kwargs):
         timerange=timerange,
         candle_type=CandleType.FUTURES,
     )
-    backtesting.load_bt_data_detail()
+    backtesting._load_bt_data_detail()
     processed = backtesting.strategy.advise_all_indicators(data)
     min_date, max_date = get_timerange(processed)