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

refactor: extract replace_order handling

Browse Source
This commit is contained in:
Matthias
2025-03-20 20:35:17 +01:00
parent 7735ea91bb
commit 02b0f0abd6
1 changed files with 61 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/freqtradebot.py
+61 -39
View File
@@ -789,6 +789,7 @@ class FreqtradeBot(LoggingMixin):
return return
else: else:
logger.debug("Max adjustment entries is set to unlimited.") logger.debug("Max adjustment entries is set to unlimited.")
self.execute_entry( self.execute_entry(
trade.pair, trade.pair,
stake_amount, stake_amount,
@@ -1711,47 +1712,68 @@ class FreqtradeBot(LoggingMixin):
cancel_reason = constants.CANCEL_REASON["USER_CANCEL"] cancel_reason = constants.CANCEL_REASON["USER_CANCEL"]
if order_obj.safe_placement_price != adjusted_price: if order_obj.safe_placement_price != adjusted_price:
# cancel existing order if new price is supplied or None self.handle_replace_order(
res = self.handle_cancel_order( order,
order, order_obj, trade, cancel_reason, replacing=replacing order_obj,
trade,
adjusted_price,
is_entry,
cancel_reason,
replacing=replacing,
) )
if not res:
self.replace_order_failed( def handle_replace_order(
trade, f"Could not fully cancel order for {trade}, therefore not replacing." self,
order: CcxtOrder | None,
order_obj: Order,
trade: Trade,
new_order_price: float | None,
is_entry: bool,
cancel_reason: str,
replacing: bool = False,
) -> None:
"""
Cancel existing order if new price is supplied, and if the cancel is successful,
places a new order with the remaining capital.
"""
if not order:
order = self.exchange.fetch_order(order_obj.order_id, trade.pair)
res = self.handle_cancel_order(order, order_obj, trade, cancel_reason, replacing=replacing)
if not res:
self.replace_order_failed(
trade, f"Could not fully cancel order for {trade}, therefore not replacing."
)
return
if new_order_price:
# place new order only if new price is supplied
try:
if is_entry:
succeeded = self.execute_entry(
pair=trade.pair,
stake_amount=(
order_obj.safe_remaining * order_obj.safe_price / trade.leverage
),
price=new_order_price,
trade=trade,
is_short=trade.is_short,
mode="replace",
) )
return else:
if adjusted_price: succeeded = self.execute_trade_exit(
# place new order only if new price is supplied trade,
try: new_order_price,
if is_entry: exit_check=ExitCheckTuple(
succeeded = self.execute_entry( exit_type=ExitType.CUSTOM_EXIT,
pair=trade.pair, exit_reason=order_obj.ft_order_tag or "order_replaced",
stake_amount=( ),
order_obj.safe_remaining * order_obj.safe_price / trade.leverage ordertype="limit",
), sub_trade_amt=order_obj.safe_remaining,
price=adjusted_price, )
trade=trade, if not succeeded:
is_short=trade.is_short, self.replace_order_failed(trade, f"Could not replace order for {trade}.")
mode="replace", except DependencyException as exception:
) logger.warning(f"Unable to replace order for {trade.pair}: {exception}")
else: self.replace_order_failed(trade, f"Could not replace order for {trade}.")
succeeded = self.execute_trade_exit(
trade,
adjusted_price,
exit_check=ExitCheckTuple(
exit_type=ExitType.CUSTOM_EXIT,
exit_reason=order_obj.ft_order_tag or "order_replaced",
),
ordertype="limit",
sub_trade_amt=order_obj.safe_remaining,
)
if not succeeded:
self.replace_order_failed(
trade, f"Could not replace order for {trade}."
)
except DependencyException as exception:
logger.warning(f"Unable to replace order for {trade.pair}: {exception}")
self.replace_order_failed(trade, f"Could not replace order for {trade}.")
def cancel_open_orders_of_trade( def cancel_open_orders_of_trade(
self, trade: Trade, sides: list[str], reason: str, replacing: bool = False self, trade: Trade, sides: list[str], reason: str, replacing: bool = False