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

reduce duplicate code, fix cache check

Browse Source
This commit is contained in:
Bloodhunter4rc 2022-12-18 23:37:18 +01:00
parent bb33b96ba7
commit 6380c3d462
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
freqtrade/plugins/pairlist/RemotePairList.py
View File

@ -63,6 +63,29 @@ class RemotePairList(IPairList):
""" """
return f"{self.name} - {self._pairlistconfig['number_assets']} pairs from RemotePairlist." return f"{self.name} - {self._pairlistconfig['number_assets']} pairs from RemotePairlist."
def process_json(self, jsonparse) -> Tuple[List[str], str]:
pairlist = jsonparse.get('pairs', [])
remote_info = jsonparse.get('info', '')[:256].strip()
remote_refresh_period = jsonparse.get('refresh_period', self._refresh_period)
info = "".join(char if char.isalnum() or
char in " +-.,%:" else "-" for char in remote_info)
if not self._init_done:
if self._refresh_period < remote_refresh_period:
self.log_once(f'Refresh Period has been increased from {self._refresh_period}'
f' to {remote_refresh_period} from Remote.', logger.info)
self._refresh_period = remote_refresh_period
self._pair_cache = TTLCache(maxsize=1, ttl=self._refresh_period)
else:
self._pair_cache = TTLCache(maxsize=1, ttl=self._refresh_period)
self._init_done = True
return pairlist, info
def return_last_pairlist(self) -> List[str]: def return_last_pairlist(self) -> List[str]:
if self._keep_pairlist_on_failure: if self._keep_pairlist_on_failure:
pairlist = self._last_pairlist pairlist = self._last_pairlist
@ -91,27 +114,12 @@ class RemotePairList(IPairList):
if "application/json" in str(content_type): if "application/json" in str(content_type):
jsonparse = response.json() jsonparse = response.json()
pairlist = jsonparse.get('pairs', []) pairlist, info = self.process_json(jsonparse)
remote_info = jsonparse.get('info', '')[:256].strip()
remote_refresh_period = jsonparse.get('refresh_period', self._refresh_period)
info = "".join(char if char.isalnum() or
char in " +-.,%:" else "-" for char in remote_info)
if not self._init_done and self._refresh_period < remote_refresh_period:
self.log_once(f'Refresh Period has been increased from {self._refresh_period}'
f' to {remote_refresh_period} from Remote.', logger.info)
self._refresh_period = remote_refresh_period
self._pair_cache = TTLCache(maxsize=1, ttl=self._refresh_period)
self._init_done = True
else: else:
if self._init_done: if self._init_done:
self.log_once(f'Error: RemotePairList is not of type JSON: ' self.log_once(f'Error: RemotePairList is not of type JSON: '
f' {self._pairlist_url}', logger.info) f' {self._pairlist_url}', logger.info)
pairlist = self.return_last_pairlist() pairlist = self.return_last_pairlist()
else: else:
raise OperationalException('RemotePairList is not of type JSON abort ') raise OperationalException('RemotePairList is not of type JSON abort ')
@ -132,7 +140,7 @@ class RemotePairList(IPairList):
:return: List of pairs :return: List of pairs
""" """
if self._init_done and self._pair_cache: if self._init_done and self._pair_cache is not None:
pairlist = self._pair_cache.get('pairlist') pairlist = self._pair_cache.get('pairlist')
else: else:
pairlist = [] pairlist = []
@ -142,7 +150,6 @@ class RemotePairList(IPairList):
if pairlist: if pairlist:
# Item found - no refresh necessary # Item found - no refresh necessary
return pairlist.copy() return pairlist.copy()
self._init_done = True
else: else:
if self._pairlist_url.startswith("file:///"): if self._pairlist_url.startswith("file:///"):
filename = self._pairlist_url.split("file:///", 1)[1] filename = self._pairlist_url.split("file:///", 1)[1]
@ -152,14 +159,7 @@ class RemotePairList(IPairList):
with open(filename) as json_file: with open(filename) as json_file:
# Load the JSON data into a dictionary # Load the JSON data into a dictionary
jsonparse = json.load(json_file) jsonparse = json.load(json_file)
pairlist = jsonparse['pairs'] pairlist, info = self.process_json(jsonparse)
info = jsonparse.get('info', '')
if not self._init_done:
self._refresh_period = jsonparse.get('refresh_period',
self._refresh_period)
self._pair_cache = TTLCache(maxsize=1, ttl=self._refresh_period)
self._init_done = True
else: else:
raise ValueError(f"{self._pairlist_url} does not exist.") raise ValueError(f"{self._pairlist_url} does not exist.")
else: else:
@ -171,7 +171,7 @@ class RemotePairList(IPairList):
pairlist = self._whitelist_for_active_markets(pairlist) pairlist = self._whitelist_for_active_markets(pairlist)
pairlist = pairlist[:self._number_pairs] pairlist = pairlist[:self._number_pairs]
if self._pair_cache: if self._pair_cache is not None:
self._pair_cache['pairlist'] = pairlist.copy() self._pair_cache['pairlist'] = pairlist.copy()
if time_elapsed != 0.0: if time_elapsed != 0.0: