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

Move formatting of /daily to telegram

Browse Source 
so /daily can return numbers in the API
This commit is contained in:
Matthias 2020-08-18 20:12:14 +02:00
parent ce15c55185
commit 375e671aaf
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
freqtrade/rpc/rpc.py
View File

@ -224,22 +224,20 @@ class RPC:
]).order_by(Trade.close_date).all() ]).order_by(Trade.close_date).all()
curdayprofit = sum(trade.close_profit_abs for trade in trades) curdayprofit = sum(trade.close_profit_abs for trade in trades)
profit_days[profitday] = { profit_days[profitday] = {
'amount': f'{curdayprofit:.8f}', 'amount': curdayprofit,
'trades': len(trades) 'trades': len(trades)
} }
data = [ data = [
{ {
'date': key, 'date': key,
'abs_profit': f'{float(value["amount"]):.8f}', 'abs_profit': value["amount"],
'fiat_value': '{value:.3f}'.format( 'fiat_value': self._fiat_converter.convert_amount(
value=self._fiat_converter.convert_amount(
value['amount'], value['amount'],
stake_currency, stake_currency,
fiat_display_currency fiat_display_currency
) if self._fiat_converter else 0, ) if self._fiat_converter else 0,
), 'trade_count': value["trades"],
'trade_count': f'{value["trades"]}',
} }
for key, value in profit_days.items() for key, value in profit_days.items()
] ]

4
freqtrade/rpc/telegram.py
View File

@ -305,8 +305,8 @@ class Telegram(RPC):
) )
stats_tab = tabulate( stats_tab = tabulate(
[[day['date'], [[day['date'],
f"{day['abs_profit']} {stats['stake_currency']}", f"{day['abs_profit']:.8f} {stats['stake_currency']}",
f"{day['fiat_value']} {stats['fiat_display_currency']}", f"{day['fiat_value']:.3f} {stats['fiat_display_currency']}",
f"{day['trade_count']} trades"] for day in stats['data']], f"{day['trade_count']} trades"] for day in stats['data']],
headers=[ headers=[
'Day', 'Day',