diff --git a/DEVLOG.md b/DEVLOG.md index 3ab9e14..369a0e2 100644 --- a/DEVLOG.md +++ b/DEVLOG.md @@ -1,5 +1,13 @@ # 开发节点记录(三系统量化交易) +## 2026年11月16日11:08 试探预算约束发布155 + +提交`6c5afe2`于11:05:35定向更新155的web与worker。开发机87组全量及41项预算专项通过;155候选web 87组、worker 86组断网全量通过,按各自实际镜像应用补丁,保留角色差异及原测试范围。排空后再次核对无在途再重建,其他28容器及唯一WS不变,私有配置、环境、挂载和业务参数保持。 + +11:07取得首轮自然盘中执行、成交回放、提议扫描等9类任务成功回执;雷赛网格已记录试探新增限制,所读盘中回执没有新委托,中文在线继续当日复核。持仓与历史批次全部字段不变,四方2700股。11:08:06接口200,连续确认1894096与接收一致,缺口、待入账、孤儿及在途0,资金6.9秒,数量和现金差0。镜像、备份、回退与脱敏证据见[整改接续](docs/交易计划与风险约束整改接续_2026-11-16.md)。 + +自然最低申报拒绝、报价和部分成交预算限制尚待实际样本;退出纪律、可承受亏损量化和分层评价仍未完成。没有人工触发模型或交易任务,没有更改历史确认、成交或账本。 + ## 2026年11月16日 试探预算工作包实现 按用户“开始推进”实施预算01至09:原预算独立保存、最低申报不扩大、强制试探同步重算、自动与人工采纳共用约束、报价和部分成交重新核算、账户锁内落单复核、旧进度回写保留已批准预算。历史试探本轮暂停自动新增,真实用户命令独立核验,正常卖出和既有做T回补继续。无DDL,无参数或账本迁移。 diff --git a/docs/evidence/trading_budget_release_20261116.json b/docs/evidence/trading_budget_release_20261116.json new file mode 100644 index 0000000..1bf622f --- /dev/null +++ b/docs/evidence/trading_budget_release_20261116.json @@ -0,0 +1,810 @@ +{ + "code_commit": "6c5afe2a82c2834e118dd8f530d7d2f0d93e476a", + "branch": "codex/trading-remediation-20261116", + "deployment": { + "deployed_at": "2026-11-16T11:05:35.906803+08:00", + "targets": [ + "pms-web", + "pms-worker" + ], + "drained": { + "active": 0, + "reserved": 0, + "scheduled": 0, + "active_queues": 0 + }, + "images": { + "web": "pms:remediation-budget-6c5afe2-web", + "worker": "pms:remediation-budget-6c5afe2-worker" + } + }, + "candidate": { + "code": "6c5afe2a82c2834e118dd8f530d7d2f0d93e476a", + "patch_sha256": "f3130aaf45d013325871840e30983c1afe8596a29923374fa94da3a3d5b9b77a", + "targets": { + "web": { + "base": "pms:remediation-grid-0ea114f-web", + "base_id": "sha256:421f64c76db6f07c8fd6436f8201b2dccecd38430ffe53d91e767fceb2e34141", + "candidate": "pms:remediation-budget-6c5afe2-web", + "image_id": "sha256:dc04b401c1640d914d2f8321114c9bd1dbccf3948a152dd7a882ddaafcfd7949", + "files": { + "app/core/action_engine.py": "38ddcfcba8dd381dc01221a6d851ea3866ca7d8f0298d5f14df4d407aa84ed0e", + "app/core/buy_budget.py": "3c8637a67c72a77fc0fd760013116a62075485de596696b88d5eefafefe083ae", + "app/db/session.py": "049bfe3ece4ea82e4896e6f35bca62e91a1e6efe5531fbe99fbe88f03e83586e", + "app/repo/pms_repo.py": "72eb28d20d387cccfd4faaf02b978f113a45ad4a8ccb7fbdecbc26af8da9110a", + "app/services/advice_service.py": "23daebf32ce0a6a1f34577f8198592cd3594cb73513a6cc27255a79440de0295", + "app/services/buy_budget.py": "e6d6636027483ef4aee0f9c2177a73130fd7bb88ef712e467d0d1b073d63af70", + "app/services/dispatcher.py": "e180d5902a87a3fd81f560efec93de869e20ad506797fe377f8806caedcca5e1", + "app/services/executor.py": "fbd90d82099931a1abcbccacbb694fe587f791558289656bfaf1fae7cc861fb0", + "app/services/plan_recheck.py": "f142997c53c02bac1b7bdb9323cd19159e6e36d6de6ffd228a7a7df37ada4f6b", + "app/services/proposal_service.py": "c2da8f57c328cec3b7ce51707a9219fcaad879a5fdbf7aa0536d888babc35777", + "app/services/rotation_execution.py": "678573a24ddc82c07e8a8a9e9b156ac763324d3c2089f0415242084b97a03d10", + "app/services/strategy_advisor.py": "445c10f3ec18306d44543778105185dc69ccc8db08daef4b5967b8cbb66645e7", + "app/services/strategy_runner.py": "5ae8a87757b17ca03d8a4492cc637017382c1491b0734242c340779b2aa6fd8f", + "app/web/main.py": "3015641db817a548cd978098770d57069bbecdd6eb31e83dcd88a31103d390e7", + "scripts/run_tests.py": "fdac8e04add5b745c7ea75c1948ebd9671b57c4955560fe37053ce8c08cef12c", + "scripts/test_batch10_units.py": "ec1550680a5b11292097e422559fe844e544219bfaba841f46c64a86fc1c7466", + "scripts/test_batch26_units.py": "faf2edc690a60a3c598f40721b275f5df802f86537e5ff08f8b2b7c3d816f876", + "scripts/test_batch51_units.py": "7dcb95fedf37a284de5a84cce754802fd7706f2e1ae927bfea7dc8edab8716b3", + "scripts/test_buy_budget.py": "e568223ce76792c733c17f0ceea59b237e60d0637e8f1df02e7b1201529882de", + "scripts/test_trade_correction_strategy.py": "63ebd103240417410fac5c7a2c0e6704fd3e1ec2f3ba751e6708c850bf9eea48", + "scripts/test_wiring.py": "c32cee9652474e6340dab32c92e8fc99ce3db6bd82678fc067a0b0a485afb1dc" + }, + "suites": 87, + "passed": true + }, + "worker": { + "base": "pms:remediation-grid-0ea114f-worker", + "base_id": "sha256:537afcc93e2ac138e546a5f89eb634f48d21eefb74492f6405814011653498ec", + "candidate": "pms:remediation-budget-6c5afe2-worker", + "image_id": "sha256:96bfd729fc83cdebf7a87393795898f893f7c16c4296fc152f15cac6840d42fd", + "files": { + "app/core/action_engine.py": "38ddcfcba8dd381dc01221a6d851ea3866ca7d8f0298d5f14df4d407aa84ed0e", + "app/core/buy_budget.py": "3c8637a67c72a77fc0fd760013116a62075485de596696b88d5eefafefe083ae", + "app/db/session.py": "049bfe3ece4ea82e4896e6f35bca62e91a1e6efe5531fbe99fbe88f03e83586e", + "app/repo/pms_repo.py": "72eb28d20d387cccfd4faaf02b978f113a45ad4a8ccb7fbdecbc26af8da9110a", + "app/services/advice_service.py": "23daebf32ce0a6a1f34577f8198592cd3594cb73513a6cc27255a79440de0295", + "app/services/buy_budget.py": "e6d6636027483ef4aee0f9c2177a73130fd7bb88ef712e467d0d1b073d63af70", + "app/services/dispatcher.py": "e180d5902a87a3fd81f560efec93de869e20ad506797fe377f8806caedcca5e1", + "app/services/executor.py": "fbd90d82099931a1abcbccacbb694fe587f791558289656bfaf1fae7cc861fb0", + "app/services/plan_recheck.py": "f142997c53c02bac1b7bdb9323cd19159e6e36d6de6ffd228a7a7df37ada4f6b", + "app/services/proposal_service.py": "c2da8f57c328cec3b7ce51707a9219fcaad879a5fdbf7aa0536d888babc35777", + "app/services/rotation_execution.py": "678573a24ddc82c07e8a8a9e9b156ac763324d3c2089f0415242084b97a03d10", + "app/services/strategy_advisor.py": "445c10f3ec18306d44543778105185dc69ccc8db08daef4b5967b8cbb66645e7", + "app/services/strategy_runner.py": "5ae8a87757b17ca03d8a4492cc637017382c1491b0734242c340779b2aa6fd8f", + "app/web/main.py": "6c254e168d6107c929f1da07d88ddb6676e7ebf2dcc0e4ef163abd868d11cdb6", + "scripts/run_tests.py": "ba42c9aefd8efc1b19cfbbc4259b301b430e4cfb7b752fd708cc9bf490da89ec", + "scripts/test_batch10_units.py": "78b2bf2764e5027f8676a53213ebbd95ac434c9e97a5019a66fefb30c912678f", + "scripts/test_batch26_units.py": "faf2edc690a60a3c598f40721b275f5df802f86537e5ff08f8b2b7c3d816f876", + "scripts/test_batch51_units.py": "7dcb95fedf37a284de5a84cce754802fd7706f2e1ae927bfea7dc8edab8716b3", + "scripts/test_buy_budget.py": "e568223ce76792c733c17f0ceea59b237e60d0637e8f1df02e7b1201529882de", + "scripts/test_trade_correction_strategy.py": "63ebd103240417410fac5c7a2c0e6704fd3e1ec2f3ba751e6708c850bf9eea48", + "scripts/test_wiring.py": "c32cee9652474e6340dab32c92e8fc99ce3db6bd82678fc067a0b0a485afb1dc" + }, + "suites": 86, + "passed": true + } + }, + "completed_at": "2026-11-16T11:04:03.854841+08:00" + }, + "verify": { + "at": "2026-11-16T11:06:24.768092+08:00", + "total_containers": 30, + "unchanged_other_containers": 28, + "targets": [ + { + "name": "pms-web", + "id": "3517f279e533fa2be854acfc222055d4d9354ee21cec5de7edc336a5d6aa4452", + "image": "sha256:dc04b401c1640d914d2f8321114c9bd1dbccf3948a152dd7a882ddaafcfd7949", + "tag": "pms:remediation-budget-6c5afe2-web", + "started": "2026-11-16T03:05:35.366139608Z", + "health": "healthy", + "files_match_candidate": true + }, + { + "name": "pms-worker", + "id": "e845d1717e77fb07bb2581f908fc4be92649997866e383559e9e01660e5f0859", + "image": "sha256:96bfd729fc83cdebf7a87393795898f893f7c16c4296fc152f15cac6840d42fd", + "tag": "pms:remediation-budget-6c5afe2-worker", + "started": "2026-11-16T03:05:35.366969331Z", + "health": null, + "files_match_candidate": true + } + ], + "private_configuration_unchanged": true, + "worker": { + "queues": [ + "celery" + ], + "tasks": [ + "pms.command_poll", + "pms.daily_report", + "pms.daily_settle", + "pms.execution_basis_refresh", + "pms.execution_cancel_confirm", + "pms.intraday_exec", + "pms.macro_scan", + "pms.monitor_watch_sync", + "pms.nav_snapshot", + "pms.plan_pull", + "pms.premarket", + "pms.proposal_scan", + "pms.replay_fills", + "pms.rotation_tick", + "pms.signal_digest", + "pms.strategy_attach", + "pms.t0_close", + "pms.tech_pull" + ] + } + }, + "backup_directory": "/home/factor/project/tradingSystem/backups/remediation-budget-20261116-6c5afe2", + "development_validation": { + "python": "3.12.14", + "full_suites": 87, + "budget_cases": 41, + "batch51_cases": 38, + "full_log": "/private/tmp/pms-budget-full-committed.log", + "full_log_sha256": "3c3271febe0cbe628a8319c38d9e15d9d3f5e437fe9202da81eff6e8f5338dd0", + "budget_log_sha256": "79180f05838d29412c7a4a0454fc2e18da426d69a9e92307b42363f4717f5547" + }, + "before": { + "at": "2026-11-16T11:05:14.867568+08:00", + "prefix": "", + "scope": "pms-sim-155", + "params": { + "PMS_DISPATCH_MODE": "ws", + "PMS_GLOBAL_BUY_HALT": false, + "PMS_GLOBAL_EXEC_HALT": false, + "PMS_AUTO_GRID_STEP_PCT": 0.04, + "PMS_RISK_EXIT_ENABLED": true, + "PMS_TIMING_FUSION_ENABLED": true, + "PMS_TIMING_FUSION_START_AT": "2026-11-11T16:17:11.269641+08:00", + "PMS_SELF_DECIDE_TRIAL": true + }, + "ws": { + "conn_state": "ONLINE", + "last_seq": 1894050, + "acked_seq": 1894050, + "resync_flag": 0, + "heartbeat_at": "2026-11-16 11:05:14", + "last_error": "", + "stat": { + "rx": 252054, + "tx": 459379, + "trades": 10, + "rejects": 0, + "reconnects": 2, + "dropped": 0, + "last_rx_at": "11:05:10", + "last_tx_at": "11:05:12", + "hs_server_seq": 1738206, + "hs_last_seq": 1738206, + "snap_positions_at": "11:04:59", + "snap_positions_n": 4, + "snap_funds_at": "11:04:59", + "seq_hwm": 1894050, + "peer_skew_ms": -4, + "ooo": 0, + "pending_gap": 0, + "funds_update_at": "10:00:54", + "funds_update_n": 10, + "position_update_at": "09:47:45", + "position_update_n": 6, + "last_close": "TimeoutError: timed out during handshake", + "peer_skew_min": -128, + "peer_skew_max": 2721 + } + }, + "funds": { + "seq": 1894046, + "received_at": "2026-11-16 11:04:59", + "age_sec": 15.8 + }, + "pending": 0, + "orphan": 0, + "open_orders": 0, + "reconciliation": { + "ok": true, + "diffs": [], + "fixes": [], + "errors": [], + "severity": "OK", + "source": "ws", + "note": "策略数量之和核对账户;不猜测差异归属,不自动把差异并入任何策略" + }, + "cash_difference": 0.0, + "valuation_ready": true, + "positions": [ + { + "strategy_book": null, + "ts_code": "002979.SZ", + "total_qty": 100, + "avg_cost": null, + "base_qty": 100 + }, + { + "strategy_book": null, + "ts_code": "300750.SZ", + "total_qty": 100, + "avg_cost": "252.880", + "base_qty": 100 + }, + { + "strategy_book": null, + "ts_code": "601126.SH", + "total_qty": 2700, + "avg_cost": "31.313", + "base_qty": 700 + }, + { + "strategy_book": null, + "ts_code": "603259.SH", + "total_qty": 100, + "avg_cost": "150.580", + "base_qty": 100 + } + ], + "files": { + "app/core/grid_inventory.py": "e72ef0b16bee924a4fc26ad6e30bc3608096cbc5176044adb27e644c74b335c8", + "app/services/strategy_runner.py": "560dc9afca5190325b8fd1a75c28fc3b4c19f19e57f7baabdc136b0c40002dd0", + "scripts/test_grid_execution.py": "55ca2b7c298a48f65e940238f8def173f247079f6601f7f68342fd58a80d7888" + }, + "http_health": 200, + "health": { + "status": "ok", + "version": "0.2.0-dev", + "service": "pms-web", + "now": "2026-11-16 11:05:15", + "trade_day": true, + "calendar_degraded": false, + "db_ok": true + } + }, + "after_drain": { + "at": "2026-11-16T11:05:31.429893+08:00", + "prefix": "", + "scope": "pms-sim-155", + "params": { + "PMS_DISPATCH_MODE": "ws", + "PMS_GLOBAL_BUY_HALT": false, + "PMS_GLOBAL_EXEC_HALT": false, + "PMS_AUTO_GRID_STEP_PCT": 0.04, + "PMS_RISK_EXIT_ENABLED": true, + "PMS_TIMING_FUSION_ENABLED": true, + "PMS_TIMING_FUSION_START_AT": "2026-11-11T16:17:11.269641+08:00", + "PMS_SELF_DECIDE_TRIAL": true + }, + "ws": { + "conn_state": "ONLINE", + "last_seq": 1894055, + "acked_seq": 1894055, + "resync_flag": 0, + "heartbeat_at": "2026-11-16 11:05:30", + "last_error": "", + "stat": { + "rx": 252059, + "tx": 459387, + "trades": 10, + "rejects": 0, + "reconnects": 2, + "dropped": 0, + "last_rx_at": "11:05:29", + "last_tx_at": "11:05:29", + "hs_server_seq": 1738206, + "hs_last_seq": 1738206, + "snap_positions_at": "11:05:29", + "snap_positions_n": 4, + "snap_funds_at": "11:05:29", + "seq_hwm": 1894053, + "peer_skew_ms": -15, + "ooo": 0, + "pending_gap": 0, + "funds_update_at": "10:00:54", + "funds_update_n": 10, + "position_update_at": "09:47:45", + "position_update_n": 6, + "last_close": "TimeoutError: timed out during handshake", + "peer_skew_min": -128, + "peer_skew_max": 2721 + } + }, + "funds": { + "seq": 1894055, + "received_at": "2026-11-16 11:05:29", + "age_sec": 2.3 + }, + "pending": 0, + "orphan": 0, + "open_orders": 0, + "reconciliation": { + "ok": true, + "diffs": [], + "fixes": [], + "errors": [], + "severity": "OK", + "source": "ws", + "note": "策略数量之和核对账户;不猜测差异归属,不自动把差异并入任何策略" + }, + "cash_difference": 0.0, + "valuation_ready": true, + "positions": [ + { + "strategy_book": null, + "ts_code": "002979.SZ", + "total_qty": 100, + "avg_cost": null, + "base_qty": 100 + }, + { + "strategy_book": null, + "ts_code": "300750.SZ", + "total_qty": 100, + "avg_cost": "252.880", + "base_qty": 100 + }, + { + "strategy_book": null, + "ts_code": "601126.SH", + "total_qty": 2700, + "avg_cost": "31.313", + "base_qty": 700 + }, + { + "strategy_book": null, + "ts_code": "603259.SH", + "total_qty": 100, + "avg_cost": "150.580", + "base_qty": 100 + } + ], + "files": { + "app/core/grid_inventory.py": "e72ef0b16bee924a4fc26ad6e30bc3608096cbc5176044adb27e644c74b335c8", + "app/services/strategy_runner.py": "560dc9afca5190325b8fd1a75c28fc3b4c19f19e57f7baabdc136b0c40002dd0", + "scripts/test_grid_execution.py": "55ca2b7c298a48f65e940238f8def173f247079f6601f7f68342fd58a80d7888" + }, + "http_health": 200, + "health": { + "status": "ok", + "version": "0.2.0-dev", + "service": "pms-web", + "now": "2026-11-16 11:05:31", + "trade_day": true, + "calendar_degraded": false, + "db_ok": true + } + }, + "after": { + "at": "2026-11-16T11:08:06.102021+08:00", + "prefix": "", + "scope": "pms-sim-155", + "params": { + "PMS_DISPATCH_MODE": "ws", + "PMS_GLOBAL_BUY_HALT": false, + "PMS_GLOBAL_EXEC_HALT": false, + "PMS_AUTO_GRID_STEP_PCT": 0.04, + "PMS_RISK_EXIT_ENABLED": true, + "PMS_TIMING_FUSION_ENABLED": true, + "PMS_TIMING_FUSION_START_AT": "2026-11-11T16:17:11.269641+08:00", + "PMS_SELF_DECIDE_TRIAL": true + }, + "ws": { + "conn_state": "ONLINE", + "last_seq": 1894096, + "acked_seq": 1894096, + "resync_flag": 0, + "heartbeat_at": "2026-11-16 11:08:04", + "last_error": "", + "stat": { + "rx": 252100, + "tx": 459463, + "trades": 10, + "rejects": 0, + "reconnects": 2, + "dropped": 0, + "last_rx_at": "11:08:00", + "last_tx_at": "11:08:01", + "hs_server_seq": 1738206, + "hs_last_seq": 1738206, + "snap_positions_at": "11:07:59", + "snap_positions_n": 4, + "snap_funds_at": "11:07:59", + "seq_hwm": 1894096, + "peer_skew_ms": -5, + "ooo": 0, + "pending_gap": 0, + "funds_update_at": "10:00:54", + "funds_update_n": 10, + "position_update_at": "09:47:45", + "position_update_n": 6, + "last_close": "TimeoutError: timed out during handshake", + "peer_skew_min": -128, + "peer_skew_max": 2721 + } + }, + "funds": { + "seq": 1894095, + "received_at": "2026-11-16 11:07:59", + "age_sec": 6.9 + }, + "pending": 0, + "orphan": 0, + "open_orders": 0, + "reconciliation": { + "ok": true, + "diffs": [], + "fixes": [], + "errors": [], + "severity": "OK", + "source": "ws", + "note": "策略数量之和核对账户;不猜测差异归属,不自动把差异并入任何策略" + }, + "cash_difference": 0.0, + "valuation_ready": true, + "positions": [ + { + "strategy_book": null, + "ts_code": "002979.SZ", + "total_qty": 100, + "avg_cost": null, + "base_qty": 100 + }, + { + "strategy_book": null, + "ts_code": "300750.SZ", + "total_qty": 100, + "avg_cost": "252.880", + "base_qty": 100 + }, + { + "strategy_book": null, + "ts_code": "601126.SH", + "total_qty": 2700, + "avg_cost": "31.313", + "base_qty": 700 + }, + { + "strategy_book": null, + "ts_code": "603259.SH", + "total_qty": 100, + "avg_cost": "150.580", + "base_qty": 100 + } + ], + "files": { + "app/core/grid_inventory.py": "e72ef0b16bee924a4fc26ad6e30bc3608096cbc5176044adb27e644c74b335c8", + "app/services/strategy_runner.py": "5ae8a87757b17ca03d8a4492cc637017382c1491b0734242c340779b2aa6fd8f", + "scripts/test_grid_execution.py": "55ca2b7c298a48f65e940238f8def173f247079f6601f7f68342fd58a80d7888" + }, + "http_health": 200, + "health": { + "status": "ok", + "version": "0.2.0-dev", + "service": "pms-web", + "now": "2026-11-16 11:08:06", + "trade_day": true, + "calendar_degraded": false, + "db_ok": true + } + }, + "runtime_comparison": { + "before_at": "2026-11-16T10:43:53.091130", + "after_at": "2026-11-16T11:06:56.976026", + "params_equal": true, + "codes": { + "002979.SZ": { + "position_equal": true, + "lots_equal": true, + "before_qty": 100, + "after_qty": 100 + }, + "300364.SZ": { + "position_equal": true, + "lots_equal": true, + "before_qty": null, + "after_qty": null + }, + "300750.SZ": { + "position_equal": true, + "lots_equal": true, + "before_qty": 100, + "after_qty": 100 + }, + "601126.SH": { + "position_equal": true, + "lots_equal": true, + "before_qty": 2700, + "after_qty": 2700 + }, + "603259.SH": { + "position_equal": true, + "lots_equal": true, + "before_qty": 100, + "after_qty": 100 + } + } + }, + "live_budget_check": { + "at": "2026-11-16T11:06:20.643057", + "scope": "pms-sim-155", + "positions": { + "002979.SZ": { + "qty": 100, + "buy_restriction": "本轮为试探仓,暂停网格及其他自动加仓;扩大投入须明确新的买入命令" + }, + "300750.SZ": { + "qty": 100, + "buy_restriction": "本轮为试探仓,暂停网格及其他自动加仓;扩大投入须明确新的买入命令" + }, + "601126.SH": { + "qty": 2700, + "buy_restriction": "" + }, + "603259.SH": { + "qty": 100, + "buy_restriction": "本轮为试探仓,暂停网格及其他自动加仓;扩大投入须明确新的买入命令" + } + }, + "parents": { + "INS_20261112_300364SZ_OPEN_001_b8a67bfde6f2": { + "code": "300364.SZ", + "status": "WAIT_REVIEW", + "budget": { + "version": 1, + "ts_code": "300364.SZ", + "amount": "17226.00", + "scale": "1.72260E+6", + "target_pct": "0.010", + "quantity_limit": 600, + "tier": "试探仓", + "basis": "买入成交金额,不含另记的交易费用", + "revision": "9d406551056d9ac5fe97a5ec" + } + } + } + }, + "natural": { + "at": "2026-11-16T11:07:01.257022+08:00", + "success_counts": { + "pms.execution_basis_refresh": 1, + "pms.command_poll": 1, + "pms.rotation_tick": 1, + "pms.monitor_watch_sync": 1, + "pms.replay_fills": 1, + "pms.signal_digest": 1, + "pms.execution_cancel_confirm": 1, + "pms.intraday_exec": 1, + "pms.proposal_scan": 1 + }, + "failed_task_names": [], + "results": { + "pms.execution_basis_refresh": { + "task_id": "acc0a997-9240-4581-9344-f753b185e1a0", + "status": "SUCCESS", + "result": { + "enabled": true, + "refreshed": [], + "errors": [], + "skipped": [], + "risk_reviews": { + "enabled": true, + "ok": true, + "reviews": {}, + "errors": [], + "skipped": "尚未到持仓评析刷新时间" + } + } + }, + "pms.replay_fills": { + "task_id": "d9286477-b296-4bb6-ae67-a86752f369d8", + "status": "SUCCESS", + "result": { + "ok": true, + "fills": 0, + "actions": 0, + "alerts": [], + "errors": [], + "cursor": "2026-11-13 10:00:54", + "ws": { + "ok": true, + "trades": 0, + "actions": 0, + "fees": 0, + "alerts": [], + "errors": [] + }, + "corrections": { + "ok": true, + "applied": 0, + "waiting": 0, + "held": 0, + "errors": [], + "alerts": [] + }, + "light_recon": { + "diffs": 0, + "severity": "OK" + } + } + }, + "pms.intraday_exec": { + "task_id": "28f8a6f3-0259-43c6-825f-620c13b9477f", + "status": "SUCCESS", + "result": { + "materialized": { + "created": [], + "skipped": [], + "errors": [], + "scanned": 0, + "note": "没有 PENDING 方案可转 —— 这**不是**失败。当前方案分布: 一条方案都没有。EXECUTING = 已经转过指令了 (看 make t-ins); GATED = 等动作引擎解锁的批", + "plans_by_status": { + "GATED": 0, + "EXECUTING": 0, + "DONE": 0 + } + }, + "execution_basis": { + "cancelled": [ + { + "ok": true, + "confirmed": true, + "pending": false, + "cancel_pending": false, + "status": "CANCELLED", + "message": "指令 INS_20261113_688100SH_OPEN_140908 已结束" + }, + { + "ok": true, + "confirmed": true, + "pending": false, + "cancel_pending": false, + "status": "EXPIRED", + "message": "指令 INS_20261112_603533SH_OPEN_001_c8edfe45ad10 已结束" + }, + { + "ok": true, + "confirmed": true, + "pending": false, + "cancel_pending": false, + "status": "CANCELLED", + "message": "指令 STR20261109100402_601126SH_g 已结束" + }, + { + "ok": true, + "confirmed": true, + "pending": false, + "cancel_pending": false, + "status": "CANCELLED", + "message": "指令 INS_20261109_300750SZ_OPEN_93201 已结束" + }, + { + "ok": true, + "confirmed": true, + "pending": false, + "cancel_pending": false, + "status": "EXPIRED", + "message": "指令 INS_20261106_601126SH_OPEN_93200 已结束" + }, + { + "ok": true, + "confirmed": true, + "pending": false, + "cancel_pending": false, + "status": "EXPIRED", + "message": "指令 INS_20261105_300124SZ_OPEN_001_ada7d8ae8bda 已结束" + }, + { + "ok": true, + "confirmed": true, + "pending": false, + "cancel_pending": false, + "status": "EXPIRED", + "message": "指令 INS_20261105_603667SH_OPEN_001_9c23abd05c05 已结束" + }, + { + "ok": true, + "confirmed": true, + "pending": false, + "cancel_pending": false, + "status": "EXPIRED", + "message": "指令 INS_20261105_688100SH_OPEN_101100 已结束" + }, + { + "ok": true, + "confirmed": true, + "pending": false, + "cancel_pending": false, + "status": "EXPIRED", + "message": "指令 INS_20261103_688017SH_OPEN_001_46624bd10d91 已结束" + }, + { + "ok": true, + "confirmed": true, + "pending": false, + "cancel_pending": false, + "status": "EXPIRED", + "message": "指令 INS_20261103_601126SH_OPEN_001_4515a80d3f58 已结束" + }, + { + "ok": true, + "confirmed": true, + "pending": false, + "cancel_pending": false, + "status": "EXPIRED", + "message": "指令 INS_20261103_002979SZ_OPEN_001_134e680ae814 已结束" + } + ], + "replacing": [], + "errors": [] + }, + "risk_exit": { + "enabled": true, + "reviews": { + "002979.SZ": "same", + "300750.SZ": "missing", + "601126.SH": "same", + "603259.SH": "same", + "603667.SH": null, + "688025.SH": null, + "688100.SH": null + }, + "errors": [], + "ok": true + }, + "strategies": { + "enabled": true, + "checked": 2, + "fired": [], + "queued": [], + "skipped": [], + "notes": [ + "601126.SH 自动网格买入等待三源合议放行:等待新的有效合成择时", + "002979.SZ 自动网格买入等待三源合议放行:等待新的有效合成择时", + "002979.SZ 本轮为试探仓,暂停网格及其他自动加仓;扩大投入须明确新的买入命令" + ], + "errors": [], + "dry_run": false, + "ok": true + }, + "swept": { + "expired": [], + "partial": [], + "synced": 0, + "errors": [] + }, + "ok": true, + "checked": 1, + "fired": [], + "waited": [ + { + "instruction_id": "INS_20261112_300364SZ_OPEN_001_b8a67bfde6f2", + "code": "300364.SZ", + "reason": "跨日买入尚未完成当日决策复核" + } + ], + "rejected": [], + "errors": [], + "mode": "ws", + "dry_run": false + } + } + } + }, + "pending_acceptance": [ + "Natural minimum-lot rejection with an otherwise eligible buy", + "Natural repricing and partial-fill budget enforcement", + "Grid new-price restriction and booked-sale reopening cycle" + ], + "scope": "155 simulation only; no parameter change, no historical trade rewrite, no injected orders or manually triggered trading/model tasks", + "overlay_notes": { + "method": "Apply committed business patch against each actual base image; preserve role-specific unrelated code", + "web_differences_from_commit": [ + "scripts/run_tests.py (preserve base registry and add budget suite)" + ], + "worker_differences_from_commit": [ + "app/web/main.py (preserve base ETF functionality)", + "scripts/run_tests.py (preserve base registry and add budget suite)", + "scripts/test_batch10_units.py (preserve base guards and add accept_open guard)" + ] + } +} diff --git a/docs/交易计划与风险约束整改接续_2026-11-16.md b/docs/交易计划与风险约束整改接续_2026-11-16.md index 3e3a30d..39caca9 100644 --- a/docs/交易计划与风险约束整改接续_2026-11-16.md +++ b/docs/交易计划与风险约束整改接续_2026-11-16.md @@ -1,6 +1,6 @@ # 交易计划与风险约束整改接续 -最新运行核验时间:2026年11月16日09:52:39,北京时间。首个网格工作包已发布155模拟PMS;试探预算约束已实现,候选发布与自然判收尚待完成。 +最新运行核验时间:2026年11月16日11:08:06,北京时间。网格库存约束与试探预算约束均已发布155模拟PMS。下一工作包是退出纪律的证据与可达性核验;新的止损阈值尚未上线。 ## 当前工作 @@ -17,16 +17,37 @@ | 工作包 | 状态 | 下一项证据 | | --- | --- | --- | | 关键交易核验 | 主要路径已确认 | 杰普特两次模型完整输入仍缺;不阻塞确定性数量与库存修复 | -| 试探预算约束 | 已开发,准备独立发布 | 候选镜像断网全量、155健康与自然回执 | +| 试探预算约束 | 已开发并发布155,隔离回归与自然调度通过 | 自然最低申报拒绝、报价变化及部分成交后的预算限制 | | 网格库存约束 | 已开发并发布155,隔离回归与自然调度通过 | 自然行情触发库存限制,以及卖出入账后恢复同价循环 | | 退出方案 | 待核验与设计 | 二次确认可达性和价格失效比较 | | 分层评价与产品验收 | 待实施 | 历史冻结名单覆盖与当前页面任务检查 | -## 155发布与实际回执 +## 155试探预算发布与实际回执 + +代码`6c5afe2`于11:05:35完成定向发布。开发机Python3.12全量87组、预算专项41项与batch51的38项隔离通过。155候选web断网全量87组、worker断网全量86组通过。实现和预算01至09映射见[试探预算验收记录](试探预算约束实现与验收_2026-11-16.md)。 + +| 服务 | 当前镜像 | 镜像摘要 | +| --- | --- | --- | +| web | `pms:remediation-budget-6c5afe2-web` | `sha256:dc04b401c1640d914d2f8321114c9bd1dbccf3948a152dd7a882ddaafcfd7949` | +| worker | `pms:remediation-budget-6c5afe2-worker` | `sha256:96bfd729fc83cdebf7a87393795898f893f7c16c4296fc152f15cac6840d42fd` | + +分别从两个服务的现用网格修复镜像应用本次21个Python文件补丁。web只保留原测试清单说明;worker另保留自身较早的ETF页面后端与测试登记,没有追平无关功能。业务补丁均实际应用,角色差异文件及最终摘要已归档,不能把所有文件都声称为与本地HEAD逐字相同。 + +发布前停止目标worker消费并等待active、reserved、scheduled、消费队列均为0;排空后再次确认无在途、无待入账且对账正常,才替换两个镜像。其他28个容器的身份、镜像和启动时间不变;唯一WS未重建。私有配置、挂载、环境和ParamStore值保持,服务器源码HEAD仍为`8413bce`。 + +11:07读取到新worker首轮自然盘中执行、成交回放、提议扫描等9类任务成功,无任务失败及执行错误。自然策略回执已识别雷赛本轮试探仓并暂停自动新增;同时仍有择时等待条件,所以不将这一回执表述为“单独由预算挡下一笔原本会成交的单”。中文在线继续等待当日复核,四方继续等待有效合成择时,所读盘中回执没有新增委托。 + +实际新worker的只读核验与发布前断网影响计算一致:雷赛、宁德、药明本轮自动新增暂停,中文在线原17226元计划受当日复核和预算限制,四方标准仓保留原策略规则。10:43与11:06快照中这五只股票的持仓记录、历史批次全部字段相同,四方仍2700股。 + +11:08:06最终健康接口200;接收与连续确认均为1894096,缺口、待入账、孤儿、在途委托均为0;资金快照年龄6.9秒,数量和现金对账差异均为0。脱敏回执见[预算发布证据](evidence/trading_budget_release_20261116.json)。私有备份在服务器`/home/factor/project/tradingSystem/backups/remediation-budget-20261116-6c5afe2`。 + +回退须先核对期间成交及在途,保持受影响试探新增路径停止,再恢复备份中的两个网格阶段镜像;不回退账本、不删除预算记录、不重建WS。旧镜像没有本次预算保护,不能直接恢复试探自动新增。当前只保证资金投入约束,不宣称已经确定最大可承受亏损。 + +## 155网格阶段发布回执(历史) 代码提交`0ea114f`于09:50:15完成发布。以两个服务各自现用镜像为底层,仅叠加`app/core/grid_inventory.py`、`app/services/strategy_runner.py`和`scripts/test_grid_execution.py`三个文件。候选web断网全量86组、worker断网全量85组均通过,差异来自现用底层版本,没有顺带追平其他业务代码。 -| 服务 | 当前镜像 | 镜像摘要 | +| 服务 | 该次镜像,现已由预算版本替换 | 镜像摘要 | | --- | --- | --- | | web | `pms:remediation-grid-0ea114f-web` | `sha256:421f64c76db6f07c8fd6436f8201b2dccecd38430ffe53d91e767fceb2e34141` | | worker | `pms:remediation-grid-0ea114f-worker` | `sha256:537afcc93e2ac138e546a5f89eb634f48d21eefb74492f6405814011653498ec` | @@ -41,6 +62,8 @@ ## 下一步开发入口 -工作包二实现与预算01至09映射见[试探预算约束实现与验收](试探预算约束实现与验收_2026-11-16.md)。开发机预算专项41项和batch51共38项隔离通过,完整代码候选仍须断网全量后发布。退出工作包继续做证据独立性和等待可达性核验,新止损阈值尚未确定,不能擅自上线。 +工作包二已完成上述发布。下一步按规格工作包四,先读取四方等现有停买轮次的首次证据、后续证据和去重原因,逐组检查同日获得第二次独立确认的可能性;再形成正常兑现、风险失效和等待超期复核三条路径的开发规格。离线比较现行规则、原入场支撑或网格下沿失效、超期转人工复核,不凭单一股票确定固定止损百分比。 -本轮已修改网格业务代码、测试和文档并完成上述定向发布,没有修改运行参数、人工触发模型或交易tick、注入测试委托。预算约束正在准备发布,退出方案和分层评价仍未完成,不能因网格发布成功而标为整项完成。 +完整最大亏损、失效价与等待期限尚未确定;计划升级的产品流程、分层收益评价、页面任务验收及上述自然交易样本仍待完成。 + +本轮已修改网格和预算业务代码、测试及文档并完成上述定向发布,没有修改运行参数、人工触发模型或交易tick、注入测试委托。退出方案和分层评价仍未完成,不能将本阶段发布标为整项整改完成。 diff --git a/docs/开发入口.md b/docs/开发入口.md index d40ace8..b7151c3 100644 --- a/docs/开发入口.md +++ b/docs/开发入口.md @@ -1,6 +1,6 @@ # 开发资料入口 -11月16日试探预算工作包已实现,范围与逐项验收见[试探预算约束实现与验收](试探预算约束实现与验收_2026-11-16.md)。候选构建、155发布与自然判收以[整改接续](交易计划与风险约束整改接续_2026-11-16.md)最新时间为准。 +11月16日11:05:35已在155发布试探预算约束,范围与预算01至09验收见[实现与验收](试探预算约束实现与验收_2026-11-16.md)。11:08对账正常,雷赛自然回执已识别试探新增限制;报价及部分成交自然样本仍待判收。实际镜像与后续退出工作入口见[整改接续](交易计划与风险约束整改接续_2026-11-16.md)。 11月13日宽基查询、当日分时和类别简称见[最新接续](宽基查询接口与分时展示接续_2026-11-13.md)。13:17仅更新web为etf-names-975fa5a,177只ETF按8类跟踪指数显示简称,取消前置标签和名称悬停,点击保留原基金详情。日内只显示北京时间当日,每日净额与60日趋势保持;13:18线上映射、页面及只读对账通过。 diff --git a/docs/试探预算约束实现与验收_2026-11-16.md b/docs/试探预算约束实现与验收_2026-11-16.md index 99afb0f..5886b3f 100644 --- a/docs/试探预算约束实现与验收_2026-11-16.md +++ b/docs/试探预算约束实现与验收_2026-11-16.md @@ -1,6 +1,6 @@ # 试探预算约束实现与验收 -本记录对应[整改规格](交易计划与风险约束整改规格_2026-11-16.md)工作包二。11月16日完成实现和只读影响核验;发布状态以[整改接续](交易计划与风险约束整改接续_2026-11-16.md)的最新时间为准。 +本记录对应[整改规格](交易计划与风险约束整改规格_2026-11-16.md)工作包二。11月16日11:05:35已发布155模拟PMS,11:08:06完成运行核验;镜像与回执见[整改接续](交易计划与风险约束整改接续_2026-11-16.md)。 ## 交易行为 @@ -40,7 +40,7 @@ | 预算08 | 试探未成交时其他路径不能抢先买入;持仓轮次的网格、普通加仓和做T新增被限制;清仓新轮次、标准仓、其他策略账本、真实用户命令及做T回补保持各自规则 | | 预算09 | 两个并发采纳只有一个父指令;真实最终落单入口在账户锁内读取变化后的预算,超限时不写委托或资金预留;数据库原子采纳复用外层事务 | -41项预算专项和38项batch51测试已在开发机Python3.12隔离通过。最终全量及服务器候选镜像结果需在发布记录中补充,不把单机通过当作155判收。`test_batch26_units.py`原来要求最低数量向上抬仓的断言,已改为预算不足零数量;其他策略的标准仓测试使用可追溯预算桩。 +41项预算专项和38项batch51测试已在开发机Python3.12隔离通过,开发机全量87组通过。155候选web断网全量87组、worker断网全量86组通过;两角色保留自身原有功能和测试范围。`test_batch26_units.py`原来要求最低数量向上抬仓的断言,已改为预算不足零数量;其他策略的标准仓测试使用可追溯预算桩。 ## 11月16日10:43只读快照的影响 @@ -58,4 +58,4 @@ ## 尚未完成的判收 -真实行情自然触发新预算拦截、自然报价变化与成交后续买,需要单独记录。发布后的接口健康、调度成功不能代替这些交易场景。新的可承受亏损预算、显式计划升级产品流程、网格适用性研究、退出证据独立性和等待期限仍属于后续工作包。 +实际新worker只读核验与上述影响一致。首轮自然盘中回执已识别雷赛试探仓并限制自动新增,所读回执未产生新委托;同期仍有择时等待条件。自然最低申报拒绝、自然报价变化与成交后续买仍需要单独记录,不能用调度成功代替这些交易场景。新的可承受亏损预算、显式计划升级产品流程、网格适用性研究、退出证据独立性和等待期限仍属于后续工作包。