CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2025-12-18 22:01:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

update imports

Browse Source
This commit is contained in:
Matthias
2024-02-10 17:27:11 +01:00
parent cfcc8f9fde
commit 7ae69a9cde
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
freqtrade/data/dataprovider.py
View File

@@ -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:

7
freqtrade/strategy/interface.py
View File

@@ -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,