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

Merge pull request #734 from arudov/fix/pair-downloads

Browse Source 
Do not download pairs if --refresh-pairs-cached isn't set
This commit is contained in:
Samuel Husso 2018-05-29 08:05:10 +03:00 committed by GitHub
commit c471ccb2db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
freqtrade/optimize/__init__.py
View File

@ -29,7 +29,7 @@ def trim_tickerlist(tickerlist: List[Dict], timerange: Tuple[Tuple, int, int]) -
if stype[0] == 'index': if stype[0] == 'index':
start_index = start start_index = start
elif stype[0] == 'date': elif stype[0] == 'date':
while tickerlist[start_index][0] < start * 1000: while start_index < len(tickerlist) and tickerlist[start_index][0] < start * 1000:
start_index += 1 start_index += 1
if stype[1] == 'line': if stype[1] == 'line':
@ -37,7 +37,7 @@ def trim_tickerlist(tickerlist: List[Dict], timerange: Tuple[Tuple, int, int]) -
if stype[1] == 'index': if stype[1] == 'index':
stop_index = stop stop_index = stop
elif stype[1] == 'date': elif stype[1] == 'date':
while tickerlist[stop_index-1][0] > stop * 1000: while stop_index > 0 and tickerlist[stop_index-1][0] > stop * 1000:
stop_index -= 1 stop_index -= 1
if start_index > stop_index: if start_index > stop_index:
@ -100,15 +100,11 @@ def load_data(datadir: str,
for pair in _pairs: for pair in _pairs:
pairdata = load_tickerdata_file(datadir, pair, ticker_interval, timerange=timerange) pairdata = load_tickerdata_file(datadir, pair, ticker_interval, timerange=timerange)
if not pairdata: if pairdata:
# download the tickerdata from exchange result[pair] = pairdata
download_backtesting_testdata(datadir, else:
pair=pair, logger.warn('No data for pair %s, use --update-pairs-cached to download the data', pair)
tick_interval=ticker_interval,
timerange=timerange)
# and retry reading the pair
pairdata = load_tickerdata_file(datadir, pair, ticker_interval, timerange=timerange)
result[pair] = pairdata
return result return result

15
freqtrade/tests/optimize/test_optimize.py
View File

@ -99,7 +99,20 @@ def test_load_data_with_new_pair_1min(ticker_history, mocker, caplog) -> None:
file = os.path.join(os.path.dirname(__file__), '..', 'testdata', 'MEME_BTC-1m.json') file = os.path.join(os.path.dirname(__file__), '..', 'testdata', 'MEME_BTC-1m.json')
_backup_file(file) _backup_file(file)
optimize.load_data(None, ticker_interval='1m', pairs=['MEME/BTC']) # do not download a new pair if refresh_pairs isn't set
optimize.load_data(None,
ticker_interval='1m',
refresh_pairs=False,
pairs=['MEME/BTC'])
assert os.path.isfile(file) is False
assert log_has('No data for pair MEME/BTC, use --update-pairs-cached to download the data',
caplog.record_tuples)
# download a new pair if refresh_pairs is set
optimize.load_data(None,
ticker_interval='1m',
refresh_pairs=True,
pairs=['MEME/BTC'])
assert os.path.isfile(file) is True assert os.path.isfile(file) is True
assert log_has('Download the pair: "MEME/BTC", Interval: 1m', caplog.record_tuples) assert log_has('Download the pair: "MEME/BTC", Interval: 1m', caplog.record_tuples)
_clean_test_file(file) _clean_test_file(file)