CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2026-02-14 18:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract trades DF creation to converter function

Browse Source
This commit is contained in:
Matthias
2023-08-18 07:02:46 +02:00
parent 357b04202c
commit d97d0e4426
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
freqtrade/data/converter.py
View File

@@ -225,6 +225,17 @@ def trades_dict_to_list(trades: List[Dict]) -> TradeList:
return [[t[col] for col in DEFAULT_TRADES_COLUMNS] for t in trades]
def trades_list_to_df(trades: TradeList):
"""
convert trades list to dataframe
:param trades: List of Lists with constants.DEFAULT_TRADES_COLUMNS as columns
"""
if not trades:
return DataFrame(columns=DEFAULT_TRADES_COLUMNS)
df = DataFrame(trades, columns=DEFAULT_TRADES_COLUMNS)
return df
def trades_to_ohlcv(trades: DataFrame, timeframe: str) -> DataFrame:
"""
Converts trades list to OHLCV list

5
freqtrade/data/history/jsondatahandler.py
View File

@@ -7,7 +7,7 @@ from pandas import DataFrame, read_json, to_datetime
from freqtrade import misc
from freqtrade.configuration import TimeRange
from freqtrade.constants import DEFAULT_DATAFRAME_COLUMNS, DEFAULT_TRADES_COLUMNS
from freqtrade.data.converter import trades_dict_to_list
from freqtrade.data.converter import trades_dict_to_list, trades_list_to_df
from freqtrade.enums import CandleType
from .idatahandler import IDataHandler
@@ -134,8 +134,7 @@ class JsonDataHandler(IDataHandler):
logger.info("Old trades format detected - converting")
tradesdata = trades_dict_to_list(tradesdata)
pass
trades = DataFrame(tradesdata, columns=DEFAULT_TRADES_COLUMNS)
return trades
return trades_list_to_df(tradesdata)
@classmethod
def _get_file_extension(cls):