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

Refreshing pair of only selected ticker_interval

Browse Source
This commit is contained in:
Jean-Baptiste LE STANG 2018-01-13 08:32:44 +01:00
parent 46dc9985fc
commit 260bb2f558
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
freqtrade/optimize/__init__.py
View File

@ -48,7 +48,7 @@ def load_data(datadir: str, ticker_interval: int, pairs: Optional[List[str]] = N
# If the user force the refresh of pairs # If the user force the refresh of pairs
if refresh_pairs: if refresh_pairs:
logger.info('Download data for all pairs and store them in %s', datadir) logger.info('Download data for all pairs and store them in %s', datadir)
download_pairs(datadir, _pairs) download_pairs(datadir, _pairs, ticker_interval)
for pair in _pairs: for pair in _pairs:
pairdata = load_tickerdata_file(datadir, pair, ticker_interval) pairdata = load_tickerdata_file(datadir, pair, ticker_interval)
@ -73,16 +73,15 @@ def make_testdata_path(datadir: str) -> str:
'..', 'tests', 'testdata')) '..', 'tests', 'testdata'))
def download_pairs(datadir, pairs: List[str]) -> bool: def download_pairs(datadir, pairs: List[str], ticker_interval: int) -> bool:
"""For each pairs passed in parameters, download 1 and 5 ticker intervals""" """For each pairs passed in parameters, download the ticker intervals"""
for pair in pairs: for pair in pairs:
try: try:
for interval in [1, 5, 30, 60, 1440]: download_backtesting_testdata(datadir, pair=pair, interval=ticker_interval)
download_backtesting_testdata(datadir, pair=pair, interval=interval)
except BaseException: except BaseException:
logger.info('Failed to download the pair: "{pair}", Interval: {interval} min'.format( logger.info('Failed to download the pair: "{pair}", Interval: {interval} min'.format(
pair=pair, pair=pair,
interval=interval, interval=ticker_interval,
)) ))
return False return False
return True return True

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

@ -130,17 +130,26 @@ def test_download_pairs(default_conf, ticker_history, mocker):
_backup_file(file2_1) _backup_file(file2_1)
_backup_file(file2_5) _backup_file(file2_5)
assert download_pairs(None, pairs=['BTC-MEME', 'BTC-CFI']) is True assert download_pairs(None, pairs=['BTC-MEME', 'BTC-CFI'], ticker_interval=1) is True
assert os.path.isfile(file1_1) is True assert os.path.isfile(file1_1) is True
assert os.path.isfile(file1_5) is True assert os.path.isfile(file1_5) is False
assert os.path.isfile(file2_1) is True assert os.path.isfile(file2_1) is True
assert os.path.isfile(file2_5) is True assert os.path.isfile(file2_5) is False
# clean files freshly downloaded # clean files freshly downloaded
_clean_test_file(file1_1) _clean_test_file(file1_1)
_clean_test_file(file1_5)
_clean_test_file(file2_1) _clean_test_file(file2_1)
assert download_pairs(None, pairs=['BTC-MEME', 'BTC-CFI'], ticker_interval=5) is True
assert os.path.isfile(file1_1) is False
assert os.path.isfile(file1_5) is True
assert os.path.isfile(file2_1) is False
assert os.path.isfile(file2_5) is True
# clean files freshly downloaded
_clean_test_file(file1_5)
_clean_test_file(file2_5) _clean_test_file(file2_5)
@ -156,7 +165,7 @@ def test_download_pairs_exception(default_conf, ticker_history, mocker, caplog):
_backup_file(file1_1) _backup_file(file1_1)
_backup_file(file1_5) _backup_file(file1_5)
download_pairs(None, pairs=['BTC-MEME']) download_pairs(None, pairs=['BTC-MEME'], ticker_interval=1)
# clean files freshly downloaded # clean files freshly downloaded
_clean_test_file(file1_1) _clean_test_file(file1_1)
_clean_test_file(file1_5) _clean_test_file(file1_5)