sanguo/sanguo_vnpy_v2
3
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
521 Commits 4 Branches 1 Tag
7bbba554f8beeb5b9de540bfecef7aadd1b0bdbd
Commit Graph

21 Commits

Author SHA1 Message Date
claude_dev 18a9c8d1a1 fix(portfolio): 实盘/影子引擎重启后定时任务全丢根治——process_initialize+facade注入run_daily [vps]
CI/CD / test (push) Successful in 13s
Details
CI/CD / nas-deploy (push) Successful in 31s
Details
CI/CD / nas-verify (push) Successful in 14s
Details 
P0 根因(2026-08-17 VPS 16 引擎空转零成交事故):bullet_trade LiveEngine 重启时
恢复 g(live_state.json/g.pkl)则跳过 initialize 走断点续跑,持久化旧任务按
module+func 反射恢复,而我们的任务是策略实例 bound method,恢复必失败
('无法恢复调度任务')→进程活着、分钟心跳正常、调度任务列表为空,开盘零成交零日志
(shadow_43/47/49 日志三段实锤:首启'已注册定时任务'→重启'无法恢复'→末代零任务)。
修法:live_strategy 加 process_initialize(引擎每次进程启动必调,resume 含),
装配抽 _setup 幂等(每进程一次);+3 回归测试(resume 只调 process_initialize
仍注册/双钩子不重复/facade 注入)。

P1 顺带根治:BrokerFacade 补注入 bullet_trade 顶层 run_daily/run_monthly——
此前 live facade 缺注入,策略自身 initialize 里的 b.run_daily 全部静默 no-op
(channel_test 无 _register_schedule 分支,4 账户连首启都不可能开仓);注入后
定时注册回归策略自身 initialize 单一事实源,_setup 不再调 _register_schedule
代注册(回测路径不变,runner_backtest._register_schedule 保留并补
ChannelTestStrategy 自注册分支消误导告警)。

829 测试绿
 2026-08-17 11:52:26 +08:00
