adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify band-aid code

Browse Source
This commit is contained in:
Matthias 2022-02-09 06:48:26 +01:00
parent 6191288ff9
commit 4e2f06fe9c
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
freqtrade/rpc/rpc.py
View File

@ -12,7 +12,7 @@ import psutil
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
from dateutil.tz import tzlocal from dateutil.tz import tzlocal
from numpy import NAN, inf, int64, mean from numpy import NAN, inf, int64, mean
from pandas import DataFrame, isnull from pandas import DataFrame, NaT
from freqtrade import __version__ from freqtrade import __version__
from freqtrade.configuration.timerange import TimeRange from freqtrade.configuration.timerange import TimeRange
@ -973,16 +973,9 @@ class RPC:
# replace NaT with empty string, # replace NaT with empty string,
# because if replaced with `None` # because if replaced with `None`
# it will be casted into NaT again # it will be casted into NaT again
dataframe[date_column] = dataframe[date_column].apply( dataframe[date_column] = dataframe[date_column].astype(object).replace({NaT: None})
lambda x: '' if isnull(x) else x)
""" dataframe = dataframe.replace({inf: None, -inf: None, NAN: None})
try this if above pandas Issue#45836 is fixed:
https://github.com/pandas-dev/pandas/issues/45836
"""
# dataframe = dataframe.replace({NaT: None})
dataframe = dataframe.replace([inf, -inf], NAN)
dataframe = dataframe.replace({NAN: None})
res = { res = {
'pair': pair, 'pair': pair,

2
tests/rpc/test_rpc_apiserver.py
View File

@ -1193,7 +1193,7 @@ def test_api_pair_candles(botclient, ohlcv_history):
assert_response(rc) assert_response(rc)
assert (rc.json()['data'] == assert (rc.json()['data'] ==
[['2017-11-26 08:50:00', 8.794e-05, 8.948e-05, 8.794e-05, 8.88e-05, 0.0877869, [['2017-11-26 08:50:00', 8.794e-05, 8.948e-05, 8.794e-05, 8.88e-05, 0.0877869,
None, 0, None, '', 1511686200000, None, None], None, 0, None, None, 1511686200000, None, None],
['2017-11-26 08:55:00', 8.88e-05, 8.942e-05, 8.88e-05, ['2017-11-26 08:55:00', 8.88e-05, 8.942e-05, 8.88e-05,
8.893e-05, 0.05874751, 8.886500000000001e-05, 1, 0.0, '2017-11-26 08:55:00', 8.893e-05, 0.05874751, 8.886500000000001e-05, 1, 0.0, '2017-11-26 08:55:00',
1511686500000, 8.893e-05, None], 1511686500000, 8.893e-05, None],