aeroxw/tick-stock-panel
1
0
Fork 0
mirror of https://ghfast.top/https://github.com/aeroxw/tick-stock-panel.git synced 2026-09-12 17:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(regime): 修复重算无产出并补全 beta 标签

Browse Source 
后端
- /recompute 全量分支原本误调 compute_regime_incremental(增量补差),
  无缺口/stale 时直接返回 0 行; 改为用 earliest_enriched_date ~ 今天
  走 run_regime_batch + upsert 强制覆盖, 真正实现"全量重算"
- _scan_enriched_fallback 原本漏调 compute_limit_signals 的 instruments
  参数致慢路径必抛异常 → enriched 缓存未预热时拿不到含信号列数据 → 聚合
  返回空; 改用主管道同款 compute_all(df, instruments, historical_shares)
  一站式补算, 与 indicators/pipeline.py 对齐
- 新增 enriched_date_set / earliest_enriched_date 辅助函数(抽出复用)

前端
- Regime 重算按钮: 加"重算中…"文字反馈 + 完成 toast(区分有/无新数据) +
  catch 捕获错误(原异常被静默吞掉)
- 市场环境菜单加 beta 胶囊标签(对齐 Settings 数据源标签样式)

验证
- 后端 582 passed; 真实数据全量重算产出 986 行(2022-07-08 ~ 2026-07-31)
- 前端 tsc + pnpm build 通过
This commit is contained in:
shy3130
2026-08-02 12:22:48 +08:00
parent 8aef435849
commit 46ebcd89c8
4 changed files with 63 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/api/regime.py
+16 -7
View File
@@ -132,16 +132,25 @@ def regime_coverage(request: Request):
@router.post("/recompute")
def regime_recompute(request: Request, start: date | None = None, end: date | None = None):
"""手动触发重算(全量或指定区间)。管理员操作。"""
"""手动触发重算(全量或指定区间)。管理员操作。
- 不传 start: 强制全量重算(enriched 最早日 ~ 今天), 覆盖所有已有行。
与 daily_pipeline 的增量补差(compute_regime_incremental)不同 —— 此接口面向
人工「我要重新算一遍」的预期, 必须真正重算而非增量补缺口。
- 传 start: 仅重算 [start, end] 区间。
"""
repo = request.app.state.repo
data_dir = _data_dir(request)
end = end or date.today()
if start is None:
# 全量: 从 enriched 最早日算到今天
new_rows = regime_builder.compute_regime_incremental(repo, data_dir, today=end)
else:
new_rows = regime_builder.run_regime_batch(repo, start=start, end=end)
if not new_rows.is_empty():
regime_builder.upsert_regime_history(data_dir, new_rows)
# 全量: 从 enriched 最早日强制重算到今天
earliest = regime_builder.earliest_enriched_date(repo)
if earliest is None:
invalidate_regime_cache()
return {"ok": True, "computed": 0}
start = earliest
new_rows = regime_builder.run_regime_batch(repo, start=start, end=end)
if not new_rows.is_empty():
regime_builder.upsert_regime_history(data_dir, new_rows)
invalidate_regime_cache()
return {"ok": True, "computed": new_rows.height if not new_rows.is_empty() else 0}
backend/app/services/regime_builder.py
+30 -12
View File
@@ -239,19 +239,24 @@ def _scan_enriched_fallback(repo, start: date, end: date) -> pl.DataFrame | None
"""缓存不覆盖时的慢路径: 一次性 scan 全部 enriched parquet + 重算指标。
仅在 regime 首次全量回填或缓存未预热时触发。返回含信号列的多日 DataFrame。
enriched 持久化只存基础列(OHLCV + raw_*/turnover/consecutive_*), 不含
change_pct/ma20/signal_* 等派生列, 故此处需用 compute_all 补算全套指标。
必须传入 instruments(涨跌停价表), 否则 compute_limit_signals 会跳过涨跌停信号。
"""
try:
enriched_dir = repo.store.data_dir / "kline_daily_enriched"
if not enriched_dir.exists():
return None
from app.indicators.pipeline import compute_indicators, compute_limit_signals
from app.indicators.pipeline import compute_all
df = pl.scan_parquet(enriched_dir / "**" / "*.parquet").filter(
(pl.col("date") >= start) & (pl.col("date") <= end)
).collect()
if df.is_empty():
return None
df = compute_indicators(df)
df = compute_limit_signals(df)
instruments = repo.get_instruments()
historical_shares = repo.get_historical_shares()
df = compute_all(df, instruments=instruments, historical_shares=historical_shares)
return df
except Exception as e: # noqa: BLE001
logger.warning("regime scan_enriched_fallback failed: %s", e)
@@ -391,15 +396,7 @@ def compute_regime_incremental(repo, data_dir: Path, *, today: date | None = Non
existing = load_regime_history(data_dir)
# 缺口: enriched 有哪些天, regime 缺哪些
enriched_dir = repo.store.data_dir / "kline_daily_enriched"
enriched_dates: set[date] = set()
if enriched_dir.exists():
for part in enriched_dir.glob("date=*/part.parquet"):
try:
ds = part.parent.name.replace("date=", "")
enriched_dates.add(date.fromisoformat(ds))
except ValueError:
continue
enriched_dates = enriched_date_set(repo)
existing_dates = set(existing["date"].to_list()) if not existing.is_empty() else set()
missing = sorted(d for d in enriched_dates if d not in existing_dates and d <= today)
@@ -417,3 +414,24 @@ def compute_regime_incremental(repo, data_dir: Path, *, today: date | None = Non
if not new_rows.is_empty():
upsert_regime_history(data_dir, new_rows)
return new_rows
def enriched_date_set(repo) -> set[date]:
"""扫描 kline_daily_enriched 分区目录, 返回所有已有日期集合。"""
enriched_dir = repo.store.data_dir / "kline_daily_enriched"
dates: set[date] = set()
if not enriched_dir.exists():
return dates
for part in enriched_dir.glob("date=*/part.parquet"):
try:
ds = part.parent.name.replace("date=", "")
dates.add(date.fromisoformat(ds))
except ValueError:
continue
return dates
def earliest_enriched_date(repo) -> date | None:
"""返回 enriched 最早日期(供全量重算定起点)。无数据返回 None。"""
dates = enriched_date_set(repo)
return min(dates) if dates else None
frontend/src/components/Layout.tsx
+10 -4
View File
@@ -80,7 +80,7 @@ const nav = [
{ to: '/monitor', label: '监控中心', icon: RadioTower },
{ to: '/review', label: '复盘', icon: BookOpenCheck },
{ to: '/indices', label: '指数', icon: BarChart3 },
{ to: '/regime', label: '市场环境', icon: Gauge },
{ to: '/regime', label: '市场环境', icon: Gauge, badge: 'beta' },
{ to: '/data', label: '数据', icon: Database },
] as const
@@ -381,11 +381,12 @@ export function Layout() {
}, [alertsTotal])
// 合并内置页面 + 可见的扩展分析菜单
const analysisNav = (analysisMenus?.items ?? [])
type NavItem = { to: string; label: string; icon: typeof Gauge; badge?: string }
const analysisNav: NavItem[] = (analysisMenus?.items ?? [])
.filter(m => m.visible)
.map(m => ({ to: `/analysis/${m.id}`, label: m.label, icon: m.icon === 'tags' ? Tags : BarChart3 }))
const allNav = [...nav, ...analysisNav]
const allNav: NavItem[] = [...nav, ...analysisNav]
const savedOrder = prefs?.nav_order ?? []
const navItems = savedOrder.length > 0
@@ -463,7 +464,7 @@ export function Layout() {
</div>
<nav className="flex-1 min-h-0 overflow-y-auto px-2 py-3 space-y-0.5">
{visibleNavItems.map(({ to, label, icon: Icon }) => (
{visibleNavItems.map(({ to, label, icon: Icon, badge }) => (
<NavLink
key={to}
to={to}
@@ -480,6 +481,11 @@ export function Layout() {
<>
<Icon className="h-4 w-4 shrink-0" />
<span className="flex-1">{label}</span>
{badge && (
<span className="ml-auto inline-flex items-center rounded-full border border-amber-400/30 bg-amber-400/10 px-1.5 py-0.5 text-[9px] font-semibold uppercase tracking-wider text-amber-400 shrink-0">
{badge}
</span>
)}
{/* 数据同步状态: 同步中转圈, 刚完成显示绿色对勾闪烁 3 秒 */}
{to === '/data' && isDataSyncing && (
<Loader2 className="h-3.5 w-3.5 shrink-0 animate-spin text-accent" />
frontend/src/pages/Regime.tsx
+7 -2
View File
@@ -15,6 +15,7 @@ import {
import { QK } from '@/lib/queryKeys'
import { useChartTheme } from '@/lib/theme'
import { fmtBigNum } from '@/lib/format'
import { toast } from '@/components/Toast'
const STATE_ORDER: RegimeState[] = ['strong', 'lean_strong', 'range', 'lean_weak', 'weak']
@@ -120,12 +121,16 @@ export function Regime() {
const handleRecompute = async () => {
setRecomputing(true)
try {
await api.regimeRecompute()
const r = await api.regimeRecompute()
// computed=0 表示无缺口/stale, 数据未变更; >0 表示新增/重算了 N 天
toast(r.computed > 0 ? `重算完成 · 新增 ${r.computed} 天` : '重算完成 · 数据已是最新', 'success')
await Promise.all([
qc.invalidateQueries({ queryKey: ['regime-history'] }),
qc.invalidateQueries({ queryKey: ['regime-states'] }),
qc.invalidateQueries({ queryKey: ['regime-latest'] }),
])
} catch (e) {
toast(`重算失败 · ${String((e as Error)?.message || e)}`, 'error')
} finally {
setRecomputing(false)
}
@@ -148,7 +153,7 @@ export function Regime() {
<button onClick={handleRecompute} disabled={recomputing}
className="inline-flex items-center gap-1.5 h-7 px-3 rounded-btn border border-border bg-base text-xs text-secondary hover:text-accent disabled:opacity-50">
{recomputing ? <Loader2 className="h-3.5 w-3.5 animate-spin" /> : <RefreshCw className="h-3.5 w-3.5" />}
重算
{recomputing ? '重算中…' : '重算'}
</button>
</div>
</div>