diff --git a/backend/main.py b/backend/main.py index ca49793..70932a6 100644 --- a/backend/main.py +++ b/backend/main.py @@ -464,15 +464,14 @@ async def get_signal_latest(user: dict = Depends(get_current_user), strategy: st data["factors"] = json.loads(data["factors"]) except Exception: pass - # 对 v53_btc：把 alt_score_ref 提升为顶层字段，方便前端直接读 - if strategy == "v53_btc" and isinstance(data.get("factors"), dict): + # 对 v53_btc 或 v53（BTC symbol）：把 alt_score_ref 提升为顶层字段 + if strategy.startswith("v53") and isinstance(data.get("factors"), dict): f = data["factors"] if data.get("score", 0) == 0 and f.get("alt_score_ref") is not None: data["display_score"] = f["alt_score_ref"] - data["gate_passed"] = f.get("gate_passed", True) else: data["display_score"] = data.get("score", 0) - data["gate_passed"] = f.get("gate_passed", True) + data["gate_passed"] = f.get("gate_passed", True) result[sym.replace("USDT", "")] = data return result diff --git a/frontend/app/paper-v53/page.tsx b/frontend/app/paper-v53/page.tsx index 12035f4..3969679 100644 --- a/frontend/app/paper-v53/page.tsx +++ b/frontend/app/paper-v53/page.tsx @@ -20,65 +20,39 @@ function parseFactors(raw: any) { return raw; } -type StrategyTab = "v53_alt" | "v53_btc"; +const STRATEGY = "v53"; +const ALL_COINS = ["BTCUSDT", "ETHUSDT", "XRPUSDT", "SOLUSDT"]; -const STRATEGY_LABELS: Record = { - v53_alt: { - label: "🟣 ALT轨 (v53_alt)", - desc: "ETH / XRP / SOL · 四层评分 55/25/15/5", - coins: ["ETHUSDT", "XRPUSDT", "SOLUSDT"], - badgeClass: "bg-purple-100 text-purple-700 border border-purple-200", - }, - v53_btc: { - label: "🔵 BTC轨 (v53_btc)", - desc: "BTCUSDT · Gate-Control逻辑", - coins: ["BTCUSDT"], - badgeClass: "bg-amber-100 text-amber-700 border border-amber-200", - }, -}; +// ─── 最新信号 ──────────────────────────────────────────────────── -// ─── 最新信号状态 ──────────────────────────────────────────────── - -const ALT_COINS = ["ETHUSDT", "XRPUSDT", "SOLUSDT"]; -const BTC_COINS = ["BTCUSDT"]; - -function LatestSignals({ strategy }: { strategy: StrategyTab }) { - const coins = strategy === "v53_btc" ? BTC_COINS : ALT_COINS; +function LatestSignals() { const [signals, setSignals] = useState>({}); - useEffect(() => { const f = async () => { - for (const sym of coins) { + for (const sym of ALL_COINS) { const coin = sym.replace("USDT", ""); - const strat = strategy === "v53_btc" ? "v53_btc" : "v53_alt"; try { - const r = await authFetch(`/api/signals/signal-history?symbol=${coin}&limit=1&strategy=${strat}`); - if (r.ok) { - const j = await r.json(); - if (j.data && j.data.length > 0) setSignals(prev => ({ ...prev, [sym]: j.data[0] })); - } + const r = await authFetch(`/api/signals/signal-history?symbol=${coin}&limit=1&strategy=${STRATEGY}`); + if (r.ok) { const j = await r.json(); if (j.data?.length > 0) setSignals(prev => ({ ...prev, [sym]: j.data[0] })); } } catch {} } }; - f(); - const iv = setInterval(f, 15000); - return () => clearInterval(iv); - }, [strategy, coins]); - - const meta = STRATEGY_LABELS[strategy]; + f(); const iv = setInterval(f, 15000); return () => clearInterval(iv); + }, []); return (

最新信号

- {strategy} + v53
- {coins.map(sym => { + {ALL_COINS.map(sym => { const s = signals[sym]; const coin = sym.replace("USDT", ""); const ago = s?.ts ? Math.round((Date.now() - s.ts) / 60000) : null; const fc = s?.factors; + const gatePassed = fc?.gate_passed ?? true; return (
@@ -90,45 +64,22 @@ function LatestSignals({ strategy }: { strategy: StrategyTab }) { {s.signal === "LONG" ? "🟢" : "🔴"} {s.signal} {s.score}分 - - {s.score >= 85 ? "加仓" : s.score >= 75 ? "标准" : "观望"} - - ) : ( - 暂无信号 - )} + ) : 暂无信号}
- {ago !== null && ( - {ago < 60 ? `${ago}m前` : `${Math.round(ago / 60)}h前`} - )} + {ago !== null && {ago < 60 ? `${ago}m前` : `${Math.round(ago/60)}h前`}}
- {fc && strategy === "v53_alt" && ( + {fc && (
- - {(fc.gate_passed ?? true) ? "✅ Gate通过" : "❌ 否决"} + + {gatePassed ? "✅" : "❌"} {fc.gate_block || "Gate"} - {fc.gate_block && ( - {fc.gate_block} - )} 方向{fc.direction?.score ?? 0}/55 拥挤{fc.crowding?.score ?? 0}/25 环境{fc.environment?.score ?? 0}/15 辅助{fc.auxiliary?.score ?? 0}/5
)} - {fc && strategy === "v53_btc" && ( -
- - {fc.gate_passed ? "✅ Gate通过" : "❌ Gate否决"} - - {fc.block_reason && ( - {fc.block_reason} - )} - - OBI {((fc.obi_raw ?? 0) * 100).toFixed(2)}% - -
- )}
); })} @@ -142,41 +93,30 @@ function LatestSignals({ strategy }: { strategy: StrategyTab }) { function ControlPanel() { const [config, setConfig] = useState(null); const [saving, setSaving] = useState(false); - useEffect(() => { - (async () => { - try { const r = await authFetch("/api/paper/config"); if (r.ok) setConfig(await r.json()); } catch {} - })(); + (async () => { try { const r = await authFetch("/api/paper/config"); if (r.ok) setConfig(await r.json()); } catch {} })(); }, []); - const toggle = async () => { setSaving(true); try { - const r = await authFetch("/api/paper/config", { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ enabled: !config.enabled }), - }); + const r = await authFetch("/api/paper/config", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ enabled: !config.enabled }) }); if (r.ok) setConfig(await r.json().then((j: any) => j.config)); } catch {} finally { setSaving(false); } }; - if (!config) return null; return (
- - {config.enabled ? "🟢 运行中" : "⚪ 已停止"} - + {config.enabled ? "🟢 运行中" : "⚪ 已停止"}
- 初始资金: ${config.initial_balance?.toLocaleString()} - 单笔风险: {(config.risk_per_trade * 100).toFixed(0)}% - 最大持仓: {config.max_positions} + 初始: ${config.initial_balance?.toLocaleString()} + 风险: {(config.risk_per_trade * 100).toFixed(0)}% + 最大: {config.max_positions}仓
); @@ -184,15 +124,12 @@ function ControlPanel() { // ─── 总览 ──────────────────────────────────────────────────────── -function SummaryCards({ strategy }: { strategy: StrategyTab }) { +function SummaryCards() { const [data, setData] = useState(null); useEffect(() => { - const f = async () => { - try { const r = await authFetch(`/api/paper/summary?strategy=${strategy}`); if (r.ok) setData(await r.json()); } catch {} - }; + const f = async () => { try { const r = await authFetch(`/api/paper/summary?strategy=${STRATEGY}`); if (r.ok) setData(await r.json()); } catch {} }; f(); const iv = setInterval(f, 10000); return () => clearInterval(iv); - }, [strategy]); - + }, []); if (!data) return
加载中...
; return (
@@ -200,9 +137,9 @@ function SummaryCards({ strategy }: { strategy: StrategyTab }) { { label: "总盈亏(R)", value: `${data.total_pnl >= 0 ? "+" : ""}${data.total_pnl}R`, sub: `${data.total_pnl_usdt >= 0 ? "+" : ""}$${data.total_pnl_usdt}`, color: data.total_pnl >= 0 ? "text-emerald-600" : "text-red-500" }, { label: "胜率", value: `${data.win_rate}%`, sub: `共${data.total_trades}笔`, color: "text-slate-800" }, { label: "持仓中", value: data.active_positions, sub: "活跃仓位", color: "text-blue-600" }, - { label: "盈亏比", value: data.profit_factor, sub: "Profit Factor", color: "text-slate-800" }, + { label: "盈亏比", value: data.profit_factor, sub: "PF", color: "text-slate-800" }, { label: "当前资金", value: `$${data.balance?.toLocaleString()}`, sub: "虚拟余额", color: data.balance >= 10000 ? "text-emerald-600" : "text-red-500" }, - { label: "状态", value: data.start_time ? "运行中 ✅" : "等待首笔", sub: "signal accumulating", color: "text-slate-600" }, + { label: "状态", value: data.start_time ? "运行中 ✅" : "等待首笔", sub: "accumulating", color: "text-slate-600" }, ].map(({ label, value, sub, color }) => (

{label}

@@ -216,83 +153,57 @@ function SummaryCards({ strategy }: { strategy: StrategyTab }) { // ─── 当前持仓 ──────────────────────────────────────────────────── -function ActivePositions({ strategy }: { strategy: StrategyTab }) { +function ActivePositions() { const [positions, setPositions] = useState([]); const [wsPrices, setWsPrices] = useState>({}); const [paperRiskUsd, setPaperRiskUsd] = useState(200); - const meta = STRATEGY_LABELS[strategy]; - useEffect(() => { - (async () => { - try { const r = await authFetch("/api/paper/config"); if (r.ok) { const cfg = await r.json(); setPaperRiskUsd((cfg.initial_balance || 10000) * (cfg.risk_per_trade || 0.02)); } } catch {} - })(); + (async () => { try { const r = await authFetch("/api/paper/config"); if (r.ok) { const cfg = await r.json(); setPaperRiskUsd((cfg.initial_balance||10000)*(cfg.risk_per_trade||0.02)); } } catch {} })(); }, []); - useEffect(() => { - const f = async () => { - try { const r = await authFetch(`/api/paper/positions?strategy=${strategy}`); if (r.ok) setPositions((await r.json()).data || []); } catch {} - }; + const f = async () => { try { const r = await authFetch(`/api/paper/positions?strategy=${STRATEGY}`); if (r.ok) setPositions((await r.json()).data||[]); } catch {} }; f(); const iv = setInterval(f, 10000); return () => clearInterval(iv); - }, [strategy]); - + }, []); useEffect(() => { - const streams = ["btcusdt", "ethusdt", "xrpusdt", "solusdt"].map(s => `${s}@aggTrade`).join("/"); + const streams = ["btcusdt","ethusdt","xrpusdt","solusdt"].map(s=>`${s}@aggTrade`).join("/"); const ws = new WebSocket(`wss://fstream.binance.com/stream?streams=${streams}`); - ws.onmessage = (e) => { - try { - const msg = JSON.parse(e.data); - if (msg.data) { const sym = msg.data.s; const price = parseFloat(msg.data.p); if (sym && price > 0) setWsPrices(prev => ({ ...prev, [sym]: price })); } - } catch {} - }; + ws.onmessage = (e) => { try { const msg=JSON.parse(e.data); if(msg.data){const sym=msg.data.s;const price=parseFloat(msg.data.p);if(sym&&price>0)setWsPrices(prev=>({...prev,[sym]:price}));} } catch {} }; return () => ws.close(); }, []); - - if (positions.length === 0) return ( -
- {meta.label} 暂无活跃持仓 -
- ); - + if (positions.length === 0) return
v53 暂无活跃持仓
; return (
-
-

当前持仓 ● 实时

-
+

当前持仓 ● 实时

{positions.map((p: any) => { - const sym = p.symbol?.replace("USDT", "") || ""; - const holdMin = Math.round((Date.now() - p.entry_ts) / 60000); - const currentPrice = wsPrices[p.symbol] || p.current_price || 0; - const entry = p.entry_price || 0; - const riskDist = p.risk_distance || Math.abs(entry - (p.sl_price || entry)) || 1; - const tp1R = riskDist > 0 ? (p.direction === "LONG" ? ((p.tp1_price || 0) - entry) / riskDist : (entry - (p.tp1_price || 0)) / riskDist) : 0; - const fullR = riskDist > 0 ? (p.direction === "LONG" ? (currentPrice - entry) / riskDist : (entry - currentPrice) / riskDist) : 0; - const unrealR = p.tp1_hit ? 0.5 * tp1R + 0.5 * fullR : fullR; - const unrealUsdt = unrealR * paperRiskUsd; + const sym = p.symbol?.replace("USDT","") || ""; + const holdMin = Math.round((Date.now()-p.entry_ts)/60000); + const currentPrice = wsPrices[p.symbol]||p.current_price||0; + const entry = p.entry_price||0; + const riskDist = p.risk_distance||Math.abs(entry-(p.sl_price||entry))||1; + const tp1R = riskDist>0?(p.direction==="LONG"?((p.tp1_price||0)-entry)/riskDist:(entry-(p.tp1_price||0))/riskDist):0; + const fullR = riskDist>0?(p.direction==="LONG"?(currentPrice-entry)/riskDist:(entry-currentPrice)/riskDist):0; + const unrealR = p.tp1_hit?0.5*tp1R+0.5*fullR:fullR; + const unrealUsdt = unrealR*paperRiskUsd; + const fc = parseFactors(p.score_factors); + const track = fc?.track||(p.symbol==="BTCUSDT"?"BTC":"ALT"); return (
- - {p.direction === "LONG" ? "🟢" : "🔴"} {sym} {p.direction} - - {strategy} - 评分{p.score} · {p.tier === "heavy" ? "加仓" : "标准"} + {p.direction==="LONG"?"🟢":"🔴"} {sym} {p.direction} + {track} + 评分{p.score}
- = 0 ? "text-emerald-600" : "text-red-500"}`}> - {unrealR >= 0 ? "+" : ""}{unrealR.toFixed(2)}R - - = 0 ? "text-emerald-500" : "text-red-400"}`}> - ({unrealUsdt >= 0 ? "+" : ""}${unrealUsdt.toFixed(0)}) - + =0?"text-emerald-600":"text-red-500"}`}>{unrealR>=0?"+":""}{unrealR.toFixed(2)}R {holdMin}m
- 入场: ${fmtPrice(p.entry_price)} - 现价: ${currentPrice ? fmtPrice(currentPrice) : "-"} - TP1: ${fmtPrice(p.tp1_price)}{p.tp1_hit ? " ✅" : ""} + 入: ${fmtPrice(p.entry_price)} + 现: ${currentPrice?fmtPrice(currentPrice):"-"} + TP1: ${fmtPrice(p.tp1_price)}{p.tp1_hit?" ✅":""} TP2: ${fmtPrice(p.tp2_price)} SL: ${fmtPrice(p.sl_price)}
@@ -306,23 +217,16 @@ function ActivePositions({ strategy }: { strategy: StrategyTab }) { // ─── 权益曲线 ──────────────────────────────────────────────────── -function EquityCurve({ strategy }: { strategy: StrategyTab }) { +function EquityCurve() { const [data, setData] = useState([]); useEffect(() => { - const f = async () => { - try { const r = await authFetch(`/api/paper/equity-curve?strategy=${strategy}`); if (r.ok) setData((await r.json()).data || []); } catch {} - }; + const f = async () => { try { const r = await authFetch(`/api/paper/equity-curve?strategy=${STRATEGY}`); if (r.ok) setData((await r.json()).data||[]); } catch {} }; f(); const iv = setInterval(f, 30000); return () => clearInterval(iv); - }, [strategy]); - + }, []); return (
-
-

权益曲线 (累计PnL)

-
- {data.length < 2 ? ( -
V5.3 暂无足够历史数据，积累中...
- ) : ( +

权益曲线

+ {data.length < 2 ?
数据积累中...
: (
@@ -341,42 +245,33 @@ function EquityCurve({ strategy }: { strategy: StrategyTab }) { // ─── 历史交易 ──────────────────────────────────────────────────── +type FilterSymbol = "all" | "BTC" | "ETH" | "XRP" | "SOL"; type FilterResult = "all" | "win" | "loss"; -function TradeHistory({ strategy }: { strategy: StrategyTab }) { +function TradeHistory() { const [trades, setTrades] = useState([]); + const [symbol, setSymbol] = useState("all"); const [result, setResult] = useState("all"); - const meta = STRATEGY_LABELS[strategy]; - useEffect(() => { - const f = async () => { - try { - const r = await authFetch(`/api/paper/trades?result=${result}&strategy=${strategy}&limit=50`); - if (r.ok) setTrades((await r.json()).data || []); - } catch {} - }; + const f = async () => { try { const r = await authFetch(`/api/paper/trades?symbol=${symbol}&result=${result}&strategy=${STRATEGY}&limit=50`); if (r.ok) setTrades((await r.json()).data||[]); } catch {} }; f(); const iv = setInterval(f, 10000); return () => clearInterval(iv); - }, [result, strategy]); - + }, [symbol, result]); return (

历史交易

- {strategy} + {(["all","BTC","ETH","XRP","SOL"] as FilterSymbol[]).map(s => ( + + ))} | - {(["all", "win", "loss"] as FilterResult[]).map((r) => ( - + {(["all","win","loss"] as FilterResult[]).map(r => ( + ))}
- {trades.length === 0 ? ( -
暂无交易记录
- ) : ( + {trades.length === 0 ?
暂无交易记录
: ( @@ -392,34 +287,17 @@ function TradeHistory({ strategy }: { strategy: StrategyTab }) { {trades.map((t: any) => { - const holdMin = t.exit_ts && t.entry_ts ? Math.round((t.exit_ts - t.entry_ts) / 60000) : 0; - const factors = parseFactors(t.score_factors); - const track = factors?.track || (t.symbol === "BTCUSDT" ? "BTC" : "ALT"); + const holdMin = t.exit_ts&&t.entry_ts?Math.round((t.exit_ts-t.entry_ts)/60000):0; + const fc = parseFactors(t.score_factors); + const track = fc?.track||(t.symbol==="BTCUSDT"?"BTC":"ALT"); return ( - - + + - - - + + + @@ -435,38 +313,28 @@ function TradeHistory({ strategy }: { strategy: StrategyTab }) { // ─── 统计面板 ──────────────────────────────────────────────────── -function StatsPanel({ strategy }: { strategy: StrategyTab }) { +function StatsPanel() { const [data, setData] = useState(null); const [tab, setTab] = useState("ALL"); - useEffect(() => { setTab("ALL"); }, [strategy]); - useEffect(() => { - const f = async () => { - try { const r = await authFetch(`/api/paper/stats?strategy=${strategy}`); if (r.ok) setData(await r.json()); } catch {} - }; + const f = async () => { try { const r = await authFetch(`/api/paper/stats?strategy=${STRATEGY}`); if (r.ok) setData(await r.json()); } catch {} }; f(); const iv = setInterval(f, 30000); return () => clearInterval(iv); - }, [strategy]); - + }, []); if (!data || data.error) return (

详细统计

-
该视图暂无统计数据，等待交易记录积累
+
等待交易记录积累...
); - - const coinTabs = strategy === "v53_btc" ? ["ALL", "BTC"] : ["ALL", "ETH", "XRP", "SOL"]; - const st = tab === "ALL" ? data : (data.by_symbol?.[tab] || null); - + const coinTabs = ["ALL","BTC","ETH","XRP","SOL"]; + const st = tab==="ALL"?data:(data.by_symbol?.[tab]||null); return (

详细统计

{coinTabs.map(t => ( - + ))}
@@ -479,15 +347,13 @@ function StatsPanel({ strategy }: { strategy: StrategyTab }) {
平均亏损

-{st.avg_loss}R

最大回撤

{st.mdd}R

夏普比率

{st.sharpe}

-
总盈亏

= 0 ? "text-emerald-600" : "text-red-500"}`}>{(st.total_pnl ?? 0) >= 0 ? "+" : ""}{st.total_pnl ?? "-"}R

-
总笔数

{st.total ?? data.total}

+
总盈亏

=0?"text-emerald-600":"text-red-500"}`}>{(st.total_pnl??0)>=0?"+":""}{st.total_pnl??"-"}R

+
总笔数

{st.total??data.total}

做多胜率

{st.long_win_rate}% ({st.long_count}笔)

做空胜率

{st.short_win_rate}% ({st.short_count}笔)

- ) : ( -
该币种暂无数据
- )} + ) :
该币种暂无数据
} ); } @@ -496,9 +362,6 @@ function StatsPanel({ strategy }: { strategy: StrategyTab }) { export default function PaperTradingV53Page() { const { isLoggedIn, loading } = useAuth(); - const [strategyTab, setStrategyTab] = useState("v53_alt"); - const meta = STRATEGY_LABELS[strategyTab]; - if (loading) return
加载中...
; if (!isLoggedIn) return (
@@ -507,36 +370,19 @@ export default function PaperTradingV53Page() { 登录
); - return (
-
-
-

📈 模拟盘 V5.3

-

ALT轨(ETH/XRP/SOL) + BTC独立Gate-Control

-
- {/* 策略Tab切换 */} -
- {(Object.entries(STRATEGY_LABELS) as [StrategyTab, typeof STRATEGY_LABELS[StrategyTab]][]).map(([key, val]) => ( - - ))} -
+
+

📈 模拟盘 V5.3

+

统一策略 v53 · BTC/ETH/XRP/SOL · 四层评分 55/25/15/5 + per-symbol 四门控制

- -
- {meta.label} — {meta.desc} -
- - - - - - - + + + + + +
); } diff --git a/frontend/app/signals-v53/page.tsx b/frontend/app/signals-v53/page.tsx index d47ebfa..be069de 100644 --- a/frontend/app/signals-v53/page.tsx +++ b/frontend/app/signals-v53/page.tsx @@ -203,7 +203,7 @@ function BTCGateCard({ factors }: { factors: LatestIndicator["factors"] }) { function IndicatorCards({ symbol }: { symbol: Symbol }) { const [data, setData] = useState(null); - const strategy = symbol === "BTC" ? "v53_btc" : "v53_alt"; + const strategy = "v53"; useEffect(() => { const fetch = async () => { @@ -295,7 +295,7 @@ function IndicatorCards({ symbol }: { symbol: Symbol }) {

{isBTC ? "BTC Gate-Control" : "ALT 四层评分"} - {" · "}{isBTC ? "v53_btc" : "v53_alt"} + {" · "}{"v53"}

([]); - const strategy = symbol === "BTC" ? "v53_btc" : "v53_alt"; + const strategy = "v53"; useEffect(() => { const fetchData = async () => { @@ -407,7 +407,7 @@ function SignalHistory({ symbol }: { symbol: Symbol }) { function CVDChart({ symbol, minutes }: { symbol: Symbol; minutes: number }) { const [data, setData] = useState([]); const [loading, setLoading] = useState(true); - const strategy = symbol === "BTC" ? "v53_btc" : "v53_alt"; + const strategy = "v53"; const fetchData = useCallback(async (silent = false) => { try {

- {t.symbol?.replace("USDT", "")} - {track} - - {t.direction === "LONG" ? "🟢" : "🔴"} {t.direction} - {t.symbol?.replace("USDT","")}{track}{t.direction==="LONG"?"🟢":"🔴"} {t.direction} {fmtPrice(t.entry_price)}{t.exit_price ? fmtPrice(t.exit_price) : "-"} 0 ? "text-emerald-600" : t.pnl_r < 0 ? "text-red-500" : "text-slate-500"}`}> - {t.pnl_r > 0 ? "+" : ""}{t.pnl_r?.toFixed(2)} - - - {t.status === "tp" ? "止盈" : t.status === "sl" ? "止损" : t.status === "sl_be" ? "保本" : t.status === "timeout" ? "超时" : t.status === "signal_flip" ? "翻转" : t.status} - - {t.exit_price?fmtPrice(t.exit_price):"-"}0?"text-emerald-600":t.pnl_r<0?"text-red-500":"text-slate-500"}`}>{t.pnl_r>0?"+":""}{t.pnl_r?.toFixed(2)}{t.status==="tp"?"止盈":t.status==="sl"?"止损":t.status==="sl_be"?"保本":t.status==="timeout"?"超时":t.status==="signal_flip"?"翻转":t.status} {t.score} {holdMin}m