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

cached pairs iteration fixed + help added

Browse Source
This commit is contained in:
Misagh 2019-03-24 22:56:42 +01:00
parent 1dfbf6eed6
commit a8be277ca0
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
freqtrade/rpc/rpc.py
View File

@ -466,12 +466,12 @@ class RPC(object):
if not self._freqtrade.edge: if not self._freqtrade.edge:
raise RPCException(f'Edge is not enabled.') raise RPCException(f'Edge is not enabled.')
for pair in self._freqtrade.edge._cached_pairs: return [
res = { {
'pair': pair, 'Pair': pair,
'winrate': self._freqtrade.edge._cached_pairs[pair].winrate, 'Winrate': self._freqtrade.edge._cached_pairs[pair].winrate,
'expectancy': self._freqtrade.edge._cached_pairs[pair].expectancy, 'Expectancy': self._freqtrade.edge._cached_pairs[pair].expectancy,
'stoploss': self._freqtrade.edge._cached_pairs[pair].stoploss, 'Stoploss': self._freqtrade.edge._cached_pairs[pair].stoploss,
} }
for pair in self._freqtrade.edge._cached_pairs
return res ]

13
freqtrade/rpc/telegram.py
View File

@ -93,6 +93,7 @@ class Telegram(RPC):
CommandHandler('reload_conf', self._reload_conf), CommandHandler('reload_conf', self._reload_conf),
CommandHandler('stopbuy', self._stopbuy), CommandHandler('stopbuy', self._stopbuy),
CommandHandler('whitelist', self._whitelist), CommandHandler('whitelist', self._whitelist),
CommandHandler('edge', self._edge),
CommandHandler('help', self._help), CommandHandler('help', self._help),
CommandHandler('version', self._version), CommandHandler('version', self._version),
] ]
@ -478,15 +479,8 @@ class Telegram(RPC):
""" """
try: try:
edge_pairs = self._rpc_edge() edge_pairs = self._rpc_edge()
edge_pairs_tab = tabulate(edge_pairs, print(edge_pairs)
headers=[ edge_pairs_tab = tabulate(edge_pairs, headers='keys', tablefmt='simple')
'Pair',
f'Winrate',
f'Expectancy',
f'Stoploss'
],
tablefmt='simple')
message = f'<b>Edge only validated following pairs:</b>\n<pre>{edge_pairs_tab}</pre>' message = f'<b>Edge only validated following pairs:</b>\n<pre>{edge_pairs_tab}</pre>'
self._send_msg(message, bot=bot, parse_mode=ParseMode.HTML) self._send_msg(message, bot=bot, parse_mode=ParseMode.HTML)
except RPCException as e: except RPCException as e:
@ -520,6 +514,7 @@ class Telegram(RPC):
"*/stopbuy:* `Stops buying, but handles open trades gracefully` \n" \ "*/stopbuy:* `Stops buying, but handles open trades gracefully` \n" \
"*/reload_conf:* `Reload configuration file` \n" \ "*/reload_conf:* `Reload configuration file` \n" \
"*/whitelist:* `Show current whitelist` \n" \ "*/whitelist:* `Show current whitelist` \n" \
"*/edge:* `Shows validated pairs by Edge if it is enabeld` \n" \
"*/help:* `This help message`\n" \ "*/help:* `This help message`\n" \
"*/version:* `Show version`" "*/version:* `Show version`"