mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve exchange formatting

Browse Source
This commit is contained in:
Matthias
2023-08-11 07:30:07 +02:00
parent 35e2e58a5c
commit f9ce0bb9ab
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/exchange/exchange.py
+8 -3
View File
@@ -271,8 +271,11 @@ class Exchange:
): ):
logger.debug("Closing async ccxt session.") logger.debug("Closing async ccxt session.")
self.loop.run_until_complete(self._api_async.close()) self.loop.run_until_complete(self._api_async.close())
if (self._ws_async and inspect.iscoroutinefunction(self._ws_async.close) if (
and self._ws_async.session): self._ws_async
and inspect.iscoroutinefunction(self._ws_async.close)
and self._ws_async.session
):
logger.debug("Closing ws ccxt session.") logger.debug("Closing ws ccxt session.")
self.loop.run_until_complete(self._ws_async.close()) self.loop.run_until_complete(self._ws_async.close())
@@ -313,6 +316,7 @@ class Exchange:
if not is_exchange_known_ccxt(name, ccxt_module): if not is_exchange_known_ccxt(name, ccxt_module):
# Fall back to async if pro doesn't support this exchange # Fall back to async if pro doesn't support this exchange
import ccxt.async_support as ccxt_async import ccxt.async_support as ccxt_async
ccxt_module = ccxt_async ccxt_module = ccxt_async
if not is_exchange_known_ccxt(name, ccxt_module): if not is_exchange_known_ccxt(name, ccxt_module):
@@ -2248,6 +2252,7 @@ class Exchange:
if self._has_watch_ohlcv and self._exchange_ws: if self._has_watch_ohlcv and self._exchange_ws:
# Subscribe to websocket # Subscribe to websocket
self._exchange_ws.schedule_ohlcv(pair, timeframe, candle_type) self._exchange_ws.schedule_ohlcv(pair, timeframe, candle_type)
if cache and (pair, timeframe, candle_type) in self._klines: if cache and (pair, timeframe, candle_type) in self._klines:
candle_limit = self.ohlcv_candle_limit(timeframe, candle_type) candle_limit = self.ohlcv_candle_limit(timeframe, candle_type)
min_date = int(date_minus_candles(timeframe, candle_limit - 5).timestamp()) min_date = int(date_minus_candles(timeframe, candle_limit - 5).timestamp())
@@ -2259,7 +2264,7 @@ class Exchange:
x = self._exchange_ws.klines_last_refresh.get((pair, timeframe, candle_type), 0) x = self._exchange_ws.klines_last_refresh.get((pair, timeframe, candle_type), 0)
logger.info(f"{pair}, {candle_date < x}, {candle_date}, {x}") logger.info(f"{pair}, {candle_date < x}, {candle_date}, {x}")
if candles and candles[-1][0] > min_date and candle_date < x: if candles and candles[-1][0] > min_date and candle_date < x:
# Usable result ... # Usable result, update happened after prior candle end date
logger.info(f"reuse watch result for {pair}, {timeframe}, {x}") logger.info(f"reuse watch result for {pair}, {timeframe}, {x}")
return self._exchange_ws.get_ohlcv(pair, timeframe, candle_type, candle_date) return self._exchange_ws.get_ohlcv(pair, timeframe, candle_type, candle_date)
tests/exchange_online/test_ccxt_ws_compat.py
-1
View File
@@ -53,4 +53,3 @@ class TestCCXTExchangeWs:
assert log_has_re(r"watch result.*", caplog) assert log_has_re(r"watch result.*", caplog)