dekun/qihuo
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix positions page hang from blocking CTP IPC and SSE lock wait.

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
dekun
2026-07-01 13:33:59 +08:00
parent 5aba31f530
commit 7748a88219
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install_trading.py
+27 -13
View File
@@ -859,10 +859,17 @@ def install_trading(app, *, login_required, require_nav, get_db, get_setting, se
"""关闭无对应 CTP 持仓的监控，并撤销残留止盈止损挂单。"""
return reconcile_monitors_without_position(conn, mode)
def _effective_active_position_count(conn, mode: str) -> int:
def _effective_active_position_count(
conn,
mode: str,
*,
ctp_connected: Optional[bool] = None,
) -> int:
"""风控持仓数以柜台/快照实际持仓优先，本地监控作兜底。"""
monitor_count = count_active_trade_monitors(conn)
if not ctp_status(mode).get("connected"):
if ctp_connected is None:
ctp_connected = bool(_cached_ctp_status(mode).get("connected"))
if not ctp_connected:
return monitor_count
keys: set[tuple[str, str]] = set()
for p in _positions_for_monitor_restore(mode, allow_ctp=False):
@@ -2179,15 +2186,10 @@ def install_trading(app, *, login_required, require_nav, get_db, get_setting, se
conn.close()
if fast:
if _live_refresh_lock.acquire(blocking=False):
try:
return _build()
finally:
_live_refresh_lock.release()
snap = position_hub.get_snapshot()
if snap:
return snap
if _live_refresh_lock.acquire(timeout=2.0):
if _live_refresh_lock.acquire(blocking=False):
try:
return _build()
finally:
@@ -2415,15 +2417,22 @@ def install_trading(app, *, login_required, require_nav, get_db, get_setting, se
try:
init_strategy_tables(conn)
mode = get_trading_mode(get_setting)
ctp_st = ctp_status(mode)
ctp_st = _cached_ctp_status(mode)
connected = bool(ctp_st.get("connected"))
capital = _capital(conn)
recommend_capital = _recommend_capital(conn)
risk = get_risk_status(
conn,
active_count=_effective_active_position_count(conn, mode),
active_count=_effective_active_position_count(
conn, mode, ctp_connected=connected,
),
equity=capital,
)
ctp_acc = _ctp_account(mode) if ctp_st.get("connected") else {}
ctp_acc = {}
bootstrap_live = position_hub.get_snapshot()
if connected and bootstrap_live and bootstrap_live.get("capital") is not None:
cap = float(bootstrap_live.get("capital") or 0)
ctp_acc = {"balance": cap, "available": cap}
active_trend = conn.execute(
"SELECT * FROM trend_pullback_plans WHERE status='active' ORDER BY id DESC LIMIT 1"
).fetchone()
@@ -2441,7 +2450,6 @@ def install_trading(app, *, login_required, require_nav, get_db, get_setting, se
_schedule_recommend_refresh()
ctp_connected = is_ctp_connected(get_setting)
margin_rec = small_account_margin_recommendations()
bootstrap_live = position_hub.get_snapshot()
if not bootstrap_live:
bootstrap_live = {
"ok": True,
@@ -2528,9 +2536,15 @@ def install_trading(app, *, login_required, require_nav, get_db, get_setting, se
if snap:
yield sse_format("positions", snap)
else:
payload = _refresh_trading_live_snapshot(fast=True)
conn = get_db()
try:
init_strategy_tables(conn)
payload = _minimal_live_payload(conn)
finally:
conn.close()
position_hub.set_snapshot(payload)
yield sse_format("positions", payload)
_push_position_snapshot_async(fast=True)
while True:
try:
msg = q.get(timeout=25)