claude_dev 0453de9321 fix(portfolio): 收益单位口径统一小数+用户验收四问题——①1044%真因:bullet_trade返回百分数字面值(10.44=10.44%),组合结果页直显(对)但档案回写/策略库按小数×100(错1044%);_extract_metrics统一÷100归一小数(注释单位契约),组合结果页fmtPct改×100(与CTA/empyrical全平台一致;历史任务NAS一次性迁移)②回测灯/回测历史'找不到结果':done无task_id(老回测)兜底跳任务中心不过滤(instance过滤对老任务为空)③实走/实盘灯'还是参数页':三级fallback——同类型在跑直达监控,实例任何在跑(如只有影子)跳列表过滤,无在跑才发起④模式列折行:宽118+日终并入单chip(实走·日终,title悬浮说明)⑤模拟盘名加版本号={实例名}·{模式}v{N}(同实例同模式递增,对齐实盘);927绿+build绿 [vps]
CI/CD / test (push) Successful in 10s
Details
CI/CD / nas-deploy (push) Successful in 26s
Details
CI/CD / nas-verify (push) Successful in 10s
Details
2026-08-16 10:06:12 +08:00
claude_dev 01184c2b1f refactor(portfolio): TET副本类名对齐策略库扫描约定—*StrategyEx→*ExStrategy(AllWeatherExStrategy等8类):strategy_registry._extract_class_names只认endswith('Strategy')的类名,Ex结尾类被判'无策略类'整文件跳过→策略库/代码编辑器看不到副本;改名后_scan_self_owned自动识别4文件(type=portfolio);CLI/API/前端选项值(all_weather_ex等)不变;328绿 [vps]
CI/CD / test (push) Successful in 12s
Details
CI/CD / nas-deploy (push) Successful in 34s
Details
CI/CD / nas-verify (push) Successful in 19s
Details
2026-08-15 13:35:23 +08:00
claude_dev a45ab3086d feat(portfolio): TET Phase2策略副本(issue #19)—4副本(*_ex)文件级copy+机械替换取数调用(get_price/closes_panel/fundamentals_df→_ex;get_index_stocks→get_constituent_ex),策略逻辑零改动(diff可审计);all_weather_ex补small/big/roic_big/bm空入参守卫(strict空raise↔老接口空表→[]等价语义);接线__init__导出+runner分发/CLI choices/_register_schedule isinstance扩列;无_ex的方法(value_metrics/limit_status_batch/security_info)按issue保留老接口;portfolio全套328绿 [vps]
CI/CD / test (push) Successful in 20s
Details
CI/CD / nas-deploy (push) Successful in 35s
Details
CI/CD / nas-verify (push) Successful in 16s
Details
2026-08-15 07:59:44 +08:00
claude_dev 36db2ed5a6 feat(shadow-desk): 通路测试策略channel_test+模拟盘列表改造: 策略=每日等权轮换ETF/蓝筹(卖旧买新走全买卖通路)+T+1当日卖探针(两端应一致拒单,验证拒单通路),注册backtest/live/前端,默认universe 5只高流动ETF,4单测(坑:BrokerFacade是dataclass,子类方法被父类__init__实例属性遮蔽须实例注入); 模拟盘列表:加类型列(个股/组合)+创建时间列,标的去JSON中括号,列宽重排,模式筛选加影子 [vps]
CI/CD / test (push) Successful in 12s
Details
CI/CD / nas-deploy (push) Successful in 28s
Details
CI/CD / nas-verify (push) Successful in 9s
Details
2026-08-14 14:32:52 +08:00
claude_dev 861c7faa8c feat(portfolio): P1-a 组合策略K线周期字段(前后端): 模拟盘新建组合卡显周期下拉(原v-if藏起,实走/影子用miniQMT档位); live组合分支不写死d(空=d默认,cta空=15m); 组合回测加interval(d=day,非d拒400+runner拒ValueError,分钟档等数据层); worker params存interval供回放预填; 前端组合回测表单加下拉(仅日线可选,其余disabled标注影子可用) [vps]
CI/CD / test (push) Successful in 11s
Details
CI/CD / nas-deploy (push) Failing after 12s
Details
CI/CD / nas-verify (push) Has been skipped
Details
2026-08-14 12:05:23 +08:00
claude_dev 1e7d696f45 feat(shadow-desk): P0对账spike(runner加initial_positions通道+final_portfolio产出): BacktestEngine续跑注入初始持仓(引擎原生支持,不消耗现金); 期末现金/持仓/总值从engine.context.portfolio直取; run_backtest_json透传initial_positions+final_portfolio; scripts/shadow_desk/spike_p0全量vs 3段续跑对账(持仓逐只/现金总值/净值曲线<1e-6,自动月初分段或--split压除权边界); 6测试 [vps]
CI/CD / test (push) Successful in 16s
Details
CI/CD / nas-deploy (push) Successful in 28s
Details
CI/CD / nas-verify (push) Successful in 12s
Details
2026-08-14 10:10:51 +08:00
claude_dev 6728872d72 fix(portfolio): 基准装载时序修正:load_strategy()会reset_settings()清掉预设,须在initialize闭包内set_benchmark(聚宽同款模式);构造参数与预run设置双失效 [vps]
CI/CD / test (push) Successful in 9s
Details
CI/CD / nas-deploy (push) Successful in 27s
Details
CI/CD / nas-verify (push) Successful in 11s
Details
2026-08-13 23:09:58 +08:00
claude_dev c8b7be69c9 fix(portfolio): 基准曲线恒空根因=bullet_trade 0.9.x BacktestEngine(benchmark=)构造参数收而不用,须set_benchmark()设全局settings(VPS冒烟实测benchmark_data恒None);run前显式设,幂等 [vps]
CI/CD / test (push) Successful in 14s
Details
CI/CD / nas-deploy (push) Successful in 30s
Details
CI/CD / nas-verify (push) Successful in 8s
Details
2026-08-13 22:59:03 +08:00
claude_dev 929f52e3c2 feat(portfolio): 组合回测加持仓变化图(daily_positions每日聚合count/value经worker/routes透传,柱=持仓数线=市值)+超额收益曲线(策略/基准净值-1,聚宽标配,前端算);2测试 [vps] 2026-08-13 20:40:03 +08:00
claude_dev 08aec403f7 feat(portfolio): 组合回测结果增强: 基准对比曲线(对齐交易日+归一化)+回撤序列+扩展指标(波动/Sortino/Calmar/超额/Alpha/Beta), worker与API透传, 结果页净值对比+回撤图 [vps]
CI/CD / test (push) Successful in 15s
Details
CI/CD / nas-deploy (push) Failing after 13s
Details
CI/CD / nas-verify (push) Has been skipped
Details
2026-08-13 18:22:10 +08:00
claude_dev ebe368f54a fix(portfolio): run_backtest_json main params+Namespace 漏费用字段致 rc=1(组合回测失败) [vps]
CI/CD / test (push) Successful in 13s
Details
CI/CD / nas-deploy (push) Successful in 26s
Details
CI/CD / nas-verify (push) Successful in 10s
Details
2026-08-13 11:34:03 +08:00
claude_dev 66b393df16 feat(portfolio): 组合回测接入A股费用(佣金/印花税/最低佣金/滑点)对齐个股回测; BulletTrade set_order_cost/set_slippage [vps]
CI/CD / test (push) Successful in 9s
Details
CI/CD / nas-deploy (push) Successful in 25s
Details
CI/CD / nas-verify (push) Successful in 10s
Details
2026-08-13 10:32:49 +08:00
claude_dev 176c17f611 fix: NAS组合回测路由适配(isdir /app)+runner provider_config透传 2026-07-31 08:11:21 +08:00
claude_dev de04a8904b feat(portfolio): 移植3聚宽策略到BulletTrade + 8bug修正 + 数据缺口文档 
三策略(聚宽py2→BulletTrade 0.9.2,BrokerFacade注入跨版本兼容):
- momentum_timing 动量择时(牛熊分界+行业RPS+均线,切回10中证行业指数)
- value_selection 价值精选(6条基本面过滤,切回沪深300)
- small_cap 小市值(去IC对冲,切回000985中证全指)

框架:
- runner_backtest 加 --strategy 分发(原硬编码all_weather)
- provider 加 get_value_metrics(价值精选6条基本面,NOTICE_DATE治前视偏差)
- 72单测全过(21+27+24)

修8个回测实测发现的真bug:
- 01第⑥条EPS绝对值0.08~0.5与①大盘矛盾→6条交集恒空致全程空仓,按注释本意改净利润同比8~50%
- 03原帖calRPS取数区间错(get_price start=end只取1天)→涨跌幅恒0 RPS失效;date.today()取真实今天非回测日
- 02 universe 000985不在constituent_unified→候选池空

VPS实测(短区间验证逻辑,非长期表现): 01价值+23%/03行业轮动+48%/02选出20只小盘

数据缺口(详见docs/research/joinquant_strategies/SUMMARY.md + data_gaps_fix_plan.md):
- 三表"1/3损坏"误报已撤回(全扫5530文件/表0损坏,沪深95%+健康,仅北交所920xxx空,不做北交所)
- 真实缺口: 行业成份股(G1已补)/000985(G2已补)/IC期货(02对冲去掉)/provider批量接口(G5待做,解锁长回测)
 2026-07-28 22:20:49 +08:00
claude_dev e807bed09c fix(portfolio): all_weather 小盘池码 + fq 口径 + stop_loss 日志 
- all_weather:
  - s_stocks 399101.XSHE → 000852.XSHG(中证1000)。旧码在 constituent_unified
    无数据,分支C(小盘轮动)完全 dead(S_mean 恒 0)= 业绩差主因。
  - stop_loss -8% logger.debug → info(原 INFO 不可见,无法验收该分支)。
  - big/bm/small 阈值验证用放宽(适配年报口径+中证1000,最终业务决策再说):
    small roe>0.15&roa>0.10 → roe>0.05&roa>0.02(原 roa>0.10 命中仅~5%)。
- runner_backtest: build_broker_facade_inner 注入 set_option 委托 bullet_trade
  settings + initialize 顺序改(先注入 broker 再 initialize)。修 fq 口径不一致
  (engine fq_mode=none raw vs get_current_data fq=pre)致大盘市价保护价<当前价不成交。

修后 all_weather 2022-2024 全量验证(726交易日,max-pool 50):
总收益 0.82%→15.48%,夏普 -0.16→+0.04,回撤 -27%→-23%。
全分支跑通:月度调仓36 / 分支A无敌行情2月 / 分支C小盘活了(末日全仓小盘) /
stop_loss -8% 触发111次。
 2026-07-24 11:27:25 +08:00
claude_dev b89eb0f941 feat(portfolio): 接线 LocalUnifiedProvider 到 runner(Task5) 2026-07-23 08:13:32 +08:00
claude_dev b270faf4b9 feat(portfolio): 本地数据 provider 层(baostock/local_parquet) 
- BaostockProvider: 读 VPS daily_baostock_full(本地,不调online,守 provider-local-data-only 铁律)
- LocalParquetProvider: 读 parquet 兜底,回测117交易日0.4s/月出JSON
- all_weather 策略 + runner_backtest 适配
- 数据源融合使用层(单 Provider 内部路由,见 data-fusion spec §6)
 2026-07-22 10:35:23 +08:00
claude_dev b38ac3efd1 fix(portfolio): 前端回测MVP链路5处bug(VPS同步/routes命令/max-pool/filter/日期) 
Layer1-3 链路验证发现并修复:

1. VPS runner_backtest旧版(tar同步,修 from bullet_trade.core import BacktestEngine ImportError)
2. routes shlex.quote对Windows路径产POSIX单引号cmd不认 -> 手动拼远端命令
3. routes 'set X=Y &&' 尾空格进value致bullet_trade provider名匹配失败 -> 删set(runner自带setdefault)
4. 加 --max-pool 参数(默认前端30)避免HS300+中小综指1258只基本面下载超时
5. filter_st/filter_new对全成分逐只 -> max_pool slice提前到filter前;
   _coerce_datetime加YYYYMMDD解析(原fromisoformat不认miniQMT日期格式)
 2026-07-18 22:16:08 +08:00
claude_dev 96b1924fd5 feat: 实盘模拟(live) + 组合回测MVP(portfolio) 
[live] 实盘模拟 vnpy+miniQMT 直连(supervisor 轮询, 前后端):
- sanguo_live: LiveTradingEngine + AShareCtaTemplate(定寸/禁做空) + runner_supervisor(DB驱动) + persistence(4表WAL)
- sanguo_api/routes_live: 9路由(create/start/stop/positions/trades/account/status)
- frontend live: New/List/Monitor + api/live.ts; config/live.yaml

[portfolio] 组合回测 MVP(BulletTrade, 链路代码完成待验证):
- runner_backtest 加 JSON 入口(--json, BacktestEngine 顶层 import)
- sanguo_api/routes_portfolio: POST /portfolio/backtest SSH 触发 VPS 跑
- frontend PortfolioBacktest.vue + api/portfolio.ts: 表单+结果+净值曲线
- 路由/菜单注册(/backtest/portfolio 组合回测)
- 已知: MVP 链路未端到端验证, agent 改至中途被停; 待 Mac 起服务联调
 2026-07-18 20:04:16 +08:00
claude_dev a68cf4905e feat(portfolio): sanguo_portfolio 组合策略框架(BulletTrade+miniQMT,不用jqdatasdk) 
把聚宽"全天候轮动"(post48819)搬到 BulletTrade。融合=pip+扩展点注入
(SanguoMiniQmtProvider 继承 MiniQMTProvider 只 override get_fundamentals,
set_data_provider 公开 API 注入, BulletTrade 源码 0 改动)。

- providers: SanguoMiniQmtProvider 补 get_fundamentals(PershareIndex+自算PE/PS/PB/PCF/市值/ROIC)
- strategies/all_weather: 4选股函数+大小盘轮动+ETF兜底+涨停止损(聚宽风格翻译)
- factors(估值/ROIC自算) + filters(ST/涨跌停/次新/停牌)
- 88/88 测试 Mac+VPS 双过; VPS 回测 pipeline 跑通(修9bug:Capital单位/日期格式/百分数口径/11字段alias)
- 实盘 runner_live+runbook 就绪等交易日; DEFAULT_DATA_PROVIDER=miniqmt env 不装 jqdatasdk
- 文档: sanguo_portfolio_plan / portfolio_backtest_result / portfolio_live_runbook
 2026-07-18 19:08:18 +08:00