From 4464b027191245677f8a1831150a512e627c5e95 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 3 Dec 2023 13:27:00 +0100 Subject: [PATCH] Add handling to properly merge 1M data to closes #9490 --- freqtrade/strategy/strategy_helper.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/freqtrade/strategy/strategy_helper.py b/freqtrade/strategy/strategy_helper.py index 7654a383f..1de3f8f89 100644 --- a/freqtrade/strategy/strategy_helper.py +++ b/freqtrade/strategy/strategy_helper.py @@ -46,10 +46,16 @@ def merge_informative_pair(dataframe: pd.DataFrame, informative: pd.DataFrame, # Subtract "small" timeframe so merging is not delayed by 1 small candle # Detailed explanation in https://github.com/freqtrade/freqtrade/issues/4073 if not informative.empty: - informative['date_merge'] = ( - informative[date_column] + pd.to_timedelta(minutes_inf, 'm') - - pd.to_timedelta(minutes, 'm') - ) + if timeframe_inf == '1M': + informative['date_merge'] = ( + (informative[date_column] + pd.offsets.MonthBegin(1)) + - pd.to_timedelta(minutes, 'm') + ) + else: + informative['date_merge'] = ( + informative[date_column] + pd.to_timedelta(minutes_inf, 'm') - + pd.to_timedelta(minutes, 'm') + ) else: informative['date_merge'] = informative[date_column] else: