From 79f7f82c590c39849ef1994eb6318df538a751ee Mon Sep 17 00:00:00 2001 From: froggleston Date: Sun, 16 Jul 2023 16:52:06 +0100 Subject: [PATCH] Fix telegram output --- freqtrade/rpc/rpc.py | 1 + freqtrade/rpc/telegram.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index 92760bf06..c778025ac 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -628,6 +628,7 @@ class RPC: def __calc_expectancy( self, mean_winning_profit: float, mean_losing_profit: float, winrate: float, loserate: float) -> Tuple[float, float]: + expectancy = 1.0 if mean_winning_profit > 0 and abs(mean_losing_profit) > 0: expectancy = ( diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index 33db5a76d..9b3cc4714 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -852,6 +852,7 @@ class Telegram(RPCHandler): winrate = stats['winrate'] expectancy = stats['expectancy'] expectancy_rate = stats['expectancy_rate'] + if stats['trade_count'] == 0: markdown_msg = f"No trades yet.\n*Bot started:* `{stats['bot_start_date']}`" else: @@ -876,9 +877,9 @@ class Telegram(RPCHandler): f"*{'First Trade opened' if not timescale else 'Showing Profit since'}:* " f"`{first_trade_date}`\n" f"*Latest Trade opened:* `{latest_trade_date}`\n" - f"*Win / Loss:* `{stats['winning_trades']} / {stats['losing_trades']}\n" - f"*Winrate:* `({winrate:.2f}%)`\n" - f"*Expectancy (Rate):* `{expectancy:.2f} ({expectancy_rate:.2f})`\n" + f"*Win / Loss:* `{stats['winning_trades']} / {stats['losing_trades']}`\n" + f"*Winrate:* `{winrate:.2f}%`\n" + f"*Expectancy (Rate):* `{expectancy:.2f} ({expectancy_rate:.2f})`" ) if stats['closed_trade_count'] > 0: markdown_msg += (