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

Add total_profit_ratio to telegram output

Browse Source 
part of #8234
This commit is contained in:
Matthias 2023-03-05 19:35:06 +01:00
parent fff08f737f
commit 9d285e3dc0
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freqtrade/rpc/rpc.py
View File

@ -192,6 +192,11 @@ class RPC:
current_profit = trade.close_profit or 0.0 current_profit = trade.close_profit or 0.0
current_profit_abs = trade.close_profit_abs or 0.0 current_profit_abs = trade.close_profit_abs or 0.0
total_profit_abs = trade.realized_profit + current_profit_abs total_profit_abs = trade.realized_profit + current_profit_abs
total_profit_ratio = 0.0
if trade.max_stake_amount:
total_profit_ratio = (
(total_profit_abs / trade.max_stake_amount) * trade.leverage
)
# Calculate fiat profit # Calculate fiat profit
if not isnan(current_profit_abs) and self._fiat_converter: if not isnan(current_profit_abs) and self._fiat_converter:
@ -224,6 +229,7 @@ class RPC:
total_profit_abs=total_profit_abs, total_profit_abs=total_profit_abs,
total_profit_fiat=total_profit_fiat, total_profit_fiat=total_profit_fiat,
total_profit_ratio=total_profit_ratio,
stoploss_current_dist=stoploss_current_dist, stoploss_current_dist=stoploss_current_dist,
stoploss_current_dist_ratio=round(stoploss_current_dist_ratio, 8), stoploss_current_dist_ratio=round(stoploss_current_dist_ratio, 8),
stoploss_current_dist_pct=round(stoploss_current_dist_ratio * 100, 2), stoploss_current_dist_pct=round(stoploss_current_dist_ratio * 100, 2),

7
freqtrade/rpc/telegram.py
View File

@ -606,9 +606,10 @@ class Telegram(RPCHandler):
if r['is_open']: if r['is_open']:
if r.get('realized_profit'): if r.get('realized_profit'):
lines.append( lines.extend([
"*Realized Profit:* `{realized_profit_ratio:.2%} ({realized_profit_r})`") "*Realized Profit:* `{realized_profit_ratio:.2%} ({realized_profit_r})`"
lines.append("*Total Profit:* `{total_profit_abs_r}` ") "*Total Profit:* `{total_profit_ratio:.2%} ({total_profit_abs_r})`"
])
# Append empty line to improve readability # Append empty line to improve readability
lines.append(" ") lines.append(" ")

2
tests/rpc/test_rpc.py
View File

@ -79,6 +79,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
'realized_profit_ratio': None, 'realized_profit_ratio': None,
'total_profit_abs': -4.09e-06, 'total_profit_abs': -4.09e-06,
'total_profit_fiat': ANY, 'total_profit_fiat': ANY,
'total_profit_ratio': ANY,
'exchange': 'binance', 'exchange': 'binance',
'leverage': 1.0, 'leverage': 1.0,
'interest_rate': 0.0, 'interest_rate': 0.0,
@ -185,6 +186,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
'profit_pct': ANY, 'profit_pct': ANY,
'profit_abs': ANY, 'profit_abs': ANY,
'total_profit_abs': ANY, 'total_profit_abs': ANY,
'total_profit_ratio': ANY,
'current_rate': ANY, 'current_rate': ANY,
}) })
assert results[0] == response_norate assert results[0] == response_norate