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

Fixed imports

Browse Source
This commit is contained in:
Mohammad Dashti 2021-09-16 13:39:09 -07:00
parent cce1226115
commit daecfe8078
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
freqtrade/exchange/exchange.py
View File

@ -1379,7 +1379,7 @@ class Exchange:
# Directory name for a pair, e.g., given `ETH/BTC` returns `ETH-BTC`. # Directory name for a pair, e.g., given `ETH/BTC` returns `ETH-BTC`.
def _pair_dir(self, pair: str) -> str: def _pair_dir(self, pair: str) -> str:
return pair.replace("/","-") return pair.replace("/", "-")
# Returns the directory path that contains the intermediate trade files for a given pair. # Returns the directory path that contains the intermediate trade files for a given pair.
def _intermediate_trades_dir_for_pair(self, datadir: str, pair: str) -> str: def _intermediate_trades_dir_for_pair(self, datadir: str, pair: str) -> str:
@ -1414,7 +1414,7 @@ class Exchange:
async def _get_interval_tree_for_pair(self, datadir: str, pair: str) -> IntervalTree: async def _get_interval_tree_for_pair(self, datadir: str, pair: str) -> IntervalTree:
cached_res = self._intermediate_data_cache.get(pair, None) cached_res = self._intermediate_data_cache.get(pair, None)
if cached_res: if cached_res:
return cached_res; return cached_res
logger.debug("Caching intervals for pair %s", pair) logger.debug("Caching intervals for pair %s", pair)
cache_interval_tree = IntervalTree() cache_interval_tree = IntervalTree()
@ -1433,8 +1433,8 @@ class Exchange:
trades_list_from_id = trades_list[0][1] trades_list_from_id = trades_list[0][1]
trades_list_to_id = trades_list[-1][1] trades_list_to_id = trades_list[-1][1]
cache_interval_tree.add(Interval( cache_interval_tree.add(Interval(
int(trades_list_from_id), #inclusive int(trades_list_from_id), # inclusive
int(trades_list_to_id), #exclusive int(trades_list_to_id), # exclusive
tmpdata_file)) tmpdata_file))
logger.debug("Cached intervals for pair %s: %s intervals", pair, len(cache_interval_tree)) logger.debug("Cached intervals for pair %s: %s intervals", pair, len(cache_interval_tree))
@ -1467,15 +1467,16 @@ class Exchange:
# fetch trades asynchronously # fetch trades asynchronously
if params: if params:
logger.debug("Fetching trades for pair %s, params: %s ", pair, params) logger.debug("Fetching trades for pair %s, params: %s ", pair, params)
trades = await self._api_async.fetch_trades(pair, params=params, limit=self.batch_size()) trades = await self._api_async.fetch_trades(
pair, params=params, limit=self.batch_size())
else: else:
logger.debug( logger.debug(
"Fetching trades for pair %s, since %s %s...", "Fetching trades for pair %s, since %s %s...",
pair, since, pair, since,
'(' + arrow.get(since // 1000).isoformat() + ') ' if since is not None else '' '(' + arrow.get(since // 1000).isoformat() + ') ' if since is not None else ''
) )
trades = await self._api_async.fetch_trades(pair, since=since, limit=self.batch_size()) trades = await self._api_async.fetch_trades(
pair, since=since, limit=self.batch_size())
trades_list = trades_dict_to_list(trades) trades_list = trades_dict_to_list(trades)
if trades_list and datadir and len(trades_list) == self.batch_size(): if trades_list and datadir and len(trades_list) == self.batch_size():
@ -1517,7 +1518,6 @@ class Exchange:
len(trades_list)) len(trades_list))
return trades_list return trades_list
# If neither `from_id` nor `to_id` are cached, we cache the trades in an # If neither `from_id` nor `to_id` are cached, we cache the trades in an
# intermediate trade file. # intermediate trade file.
tmpdata_file = self._intermediate_trades_file(datadir, pair, from_id) tmpdata_file = self._intermediate_trades_file(datadir, pair, from_id)
@ -1552,8 +1552,7 @@ class Exchange:
until: int, until: int,
since: Optional[int] = None, since: Optional[int] = None,
from_id: Optional[str] = None, from_id: Optional[str] = None,
datadir: Optional[str] = None datadir: Optional[str] = None) -> Tuple[str, List[List]]:
) -> Tuple[str, List[List]]:
""" """
Asyncronously gets trade history using fetch_trades Asyncronously gets trade history using fetch_trades
use this when exchange uses id-based iteration (check `self._trades_pagination`) use this when exchange uses id-based iteration (check `self._trades_pagination`)
@ -1617,10 +1616,9 @@ class Exchange:
return (pair, trades) return (pair, trades)
async def _async_get_trade_history_time(self, pair: str, until: int, async def _async_get_trade_history_time(
since: Optional[int] = None, self, pair: str, until: int, since: Optional[int] = None, datadir: Optional[str] = None
datadir: Optional[str] = None ) -> Tuple[str, List[List]]:
) -> Tuple[str, List[List]]:
""" """
Asyncronously gets trade history using fetch_trades, Asyncronously gets trade history using fetch_trades,
when the exchange uses time-based iteration (check `self._trades_pagination`) when the exchange uses time-based iteration (check `self._trades_pagination`)
@ -1652,8 +1650,7 @@ class Exchange:
since: Optional[int] = None, since: Optional[int] = None,
until: Optional[int] = None, until: Optional[int] = None,
from_id: Optional[str] = None, from_id: Optional[str] = None,
datadir: Optional[str] = None datadir: Optional[str] = None) -> Tuple[str, List[List]]:
) -> Tuple[str, List[List]]:
""" """
Async wrapper handling downloading trades using either time or id based methods. Async wrapper handling downloading trades using either time or id based methods.
""" """