mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: improved response on delete order

Browse Source
This commit is contained in:
Matthias
2025-07-07 19:20:48 +02:00
parent 60029c2a8b
commit e90c60c940
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/rpc/rpc.py
+5 -2
View File
@@ -1115,13 +1115,16 @@ class RPC:
c_count += 1 c_count += 1
except ExchangeError: except ExchangeError:
pass pass
trade_pair = trade.pair
trade.delete() trade.delete()
self._freqtrade.wallets.update() self._freqtrade.wallets.update()
return { return {
"result": "success", "result": "success",
"trade_id": trade_id, "trade_id": trade_id,
"result_msg": f"Deleted trade {trade_id}. Closed {c_count} open orders.", "result_msg": (
f"Deleted trade #{trade_id} for pair {trade_pair}. "
f"Closed {c_count} open orders."
),
"cancel_order_count": c_count, "cancel_order_count": c_count,
} }
freqtrade/rpc/telegram.py
+1 -1
View File
@@ -1484,7 +1484,7 @@ class Telegram(RPCHandler):
trade_id = int(context.args[0]) trade_id = int(context.args[0])
msg = self._rpc._rpc_delete(trade_id) msg = self._rpc._rpc_delete(trade_id)
await self._send_msg( await self._send_msg(
f"`{msg['result_msg']}`\n" f"{msg['result_msg']}\n"
"Please make sure to take care of this asset on the exchange manually." "Please make sure to take care of this asset on the exchange manually."
) )
tests/rpc/test_rpc_apiserver.py
+2 -2
View File
@@ -1048,7 +1048,7 @@ def test_api_delete_trade(botclient, mocker, fee, markets, is_short):
rc = client_delete(client, f"{BASE_URI}/trades/1") rc = client_delete(client, f"{BASE_URI}/trades/1")
assert_response(rc) assert_response(rc)
assert rc.json()["result_msg"] == "Deleted trade 1. Closed 1 open orders." assert rc.json()["result_msg"] == "Deleted trade #1 for pair ETH/BTC. Closed 1 open orders."
assert len(trades) - 1 == len(Trade.session.scalars(select(Trade)).all()) assert len(trades) - 1 == len(Trade.session.scalars(select(Trade)).all())
assert cancel_mock.call_count == 1 assert cancel_mock.call_count == 1
@@ -1061,7 +1061,7 @@ def test_api_delete_trade(botclient, mocker, fee, markets, is_short):
assert len(trades) - 1 == len(Trade.session.scalars(select(Trade)).all()) assert len(trades) - 1 == len(Trade.session.scalars(select(Trade)).all())
rc = client_delete(client, f"{BASE_URI}/trades/5") rc = client_delete(client, f"{BASE_URI}/trades/5")
assert_response(rc) assert_response(rc)
assert rc.json()["result_msg"] == "Deleted trade 5. Closed 1 open orders." assert rc.json()["result_msg"] == "Deleted trade #5 for pair XRP/BTC. Closed 1 open orders."
assert len(trades) - 2 == len(Trade.session.scalars(select(Trade)).all()) assert len(trades) - 2 == len(Trade.session.scalars(select(Trade)).all())
assert stoploss_mock.call_count == 1 assert stoploss_mock.call_count == 1
tests/rpc/test_rpc_telegram.py
+1 -1
View File
@@ -2001,7 +2001,7 @@ async def test_telegram_delete_trade(mocker, update, default_conf, fee, is_short
context.args = [1] context.args = [1]
await telegram._delete_trade(update=update, context=context) await telegram._delete_trade(update=update, context=context)
assert msg_mock.call_count == 1 assert msg_mock.call_count == 1
assert "Deleted trade 1." in msg_mock.call_args_list[0][0][0] assert "Deleted trade #1" in msg_mock.call_args_list[0][0][0]
assert "Please make sure to take care of this asset" in msg_mock.call_args_list[0][0][0] assert "Please make sure to take care of this asset" in msg_mock.call_args_list[0][0][0]