From 7ae69a9cde3d70b7ecfa7350266fdafe16433f3c Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 10 Feb 2024 17:27:11 +0100 Subject: [PATCH] update imports --- freqtrade/data/dataprovider.py | 12 ++++-------- freqtrade/strategy/interface.py | 7 +++---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/freqtrade/data/dataprovider.py b/freqtrade/data/dataprovider.py index b60478c0d..10ff8c17e 100644 --- a/freqtrade/data/dataprovider.py +++ b/freqtrade/data/dataprovider.py @@ -15,8 +15,7 @@ from freqtrade.configuration import TimeRange from freqtrade.constants import (FULL_DATAFRAME_THRESHOLD, Config, ListPairsWithTimeframes, PairWithTimeframe) from freqtrade.data.converter import public_trades_to_dataframe -from freqtrade.data.history import load_pair_history -from freqtrade.data.history.idatahandler import get_datahandler +from freqtrade.data.history import get_datahandler, load_pair_history from freqtrade.enums import CandleType, RPCMessageType, RunMode from freqtrade.exceptions import ExchangeError, OperationalException from freqtrade.exchange import Exchange, timeframe_to_prev_date, timeframe_to_seconds @@ -450,14 +449,12 @@ class DataProvider: # refresh latest trades data self.refresh_latest_trades(pairlist) - def refresh_latest_trades(self, - pairlist: ListPairsWithTimeframes) -> None: + def refresh_latest_trades(self, pairlist: ListPairsWithTimeframes) -> None: """ Refresh latest trades data (if enabled in config) """ - use_public_trades = self._config.get( - 'exchange', {}).get('use_public_trades', False) + use_public_trades = self._config.get('exchange', {}).get('use_public_trades', False) if use_public_trades: datahandler = get_datahandler( self._config['datadir'], data_format=self._config['dataformat_trades']) @@ -533,8 +530,7 @@ class DataProvider: data_handler = get_datahandler( self._config['datadir'], data_format=self._config['dataformat_trades']) ticks = data_handler.trades_load(pair) - trades_df = public_trades_to_dataframe( - ticks.values.tolist(), pair=pair) + trades_df = public_trades_to_dataframe(ticks.values.tolist(), pair=pair) return trades_df else: diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py index 87781c6b7..282e877a9 100644 --- a/freqtrade/strategy/interface.py +++ b/freqtrade/strategy/interface.py @@ -10,7 +10,7 @@ from typing import Dict, List, Optional, Tuple, Union from pandas import DataFrame from freqtrade.constants import CUSTOM_TAG_MAX_LENGTH, Config, IntOrInf, ListPairsWithTimeframes -from freqtrade.data import converter +from freqtrade.data.converter import populate_dataframe_with_trades from freqtrade.data.dataprovider import DataProvider from freqtrade.enums import (CandleType, ExitCheckTuple, ExitType, MarketDirection, RunMode, SignalDirection, SignalTagType, SignalType, TradingMode) @@ -1410,15 +1410,14 @@ class IStrategy(ABC, HyperStrategyMixin): self, dataframe, metadata, inf_data, populate_fn) # TODO: extract this into a separate method e.g. if_enabled_populate_trades() - use_public_trades = self.config.get( - 'exchange', {}).get('use_public_trades', False) + use_public_trades = self.config.get('exchange', {}).get('use_public_trades', False) if use_public_trades: trades = self.dp.trades(pair=metadata['pair'], copy=False) config = self.config config['timeframe'] = self.timeframe # TODO: slice trades to size of dataframe for faster backtesting - dataframe = converter.populate_dataframe_with_trades( + dataframe = populate_dataframe_with_trades( config, dataframe, trades,