翻倍出场监控中按钮改为取消;中控目标监控列显示倍数如1倍。
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -121,20 +121,40 @@ def _resolve_options_source(conn, inst_id: str) -> tuple[str, str, int | None]:
|
||||
return default
|
||||
|
||||
|
||||
def _format_profit_exit_mult(mult: Any) -> str:
|
||||
try:
|
||||
n = float(mult)
|
||||
except (TypeError, ValueError):
|
||||
return "1倍"
|
||||
if n <= 0:
|
||||
return "1倍"
|
||||
if abs(n - round(n)) < 1e-9:
|
||||
return f"{int(round(n))}倍"
|
||||
return f"{n:g}倍"
|
||||
|
||||
|
||||
def _format_options_target(p: dict[str, Any]) -> str:
|
||||
hedge = p.get("hedge_plan_target") if isinstance(p.get("hedge_plan_target"), dict) else None
|
||||
opt_type = str(p.get("opt_type") or p.get("optType") or "").upper()
|
||||
if hedge:
|
||||
rr = _safe_float(hedge.get("profit_rr"))
|
||||
pid = hedge.get("plan_id")
|
||||
if rr is not None and rr > 0:
|
||||
return f"对冲#{pid} 盈亏比 {rr:g}" if pid is not None else f"盈亏比 {rr:g}"
|
||||
ot = str(hedge.get("opt_type") or opt_type).upper()
|
||||
side = "Put ≤" if ot == "P" else "Call ≥"
|
||||
tgt = _safe_float(hedge.get("target_index"))
|
||||
pid = hedge.get("plan_id")
|
||||
if tgt is not None:
|
||||
return f"对冲#{pid} {side} {tgt:g}" if pid is not None else f"{side} {tgt:g}"
|
||||
parts: list[str] = []
|
||||
tgt = _safe_float(p.get("target_index"))
|
||||
if tgt is not None and tgt > 0:
|
||||
side = "Put ≤" if opt_type == "P" else "Call ≥"
|
||||
return f"{side} {tgt:g}"
|
||||
parts.append(f"{side} {tgt:g}")
|
||||
if p.get("profit_exit_enabled"):
|
||||
parts.append(_format_profit_exit_mult(p.get("profit_exit_mult")))
|
||||
if parts:
|
||||
return " · ".join(parts)
|
||||
return "—"
|
||||
|
||||
|
||||
@@ -350,11 +370,39 @@ def collect_options_items(
|
||||
raw = fetch_options_positions() or []
|
||||
except Exception:
|
||||
return []
|
||||
pe_map: dict[str, dict[str, Any]] = {}
|
||||
tgt_map: dict[str, dict[str, Any]] = {}
|
||||
hedge_map: dict[str, dict[str, Any]] = {}
|
||||
if conn is not None:
|
||||
try:
|
||||
from lib.options.options_profit_exit_lib import profit_exit_by_inst
|
||||
from lib.options.options_target_lib import targets_by_inst
|
||||
from lib.hedge_plan.hedge_plan_db import active_options_targets_by_inst
|
||||
|
||||
pe_map = profit_exit_by_inst(conn)
|
||||
tgt_map = targets_by_inst(conn)
|
||||
hedge_map = active_options_targets_by_inst(conn)
|
||||
except Exception:
|
||||
pe_map, tgt_map, hedge_map = {}, {}, {}
|
||||
out: list[dict[str, Any]] = []
|
||||
for p in raw:
|
||||
if not isinstance(p, dict):
|
||||
continue
|
||||
out.append(_format_options_item(p, conn=conn))
|
||||
row = dict(p)
|
||||
inst = str(row.get("inst_id") or row.get("instId") or "").strip()
|
||||
mon = tgt_map.get(inst)
|
||||
if mon:
|
||||
row["target_index"] = mon.get("target_index")
|
||||
pe = pe_map.get(inst)
|
||||
if pe:
|
||||
row["profit_exit_enabled"] = pe.get("profit_exit_enabled")
|
||||
row["profit_exit_mult"] = pe.get("profit_exit_mult")
|
||||
hedge = hedge_map.get(inst)
|
||||
if hedge:
|
||||
row["hedge_plan_target"] = hedge
|
||||
if not mon:
|
||||
row["target_index"] = hedge.get("target_index")
|
||||
out.append(_format_options_item(row, conn=conn))
|
||||
return out
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user