mirror of
https://ghfast.top/https://github.com/aeroxw/tick-stock-panel.git
synced 2026-09-12 16:44:15 +08:00
feat(v0.2): 市场阶段与主线识别 + 因子挖掘全链路 + 数据层完善
- 市场环境: 新增情绪周期6阶段(冰点/启动/主升/高潮/退潮/修复, 连板梯队驱动, EMA平滑+2日确认+弱档否决, 平均段长9.7天)与概念/行业主线排名(涨停梯队聚合, 可配置宽基/风格标签过滤); 市场环境页重构, regime 透明加列, 与5档state并存 - 挖掘: 因子与策略挖掘全链路(API/worker/进程锁/候选库/前端工作台/文档), 周度调度默认关闭且永不自动发布 - 回测: 财务快照因子(点时口径), 批量回测预计算共享下期收益, 信号路径矩阵列依赖展开修复(consecutive_limit_ups 缺列报错) - 数据/性能: enriched 生成与预热治理, 重任务限流, 行情/K线缓存复用, 时区修复 - 测试: 后端全量 914 通过; GUI 黑盒验证截图存证 gui-test-screenshots/
This commit is contained in:
+55
-28
@@ -381,7 +381,10 @@ def strategy_run(req: StrategyBacktestRequest, request: Request):
|
||||
regime_filter=req.regime_filter,
|
||||
)
|
||||
task = make_worker_task("backtest", settings.data_dir, cfg)
|
||||
return run_worker_task(task)
|
||||
from app.services.heavy_job_limiter import shared_heavy_job_limiter
|
||||
|
||||
with shared_heavy_job_limiter.slot("normal"):
|
||||
return run_worker_task(task)
|
||||
|
||||
|
||||
# ── SSE 流式回测 (实时进度 + 可取消 + 支持重连) ───────────────────
|
||||
@@ -409,10 +412,6 @@ _running_jobs: dict[str, _BacktestJob] = {}
|
||||
_jobs_lock = threading.Lock()
|
||||
_JOB_TTL = 300 # 完成后保留 5 分钟
|
||||
|
||||
# 并发回测上限: 多个重回测同时跑会 OOM (服务器内存约 1.8GB)。用信号量限并发,
|
||||
# 超出的任务在 _run_backtest 里排队, SSE 连接照常保持, run 一开始就有进度。
|
||||
_backtest_semaphore = threading.Semaphore(2)
|
||||
|
||||
|
||||
def _cleanup_stale_jobs():
|
||||
"""清理过期任务 (完成超过 TTL 的)。全程持 _jobs_lock: 迭代+pop 与其他访问互斥。"""
|
||||
@@ -588,21 +587,27 @@ async def strategy_stream(
|
||||
)
|
||||
|
||||
def _run_backtest():
|
||||
# 信号量限并发: 超额任务在此阻塞排队, 不并发吃满内存 (等待期间 cancel_event
|
||||
# 仍可置位, svc.run 会据此提前返回 cancelled)。持槽跑完在 finally 释放。
|
||||
_backtest_semaphore.acquire()
|
||||
from app.services.heavy_job_limiter import (
|
||||
HeavyJobCancelledError,
|
||||
shared_heavy_job_limiter,
|
||||
)
|
||||
|
||||
try:
|
||||
task = make_worker_task("backtest", settings.data_dir, cfg)
|
||||
result = run_worker_task(
|
||||
task,
|
||||
lambda d: job.progress.append(d),
|
||||
job.cancel_event,
|
||||
)
|
||||
with shared_heavy_job_limiter.slot(
|
||||
"normal",
|
||||
cancel_event=job.cancel_event,
|
||||
):
|
||||
task = make_worker_task("backtest", settings.data_dir, cfg)
|
||||
result = run_worker_task(
|
||||
task,
|
||||
lambda d: job.progress.append(d),
|
||||
job.cancel_event,
|
||||
)
|
||||
_finish_job(job, result=result)
|
||||
except HeavyJobCancelledError:
|
||||
_finish_job(job, error="回测已取消")
|
||||
except Exception as e:
|
||||
_finish_job(job, error=str(e))
|
||||
finally:
|
||||
_backtest_semaphore.release()
|
||||
|
||||
# 启动后台线程 (不阻塞事件循环)
|
||||
threading.Thread(target=_run_backtest, daemon=True).start()
|
||||
@@ -886,14 +891,25 @@ async def optimize_stream(
|
||||
)
|
||||
|
||||
def _run_opt():
|
||||
from app.services.heavy_job_limiter import (
|
||||
HeavyJobCancelledError,
|
||||
shared_heavy_job_limiter,
|
||||
)
|
||||
|
||||
try:
|
||||
task = make_worker_task("optimize", settings.data_dir, ocfg)
|
||||
result = run_worker_task(
|
||||
task,
|
||||
lambda d: job.progress.append(d),
|
||||
job.cancel_event,
|
||||
)
|
||||
with shared_heavy_job_limiter.slot(
|
||||
"normal",
|
||||
cancel_event=job.cancel_event,
|
||||
):
|
||||
task = make_worker_task("optimize", settings.data_dir, ocfg)
|
||||
result = run_worker_task(
|
||||
task,
|
||||
lambda d: job.progress.append(d),
|
||||
job.cancel_event,
|
||||
)
|
||||
_finish_job(job, result=result)
|
||||
except HeavyJobCancelledError:
|
||||
_finish_job(job, error="优化已取消")
|
||||
except Exception as e:
|
||||
_finish_job(job, error=str(e))
|
||||
|
||||
@@ -1101,14 +1117,25 @@ async def walkforward_stream(
|
||||
)
|
||||
|
||||
def _run_wf():
|
||||
from app.services.heavy_job_limiter import (
|
||||
HeavyJobCancelledError,
|
||||
shared_heavy_job_limiter,
|
||||
)
|
||||
|
||||
try:
|
||||
task = make_worker_task("walkforward", settings.data_dir, wf_cfg)
|
||||
result = run_worker_task(
|
||||
task,
|
||||
lambda d: job.progress.append(d),
|
||||
job.cancel_event,
|
||||
)
|
||||
with shared_heavy_job_limiter.slot(
|
||||
"normal",
|
||||
cancel_event=job.cancel_event,
|
||||
):
|
||||
task = make_worker_task("walkforward", settings.data_dir, wf_cfg)
|
||||
result = run_worker_task(
|
||||
task,
|
||||
lambda d: job.progress.append(d),
|
||||
job.cancel_event,
|
||||
)
|
||||
_finish_job(job, result=result)
|
||||
except HeavyJobCancelledError:
|
||||
_finish_job(job, error="walk-forward 已取消")
|
||||
except Exception as e:
|
||||
_finish_job(job, error=str(e))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user