fix: sync live TP/SL to position cards after entrust changes
Use exchange TP/SL for display and DB sync on price_snapshot polls, refresh instance UI cells on each tick, and merge live values into hub monitor board. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -66,6 +66,7 @@ from order_monitor_display_lib import (
|
||||
apply_order_live_price_display,
|
||||
apply_order_price_display_fields,
|
||||
enrich_order_display_fields,
|
||||
order_monitor_tpsl_needs_sync,
|
||||
stop_is_profit_protecting,
|
||||
tpsl_slot_trigger_price,
|
||||
tpsl_update_passes_rr_gate,
|
||||
@@ -5699,45 +5700,30 @@ def api_price_snapshot():
|
||||
except Exception:
|
||||
exchange_tpsl = {"sl": None, "tp": None}
|
||||
payload["exchange_tpsl"] = exchange_tpsl
|
||||
live_sl = tpsl_slot_trigger_price(exchange_tpsl.get("sl"))
|
||||
live_tp = tpsl_slot_trigger_price(exchange_tpsl.get("tp"))
|
||||
disp_sl = live_sl if live_sl is not None else r["stop_loss"]
|
||||
disp_tp = live_tp if live_tp is not None else r["take_profit"]
|
||||
sym = r["symbol"]
|
||||
payload["stop_loss_raw"] = disp_sl
|
||||
payload["take_profit_raw"] = disp_tp
|
||||
payload["stop_loss_display"] = (
|
||||
format_price_for_symbol(sym, disp_sl) if disp_sl not in (None, "") else "—"
|
||||
)
|
||||
payload["take_profit_display"] = (
|
||||
format_price_for_symbol(sym, disp_tp) if disp_tp not in (None, "") else "—"
|
||||
)
|
||||
apply_order_price_display_fields(
|
||||
payload,
|
||||
direction=r["direction"],
|
||||
entry_price=entry,
|
||||
initial_stop_loss=r["initial_stop_loss"],
|
||||
stop_loss=disp_sl,
|
||||
take_profit=disp_tp,
|
||||
stop_loss=r["stop_loss"],
|
||||
take_profit=r["take_profit"],
|
||||
calc_rr_ratio_fn=calc_rr_ratio,
|
||||
exchange_tpsl=exchange_tpsl,
|
||||
format_price_fn=format_price_for_symbol,
|
||||
symbol=r["symbol"],
|
||||
)
|
||||
order_prices.append(payload)
|
||||
if live_sl is not None or live_tp is not None:
|
||||
new_sl, new_tp, changed = order_monitor_tpsl_needs_sync(
|
||||
r["stop_loss"], r["take_profit"], exchange_tpsl
|
||||
)
|
||||
if changed:
|
||||
try:
|
||||
cur_sl = float(r["stop_loss"] or 0)
|
||||
cur_tp = float(r["take_profit"] or 0)
|
||||
except (TypeError, ValueError):
|
||||
cur_sl, cur_tp = 0.0, 0.0
|
||||
new_sl = live_sl if live_sl is not None else cur_sl
|
||||
new_tp = live_tp if live_tp is not None else cur_tp
|
||||
if (live_sl is not None and abs(new_sl - cur_sl) > 1e-12) or (
|
||||
live_tp is not None and abs(new_tp - cur_tp) > 1e-12
|
||||
):
|
||||
conn.execute(
|
||||
"UPDATE order_monitors SET stop_loss=?, take_profit=? WHERE id=?",
|
||||
(new_sl, new_tp, int(r["id"])),
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
order_prices.append(payload)
|
||||
|
||||
try:
|
||||
conn.commit()
|
||||
|
||||
Reference in New Issue
Block a user