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

Evict cache if we didn't get new candles for X hours

Browse Source
This commit is contained in:
Matthias 2022-10-06 06:41:56 +02:00
parent f475c6c305
commit 92a1d58df8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
freqtrade/exchange/exchange.py
View File

@ -1854,8 +1854,12 @@ class Exchange:
since_ms: Optional[int], cache: bool) -> Coroutine: since_ms: Optional[int], cache: bool) -> Coroutine:
not_all_data = self.required_candle_call_count > 1 not_all_data = self.required_candle_call_count > 1
if cache and (pair, timeframe, candle_type) in self._klines: if cache and (pair, timeframe, candle_type) in self._klines:
# Not in cache - force multi-calls candle_limit = self.ohlcv_candle_limit(timeframe, candle_type)
not_all_data = False min_date = date_minus_candles(timeframe, candle_limit - 5).timestamp()
# Check if 1 call can get us updated candles without hole in the data.
if min_date < self._pairs_last_refresh_time.get((pair, timeframe, candle_type), 0):
# Cache can be used - do one-off call.
not_all_data = False
if (not since_ms if (not since_ms
and (self._ft_has["ohlcv_require_since"] or not_all_data)): and (self._ft_has["ohlcv_require_since"] or not_all_data)):

4
tests/exchange/test_exchange.py
View File

@ -2145,13 +2145,13 @@ def test_refresh_latest_ohlcv(mocker, default_conf, caplog, candle_type) -> None
f"{pairs[0][1]}, {candle_type} ...", f"{pairs[0][1]}, {candle_type} ...",
caplog) caplog)
caplog.clear() caplog.clear()
# Reset refresh times - must do 1 call per pair (even though required_calls is 2) # Reset refresh times - must do 2 call per pair as cache is expired
exchange._pairs_last_refresh_time = {} exchange._pairs_last_refresh_time = {}
res = exchange.refresh_latest_ohlcv( res = exchange.refresh_latest_ohlcv(
[('IOTA/ETH', '5m', candle_type), ('XRP/ETH', '5m', candle_type)]) [('IOTA/ETH', '5m', candle_type), ('XRP/ETH', '5m', candle_type)])
assert len(res) == len(pairs) assert len(res) == len(pairs)
assert exchange._api_async.fetch_ohlcv.call_count == 2 assert exchange._api_async.fetch_ohlcv.call_count == 4
# cache - but disabled caching # cache - but disabled caching
exchange._api_async.fetch_ohlcv.reset_mock() exchange._api_async.fetch_ohlcv.reset_mock()