diff --git a/freqtrade/persistence/trade_model.py b/freqtrade/persistence/trade_model.py index dfac9e36f..241ef70f5 100644 --- a/freqtrade/persistence/trade_model.py +++ b/freqtrade/persistence/trade_model.py @@ -1780,7 +1780,7 @@ class Trade(ModelBase, LocalTrade): .order_by(desc('profit_sum_abs')) ).all() - return_list: List[Dict] = [] + resp: List[Dict] = [] for id, enter_tag, exit_reason, profit, profit_abs, count in mix_tag_perf: enter_tag = enter_tag if enter_tag is not None else "Other" exit_reason = exit_reason if exit_reason is not None else "Other" @@ -1788,24 +1788,25 @@ class Trade(ModelBase, LocalTrade): if (exit_reason is not None and enter_tag is not None): mix_tag = enter_tag + " " + exit_reason i = 0 - if not any(item["mix_tag"] == mix_tag for item in return_list): - return_list.append({'mix_tag': mix_tag, - 'profit_ratio': profit, - 'profit_pct': round(profit * 100, 2), - 'profit_abs': profit_abs, - 'count': count}) + if not any(item["mix_tag"] == mix_tag for item in resp): + resp.append({'mix_tag': mix_tag, + 'profit_ratio': profit, + 'profit_pct': round(profit * 100, 2), + 'profit_abs': profit_abs, + 'count': count}) else: - while i < len(return_list): - if return_list[i]["mix_tag"] == mix_tag: - return_list[i] = { + while i < len(resp): + if resp[i]["mix_tag"] == mix_tag: + resp[i] = { 'mix_tag': mix_tag, - 'profit_ratio': profit + return_list[i]["profit"], - 'profit_pct': round(profit + return_list[i]["profit"] * 100, 2), - 'profit_abs': profit_abs + return_list[i]["profit_abs"], - 'count': 1 + return_list[i]["count"]} + 'profit_ratio': profit + resp[i]["profit_ratio"], + 'profit_pct': round(profit + resp[i]["profit_ratio"] * 100, 2), + 'profit_abs': profit_abs + resp[i]["profit_abs"], + 'count': 1 + resp[i]["count"] + } i += 1 - return return_list + return resp @staticmethod def get_best_pair(start_date: datetime = datetime.fromtimestamp(0)):