合入155已发布的委托和跨日复核修复
This commit is contained in:
commit
7fe3c5d046
53
DEVLOG.md
53
DEVLOG.md
|
|
@ -2612,3 +2612,56 @@ QMT11:53:36至11:54:04短暂中断,自动重连恢复,外部原因未核实
|
|||
新增第7图,固定热度0.80及每边30基点,复用已有结果展示1至10日:单日完整41日样本、单日共同池24日和历史至少5次共同池24日。单日41日样本H1/H5/H10平均每批净收益分别为−0.88%/−1.40%/−3.40%;分别标明时间窗口,不将样本变化归因于频次。前六张PNG逐字节不变。保留原图集文件路径,更新开发入口。
|
||||
|
||||
开发机macOS核验时间2026-10-30T13:24:29.443371+08:00。全部436行绘图数据、源摘要、引用与Python语法通过;独立Chrome验证7图加载、新旧目录跳转、明细展开及430像素无页面横向溢出,外部请求和页面错误均为0;新增图与说明页面已目视。当前状态见research/strategy_chart_review_20261030/manifest.json。本次补充已完成,没有新回测、数据库访问、参数修改或部署;原有114行DEVLOG和10行复盘台账保持未暂存。
|
||||
|
||||
## 2026-10-30 跨日买入决策复核
|
||||
|
||||
- 在独立工作树补齐跨日买入复核,保护主工作树的吸筹研究。旧买单先撤销并等待成交入账,再重新走当日排名、研判、规则和数量;执行价格重新咨询,人工确认按原档位办理。
|
||||
- 增加持久复核状态、执行和发送出口守卫、条件更新与同事务审计;保留原父指令及真实成交。页面展示复核状态与真实委托限价。
|
||||
- 155两笔旧委托已于09:39请求撤销,09:47确认两笔均撤销且0成交。部署和运行判收另记,详见[跨日复核记录](docs/跨日买入决策复核_2026-10-30.md)。
|
||||
|
||||
- 10:16:14最终发布pms:daily-review-8f8beba至155的web、worker及唯一ws;155代码提交12b9c22。beat、业务环境和挂载保持。只启用PMS_DAILY_BUY_REVIEW,不改用户暂停及微盘参数。整条命令撤销和策略接管已识别复核等待状态。
|
||||
- 本地与155最终候选镜像全量隔离断网回归、36项专项、页面三道护栏通过。1440/390浏览器重放通过、0写请求;最终HTML摘要与验收文件一致。
|
||||
- 10:17:39 QMT确认序号1501742较前次1501727推进,序号相等、无缺口及新增拒绝、无待入账与待归属;资金年龄26.3秒,持仓与现金差异0。盛弘旧任务因当日吸筹条件未通过而结束;威胜昨日任务结束,保留今天独立确认的新指令(首批400股、23.30,受理未成交)。不伪称自然覆盖全部恢复分支。证据见docs/evidence/pms_daily_buy_review_20261030.json。
|
||||
|
||||
|
||||
## 2026-10-30 普通限价当日有效与撤单成交边界
|
||||
|
||||
- 用户给出的威胜D02已核实:10:22:02发出,PMS有效期10:32:00,QMT于10:32:01.896按valid_until到期撤单、零成交,PMS没有主动撤此单。原10分钟分片设置在QMT价格等待模式下造成反复撤挂。
|
||||
- 用户确认改为当日有效。新增ParamStore开关PMS_EXEC_QMT_DAY_ORDER,155开启;普通执行器QMT限价单至15:00,微盘、网格和做T窗口及次日完整决策不改。补齐撤单拒绝与下单拒绝区分、累计量防倒退、发送状态不覆盖先到回报、传输不确定时必须向QMT撤单、撤单查询失败仍停止父任务等处理。迟到成交继续归原策略,原有资金占用口径保留。
|
||||
- 本机源码64af252、2eaec70;开发机已有全量回归通过,最终新增22专项通过。155最终候选镜像断网、只读、1核512MiB全量ALL SUITES PASS;10:52:39发布pms:day-order-2eaec70至web/worker/唯一ws,服务器源码6702090。worker发布前空闲,beat/监控、实际环境与挂载不变;没有碰188、研究容器、用户暂停和持仓。
|
||||
- 真机10:53:05自然发出威胜D05、400股@23.30,QMT ACCEPTED,截止当日15:00。10:54:05连续确认1502309、无新拒绝或额外重连、资金27.8秒、待入账0、孤儿0、数量及现金对账0差异。撤单成交竞争为隔离验证,未制造真实测试成交;收盘到期尚待自然运行。
|
||||
- 回退需先停止新增并保留在途回报;已发单期限不能靠关闭参数缩短。详细说明和证据见docs/限价单有效期与撤单成交边界_2026-10-30.md及docs/evidence/pms_day_order_cancel_20261030.json。主工作树吸筹研究未合并,CLAUDE.md不动。
|
||||
|
||||
|
||||
## 2026-10-30 收盘复核与已过期续单修复
|
||||
|
||||
- 155在16:15至16:25复核:50股快照08:50:08冻结、08:51被PMS自然读取,历史分位10.05%,无信号、微盘空仓;50只均为沪深证券且资格、排序和版本一致。15:20日终记录健康。未查看188,未生成测试信号或交易,未变更用户暂停和策略参数。
|
||||
- 威胜D05于10:53受理,15:00:02.787因valid_until自然到期、零成交,确认上午改为当日有效已实际生效。15:00:16多生成的D06仍用15:00期限,随后被本地出口作废,未发QMT。定位到交易时段包含15:00整分钟、执行器缺少截止前检查;本次在QMT价格等待和委托生成前各补检查,14:59行为保持。
|
||||
- 源码47f5621、155补丁39d209a;17项专项、本地及155候选镜像全量断网回归通过。16:22:05仅web/worker重建为pms:close-boundary-47f5621,发布前worker空闲,环境、挂载和页面摘要保持;ws仍day-order-2eaec70,beat与监控未动。修复后自然收盘边界尚未再次发生,撤单成交竞争仍为隔离验证,不冒充真机案例。
|
||||
- 16:25:45确认1507616较16:15的1507453推进,最新160条连续,无新增拒绝、重连、待入账或孤儿成交;资金年龄6.5秒、冻结0、无活动子委托。四方2700股和汇川200股按原策略归属,总资产1,995,983元,数量及现金对账差异0。今日汇川成交已入账,无归档旧仓回流。费用回报仍null,不补造费用;11月2日快照待今日收盘源数据。
|
||||
- 更新自动复核提示和阶段接续,保留16:10日程与无变化静默规则。记录见docs/微盘轮动每日复核_2026-10-30.md及docs/evidence/micro50_daily_20261030.json。主工作树及155私有修改保留,不同步CLAUDE.md。完整微盘自然入退场仍待信号,继续运行复核。
|
||||
|
||||
|
||||
## 2026-11-02 QMT下单策略标识与取消对话定时复核
|
||||
|
||||
按用户要求,place_order只新增strategy_type:subjective_quant对应主观量化,micro_rotation对应微盘轮动。按持久父指令账本归类,轮换筹资的原策略卖单仍属主观量化;数量、价格、有效期、备注和幂等键不变,撤单与查询报文不变。读取失败保留队列;新字段参与原有完整payload签名,协议文档升V1.0.2而信封与握手版本不改,无DDL或业务参数变更。
|
||||
|
||||
源码578a2fa,新增8项隔离测试,本地及155候选镜像全量断网回归通过,历史签名向量及页面护栏通过。开发机补齐requirements依赖后使用独立测试环境,生产镜像依赖保持。155首次发布前一致性检查中止且未写配置或重启,随后同样条件重新采样通过;09:07:31只将pms-ws重建为pms:strategy-type-578a2fa,服务器补丁4059b6f。其余容器、实际环境、挂载及用户暂停保持,未触及188。
|
||||
|
||||
09:08:20确认1569713较发布后1569698推进,最新160条连续,缺口、新拒绝、额外重连、待入账与孤儿0;资金21.2秒,数量和现金对账差异0、无在途。没有生成测试委托,真实QMT接收和保存新字段仍待自然下单,不冒充完成对端验收。说明及证据见docs/QMT下单策略类型_2026-11-02.md和docs/evidence/pms_qmt_strategy_type_20261102.json。
|
||||
|
||||
通过Codex自动任务工具删除本对话30-pms,返回deleted,配置文件也已不存在;不再进行定时聊天复核,PMS自身业务调度不受影响。阶段接续已更新,主项目研究修改、其他工作树和服务器私有文件保留,CLAUDE.md未修改。
|
||||
|
||||
## 2026-11-02 交易指令按策略分组
|
||||
|
||||
用户要求PMS交易指令也区分主观量化和微盘轮动,保持系统风格。交易员与管理视图采用策略标签,保留状态分类;消息显示策略并正确跳转。补齐两账本查询和撤单范围,确认框标明策略,同名股票不混用;轮动哈希指令终态按创建日期保留当日显示,读取失败不冒充空仓。没有调整价格、数量、有效期或执行决策。
|
||||
|
||||
本地源码716e215;155代码381ddf8,09:39:49仅web完成pms:instruction-books-716e215发布,其他容器与参数不动。开发机14项专项、全量隔离及页面三道护栏通过;155候选镜像断网全量ALL SUITES PASS。Chrome桌面1440和窄屏390以真实只读数据和隔离场景复现分账、计数、终态、消息、错误及撤单确认关闭,错误与写请求均0,部署HTML再次通过。未执行真实撤单或制造委托。
|
||||
|
||||
09:40:32实机连续确认1570221,缺口、待入账、孤儿及新增拒绝0,资金24.2秒,数量现金对账一致;最新两策略接口归属正确。微盘当前无指令,自然成交和撤单仍待实际发生,不能把回放当真机案例。自动复核仍按上次用户要求取消。详见docs/交易指令策略分组_2026-11-02.md及发布证据。
|
||||
|
||||
## 2026-11-02 10:13 · 按用户授权再次重置155模拟仓
|
||||
|
||||
用户确认QMT已清空,初始总规模1,967,927.74元。新增一次性双账本重置脚本及9项隔离测试,本地提交332f008,155补丁36d6ad7,维护镜像pms:sim-reset-332f008断网全量回归ALL SUITES PASS。09:45暂停并温和停止worker/beat,10:08:20将旧持仓、批次、任务、提议、个股策略、流水及净值完整备份后事务清理,实际空仓现金成为新本金,PMS_TOTAL_SCALE同步,净值1.0000。保留规则8%/85%/50只、429条通道委托、1279条逐笔成交及处理标记、操作审计和信号去重;旧轮换资本与收益文档归档,通道序号不动。
|
||||
|
||||
真机见过:暂停期间两账本持仓与任务清零,回放新增成交和动作均0;10:11:32完成资金与数量对账后仅恢复本次暂停,auto/run继续。10:12:14确认1570706,无缺口、新拒绝、在途或待入账,资金18.9秒,现金及数量差异0;10:13:39健康正常。worker/beat启动原容器,web与唯一ws未重启,镜像环境挂载保持。恢复后新信号和研判是自然调度结果,不再删除。维护首次恢复水位检查未通过时保持暂停,待新采样追平才放开。定时复核保持取消,微盘自然完整成交与费用仍未判收。备份和详细证据见[再次重置与本金基线](docs/模拟仓再次重置与本金基线_2026-11-02.md)。
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# PMS ↔ QMT · WebSocket 指令与回报协议
|
||||
|
||||
> 版本:**V1.0.1**(2026-07-30)——V1.0 定稿(2026-07-28)+ 两处澄清,**消息集与状态机一字未动**,V1.0 的实现无需改动即合规。Q1~Q11 与 R1/R2 均已答复回填(见 §10),双方据此实现。
|
||||
> 版本:**V1.0.2**(2026-11-02)——`place_order.payload`新增`strategy_type`策略类型,其他业务字段、信封版本及状态机保持。历史变更见§11。
|
||||
> 后续变更一律版本号递增。**变更记录(§11)按版本号从旧到新排列,读到最后一行才是当前版本**——曾因 V1.0 排在 V0.9.2 之上,对端漏掉了 `ack_seq`(§4.5)。
|
||||
> 双方:**PMS**(tradingSystem,持仓管理系统,指令发起方)· **QMT**(券商终端侧执行服务,指令执行方)
|
||||
> 本文档取代 `QMT_INTERFACE_REQUIREMENTS.md` 中 B 部分的表通道方案。A 部分(只读数据)与 C 部分(切换约定)继续有效。
|
||||
|
|
@ -174,6 +174,7 @@ def sign(seed_hex, canon):
|
|||
"limit_price": 12.35,
|
||||
"valid_until": 1769512500000,
|
||||
"intent": "TRIM",
|
||||
"strategy_type": "subjective_quant",
|
||||
"note": "保垫减仓·垫厚先收"
|
||||
}
|
||||
```
|
||||
|
|
@ -187,12 +188,17 @@ def sign(seed_hex, canon):
|
|||
| `limit_price` | number | **必填**,2 位小数。PMS 的择时模块负责定价,QMT 不做价格决策。不接受 null |
|
||||
| `valid_until` | int | 有效期截止,epoch 毫秒。到期仍未全成,QMT **自动撤单**并回 `EXPIRED` 终态 |
|
||||
| `intent` | string | `OPEN`/`FILL`/`ADD`/`DCA`/`TRIM`/`EXIT`/`T0`,仅归类 |
|
||||
| `strategy_type` | string | `subjective_quant`:主观量化;`micro_rotation`:微盘轮动。用于QMT分类、展示和人工操作,不改变价格、数量或执行规则。新PMS下单必带,历史报文可能没有此字段 |
|
||||
| `note` | string | ≤ 200 字,人工看盘用,QMT 原样落库即可 |
|
||||
|
||||
`valid_until` 是这套设计里替代「10 秒轮询撤单」的关键:PMS 不必盯着撤,到点 QMT 自己收。
|
||||
|
||||
2026-10-28补充:155模拟实例可启用`PMS_EXEC_QMT_PRICE_MONITOR`。已生成的计划由PMS给出限价、数量和有效期,即可提交QMT等待成交,不再等待现价进入区间。买单限价为执行区间上沿,卖单为下沿;买入可在更低价格成交,卖出可在更高价格成交。这不是上下界条件单,协议字段没有增加。用户暂停、资金占用、配额、可卖量和回报入账仍由PMS负责。原执行模式默认保留,不改变其他实例。
|
||||
|
||||
2026-11-02补充:策略类型取自父指令的持久账本归属,适用于买入、卖出、补单及重发。主观量化为微盘筹资的卖单仍为`subjective_quant`,不能按当前轮换阶段或备注判断。内部账本`original`对应`subjective_quant`,`micro30`对应`micro_rotation`,50只版本不改变标识。`note`等原有字段原样保留,撤单与查询报文不加字段。策略来源暂时无法核实时保留队列,不误标为另一策略。
|
||||
|
||||
QMT需读取并保存该字段,可按上述映射显示中文;兼容既有无此字段的历史订单。验签仍按收到的完整payload规范化,包含新增字段,不能先按旧字段白名单重建payload后验签。信封`v=1`与握手`protocol=1`不变;历史签名测试向量保持原样。
|
||||
|
||||
### 4.3 `cancel_order` —— 撤单
|
||||
|
||||
```json
|
||||
|
|
@ -201,6 +207,10 @@ def sign(seed_hex, canon):
|
|||
|
||||
QMT 撤在途部分,已成交部分保留。撤单完成后该指令进入 `CANCELLED` 终态(若撤单前已全成,则回 `reject{code:"ALREADY_FINAL"}` 并附当前状态)。
|
||||
|
||||
2026-10-30补充:155启用`PMS_EXEC_QMT_DAY_ORDER`时,普通QMT限价委托的`valid_until`给到当日15:00;微盘轮换、网格和做T各自的窗口不变。已发送委托不原地改有效期,新委托按新规则生成。次日买入仍须完整决策复核。
|
||||
|
||||
撤单请求已发送不等于券商撤单成功。`reject`若对应撤单,不能把原委托改成`REJECTED`;`ALREADY_FINAL`也不能替代带累计成交量的终态回报。部分成交后撤单的`cum_qty`必须保留实际累计成交,逐笔`trade`仍须完整推送。PMS停止父任务新增后,仍跟踪子委托、保留在途占用并按原策略接收迟到成交。发送前持久标记可能已发出,重启恢复后的排队单若曾尝试发送,仍向QMT撤单并等终态,不能直接本地作废。
|
||||
|
||||
### 4.4 查询类
|
||||
|
||||
| type | payload | 回应 |
|
||||
|
|
@ -536,3 +546,4 @@ QMT 侧如有本表未覆盖的拒绝场景,请在定稿时补充,**不要
|
|||
| V0.9.2 | 2026-07-28 | 回填 QMT 侧 Q1~Q11 答复(§10),并据此补齐四处:①新增下行消息 **`ack_seq` 累积确认**(§4.5)——对方的「按最后未 ack 的消息续发」实现依赖它,原协议缺失 ②`trade_no` 定为 `{broker_order_id}#{n}`(§5.5)——券商原生只有委托号,一委托多成交时无法逐笔去重 ③手续费**不摊入持仓成本**、新增 `fee_estimated` 标志(§5.5)——对方明确逐笔费用可能有误差,避免污染安全垫 ④`CANCELLED`/`EXPIRED` 改由 PMS 侧自记(§7.2),不再要求下游区分。另记录 `total_filled` 口径存疑及规避方式(§10.2)。剩余阻塞项收敛为 R1/R2 两条(§10.1) |
|
||||
| **V1.0** | 2026-07-28 | **定稿**。回填 R1/R2:旧通道**即刻停用**、端点定为 `ws://192.168.16.98:8080`;补 §10.1.1 部署前检查清单(白名单、公钥交换、Redis 持久化、密钥只走 `.env`);调整 §9 灰度策略(旧通道已停,无从并行,改为小仓位实跑) |
|
||||
| V1.0.1 | 2026-07-30 | 依 07-30 联调实测澄清两处,**不改消息集与状态机**:①§7.3 `BAD_PARAM` 的含义由「价格精度超限」扩为「价格不合法(精度超限或限价越界)」,并补一段与 `LIMIT_UP`/`LIMIT_DOWN` 的分界说明——原表对「限价超出当日涨跌停区间」没有落点,实测该单既未被拒也未成交,一路挂到 `EXPIRED` ②本表顺序修正:V1.0 那行原排在 V0.9.2 之上,导致对端读到「定稿」即止、漏掉 V0.9.2 引入的 `ack_seq`(§4.5),进而形成 ack→reject 自激循环。**顺序修正不涉及任何条款变更** |
|
||||
| V1.0.2 | 2026-11-02 | 下单业务体新增`strategy_type`,按父指令账本区分主观量化与微盘轮动;其余下单字段、撤单、信封与握手版本、签名算法及状态机不变。新增字段参与完整payload签名,历史测试向量不变 |
|
||||
|
|
|
|||
|
|
@ -440,8 +440,8 @@ def add_trade_minutes(start_min: int, minutes: int) -> int:
|
|||
def slice_deadline(now, *, ttl_min: int = 10, forced: bool = False) -> int:
|
||||
"""单个下发分片的有效期截止 (当日分钟数)。下游到点未成交即自动撤单。
|
||||
|
||||
普通分片只给 ttl_min 个交易分钟: run_tick 每分钟重评一次, 撤掉重下比挂着更好
|
||||
—— 限价是按下发那一刻的价算的, 挂久了价已经不是那个价, 还白占可用资金/持仓。
|
||||
短时分片给 ttl_min 个交易分钟,到期后允许按新依据再评估。
|
||||
普通QMT限价单启用当日有效时,由调用方选择收盘截止。
|
||||
兜底单 (14:45 之后的 forced) 直接给到收盘: 那是「今天必须走掉」的单, 不能被
|
||||
TTL 撤回来。
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -370,7 +370,7 @@ def parse(raw, *, peer_pubkey_b64: str) -> dict:
|
|||
# ================================================================ 各类下行 payload
|
||||
def place_order_payload(*, instruction_id: str, ts_code: str, side: str, qty: int,
|
||||
limit_price, valid_until: int, intent: str = "OPEN",
|
||||
note: str = "") -> dict:
|
||||
note: str = "", strategy_type: str = None) -> dict:
|
||||
"""§4.2。落地前把易错项一次性校验干净 —— 宁可在本地报错, 不要换 QMT 一个 BAD_PARAM。"""
|
||||
side = str(side or "").lower()
|
||||
if side not in ("buy", "sell"):
|
||||
|
|
@ -395,9 +395,14 @@ def place_order_payload(*, instruction_id: str, ts_code: str, side: str, qty: in
|
|||
intent = "OPEN"
|
||||
if len(str(instruction_id or "")) > 64 or not instruction_id:
|
||||
raise CodecError("BAD_PARAM", f"instruction_id 长度须在 1~64, 收到 {instruction_id!r}")
|
||||
return {"instruction_id": str(instruction_id), "ts_code": str(ts_code), "side": side,
|
||||
"qty": qty, "limit_price": px, "valid_until": int(valid_until),
|
||||
"intent": intent, "note": str(note or "")[:200]}
|
||||
payload = {"instruction_id": str(instruction_id), "ts_code": str(ts_code), "side": side,
|
||||
"qty": qty, "limit_price": px, "valid_until": int(valid_until),
|
||||
"intent": intent, "note": str(note or "")[:200]}
|
||||
if strategy_type is not None:
|
||||
if strategy_type not in ("subjective_quant", "micro_rotation"):
|
||||
raise CodecError("BAD_PARAM", "未知策略类型")
|
||||
payload["strategy_type"] = strategy_type
|
||||
return payload
|
||||
|
||||
|
||||
def cancel_order_payload(*, cancel_id: str, instruction_id: str) -> dict:
|
||||
|
|
|
|||
|
|
@ -486,6 +486,17 @@ def add_instruction_exec(instruction_id: str, qty: int) -> int:
|
|||
{"q": int(qty), "iid": instruction_id, "ts": _NOW()})
|
||||
|
||||
|
||||
def compare_review_instruction(old, progress, status):
|
||||
"""单表条件更新;复核与用户撤销、回放成交互斥,不覆盖并发变化。"""
|
||||
return execute('UPDATE pms_instruction SET status=:st, progress_json=:pg, '
|
||||
'limit_price=NULL, updated_at=:ts WHERE instruction_id=:iid '
|
||||
'AND status=:old_st AND exec_qty=:eq AND progress_json=:old_pg',
|
||||
{'st': status, 'pg': _dumps(progress), 'ts': _NOW(),
|
||||
'iid': old['instruction_id'], 'old_st': old['status'],
|
||||
'eq': int(old.get('exec_qty') or 0),
|
||||
'old_pg': old.get('progress_json') or _dumps(old.get('progress') or {})})
|
||||
|
||||
|
||||
# ================================================================ pms_proposal
|
||||
def insert_proposal(*, proposal_id, ts_code, action, qty, hard_numbers, expire_at,
|
||||
judge_verdict=None, judge_reason=None, status="WAIT_USER") -> int:
|
||||
|
|
|
|||
|
|
@ -417,8 +417,17 @@ def claim_order(instruction_id: str) -> bool:
|
|||
return bool(n)
|
||||
|
||||
|
||||
def mark_send_attempt(instruction_id: str) -> bool:
|
||||
"""发送前持久标记可能已发出;进程崩溃或网络超时后不能按未发单释放占用。"""
|
||||
return bool(execute("UPDATE pms_qmt_order SET sent_at = :ts, updated_at = :ts "
|
||||
"WHERE instruction_id = :iid AND status = 'SENDING' "
|
||||
"AND cancel_state = 'NONE'", {"iid": instruction_id, "ts": _NOW()}))
|
||||
|
||||
|
||||
def mark_sent(instruction_id: str) -> int:
|
||||
return execute("UPDATE pms_qmt_order SET status = 'SENT', sent_at = :ts, "
|
||||
# 回报可能在 send() 返回前已被消费,不能把 ACCEPTED/PARTIAL/终态写回 SENT。
|
||||
return execute("UPDATE pms_qmt_order SET status = CASE WHEN status = 'SENDING' "
|
||||
"THEN 'SENT' ELSE status END, sent_at = :ts, "
|
||||
"send_attempts = send_attempts + 1, updated_at = :ts "
|
||||
"WHERE instruction_id = :iid", {"iid": instruction_id, "ts": _NOW()})
|
||||
|
||||
|
|
@ -439,7 +448,7 @@ def requeue_order(instruction_id: str, error: str = "", max_attempts: int = 3,
|
|||
"status = CASE WHEN send_attempts + :inc >= :mx THEN 'SEND_FAILED' "
|
||||
" ELSE 'QUEUED' END, "
|
||||
"send_attempts = send_attempts + :inc, "
|
||||
"reject_reason = :err, updated_at = :ts WHERE instruction_id = :iid",
|
||||
"reject_reason = :err, updated_at = :ts WHERE instruction_id = :iid AND status = 'SENDING'",
|
||||
{"iid": instruction_id, "mx": int(max_attempts), "err": str(error)[:300],
|
||||
"inc": 1 if count_attempt else 0, "ts": _NOW()})
|
||||
|
||||
|
|
@ -460,7 +469,7 @@ def abort_order(instruction_id: str, note: str) -> int:
|
|||
now = _NOW()
|
||||
return execute("UPDATE pms_qmt_order SET status = 'ABORTED', reject_code = 'LOCAL_ABORT', "
|
||||
"reject_reason = :nt, final_at = :ts, updated_at = :ts "
|
||||
"WHERE instruction_id = :iid",
|
||||
"WHERE instruction_id = :iid AND status IN ('QUEUED','SENDING') AND sent_at IS NULL",
|
||||
{"iid": instruction_id, "nt": str(note)[:300], "ts": now})
|
||||
|
||||
|
||||
|
|
@ -488,6 +497,14 @@ def request_cancel(*, parent_id: str, cancel_id: str) -> int:
|
|||
f"AND cancel_state = 'NONE' AND status IN ({_in_clause(list(LIVE), 'lv', p)})", p)
|
||||
|
||||
|
||||
def request_order_cancel(instruction_id: str, cancel_id: str, note: str) -> int:
|
||||
"""只收回这张可能已经发出的委托,不能用本地作废代替QMT确认。"""
|
||||
p = {'iid': instruction_id, 'cid': cancel_id, 'nt': note[:300], 'ts': _NOW()}
|
||||
return execute("UPDATE pms_qmt_order SET cancel_state='REQUESTED', cancel_id=:cid, "
|
||||
"cancel_req_at=:ts, note=:nt, updated_at=:ts WHERE instruction_id=:iid "
|
||||
f"AND cancel_state='NONE' AND status IN ({_in_clause(list(LIVE), 'lv', p)})", p)
|
||||
|
||||
|
||||
def next_cancel_requests(limit: int = 20) -> list:
|
||||
p = {"n": int(limit)}
|
||||
return fetch_all(
|
||||
|
|
|
|||
|
|
@ -244,6 +244,8 @@ def intraday_exec():
|
|||
"""
|
||||
from app.services import executor, proposal_service, strategy_runner
|
||||
r = {"materialized": executor.materialize_plans()}
|
||||
from app.services import daily_buy_review
|
||||
r["daily_buy_review"] = daily_buy_review.process()
|
||||
r["proposals"] = proposal_service.scan_and_route()
|
||||
r["strategies"] = strategy_runner.tick() # 个股交易方案: 触发即发短窗口指令, 由下面 run_tick 执行
|
||||
# 过期收口改为每分钟一次 (原来只在 15:10 日结跑) —— 让过了窗口/deadline 的单当即作废,
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ from app.services import industry, param_store, portfolio
|
|||
logger = logging.getLogger("pms.command")
|
||||
|
||||
# 在途 (可被撤销/冲突判定) 的指令状态
|
||||
LIVE_INSTR = ("PROPOSED", "RULE_PASSED", "JUDGE_PASSED", "DISPATCHED")
|
||||
LIVE_INSTR = ("PROPOSED", "RULE_PASSED", "JUDGE_PASSED", "DISPATCHED", "WAIT_REVIEW")
|
||||
|
||||
STOCK_PARAM_TYPES = ("FREEZE_STOCK", "UNFREEZE_STOCK", "T0_ENABLE", "T0_DISABLE",
|
||||
"SET_STOP_PRICE", "SET_TARGET_PRICE", "BLACKLIST_ADD", "BLACKLIST_REMOVE",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,312 @@
|
|||
"""跨日买入复核:停止旧单、等待真实回报、重走当日决策,再开放当日额度。"""
|
||||
from copy import deepcopy
|
||||
from datetime import datetime
|
||||
import hashlib
|
||||
|
||||
from app.db.session import transaction
|
||||
from app.repo import pms_repo, qmt_repo
|
||||
from app.services import param_store
|
||||
|
||||
LIVE = ('PROPOSED', 'RULE_PASSED', 'JUDGE_PASSED', 'DISPATCHED', 'WAIT_REVIEW')
|
||||
|
||||
|
||||
def _day(value):
|
||||
try:
|
||||
return int(str(value)[:10].replace('-', ''))
|
||||
except (TypeError, ValueError):
|
||||
return 0
|
||||
|
||||
|
||||
def applies(ins):
|
||||
return bool(ins and ins.get('side') == 'buy'
|
||||
and (ins.get('progress') or {}).get('execution_profile') != 'rotation')
|
||||
|
||||
|
||||
def _command_blocker(ins):
|
||||
cid = (ins.get('progress') or {}).get('command_id')
|
||||
if cid:
|
||||
cmd = pms_repo.get_command(cid)
|
||||
if not cmd or cmd['status'] not in ('EXECUTING', 'PARTIAL'):
|
||||
return '来源命令已经结束,不能恢复旧买入安排'
|
||||
return None
|
||||
|
||||
|
||||
def blocker(ins, *, now=None):
|
||||
if not applies(ins):
|
||||
return None
|
||||
if ins.get('status') == 'WAIT_REVIEW':
|
||||
return '跨日买入尚未完成当日决策复核'
|
||||
if not param_store.get_bool('PMS_DAILY_BUY_REVIEW', False):
|
||||
return None
|
||||
stopped = _command_blocker(ins)
|
||||
if stopped:
|
||||
return stopped
|
||||
today = _day(now or datetime.now())
|
||||
prog = ins.get('progress') or {}
|
||||
if prog.get('deadline') and _day(prog['deadline']) < today:
|
||||
return '买入安排已过有效期,不能继续续单'
|
||||
review = prog.get('daily_review') or {}
|
||||
if review.get('ymd') == today and review.get('status') == 'approved':
|
||||
return None
|
||||
decision_day = prog.get('decision_ymd') or _day(ins.get('created_at'))
|
||||
if decision_day != today:
|
||||
return '旧买入安排需按当日候选、研判、数量和价格重新复核'
|
||||
return None
|
||||
|
||||
|
||||
def _orders(ins):
|
||||
"""不把终态当作零成交;出口与账本尚未一致时禁止重开额度。"""
|
||||
rows = qmt_repo.orders_for_parent(ins['instruction_id'])
|
||||
if len({r['instruction_id'] for r in rows}) != len(rows):
|
||||
raise ValueError('出口子单重复,等待核对')
|
||||
filled = 0
|
||||
for row in rows:
|
||||
qty, done = int(row['qty']), int(row.get('cum_qty') or 0)
|
||||
if qty <= 0 or not 0 <= done <= qty:
|
||||
raise ValueError('出口数量无效,等待核对')
|
||||
filled += qty if row['status'] == qmt_repo.OS_FILLED else done
|
||||
return rows, filled
|
||||
|
||||
|
||||
def allowance(ins, *, now=None):
|
||||
if not applies(ins):
|
||||
return max(0, int(ins['qty']) - int(ins.get('exec_qty') or 0))
|
||||
if blocker(ins, now=now):
|
||||
return 0
|
||||
review = (ins.get('progress') or {}).get('daily_review') or {}
|
||||
if review.get('ymd') != _day(now or datetime.now()) or review.get('status') != 'approved':
|
||||
return max(0, int(ins['qty']) - int(ins.get('exec_qty') or 0))
|
||||
rows, filled = _orders(ins)
|
||||
pending = sum(int(r['qty']) - int(r.get('cum_qty') or 0)
|
||||
for r in rows if r['status'] not in qmt_repo.FINAL)
|
||||
consumed = max(filled, int(ins.get('exec_qty') or 0)) - int(review['start_filled'])
|
||||
return max(0, int(review['qty']) - max(0, consumed) - pending)
|
||||
|
||||
|
||||
def _save(old, progress, status, reason, *, proposal=None, decision=None, arbiter='system'):
|
||||
"""所有状态推进均比较旧状态、旧进度及成交量;不能复活用户已撤销的指令。"""
|
||||
with transaction():
|
||||
changed = pms_repo.compare_review_instruction(old, progress, status)
|
||||
if not changed:
|
||||
return False
|
||||
if proposal and decision:
|
||||
if not pms_repo.decide_proposal(proposal['proposal_id'], decision,
|
||||
expected_hard=proposal['hard_numbers_json']):
|
||||
raise RuntimeError('确认建议已变化,本次复核推进已回滚')
|
||||
recorded = pms_repo.insert_ledger(ts_code=old['ts_code'], action='DAILY_REVIEW', arbiter=arbiter,
|
||||
verdict='PASS' if status == 'PROPOSED' else 'WAIT' if status == 'WAIT_REVIEW' else 'REJECT',
|
||||
price_at=0, hard_numbers=progress.get('daily_review'), reason=reason,
|
||||
ref_id=old['instruction_id'])
|
||||
if not recorded:
|
||||
raise RuntimeError('复核留痕失败,状态推进已回滚')
|
||||
if status == 'PROPOSED' and arbiter == 'system' and (progress['daily_review'].get('self_decide') or {}).get('decision') == 'accept':
|
||||
counted = pms_repo.insert_ledger(ts_code=old['ts_code'], action=old['action'], arbiter='system',
|
||||
verdict='PASS', price_at=0, hard_numbers=progress['daily_review'],
|
||||
reason=pms_repo.SYSTEM_ACCEPT_REASON_PREFIX + '跨日完整复核通过', ref_id=old['instruction_id'])
|
||||
if not counted:
|
||||
raise RuntimeError('当日自动采纳计数失败,状态推进已回滚')
|
||||
return True
|
||||
|
||||
|
||||
def _hold(ins, now, reason):
|
||||
prog = deepcopy(ins.get('progress') or {})
|
||||
previous = prog.get('daily_review') or {}
|
||||
if previous:
|
||||
prog['daily_review_history'] = (prog.get('daily_review_history', []) + [previous])[-20:]
|
||||
prog['daily_review'] = {'ymd': _day(now), 'status': 'pending', 'reason': reason}
|
||||
# 同一日人工维护后重核也不能复用旧执行价。
|
||||
for key in ('exec_advice', 'ref_lock', 'last_decision'):
|
||||
prog.pop(key, None)
|
||||
if _save(ins, prog, 'WAIT_REVIEW', reason):
|
||||
return pms_repo.get_instruction(ins['instruction_id'])
|
||||
return None
|
||||
|
||||
|
||||
def _end(ins, reason, now, *, proposal=None, decision=None, arbiter='system'):
|
||||
prog = deepcopy(ins.get('progress') or {})
|
||||
prog['daily_review'] = {'ymd': _day(now), 'status': 'ended', 'reason': reason}
|
||||
return _save(ins, prog, 'EXPIRED', reason, proposal=proposal, decision=decision, arbiter=arbiter)
|
||||
|
||||
|
||||
def _basis(candidate):
|
||||
h = candidate.get('hard_numbers') or {}
|
||||
# 价格由执行层重新咨询;成交前仍过实时规则闸。研究/账户变化不能复用人工确认。
|
||||
from app.core.plan_revision import fingerprint
|
||||
return fingerprint({'qty': candidate['qty'], 'action': candidate['action'],
|
||||
'code': candidate['ts_code'], 'basis': h.get('plan_basis'),
|
||||
'params': h.get('scan_params_hash'), 'portfolio': h.get('portfolio_context_hash'),
|
||||
'risk': h.get('risk'), 'consensus': h.get('consensus')})
|
||||
|
||||
|
||||
def _invalidate_confirmation(ins, p, now):
|
||||
prog = deepcopy(ins.get('progress') or {})
|
||||
reason = '当日依据已变化,后台重新准备买入建议'
|
||||
prog['daily_review'] = {'ymd': _day(now), 'status': 'pending', 'reason': reason}
|
||||
return _save(ins, prog, 'WAIT_REVIEW', reason, proposal=p, decision='EXPIRED')
|
||||
|
||||
|
||||
def _approve(ins, result, now, *, proposal=None, arbiter='system', reason=None):
|
||||
if _command_blocker(ins):
|
||||
return False
|
||||
rows, filled = _orders(ins)
|
||||
if any(r['status'] not in qmt_repo.FINAL for r in rows) or filled != int(ins.get('exec_qty') or 0):
|
||||
return False
|
||||
c = result['candidate']
|
||||
qty = min(int(c['qty']), int(ins['qty']) - int(ins.get('exec_qty') or 0))
|
||||
if qty <= 0:
|
||||
return False
|
||||
prog = deepcopy(ins.get('progress') or {})
|
||||
reason = reason or '已通过当日完整决策复核,执行前重新确定限价'
|
||||
prog['daily_review'] = {'ymd': _day(now), 'status': 'approved', 'qty': qty,
|
||||
'start_filled': int(ins.get('exec_qty') or 0), 'at': now.isoformat(), 'reason': reason,
|
||||
'basis': _basis(c), 'candidate': c, 'verdict': result['verdict'],
|
||||
'self_decide': result.get('self_decide')}
|
||||
for key in ('exec_advice', 'ref_lock', 'last_decision'):
|
||||
prog.pop(key, None)
|
||||
return _save(ins, prog, 'PROPOSED', reason, proposal=proposal,
|
||||
decision='ACCEPTED' if proposal else None, arbiter=arbiter)
|
||||
|
||||
|
||||
def _queue(ins, result, now):
|
||||
c, verdict = result['candidate'], result['verdict']
|
||||
prog = deepcopy(ins.get('progress') or {})
|
||||
# 按当次准备内容编号;重启复用,依据变化可以生成新版本。
|
||||
digest = hashlib.sha256((ins['instruction_id'] + _basis(c)).encode()).hexdigest()[:18]
|
||||
pid = f'PRP_DAILY_{_day(now)}_{digest}'
|
||||
reason = c.get('confirm_why') or verdict.get('reason') or '今日买入需按原确认规则重新确认'
|
||||
hard = dict(c.get('hard_numbers') or {}, kind='daily_review', daily_parent=ins['instruction_id'],
|
||||
daily_basis=_basis(c), daily_ymd=_day(now), daily_verdict=verdict,
|
||||
preparation={'status': 'ready'}, proposal_revision=digest, reason=reason)
|
||||
prog['daily_review'] = {'ymd': _day(now), 'status': 'confirmation', 'proposal_id': pid,
|
||||
'reason': reason}
|
||||
with transaction():
|
||||
if not _save(ins, prog, 'WAIT_REVIEW', reason):
|
||||
return False
|
||||
if not pms_repo.get_proposal(pid):
|
||||
inserted = pms_repo.insert_proposal(proposal_id=pid, ts_code=ins['ts_code'], action=ins['action'],
|
||||
qty=c['qty'], hard_numbers=hard, expire_at=now.replace(hour=15, minute=0, second=0),
|
||||
judge_verdict=verdict.get('verdict'), judge_reason=reason[:500])
|
||||
if not inserted:
|
||||
raise RuntimeError('复核确认建议未保存,状态推进已回滚')
|
||||
return True
|
||||
|
||||
|
||||
def process(*, now=None):
|
||||
from app.services import dispatcher, proposal_service
|
||||
now = now or datetime.now()
|
||||
out = {'held': [], 'approved': [], 'queued': [], 'ended': [], 'waiting': [], 'errors': []}
|
||||
if not param_store.get_bool('PMS_DAILY_BUY_REVIEW', False):
|
||||
return out
|
||||
# 先停完所有旧任务,再进行可能耗时的研判;未处理到的也不能从下发出口绕过。
|
||||
for row in pms_repo.list_instructions(statuses=list(LIVE), side='buy', limit=500):
|
||||
if not applies(row) or not blocker(row, now=now):
|
||||
continue
|
||||
try:
|
||||
review = (row.get('progress') or {}).get('daily_review') or {}
|
||||
if row['status'] != 'WAIT_REVIEW' or review.get('ymd') != _day(now):
|
||||
held = _hold(row, now, blocker(row, now=now))
|
||||
if held:
|
||||
out['held'].append(row['instruction_id'])
|
||||
except Exception as e:
|
||||
out['errors'].append(f"{row['instruction_id']}: {e}")
|
||||
reviewed = 0
|
||||
for row in pms_repo.list_instructions(statuses=['WAIT_REVIEW'], side='buy', limit=500):
|
||||
if not applies(row):
|
||||
continue
|
||||
iid = row['instruction_id']
|
||||
try:
|
||||
orders, filled = _orders(row)
|
||||
if any(o['status'] not in qmt_repo.FINAL for o in orders):
|
||||
cancelled = dispatcher.cancel(instruction_id=iid, dispatch_ref=row.get('dispatch_ref'))
|
||||
if not cancelled.get('ok'):
|
||||
out['errors'].append(f'{iid}: 旧委托撤销未受理')
|
||||
out['waiting'].append(iid)
|
||||
continue
|
||||
if filled != int(row.get('exec_qty') or 0):
|
||||
out['waiting'].append(iid) # 等回放,不将通道累计数写成账本成交。
|
||||
continue
|
||||
prog = row.get('progress') or {}
|
||||
stopped = _command_blocker(row)
|
||||
if stopped:
|
||||
if _end(row, stopped, now):
|
||||
out['ended'].append(iid)
|
||||
continue
|
||||
if (prog.get('deadline') and _day(prog['deadline']) < _day(now)) or prog.get('origin') == 'strategy':
|
||||
if _end(row, '昨日买入安排结束;后续按当日策略重新生成', now):
|
||||
out['ended'].append(iid)
|
||||
continue
|
||||
state = prog.get('daily_review') or {}
|
||||
if state.get('status') == 'confirmation' and state.get('ymd') == _day(now):
|
||||
p = pms_repo.get_proposal(state['proposal_id'])
|
||||
if p and p['status'] == 'WAIT_USER' and not proposal_service.is_expired(p, now):
|
||||
continue
|
||||
if _end(row, '当日复核确认未完成,旧买入安排结束', now):
|
||||
out['ended'].append(iid)
|
||||
continue
|
||||
if param_store.get_bool('PMS_GLOBAL_EXEC_HALT', False) or param_store.get_bool('PMS_GLOBAL_BUY_HALT', False):
|
||||
out['waiting'].append(iid)
|
||||
continue
|
||||
if reviewed >= 1:
|
||||
break
|
||||
reviewed += 1
|
||||
result = proposal_service.scan_and_route(now=now, review_instruction=row)
|
||||
if result.get('errors') or not result.get('ok'):
|
||||
out['errors'].extend(result.get('errors') or [f'{iid}: 当日决策资料未就绪'])
|
||||
continue
|
||||
fresh = result.get('review')
|
||||
if fresh:
|
||||
# 模型响应期间上游可能换榜或账户成交。再走同一候选流程,不能只验证旧票仍有报告。
|
||||
checked = proposal_service.scan_and_route(now=now, review_instruction=row,
|
||||
prepared_verdict=fresh['verdict'])
|
||||
current = checked.get('review')
|
||||
if checked.get('errors') or not current or _basis(current['candidate']) != _basis(fresh['candidate']):
|
||||
out['waiting'].append(iid)
|
||||
continue
|
||||
fresh = current
|
||||
changed = _approve(row, fresh, now) if fresh['auto_exec'] else _queue(row, fresh, now)
|
||||
if changed:
|
||||
out['approved' if fresh['auto_exec'] else 'queued'].append(iid)
|
||||
else:
|
||||
# 未通过不带昨日任务继续。后续条件转好仍由正常扫描产生新建议。
|
||||
reasons = [r.get('why') or ';'.join(r.get('failed') or [])
|
||||
for r in result.get('rejected', []) + result.get('skipped', [])
|
||||
if r.get('ts_code') in (None, row['ts_code']) and not r.get('informational')]
|
||||
reason = '当日复核未通过:' + (';'.join(filter(None, reasons)) or '不在当日可执行候选中')
|
||||
if _end(row, reason[:500], now):
|
||||
out['ended'].append(iid)
|
||||
except Exception as e:
|
||||
out['errors'].append(f'{iid}: {e}')
|
||||
return out
|
||||
|
||||
|
||||
def decide_confirmation(p, decision, reason, revision=None, *, now=None):
|
||||
"""人工入口不调用模型,只在当前候选/账户依据未变时使用当日已准备结论。"""
|
||||
from app.services import proposal_service
|
||||
now = now or datetime.now()
|
||||
h = p.get('hard_numbers') or {}
|
||||
ins = pms_repo.get_instruction(h.get('daily_parent'))
|
||||
if decision == 'ACCEPTED' and p['status'] == 'ACCEPTED':
|
||||
return {'ok': True, 'already_accepted': True, 'instruction_id': h['daily_parent']}
|
||||
if (not ins or ins['status'] != 'WAIT_REVIEW' or p['status'] != 'WAIT_USER'
|
||||
or h.get('daily_ymd') != _day(now) or proposal_service.is_expired(p, now)
|
||||
or revision != h.get('proposal_revision')):
|
||||
return {'ok': False, 'error': '今日复核建议已变化或过期,请刷新'}
|
||||
orders, filled = _orders(ins)
|
||||
if any(o['status'] not in qmt_repo.FINAL for o in orders) or filled != int(ins.get('exec_qty') or 0):
|
||||
return {'ok': False, 'error': '旧委托或成交尚未核对完成'}
|
||||
if decision == 'DECLINED':
|
||||
changed = _end(ins, reason, now, proposal=p, decision=decision, arbiter='user')
|
||||
else:
|
||||
if param_store.get_bool('PMS_GLOBAL_EXEC_HALT', False) or param_store.get_bool('PMS_GLOBAL_BUY_HALT', False):
|
||||
return {'ok': False, 'error': '用户已暂停买入或执行'}
|
||||
result = proposal_service.scan_and_route(now=now, review_instruction=ins,
|
||||
prepared_verdict=h['daily_verdict'])
|
||||
fresh = result.get('review')
|
||||
if result.get('errors'):
|
||||
return {'ok': False, 'error': '当日资料暂不可用,恢复后再确认'}
|
||||
if not fresh or _basis(fresh['candidate']) != h['daily_basis']:
|
||||
pending = _invalidate_confirmation(ins, p, now)
|
||||
return {'ok': False, 'pending': pending, 'error': '当日依据已变化,后台重新准备买入建议'}
|
||||
changed = _approve(ins, fresh, now, proposal=p, arbiter='user', reason=reason)
|
||||
return {'ok': bool(changed), 'decision': decision, 'instruction_id': ins['instruction_id'],
|
||||
**({} if changed else {'error': '指令已变化,本次未恢复买入'})}
|
||||
|
|
@ -156,7 +156,9 @@ def dispatch(*, instruction_id: str, ts_code: str, side: str, qty: int, limit_pr
|
|||
pid = _parent_of(instruction_id, parent_id)
|
||||
parent = pms_repo.get_instruction(pid)
|
||||
stopped = pms_repo.instruction_buy_stop(pid)
|
||||
blocked = ('清仓已终止原买入安排' if stopped or ((parent or {}).get('progress') or {}).get('stopped_by_exit') else buy_blocker(ts_code))
|
||||
from app.services import daily_buy_review
|
||||
review_block = daily_buy_review.blocker(parent) if parent else None
|
||||
blocked = review_block or ('清仓已终止原买入安排' if stopped or ((parent or {}).get('progress') or {}).get('stopped_by_exit') else buy_blocker(ts_code))
|
||||
if parent and parent.get('status') not in ('PROPOSED', 'RULE_PASSED', 'JUDGE_PASSED', 'DISPATCHED'):
|
||||
blocked = '来源买入指令已结束,不再发单'
|
||||
if blocked:
|
||||
|
|
@ -203,6 +205,21 @@ def _parent_of(instruction_id: str, parent_id=None) -> str:
|
|||
return tail[0] if len(tail) == 2 and tail[1].isdigit() else iid
|
||||
|
||||
|
||||
def order_strategy_type(parent_id: str) -> str:
|
||||
"""下单报文按持久父指令的账本归类,不用备注、当前阶段或调用上下文猜测。"""
|
||||
if not settings.INFRA_STRATEGY_BOOK_SCHEMA:
|
||||
return "subjective_quant" # 未启用分策略账本的既有实例只有主观量化。
|
||||
from app.core import strategy_book as books
|
||||
from app.repo import pms_repo
|
||||
with books.scope('all'):
|
||||
parent = pms_repo.get_instruction(parent_id)
|
||||
types = {books.ORIGINAL: "subjective_quant", books.MICRO: "micro_rotation"}
|
||||
book = (parent or {}).get('book_id')
|
||||
if book not in types:
|
||||
raise RuntimeError('委托的策略来源无法核实')
|
||||
return types[book]
|
||||
|
||||
|
||||
def _ws(*, instruction_id, ts_code, side, qty, limit_price, valid_until, intent=None,
|
||||
parent_id=None, note=None) -> dict:
|
||||
"""ws 直连: 落出口队列即返回, 实际发送由 pms-ws 常驻进程完成。
|
||||
|
|
@ -268,11 +285,21 @@ def cancel(*, instruction_id: str, dispatch_ref=None) -> dict:
|
|||
except Exception as e:
|
||||
logger.exception("撤单请求落表失败 %s", instruction_id)
|
||||
return {"ok": False, "mode": m, "error": f"{type(e).__name__}: {e}"}
|
||||
pending = bool(n)
|
||||
if not pending:
|
||||
try:
|
||||
pending = any(o.get('status') in qmt_repo.LIVE
|
||||
for o in qmt_repo.orders_for_parent(instruction_id))
|
||||
except Exception:
|
||||
# 撤销意图已写入。展示核验失败不能使父任务继续新增或恢复续单。
|
||||
pending = True
|
||||
logger.warning('撤单请求已登记,子委托状态暂不可核实 %s', instruction_id)
|
||||
if not n:
|
||||
return {"ok": True, "mode": m, "cancelled": 0,
|
||||
"note": "该指令名下没有在途子单, 仅本地置撤销"}
|
||||
return {"ok": True, "mode": m, "cancelled": 0, "cancel_pending": pending,
|
||||
"note": "撤单已在处理中,等待QMT终态" if pending else "该指令名下没有在途子单, 仅本地置撤销"}
|
||||
note = f"已标记 {n} 张在途委托待撤 (cancel_id={cancel_id})"
|
||||
ch = channel_status()
|
||||
if not ch["online"]:
|
||||
note += f"; 连接当前 {ch['conn_state']}, 重连后发出"
|
||||
return {"ok": True, "mode": m, "cancelled": n, "cancel_id": cancel_id, "note": note}
|
||||
return {"ok": True, "mode": m, "cancelled": n, "cancel_pending": pending,
|
||||
"cancel_id": cancel_id, "note": note}
|
||||
|
|
|
|||
|
|
@ -191,7 +191,10 @@ def _qmt_limit(*, side, action, ts_code, now, day, params, is_last_day, urgent,
|
|||
return result(et.ACT_WAIT, "无有效行情或已停牌,等待核实")
|
||||
if left <= 0:
|
||||
return result(et.ACT_WAIT, et.quota_wait_reason(urgent, is_last_day))
|
||||
if not et.in_session(et.hm_to_min(now)):
|
||||
now_min = et.hm_to_min(now)
|
||||
if now_min >= et.CLOSE_MIN:
|
||||
return result(et.ACT_WAIT, "已收盘,今日不再新增委托")
|
||||
if not et.in_session(now_min):
|
||||
return result(et.ACT_WAIT, "非交易时段")
|
||||
|
||||
strategy = (prog or {}).get("origin") == "strategy" and (prog or {}).get("stype") in ("GRID", "TRAIL")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
"""统一执行方向检查。只消解既有指令冲突,不重做研究或择时。"""
|
||||
from app.repo import pms_repo, qmt_repo
|
||||
|
||||
LIVE = ('PROPOSED', 'RULE_PASSED', 'JUDGE_PASSED', 'DISPATCHED')
|
||||
LIVE = ('PROPOSED', 'RULE_PASSED', 'JUDGE_PASSED', 'DISPATCHED', 'WAIT_REVIEW')
|
||||
BUY_ACTIONS = ('OPEN', 'FILL', 'ADD', 'DCA')
|
||||
|
||||
|
||||
|
|
@ -51,7 +51,8 @@ def _queued_parent_check(row, parent):
|
|||
return '清仓已终止原买入安排'
|
||||
if parent.get('status') not in LIVE:
|
||||
return '来源买入指令已结束,未发出的委托作废'
|
||||
return buy_blocker(row['ts_code'])
|
||||
from app.services import daily_buy_review
|
||||
return daily_buy_review.blocker(parent) or buy_blocker(row['ts_code'])
|
||||
|
||||
|
||||
def enforce_exit(ins):
|
||||
|
|
@ -141,6 +142,14 @@ def instruction_progress(rows):
|
|||
label = '等待买入条件' if row.get('side') == 'buy' else '等待卖出条件'
|
||||
else:
|
||||
label = '等待执行'
|
||||
review = (row.get('progress') or {}).get('daily_review') or {}
|
||||
if row.get('status') == 'WAIT_REVIEW' and not active:
|
||||
label = '待确认今日买入' if review.get('status') == 'confirmation' else '跨日复核中'
|
||||
stage = 'review'
|
||||
live_prices = {str(o.get('limit_price')) for o in active if o.get('limit_price') is not None}
|
||||
row['execution_limit'] = next(iter(live_prices)) if len(live_prices) == 1 else None
|
||||
row['execution_note'] = review.get('reason') if stage == 'review' else (
|
||||
((row.get('progress') or {}).get('last_decision') or {}).get('reason'))
|
||||
row['execution_label'] = label
|
||||
row['execution_stage'] = stage
|
||||
except Exception:
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ logger = logging.getLogger("pms.exec")
|
|||
ST_PROPOSED, ST_RULE_PASSED, ST_DISPATCHED = "PROPOSED", "RULE_PASSED", "DISPATCHED"
|
||||
ST_CONFIRMED, ST_REJECTED, ST_EXPIRED, ST_CANCELLED = ("CONFIRMED", "REJECTED", "EXPIRED",
|
||||
"CANCELLED")
|
||||
LIVE = (ST_PROPOSED, ST_RULE_PASSED, ST_DISPATCHED)
|
||||
LIVE = (ST_PROPOSED, ST_RULE_PASSED, ST_DISPATCHED, "WAIT_REVIEW")
|
||||
|
||||
# 方案状态: GATED = 建仓的补足/加仓批, 等动作引擎按条件解锁 (DDL 注释已同步)
|
||||
PLAN_PENDING, PLAN_GATED, PLAN_EXEC, PLAN_DONE = "PENDING", "GATED", "EXECUTING", "DONE"
|
||||
|
|
@ -104,6 +104,9 @@ def materialize_plans(limit: int = 100) -> dict:
|
|||
or param_store.get_int("PMS_EXEC_WINDOW_TDAYS", 3))
|
||||
prog0 = {"deadline": str(p.get("deadline") or ""), "command_id": cid,
|
||||
"is_command": True, "children": []}
|
||||
# 旧方案今天才物化也不能冒充当日决策。
|
||||
from app.services.daily_buy_review import _day
|
||||
prog0['decision_ymd'] = _day(p.get('created_at') or cmd.get('issued_at'))
|
||||
provenance = next((x for x in (cmd.get('progress') or {}).get('plan_provenance', [])
|
||||
if x.get('plan_id') == p['plan_id']), None)
|
||||
if provenance:
|
||||
|
|
@ -209,7 +212,8 @@ def run_tick(*, now=None, dry_run: bool = False) -> dict:
|
|||
if not cancelled.get('ok'):
|
||||
out['errors'].append(cancelled.get('message') or '清仓停止买入尚未完成')
|
||||
continue
|
||||
blocked = execution_conflicts.buy_blocker(code)
|
||||
from app.services import daily_buy_review
|
||||
blocked = daily_buy_review.blocker(ins, now=now) or execution_conflicts.buy_blocker(code)
|
||||
if blocked:
|
||||
prog['last_decision'] = {'at': now.strftime('%H:%M'), 'action': 'WAIT', 'reason': blocked}
|
||||
if not dry_run:
|
||||
|
|
@ -219,6 +223,8 @@ def run_tick(*, now=None, dry_run: bool = False) -> dict:
|
|||
# 回放与下发是两个任务。出口已成交时,exec_qty 可能还没更新,
|
||||
# 不能把「已终态、不在途」误当成「父指令还有额度」。
|
||||
available = _parent_available(ins, children)
|
||||
if side == 'buy':
|
||||
available = min(available, daily_buy_review.allowance(ins, now=now))
|
||||
if available <= 0:
|
||||
reason = '父指令额度已由成交或在途委托占用,等待回报入账或撤单确认'
|
||||
prog['last_decision'] = {'at': now.strftime('%H:%M'), 'action': 'WAIT', 'reason': reason}
|
||||
|
|
@ -361,13 +367,22 @@ def run_tick(*, now=None, dry_run: bool = False) -> dict:
|
|||
pms_repo.update_instruction(ins["instruction_id"], progress=prog)
|
||||
continue
|
||||
|
||||
dl_min = order_deadline(now, d, ttl_min=order_ttl)
|
||||
if dl_min <= et.hm_to_min(now):
|
||||
# 收盘边界可能刚收到旧单终态,不能因此再生成有效期已到的子单。
|
||||
reason = '已到委托截止时间,今日不再新增委托'
|
||||
prog['last_decision'] = {'at': now.strftime('%H:%M'), 'action': et.ACT_WAIT, 'reason': reason}
|
||||
if not dry_run:
|
||||
pms_repo.update_instruction(ins['instruction_id'], progress=prog)
|
||||
out['waited'].append({'instruction_id': ins['instruction_id'], 'code': code,
|
||||
'action': et.ACT_WAIT, 'reason': reason})
|
||||
continue
|
||||
if dry_run:
|
||||
out["fired"].append({"instruction_id": ins["instruction_id"], "code": code,
|
||||
"qty": qty, "limit": d["limit_price"],
|
||||
"reason": d["reason"], "dry_run": True})
|
||||
continue
|
||||
|
||||
dl_min = et.slice_deadline(now, ttl_min=order_ttl, forced=d.get("forced", False))
|
||||
# intent / parent_id / note 是 ws 通道要的 (协议 §4.2): intent 只作归类,
|
||||
# parent_id 让子单能回指父指令, note 原样落到 QMT 侧供人工看盘。
|
||||
# shadow 模式忽略这三项, 传着不碍事 —— 两种模式共用同一个调用点。
|
||||
|
|
@ -437,6 +452,8 @@ def sweep_windows(*, now=None) -> dict:
|
|||
pms_repo.update_plan(ins["origin_id"], filled_qty=exec_qty,
|
||||
status=PLAN_DONE if remaining <= 0 else None)
|
||||
out["synced"] += 1
|
||||
if ins.get('status') == 'WAIT_REVIEW':
|
||||
continue # 复核任务自行处理截止日及撤单,不能提前释放在途数量。
|
||||
if remaining <= 0:
|
||||
pms_repo.update_instruction(ins["instruction_id"], status=ST_CONFIRMED)
|
||||
continue
|
||||
|
|
@ -479,10 +496,8 @@ def cancel_instruction(instruction_id: str, reason: str = "页面人工撤销",
|
|||
return {"ok": False, "error": f"指令处于 {ins['status']}, 不可撤销"}
|
||||
r = dispatcher.cancel(instruction_id=instruction_id,
|
||||
dispatch_ref=ins.get("dispatch_ref")) or {}
|
||||
# **下游没撤成就不能在本端标 CANCELLED。** 原来 r 拿到手却从不检查, 一律回「已撤销」
|
||||
# 并把父指令置终态 —— 而终态之后没有任何东西再跟踪它, 下游那张委托继续挂着、继续成交,
|
||||
# 成交回来还会因为找不到在途父指令而变成孤儿。撤不掉就保持在途, 让它继续被择时/收口/
|
||||
# 对账看见, 由人再处理。
|
||||
# ok 只表示撤单意图已落表。父指令停止新增,子委托仍按QMT回报跟踪,
|
||||
# 在途占用及迟到成交不因父指令 CANCELLED 而清除。
|
||||
if not r.get("ok"):
|
||||
logger.error("[撤单] 下游未受理 %s: %s —— 指令保持在途, 下游委托可能仍挂着",
|
||||
instruction_id, r.get("error") or r)
|
||||
|
|
@ -500,10 +515,21 @@ def cancel_instruction(instruction_id: str, reason: str = "页面人工撤销",
|
|||
pms_repo.insert_ledger(ts_code=ins["ts_code"], action=ins.get("action"), arbiter=arbiter,
|
||||
verdict="REJECT", price_at=0, ref_id=instruction_id, reason=reason,
|
||||
hard_numbers=(ins.get('progress') or {}).get('plan') or {})
|
||||
return {"ok": True, "downstream": r, "message": f"指令 {instruction_id} 已撤销"}
|
||||
pending = dispatcher.mode() == dispatcher.MODE_WS and bool(r.get('cancel_pending'))
|
||||
return {"ok": True, "downstream": r, "cancel_pending": pending,
|
||||
"message": (f"指令 {instruction_id} 已停止新增,撤单处理中,已成交部分仍会入账"
|
||||
if pending else f"指令 {instruction_id} 已撤销")}
|
||||
|
||||
|
||||
# ================================================================ 内部
|
||||
def order_deadline(now, decision, *, ttl_min):
|
||||
# 仅作用于普通执行器的QMT价格监控路径。轮换、网格和做T各自决定有效期。
|
||||
day_order = (decision.get('qmt_price_monitor')
|
||||
and param_store.get_bool('PMS_EXEC_QMT_DAY_ORDER', False))
|
||||
return et.slice_deadline(now, ttl_min=ttl_min,
|
||||
forced=bool(decision.get('forced') or day_order))
|
||||
|
||||
|
||||
def _pos_of(view: dict, ts_code: str) -> dict:
|
||||
for x in view["positions"]:
|
||||
if x["ts_code"] == ts_code:
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ SECRET_KEYS = ("PMS_QMT_SIGN_SEED_HEX", "PMS_QMT_PEER_PUBKEY_B64", "PMS_SESSION_
|
|||
|
||||
# 运行态开关: key -> (默认值, 类型, 说明)
|
||||
RUNTIME_EXTRA = {
|
||||
"PMS_DAILY_BUY_REVIEW": (False, bool, "跨日买入先撤旧委托,再按当日候选、研判、数量和价格完整复核;未通过不得续单"),
|
||||
'PMS_ROTATION_MODE': ('observe', str, '微盘轮换模式:observe观察、paper独立纸面、auto自动。自动须通过验收门槛'),
|
||||
'PMS_ROTATION_SIM_DIRECT': (False, bool, '155模拟仓直接启用,取消观察及纸面等待;保留账本、资金、数据、权限和用户控制检查'),
|
||||
'PMS_ROTATION_MONITOR_URL': ('', str, '微盘监控只读接口根地址,留空停用拉取'),
|
||||
|
|
@ -280,6 +281,7 @@ DESC = {
|
|||
"PMS_DISPATCH_MODE": "下发通道: shadow=只记账待人工 / ws=WebSocket 直连 QMT (需先起 pms-ws)",
|
||||
"PMS_EXEC_SLICES": "当日配额分几笔出手",
|
||||
"PMS_ORDER_TTL_MIN": "单笔挂单有效期 (交易分钟), 到点下游自动撤; 兜底单不受限",
|
||||
"PMS_EXEC_QMT_DAY_ORDER": "普通QMT限价单当日有效,最晚15:00撤单;不改变微盘和网格的执行窗口",
|
||||
"PMS_SELL_BUCKET_TIMES": "卖出分桶收口时点 (逗号分隔, 如 11:30,14:00): 桶内照旧择价, 桶收口无条件补齐该桶份额, 把跌日的强制卖出从 14:45 一根针分散到多个时点; 留空=不分桶回到旧行为",
|
||||
"PMS_URGENT_SELL_DISCOUNT": "紧急卖出限价系数 (一键清仓/高置信风控清仓直通出手, 比兜底 0.998 更激进, 每分钟按新现价重定)",
|
||||
"PMS_RISK_WARN_ENTRY": "单笔敞口告警线 (占规模)", "PMS_RISK_WARN_PORTFOLIO": "组合敞口告警线",
|
||||
|
|
|
|||
|
|
@ -193,6 +193,8 @@ def refresh_pending(*, now=None, deadline=None):
|
|||
legacy_on = param_store.get_bool('PMS_PLAN_VERSION_RECHECK', False)
|
||||
rows = pms_repo.list_proposals(statuses=('WAIT_USER',), limit=200)
|
||||
for p in rows:
|
||||
if (p.get('hard_numbers') or {}).get('kind') == 'daily_review':
|
||||
continue # 关联旧父指令的当日复核由 daily_buy_review 维护。
|
||||
if not legacy_on and (p.get('hard_numbers') or {}).get('candidate_source') != 'dividend':
|
||||
continue
|
||||
if p.get('action') != 'OPEN' or (p.get('hard_numbers') or {}).get('kind') == 'strategy' or ps.is_expired(p, now):
|
||||
|
|
|
|||
|
|
@ -63,9 +63,11 @@ def _macro_gate() -> dict:
|
|||
return {}
|
||||
|
||||
|
||||
def scan_and_route(*, now=None, dry_run: bool = False) -> dict:
|
||||
def scan_and_route(*, now=None, dry_run: bool = False, review_instruction=None, prepared_verdict=None) -> dict:
|
||||
"""自主提议扫描一轮。dry_run=True 只出候选与判定, 不落任何表。"""
|
||||
now = now or datetime.now()
|
||||
if review_instruction is not None:
|
||||
dry_run = True
|
||||
out = {"ok": True, "autonomy": None, "open_autonomy": None, "candidates": 0,
|
||||
"open_candidates": 0, "executed": [], "queued": [],
|
||||
"rejected": [], "skipped": [], "errors": [], "degraded": False, "dry_run": dry_run,
|
||||
|
|
@ -137,7 +139,8 @@ def scan_and_route(*, now=None, dry_run: bool = False) -> dict:
|
|||
# 「今日系统已判放弃,明日重评」。off 时 _system_declined_today_keys 返回空, 逐字回旧。
|
||||
skip = {**_jk, **_rejected_today_keys(),
|
||||
**_declined_today_keys(), **_system_declined_today_keys(),
|
||||
**_inflight_keys()}
|
||||
**(_inflight_keys(exclude_instruction=review_instruction["instruction_id"])
|
||||
if review_instruction else _inflight_keys())}
|
||||
# 挂了 ACTIVE 交易方案(策略)的票交策略层接管, 动作引擎不再对它自动提议
|
||||
# (读库失败按空集 —— 宁可这轮不排除, 也不能因读不到把全体持仓都排除)
|
||||
try:
|
||||
|
|
@ -210,12 +213,15 @@ def scan_and_route(*, now=None, dry_run: bool = False) -> dict:
|
|||
|
||||
# ---- 新建仓: 候选池那一路 (取不到候选池不影响上面四类, 反之亦然) ----
|
||||
open_cands = []
|
||||
review_source = (((review_instruction or {}).get('progress') or {}).get('plan') or {}).get('candidate_source')
|
||||
if open_autonomy == AUTONOMY_OFF:
|
||||
out["skipped"].append({"action": ae.A_OPEN, "why": "新建仓档位 off, 不扫描候选池"})
|
||||
else:
|
||||
try:
|
||||
open_cands = _scan_open(view, params, stock_params, skip, mkt, out, now=now,
|
||||
record_consumption=not dry_run)
|
||||
record_consumption=not dry_run,
|
||||
**({'candidate_source': 'dividend'} if review_source == 'dividend' else {}),
|
||||
**({'review_instruction': review_instruction} if review_instruction else {}))
|
||||
except Exception as e:
|
||||
logger.exception("新建仓扫描失败")
|
||||
out["errors"].append(f"新建仓扫描失败: {type(e).__name__}: {e}")
|
||||
|
|
@ -235,6 +241,29 @@ def scan_and_route(*, now=None, dry_run: bool = False) -> dict:
|
|||
deadline = time.monotonic() + max(
|
||||
0, param_store.get_int("PMS_JUDGE_TICK_BUDGET_SEC", 150))
|
||||
|
||||
if review_instruction is not None:
|
||||
old = review_instruction
|
||||
fresh = next((c for c in list(scanned['candidates']) + open_cands
|
||||
if c['ts_code'] == old['ts_code'] and c['action'] == old['action']), None)
|
||||
if not fresh:
|
||||
return {**out, 'review': None}
|
||||
remaining = max(0, int(old['qty']) - int(old.get('exec_qty') or 0))
|
||||
fresh['qty'] = min(int(fresh['qty']), remaining)
|
||||
if fresh['qty'] <= 0:
|
||||
return {**out, 'review': None}
|
||||
fresh['_plan_recheck'] = True
|
||||
fresh['judge_required'] = True
|
||||
fresh.setdefault('hard_numbers', {}).update(qty=fresh['qty'], daily_parent=old['instruction_id'])
|
||||
result = _route_one(fresh, view, params, stock_params, brake_active, now, True, out,
|
||||
deadline=deadline, review_only=True, prepared_verdict=prepared_verdict)
|
||||
if result:
|
||||
result['candidate']['qty'] = min(int(result['candidate']['qty']), remaining)
|
||||
result['candidate']['hard_numbers']['qty'] = result['candidate']['qty']
|
||||
if review_source == 'dividend':
|
||||
# 原人工选定的独立来源不得因跨日复核升级为自主选股。
|
||||
result.update(auto_exec=False, force_queue=True)
|
||||
return {**out, 'review': result}
|
||||
|
||||
for group_index, group in enumerate((list(scanned['candidates']), open_cands)):
|
||||
if group_index == 1 and not dry_run:
|
||||
from app.services.plan_recheck import refresh_pending
|
||||
|
|
@ -316,7 +345,8 @@ def _save_tech_exit_done(codes) -> None:
|
|||
|
||||
# ================================================================ 新建仓的取数与筛选
|
||||
def _scan_open(view, params, stock_params, skip, mkt, out, now=None,
|
||||
review_code=None, exclude_proposal=None, record_consumption=True, candidate_source='plan') -> list:
|
||||
review_code=None, exclude_proposal=None, record_consumption=True, candidate_source='plan',
|
||||
review_instruction=None) -> list:
|
||||
"""候选池 → 新建仓候选。产出的候选数天生不超过剩余名额 (名额与金额在纯逻辑里边走边扣)。
|
||||
|
||||
与命令驱动那条路 (command_service._candidates) 有意不同的两点:
|
||||
|
|
@ -359,6 +389,8 @@ def _scan_open(view, params, stock_params, skip, mkt, out, now=None,
|
|||
# 拿不到 ≠ 今天没票可买。显式留痕, 本轮不产新建仓候选, 已有持仓的四类照常。
|
||||
logger.error("[新建仓] 候选池取数失败, 本轮不建仓: %s", e)
|
||||
out["skipped"].append({"action": ae.A_OPEN, "why": f"候选池取不到, 本轮不建仓: {e}"})
|
||||
if review_instruction:
|
||||
out['errors'].append('当日候选资料未就绪,跨日任务继续等待')
|
||||
return []
|
||||
# 仅展示的票逐只写跳过原因: disposition_snapshot 复用本函数, 页面「系统在盯的候选」
|
||||
# 由此显示「选股系统判为仅展示」而不是一个说不清的空白。
|
||||
|
|
@ -368,6 +400,12 @@ def _scan_open(view, params, stock_params, skip, mkt, out, now=None,
|
|||
out["skipped"].append({"ts_code": row.get("ts_code"), "action": ae.A_OPEN,
|
||||
"why": ae.display_only_why(row)})
|
||||
items = list(sel.get("items") or [])
|
||||
if review_instruction:
|
||||
code = review_instruction['ts_code']
|
||||
pending = (sel.get('refresh_status') or {}).get('pending_codes') or []
|
||||
if not (sel.get('decision') or {}).get('id') or code in pending or code.replace('.', '') in pending:
|
||||
out['errors'].append('当前研究资料未就绪,跨日买入继续等待')
|
||||
return []
|
||||
if review_code:
|
||||
items = [x for x in items if x['ts_code'] == review_code]
|
||||
if not items:
|
||||
|
|
@ -377,6 +415,9 @@ def _scan_open(view, params, stock_params, skip, mkt, out, now=None,
|
|||
out.setdefault('user_monitor_codes', []).extend(x['ts_code'] for x in items if x.get('user_candidate'))
|
||||
codes = [x["ts_code"] for x in items]
|
||||
prices = market.get_prices(codes)
|
||||
if review_instruction and review_instruction['ts_code'] in codes and not prices.get(review_instruction['ts_code']):
|
||||
out['errors'].append('当日有效行情缺失,跨日买入继续等待')
|
||||
return []
|
||||
# 行业名一次批量取, 本轮复用。滚动扣减要算行业集中度, 所以必须先有它 ——
|
||||
# caps_ctx 对**从没持仓过**的票带不出行业名, 不显式传的话 sizer.check_caps 遇到
|
||||
# sector 为空会整段跳过, 行业集中度那道硬拦截就静默失效了。
|
||||
|
|
@ -399,12 +440,14 @@ def _scan_open(view, params, stock_params, skip, mkt, out, now=None,
|
|||
# 名额与金额都要扣掉**在途的建仓承诺** (2026-08-28 审查修): names_count 只数已成交
|
||||
# 持仓, 在途 OPEN 指令与等拍板的 OPEN 提议两头都不占 —— 候选没进买入区间时指令滞留
|
||||
# 在途, 下一跳名额照旧又放两只, 几分钟就把持仓数上限击穿。同票去重挡不住换一只票。
|
||||
if candidate_source == 'dividend':
|
||||
if review_instruction:
|
||||
inflight = _inflight_open_commitments(view, exclude_proposal=exclude_proposal,
|
||||
exclude_instruction=review_instruction['instruction_id'], strict=True)
|
||||
elif candidate_source == 'dividend':
|
||||
inflight = _inflight_open_commitments(view, exclude_proposal=exclude_proposal, strict=True)
|
||||
cands = [c for c in cands if c['ts_code'] not in inflight['names']]
|
||||
else:
|
||||
inflight = (_inflight_open_commitments(view, exclude_proposal=exclude_proposal)
|
||||
if exclude_proposal else _inflight_open_commitments(view))
|
||||
inflight = _inflight_open_commitments(view, exclude_proposal=exclude_proposal)
|
||||
slots = int(p["max_names"] or 0) - int(t["names_count"] or 0) - len(inflight["names"])
|
||||
room = float(p["portfolio_cap"] or 0) * float(p["scale"] or 0) \
|
||||
- float(t["portfolio_mv"] or 0) - inflight["amount"]
|
||||
|
|
@ -420,6 +463,8 @@ def _scan_open(view, params, stock_params, skip, mkt, out, now=None,
|
|||
if str(t.get("cash_source") or "") == portfolio.CASH_WS and t.get("cash_avail") is not None:
|
||||
room = min(room, float(t["cash_avail"]))
|
||||
elif param_store.get_bool("PMS_OPEN_REQUIRE_WS_CASH", True):
|
||||
if review_instruction:
|
||||
out['errors'].append('最新账户资金未就绪,跨日买入继续等待')
|
||||
out["skipped"].append({"action": ae.A_OPEN,
|
||||
"why": f"读不到券商账户的可用资金,这一轮不开新仓;"
|
||||
f"已持有的票照常处理。"
|
||||
|
|
@ -616,7 +661,7 @@ def _no_candidate_why(sel) -> str:
|
|||
return head + ":" + ",".join(parts) + "。"
|
||||
|
||||
|
||||
def _inflight_open_commitments(view, exclude_proposal=None, strict=False) -> dict:
|
||||
def _inflight_open_commitments(view, exclude_proposal=None, strict=False, exclude_instruction=None) -> dict:
|
||||
"""在途的新建仓承诺: names 为代码集合,amount 为预估占用,basis 为稳定核验依据。
|
||||
|
||||
口径: 在途 (LIVE) 的 OPEN 指令 + 等拍板 (WAIT_USER) 的 OPEN 提议, 只算**尚未持有**
|
||||
|
|
@ -629,6 +674,8 @@ def _inflight_open_commitments(view, exclude_proposal=None, strict=False) -> dic
|
|||
rows = []
|
||||
try:
|
||||
for i in pms_repo.list_instructions(statuses=list(executor.LIVE), limit=300):
|
||||
if exclude_instruction and i['instruction_id'] == exclude_instruction:
|
||||
continue
|
||||
if i.get("action") == ae.A_OPEN and i["ts_code"] not in held:
|
||||
rows.append((i["ts_code"], int(i.get("qty") or 0), None))
|
||||
basis.append(('instruction', str(i.get('instruction_id') or ''),
|
||||
|
|
@ -641,6 +688,8 @@ def _inflight_open_commitments(view, exclude_proposal=None, strict=False) -> dic
|
|||
for pr in pms_repo.list_proposals(statuses=("WAIT_USER",), limit=200):
|
||||
if exclude_proposal and pr.get('proposal_id') == exclude_proposal:
|
||||
continue
|
||||
if exclude_instruction and (pr.get('hard_numbers') or {}).get('daily_parent') == exclude_instruction:
|
||||
continue
|
||||
if pr.get("action") == ae.A_OPEN and pr["ts_code"] not in held:
|
||||
hn = pr.get("hard_numbers") or {}
|
||||
rows.append((pr["ts_code"], int(pr.get("qty") or 0),
|
||||
|
|
@ -1046,7 +1095,8 @@ def _route_one(c, view, params, stock_params, brake_active, now, dry_run, out,
|
|||
c['hard_numbers'].update(judge_verdict=verdict.get('verdict'),
|
||||
judge_conf=verdict.get('confidence'),
|
||||
price=price, reason=c['reason'])
|
||||
return {'candidate': c, 'verdict': verdict}
|
||||
return {'candidate': c, 'verdict': verdict, 'auto_exec': auto_exec, 'force_queue': force_queue,
|
||||
'self_decide': sd}
|
||||
|
||||
if dry_run:
|
||||
(out["executed"] if auto_exec else out["queued"]).append(
|
||||
|
|
@ -1665,7 +1715,7 @@ def _declined_today_keys() -> dict:
|
|||
return keys
|
||||
|
||||
|
||||
def _inflight_keys() -> dict:
|
||||
def _inflight_keys(exclude_instruction=None) -> dict:
|
||||
"""已有在途提议或在途指令的 {(代码, 动作): 原因} —— 同一件事不重复提。
|
||||
|
||||
提议与指令分开写原因, 并且**指令写在后面覆盖提议**: 一条提议被采纳之后会变成指令,
|
||||
|
|
@ -1685,14 +1735,22 @@ def _inflight_keys() -> dict:
|
|||
keys.setdefault((code, buy), '该股有减持安排待处理,暂不新增买入提议')
|
||||
try:
|
||||
for p in pms_repo.list_proposals(statuses=("WAIT_USER",), limit=200):
|
||||
if exclude_instruction and (p.get('hard_numbers') or {}).get('daily_parent') == exclude_instruction:
|
||||
continue
|
||||
_mark(p["ts_code"], p["action"], f"已有在途提议 {p.get('proposal_id')} 在等人确认")
|
||||
except Exception as e:
|
||||
if exclude_instruction:
|
||||
raise
|
||||
logger.warning("读提议队列失败: %s", e)
|
||||
try:
|
||||
for i in pms_repo.list_instructions(statuses=list(executor.LIVE), limit=300):
|
||||
if i['instruction_id'] == exclude_instruction:
|
||||
continue
|
||||
_mark(i["ts_code"], i.get("action"),
|
||||
f"已有在途指令 {i.get('instruction_id')} ({i.get('status')})")
|
||||
except Exception as e:
|
||||
if exclude_instruction:
|
||||
raise
|
||||
logger.warning("读在途指令失败: %s", e)
|
||||
return keys
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ from app.repo import pms_repo, qmt_repo, rotation_repo as store
|
|||
from app.services import param_store, portfolio, market
|
||||
|
||||
TZ = ZoneInfo('Asia/Shanghai')
|
||||
LIVE = ('PROPOSED', 'RULE_PASSED', 'JUDGE_PASSED', 'DISPATCHED')
|
||||
LIVE = ('PROPOSED', 'RULE_PASSED', 'JUDGE_PASSED', 'DISPATCHED', 'WAIT_REVIEW')
|
||||
TERMINAL = qmt_repo.FINAL
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -852,7 +852,7 @@ def _has_pending(st) -> bool:
|
|||
ins = pms_repo.get_instruction(iid)
|
||||
except Exception: # noqa: BLE001
|
||||
return False
|
||||
return bool(ins and ins.get("status") in ("PROPOSED", "RULE_PASSED", "DISPATCHED"))
|
||||
return bool(ins and ins.get("status") in ("PROPOSED", "RULE_PASSED", "DISPATCHED", "WAIT_REVIEW"))
|
||||
|
||||
|
||||
def _snap(a, hv, p) -> dict:
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ from app.services import market, param_store, portfolio
|
|||
logger = logging.getLogger("pms.strategy")
|
||||
|
||||
# 指令在途 (未终态) 的状态集 —— 与 executor.LIVE 一致; 本层据此判断「上一笔还没走完, 先别再发」。
|
||||
LIVE_INS = ("PROPOSED", "RULE_PASSED", "DISPATCHED")
|
||||
LIVE_INS = ("PROPOSED", "RULE_PASSED", "DISPATCHED", "WAIT_REVIEW")
|
||||
|
||||
# 批次动作 (与 recon.ACTION_TO_LOT 对齐)
|
||||
A_T0 = "T0_ROUND" # 做T 买入与卖出 → T0 批次
|
||||
|
|
|
|||
|
|
@ -444,12 +444,17 @@ def api_lots(ts_code: str, status: str = Query("OPEN"),
|
|||
|
||||
@app.get("/api/instructions")
|
||||
def api_instructions(status: str = Query(None), limit: int = 200,
|
||||
include_archived: bool = Query(False)):
|
||||
include_archived: bool = Query(False),
|
||||
book_id: Literal["original", "micro30"] = Query("original")):
|
||||
statuses = [s for s in (status or "").split(",") if s] or None
|
||||
def _list():
|
||||
from app.core import strategy_book as books
|
||||
from app.services.execution_conflicts import instruction_progress
|
||||
return instruction_progress(pms_repo.list_instructions(statuses=statuses, limit=limit,
|
||||
include_archived=include_archived))
|
||||
if book_id == books.MICRO and not settings.INFRA_STRATEGY_BOOK_SCHEMA:
|
||||
return []
|
||||
with books.scope(book_id):
|
||||
return instruction_progress(pms_repo.list_instructions(statuses=statuses, limit=limit,
|
||||
include_archived=include_archived))
|
||||
return ok(_list)
|
||||
|
||||
|
||||
|
|
@ -564,6 +569,9 @@ def api_decide(request: Request, proposal_id: str, payload: dict = Body(default=
|
|||
p = pms_repo.get_proposal(proposal_id)
|
||||
if not p:
|
||||
return {"ok": False, "error": "提议不存在"}
|
||||
if (p.get('hard_numbers') or {}).get('kind') == 'daily_review':
|
||||
from app.services.daily_buy_review import decide_confirmation
|
||||
return decide_confirmation(p, decision, reason, payload.get('proposal_revision'))
|
||||
if (decision == 'ACCEPTED' and p['status'] == 'ACCEPTED' and p['action'] == 'OPEN'
|
||||
and (p.get('hard_numbers') or {}).get('kind') != 'strategy'):
|
||||
existing = pms_repo.accepted_open_instruction(proposal_id)
|
||||
|
|
@ -787,11 +795,18 @@ def api_sweep_windows():
|
|||
|
||||
|
||||
@app.post("/api/instructions/{instruction_id}/cancel")
|
||||
def api_cancel_instruction(instruction_id: str, payload: dict = Body(default={})):
|
||||
def api_cancel_instruction(instruction_id: str, payload: dict = Body(default={}),
|
||||
book_id: Literal["original", "micro30"] = Query("original")):
|
||||
from app.core import strategy_book as books
|
||||
from app.services import executor
|
||||
return ok_logged("cancel_instruction", executor.cancel_instruction, instruction_id,
|
||||
def _cancel(iid, reason):
|
||||
if book_id == books.MICRO and not settings.INFRA_STRATEGY_BOOK_SCHEMA:
|
||||
return {"ok": False, "error": "微盘轮动账本尚未启用"}
|
||||
with books.scope(book_id):
|
||||
return executor.cancel_instruction(iid, reason)
|
||||
return ok_logged("cancel_instruction", _cancel, instruction_id,
|
||||
payload.get("reason") or "页面人工撤销",
|
||||
params={"instruction_id": instruction_id})
|
||||
params={"instruction_id": instruction_id, "book_id": book_id})
|
||||
|
||||
|
||||
@app.post("/api/ops/scan-proposals")
|
||||
|
|
|
|||
|
|
@ -368,6 +368,10 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
状态芯片一行、「下一步」短语一行放下, 具体说明进悬停。 */
|
||||
.position-tabs > .el-tabs__header{margin-bottom:8px;}
|
||||
.position-tabs .tabn{margin-left:6px;}
|
||||
.instruction-books .el-tabs__item{padding:0 14px;}
|
||||
.instruction-status > .el-tabs__header{margin-bottom:8px;}
|
||||
.instruction-status .el-tabs__item{font-size:12px;height:32px;padding:0 9px;}
|
||||
.instruction-status .el-tabs__nav-wrap::after{height:0;}
|
||||
.book-heading{display:flex;align-items:center;flex-wrap:wrap;gap:8px 18px;margin:10px 0;}
|
||||
.book-heading .book-stat{font-size:12px;color:var(--muted);}
|
||||
.postbl .el-scrollbar__wrap{overflow-x:auto;}
|
||||
|
|
@ -1194,19 +1198,25 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
</div>
|
||||
|
||||
<!-- 当日指令 -->
|
||||
<div class="panel tblk" id="t-ins">
|
||||
<div class="panel tblk postbl" id="t-ins">
|
||||
<h3>当日指令</h3>
|
||||
<div class="sub2">今天下发的买卖单,按进展分档</div>
|
||||
<el-tabs v-model="insTab">
|
||||
<div class="sub2">在办买卖安排及今日成交;跨日买入须重新复核</div>
|
||||
<el-tabs v-model="instructionTab" class="position-tabs instruction-books">
|
||||
<el-tab-pane v-for="book in instructionBooks" :key="book.id" :name="'ins-'+book.id">
|
||||
<template #label>{{ book.name }} <span class="tabn">{{ instructionReady[book.id] ? instructionCounts[book.id] : '—' }}</span></template>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
<el-alert v-if="!instructionReady[instructionBook]" title="该策略指令读取失败,请刷新后重试。" type="warning" :closable="false"></el-alert>
|
||||
<el-tabs v-else v-model="insTab" class="instruction-status">
|
||||
<el-tab-pane name="live">
|
||||
<template #label>未成交 <span class="tabn">{{ insLive.length }}</span></template>
|
||||
<el-table :data="insLive" size="small" max-height="280" empty-text="现在没有未成交的买卖单">
|
||||
<el-table-column label="股票" min-width="150"><template #default="s"><b>{{ nm(s.row.ts_code) }}</b> <span class="muted mono">{{ s.row.ts_code }}</span></template></el-table-column>
|
||||
<el-table-column label="做什么" width="150"><template #default="s">{{ tx('action', s.row.action) }} · {{ tx('side', s.row.side) }}</template></el-table-column>
|
||||
<el-table-column label="计划量 / 已成交" width="130" align="right"><template #default="s"><span class="mono">{{ s.row.qty }} / {{ s.row.exec_qty||0 }}</span></template></el-table-column>
|
||||
<el-table-column label="限价" width="82" align="right"><template #default="s"><span class="mono">{{ s.row.limit_price||'—' }}</span></template></el-table-column>
|
||||
<el-table-column label="进展" min-width="130"><template #default="s"><span class="chip idle"><span class="dot"></span>{{ s.row.execution_label || tx('insStatus', s.row.status) }}</span></template></el-table-column>
|
||||
<el-table-column label="操作" width="76"><template #default="s"><button class="tbtn sm" @click="cancelIns(s.row.instruction_id)">撤单</button></template></el-table-column>
|
||||
<el-table-column label="委托限价" width="88" align="right"><template #default="s"><span class="mono">{{ s.row.execution_limit||'—' }}</span></template></el-table-column>
|
||||
<el-table-column label="进展" min-width="130"><template #default="s"><span class="chip idle" :title="s.row.execution_note || ''"><span class="dot"></span>{{ s.row.execution_label || tx('insStatus', s.row.status) }}</span></template></el-table-column>
|
||||
<el-table-column label="操作" width="76" fixed="right"><template #default="s"><button class="tbtn sm" @click="cancelIns(s.row)">撤单</button></template></el-table-column>
|
||||
</el-table>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="done">
|
||||
|
|
@ -1226,7 +1236,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
<el-table-column label="怎么结束的" min-width="150"><template #default="s"><span class="chip warn"><span class="dot"></span>{{ s.row.execution_label || tx('insStatus', s.row.status) }}</span></template></el-table-column>
|
||||
</el-table>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="deny">
|
||||
<el-tab-pane v-if="instructionBook==='original'" name="deny">
|
||||
<template #label>未建仓候选 <span class="tabn">{{ denyToday.length }}</span></template>
|
||||
<div class="sub2" style="margin:8px 2px 4px">未建仓候选</div>
|
||||
<el-table :data="denyToday" size="small" max-height="320" empty-text="当前没有未建仓的候选">
|
||||
|
|
@ -2009,11 +2019,17 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
</el-tabs>
|
||||
</div>
|
||||
|
||||
<div class="panel">
|
||||
<div class="panel postbl" id="instruction-ledger">
|
||||
<h3>在途指令
|
||||
<el-checkbox v-model="showAllInstr" size="small" style="margin-left:12px;font-weight:normal">显示已了结</el-checkbox>
|
||||
</h3>
|
||||
<el-table :data="instrLive" size="small" border max-height="320" empty-text="没有在途指令">
|
||||
<el-tabs v-model="instructionLedgerTab" class="position-tabs instruction-books">
|
||||
<el-tab-pane v-for="book in instructionBooks" :key="book.id" :name="'ins-ledger-'+book.id">
|
||||
<template #label>{{ book.name }}</template>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
<el-alert v-if="!instructionReady[instructionLedgerBook]" title="该策略指令读取失败,请刷新后重试。" type="warning" :closable="false"></el-alert>
|
||||
<el-table v-else :data="instrLive" size="small" border max-height="320" empty-text="该策略暂无指令">
|
||||
<el-table-column type="expand" width="40">
|
||||
<template #default="s">
|
||||
<div style="padding:6px 16px">
|
||||
|
|
@ -2057,9 +2073,9 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
</el-table-column>
|
||||
<el-table-column prop="status" label="状态" width="115"></el-table-column>
|
||||
<el-table-column prop="origin_type" label="来源" width="80"></el-table-column>
|
||||
<el-table-column label="操作" width="90">
|
||||
<el-table-column label="操作" width="90" fixed="right">
|
||||
<template #default="s">
|
||||
<el-button size="small" @click="cancelIns(s.row.instruction_id)">撤销</el-button>
|
||||
<el-button v-if="canCancelIns(s.row)" size="small" @click="cancelIns(s.row)">撤销</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -2849,6 +2865,13 @@ createApp({
|
|||
const positionKey = row => (row.book_id || 'original') + ':' + row.ts_code;
|
||||
const lotsRequests = {};
|
||||
const instructions = ref([]), ledger = ref([]), proposals = ref([]), preparingProposals = ref([]);
|
||||
const instructionBooks = [{id:'original',name:'主观量化'}, {id:'micro30',name:'微盘轮动'}];
|
||||
const instructionReady = reactive({original:true,micro30:true});
|
||||
const instructionTab = ref('ins-original'), instructionLedgerTab = ref('ins-ledger-original');
|
||||
const instructionBook = computed(() => instructionTab.value.slice(4));
|
||||
const instructionLedgerBook = computed(() => instructionLedgerTab.value.slice(11));
|
||||
const bookInstructions = computed(() => instructions.value.filter(r => r.book_id===instructionBook.value));
|
||||
const instructionBookName = book => (instructionBooks.find(b => b.id===book)||{}).name || '策略待核实';
|
||||
const strategies = ref([]), stratEnabled = ref(false), opLog = ref([]);
|
||||
const autoScanRes = ref(null), autoScanBusy = ref(false); // 自动挂载试算 (2026-08-25)
|
||||
const autoInfo = ref(null); // 自动挂载仪表: 总开关 + 今天正式一跳跑没跑 (2026-08-26)
|
||||
|
|
@ -2894,6 +2917,7 @@ createApp({
|
|||
} finally { dividendBusy.value = ''; }
|
||||
}
|
||||
const insTab = ref('live');
|
||||
watch(instructionBook, () => { if (insTab.value==='deny') insTab.value='live'; });
|
||||
const stratDlg = reactive({ visible:false, busy:false, reasons:[], ts_code:'', price:0,
|
||||
total_qty:0, avail_qty:0, cushion_pct:null, type:'T0', autonomy:'auto',
|
||||
p:{ t_ratio:0.2, lower:0, upper:0, center:0, step_pct:0.02, per_lot:100, max_capital:0,
|
||||
|
|
@ -3098,7 +3122,7 @@ createApp({
|
|||
const T = {
|
||||
// 账本的动作有十六个:八个真动作(planner.py:31 那批常量)加八个伪动作
|
||||
// (账本里直写的字面量,例如对账修正、信号留痕)。少一个就会在页面上露原码。
|
||||
action: { BUY_STOP:'停止买入', OPEN:'建新仓', OPEN_REASK:'重问研判', FILL:'回落补足', ADD:'盈利加仓', DCA:'浮亏补仓', TRIM:'保盈减仓',
|
||||
action: { DAILY_REVIEW:'跨日复核', BUY_STOP:'停止买入', OPEN:'建新仓', OPEN_REASK:'重问研判', FILL:'回落补足', ADD:'盈利加仓', DCA:'浮亏补仓', TRIM:'保盈减仓',
|
||||
EXIT:'清仓', T0:'做T', T0_ROUND:'做T', SWITCH:'换仓', HALT:'停手',
|
||||
RECON:'对账修正', CLEANUP:'收尾清理', MACRO:'大盘冷热',
|
||||
SIGNAL:'信号留痕', SIGNAL_BUY:'买入信号',
|
||||
|
|
@ -3112,7 +3136,7 @@ createApp({
|
|||
lot: { BASE:'首批', FILL:'回落补足', ADD:'盈利加仓', DCA:'浮亏补仓', T0:'做T仓', RECON:'对账修正' },
|
||||
frozen: { NONE:'', COMMAND_HALT:'命令要求只卖不买', BRAKE:'组合刹车,只卖不买', MANUAL:'人工冻结,只卖不买' },
|
||||
posStatus: { PLANNED:'计划建仓', OPENING:'建仓中', HOLDING:'持有中', EXITING:'清仓中', CLOSED:'已清仓' },
|
||||
insStatus: { PROPOSED:'待执行检查', RULE_PASSED:'合规检查已过', JUDGE_PASSED:'决策系统复核已过', DISPATCHED:'执行中',
|
||||
insStatus: { PROPOSED:'待执行检查', RULE_PASSED:'合规检查已过', JUDGE_PASSED:'决策系统复核已过', DISPATCHED:'执行中', WAIT_REVIEW:'跨日复核中',
|
||||
CONFIRMED:'已成交', REJECTED:'已拦截', EXPIRED:'到期作废', CANCELLED:'已撤销' },
|
||||
arbiter: { rule:'合规检查', judge:'决策系统', user:'人工', system:'系统自动' },
|
||||
// 这一组是**评审账本**的结论,只有四个值。研判闸的结论是另一组 judgeVerdict,
|
||||
|
|
@ -3346,17 +3370,21 @@ createApp({
|
|||
});
|
||||
const marketState = computed(() =>
|
||||
!health.value.trade_day ? '非交易日' : (marketOpen.value ? '盘中' : '休市'));
|
||||
const _LIVE_INS = ['PROPOSED', 'RULE_PASSED', 'JUDGE_PASSED', 'DISPATCHED'];
|
||||
const _LIVE_INS = ['PROPOSED', 'RULE_PASSED', 'JUDGE_PASSED', 'DISPATCHED', 'WAIT_REVIEW'];
|
||||
const _isArch = r => !!(r && r.archived_at); // 软归档: 有 archived_at = 已从视图移除 (行仍在库)
|
||||
const _sameDayIns = r => { const y = todayYmd.value;
|
||||
const id = String(r.instruction_id || '');
|
||||
// 策略指令的前缀是 STR{ymd} (strategy_runner), 不是 INS_ —— 原来它们一进终态就从
|
||||
// 「已成交/已终止」和消息栏同时消失, 交易员眼看着自己的单子凭空不见 (2026-08-28)
|
||||
return !y || id.indexOf('INS_' + y + '_') === 0 || id.indexOf('STR' + y) === 0; };
|
||||
return !y || id.indexOf('INS_' + y + '_') === 0 || id.indexOf('STR' + y) === 0
|
||||
|| (id.startsWith('ROT_') && String(r.created_at||'').slice(0,10).replaceAll('-','')===y); };
|
||||
// 已归档的一律不进「当日指令」三档 —— 归档=从所有面板隐藏。
|
||||
const insLive = computed(() => (instructions.value || []).filter(r => _LIVE_INS.includes(r.status) && !_isArch(r)));
|
||||
const insDone = computed(() => (instructions.value || []).filter(r => r.status === 'CONFIRMED' && _sameDayIns(r) && !_isArch(r)));
|
||||
const insEnd = computed(() => (instructions.value || []).filter(r => ['EXPIRED', 'CANCELLED', 'REJECTED'].includes(r.status) && _sameDayIns(r) && !_isArch(r)));
|
||||
const canCancelIns = r => _LIVE_INS.includes(r.status) && !_isArch(r);
|
||||
const insLive = computed(() => bookInstructions.value.filter(canCancelIns));
|
||||
const insDone = computed(() => bookInstructions.value.filter(r => r.status === 'CONFIRMED' && _sameDayIns(r) && !_isArch(r)));
|
||||
const insEnd = computed(() => bookInstructions.value.filter(r => ['EXPIRED', 'CANCELLED', 'REJECTED'].includes(r.status) && _sameDayIns(r) && !_isArch(r)));
|
||||
const instructionCounts = computed(() => Object.fromEntries(instructionBooks.map(b => [b.id,
|
||||
instructions.value.filter(r => r.book_id===b.id && !_isArch(r) && (_LIVE_INS.includes(r.status) || _sameDayIns(r))).length])));
|
||||
// 在办/在途/策略列表: 默认只看进行中; 「显示已完成」开关放开终态。命令与策略开关还会拉出已归档 (带恢复按钮)。
|
||||
const _CMD_ACTIVE = ['PENDING', 'PLANNING', 'EXECUTING', 'PARTIAL', 'EFFECTIVE'];
|
||||
const _STRAT_ACTIVE = ['ACTIVE', 'PAUSED'];
|
||||
|
|
@ -3364,14 +3392,14 @@ createApp({
|
|||
r => showAllCommands.value ? true : (_CMD_ACTIVE.includes(r.status) && !_isArch(r))));
|
||||
const strategiesShown = computed(() => (strategies.value || []).filter(
|
||||
r => showAllStrategies.value ? true : (_STRAT_ACTIVE.includes(r.status) && !_isArch(r))));
|
||||
const instrLive = computed(() => (instructions.value || []).filter(
|
||||
r => showAllInstr.value ? true : (_LIVE_INS.includes(r.status) && !_isArch(r))));
|
||||
const instrLive = computed(() => instructions.value.filter(r => r.book_id===instructionLedgerBook.value
|
||||
&& (showAllInstr.value || canCancelIns(r))));
|
||||
// 哪些行可「移除」(只终态): 与后端 archive_* 的终态集一致。
|
||||
const cmdArchivable = r => ['DONE', 'CANCELLED', 'SUPERSEDED'].includes(r.status);
|
||||
const stratArchivable = r => ['CANCELLED', 'DONE'].includes(r.status);
|
||||
// 每只候选今天为什么下单/没下单: 已落地的事实(指令/提议)优先, 其余看 /api/open-scan 的只读处置。
|
||||
function dispOf(code) {
|
||||
const inst = (instructions.value || []).find(i => i.ts_code === code && i.action === 'OPEN'
|
||||
const inst = (instructions.value || []).find(i => i.book_id === 'original' && i.ts_code === code && i.action === 'OPEN'
|
||||
&& (_LIVE_INS.includes(i.status) || _sameDayIns(i))); // 旧的终态单不算「已下单」(2026-08-28)
|
||||
if (inst) {
|
||||
// 系统自决自动采纳的指令 (2026-09-14): 进度里 auto 为真且理由以「系统采纳」开头, 显示「系统已采纳」。
|
||||
|
|
@ -4047,9 +4075,14 @@ createApp({
|
|||
positionGroups.value = d.strategy_groups || [];
|
||||
}
|
||||
async function loadInstructions() {
|
||||
const d = await call('get',
|
||||
'/api/instructions?status=PROPOSED,RULE_PASSED,JUDGE_PASSED,DISPATCHED,CONFIRMED,EXPIRED,CANCELLED,REJECTED&limit=200');
|
||||
instructions.value = d.data || [];
|
||||
// 每个策略独立取最近200条,避免另一策略的历史记录挤掉当前指令。
|
||||
const groups = await Promise.all(instructionBooks.map(async book => {
|
||||
const d = await call('get',
|
||||
'/api/instructions?status=PROPOSED,RULE_PASSED,JUDGE_PASSED,DISPATCHED,WAIT_REVIEW,CONFIRMED,EXPIRED,CANCELLED,REJECTED&limit=200&book_id='+book.id);
|
||||
instructionReady[book.id] = d.ok===true && Array.isArray(d.data);
|
||||
return instructionReady[book.id] ? d.data.map(row => ({...row,book_id:book.id})) : [];
|
||||
}));
|
||||
instructions.value = groups.flat();
|
||||
}
|
||||
async function loadLedger() {
|
||||
const d = await call('get', '/api/ledger?limit=60'); ledger.value = d.data || [];
|
||||
|
|
@ -4614,12 +4647,13 @@ createApp({
|
|||
loading.value = false;
|
||||
wsPollSync();
|
||||
}
|
||||
async function cancelIns(iid) {
|
||||
async function cancelIns(row) {
|
||||
const iid = row.instruction_id, book = row.book_id;
|
||||
try {
|
||||
await ElementPlus.ElMessageBox.confirm('撤销指令 ' + iid + '?', '确认',
|
||||
await ElementPlus.ElMessageBox.confirm('撤销「' + instructionBookName(book) + '」的 ' + nm(row.ts_code) + ' 指令?', '确认撤单',
|
||||
{ type: 'warning' });
|
||||
} catch (e) { return; }
|
||||
const d = await call('post', '/api/instructions/' + iid + '/cancel', {});
|
||||
const d = await call('post', '/api/instructions/' + encodeURIComponent(iid) + '/cancel?book_id='+encodeURIComponent(book), {});
|
||||
ElementPlus.ElMessage[(d.ok ? 'success' : 'error')](d.message || d.error);
|
||||
await Promise.all([loadInstructions(), loadLedger()]);
|
||||
}
|
||||
|
|
@ -5031,7 +5065,7 @@ createApp({
|
|||
if (active) return active;
|
||||
if (r.status==='CONFIRMED') return '成交';
|
||||
if (['CANCELLED','REJECTED','EXPIRED'].includes(r.status)) return '已终止';
|
||||
return {waiting:'待执行',shadow:'待核对'}[r.execution_stage] || (_LIVE_INS.includes(r.status) ? '待核对' : '指令');
|
||||
return {waiting:'待执行',review:'待复核',shadow:'待核对'}[r.execution_stage] || (_LIVE_INS.includes(r.status) ? '待核对' : '指令');
|
||||
}
|
||||
function insWhy(r) {
|
||||
const bits = [];
|
||||
|
|
@ -5057,8 +5091,9 @@ createApp({
|
|||
if (_isArch(r) || !_sameDayIns(r)) continue;
|
||||
const t = _at(r, ['updated_at', 'created_at', 'at', 'dispatched_at']);
|
||||
out.push({ kind:'order', badge:insBadge(r), time:_hm(t), sort:_hms(t), ts_code:r.ts_code,
|
||||
book_id:r.book_id, ins_status:r.status,
|
||||
cat:tx('action', r.action) + ' · ' + (r.execution_label || tx('insStatus', r.status)),
|
||||
strong:true, why:insWhy(r), goLabel:'看在办', go:'ins' });
|
||||
strong:true, why:instructionBookName(r.book_id) + ' · ' + insWhy(r), goLabel:'看在办', go:'ins' });
|
||||
}
|
||||
// 3) 待确认提议 —— 自主档位是「只提议」时, 新提议在这里也提醒一次
|
||||
for (const p of (proposals.value || [])) {
|
||||
|
|
@ -5125,7 +5160,9 @@ createApp({
|
|||
function setMsgKind(k) { msgKind.value = k; msgOpen.value = true; }
|
||||
function msgGo(m) {
|
||||
if (m.go === 'sig') { sigTab.value = 'brief'; openRailSide('l'); }
|
||||
else if (m.go === 'ins') { msgOpen.value = false; scrollTo('t-ins'); }
|
||||
else if (m.go === 'ins') { instructionTab.value='ins-'+m.book_id;
|
||||
insTab.value=m.ins_status==='CONFIRMED'?'done':_LIVE_INS.includes(m.ins_status)?'live':'end';
|
||||
msgOpen.value = false; scrollTo('t-ins'); }
|
||||
else if (m.go === 'prop') { sectClosed.prop = false; openRailSide('r'); }
|
||||
else if (m.go === 'strat') { sectClosed.strat = false; openRailSide('r'); }
|
||||
}
|
||||
|
|
@ -5278,6 +5315,8 @@ createApp({
|
|||
showLedger, onPosExpand,
|
||||
dividend, dividendShown, dividendBusy, dividendMore, prepareDividend, loadDividend,
|
||||
openScan, insTab, todayYmd, insLive, insDone, insEnd, dispOf, conOf, loadOpenScan, denyToday,
|
||||
instructionBooks, instructionReady, instructionTab, instructionLedgerTab, instructionBook,
|
||||
instructionLedgerBook, instructionCounts, canCancelIns,
|
||||
commandsShown, strategiesShown, instrLive, showAllCommands, showAllStrategies, showAllInstr,
|
||||
cmdArchivable, stratArchivable, archiveRow,
|
||||
showOpLog, showSettings, watchCandidates, scanNotes, marketOpen, marketState, lastRefresh, autoRefresh,
|
||||
|
|
|
|||
|
|
@ -675,6 +675,18 @@ class WsRunner:
|
|||
n, json.dumps(pl, ensure_ascii=False)[:500])
|
||||
self._maybe_degrade_ack(pl)
|
||||
else:
|
||||
row = await _db(qmt_repo.get_order, iid) or {}
|
||||
cur = str(row.get('status') or '').upper()
|
||||
# 撤单拒绝不等于原委托拒绝。ALREADY_FINAL 也可能先于终态回报到达;
|
||||
# 缺累计成交量时保持原占用,等待 order_update 与 trade,不猜成交数。
|
||||
cancelling = row.get('cancel_state') in ('REQUESTED', 'SENT')
|
||||
if cur in qmt_repo.FINAL or cancelling or code == 'ALREADY_FINAL':
|
||||
self._note_orphan(await _db(qmt_repo.update_order, iid,
|
||||
reject_code=code[:32], reject_reason=str(pl.get('reason') or '')[:300]),
|
||||
type_, iid)
|
||||
logger.warning('[reject] %s 撤单或终态响应 %s,保留委托状态 %s 和成交数量,等待最终核对',
|
||||
iid, code, cur)
|
||||
return
|
||||
n = await _db(qmt_repo.update_order, iid, status=qmt_repo.OS_REJECTED,
|
||||
reject_code=code[:32],
|
||||
reject_reason=str(pl.get("reason") or "")[:300],
|
||||
|
|
@ -722,6 +734,18 @@ class WsRunner:
|
|||
status = str(pl.get("status") or "").upper()
|
||||
row = await _db(qmt_repo.get_order, iid) or {}
|
||||
cur = str(row.get("status") or "").upper()
|
||||
done = pl.get('cum_qty')
|
||||
try:
|
||||
done = int(done)
|
||||
if done < int(row.get('cum_qty') or 0) or done > int(row['qty']) or done < 0:
|
||||
raise ValueError('累计成交倒退或超出委托数量')
|
||||
if status == wsc.ST_FILLED and done != int(row['qty']):
|
||||
raise ValueError('全成状态与累计成交数量不符')
|
||||
except (TypeError, ValueError, KeyError) as exc:
|
||||
self._stat['order_update_conflicts'] = self._stat.get('order_update_conflicts', 0) + 1
|
||||
self._stat['last_order_conflict'] = f'{iid}: {exc}'
|
||||
logger.error('[order_update] %s 累计成交不可核实,保留原委托占用: %s', iid, exc)
|
||||
return
|
||||
if wsc.is_final(cur) and status != cur:
|
||||
# §5.4/§7.1: 终态唯一、不可再变、只推一次。真收到第二条终态说明对端有 bug ——
|
||||
# 此时**保住第一条**: 账本记的是"到底成交了多少", 被一条迟到的 CANCELLED 覆盖掉
|
||||
|
|
@ -729,7 +753,7 @@ class WsRunner:
|
|||
logger.error("[order_update] %s 已是终态 %s, 又收到 %s —— 已忽略, 请核对对端实现",
|
||||
iid, cur, status)
|
||||
return
|
||||
fields = {"status": status, "cum_qty": int(pl.get("cum_qty") or 0)}
|
||||
fields = {"status": status, "cum_qty": done}
|
||||
if pl.get("cum_avg_price") is not None:
|
||||
fields["cum_avg_price"] = float(pl["cum_avg_price"])
|
||||
if pl.get("leaves_qty") is not None:
|
||||
|
|
@ -865,8 +889,7 @@ class WsRunner:
|
|||
if int(r["valid_until"] or 0) <= now:
|
||||
# 排队期间就过期了。发出去只会立刻换回一个 EXPIRED, 白跑一趟还占对端一条
|
||||
# 记录 —— 本地作废更干净, executor 下一跳会按新行情重新出手。
|
||||
await _db(qmt_repo.abort_order, iid, "排队期间 valid_until 已过, 未发出即作废")
|
||||
logger.warning("[outbox] %s 有效期已过, 本地作废未发出", iid)
|
||||
await self._stop_outbox_order(iid, "排队期间 valid_until 已过")
|
||||
continue
|
||||
if not await _db(qmt_repo.claim_order, iid):
|
||||
continue # 被别的进程抢走了 (滚动重启的瞬间)
|
||||
|
|
@ -874,31 +897,38 @@ class WsRunner:
|
|||
# 排队后可能发生清仓或撤单。认领后再核对,未知状态保留重试。
|
||||
fresh = await _db(qmt_repo.get_order, iid)
|
||||
if not fresh or fresh.get('cancel_state') in ('REQUESTED', 'SENT'):
|
||||
await _db(qmt_repo.abort_order, iid, '发出前撤销')
|
||||
await self._stop_outbox_order(iid, '发出前撤销')
|
||||
continue
|
||||
from app.services.execution_conflicts import queued_buy_blocker
|
||||
from app.services.dispatcher import order_strategy_type
|
||||
try:
|
||||
blocked = await _db(queued_buy_blocker, fresh)
|
||||
if not blocked:
|
||||
strategy_type = await _db(order_strategy_type, fresh.get('parent_id'))
|
||||
except Exception as exc:
|
||||
await _db(qmt_repo.requeue_order, iid, f'买入依据暂不可核实: {exc}',
|
||||
self._p('max_attempts', 3), False)
|
||||
logger.warning('[outbox] %s 买入依据暂不可核实,保留队列', iid)
|
||||
continue
|
||||
if blocked:
|
||||
await _db(qmt_repo.abort_order, iid, blocked)
|
||||
await self._stop_outbox_order(iid, blocked)
|
||||
continue
|
||||
payload = wsc.place_order_payload(
|
||||
instruction_id=iid, ts_code=r["ts_code"], side=r["side"],
|
||||
qty=int(r["qty"]), limit_price=r["limit_price"],
|
||||
valid_until=int(r["valid_until"]), intent=r.get("intent") or "OPEN",
|
||||
note=r.get("note") or "")
|
||||
note=r.get("note") or "", strategy_type=strategy_type)
|
||||
if not await _db(qmt_repo.mark_send_attempt, iid):
|
||||
continue # 同时发生撤单或状态改变,不再发送。
|
||||
await self._send(wsc.T_PLACE, payload, seed, corr_id=iid)
|
||||
except Exception as e:
|
||||
# 连接断了不算这张单的"失败次数" —— 那是通道的问题不是这张单的问题,
|
||||
# 否则一次几秒的网络抖动就能把三张待发单全部烧成 SEND_FAILED。
|
||||
conn = _is_conn_error(e)
|
||||
# 已进入传输阶段则无法证明对端未收到,必须保留在途与幂等键。
|
||||
attempted = await _db(qmt_repo.get_order, iid)
|
||||
await _db(qmt_repo.requeue_order, iid, f"{type(e).__name__}: {e}",
|
||||
self._p("max_attempts", 3), not conn)
|
||||
self._p("max_attempts", 3), not conn and not bool((attempted or {}).get('sent_at')))
|
||||
logger.warning("[outbox] %s 发送失败%s: %s", iid,
|
||||
" (连接问题, 不计失败次数)" if conn else "", e)
|
||||
raise
|
||||
|
|
@ -906,11 +936,21 @@ class WsRunner:
|
|||
logger.info("[outbox] 已发出 %s %s %s %s股 @%.2f", iid, r["ts_code"],
|
||||
r["side"], r["qty"], float(r["limit_price"]))
|
||||
|
||||
async def _stop_outbox_order(self, iid: str, reason: str):
|
||||
row = await _db(qmt_repo.get_order, iid) or {}
|
||||
if row.get('sent_at'):
|
||||
# 包括重启恢复后的 QUEUED:曾尝试发送就必须向QMT撤单并等回报。
|
||||
n = await _db(qmt_repo.request_order_cancel, iid, wsc.new_cancel_id(_ymd()), reason)
|
||||
if not n and row.get('cancel_state') not in ('REQUESTED', 'SENT') and row.get('status') in qmt_repo.LIVE:
|
||||
raise RuntimeError('待撤意图未写入,保留委托占用')
|
||||
else:
|
||||
await _db(qmt_repo.abort_order, iid, reason)
|
||||
|
||||
async def _drain_cancels(self, seed: str):
|
||||
rows = await _db(qmt_repo.next_cancel_requests, 20)
|
||||
for r in rows:
|
||||
iid = r["instruction_id"]
|
||||
if r["status"] in (qmt_repo.OS_QUEUED, qmt_repo.OS_SENDING):
|
||||
if r["status"] in (qmt_repo.OS_QUEUED, qmt_repo.OS_SENDING) and not r.get('sent_at'):
|
||||
# 还没发出去就要撤 —— 直接本地作废, 不必跑一趟下游
|
||||
await _db(qmt_repo.abort_order, iid, "发出前撤销")
|
||||
await _db(qmt_repo.mark_cancel_sent, iid)
|
||||
|
|
|
|||
|
|
@ -213,6 +213,7 @@ class Settings(BaseSettings):
|
|||
PMS_DISPATCH_MODE: str = "shadow" # 下发通道: shadow(影子,默认) / ws(直连QMT,待实现)
|
||||
PMS_EXEC_SLICES: int = 1 # 当日配额分几笔出手 (设计「分笔卖出配额」)
|
||||
PMS_ORDER_TTL_MIN: int = 10 # 单个下发分片的挂单有效期(交易分钟), 到点下游自动撤
|
||||
PMS_EXEC_QMT_DAY_ORDER: bool = False # 普通QMT限价单当日有效;微盘、网格等独立执行不受影响
|
||||
# --- 卖出分桶收口与紧急直通 (2026-08-17 清仓择时改造) ---
|
||||
# 「现价不低于均价才卖」是只在强势时放行的条件, 下跌日全天不满足, 全部数量会
|
||||
# 堆到 14:45 一笔打出。分桶: 桶内照旧择价, 桶收口无条件补齐该桶份额, 把跌日的
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
# QMT下单策略类型
|
||||
|
||||
本次只给`place_order.payload`增加一个`strategy_type`字段,供QMT分类、展示及人工操作。其他业务字段、委托编号、价格、数量、有效期和备注保持原样,撤单及查询消息不变。
|
||||
|
||||
| strategy_type | 显示名称 | PMS内部账本 |
|
||||
| --- | --- | --- |
|
||||
| subjective_quant | 主观量化 | original |
|
||||
| micro_rotation | 微盘轮动 | micro30 |
|
||||
|
||||
标识不包含持股数量,微盘当前为50只。PMS按父指令的持久账本归属填值,不按备注、当前轮换阶段或调用上下文推断。主观量化减持为微盘腾出资金时,该卖单仍标为`subjective_quant`。微盘买入、日常换仓及退出均标为`micro_rotation`。
|
||||
|
||||
QMT读取并保存该字段,可用上述映射显示中文。旧订单或历史报文可能没有该字段,需要兼容保留;不要求重新下发或修改历史委托。新增字段参与完整payload签名,验签前不能用旧字段白名单重建payload。信封`v=1`、握手`protocol=1`和签名算法保持。完整定义见[QMT协议第4.2节](../QMT_WS_PROTOCOL.md)。
|
||||
|
||||
PMS策略来源无法核实时保留队列等待重试,不伪造另一策略名称;已有的用户命令、资金占用、跨日复核、到期与撤单回报处理保持。
|
||||
|
||||
## 验证与发布
|
||||
|
||||
源码提交578a2fa。新增8项隔离测试覆盖原字段不变、两类策略买卖归属、轮换筹资归属、策略读取故障、签名篡改及撤单格式。原签名测试向量未改,开发机全量断网回归通过。155候选镜像在断网、只读、1核512MiB下全量回归通过;没有修改生产依赖。
|
||||
|
||||
本对话的每日定时复核`30-pms`已按用户要求删除。这只取消本聊天的自动复核,不修改PMS业务调度或策略运行档位。
|
||||
|
||||
155于2026年11月2日09:07:31完成发布,仅将唯一`pms-ws`重建为`pms:strategy-type-578a2fa`,服务器补丁提交4059b6f。web、worker、beat与监控容器保持原进程;环境、挂载、业务参数、用户暂停及策略规则均未改变。首次发布前一致性检查中止在所有写操作之前,随后相同条件重新采样通过后才发布,没有通过重连规避检查。
|
||||
|
||||
09:08:20确认序号已推进至1569713,最新160条连续,缺口、新拒绝、额外重连、待入账和孤儿成交为0,资金年龄21.2秒;数量及现金对账差异0,无在途委托。当前没有新委托,字段的真实QMT接收、保存及显示尚待后续自然下单核实;本次不制造测试交易。隔离发送出口及签名测试通过,不冒充对端已落库。
|
||||
|
||||
发布证据见[155核验摘要](evidence/pms_qmt_strategy_type_20261102.json)。如需回退,先停止新增,保留账本及在途回报,再定向回退WS镜像;不删改历史委托或重置序号。
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,503 @@
|
|||
{
|
||||
"deployment": {
|
||||
"at_beijing": "2026-10-30 10:16:14",
|
||||
"health": {
|
||||
"status": "ok",
|
||||
"version": "0.2.0-dev",
|
||||
"service": "pms-web",
|
||||
"now": "2026-10-30 10:16:14",
|
||||
"trade_day": true,
|
||||
"calendar_degraded": false,
|
||||
"db_ok": true
|
||||
},
|
||||
"source_commit": "8f8beba",
|
||||
"image": "pms:daily-review-8f8beba",
|
||||
"server_commit": "12b9c22",
|
||||
"page_sha256": "2b55496a0298e0ed86f9b6e5c4fde07212a41da910add08ba83e53b0b850990f",
|
||||
"worker_idle_before": {
|
||||
"celery@cdc01843e579": []
|
||||
},
|
||||
"recreated": [
|
||||
"pms-web",
|
||||
"pms-worker",
|
||||
"pms-ws"
|
||||
],
|
||||
"beat_unchanged": true,
|
||||
"environment_mounts_unchanged": true,
|
||||
"services": {
|
||||
"pms-web": {
|
||||
"image": "pms:daily-review-8f8beba",
|
||||
"started": "2026-10-30T02:16:09.657546766Z"
|
||||
},
|
||||
"pms-worker": {
|
||||
"image": "pms:daily-review-8f8beba",
|
||||
"started": "2026-10-30T02:16:09.656947918Z"
|
||||
},
|
||||
"pms-beat": {
|
||||
"image": "pms:micro30-f1424f3",
|
||||
"started": "2026-10-28T04:48:27.998315799Z"
|
||||
},
|
||||
"pms-ws": {
|
||||
"image": "pms:daily-review-8f8beba",
|
||||
"started": "2026-10-30T02:16:09.656555286Z"
|
||||
}
|
||||
}
|
||||
},
|
||||
"code_commits": [
|
||||
"f0a7e91",
|
||||
"c90d7b3",
|
||||
"8f8beba"
|
||||
],
|
||||
"tests": {
|
||||
"specialized_cases": 36,
|
||||
"local_full": "ALL SUITES PASS",
|
||||
"candidate_155_network_none": "ALL SUITES PASS",
|
||||
"browser": {
|
||||
"viewports": [
|
||||
1440,
|
||||
390
|
||||
],
|
||||
"actualRowsReplayed": true,
|
||||
"waitingAndSubmittedLimits": true,
|
||||
"cancelDialogClosed": true,
|
||||
"errors": [],
|
||||
"writes": []
|
||||
},
|
||||
"final_html_sha256": "2b55496a0298e0ed86f9b6e5c4fde07212a41da910add08ba83e53b0b850990f"
|
||||
},
|
||||
"samples": [
|
||||
{
|
||||
"at": "2026-10-30T10:16:42.049212",
|
||||
"params": {
|
||||
"PMS_DISPATCH_MODE": "ws",
|
||||
"PMS_RECON_SOURCE": "ws_only",
|
||||
"PMS_QMT_WS_URL": "ws://192.168.18.182:9443/pms",
|
||||
"PMS_QMT_WS_ENABLED": true,
|
||||
"PMS_GLOBAL_BUY_HALT": false,
|
||||
"PMS_GLOBAL_EXEC_HALT": false,
|
||||
"PMS_EXEC_QMT_PRICE_MONITOR": true,
|
||||
"PMS_DAILY_BUY_REVIEW": true,
|
||||
"PMS_ROTATION_MODE": "auto",
|
||||
"PMS_ROTATION_CONTROL": "run",
|
||||
"PMS_ROTATION_RULE_VERSION": "micro50-v2-20261028"
|
||||
},
|
||||
"channel": {
|
||||
"online": true,
|
||||
"last_seq": 1501727,
|
||||
"acked_seq": 1501727,
|
||||
"resync_required": false,
|
||||
"inbox_pending": 0,
|
||||
"orphan_held": 0,
|
||||
"connected_at": "2026-10-30 10:16:13"
|
||||
},
|
||||
"gap": 0,
|
||||
"rejects": 0,
|
||||
"reconnects": 0,
|
||||
"cash": {
|
||||
"source": "ws",
|
||||
"cash_avail": 1912221.0,
|
||||
"total_asset": 1998107.0,
|
||||
"account_market_value": 85886.0,
|
||||
"frozen_cash": 0.0,
|
||||
"age_sec": 29.4,
|
||||
"why": ""
|
||||
},
|
||||
"recon": {
|
||||
"ok": true,
|
||||
"diffs": [],
|
||||
"fixes": [],
|
||||
"errors": [],
|
||||
"severity": "OK",
|
||||
"source": "ws",
|
||||
"note": "策略数量之和核对账户;不猜测差异归属,不自动把差异并入任何策略"
|
||||
},
|
||||
"accounting": {
|
||||
"ready": true,
|
||||
"cash_difference": 0.0
|
||||
},
|
||||
"instructions": [
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d",
|
||||
"ts_code": "688100.SH",
|
||||
"status": "DISPATCHED",
|
||||
"qty": 800,
|
||||
"exec_qty": 0,
|
||||
"limit_price": "24.16",
|
||||
"created_at": "2026-10-30 10:10:22",
|
||||
"updated_at": "2026-10-30 10:16:02",
|
||||
"orders": [
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D01",
|
||||
"status": "ACCEPTED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"created_at": "2026-10-30 10:11:05",
|
||||
"updated_at": "2026-10-30 10:11:05",
|
||||
"cancel_state": "NONE",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
}
|
||||
],
|
||||
"review_status": null,
|
||||
"review_reason": null,
|
||||
"execution_price_date": 20261030
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261029_688100SH_OPEN_001_2d3808de0edd",
|
||||
"ts_code": "688100.SH",
|
||||
"status": "EXPIRED",
|
||||
"qty": 800,
|
||||
"exec_qty": 0,
|
||||
"limit_price": null,
|
||||
"created_at": "2026-10-29 14:18:13",
|
||||
"updated_at": "2026-10-30 10:11:03",
|
||||
"orders": [
|
||||
{
|
||||
"instruction_id": "INS_20261029_688100SH_OPEN_001_2d3808de0edd_D02",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"created_at": "2026-10-29 14:29:01",
|
||||
"updated_at": "2026-10-29 14:39:02",
|
||||
"cancel_state": "NONE",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261029_688100SH_OPEN_001_2d3808de0edd_D03",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"created_at": "2026-10-29 14:40:01",
|
||||
"updated_at": "2026-10-29 14:50:02",
|
||||
"cancel_state": "NONE",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261029_688100SH_OPEN_001_2d3808de0edd_D04",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"created_at": "2026-10-29 14:51:01",
|
||||
"updated_at": "2026-10-29 15:00:01",
|
||||
"cancel_state": "NONE",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261029_688100SH_OPEN_001_2d3808de0edd_D05",
|
||||
"status": "CANCELLED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"created_at": "2026-10-30 09:32:42",
|
||||
"updated_at": "2026-10-30 09:39:40",
|
||||
"cancel_state": "SENT",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
}
|
||||
],
|
||||
"review_status": "ended",
|
||||
"review_reason": "当日复核未通过:已有在途指令 INS_20261030_688100SH_OPEN_001_39f88720f32d (PROPOSED)",
|
||||
"execution_price_date": 20261030
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261028_300693SZ_OPEN_47b78b",
|
||||
"ts_code": "300693.SZ",
|
||||
"status": "EXPIRED",
|
||||
"qty": 600,
|
||||
"exec_qty": 0,
|
||||
"limit_price": null,
|
||||
"created_at": "2026-10-28 09:35:02",
|
||||
"updated_at": "2026-10-30 10:12:02",
|
||||
"orders": [
|
||||
{
|
||||
"instruction_id": "INS_20261028_300693SZ_OPEN_47b78b_D36",
|
||||
"status": "EXPIRED",
|
||||
"qty": 300,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "30.02",
|
||||
"created_at": "2026-10-29 14:36:01",
|
||||
"updated_at": "2026-10-29 14:46:02",
|
||||
"cancel_state": "NONE",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261028_300693SZ_OPEN_47b78b_D37",
|
||||
"status": "EXPIRED",
|
||||
"qty": 300,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "30.02",
|
||||
"created_at": "2026-10-29 14:46:05",
|
||||
"updated_at": "2026-10-29 14:56:01",
|
||||
"cancel_state": "NONE",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261028_300693SZ_OPEN_47b78b_D38",
|
||||
"status": "EXPIRED",
|
||||
"qty": 300,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "30.02",
|
||||
"created_at": "2026-10-29 14:56:05",
|
||||
"updated_at": "2026-10-29 15:00:02",
|
||||
"cancel_state": "NONE",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261028_300693SZ_OPEN_47b78b_D39",
|
||||
"status": "CANCELLED",
|
||||
"qty": 600,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "30.02",
|
||||
"created_at": "2026-10-30 09:32:42",
|
||||
"updated_at": "2026-10-30 09:39:40",
|
||||
"cancel_state": "SENT",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
}
|
||||
],
|
||||
"review_status": "ended",
|
||||
"review_reason": "当日复核未通过:三条门槛都过了,但吸筹只到「⚠️ 跌破吸筹区间」,没到明确吸筹这条线",
|
||||
"execution_price_date": 20261030
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"at": "2026-10-30T10:17:39.076079",
|
||||
"params": {
|
||||
"PMS_DISPATCH_MODE": "ws",
|
||||
"PMS_RECON_SOURCE": "ws_only",
|
||||
"PMS_QMT_WS_URL": "ws://192.168.18.182:9443/pms",
|
||||
"PMS_QMT_WS_ENABLED": true,
|
||||
"PMS_GLOBAL_BUY_HALT": false,
|
||||
"PMS_GLOBAL_EXEC_HALT": false,
|
||||
"PMS_EXEC_QMT_PRICE_MONITOR": true,
|
||||
"PMS_DAILY_BUY_REVIEW": true,
|
||||
"PMS_ROTATION_MODE": "auto",
|
||||
"PMS_ROTATION_CONTROL": "run",
|
||||
"PMS_ROTATION_RULE_VERSION": "micro50-v2-20261028"
|
||||
},
|
||||
"channel": {
|
||||
"online": true,
|
||||
"last_seq": 1501742,
|
||||
"acked_seq": 1501742,
|
||||
"resync_required": false,
|
||||
"inbox_pending": 0,
|
||||
"orphan_held": 0,
|
||||
"connected_at": "2026-10-30 10:16:13"
|
||||
},
|
||||
"gap": 0,
|
||||
"rejects": 0,
|
||||
"reconnects": 0,
|
||||
"cash": {
|
||||
"source": "ws",
|
||||
"cash_avail": 1912221.0,
|
||||
"total_asset": 1997952.0,
|
||||
"account_market_value": 85731.0,
|
||||
"frozen_cash": 0.0,
|
||||
"age_sec": 26.3,
|
||||
"why": ""
|
||||
},
|
||||
"recon": {
|
||||
"ok": true,
|
||||
"diffs": [],
|
||||
"fixes": [],
|
||||
"errors": [],
|
||||
"severity": "OK",
|
||||
"source": "ws",
|
||||
"note": "策略数量之和核对账户;不猜测差异归属,不自动把差异并入任何策略"
|
||||
},
|
||||
"accounting": {
|
||||
"ready": true,
|
||||
"cash_difference": 0.0
|
||||
},
|
||||
"instructions": [
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d",
|
||||
"ts_code": "688100.SH",
|
||||
"status": "DISPATCHED",
|
||||
"qty": 800,
|
||||
"exec_qty": 0,
|
||||
"limit_price": "24.16",
|
||||
"created_at": "2026-10-30 10:10:22",
|
||||
"updated_at": "2026-10-30 10:17:04",
|
||||
"orders": [
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D01",
|
||||
"status": "ACCEPTED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"created_at": "2026-10-30 10:11:05",
|
||||
"updated_at": "2026-10-30 10:11:05",
|
||||
"cancel_state": "NONE",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
}
|
||||
],
|
||||
"review_status": null,
|
||||
"review_reason": null,
|
||||
"execution_price_date": 20261030
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261029_688100SH_OPEN_001_2d3808de0edd",
|
||||
"ts_code": "688100.SH",
|
||||
"status": "EXPIRED",
|
||||
"qty": 800,
|
||||
"exec_qty": 0,
|
||||
"limit_price": null,
|
||||
"created_at": "2026-10-29 14:18:13",
|
||||
"updated_at": "2026-10-30 10:11:03",
|
||||
"orders": [
|
||||
{
|
||||
"instruction_id": "INS_20261029_688100SH_OPEN_001_2d3808de0edd_D02",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"created_at": "2026-10-29 14:29:01",
|
||||
"updated_at": "2026-10-29 14:39:02",
|
||||
"cancel_state": "NONE",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261029_688100SH_OPEN_001_2d3808de0edd_D03",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"created_at": "2026-10-29 14:40:01",
|
||||
"updated_at": "2026-10-29 14:50:02",
|
||||
"cancel_state": "NONE",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261029_688100SH_OPEN_001_2d3808de0edd_D04",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"created_at": "2026-10-29 14:51:01",
|
||||
"updated_at": "2026-10-29 15:00:01",
|
||||
"cancel_state": "NONE",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261029_688100SH_OPEN_001_2d3808de0edd_D05",
|
||||
"status": "CANCELLED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"created_at": "2026-10-30 09:32:42",
|
||||
"updated_at": "2026-10-30 09:39:40",
|
||||
"cancel_state": "SENT",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
}
|
||||
],
|
||||
"review_status": "ended",
|
||||
"review_reason": "当日复核未通过:已有在途指令 INS_20261030_688100SH_OPEN_001_39f88720f32d (PROPOSED)",
|
||||
"execution_price_date": 20261030
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261028_300693SZ_OPEN_47b78b",
|
||||
"ts_code": "300693.SZ",
|
||||
"status": "EXPIRED",
|
||||
"qty": 600,
|
||||
"exec_qty": 0,
|
||||
"limit_price": null,
|
||||
"created_at": "2026-10-28 09:35:02",
|
||||
"updated_at": "2026-10-30 10:12:02",
|
||||
"orders": [
|
||||
{
|
||||
"instruction_id": "INS_20261028_300693SZ_OPEN_47b78b_D36",
|
||||
"status": "EXPIRED",
|
||||
"qty": 300,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "30.02",
|
||||
"created_at": "2026-10-29 14:36:01",
|
||||
"updated_at": "2026-10-29 14:46:02",
|
||||
"cancel_state": "NONE",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261028_300693SZ_OPEN_47b78b_D37",
|
||||
"status": "EXPIRED",
|
||||
"qty": 300,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "30.02",
|
||||
"created_at": "2026-10-29 14:46:05",
|
||||
"updated_at": "2026-10-29 14:56:01",
|
||||
"cancel_state": "NONE",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261028_300693SZ_OPEN_47b78b_D38",
|
||||
"status": "EXPIRED",
|
||||
"qty": 300,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "30.02",
|
||||
"created_at": "2026-10-29 14:56:05",
|
||||
"updated_at": "2026-10-29 15:00:02",
|
||||
"cancel_state": "NONE",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261028_300693SZ_OPEN_47b78b_D39",
|
||||
"status": "CANCELLED",
|
||||
"qty": 600,
|
||||
"cum_qty": 0,
|
||||
"limit_price": "30.02",
|
||||
"created_at": "2026-10-30 09:32:42",
|
||||
"updated_at": "2026-10-30 09:39:40",
|
||||
"cancel_state": "SENT",
|
||||
"reject_code": null,
|
||||
"reject_reason": null
|
||||
}
|
||||
],
|
||||
"review_status": "ended",
|
||||
"review_reason": "当日复核未通过:三条门槛都过了,但吸筹只到「⚠️ 跌破吸筹区间」,没到明确吸筹这条线",
|
||||
"execution_price_date": 20261030
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"today_weisheng": {
|
||||
"parent": {
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d",
|
||||
"origin_id": "PRP_20261030_688100SH_OPEN",
|
||||
"created_at": "2026-10-30 10:10:22",
|
||||
"status": "DISPATCHED",
|
||||
"qty": 800
|
||||
},
|
||||
"proposal": {
|
||||
"proposal_id": "PRP_20261030_688100SH_OPEN",
|
||||
"created_at": "2026-10-30 09:40:41",
|
||||
"decided_at": "2026-10-30 10:10:22",
|
||||
"status": "ACCEPTED",
|
||||
"judge_verdict": "UNAVAILABLE",
|
||||
"judge_reason": "证据不足以判断, 交人: 吸筹与模组传导仍成立,但实时资金中性、PV双周期看空且无近期催化,多空冲突证据不足以从零建仓。",
|
||||
"expire_at": "2026-10-30 23:59:59"
|
||||
},
|
||||
"version_check_at": "2026-10-30T10:10:22.420687+08:00"
|
||||
},
|
||||
"limits": [
|
||||
"审批和通过后继续执行的全部异常路径经隔离测试;本次真机自然见到旧任务失效和当日独立确认,未制造模拟信号或测试委托。",
|
||||
"研究工作树及155已有实验容器不在本次发布目标内。"
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,493 @@
|
|||
{
|
||||
"cause": {
|
||||
"at": "2026-10-30T10:40:35.812835",
|
||||
"params": {
|
||||
"PMS_DISPATCH_MODE": "ws",
|
||||
"PMS_RECON_SOURCE": "ws_only",
|
||||
"PMS_QMT_WS_URL": "ws://192.168.18.182:9443/pms",
|
||||
"PMS_QMT_WS_ENABLED": true,
|
||||
"PMS_GLOBAL_BUY_HALT": false,
|
||||
"PMS_GLOBAL_EXEC_HALT": false,
|
||||
"PMS_EXEC_QMT_PRICE_MONITOR": true,
|
||||
"PMS_DAILY_BUY_REVIEW": true,
|
||||
"PMS_ORDER_TTL_MIN": 10
|
||||
},
|
||||
"orders": [
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D01",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"leaves_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"valid_until": 1793326860000,
|
||||
"created_at": "2026-10-30 10:11:05",
|
||||
"sent_at": "2026-10-30 10:11:05",
|
||||
"final_at": "2026-10-30 10:21:28",
|
||||
"updated_at": "2026-10-30 10:21:28",
|
||||
"cancel_state": "NONE",
|
||||
"cancel_req_at": null,
|
||||
"broker_order_id": "DESK-c4591a9c78",
|
||||
"reject_code": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D02",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"leaves_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"valid_until": 1793327520000,
|
||||
"created_at": "2026-10-30 10:22:02",
|
||||
"sent_at": "2026-10-30 10:22:02",
|
||||
"final_at": "2026-10-30 10:32:02",
|
||||
"updated_at": "2026-10-30 10:32:02",
|
||||
"cancel_state": "NONE",
|
||||
"cancel_req_at": null,
|
||||
"broker_order_id": "DESK-6d51935a96",
|
||||
"reject_code": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D03",
|
||||
"status": "ACCEPTED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"leaves_qty": null,
|
||||
"limit_price": "23.30",
|
||||
"valid_until": 1793328180000,
|
||||
"created_at": "2026-10-30 10:33:01",
|
||||
"sent_at": "2026-10-30 10:33:02",
|
||||
"final_at": null,
|
||||
"updated_at": "2026-10-30 10:33:02",
|
||||
"cancel_state": "NONE",
|
||||
"cancel_req_at": null,
|
||||
"broker_order_id": "DESK-18347d4c92",
|
||||
"reject_code": null
|
||||
}
|
||||
],
|
||||
"messages": [
|
||||
{
|
||||
"seq": 1501990,
|
||||
"msg_type": "persist_result",
|
||||
"corr_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D03",
|
||||
"payload_json": "{\"instruction_id\": \"INS_20261030_688100SH_OPEN_001_39f88720f32d_D03\", \"scope\": \"final\", \"trade_no\": null, \"ok\": true, \"tables\": {\"trading_order\": \"DESK-18347d4c92\"}, \"error\": null}",
|
||||
"received_at": "2026-10-30 10:33:02"
|
||||
},
|
||||
{
|
||||
"seq": 1501989,
|
||||
"msg_type": "ack",
|
||||
"corr_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D03",
|
||||
"payload_json": "{\"instruction_id\": \"INS_20261030_688100SH_OPEN_001_39f88720f32d_D03\", \"accepted\": true, \"duplicate\": false, \"broker_order_id\": \"DESK-18347d4c92\", \"status\": \"ACCEPTED\"}",
|
||||
"received_at": "2026-10-30 10:33:02"
|
||||
},
|
||||
{
|
||||
"seq": 1501972,
|
||||
"msg_type": "order_update",
|
||||
"corr_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D02",
|
||||
"payload_json": "{\"instruction_id\": \"INS_20261030_688100SH_OPEN_001_39f88720f32d_D02\", \"broker_order_id\": \"DESK-6d51935a96\", \"status\": \"EXPIRED\", \"final\": true, \"cum_qty\": 0, \"cum_avg_price\": null, \"leaves_qty\": 0, \"update_time\": 1793327521896, \"reason\": \"valid_until\"}",
|
||||
"received_at": "2026-10-30 10:32:02"
|
||||
},
|
||||
{
|
||||
"seq": 1501811,
|
||||
"msg_type": "persist_result",
|
||||
"corr_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D02",
|
||||
"payload_json": "{\"instruction_id\": \"INS_20261030_688100SH_OPEN_001_39f88720f32d_D02\", \"scope\": \"final\", \"trade_no\": null, \"ok\": true, \"tables\": {\"trading_order\": \"DESK-6d51935a96\"}, \"error\": null}",
|
||||
"received_at": "2026-10-30 10:22:02"
|
||||
},
|
||||
{
|
||||
"seq": 1501810,
|
||||
"msg_type": "ack",
|
||||
"corr_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D02",
|
||||
"payload_json": "{\"instruction_id\": \"INS_20261030_688100SH_OPEN_001_39f88720f32d_D02\", \"accepted\": true, \"duplicate\": false, \"broker_order_id\": \"DESK-6d51935a96\", \"status\": \"ACCEPTED\"}",
|
||||
"received_at": "2026-10-30 10:22:02"
|
||||
},
|
||||
{
|
||||
"seq": 1501798,
|
||||
"msg_type": "order_update",
|
||||
"corr_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D01",
|
||||
"payload_json": "{\"instruction_id\": \"INS_20261030_688100SH_OPEN_001_39f88720f32d_D01\", \"broker_order_id\": \"DESK-c4591a9c78\", \"status\": \"EXPIRED\", \"final\": true, \"cum_qty\": 0, \"cum_avg_price\": null, \"leaves_qty\": 0, \"update_time\": 1793326879970, \"reason\": \"valid_until\"}",
|
||||
"received_at": "2026-10-30 10:21:28"
|
||||
},
|
||||
{
|
||||
"seq": 1501639,
|
||||
"msg_type": "persist_result",
|
||||
"corr_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D01",
|
||||
"payload_json": "{\"instruction_id\": \"INS_20261030_688100SH_OPEN_001_39f88720f32d_D01\", \"scope\": \"final\", \"trade_no\": null, \"ok\": true, \"tables\": {\"trading_order\": \"DESK-c4591a9c78\"}, \"error\": null}",
|
||||
"received_at": "2026-10-30 10:11:05"
|
||||
},
|
||||
{
|
||||
"seq": 1501638,
|
||||
"msg_type": "ack",
|
||||
"corr_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D01",
|
||||
"payload_json": "{\"instruction_id\": \"INS_20261030_688100SH_OPEN_001_39f88720f32d_D01\", \"accepted\": true, \"duplicate\": false, \"broker_order_id\": \"DESK-c4591a9c78\", \"status\": \"ACCEPTED\"}",
|
||||
"received_at": "2026-10-30 10:11:05"
|
||||
}
|
||||
]
|
||||
},
|
||||
"deployment": {
|
||||
"at_beijing": "2026-10-30 10:52:39",
|
||||
"health": {
|
||||
"status": "ok",
|
||||
"version": "0.2.0-dev",
|
||||
"service": "pms-web",
|
||||
"now": "2026-10-30 10:52:39",
|
||||
"trade_day": true,
|
||||
"calendar_degraded": false,
|
||||
"db_ok": true
|
||||
},
|
||||
"source_commit": "2eaec70",
|
||||
"image": "pms:day-order-2eaec70",
|
||||
"server_commit": "6702090",
|
||||
"page_sha256": "2b55496a0298e0ed86f9b6e5c4fde07212a41da910add08ba83e53b0b850990f",
|
||||
"worker_idle_before": {
|
||||
"celery@308c9752144e": []
|
||||
},
|
||||
"recreated": [
|
||||
"pms-web",
|
||||
"pms-worker",
|
||||
"pms-ws"
|
||||
],
|
||||
"parameter": {
|
||||
"ok": true,
|
||||
"key": "PMS_EXEC_QMT_DAY_ORDER",
|
||||
"value": true
|
||||
},
|
||||
"beat_unchanged": true,
|
||||
"environment_mounts_unchanged": true,
|
||||
"services": {
|
||||
"pms-web": {
|
||||
"image": "pms:day-order-2eaec70",
|
||||
"started": "2026-10-30T02:52:34.907638327Z"
|
||||
},
|
||||
"pms-worker": {
|
||||
"image": "pms:day-order-2eaec70",
|
||||
"started": "2026-10-30T02:52:34.905973353Z"
|
||||
},
|
||||
"pms-beat": {
|
||||
"image": "pms:micro30-f1424f3",
|
||||
"started": "2026-10-28T04:48:27.998315799Z"
|
||||
},
|
||||
"pms-ws": {
|
||||
"image": "pms:day-order-2eaec70",
|
||||
"started": "2026-10-30T02:52:34.905287589Z"
|
||||
}
|
||||
}
|
||||
},
|
||||
"verification": [
|
||||
{
|
||||
"at": "2026-10-30T10:53:00.840527",
|
||||
"params": {
|
||||
"PMS_DISPATCH_MODE": "ws",
|
||||
"PMS_RECON_SOURCE": "ws_only",
|
||||
"PMS_QMT_WS_URL": "ws://192.168.18.182:9443/pms",
|
||||
"PMS_QMT_WS_ENABLED": true,
|
||||
"PMS_GLOBAL_BUY_HALT": false,
|
||||
"PMS_GLOBAL_EXEC_HALT": false,
|
||||
"PMS_EXEC_QMT_PRICE_MONITOR": true,
|
||||
"PMS_DAILY_BUY_REVIEW": true,
|
||||
"PMS_ORDER_TTL_MIN": 10,
|
||||
"PMS_EXEC_QMT_DAY_ORDER": true
|
||||
},
|
||||
"channel": {
|
||||
"process_alive": true,
|
||||
"conn_state": "ONLINE",
|
||||
"online": true,
|
||||
"heartbeat_age_sec": 1.0,
|
||||
"last_seq": 1502289,
|
||||
"acked_seq": 1502289,
|
||||
"resync_required": false,
|
||||
"queue": {
|
||||
"ABORTED": 2,
|
||||
"ACCEPTED": 1,
|
||||
"CANCELLED": 2,
|
||||
"EXPIRED": 57,
|
||||
"FILLED": 360,
|
||||
"REJECTED": 5
|
||||
},
|
||||
"inbox_pending": 0,
|
||||
"orphan_held": 0,
|
||||
"error": null,
|
||||
"connected_at": "2026-10-30 10:52:37",
|
||||
"last_error": "",
|
||||
"stat": {
|
||||
"rx": 6,
|
||||
"tx": 12,
|
||||
"trades": 0,
|
||||
"rejects": 0,
|
||||
"reconnects": 0,
|
||||
"dropped": 0,
|
||||
"last_rx_at": "10:52:57",
|
||||
"last_tx_at": "10:52:57",
|
||||
"hs_server_seq": 1502282,
|
||||
"hs_last_seq": 1502282,
|
||||
"snap_positions_at": "10:52:37",
|
||||
"snap_positions_n": 2,
|
||||
"snap_funds_at": "10:52:37",
|
||||
"seq_hwm": 1502289,
|
||||
"peer_skew_ms": -56,
|
||||
"peer_skew_min": -59,
|
||||
"peer_skew_max": -44
|
||||
}
|
||||
},
|
||||
"cash": {
|
||||
"source": "ws",
|
||||
"cash_avail": 1912221.0,
|
||||
"total_asset": 1997349.0,
|
||||
"account_market_value": 85128.0,
|
||||
"frozen_cash": 0.0,
|
||||
"age_sec": 24.0,
|
||||
"why": ""
|
||||
},
|
||||
"recon": {
|
||||
"ok": true,
|
||||
"diffs": [],
|
||||
"fixes": [],
|
||||
"errors": [],
|
||||
"severity": "OK",
|
||||
"source": "ws",
|
||||
"note": "策略数量之和核对账户;不猜测差异归属,不自动把差异并入任何策略"
|
||||
},
|
||||
"cash_difference": 0.0,
|
||||
"orders": [
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D01",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"leaves_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"valid_until": 1793326860000,
|
||||
"created_at": "2026-10-30 10:11:05",
|
||||
"sent_at": "2026-10-30 10:11:05",
|
||||
"final_at": "2026-10-30 10:21:28",
|
||||
"updated_at": "2026-10-30 10:21:28",
|
||||
"cancel_state": "NONE",
|
||||
"cancel_req_at": null,
|
||||
"broker_order_id": "DESK-c4591a9c78",
|
||||
"reject_code": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D02",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"leaves_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"valid_until": 1793327520000,
|
||||
"created_at": "2026-10-30 10:22:02",
|
||||
"sent_at": "2026-10-30 10:22:02",
|
||||
"final_at": "2026-10-30 10:32:02",
|
||||
"updated_at": "2026-10-30 10:32:02",
|
||||
"cancel_state": "NONE",
|
||||
"cancel_req_at": null,
|
||||
"broker_order_id": "DESK-6d51935a96",
|
||||
"reject_code": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D03",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"leaves_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"valid_until": 1793328180000,
|
||||
"created_at": "2026-10-30 10:33:01",
|
||||
"sent_at": "2026-10-30 10:33:02",
|
||||
"final_at": "2026-10-30 10:43:01",
|
||||
"updated_at": "2026-10-30 10:43:01",
|
||||
"cancel_state": "NONE",
|
||||
"cancel_req_at": null,
|
||||
"broker_order_id": "DESK-18347d4c92",
|
||||
"reject_code": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D04",
|
||||
"status": "ACCEPTED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"leaves_qty": null,
|
||||
"limit_price": "23.30",
|
||||
"valid_until": 1793328780000,
|
||||
"created_at": "2026-10-30 10:43:06",
|
||||
"sent_at": "2026-10-30 10:43:06",
|
||||
"final_at": null,
|
||||
"updated_at": "2026-10-30 10:43:06",
|
||||
"cancel_state": "NONE",
|
||||
"cancel_req_at": null,
|
||||
"broker_order_id": "DESK-7eb3c789d8",
|
||||
"reject_code": null
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"at": "2026-10-30T10:54:05.684820",
|
||||
"params": {
|
||||
"PMS_DISPATCH_MODE": "ws",
|
||||
"PMS_RECON_SOURCE": "ws_only",
|
||||
"PMS_QMT_WS_URL": "ws://192.168.18.182:9443/pms",
|
||||
"PMS_QMT_WS_ENABLED": true,
|
||||
"PMS_GLOBAL_BUY_HALT": false,
|
||||
"PMS_GLOBAL_EXEC_HALT": false,
|
||||
"PMS_EXEC_QMT_PRICE_MONITOR": true,
|
||||
"PMS_DAILY_BUY_REVIEW": true,
|
||||
"PMS_ORDER_TTL_MIN": 10,
|
||||
"PMS_EXEC_QMT_DAY_ORDER": true
|
||||
},
|
||||
"channel": {
|
||||
"process_alive": true,
|
||||
"conn_state": "ONLINE",
|
||||
"online": true,
|
||||
"heartbeat_age_sec": 1.8,
|
||||
"last_seq": 1502309,
|
||||
"acked_seq": 1502309,
|
||||
"resync_required": false,
|
||||
"queue": {
|
||||
"ABORTED": 2,
|
||||
"ACCEPTED": 1,
|
||||
"CANCELLED": 2,
|
||||
"EXPIRED": 58,
|
||||
"FILLED": 360,
|
||||
"REJECTED": 5
|
||||
},
|
||||
"inbox_pending": 0,
|
||||
"orphan_held": 0,
|
||||
"error": null,
|
||||
"connected_at": "2026-10-30 10:52:37",
|
||||
"last_error": "",
|
||||
"stat": {
|
||||
"rx": 26,
|
||||
"tx": 44,
|
||||
"trades": 0,
|
||||
"rejects": 0,
|
||||
"reconnects": 0,
|
||||
"dropped": 0,
|
||||
"last_rx_at": "10:54:02",
|
||||
"last_tx_at": "10:54:03",
|
||||
"hs_server_seq": 1502282,
|
||||
"hs_last_seq": 1502282,
|
||||
"snap_positions_at": "10:53:37",
|
||||
"snap_positions_n": 2,
|
||||
"snap_funds_at": "10:53:37",
|
||||
"seq_hwm": 1502309,
|
||||
"peer_skew_ms": -56,
|
||||
"peer_skew_min": -59,
|
||||
"peer_skew_max": -44
|
||||
}
|
||||
},
|
||||
"cash": {
|
||||
"source": "ws",
|
||||
"cash_avail": 1912221.0,
|
||||
"total_asset": 1997299.0,
|
||||
"account_market_value": 85078.0,
|
||||
"frozen_cash": 0.0,
|
||||
"age_sec": 27.8,
|
||||
"why": ""
|
||||
},
|
||||
"recon": {
|
||||
"ok": true,
|
||||
"diffs": [],
|
||||
"fixes": [],
|
||||
"errors": [],
|
||||
"severity": "OK",
|
||||
"source": "ws",
|
||||
"note": "策略数量之和核对账户;不猜测差异归属,不自动把差异并入任何策略"
|
||||
},
|
||||
"cash_difference": 0.0,
|
||||
"orders": [
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D01",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"leaves_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"valid_until": 1793326860000,
|
||||
"created_at": "2026-10-30 10:11:05",
|
||||
"sent_at": "2026-10-30 10:11:05",
|
||||
"final_at": "2026-10-30 10:21:28",
|
||||
"updated_at": "2026-10-30 10:21:28",
|
||||
"cancel_state": "NONE",
|
||||
"cancel_req_at": null,
|
||||
"broker_order_id": "DESK-c4591a9c78",
|
||||
"reject_code": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D02",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"leaves_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"valid_until": 1793327520000,
|
||||
"created_at": "2026-10-30 10:22:02",
|
||||
"sent_at": "2026-10-30 10:22:02",
|
||||
"final_at": "2026-10-30 10:32:02",
|
||||
"updated_at": "2026-10-30 10:32:02",
|
||||
"cancel_state": "NONE",
|
||||
"cancel_req_at": null,
|
||||
"broker_order_id": "DESK-6d51935a96",
|
||||
"reject_code": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D03",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"leaves_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"valid_until": 1793328180000,
|
||||
"created_at": "2026-10-30 10:33:01",
|
||||
"sent_at": "2026-10-30 10:33:02",
|
||||
"final_at": "2026-10-30 10:43:01",
|
||||
"updated_at": "2026-10-30 10:43:01",
|
||||
"cancel_state": "NONE",
|
||||
"cancel_req_at": null,
|
||||
"broker_order_id": "DESK-18347d4c92",
|
||||
"reject_code": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D04",
|
||||
"status": "EXPIRED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"leaves_qty": 0,
|
||||
"limit_price": "23.30",
|
||||
"valid_until": 1793328780000,
|
||||
"created_at": "2026-10-30 10:43:06",
|
||||
"sent_at": "2026-10-30 10:43:06",
|
||||
"final_at": "2026-10-30 10:53:02",
|
||||
"updated_at": "2026-10-30 10:53:02",
|
||||
"cancel_state": "NONE",
|
||||
"cancel_req_at": null,
|
||||
"broker_order_id": "DESK-7eb3c789d8",
|
||||
"reject_code": null
|
||||
},
|
||||
{
|
||||
"instruction_id": "INS_20261030_688100SH_OPEN_001_39f88720f32d_D05",
|
||||
"status": "ACCEPTED",
|
||||
"qty": 400,
|
||||
"cum_qty": 0,
|
||||
"leaves_qty": null,
|
||||
"limit_price": "23.30",
|
||||
"valid_until": 1793343600000,
|
||||
"created_at": "2026-10-30 10:53:04",
|
||||
"sent_at": "2026-10-30 10:53:05",
|
||||
"final_at": null,
|
||||
"updated_at": "2026-10-30 10:53:05",
|
||||
"cancel_state": "NONE",
|
||||
"cancel_req_at": null,
|
||||
"broker_order_id": "DESK-9da5d84aa1",
|
||||
"reject_code": null
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"tests": {
|
||||
"local_special_cases": 22,
|
||||
"local_full_regression": "PASS before final cancel-read-failure follow-up",
|
||||
"server_final_image": "pms:day-order-2eaec70",
|
||||
"server_offline_full": "ALL SUITES PASS",
|
||||
"artificial_live_orders": 0,
|
||||
"cancel_fill_races": "isolated replay only"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,104 @@
|
|||
{
|
||||
"checked_at_beijing": "2026-11-02T09:40:32.008023",
|
||||
"source_commit": "716e215",
|
||||
"server_code_commit": "381ddf8",
|
||||
"deployment_at": "2026-11-02 09:39:49",
|
||||
"image": "pms:instruction-books-716e215",
|
||||
"recreated": [
|
||||
"pms-web"
|
||||
],
|
||||
"other_containers_unchanged": true,
|
||||
"environment_mounts_unchanged": true,
|
||||
"services": {
|
||||
"pms-web": {
|
||||
"image": "pms:instruction-books-716e215",
|
||||
"started": "2026-11-02T01:39:44.413915761Z"
|
||||
},
|
||||
"pms-worker": {
|
||||
"image": "pms:close-boundary-47f5621",
|
||||
"started": "2026-10-30T08:22:00.413434371Z"
|
||||
},
|
||||
"pms-beat": {
|
||||
"image": "pms:micro30-f1424f3",
|
||||
"started": "2026-10-28T04:48:27.998315799Z"
|
||||
},
|
||||
"pms-ws": {
|
||||
"image": "pms:strategy-type-578a2fa",
|
||||
"started": "2026-11-02T01:07:27.741851322Z"
|
||||
},
|
||||
"bionic-micro30-monitor": {
|
||||
"image": "bionic-micro30:3e2a584",
|
||||
"started": "2026-10-28T04:48:05.471247248Z"
|
||||
}
|
||||
},
|
||||
"html_sha256": "fc906283185a3daf2ece8e0aaa7e57ada03e93218bd81fd93d375e5a397cd998",
|
||||
"tests": {
|
||||
"strategy_ui_api_cases": 14,
|
||||
"local_full_offline": "ALL SUITES PASS",
|
||||
"candidate_155_full_offline": "ALL SUITES PASS",
|
||||
"page_guards": [
|
||||
"enum",
|
||||
"wiring",
|
||||
"copy"
|
||||
]
|
||||
},
|
||||
"browser": {
|
||||
"actualRowsReplayed": true,
|
||||
"isolatedBothBooksSameCode": true,
|
||||
"rotationTerminalsVisible": true,
|
||||
"statusCounts": true,
|
||||
"scopedCancelDialogClosed": true,
|
||||
"feedJumpsToBookAndStatus": true,
|
||||
"failedReadIsNotEmpty": true,
|
||||
"viewports": [
|
||||
1440,
|
||||
390
|
||||
],
|
||||
"errors": [],
|
||||
"writes": [],
|
||||
"external": []
|
||||
},
|
||||
"instruction_api": {
|
||||
"original": {
|
||||
"ok": true,
|
||||
"rows": 7,
|
||||
"all_rows_in_requested_book": true
|
||||
},
|
||||
"micro30": {
|
||||
"ok": true,
|
||||
"rows": 0,
|
||||
"all_rows_in_requested_book": true
|
||||
}
|
||||
},
|
||||
"channel": {
|
||||
"online": true,
|
||||
"connected_at": "2026-11-02 09:27:08",
|
||||
"last_seq": 1570221,
|
||||
"acked_seq": 1570221,
|
||||
"resync_required": false,
|
||||
"inbox_pending": 0,
|
||||
"orphan_held": 0
|
||||
},
|
||||
"channel_stat": {
|
||||
"seq_hwm": 1570221,
|
||||
"pending_gap": 0,
|
||||
"rejects": 0,
|
||||
"reconnects": 3
|
||||
},
|
||||
"new_reject_count": 0,
|
||||
"cash_age_sec": 24.2,
|
||||
"quantity_reconciliation": {
|
||||
"ok": true,
|
||||
"diffs": [],
|
||||
"fixes": [],
|
||||
"errors": [],
|
||||
"severity": "OK",
|
||||
"source": "ws",
|
||||
"note": "策略数量之和核对账户;不猜测差异归属,不自动把差异并入任何策略"
|
||||
},
|
||||
"cash_difference": 0.0,
|
||||
"active_child_count": 0,
|
||||
"natural_new_order_count": 0,
|
||||
"params_unchanged": true,
|
||||
"scope": "155模拟PMS,浏览器为真实只读数据及隔离场景重放;未触发生产写接口、未制造委托。"
|
||||
}
|
||||
|
|
@ -0,0 +1,289 @@
|
|||
{
|
||||
"deployment": {
|
||||
"at_beijing": "2026-11-02 09:07:31",
|
||||
"source_commit": "578a2fa",
|
||||
"server_commit": "4059b6f",
|
||||
"image": "pms:strategy-type-578a2fa",
|
||||
"recreated": [
|
||||
"pms-ws"
|
||||
],
|
||||
"other_containers_unchanged": true,
|
||||
"environment_mounts_unchanged": true,
|
||||
"before": {
|
||||
"params": {
|
||||
"PMS_QMT_WS_URL": "ws://192.168.18.182:9443/pms",
|
||||
"PMS_QMT_WS_ENABLED": true,
|
||||
"PMS_DISPATCH_MODE": "ws",
|
||||
"PMS_RECON_SOURCE": "ws_only",
|
||||
"PMS_ROTATION_MODE": "auto",
|
||||
"PMS_ROTATION_CONTROL": "run",
|
||||
"PMS_ROTATION_RULE_VERSION": "micro50-v2-20261028",
|
||||
"PMS_GLOBAL_EXEC_HALT": false,
|
||||
"PMS_GLOBAL_BUY_HALT": false
|
||||
},
|
||||
"channel": {
|
||||
"process_alive": true,
|
||||
"conn_state": "ONLINE",
|
||||
"online": true,
|
||||
"heartbeat_age_sec": 1.4,
|
||||
"last_seq": 1569698,
|
||||
"acked_seq": 1569698,
|
||||
"resync_required": false,
|
||||
"queue": {
|
||||
"ABORTED": 3,
|
||||
"CANCELLED": 2,
|
||||
"EXPIRED": 59,
|
||||
"FILLED": 360,
|
||||
"REJECTED": 5
|
||||
},
|
||||
"inbox_pending": 0,
|
||||
"orphan_held": 0,
|
||||
"error": null,
|
||||
"connected_at": "2026-10-30 10:52:37",
|
||||
"last_error": "",
|
||||
"stat": {
|
||||
"rx": 67415,
|
||||
"tx": 122909,
|
||||
"trades": 0,
|
||||
"rejects": 0,
|
||||
"reconnects": 0,
|
||||
"dropped": 0,
|
||||
"last_rx_at": "09:07:23",
|
||||
"last_tx_at": "09:07:25",
|
||||
"hs_server_seq": 1502282,
|
||||
"hs_last_seq": 1502282,
|
||||
"snap_positions_at": "09:07:03",
|
||||
"snap_positions_n": 2,
|
||||
"snap_funds_at": "09:07:03",
|
||||
"seq_hwm": 1569698,
|
||||
"peer_skew_ms": 40,
|
||||
"peer_skew_min": -97,
|
||||
"peer_skew_max": 274,
|
||||
"ooo": 0,
|
||||
"pending_gap": 0
|
||||
}
|
||||
},
|
||||
"cash": {
|
||||
"source": "ws",
|
||||
"cash_avail": 1912221.0,
|
||||
"total_asset": 1995983.0,
|
||||
"account_market_value": 83762.0,
|
||||
"frozen_cash": 0.0,
|
||||
"age_sec": 23.5,
|
||||
"why": ""
|
||||
},
|
||||
"schema": true,
|
||||
"active": []
|
||||
},
|
||||
"after": {
|
||||
"params": {
|
||||
"PMS_QMT_WS_URL": "ws://192.168.18.182:9443/pms",
|
||||
"PMS_QMT_WS_ENABLED": true,
|
||||
"PMS_DISPATCH_MODE": "ws",
|
||||
"PMS_RECON_SOURCE": "ws_only",
|
||||
"PMS_ROTATION_MODE": "auto",
|
||||
"PMS_ROTATION_CONTROL": "run",
|
||||
"PMS_ROTATION_RULE_VERSION": "micro50-v2-20261028",
|
||||
"PMS_GLOBAL_EXEC_HALT": false,
|
||||
"PMS_GLOBAL_BUY_HALT": false
|
||||
},
|
||||
"channel": {
|
||||
"process_alive": true,
|
||||
"conn_state": "ONLINE",
|
||||
"online": true,
|
||||
"heartbeat_age_sec": 0.7,
|
||||
"last_seq": 1569698,
|
||||
"acked_seq": 1569698,
|
||||
"resync_required": false,
|
||||
"queue": {
|
||||
"ABORTED": 3,
|
||||
"CANCELLED": 2,
|
||||
"EXPIRED": 59,
|
||||
"FILLED": 360,
|
||||
"REJECTED": 5
|
||||
},
|
||||
"inbox_pending": 0,
|
||||
"orphan_held": 0,
|
||||
"error": null,
|
||||
"connected_at": "2026-11-02 09:07:30",
|
||||
"last_error": "",
|
||||
"stat": {
|
||||
"rx": 67415,
|
||||
"tx": 122909,
|
||||
"trades": 0,
|
||||
"rejects": 0,
|
||||
"reconnects": 0,
|
||||
"dropped": 0,
|
||||
"last_rx_at": "09:07:23",
|
||||
"last_tx_at": "09:07:25",
|
||||
"hs_server_seq": 1502282,
|
||||
"hs_last_seq": 1502282,
|
||||
"snap_positions_at": "09:07:03",
|
||||
"snap_positions_n": 2,
|
||||
"snap_funds_at": "09:07:03",
|
||||
"seq_hwm": 1569698,
|
||||
"peer_skew_ms": 40,
|
||||
"peer_skew_min": -97,
|
||||
"peer_skew_max": 274,
|
||||
"ooo": 0,
|
||||
"pending_gap": 0
|
||||
}
|
||||
},
|
||||
"cash": {
|
||||
"source": "ws",
|
||||
"cash_avail": 1912221.0,
|
||||
"total_asset": 1995983.0,
|
||||
"account_market_value": 83762.0,
|
||||
"frozen_cash": 0.0,
|
||||
"age_sec": 0.7,
|
||||
"why": ""
|
||||
},
|
||||
"schema": true,
|
||||
"active": []
|
||||
},
|
||||
"health": {
|
||||
"status": "ok",
|
||||
"version": "0.2.0-dev",
|
||||
"service": "pms-web",
|
||||
"now": "2026-11-02 09:07:31",
|
||||
"trade_day": true,
|
||||
"calendar_degraded": false,
|
||||
"db_ok": true
|
||||
},
|
||||
"services": {
|
||||
"pms-web": {
|
||||
"image": "pms:close-boundary-47f5621",
|
||||
"started": "2026-10-30T08:22:00.412778588Z"
|
||||
},
|
||||
"pms-worker": {
|
||||
"image": "pms:close-boundary-47f5621",
|
||||
"started": "2026-10-30T08:22:00.413434371Z"
|
||||
},
|
||||
"pms-beat": {
|
||||
"image": "pms:micro30-f1424f3",
|
||||
"started": "2026-10-28T04:48:27.998315799Z"
|
||||
},
|
||||
"pms-ws": {
|
||||
"image": "pms:strategy-type-578a2fa",
|
||||
"started": "2026-11-02T01:07:27.741851322Z"
|
||||
},
|
||||
"bionic-micro30-monitor": {
|
||||
"image": "bionic-micro30:3e2a584",
|
||||
"started": "2026-10-28T04:48:05.471247248Z"
|
||||
}
|
||||
}
|
||||
},
|
||||
"final_probe": {
|
||||
"at_beijing": "2026-11-02T09:08:20.959362",
|
||||
"params": {
|
||||
"PMS_ROTATION_MODE": "auto",
|
||||
"PMS_ROTATION_CONTROL": "run",
|
||||
"PMS_ROTATION_RULE_VERSION": "micro50-v2-20261028",
|
||||
"PMS_GLOBAL_EXEC_HALT": false,
|
||||
"PMS_GLOBAL_BUY_HALT": false,
|
||||
"PMS_QMT_WS_URL": "ws://192.168.18.182:9443/pms",
|
||||
"PMS_QMT_WS_ENABLED": true,
|
||||
"PMS_DISPATCH_MODE": "ws",
|
||||
"PMS_RECON_SOURCE": "ws_only",
|
||||
"PMS_EXEC_QMT_PRICE_MONITOR": true,
|
||||
"PMS_EXEC_QMT_DAY_ORDER": true,
|
||||
"PMS_DAILY_BUY_REVIEW": true,
|
||||
"PMS_ROTATION_SIM_DIRECT": true
|
||||
},
|
||||
"channel": {
|
||||
"process_alive": true,
|
||||
"conn_state": "ONLINE",
|
||||
"online": true,
|
||||
"heartbeat_age_sec": 0.1,
|
||||
"last_seq": 1569713,
|
||||
"acked_seq": 1569713,
|
||||
"resync_required": false,
|
||||
"queue": {
|
||||
"ABORTED": 3,
|
||||
"CANCELLED": 2,
|
||||
"EXPIRED": 59,
|
||||
"FILLED": 360,
|
||||
"REJECTED": 5
|
||||
},
|
||||
"inbox_pending": 0,
|
||||
"orphan_held": 0,
|
||||
"error": null,
|
||||
"connected_at": "2026-11-02 09:07:30",
|
||||
"last_error": "",
|
||||
"stat": {
|
||||
"rx": 14,
|
||||
"tx": 26,
|
||||
"trades": 0,
|
||||
"rejects": 0,
|
||||
"reconnects": 0,
|
||||
"dropped": 0,
|
||||
"last_rx_at": "09:08:20",
|
||||
"last_tx_at": "09:08:20",
|
||||
"hs_server_seq": 1569698,
|
||||
"hs_last_seq": 1569698,
|
||||
"snap_positions_at": "09:08:00",
|
||||
"snap_positions_n": 2,
|
||||
"snap_funds_at": "09:08:00",
|
||||
"seq_hwm": 1569713,
|
||||
"peer_skew_ms": 34,
|
||||
"peer_skew_min": 28,
|
||||
"peer_skew_max": 44
|
||||
}
|
||||
},
|
||||
"cash": {
|
||||
"source": "ws",
|
||||
"cash_avail": 1912221.0,
|
||||
"total_asset": 1995983.0,
|
||||
"account_market_value": 83762.0,
|
||||
"frozen_cash": 0.0,
|
||||
"age_sec": 21.2,
|
||||
"why": ""
|
||||
},
|
||||
"positions": {
|
||||
"original": [
|
||||
{
|
||||
"ts_code": "300124.SZ",
|
||||
"total_qty": 200,
|
||||
"book_id": "original"
|
||||
},
|
||||
{
|
||||
"ts_code": "601126.SH",
|
||||
"total_qty": 2700,
|
||||
"book_id": "original"
|
||||
}
|
||||
],
|
||||
"micro30": []
|
||||
},
|
||||
"reconciliation": {
|
||||
"ok": true,
|
||||
"diffs": [],
|
||||
"fixes": [],
|
||||
"errors": [],
|
||||
"severity": "OK",
|
||||
"source": "ws",
|
||||
"note": "策略数量之和核对账户;不猜测差异归属,不自动把差异并入任何策略"
|
||||
},
|
||||
"cash_difference": 0.0,
|
||||
"new_rejects": [],
|
||||
"new_trades": [],
|
||||
"new_orders": [],
|
||||
"active_children": []
|
||||
},
|
||||
"latest_160_messages_contiguous": true,
|
||||
"verification": {
|
||||
"specific_cases": 8,
|
||||
"local_full": "ALL SUITES PASS",
|
||||
"candidate_full": "ALL SUITES PASS",
|
||||
"candidate_network": "none",
|
||||
"candidate_resource_limit": "1CPU/512MiB",
|
||||
"source_matches_running_ws": true,
|
||||
"new_strategy_field_seen_by_qmt": false,
|
||||
"no_synthetic_order": true
|
||||
},
|
||||
"automation": {
|
||||
"id": "30-pms",
|
||||
"status": "deleted",
|
||||
"tool_confirmed": true
|
||||
},
|
||||
"initial_deploy_preflight": "第一次一致性检查在任何发布写操作前中止;相同断言重新采样通过后发布,未主动重连绕过检查。"
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
# 交易指令按策略区分
|
||||
|
||||
核验时间:2026年11月2日09:40,北京时间。范围仅155模拟PMS。
|
||||
|
||||
## 页面与操作
|
||||
|
||||
- 当日指令采用“主观量化”“微盘轮动”两个标签页,沿用持仓区的细线、字号和中性色。每个策略保留未成交、已成交、已终止分类与独立数量;未建仓候选只属于主观量化。
|
||||
- 管理视图的在途指令同步按策略切换;已了结指令不再提供撤销按钮。窄屏中操作列固定在右侧。
|
||||
- 消息栏注明所属策略,点击可定位到对应策略和状态。轮动指令的哈希编号按创建日期识别当日记录,避免成交或终止后从当日列表消失。
|
||||
- 撤单确认框显示策略与股票;读取失败明确提示,不能当作空列表。交易数量、价格、有效期及交易规则保持。
|
||||
|
||||
## 接口与归属
|
||||
|
||||
`GET /api/instructions` 和 `POST /api/instructions/{instruction_id}/cancel` 增加可选查询参数 `book_id`,只接受 `original`、`micro30`,默认 `original`。兼容原调用;未启用策略账本的实例中,微盘查询返回空,微盘撤单拒绝执行。
|
||||
|
||||
页面对两个账本分别取最近200条,分别查询和统计。原策略为微盘筹资的减持仍归主观量化,以落表归属为准,不靠股票代码、买卖方向或轮动任务名称猜测。撤单继续调用原执行流程,仅限定账本范围;不会跨账本查找或认领,撤单请求不等于撤单成功。
|
||||
|
||||
## 验证与部署
|
||||
|
||||
- 开发机14项持仓及指令账本专项、本地全量隔离回归、页面枚举/接线/文案三道护栏通过。
|
||||
- 155候选镜像在断网、1核、512MiB、只读文件系统下完成全量回归,末行为 `ALL SUITES PASS`。
|
||||
- 开发机Chrome分别检查1440及390像素。使用155只读响应重放实际空微盘状态,并用隔离场景验证同名股票分账、状态数量、轮动终态、归档隐藏、消息跳转、读取失败、撤单确认与关闭。控制台错误0,生产写请求0。部署后的实际HTML也复现通过;这不是交易员真实登录或真实微盘撤单验收。
|
||||
- 源码提交 `716e215`,155代码提交 `381ddf8`。09:39:49发布核验完成,仅重建 `pms-web` 为 `pms:instruction-books-716e215`;worker、beat、唯一ws及微盘监控容器未重建,环境、挂载与运行参数保持。
|
||||
- 09:40:32只读核验:两个策略接口各行归属正确,主观量化最近记录7条、微盘0条;这不是今日委托数。连续确认与最高序号均1570221,暂存缺口、待入账、孤儿及新增拒绝均0,resync为false,资金快照24.2秒,策略合计数量与现金对账一致。
|
||||
|
||||
本次没有生成委托、成交或信号,也没有用真实撤单测试页面。微盘自然交易及撤单回报仍待实际发生。定时复核保持此前已取消的状态。
|
||||
|
||||
完整计数及镜像见[发布证据](evidence/pms_instruction_books_20261102.json)。如需回退,仅恢复Web的上一镜像 `pms:close-boundary-47f5621`;本次没有数据迁移,不回退账本或改动在途回报。
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
# 微盘轮动收盘运行复核
|
||||
|
||||
本次核验155模拟PMS,开始于2026年10月30日16:15:39,北京时间。只复核沪深证券,未访问188,未研究北交所,未修改策略参数或用户暂停,未制造信号、委托或成交。
|
||||
|
||||
## 今日微盘状态
|
||||
|
||||
规则仍为8%入场、85%退出、50只,版本micro50-v2-20261028,auto/run,两个全局暂停为false。微盘历史分位10.05%,低位入场、成长主线瓦解与高位退出均未触发,微盘保持空仓,阶段为主观量化运行。
|
||||
|
||||
- 数据日期10月29日,执行日期10月30日。监控计算时间为10月29日21:32:06,冻结文件修改时间为10月30日08:50:08,PMS于08:51自然保存同版快照。
|
||||
- 快照摘要为`e256ad0d7a484cdcc1c6adbf24a931f81299e16dca30668d98eaa4a097fdb91f`。信号与名单就绪,执行检查无错误;50只代码唯一,全部为沪深证券且资格通过,按总市值和代码排序,最短上市636个交易日。
|
||||
- PMS保存的最后窗口内运行时间为09:59,信号健康、无阻断、无交易意图、轮次仍为0。未发生微盘资金划转或真实成交。无交易意图时不会生成execution事件,不能把该事件表为空视为未调度。
|
||||
- 15:20自然日终记录healthy=true。当前observed记录仅为快照留痕,不是重新设立观察期准入门槛。
|
||||
|
||||
上午容器后来重建,当前worker的docker日志不包含全部早盘过程。本次以冻结文件、PMS保存版本、09:59状态及15:20日终记录证明已实际使用,不声称逐分钟重建了所有早盘调用。
|
||||
|
||||
## 当日限价单已自然完成收盘到期
|
||||
|
||||
威胜信息父任务`INS_20261030_688100SH_OPEN_001_39f88720f32d`的D05,10:53:05获QMT受理,400股、限价23.30元,截止15:00。QMT于15:00:02.787生成EXPIRED,累计成交0,PMS于15:00:03收到序号1506244。本地撤单标记NONE,与正常到期相符;没有在中途按旧10分钟规则反复撤挂。
|
||||
|
||||
这补齐了上午“有效期及受理已见过、收盘到期尚待自然验证”的待办。撤单与成交同时发生的真机案例仍未自然出现,不能由这笔零成交到期代替。
|
||||
|
||||
## 收盘边界发现及修复
|
||||
|
||||
旧单终态释放配额后,15:00:16又生成D06,其有效期仍是15:00。15:00:17出口检查将其本地ABORTED;sent_at和QMT委托号均为空,未发到QMT,没有形成额外持仓或成交。
|
||||
|
||||
根因是QMT价格监控沿用包含15:00整分钟的交易时段判断。即使已收盘,仍能产生FIRE;执行器也没有在生成子委托前比较有效期与本轮时间。
|
||||
|
||||
本次补两处检查:QMT价格监控在15:00及之后不再给出新增委托;普通执行器对有效期已经到达的结果直接等待,不再生成无效子单。这也覆盖咨询仍返回FIRE的情况。14:59仍可按原规则提交;不改变已有委托、当日限价、微盘窗口或次日完整决策复核。
|
||||
|
||||
源码47f5621。新增3项回归,QMT价格等待专项共17项通过,开发机及155最终候选镜像全量断网回归通过。155于16:22:05将web和worker重建为`pms:close-boundary-47f5621`,服务器补丁提交39d209a;发布前worker空闲,参数、环境、挂载及页面摘要保持。唯一ws保留`pms:day-order-2eaec70`,beat和监控未动。此次修复已部署,但修复后的下一个自然收盘边界尚未发生,不能冒充再次真机验证。D06保留为历史证据,没有删表或改写其状态来掩盖问题。
|
||||
|
||||
## 账户和下一执行日数据
|
||||
|
||||
16:15:39连续接收与确认均为1507453,最近160条消息序号连续,自10:52:37本次通道启动后拒绝0、额外重连0、待入账0、孤儿成交0,resync=false。没有活动子委托。
|
||||
|
||||
主观量化实际持仓为四方股份2700股、汇川技术200股,微盘空仓。可用现金1,912,221元,冻结0,市值83,762元,总资产1,995,983元;资金年龄1.1秒,策略数量合计和现金对账差异均0。今日唯一新增实际成交为10:04的汇川200股、56.10元,已按原委托记入original;没有归档旧仓或外部测试成交回流。
|
||||
|
||||
费用回报仍为null,现金快照也未扣费,账本费用保持0;已确认的佣金万二、每笔最低5元配置不等于实际费用已经判收。本次没有补造费用。
|
||||
|
||||
16:18:12核对宏观四个指数,最新仍为10月29日。11月2日快照接口404,监控health为degraded/ValueError,最后成功为今日08:52;今日收盘数据尚未齐全,下一执行日快照仍待自动重算。当日已冻结快照继续有效,不能把下一日未就绪误解为当日信号失效,也不以旧日期代替新日期。
|
||||
|
||||
现有调度继续运行。完整微盘入退场、实际容量、资金划转和残余退出仍待自然信号;不追加研究或强制测试交易。
|
||||
|
||||
## 发布后核验与接续
|
||||
|
||||
16:25:45重新读取真机,连续接收与确认推进到1507616,最近160条仍连续;连接仍始于10:52:37,新增拒绝、重连、缺口、待入账和孤儿成交均为0。资金年龄6.5秒,冻结0,账户持仓、现金、策略模式和用户暂停与发布前一致,数量及现金对账差异0。没有新增子委托。
|
||||
|
||||
本次自动复核说明已更新到当前工作树及最新规则,去掉旧镜像读数,纳入沪深范围和当日15:00有效期;日程仍为北京时间16:10,状态无变化保持安静。完整微盘自然轮换尚未出现,复核继续。
|
||||
|
||||
原始证据摘要见[当日证据](evidence/micro50_daily_20261030.json)。回退时先停止新增,保留现有账本、在途回报和当日有效期,不修改历史订单或倒退表结构。
|
||||
|
|
@ -2,6 +2,22 @@
|
|||
|
||||
整理日期:2026年10月28日,北京时间。本文件是本阶段的简明接续入口。未标明后续更新的读数来自10月28日12:49:37发布核验;最新状态以顶部更新为准。后续先读AGENTS.md及本文件,再按需查看原始证据。
|
||||
|
||||
|
||||
> 11月2日10:13更新:用户再次授权清空模拟仓,并确认初始总规模1,967,927.74元。QMT新快照已核实同额空仓;10:08:20备份后事务清除两策略旧运行账本,新净值1.0000;10:11:32恢复原有auto/run及两项暂停false。总操作规模同步更新,其余策略规则、费用、通道去重与序号保留。9项专项和155维护镜像断网全量回归通过;10:12:14连续确认1570706,无缺口、拒绝、在途和待入账,资金18.9秒,数量现金对账0。旧成交回放新增0,恢复后自然生成的新研判记录不再清除。仅温和停止后启动原worker/beat,web、唯一ws及业务镜像不变;定时复核保持取消。详见[再次重置与本金基线](模拟仓再次重置与本金基线_2026-11-02.md)。
|
||||
|
||||
> 11月2日09:40更新:当日指令、管理视图在途指令按主观量化和微盘轮动分别展示,消息栏带策略并定位对应状态,查询与撤单按账本限定。仅web发布pms:instruction-books-716e215(本地716e215、155代码381ddf8);其他容器、交易规则及参数未改。14项专项、全量断网回归、页面三道护栏和1440/390像素浏览器复现通过。09:40:32连续确认1570221、缺口和新增拒绝0,资金24.2秒,数量现金对账一致;无真实测试委托。定时复核维持取消。详见[交易指令策略分组](交易指令策略分组_2026-11-02.md)。
|
||||
|
||||
|
||||
> 11月2日09:08更新:用户要求下单增加策略类型并取消本对话定时复核。新增strategy_type:subjective_quant为主观量化、micro_rotation为微盘轮动,按父指令账本归属,其余报文字段及交易规则保持。09:07:31仅唯一ws发布pms:strategy-type-578a2fa(源码578a2fa、155提交4059b6f);其余容器未动。8项专项及本地、155候选镜像全量断网回归通过;09:08:20连续确认1569713、无缺口或新拒绝、资金21.2秒、数量现金对账一致。尚无新委托,不宣称QMT已保存新字段。自动复核30-pms已删除,PMS业务调度继续。详见[下单策略类型说明](QMT下单策略类型_2026-11-02.md)。
|
||||
|
||||
|
||||
> 10月30日16:25更新:今日50股快照08:50:08冻结、08:51取用,历史分位10.05%,无入场信号;微盘空仓。威胜D05已在15:00:02.787自然到期且零成交,证明当日限价规则生效;收盘后多生成的D06被出口本地作废,未发QMT。修复收盘续单边界,16:22:05仅web/worker发布为pms:close-boundary-47f5621(源码47f5621、155提交39d209a);ws仍为pms:day-order-2eaec70,beat及监控未动。本地17项专项及本地、155候选镜像全量断网回归通过。16:25:45连续确认1507616,无缺口、新拒绝和重连,资金6.5秒,数量及现金对账一致。主观量化四方2700股、汇川200股;参数及暂停保持。下一执行日11月2日快照待今日收盘数据,实际成交费用仍未判收。详见[10月30日每日复核](微盘轮动每日复核_2026-10-30.md)。
|
||||
|
||||
|
||||
> 10月30日10:54更新:普通QMT限价单改为当日15:00有效,ParamStore的PMS_EXEC_QMT_DAY_ORDER=true;微盘窗口和跨日复核保持。10:52:39将web、worker及唯一ws发布为pms:day-order-2eaec70,beat与监控未动。补齐撤单拒绝不能结束原挂单、累计成交不倒退、迟到成交保留原策略及传输结果不确定时不本地释放等边界。10:53:05自然生成的威胜D05已由QMT受理,400股、23.30元、有效至15:00;无人工测试单。10:54:05连续确认1502309、无缺口与新增拒绝、资金27.8秒、数量及现金对账一致。详情见[限价单有效期与撤单成交边界](限价单有效期与撤单成交边界_2026-10-30.md)。
|
||||
|
||||
> 10月30日10:17更新:155已启用跨日买入完整复核,PMS_DAILY_BUY_REVIEW=true。最终web、worker及唯一ws镜像为pms:daily-review-8f8beba,10:16:14发布;beat仍为pms:micro30-f1424f3。旧买单先停止续单、撤销并等成交入账,再重走当天排名、研判、数量及执行定价。盛弘旧任务未通过当天吸筹条件而结束;威胜旧任务结束,保留今天独立确认的新计划。10:17:39确认序号1501742、缺口0、无新增拒绝、资金年龄26.3秒、数量与现金对账一致。微盘8%/85%/50只、auto/run、两项暂停false及QMT价格等待均保持。详见[跨日买入决策复核](跨日买入决策复核_2026-10-30.md)。代码在独立工作树codex/pms-daily-review-20261030,主工作树的吸筹研究未合并进本次发布。以下镜像和读数保留为历史状态。
|
||||
|
||||
> 10月29日17:09更新:按用户要求取消主观量化的上游及本地主题配额,显式发送theme_cap=0;同版只读候选由7只变8只,新增汇川技术,保留现有排名。策略轮换页已添加“复制名单”小按钮,复制当前50股代码与名称。web和worker更新为pms:theme-copy-7ecf3a9,源码7ecf3a9、155补丁提交d91424a;beat及唯一ws未重建。QMT连续确认、资金和持仓对账正常,暂停及策略参数未改。发布首次匿名访问受保护页面导致脚本回退,修正核验路径后重新发布成功。详见[取消主题限额与名单复制](选股取消主题限额与微盘名单复制_2026-10-29.md)。以下主题5只描述为历史状态。
|
||||
|
||||
> 10月29日16:43页面维护更新:历史操作日志不再冒充当日风控,web已定向更新为pms:alerts-b96ce9f,其余容器保持原进程。源页面提交b96ce9f,155单独应用补丁形成06570ad。参数、暂停及持仓未变,QMT连续确认和对账正常。选股质地排名及真实消费顺序已核对,仍保留前300只和上游同主题5只的既有范围;没有更改候选规则。详见[风控与排名核验](风控历史提醒修复与选股排名核验_2026-10-29.md)。
|
||||
|
|
@ -77,6 +93,8 @@
|
|||
|
||||
每日北京时间16:10的既有运行复核继续。没有变化时保持安静,出现实质进展、失败或不可替代的信息缺口时通知。用户没有要求继续研究时,不新增平滑窗口、参数扫描或上线变更。
|
||||
|
||||
2026年11月2日,用户取消本对话的定时复核,自动任务30-pms已删除,不再按每日16:10唤醒。PMS业务调度和微盘策略运行保持;未完成的自然交易验收留档,后续按用户新任务继续。用户没有要求继续研究时,不新增平滑窗口、参数扫描或上线变更。
|
||||
|
||||
## 六、接续定位
|
||||
|
||||
PMS分支为`codex/micro30-rotation-20261027`。生产代码提交9e14f92,50股判收文档c51fb7f,平滑实验c57ed90。监控代码提交3e2a584,位于相邻bionic_trader仓库。研究提交不代表运行镜像已经变更。
|
||||
|
|
|
|||
|
|
@ -0,0 +1,70 @@
|
|||
# 模拟仓再次重置与本金基线
|
||||
|
||||
2026年11月2日,北京时间。用户再次授权清理155模拟仓,并确认QMT已清空,初始总规模为 **1,967,927.74元**。10:08:20完成PMS事务重置,10:11:32恢复原有自动运行。本次仅操作155,不涉及188真实PMS、宿主机重启或QMT交易表写入。
|
||||
|
||||
## 新基线
|
||||
|
||||
QMT在10:03及正式提交前均提供一分钟内的空仓快照,可用资金与总资产均为1,967,927.74元,冻结资金和市值为0。早先临时出现的200万元已被新的实际资金覆盖,没有沿用旧值。
|
||||
|
||||
- 主观量化和微盘轮动持仓均清空,旧计划、指令、待确认提议、个股策略和本轮盈亏归档后清除。
|
||||
- `PMS_TOTAL_SCALE`通过ParamStore改为1,967,927.74元,`PMS_PUBLISH_NAV_SCALE=0`继续跟随总规模。11月2日净值基线为1.0000、仓位0、浮动和已实现盈亏0。
|
||||
- 新本金先归主观量化现金账本,微盘现金和本金为0。微盘尚未获得资金,因此其独立净值为空,不能伪造为1;自然轮换时再按实际资金划转记账。
|
||||
- 继续使用`micro50-v2-20261028`:8%入场、85%退出、50只,成长瓦解独立入场,auto/run保持。现有仓位约束、费用、选股、QMT价格等待、当日限价单及跨日重新决策规则保持。
|
||||
- 交易前的临时暂停已恢复为false。新计划必须重新经过现有决策流程;清理前未完成的任务不会续挂。
|
||||
|
||||
## 备份与清理
|
||||
|
||||
服务器备份目录:`/home/factor/project/tradingSystem/backups/sim-reset-20261102`,目录权限700,账本及配置备份权限600,不进入Git。
|
||||
|
||||
`ledger.json`包含11张运行表及建表语句、运行参数、轮换文档、QMT委托和逐笔成交。摘要为:
|
||||
|
||||
```text
|
||||
b2c95c0408b9aadc4126c7574179b85df763c37936246e7111d37be72b19159d
|
||||
```
|
||||
|
||||
先将备份写入宿主机并核对摘要,再执行事务。清理前再次比较账本、参数、轮换文档、委托和成交;变化则中止。任务删除、派生状态重置、资金账本和净值初始化处于同一事务。
|
||||
|
||||
| 运行表 | 清理行数 |
|
||||
| --- | ---: |
|
||||
| 持仓批次 | 3 |
|
||||
| 持仓记录 | 2 |
|
||||
| 交易指令 | 7 |
|
||||
| 动作流水 | 148 |
|
||||
| 费用流水 | 0 |
|
||||
| 执行计划 | 4 |
|
||||
| 任务命令 | 1 |
|
||||
| 交易提议 | 8 |
|
||||
| 个股策略 | 1 |
|
||||
| 日终报告 | 4 |
|
||||
| 净值序列 | 4 |
|
||||
|
||||
这些旧记录均属于主观量化;微盘原本为空。人工参数命令的保留规则没有改变,本次实际无此类记录。清理后净值表重新写入一条新基线。
|
||||
|
||||
旧资金账本、轮换状态和每日收益文档保留为`reset_archive`,新轮换状态清除旧进展和资金占用,保留信号去重、轮次等身份信息。429条QMT出口委托和1,279条逐笔成交及其处理标记保留,操作审计保留,通道序号不变更。10:13再次比对,备份中的旧委托、逐笔成交记录逐条未变。
|
||||
|
||||
成交回放游标采用现有v2格式,时间为10:08:20;读取24小时重叠窗口确认当时无已有汇总成交,不使用字典序游标。旧PMS父任务只留在备份中,不用旧父任务认领新账本成交。迟到且无法归属的真实回报仍应阻断核对,不强行入账。
|
||||
|
||||
## 实施和验证
|
||||
|
||||
一次性脚本为[scripts/reset_sim_baseline_20261102.py](../scripts/reset_sim_baseline_20261102.py),专项测试为[scripts/test_sim_reset_units.py](../scripts/test_sim_reset_units.py)。本地提交`332f008`,155应用补丁提交`36d6ad7`,维护镜像`pms:sim-reset-332f008`。
|
||||
|
||||
开发机通过9项隔离测试,覆盖空仓证据、金额不符、备份漂移、双账本清理、去重及配置保留、幂等、当日编号冲突和事务失败回滚。155维护镜像在断网、无业务配置、1核512MiB条件下全量回归,结果`ALL SUITES PASS`。实际维护另启动一次性容器,使用155既有配置和备份挂载,直接执行prepare/apply后退出,不连接QMT,也不发委托。
|
||||
|
||||
09:45先设置两项暂停,温和停止beat和worker。web及唯一pms-ws持续运行。10:10启动原worker/beat容器,保持原镜像、环境和挂载;只在确认没有新的用户暂停、空仓及现金对账通过、回放无旧仓回流后,于10:11:32恢复本次维护前的false暂停值。第一次恢复检查未通过瞬时确认水位相等检查,未修改暂停;新采样追平后再恢复,没有断连或修改序号。
|
||||
|
||||
| 服务 | 维持的实际镜像 |
|
||||
| --- | --- |
|
||||
| pms-web | `pms:instruction-books-716e215` |
|
||||
| pms-worker | `pms:close-boundary-47f5621` |
|
||||
| pms-beat | `pms:micro30-f1424f3` |
|
||||
| 唯一pms-ws | `pms:strategy-type-578a2fa` |
|
||||
|
||||
10:09暂停期间真机核验:两策略运行账本为空,指令查询均为空;调用现有成交回放得到新增成交0、账本动作0、错误0;数量和现金差异均0。
|
||||
|
||||
10:12:14恢复后核验:确认序号1570706与接收最高序号一致,无缺口、无新增拒绝、无在途委托、无待入账或孤立成交;资金快照18.9秒,空仓本金1,967,927.74元,数量及现金差异0。QMT连接自09:48:26保持,进程累计重连8次是早前QMT清理期间的历史值,不能表述为当日从未重连。
|
||||
|
||||
恢复后调度已自然生成新的信号留痕和研判拒绝记录,运行流水不再永久为0;这些有新的决定时间,没有旧仓回流,也不是人为制造的测试委托。信号去重集合只按现有调度新增,清账没有删除旧去重键。10:13:39页面健康接口返回正常且数据库可用。
|
||||
|
||||
备份目录另保存`before-pause.json`、私有容器信息、prepare/apply回执、暂停期间核验、恢复回执、恢复后核验和最终容器检查。私有环境、完整备份不在文档中展开。
|
||||
|
||||
本次未修改页面或交易业务代码,不重跑布局验收,不为镜像版本一致重建服务。会话定时复核保持取消。自然发生的完整微盘入退场及实际成交费用仍沿用原有未判收事项,本次空仓重置不能抵扣。若以后需要恢复旧账,必须先暂停并重新核对QMT,不能直接将旧持仓或游标单独导回新周期。
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
# 跨日买入决策复核
|
||||
|
||||
## 口径
|
||||
|
||||
账户增仓目标可以在有效期内保留,但昨日选定的股票和价格不能自动沿用。主观量化未完成买入跨日后,先停止续单并撤销旧委托;待QMT返回终态、实际成交入账一致,再按当天完整候选排名、研判、账户和用户约束重新核定数量。执行层重新取得当日价格,仍交QMT等待限价成交。
|
||||
|
||||
当前规则如下:
|
||||
|
||||
- 同日新决策正常执行;旧方案今天才生成指令,仍按原方案日期判断是否需要复核。
|
||||
- 未完成复核的指令持久化为`WAIT_REVIEW`,仍占在途名额;执行器、下发出口和WS发送端均阻止旧买单绕行。功能开关关闭也不解除已经存在的复核等待。
|
||||
- 复核复用完整选股和研判流程,不使用放宽排名范围的单票复查。只剔除本父指令及它关联的确认建议占用,其他承诺仍占资金和名额。
|
||||
- 自动档通过则恢复同一父指令,今日额度不得超过新决策数量及原未成交授权。模型响应期间再次核对候选和账户依据。人工确认情形重新生成当天确认建议,点击确认不调用模型;依据变化交后台重新准备。
|
||||
- 部分成交及迟到回报继续归原父指令。撤单请求成功不等于已撤销,出口累计成交不等于账本已入账;两者未核齐不恢复。状态、成交量或原进度发生并发变化时,条件更新不得覆盖用户撤销或回放结果。
|
||||
- 原买入窗口已过期则结束剩余安排;不会因账户命令处于部分完成就继续发单。旧任务失去资格则结束,后续由正常当日流程重新选股。卖出安排保持原规则;微盘由自身每日冻结名单流程管理,不套主观量化复核。旧网格等策略买入到跨日后结束,交原策略重新产生当日任务。
|
||||
- 每轮最多研判一笔复核任务,其余先持久停住并等待下一轮。数据或回报异常守成。每日系统自决额度仍使用原计数口径。
|
||||
|
||||
`PMS_DAILY_BUY_REVIEW`通过ParamStore控制,代码默认关闭,仅在授权的155模拟实例启用。全局暂停、微盘8%/85%/50只参数及价格等待交QMT的设置不因本次修复改变。
|
||||
|
||||
## 现场处理
|
||||
|
||||
2026年10月30日09:39:40,已备份威胜信息和盛弘股份的父子委托记录,备份位于155的`/app/logs/daily_review_before_20261030_093940.json`。两笔父指令进入复核等待并请求撤单。09:47:40读回QMT状态:威胜D05和盛弘D39均为CANCELLED,累计成交0;父指令累计成交0,冻结资金0。没有补单或补造成交。
|
||||
|
||||
盛弘来源是10月28日宏观触发的账户增仓2%命令,生成的是OPEN首批建仓,不表示账户已持有盛弘。威胜来自10月29日的建仓提议。两者此前仅重新咨询了执行价格,未重新经过完整资格和研判,这是本次修复的缺口。
|
||||
|
||||
## 验证与发布记录
|
||||
|
||||
开发机增加36项专项测试,包括真实SQLite单表事务回滚、撤单未终态、迟到成交、数量预留、用户撤销并发、人工确认与完整选股接线。全量断网回归及页面三道护栏经隔离入口执行。页面1440及390宽浏览器重放验证复核状态、实际委托限价、标签切换和撤单弹窗关闭,写请求为0;属于开发机复现,不是交易员实际登录验收。
|
||||
|
||||
10:10:20先发布决策复核,10:10:35通过ParamStore启用。联动检查补齐整条命令撤销、策略接管与复核等待状态后,10:16:14发布最终版本。web、worker及唯一pms-ws均为`pms:daily-review-8f8beba`,本地代码提交依次为f0a7e91、c90d7b3、8f8beba;155最终代码提交12b9c22。beat保持原镜像和原进程,私有环境、挂载及两项暂停均未变。既有实验容器未操作。
|
||||
|
||||
最终候选镜像在155以断网、1核、512MiB、只读文件系统完成全量回归,末行为ALL SUITES PASS。实际部署HTML与浏览器已验文件摘要一致。最终两次采样为10:16:42和10:17:39,连续收发确认由1501727推进至1501742,两次接收序号均等于确认序号,缺口0、当前进程新增拒绝0、被动重连0、待入账0、待归属0、resync=false。最新资金年龄26.3秒,策略持仓合计与QMT一致,现金差异0。
|
||||
|
||||
真机已见到:
|
||||
|
||||
- 盛弘10月28日的旧建仓任务复核后结束,累计成交0。当天未通过的原因是吸筹条件未达到原策略要求,没有恢复昨日600股委托。
|
||||
- 威胜10月29日的旧任务结束,累计成交0。当天已有独立建议PRP_20261030_688100SH_OPEN,09:40准备、10:10:22采纳并重新核对来源;保留该新父指令800股,10:11:05向QMT提交首批400股、限价23.30。采样时为ACCEPTED且未成交。价格与昨日相同不代表沿用旧任务,当日执行咨询及新指令分别有记录。
|
||||
- 新确认单在本次复核之外已按当日流程产生;没有为验证而注入信号、制造真实测试委托或改写成交。自动复核通过后恢复旧父指令、人工复核建议变化及并发异常等分支目前以36项隔离测试为证,不能冒充自然交易全部判收。
|
||||
|
||||
[精简运行证据](evidence/pms_daily_buy_review_20261030.json)保留版本、时间、委托与通道读数。回退先停止新增买入,保留复核状态、账本和在途回报;不能把WAIT_REVIEW任务批量恢复为DISPATCHED。
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
# 限价单有效期与撤单成交边界
|
||||
|
||||
核验对象为155模拟PMS与182的QMT连接。188真实PMS不在范围内。本文区分实收回报与隔离回放,不使用真实测试委托。
|
||||
|
||||
## 已查明的到期原因
|
||||
|
||||
2026年10月30日10:40:35读取155的出口表与收件表。威胜信息当日父任务为`INS_20261030_688100SH_OPEN_001_39f88720f32d`,计划800股,以下三笔子委托均为400股、限价23.30元。
|
||||
|
||||
| 子委托 | PMS发送时间 | PMS指定截止时间 | QMT回报 |
|
||||
| --- | --- | --- | --- |
|
||||
| D01 | 10:11:05 | 10:21:00 | EXPIRED,累计成交0;PMS于10:21:28收到 |
|
||||
| D02 | 10:22:02 | 10:32:00 | EXPIRED,累计成交0;QMT事件10:32:01.896,PMS于10:32:02收到 |
|
||||
| D03 | 10:33:02 | 10:43:00 | 核验时ACCEPTED,累计成交0 |
|
||||
|
||||
D02对应QMT委托号`DESK-6d51935a96`,与用户提供日志一致。D02的PMS撤单状态为NONE,没有主动发过撤单;收件序号1501972包含`reason=valid_until`。因此是QMT按PMS传入的有效期自动撤单。QMT落库的`cancelled`不区分主动撤单和到期,协议回报已正确使用EXPIRED。
|
||||
|
||||
根因是价格等待交给QMT之后,普通执行器仍沿用`PMS_ORDER_TTL_MIN=10`的短时分片规则。上一张到期后,未成交部分重新回到配额,下一分钟可能以相同限价再发,导致重复撤挂。用户本次已明确选择当日有效。
|
||||
|
||||
## 发布后的规则
|
||||
|
||||
新增ParamStore参数`PMS_EXEC_QMT_DAY_ORDER`,默认关闭,155按用户选择开启。只有普通执行器的QMT价格监控路径改为当日15:00截止;微盘轮换、网格和做T独立窗口不变。用户撤单、清仓及其他现有终止约束继续生效。次日未完成买入仍重走当天排名、研判、数量与定价。
|
||||
|
||||
已发送委托不原地修改有效期,也不为验证新规则人为补单;旧子委托按原期限结束,后续自然生成的委托使用新期限。
|
||||
|
||||
## 撤单与成交交错的处理
|
||||
|
||||
- PMS停止父任务新增后,子委托独立跟踪。已登记撤单但尚未终态时,返回“撤单处理中”,不能宣称QMT已经撤成。
|
||||
- 撤单被拒绝或返回ALREADY_FINAL,不把原委托改为REJECTED,不提前释放占用。等正式委托终态及成交回报;回报缺失时保守等待核对。
|
||||
- 已成交部分按原委托和策略记账。父任务已撤销也不能丢弃迟到成交;同一笔成交重复消费不重复入账。部分成交后撤单,只释放未成交部分。
|
||||
- 累计成交数量缺失、倒退、超出委托量,或者全成状态与数量不符时,不覆盖已有状态,保留占用并记录异常。迟到的撤单或拒绝不能覆盖已全成状态。
|
||||
- 发送前先持久化“可能已发出”的标记。网络异常或重启恢复后的QUEUED,不再被直接当成从未发出的单。需要终止时仍向QMT撤单,收到终态前保持占用。
|
||||
- 发送完成的本地写回,不得覆盖已经先到的受理、部分成交或终态;传输错误也不得把已确认状态退回队列。
|
||||
- 撤单意图已经写入后,展示所需的状态查询失败不能让父任务恢复继续下单。
|
||||
|
||||
这里的“停止父任务”与“券商订单已撤”是两件事。账户资金预算仍要求委托终态和晚于终态的有效资金快照,不能仅凭PMS已发撤单请求释放冻结或增加可用现金。
|
||||
|
||||
## QMT侧仍需遵守的接口约定
|
||||
|
||||
1. 真正向券商提交的挂单,撤单完成应以券商确认或订单查询结果为准,不能仅发送撤单请求便写最终撤销。
|
||||
2. 部分成交后撤单,`order_update.cum_qty`及落库累计成交数量保留真实值,剩余委托量归零;逐笔trade照常完整发送。
|
||||
3. 撤单前已经全成,保留FILLED及实际成交,撤单响应可为ALREADY_FINAL;仍须保证正式终态和trade可补发。
|
||||
4. 同一instruction_id重发必须幂等,不能再次创建券商委托。
|
||||
|
||||
本次用户所贴D02的累计成交为0,与PMS实收回报一致,不能据此认定QMT覆盖了实际成交。以上并发边界由隔离测试验证,不能冒充本次真机已发生。
|
||||
|
||||
## 验证与发布回执
|
||||
|
||||
2026年10月30日10:52:39在155完成发布。web、worker与唯一pms-ws使用`pms:day-order-2eaec70`,服务器代码提交6702090;beat及微盘监控保持原进程。环境和挂载比对一致,未修改用户暂停及微盘规则。ParamStore中的`PMS_EXEC_QMT_DAY_ORDER=true`已回读确认。源码提交64af252、2eaec70。新增22项专项覆盖正常拒绝、撤单拒绝、先全成后撤单、部分成交、累计量异常、发送与撤单竞争、重启恢复、真实SQL状态保护,以及已撤父任务的迟到成交按原策略只记一次。
|
||||
|
||||
开发机全量断网回归通过,最终新增22项专项通过;155最终候选镜像使用`--network none --cpus 1 --memory 512m --read-only`全量回归,末行为ALL SUITES PASS。没有页面布局修改;全量入口包含页面三道护栏。
|
||||
|
||||
发布前QMT曾短暂重连,10:36:41恢复后至发布前连续确认正常;这部分旧重连不能当成发布后的故障。发布后10:53:00确认序号1502289,待入账和孤儿成交均0,资金快照24秒,数量与现金对账差异0。新进程未出现额外重连或拒绝。
|
||||
|
||||
回退时先停止新增风险动作,保留账本、出口与回报。关闭当日有效参数只影响后续生成的委托,不能缩短已经在QMT上的有效期;需要终止现有单时应走正常撤单并等终态,不直接改表释放占用。
|
||||
|
||||
最终真机核验:10:53:01旧D04按原期限EXPIRED、累计成交0;10:53:05系统自然发送D05(威胜400股,限价23.30),QMT受理号`DESK-9da5d84aa1`,`valid_until=1793343600000`对应北京时间当日15:00。10:54:05核验仍为ACCEPTED、累计成交0。连续确认从1502289推进至1502309,与接收序号一致;无新增拒绝、缺口、重连、待入账或孤儿成交,资金快照27.8秒,数量与现金对账差异0。
|
||||
|
||||
完整证据见[发布与回执](evidence/pms_day_order_cancel_20261030.json)。新有效期及真实受理已见过;收盘到期处理、撤单与成交同时发生的真机案例尚未自然发生,不能把隔离回放当作真机验收。
|
||||
|
|
@ -0,0 +1,274 @@
|
|||
"""用户2026-11-02授权的155模拟仓重置。prepare只备份,apply按摘要一次性提交。
|
||||
|
||||
运行前暂停买入和执行,温和停止beat/worker;web及唯一ws继续收回报。
|
||||
本脚本不发委托、不清通道、不改序号、不恢复交易开关。旧运行账本先完整备份,
|
||||
清除两策略持仓、批次、任务、盈亏和净值;实际空仓资金作为新本金。
|
||||
"""
|
||||
import argparse
|
||||
import copy
|
||||
import datetime as dt
|
||||
import hashlib
|
||||
import json
|
||||
import math
|
||||
import os
|
||||
from pathlib import Path
|
||||
import sys
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
|
||||
RESET_ID = 'sim-reset-20261102'
|
||||
ACTOR = 'sim_reset_20261102'
|
||||
DAY = dt.date(2026, 11, 2)
|
||||
INITIAL_CASH = 1967927.74 # 用户本次明确确认的初始总规模,必须与QMT实值一致。
|
||||
TABLES = ('pms_lot', 'pms_position', 'pms_instruction', 'pms_action_ledger',
|
||||
'pms_cash_flow', 'pms_plan', 'pms_command', 'pms_proposal',
|
||||
'pms_strategy', 'pms_daily_report', 'pms_nav_daily')
|
||||
CLEAR = TABLES
|
||||
DERIVED = {'PMS_RECON_STREAK': 0, 'PMS_RECON_STREAK_YMD': 0,
|
||||
'PMS_HIGH_WATER': 0., 'PMS_BRAKE_UNTIL': 0,
|
||||
'PMS_AUTO_LAST_SCAN': '', 'PMS_LOGIC_STATE_MAP': ''}
|
||||
OWNED_MAPS = {'PMS_CUSHION_NEG_STREAK': '{}', 'PMS_EXIT_CLEANUP_DONE': '[]',
|
||||
'PMS_STRATEGY_BUYPAUSE': '{}', 'PMS_TECH_EXIT_DONE': '{}'}
|
||||
LIVE_DOCS = ('capital:live', 'state:live', 'account-execution')
|
||||
|
||||
|
||||
def encoded(value):
|
||||
return json.dumps(value, ensure_ascii=False, sort_keys=True, default=str, allow_nan=False).encode()
|
||||
|
||||
|
||||
def digest(value):
|
||||
return hashlib.sha256(encoded(value)).hexdigest()
|
||||
|
||||
|
||||
def save_new(path, value):
|
||||
with os.fdopen(os.open(path, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o600), 'wb') as f:
|
||||
f.write(encoded(value)); f.flush(); os.fsync(f.fileno())
|
||||
|
||||
|
||||
def validate_empty(channel, positions, funds, pause_at):
|
||||
"""纯校验:缺少/陈旧/不完整快照绝不解释为空仓。"""
|
||||
from app.core import ws_codec
|
||||
if not channel.get('online') or channel.get('error') or channel.get('resync_required'):
|
||||
raise ValueError('通道未健康对齐')
|
||||
seq = channel.get('last_seq')
|
||||
if not seq or seq != channel.get('acked_seq') or seq != channel.get('stat', {}).get('seq_hwm'):
|
||||
raise ValueError('连续确认尚未追平')
|
||||
if any(channel.get(k) for k in ('inbox_pending', 'orphan_held')) or channel.get('stat', {}).get('pending_gap') or channel.get('stat', {}).get('rejects'):
|
||||
raise ValueError('仍有待处理回报或缺口')
|
||||
for snap in (positions, funds):
|
||||
if not snap or snap.get('age_sec') is None or not 0 <= snap['age_sec'] < 60:
|
||||
raise ValueError('需要一分钟内快照')
|
||||
if str(snap.get('received_at') or '')[:19] <= str(pause_at)[:19]:
|
||||
raise ValueError('需要暂停后的新快照')
|
||||
if positions.get('payload', {}).get('kind') != 'positions' or positions['payload'].get('items') != []:
|
||||
raise ValueError('QMT尚未确认完整空仓')
|
||||
if funds.get('payload', {}).get('kind') != 'funds':
|
||||
raise ValueError('缺少资金快照')
|
||||
parsed = ws_codec.parse_funds_snapshot(funds['payload'])
|
||||
for key in ('available_cash', 'total_asset', 'frozen_cash', 'market_value'):
|
||||
v = parsed.get(key)
|
||||
if v is None or not math.isfinite(v) or v < 0:
|
||||
raise ValueError('资金字段不完整或非法')
|
||||
if parsed['frozen_cash'] or parsed['market_value'] or parsed['available_cash'] <= 0:
|
||||
raise ValueError('仍有冻结、市值或没有可用资金')
|
||||
if abs(parsed['total_asset']-parsed['available_cash']) > .01:
|
||||
raise ValueError('空仓资产与资金不一致')
|
||||
if abs(parsed['available_cash']-INITIAL_CASH) > .005:
|
||||
raise ValueError('QMT资金与用户确认的初始总规模不符')
|
||||
return parsed
|
||||
|
||||
|
||||
def require_safe(*, empty=False):
|
||||
from config.settings import settings
|
||||
from app.services import param_store, dispatcher
|
||||
from app.repo import pms_repo, qmt_repo
|
||||
if dt.date.today() != DAY or settings.PMS_TABLE_PREFIX or not settings.INFRA_STRATEGY_BOOK_SCHEMA:
|
||||
raise RuntimeError('只适用于本次已迁移账本的155模拟仓')
|
||||
wanted = {'PMS_DISPATCH_MODE': 'ws', 'PMS_RECON_SOURCE': 'ws_only',
|
||||
'PMS_QMT_WS_URL': 'ws://192.168.18.182:9443/pms',
|
||||
'PMS_ROTATION_MODE': 'auto', 'PMS_ROTATION_RULE_VERSION': 'micro50-v2-20261028'}
|
||||
if any(param_store.get(k) != v for k, v in wanted.items()):
|
||||
raise RuntimeError('实例运行配置与本次授权范围不符')
|
||||
params = pms_repo.all_params()
|
||||
for k in ('PMS_GLOBAL_BUY_HALT', 'PMS_GLOBAL_EXEC_HALT'):
|
||||
if not param_store.get_bool(k) or params[k]['updated_by'] != ACTOR:
|
||||
raise RuntimeError('暂停已被其他用户操作覆盖')
|
||||
orders = qmt_repo.list_orders(limit=10001)
|
||||
if len(orders) > 10000 or any(o['status'] not in qmt_repo.FINAL for o in orders):
|
||||
raise RuntimeError('委托未全部终结,不能重置')
|
||||
channel = dispatcher.channel_status()
|
||||
if channel['inbox_pending'] or channel['orphan_held']:
|
||||
raise RuntimeError('仍有待处理或孤立回报')
|
||||
result = {'channel': channel, 'positions': qmt_repo.latest_snapshot('positions'),
|
||||
'funds': qmt_repo.latest_snapshot('funds')}
|
||||
if empty:
|
||||
pause_at = max(params[k]['updated_at'] for k in ('PMS_GLOBAL_BUY_HALT', 'PMS_GLOBAL_EXEC_HALT'))
|
||||
result['parsed_funds'] = validate_empty(channel, result['positions'], result['funds'], pause_at)
|
||||
return result
|
||||
|
||||
|
||||
def read_table(table, *, lock=False):
|
||||
from app.core import strategy_book as books
|
||||
from app.db import session as db
|
||||
key = 'ymd' if table in ('pms_daily_report', 'pms_nav_daily') else 'id'
|
||||
with books.scope('all'):
|
||||
return db.fetch_all('SELECT * FROM '+table+' ORDER BY '+key+(' FOR UPDATE' if lock else ''))
|
||||
|
||||
|
||||
def ledger_state(*, lock=False):
|
||||
from app.db import session as db
|
||||
return {'tables': {t: read_table(t, lock=lock) for t in TABLES},
|
||||
'runtime_params': db.fetch_all('SELECT * FROM pms_runtime_param ORDER BY param_key'),
|
||||
'rotation_documents': db.fetch_all('SELECT * FROM pms_rotation_document ORDER BY doc_id'),
|
||||
'qmt_orders': db.fetch_all('SELECT * FROM pms_qmt_order ORDER BY id'),
|
||||
'trade_inbox': db.fetch_all("SELECT * FROM pms_qmt_inbox WHERE msg_type='trade' ORDER BY seq")}
|
||||
|
||||
|
||||
def prepare(path):
|
||||
from app.db import session as db
|
||||
from app.repo import rotation_repo as store
|
||||
if store.get('maintenance:'+RESET_ID)[0]:
|
||||
raise RuntimeError('本次重置已经完成')
|
||||
channel = require_safe()
|
||||
with db.transaction():
|
||||
backup = ledger_state(lock=True)
|
||||
backup.update(reset_id=RESET_ID, prepared_at=str(dt.datetime.now()), current=channel,
|
||||
schemas={t: db.fetch_all('SHOW CREATE TABLE '+t) for t in TABLES})
|
||||
save_new(path, backup)
|
||||
return {'backup_sha256': digest(backup), 'counts': {t: len(v) for t,v in backup['tables'].items()}}
|
||||
|
||||
|
||||
def baseline_documents(old, funds, now):
|
||||
from app.core import micro_rotation, rotation_account
|
||||
value = rotation_account.seed(funds['parsed_funds']['available_cash'], {'original': 0., 'micro30': 0.})
|
||||
# 旧成交键继续去重,历史金额不参与新本金、费用和收益计算。
|
||||
value['fills'] = copy.deepcopy((old.get('capital:live') or {}).get('fills', {}))
|
||||
if (old.get('capital:live') or {}).get('transfers'):
|
||||
raise ValueError('本次实例已有历史划拨,需扩展划拨编号衔接后再执行')
|
||||
value.update(started_at=now.isoformat(), source_funds_seq=funds['funds']['seq'], reset_id=RESET_ID)
|
||||
previous = (old.get('state:live') or {}).get('rotation') or {}
|
||||
state = micro_rotation.initial_state()
|
||||
for key in ('cycle', 'consumed_entry', 'closed_date', 'last_snapshot', 'disabled'):
|
||||
if key in previous:
|
||||
state[key] = previous[key]
|
||||
state['reason'] = '用户重置模拟仓'
|
||||
return {'capital:live': value,
|
||||
'state:live': {'rotation': state, 'reset_id': RESET_ID, 'reset_at': now.isoformat()},
|
||||
'account-execution': {'epoch_seq': funds['funds']['seq'], 'available': value['cash']['original'],
|
||||
'market_value': 0., 'orders': {}, 'reset_id': RESET_ID}}
|
||||
|
||||
|
||||
def reset_in_transaction(backup, sha, funds, cursor, now):
|
||||
from app.core import strategy_book as books
|
||||
from app.db import session as db
|
||||
from app.repo import pms_repo, rotation_repo as store
|
||||
from app.services import param_store, ledger_service, publish_export
|
||||
result = {'reset_id': RESET_ID, 'at_beijing': str(now), 'backup_sha256': sha,
|
||||
'source_positions_seq': funds['positions']['seq'], 'source_funds_seq': funds['funds']['seq'],
|
||||
'initial_cash': funds['parsed_funds']['available_cash'], 'deleted': {},
|
||||
'replay_seen': len(cursor['seen']), 'ws_seq_before': funds['channel']['last_seq']}
|
||||
current = ledger_state(lock=True)
|
||||
for key in current:
|
||||
if digest(current[key]) != digest(backup[key]):
|
||||
raise RuntimeError('备份后数据变化:'+key)
|
||||
old = {r['doc_id']: json.loads(r['payload_json']) for r in backup['rotation_documents']}
|
||||
new = baseline_documents(old, funds, now)
|
||||
# 保留通道表及回报去重。旧指令只在备份中,迟到的旧成交无法误认到新账本。
|
||||
# 本次当天尚无PMS委托/父指令,删除历史任务不会复用当日出口编号。
|
||||
today = now.date().isoformat()
|
||||
if any(str(r.get('created_at') or '')[:10] == today for r in backup['qmt_orders']+backup['tables']['pms_instruction']):
|
||||
raise RuntimeError('当天已有指令,本次脚本不能保证重置后编号不复用')
|
||||
if any(str(r.get('issued_at') or '')[:10] == today and r.get('cmd_class') == 'task' for r in backup['tables']['pms_command']):
|
||||
raise RuntimeError('当天已有任务命令,本次脚本不能保证编号不复用')
|
||||
for book in (books.ORIGINAL, books.MICRO):
|
||||
with books.scope(book):
|
||||
for table in CLEAR:
|
||||
if table in books.TABLES:
|
||||
# 人工参数命令(如黑白名单、仓位限制)继续有效。
|
||||
where = " WHERE cmd_class <> 'param'" if table == 'pms_command' else ''
|
||||
result['deleted'][book+':'+table] = db.execute('DELETE FROM '+table+where)
|
||||
for table in CLEAR:
|
||||
if table not in books.TABLES:
|
||||
result['deleted'][table] = db.execute('DELETE FROM '+table)
|
||||
for key, value in {**DERIVED, 'PMS_TOTAL_SCALE': INITIAL_CASH, 'PMS_PUBLISH_NAV_SCALE': 0.}.items():
|
||||
if not param_store.set_param(key, value, ACTOR).get('ok'):
|
||||
raise RuntimeError('派生参数写入失败:'+key)
|
||||
for key, value in {**OWNED_MAPS, ledger_service.CURSOR_KEY: encoded(cursor).decode()}.items():
|
||||
pms_repo.set_param(key, value, ACTOR)
|
||||
if pms_repo.get_param(key) != value:
|
||||
raise RuntimeError('派生状态写入核验失败:'+key)
|
||||
for key, value in new.items():
|
||||
if key in old:
|
||||
store.put_once('archive:'+RESET_ID+':'+key, 'reset_archive', old[key])
|
||||
kind = {'capital:live':'capital','state:live':'state','account-execution':'funds_reservation'}[key]
|
||||
with store.locked(key, kind, {}) as target:
|
||||
target.clear(); target.update(value)
|
||||
# 历史收益、执行与待核对记录保留归档,不混入新周期图表。
|
||||
for r in backup['rotation_documents']:
|
||||
if r['kind'] in ('live_day','execution','unattributed_fill','command_conflict'):
|
||||
db.execute('UPDATE pms_rotation_document SET doc_id=:new,kind=:kind WHERE doc_id=:old',
|
||||
{'new':'archive:'+RESET_ID+':'+r['doc_id'], 'kind':'reset_archive', 'old':r['doc_id']})
|
||||
for table in CLEAR:
|
||||
rows = read_table(table)
|
||||
if table == 'pms_command':
|
||||
rows = [r for r in rows if r['cmd_class'] != 'param']
|
||||
if rows:
|
||||
raise RuntimeError('清理不完整:'+table)
|
||||
result['nav_baseline'] = publish_export.record_nav_snapshot()
|
||||
if result['nav_baseline'].get('nav') != 1. or result['nav_baseline'].get('pos_ratio') != 0.:
|
||||
raise RuntimeError('新净值基线错误')
|
||||
if digest(db.fetch_all('SELECT * FROM pms_qmt_order ORDER BY id')) != digest(backup['qmt_orders']):
|
||||
raise RuntimeError('清理中委托变化')
|
||||
if digest(db.fetch_all("SELECT * FROM pms_qmt_inbox WHERE msg_type='trade' ORDER BY seq")) != digest(backup['trade_inbox']):
|
||||
raise RuntimeError('清理中新增成交,先核对后重做备份')
|
||||
store.put_once('maintenance:'+RESET_ID, 'maintenance', result)
|
||||
pms_repo.insert_op_log(op='reset_sim_baseline',result='OK',by='user_authorized',
|
||||
reason='用户再次重置模拟仓,QMT新鲜空仓及资金已核实,两策略重新起算',params=result,ref=RESET_ID)
|
||||
return result
|
||||
|
||||
|
||||
def apply(path, expected_sha):
|
||||
from app.db import session as db
|
||||
from app.repo import downstream_repo, rotation_repo as store
|
||||
from app.services import ledger_service
|
||||
raw = Path(path).read_bytes()
|
||||
if not expected_sha or hashlib.sha256(raw).hexdigest() != expected_sha:
|
||||
raise RuntimeError('备份摘要不符')
|
||||
backup = json.loads(raw)
|
||||
if backup.get('reset_id') != RESET_ID:
|
||||
raise RuntimeError('备份不属于本次重置')
|
||||
receipt, _ = store.get('maintenance:'+RESET_ID)
|
||||
if receipt:
|
||||
if receipt['backup_sha256'] != expected_sha:
|
||||
raise RuntimeError('本次已用另一份备份完成重置')
|
||||
return {'already_applied': True, 'receipt': receipt}
|
||||
funds = require_safe(empty=True)
|
||||
now = dt.datetime.now().replace(microsecond=0)
|
||||
since = str(now-dt.timedelta(seconds=ledger_service._REPLAY_OVERLAP_SEC))
|
||||
fills = downstream_repo.fetch_filled_orders(since_time=since, limit=10001)
|
||||
if len(fills) > 10000 or any(str(f.get('done_time') or '')[:19] > str(now) for f in fills):
|
||||
raise RuntimeError('汇总成交窗口未核实完整')
|
||||
cursor = {'v':2, 't':str(now), 'seen': {ledger_service._fill_key(f):str(f.get('done_time') or now)[:19] for f in fills}}
|
||||
with store.account_guard(), db.transaction():
|
||||
fresh = require_safe(empty=True)
|
||||
if fresh['parsed_funds'] != funds['parsed_funds']:
|
||||
# as_of随新快照变化不影响资产,但资金金额改变则必须重新核实。
|
||||
keys = ('available_cash','total_asset','frozen_cash','market_value')
|
||||
if any(fresh['parsed_funds'][k] != funds['parsed_funds'][k] for k in keys):
|
||||
raise RuntimeError('账户资金在操作前变化')
|
||||
result = reset_in_transaction(backup, expected_sha, fresh, cursor, now)
|
||||
save_new(str(path)+'.receipt.json', result)
|
||||
return result
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('action', choices=('prepare','apply'))
|
||||
parser.add_argument('--backup', required=True)
|
||||
parser.add_argument('--backup-sha256')
|
||||
args = parser.parse_args()
|
||||
result = prepare(args.backup) if args.action == 'prepare' else apply(args.backup,args.backup_sha256)
|
||||
print(json.dumps(result,ensure_ascii=False,default=str))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
@ -5,8 +5,12 @@
|
|||
运行: docker compose run --rm pms-web python scripts/run_tests.py
|
||||
|
||||
包含 (例数按 2026-10-26 隔离回归实跑校正):
|
||||
test_batch50_units.py QMT限价等待、价格来源故障、用户暂停、配额防重和试算隔离 (14例)
|
||||
test_batch49_units.py 持仓分组、同名股票与批次归属、未迁移及缺数展示 (8例)
|
||||
test_sim_reset_units.py 双账本重置、空仓证据、配置与去重保留、幂等及SQL回滚 (9例)
|
||||
test_batch53_units.py QMT下单策略类型、原字段与签名、双策略买卖归属及读取故障保留队列 (8例)
|
||||
test_batch52_units.py 当日限价、撤单拒绝、迟到成交、发送恢复与真实SQL状态保护 (22例)
|
||||
test_batch51_units.py 跨日决策复核、撤单回报、数量约束、人工确认与真实SQL事务及完整选股接线 (36例)
|
||||
test_batch50_units.py QMT限价等待、价格来源故障、用户暂停、配额防重、试算隔离及收盘边界 (17例)
|
||||
test_batch49_units.py 持仓与指令分组、同名股票及批次归属、撤单账本、未迁移及缺数展示 (14例)
|
||||
test_batch48_units.py 策略账本隔离、轮换优先级、交易单位、模拟直接启用、读数及微盘50规则换版 (55例)
|
||||
test_batch47_units.py 账户资金去重、买入额度与账户展示和策略估值分离 (9 例)
|
||||
test_batch46_units.py 质地排序切换、档位准入、命令分配与白名单优先 (11 例)
|
||||
|
|
@ -180,7 +184,11 @@ import sys
|
|||
|
||||
HERE = os.path.dirname(os.path.abspath(__file__))
|
||||
ROOT = os.path.dirname(HERE)
|
||||
SUITES = ["test_core_units.py", "test_batch2_units.py", "test_batch3_units.py",
|
||||
SUITES = [
|
||||
"test_sim_reset_units.py",
|
||||
"test_batch53_units.py",
|
||||
"test_batch52_units.py",
|
||||
"test_batch51_units.py","test_core_units.py", "test_batch2_units.py", "test_batch3_units.py",
|
||||
"test_batch4_units.py", "test_batch5_units.py", "test_batch6_units.py",
|
||||
"test_batch7_units.py", "test_batch8_units.py", "test_batch9_units.py",
|
||||
"test_batch10_units.py", "test_batch11_units.py", "test_batch12_units.py",
|
||||
|
|
|
|||
|
|
@ -50,6 +50,11 @@ ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|||
# 这些函数**写失败时不抛异常**, 只把失败写在返回值里。调用点必须接住。
|
||||
# key = 函数名, value = 允许的调用者模块名 (None = 不限, 用于 _db(f, ...) 这种间接调用)
|
||||
SOFT_FAIL = {
|
||||
"mark_send_attempt": {"qmt_repo"},
|
||||
"request_order_cancel": {"qmt_repo"},
|
||||
"process": {"daily_buy_review"},
|
||||
"decide_confirmation": {"daily_buy_review"},
|
||||
"compare_review_instruction": {"pms_repo"},
|
||||
"set_param": {"param_store"}, # → {"ok": False, "error": ...}
|
||||
"save_neg_streak": {"portfolio"}, # → {"ok": False, "error": ...}
|
||||
"bump_once_guards": {"proposal_service"}, # → {"ok": False, "error": ...}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
"""持仓展示与批次查询的策略隔离。"""
|
||||
"""持仓、批次及交易指令页面的策略隔离。"""
|
||||
import unit_test_guard # noqa: F401
|
||||
import copy
|
||||
import unittest
|
||||
|
|
@ -84,5 +84,83 @@ class PositionGroupsTests(unittest.TestCase):
|
|||
read.assert_called_once_with('600000.SH', 'micro30', status=None)
|
||||
|
||||
|
||||
class InstructionBooksTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
from app.web import main
|
||||
self.api = main
|
||||
|
||||
def test_list_scopes_both_books_and_restores_caller(self):
|
||||
from app.services import dispatcher
|
||||
def read(**kw):
|
||||
self.assertEqual(kw, {'statuses': ['DISPATCHED', 'CONFIRMED'],
|
||||
'limit': 200, 'include_archived': False})
|
||||
return [{'instruction_id': 'same-stock-'+books.CURRENT.get(),
|
||||
'ts_code': '600000.SH', 'book_id': books.CURRENT.get(),
|
||||
'status': 'CONFIRMED', 'qty': 100 if books.CURRENT.get()=='original' else 300}]
|
||||
with patch.object(settings, 'INFRA_STRATEGY_BOOK_SCHEMA', True), \
|
||||
patch.object(self.api.pms_repo, 'list_instructions', side_effect=read), \
|
||||
patch.object(dispatcher, 'mode', return_value='ws'):
|
||||
with books.scope('micro30'):
|
||||
rows = [self.api.api_instructions(status='DISPATCHED,CONFIRMED', limit=200,
|
||||
include_archived=False, book_id=b)['data'][0] for b in ('original','micro30')]
|
||||
self.assertEqual(books.CURRENT.get(), 'micro30')
|
||||
self.assertEqual([r['qty'] for r in rows], [100,300])
|
||||
self.assertEqual([r['book_id'] for r in rows], ['original','micro30'])
|
||||
|
||||
def test_unmigrated_micro_never_lists_original(self):
|
||||
with patch.object(settings, 'INFRA_STRATEGY_BOOK_SCHEMA', False), \
|
||||
patch.object(self.api.pms_repo, 'list_instructions') as read:
|
||||
result = self.api.api_instructions(status=None, include_archived=False, book_id='micro30')
|
||||
self.assertEqual(result, {'ok': True, 'data': []})
|
||||
read.assert_not_called()
|
||||
|
||||
def test_read_failure_is_not_successful_empty_and_restores_scope(self):
|
||||
with patch.object(settings, 'INFRA_STRATEGY_BOOK_SCHEMA', True), \
|
||||
patch.object(self.api.pms_repo, 'list_instructions', side_effect=RuntimeError('offline')):
|
||||
result = self.api.api_instructions(status=None, include_archived=False, book_id='micro30')
|
||||
self.assertFalse(result['ok'])
|
||||
self.assertEqual(books.CURRENT.get(), 'original')
|
||||
|
||||
def test_cancel_uses_selected_book_and_existing_cancel_flow(self):
|
||||
from app.services import executor
|
||||
def cancel(iid, reason):
|
||||
self.assertEqual(iid, 'ROT_test')
|
||||
self.assertEqual(reason, '页面人工撤销')
|
||||
return {'ok': True, 'book': books.CURRENT.get(), 'cancel_pending': True}
|
||||
with patch.object(settings, 'INFRA_STRATEGY_BOOK_SCHEMA', True), \
|
||||
patch.object(executor, 'cancel_instruction', side_effect=cancel), \
|
||||
patch.object(self.api.pms_repo, 'insert_op_log') as log:
|
||||
for book in ('original','micro30'):
|
||||
result = self.api.api_cancel_instruction('ROT_test', payload={}, book_id=book)
|
||||
self.assertEqual(result['book'], book)
|
||||
self.assertTrue(result['cancel_pending'])
|
||||
self.assertEqual(log.call_args.kwargs['params']['book_id'], book)
|
||||
self.assertEqual(books.CURRENT.get(), 'original')
|
||||
|
||||
def test_wrong_book_does_not_fall_back_or_cancel_other_book(self):
|
||||
from app.services import dispatcher
|
||||
seen = []
|
||||
def read(iid):
|
||||
seen.append(books.CURRENT.get())
|
||||
return None # 指令在另一个账本,本范围内不存在。
|
||||
with patch.object(settings, 'INFRA_STRATEGY_BOOK_SCHEMA', True), \
|
||||
patch.object(self.api.pms_repo, 'get_instruction', side_effect=read), \
|
||||
patch.object(self.api.pms_repo, 'insert_op_log'), \
|
||||
patch.object(dispatcher, 'cancel') as cancel:
|
||||
result = self.api.api_cancel_instruction('ROT_test', payload={}, book_id='micro30')
|
||||
self.assertFalse(result['ok'])
|
||||
self.assertEqual(seen, ['micro30'])
|
||||
cancel.assert_not_called()
|
||||
|
||||
def test_unmigrated_micro_cannot_cancel_original(self):
|
||||
from app.services import executor
|
||||
with patch.object(settings, 'INFRA_STRATEGY_BOOK_SCHEMA', False), \
|
||||
patch.object(executor, 'cancel_instruction') as cancel, \
|
||||
patch.object(self.api.pms_repo, 'insert_op_log'):
|
||||
result = self.api.api_cancel_instruction('ROT_test', payload={}, book_id='micro30')
|
||||
self.assertFalse(result['ok'])
|
||||
cancel.assert_not_called()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
|
|
|||
|
|
@ -94,6 +94,34 @@ class QmtPriceTests(unittest.TestCase):
|
|||
self.assertEqual(r['limit_price'], 30.02)
|
||||
self.assertFalse(r['forced'])
|
||||
|
||||
def test_close_boundary_cannot_submit_even_urgent_sell(self):
|
||||
for now in ('15:00', '15:01', datetime(2026, 10, 28, 15, 0, 16)):
|
||||
for side in ('buy', 'sell'):
|
||||
self.assertEqual(self.decide(now=now, side=side, urgent=True)['action'], 'WAIT')
|
||||
self.assertEqual(self.post.call_count, 0)
|
||||
self.assertEqual(self.decide(now='14:59')['action'], 'FIRE')
|
||||
|
||||
def test_expired_child_at_close_does_not_create_new_outbox(self):
|
||||
self.parent()
|
||||
self.fake.params['PMS_EXEC_QMT_DAY_ORDER'] = True
|
||||
with patch.object(market, 'day_snapshot', return_value={'price': 31.1}):
|
||||
self.assertEqual(len(executor.run_tick(now=NOW)['fired']), 1)
|
||||
old = next(iter(self.fake.qmt.orders.values())); old.update(status='EXPIRED', cum_qty=0)
|
||||
r = executor.run_tick(now=datetime(2026, 10, 28, 15, 0, 16))
|
||||
self.assertEqual(r['fired'], [])
|
||||
self.assertIn('已收盘', str(r['waited']))
|
||||
self.assertEqual(len(self.fake.qmt.orders), 1)
|
||||
|
||||
def test_executor_rejects_expired_deadline_even_when_advisor_fires(self):
|
||||
self.parent()
|
||||
with patch.object(market, 'day_snapshot', return_value={'price': 31.1}), \
|
||||
patch.object(ea, 'decide', return_value={'action': 'FIRE', 'qty_hint': 200,
|
||||
'limit_price': 30.02, 'reason': 'test', 'qmt_price_monitor': True}):
|
||||
r = executor.run_tick(now=datetime(2026, 10, 28, 15, 0, 16))
|
||||
self.assertEqual(r['fired'], [])
|
||||
self.assertIn('截止时间', str(r['waited']))
|
||||
self.assertEqual(self.fake.qmt.orders, {})
|
||||
|
||||
def test_disabled_mode_retains_old_wait(self):
|
||||
self.fake.params['PMS_EXEC_QMT_PRICE_MONITOR'] = False
|
||||
self.assertEqual(self.decide(day={'price': 31.1})['action'], 'WAIT')
|
||||
|
|
|
|||
|
|
@ -0,0 +1,314 @@
|
|||
"""跨日复核:真实单表SQL事务、决策重走、委托回报与人工确认并发。"""
|
||||
import unit_test_guard
|
||||
import copy
|
||||
import os, sys
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
import json
|
||||
import tempfile
|
||||
import unittest
|
||||
from datetime import datetime, timedelta
|
||||
from unittest.mock import patch
|
||||
from sqlalchemy import create_engine, text, event
|
||||
from app.db import session
|
||||
from app.repo import pms_repo, qmt_repo
|
||||
from app.services import daily_buy_review as dr, proposal_service as ps, dispatcher, execution_conflicts, executor
|
||||
|
||||
NOW = datetime(2026, 10, 30, 10, 0)
|
||||
CODE = '300693.SZ'
|
||||
|
||||
|
||||
class DailyReviewTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.tmp = tempfile.TemporaryDirectory(); self.addCleanup(self.tmp.cleanup)
|
||||
self.engine = create_engine('sqlite:///' + self.tmp.name + '/state.sqlite')
|
||||
self.addCleanup(self.engine.dispose)
|
||||
self.use(session, 'get_engine', return_value=self.engine)
|
||||
self.use(session, '_check_cooldown')
|
||||
self.params = {'PMS_DAILY_BUY_REVIEW': True}
|
||||
self.use(dr.param_store, 'get_bool', side_effect=lambda k, d=False: self.params.get(k, d))
|
||||
self.orders = []
|
||||
self.use(qmt_repo, 'orders_for_parent', side_effect=lambda _: copy.deepcopy(self.orders))
|
||||
self.cancel = self.use(dispatcher, 'cancel', return_value={'ok': True})
|
||||
self.fresh = {'candidate': {'ts_code': CODE, 'action': 'OPEN', 'side': 'buy', 'qty': 400,
|
||||
'hard_numbers': {'plan_basis': {'research': 'today'}, 'scan_params_hash': 'p',
|
||||
'portfolio_context_hash': 'a'}},
|
||||
'verdict': {'verdict': 'PASS', 'reason': 'today', 'degraded': False}, 'auto_exec': True}
|
||||
self.scan = self.use(ps, 'scan_and_route', side_effect=lambda **kw: {'ok': True, 'review': copy.deepcopy(self.fresh)})
|
||||
ddl = [
|
||||
'CREATE TABLE pms_proposal(id INTEGER PRIMARY KEY,proposal_id TEXT UNIQUE,ts_code TEXT,action TEXT,qty INTEGER,hard_numbers_json TEXT,status TEXT,expire_at TEXT,decided_at TEXT,judge_verdict TEXT,judge_reason TEXT,archived_at TEXT,created_at TEXT)',
|
||||
'CREATE TABLE pms_action_ledger(id INTEGER PRIMARY KEY,ts_code TEXT,decided_at TEXT,action TEXT,arbiter TEXT,verdict TEXT,price_at REAL,hard_numbers_json TEXT,failed_checks_json TEXT,reason TEXT,ref_id TEXT,outcome_scored INTEGER)',
|
||||
'CREATE TABLE pms_instruction(id INTEGER PRIMARY KEY,instruction_id TEXT UNIQUE,origin_type TEXT,origin_id TEXT,ts_code TEXT,action TEXT,side TEXT,qty INTEGER,limit_price REAL,window_tdays INTEGER,status TEXT,exec_qty INTEGER,progress_json TEXT,created_at TEXT,updated_at TEXT,archived_at TEXT)']
|
||||
with self.engine.begin() as c:
|
||||
for sql in ddl: c.execute(text(sql))
|
||||
pms_repo.insert_instruction(instruction_id='P', origin_type='plan', origin_id='PLAN', ts_code=CODE,
|
||||
action='OPEN', side='buy', qty=600, limit_price=29, window_tdays=3, status='DISPATCHED',
|
||||
progress={'deadline': '2026-11-02', 'exec_advice': {'ymd': 20261029, 'buy_band': [28, 29]},
|
||||
'ref_lock': {'ymd': 20261029}, 'is_command': True})
|
||||
session.execute('UPDATE pms_instruction SET created_at=:t, exec_qty=0', {'t': '2026-10-29 10:00:00'})
|
||||
|
||||
def use(self, obj, name, **kw):
|
||||
p = patch.object(obj, name, **kw); result = p.start(); self.addCleanup(p.stop); return result
|
||||
|
||||
def parent(self): return pms_repo.get_instruction('P')
|
||||
def run_review(self): return dr.process(now=NOW)
|
||||
def child(self, state='ACCEPTED', qty=600, done=0):
|
||||
self.orders = [{'instruction_id': 'P_D01', 'status': state, 'qty': qty, 'cum_qty': done}]
|
||||
def prop(self): return pms_repo.get_proposal(self.parent()['progress']['daily_review']['proposal_id'])
|
||||
def accept(self, p=None):
|
||||
p = p or self.prop()
|
||||
return dr.decide_confirmation(p, 'ACCEPTED', '交易员确认', p['hard_numbers']['proposal_revision'], now=NOW)
|
||||
|
||||
def test_old_day_is_blocked_even_with_refreshed_execution_advice(self):
|
||||
row = self.parent(); row['progress']['exec_advice']['ymd'] = 20261030
|
||||
self.assertTrue(dr.blocker(row, now=NOW))
|
||||
|
||||
def test_today_new_decision_passes_and_missing_date_fails_closed(self):
|
||||
row = self.parent(); row['created_at'] = NOW
|
||||
self.assertIsNone(dr.blocker(row, now=NOW))
|
||||
row['created_at'] = None
|
||||
self.assertTrue(dr.blocker(row, now=NOW))
|
||||
|
||||
def test_old_plan_materialized_today_still_requires_review(self):
|
||||
row = self.parent(); row['created_at'] = NOW; row['progress']['decision_ymd'] = 20261029
|
||||
self.assertTrue(dr.blocker(row, now=NOW))
|
||||
|
||||
def test_rotation_and_sell_keep_existing_daily_process(self):
|
||||
row = self.parent(); row['progress']['execution_profile'] = 'rotation'
|
||||
self.assertIsNone(dr.blocker(row, now=NOW))
|
||||
row = self.parent(); row['side'] = 'sell'
|
||||
self.assertIsNone(dr.blocker(row, now=NOW))
|
||||
|
||||
def test_maintenance_hold_stays_blocked_even_when_switch_off(self):
|
||||
self.params['PMS_DAILY_BUY_REVIEW'] = False
|
||||
row = self.parent(); row['status'] = 'WAIT_REVIEW'
|
||||
self.assertTrue(dr.blocker(row, now=NOW))
|
||||
|
||||
def test_active_child_cancel_request_does_not_reopen_parent(self):
|
||||
self.child()
|
||||
r = self.run_review()
|
||||
self.assertEqual(self.parent()['status'], 'WAIT_REVIEW'); self.assertEqual(r['waiting'], ['P'])
|
||||
self.scan.assert_not_called(); self.cancel.assert_called_once()
|
||||
|
||||
def test_cancel_failure_remains_pending(self):
|
||||
self.child(); self.cancel.return_value = {'ok': False}
|
||||
self.assertTrue(self.run_review()['errors']); self.assertEqual(self.parent()['status'], 'WAIT_REVIEW')
|
||||
|
||||
def test_late_partial_fill_waits_for_bookkeeping_before_review(self):
|
||||
self.child('CANCELLED', done=100)
|
||||
self.run_review(); self.scan.assert_not_called()
|
||||
pms_repo.update_instruction('P', exec_qty=100)
|
||||
self.assertEqual(self.run_review()['approved'], ['P'])
|
||||
self.assertEqual(self.parent()['progress']['daily_review']['start_filled'], 100)
|
||||
self.assertEqual(self.parent()['exec_qty'], 100)
|
||||
|
||||
def test_approval_uses_current_quantity_and_clears_old_price_cache(self):
|
||||
self.child('EXPIRED')
|
||||
r = self.run_review(); row = self.parent()
|
||||
self.assertEqual(r['approved'], ['P']); self.assertEqual(row['status'], 'PROPOSED')
|
||||
self.assertEqual(row['qty'], 600); self.assertEqual(row['progress']['daily_review']['qty'], 400)
|
||||
self.assertNotIn('exec_advice', row['progress']); self.assertNotIn('ref_lock', row['progress'])
|
||||
self.assertIsNone(row['limit_price']); self.assertEqual(self.scan.call_count, 2)
|
||||
self.assertIsNone(dr.blocker(row, now=NOW)); self.assertTrue(dr.blocker(row, now=NOW + timedelta(days=1)))
|
||||
|
||||
def test_approval_does_not_expand_prior_authorization(self):
|
||||
self.fresh['candidate']['qty'] = 1000
|
||||
self.run_review()
|
||||
self.assertEqual(self.parent()['progress']['daily_review']['qty'], 600)
|
||||
|
||||
def test_allowance_counts_fills_and_reservations_once(self):
|
||||
self.run_review(); self.child('ACCEPTED', qty=300, done=100)
|
||||
pms_repo.update_instruction('P', exec_qty=100)
|
||||
self.assertEqual(dr.allowance(self.parent(), now=NOW), 100)
|
||||
self.orders[0]['status'] = 'CANCELLED'
|
||||
self.assertEqual(dr.allowance(self.parent(), now=NOW), 300)
|
||||
|
||||
def test_source_failure_keeps_pending_and_never_reuses_yesterday(self):
|
||||
self.scan.side_effect = lambda **kw: {'ok': False, 'errors': ['上游失败']}
|
||||
self.assertTrue(self.run_review()['errors']); self.assertEqual(self.parent()['status'], 'WAIT_REVIEW')
|
||||
|
||||
def test_source_changed_during_model_response_requires_new_preparation(self):
|
||||
changed = copy.deepcopy(self.fresh); changed['candidate']['hard_numbers']['plan_basis'] = {'research': 'new'}
|
||||
self.scan.side_effect = [{'ok': True, 'review': self.fresh}, {'ok': True, 'review': changed}]
|
||||
self.assertEqual(self.run_review()['waiting'], ['P']); self.assertEqual(self.parent()['status'], 'WAIT_REVIEW')
|
||||
|
||||
def test_disqualified_parent_ends_without_erasing_existing_fill(self):
|
||||
self.child('CANCELLED', done=100); pms_repo.update_instruction('P', exec_qty=100)
|
||||
self.scan.side_effect = lambda **kw: {'ok': True, 'review': None, 'skipped': [{'ts_code': CODE, 'why': '排名已不入选'}]}
|
||||
self.assertEqual(self.run_review()['ended'], ['P']); self.assertEqual(self.parent()['exec_qty'], 100)
|
||||
self.assertIn('排名', self.parent()['progress']['daily_review']['reason'])
|
||||
|
||||
def test_source_command_cancelled_during_review_cannot_resume(self):
|
||||
row = self.parent(); row['progress']['command_id'] = 'CMD'
|
||||
pms_repo.update_instruction('P', progress=row['progress'])
|
||||
self.use(pms_repo, 'get_command', return_value={'status': 'CANCELLED'})
|
||||
self.assertEqual(self.run_review()['ended'], ['P']); self.scan.assert_not_called()
|
||||
|
||||
def test_expired_command_does_not_keep_buying_as_partial(self):
|
||||
row = self.parent(); row['progress']['deadline'] = '2026-10-29'
|
||||
pms_repo.update_instruction('P', progress=row['progress'])
|
||||
self.assertEqual(self.run_review()['ended'], ['P']); self.scan.assert_not_called()
|
||||
|
||||
def test_global_pause_prevents_decision_and_resume(self):
|
||||
self.params['PMS_GLOBAL_BUY_HALT'] = True
|
||||
self.run_review(); self.assertEqual(self.parent()['status'], 'WAIT_REVIEW'); self.scan.assert_not_called()
|
||||
|
||||
def test_auto_accept_is_counted_in_existing_daily_limit(self):
|
||||
self.fresh['self_decide'] = {'decision': 'accept'}
|
||||
self.run_review()
|
||||
self.assertEqual(pms_repo.system_pass_count_today('2000-01-01'), 1)
|
||||
self.run_review()
|
||||
self.assertEqual(pms_repo.system_pass_count_today('2000-01-01'), 1)
|
||||
|
||||
def test_restart_reuses_today_approval(self):
|
||||
self.run_review(); n = self.scan.call_count
|
||||
self.run_review(); self.assertEqual(self.scan.call_count, n)
|
||||
|
||||
def test_manual_route_requires_fresh_confirmation(self):
|
||||
self.fresh['auto_exec'] = False
|
||||
self.assertEqual(self.run_review()['queued'], ['P']); p = self.prop()
|
||||
self.assertEqual(p['qty'], 400); self.assertEqual(self.parent()['status'], 'WAIT_REVIEW')
|
||||
self.assertTrue(self.accept(p)['ok']); self.assertEqual(self.parent()['status'], 'PROPOSED')
|
||||
self.assertTrue(self.accept(pms_repo.get_proposal(p['proposal_id']))['already_accepted'])
|
||||
self.assertEqual(len(pms_repo.list_instructions()), 1)
|
||||
|
||||
def test_manual_decline_never_resumes(self):
|
||||
self.fresh['auto_exec'] = False; self.run_review(); p = self.prop()
|
||||
r = dr.decide_confirmation(p, 'DECLINED', '不买', p['hard_numbers']['proposal_revision'], now=NOW)
|
||||
self.assertTrue(r['ok']); self.assertEqual(self.parent()['status'], 'EXPIRED')
|
||||
|
||||
def test_changed_manual_basis_invalidates_and_background_reprepares(self):
|
||||
self.fresh['auto_exec'] = False; self.run_review(); p = self.prop()
|
||||
self.fresh['candidate']['qty'] = 200
|
||||
r = self.accept(p); self.assertFalse(r['ok']); self.assertTrue(r['pending'])
|
||||
self.assertEqual(pms_repo.get_proposal(p['proposal_id'])['status'], 'EXPIRED')
|
||||
self.assertEqual(self.run_review()['queued'], ['P']); self.assertEqual(self.prop()['qty'], 200)
|
||||
|
||||
def test_cancel_during_model_response_cannot_revive_parent(self):
|
||||
def cancelled(**kw):
|
||||
pms_repo.update_instruction('P', status='CANCELLED')
|
||||
return {'ok': True, 'review': self.fresh}
|
||||
self.scan.side_effect = cancelled
|
||||
self.run_review(); self.assertEqual(self.parent()['status'], 'CANCELLED')
|
||||
|
||||
def test_fill_during_model_response_cannot_overwrite_bookkeeping(self):
|
||||
def filled(**kw):
|
||||
pms_repo.update_instruction('P', exec_qty=100)
|
||||
return {'ok': True, 'review': self.fresh}
|
||||
self.scan.side_effect = filled
|
||||
self.run_review(); self.assertEqual(self.parent()['status'], 'WAIT_REVIEW')
|
||||
self.assertEqual(self.parent()['exec_qty'], 100)
|
||||
|
||||
def test_sql_audit_failure_rolls_back_status_and_manual_decision(self):
|
||||
self.fresh['auto_exec'] = False; self.run_review(); p = self.prop()
|
||||
def fail(conn, cursor, statement, *args):
|
||||
if statement.startswith('INSERT INTO pms_action_ledger'): raise RuntimeError('audit failure')
|
||||
event.listen(self.engine, 'before_cursor_execute', fail)
|
||||
try:
|
||||
with self.assertRaises(RuntimeError): self.accept(p)
|
||||
finally: event.remove(self.engine, 'before_cursor_execute', fail)
|
||||
self.assertEqual(self.parent()['status'], 'WAIT_REVIEW')
|
||||
self.assertEqual(pms_repo.get_proposal(p['proposal_id'])['status'], 'WAIT_USER')
|
||||
|
||||
def test_direct_dispatch_and_queued_sender_both_block_old_day(self):
|
||||
self.use(dispatcher, 'mode', return_value='ws')
|
||||
self.use(execution_conflicts, 'buy_blocker', return_value=None)
|
||||
sent = self.use(dispatcher, '_ws')
|
||||
r = dispatcher.dispatch(instruction_id='P_D01', ts_code=CODE, side='buy', qty=100,
|
||||
limit_price=30, valid_until=NOW, parent_id='P')
|
||||
self.assertFalse(r['ok']); sent.assert_not_called()
|
||||
self.assertTrue(execution_conflicts._queued_parent_check({'parent_id': 'P', 'ts_code': CODE}, self.parent()))
|
||||
|
||||
def test_quantity_read_failure_blocks_instead_of_assuming_zero(self):
|
||||
self.run_review()
|
||||
self.use(qmt_repo, 'orders_for_parent', side_effect=RuntimeError('db down'))
|
||||
with self.assertRaises(RuntimeError): dr.allowance(self.parent(), now=NOW)
|
||||
|
||||
|
||||
class ScanIntegrationTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
from test_wiring import install_fakes
|
||||
from app.services import plan_feed, judge
|
||||
self.feed, self.judge = plan_feed, judge
|
||||
self.fake = install_fakes(prices={CODE: 30, '600001.SH': 10}, params={
|
||||
'PMS_TOTAL_SCALE': 2000000, 'PMS_AUTONOMY': 'full', 'PMS_OPEN_AUTONOMY': 'full',
|
||||
'PMS_OPEN_REQUIRE_WS_CASH': False, 'PMS_EXEC_WINDOW_TDAYS': 3,
|
||||
'PMS_CONSENSUS_ROUTE': False, 'PMS_PLAN_TOP_N': 1, 'PMS_CANDIDATE_SOURCE': 'plan_api', 'PMS_PLAN_THEME_CAP': 0})
|
||||
self.fake.insert_instruction(instruction_id='P', origin_type='plan', origin_id='plan',
|
||||
ts_code=CODE, action='OPEN', side='buy', qty=600, status='WAIT_REVIEW',
|
||||
progress={'deadline': '2026-11-02'})
|
||||
self.parent = self.fake.get_instruction('P')
|
||||
self.raw = {'date': '2026-10-30', 'rank_axis': 'quality', 'decision': {'id': 'today'},
|
||||
'main': [{'code': 'SZ300693', 'rank': 1, 'score': 230, 'tier': '强传导',
|
||||
'upside': .3, 'heat': .2, 'verdict': '候选', 'risk': []}]}
|
||||
patch.object(plan_feed, 'get_plan', side_effect=lambda **kw: plan_feed.parse_plan(self.raw)).start()
|
||||
fp = dict(top_n=1, tiers=['强传导'], include_observe=False, min_score=0, min_sources=0,
|
||||
min_upside=0, theme_cap_local=0, exclude_st=False, rank_by_quality=True,
|
||||
rank_by_upstream=True, observe_if_fund_bull=False)
|
||||
patch.object(plan_feed, '_params', return_value=fp).start()
|
||||
self.request = patch.object(judge, 'request', return_value={'verdict': 'PASS', 'reason': '当日研究',
|
||||
'confidence': 90, 'degraded': False, 'raw': {'verdict': 'PASS'}}).start()
|
||||
self.addCleanup(patch.stopall)
|
||||
|
||||
def scan(self): return ps.scan_and_route(now=NOW, review_instruction=copy.deepcopy(self.parent))
|
||||
|
||||
def test_real_full_scan_excludes_self_and_requests_fresh_judgement(self):
|
||||
r = self.scan(); self.assertFalse(r['errors'], r); self.assertIsNotNone(r['review'], r)
|
||||
self.assertTrue(self.request.call_args.kwargs['force'])
|
||||
self.assertLessEqual(r['review']['candidate']['qty'], 600)
|
||||
self.assertEqual(len(self.fake.instructions), 1)
|
||||
|
||||
def test_rank_cutoff_is_reapplied_not_bypassed_by_old_choice(self):
|
||||
self.raw['main'].insert(0, dict(self.raw['main'][0], code='SH600001', rank=1, score=250))
|
||||
self.raw['main'][1]['rank'] = 2
|
||||
r = self.scan(); self.assertIsNone(r['review'], r); self.request.assert_not_called()
|
||||
|
||||
def test_other_inflight_kept_while_self_and_linked_confirmation_excluded(self):
|
||||
self.fake.insert_instruction(instruction_id='OTHER', origin_type='plan', origin_id='o',
|
||||
ts_code='600001.SH', action='OPEN', side='buy', qty=100, status='PROPOSED', progress={})
|
||||
self.fake.insert_proposal(proposal_id='REVIEW', ts_code=CODE, action='OPEN', qty=200,
|
||||
hard_numbers={'daily_parent': 'P'}, expire_at=NOW)
|
||||
keys = ps._inflight_keys(exclude_instruction='P')
|
||||
self.assertNotIn((CODE, 'OPEN'), keys); self.assertIn(('600001.SH', 'OPEN'), keys)
|
||||
c = ps._inflight_open_commitments({'held': []}, exclude_instruction='P', strict=True)
|
||||
self.assertEqual(c['names'], {'600001.SH'}); self.assertEqual(c['amount'], 1000)
|
||||
|
||||
def test_nonautomatic_verdict_retains_manual_route(self):
|
||||
self.request.return_value = {'verdict': 'UNAVAILABLE', 'reason': '待人工确认', 'degraded': True}
|
||||
r = self.scan(); self.assertIsNotNone(r['review'], r); self.assertFalse(r['review']['auto_exec'])
|
||||
|
||||
def test_missing_current_source_waits_instead_of_approving(self):
|
||||
with patch.object(self.feed, 'get_plan', side_effect=self.feed.PlanFeedError('missing')):
|
||||
r = self.scan()
|
||||
self.assertTrue(r['errors']); self.assertIsNone(r['review'])
|
||||
|
||||
def test_separate_manual_source_is_preserved_and_never_upgraded(self):
|
||||
from app.services import dividend_feed
|
||||
self.parent['progress']['plan'] = {'candidate_source': 'dividend'}
|
||||
selected = self.feed.candidates(record=False)
|
||||
with patch.object(dividend_feed, 'candidates', return_value=selected) as separate:
|
||||
r = self.scan()
|
||||
self.assertIsNotNone(r['review'], r); self.assertFalse(r['review']['auto_exec'])
|
||||
self.assertTrue(separate.called)
|
||||
|
||||
def test_cancel_entire_command_also_cancels_review_waiting_child(self):
|
||||
from app.services import command_service
|
||||
self.fake.commands['CMD'] = {'command_id': 'CMD', 'cmd_class': 'task', 'status': 'EXECUTING'}
|
||||
self.fake.insert_plans([{'command_id': 'CMD', 'plan_id': 'plan', 'status': 'EXECUTING', 'qty': 600}])
|
||||
with patch.object(dispatcher, 'cancel', return_value={'ok': True}):
|
||||
r = command_service.cancel('CMD')
|
||||
self.assertTrue(r['ok'], r); self.assertEqual(r['cancelled'], ['P'])
|
||||
self.assertEqual(self.fake.get_instruction('P')['status'], 'CANCELLED')
|
||||
|
||||
def test_strategy_and_rotation_continue_tracking_review_waits(self):
|
||||
from app.services import rotation_service, strategy_runner, strategy_advisor
|
||||
self.assertIn('WAIT_REVIEW', rotation_service.LIVE)
|
||||
self.assertIn('WAIT_REVIEW', strategy_runner.LIVE_INS)
|
||||
self.assertTrue(strategy_advisor._has_pending({'state': {'pending': {'iid': 'P'}}}))
|
||||
|
||||
def test_prepared_verdict_path_does_not_call_model(self):
|
||||
r = ps.scan_and_route(now=NOW, review_instruction=copy.deepcopy(self.parent),
|
||||
prepared_verdict={'verdict': 'PASS', 'reason': '今日已准备', 'degraded': False})
|
||||
self.assertIsNotNone(r['review'], r); self.request.assert_not_called()
|
||||
|
||||
|
||||
if __name__ == '__main__': unittest.main()
|
||||
|
|
@ -0,0 +1,223 @@
|
|||
"""当日限价有效期、撤单与成交交错,以及传输状态的真实SQL回归。"""
|
||||
import unit_test_guard
|
||||
import asyncio
|
||||
import copy
|
||||
import os
|
||||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
from contextlib import nullcontext
|
||||
from datetime import datetime
|
||||
from unittest.mock import AsyncMock, patch
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
from sqlalchemy import create_engine, text
|
||||
from app.db import session
|
||||
from app.repo import qmt_repo, pms_repo
|
||||
from app.services import executor, dispatcher
|
||||
from app.ws.runner import WsRunner
|
||||
|
||||
|
||||
class ChannelTest(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.loop = asyncio.new_event_loop(); asyncio.set_event_loop(self.loop)
|
||||
self.addCleanup(self.loop.close)
|
||||
self.runner = WsRunner()
|
||||
self.row = {'instruction_id': 'P_D01', 'parent_id': 'P', 'qty': 400, 'cum_qty': 0,
|
||||
'status': 'ACCEPTED', 'cancel_state': 'SENT', 'ts_code': '688100.SH'}
|
||||
self.use(qmt_repo, 'get_order', side_effect=lambda _: copy.deepcopy(self.row))
|
||||
self.use(qmt_repo, 'update_order', side_effect=self.update)
|
||||
|
||||
def use(self, obj, name, **kw):
|
||||
p = patch.object(obj, name, **kw); m = p.start(); self.addCleanup(p.stop); return m
|
||||
|
||||
def update(self, _, **fields): self.row.update(fields); return 1
|
||||
def reject(self, code='ALREADY_FINAL'):
|
||||
self.loop.run_until_complete(self.runner._apply_side_effects('reject',
|
||||
{'instruction_id': 'P_D01', 'code': code, 'reason': 'cancel denied'}, {}))
|
||||
def state(self, status, done):
|
||||
self.loop.run_until_complete(self.runner._on_order_update('P_D01',
|
||||
{'status': status, 'cum_qty': done, 'final': status in qmt_repo.FINAL, 'leaves_qty': 0}))
|
||||
|
||||
def test_cancel_reject_keeps_order_and_reservation(self):
|
||||
self.row.update(status='PARTIAL', cum_qty=100)
|
||||
self.reject('INTERNAL')
|
||||
self.assertEqual((self.row['status'], self.row['cum_qty']), ('PARTIAL', 100))
|
||||
self.assertNotIn('final_at', self.row)
|
||||
with patch.object(dispatcher, 'mode', return_value='ws'), patch.object(qmt_repo, 'orders_for_parent', return_value=[self.row]):
|
||||
self.assertEqual(executor._parent_available({'instruction_id': 'P', 'qty': 400, 'exec_qty': 0}, []), 0)
|
||||
|
||||
def test_already_final_before_final_update_keeps_pending(self):
|
||||
self.row['cancel_state'] = 'NONE'
|
||||
self.reject(); self.assertEqual(self.row['status'], 'ACCEPTED')
|
||||
self.state('FILLED', 400); self.assertEqual(self.row['status'], 'FILLED')
|
||||
|
||||
def test_reject_cannot_overwrite_filled(self):
|
||||
self.row.update(status='FILLED', cum_qty=400)
|
||||
self.reject(); self.assertEqual((self.row['status'], self.row['cum_qty']), ('FILLED', 400))
|
||||
|
||||
def test_genuine_place_rejection_still_finishes(self):
|
||||
self.row.update(status='SENT', cancel_state='NONE')
|
||||
self.reject('INVALID_PRICE'); self.assertEqual(self.row['status'], 'REJECTED')
|
||||
|
||||
def test_partial_cancel_preserves_fill_releases_only_remainder(self):
|
||||
self.row['cum_qty'] = 100
|
||||
self.state('CANCELLED', 100)
|
||||
with patch.object(dispatcher, 'mode', return_value='ws'), patch.object(qmt_repo, 'orders_for_parent', return_value=[self.row]):
|
||||
self.assertEqual(executor._parent_available({'instruction_id': 'P', 'qty': 400, 'exec_qty': 0}, []), 300)
|
||||
|
||||
def test_cancel_cannot_zero_previously_reported_fills(self):
|
||||
self.row.update(status='PARTIAL', cum_qty=100)
|
||||
self.state('CANCELLED', 0)
|
||||
self.assertEqual((self.row['status'], self.row['cum_qty']), ('PARTIAL', 100))
|
||||
self.assertEqual(self.runner._stat['order_update_conflicts'], 1)
|
||||
|
||||
def test_missing_or_invalid_cumulative_quantity_keeps_pending(self):
|
||||
for quantity in (None, -1, 500):
|
||||
self.state('CANCELLED', quantity)
|
||||
self.assertEqual(self.row['status'], 'ACCEPTED')
|
||||
self.state('FILLED', 0); self.assertEqual(self.row['status'], 'ACCEPTED')
|
||||
|
||||
def test_late_cancel_does_not_override_full_fill(self):
|
||||
self.state('FILLED', 400); self.state('CANCELLED', 400)
|
||||
self.assertEqual(self.row['status'], 'FILLED')
|
||||
|
||||
def test_restarted_queued_order_is_cancelled_at_qmt(self):
|
||||
self.row.update(status='QUEUED', sent_at=datetime.now(), cancel_state='REQUESTED', cancel_id='C')
|
||||
with patch.object(qmt_repo, 'next_cancel_requests', return_value=[self.row]), \
|
||||
patch.object(qmt_repo, 'mark_cancel_sent'), patch.object(qmt_repo, 'abort_order') as abort, \
|
||||
patch.object(self.runner, '_send', new_callable=AsyncMock) as send:
|
||||
self.loop.run_until_complete(self.runner._drain_cancels('unused'))
|
||||
abort.assert_not_called(); send.assert_awaited_once()
|
||||
self.assertEqual(send.call_args.args[0], 'cancel_order')
|
||||
|
||||
def test_unsent_queue_can_be_aborted_locally(self):
|
||||
self.row.update(status='QUEUED', sent_at=None, cancel_state='REQUESTED')
|
||||
with patch.object(qmt_repo, 'next_cancel_requests', return_value=[self.row]), \
|
||||
patch.object(qmt_repo, 'mark_cancel_sent'), patch.object(qmt_repo, 'abort_order') as abort, \
|
||||
patch.object(self.runner, '_send', new_callable=AsyncMock) as send:
|
||||
self.loop.run_until_complete(self.runner._drain_cancels('unused'))
|
||||
abort.assert_called_once(); send.assert_not_called()
|
||||
|
||||
def test_expired_uncertain_send_needs_downstream_cancel(self):
|
||||
self.row.update(status='QUEUED', sent_at=datetime.now(), cancel_state='NONE')
|
||||
with patch.object(qmt_repo, 'request_order_cancel', return_value=1) as cancel, patch.object(qmt_repo, 'abort_order') as abort:
|
||||
self.loop.run_until_complete(self.runner._stop_outbox_order('P_D01', 'expired'))
|
||||
cancel.assert_called_once(); abort.assert_not_called()
|
||||
|
||||
def test_cancel_between_claim_and_send_prevents_transport(self):
|
||||
from app.services import execution_conflicts
|
||||
self.row.update(status='SENDING', cancel_state='NONE', side='buy', limit_price=23.3,
|
||||
valid_until=9999999999999)
|
||||
with patch.object(qmt_repo, 'next_queued', return_value=[self.row]), \
|
||||
patch.object(qmt_repo, 'claim_order', return_value=True), \
|
||||
patch.object(execution_conflicts, 'queued_buy_blocker', return_value=None), \
|
||||
patch.object(qmt_repo, 'mark_send_attempt', return_value=False), \
|
||||
patch.object(self.runner, '_send', new_callable=AsyncMock) as send:
|
||||
self.loop.run_until_complete(self.runner._drain_outbox('unused'))
|
||||
send.assert_not_called()
|
||||
|
||||
def test_send_error_after_attempt_keeps_uncertain_order_retryable(self):
|
||||
from app.services import execution_conflicts
|
||||
self.row.update(status='SENDING', cancel_state='NONE', side='buy', limit_price=23.3,
|
||||
valid_until=9999999999999)
|
||||
def attempted(_): self.row['sent_at'] = datetime.now(); return True
|
||||
with patch.object(qmt_repo, 'next_queued', return_value=[self.row]), \
|
||||
patch.object(qmt_repo, 'claim_order', return_value=True), \
|
||||
patch.object(execution_conflicts, 'queued_buy_blocker', return_value=None), \
|
||||
patch.object(qmt_repo, 'mark_send_attempt', side_effect=attempted), \
|
||||
patch.object(qmt_repo, 'requeue_order') as requeue, \
|
||||
patch.object(self.runner, '_send', new_callable=AsyncMock, side_effect=RuntimeError('uncertain send')):
|
||||
with self.assertRaises(RuntimeError):
|
||||
self.loop.run_until_complete(self.runner._drain_outbox('unused'))
|
||||
self.assertTrue(self.row['sent_at'])
|
||||
self.assertFalse(requeue.call_args.args[-1])
|
||||
|
||||
|
||||
class DeadlineTest(unittest.TestCase):
|
||||
def test_qmt_day_order_always_ends_at_close(self):
|
||||
with patch.object(executor.param_store, 'get_bool', return_value=True):
|
||||
for hour, minute in [(9, 31), (11, 25), (14, 58)]:
|
||||
self.assertEqual(executor.order_deadline(datetime(2026, 10, 30, hour, minute),
|
||||
{'qmt_price_monitor': True}, ttl_min=10), 900)
|
||||
|
||||
def test_old_mode_keeps_ten_minute_lifetime(self):
|
||||
now = datetime(2026, 10, 30, 10, 22)
|
||||
with patch.object(executor.param_store, 'get_bool', return_value=False):
|
||||
self.assertEqual(executor.order_deadline(now, {'qmt_price_monitor': True}, ttl_min=10), 632)
|
||||
with patch.object(executor.param_store, 'get_bool', return_value=True):
|
||||
self.assertEqual(executor.order_deadline(now, {}, ttl_min=10), 632)
|
||||
|
||||
def test_repeated_cancel_request_reports_pending(self):
|
||||
with patch.object(dispatcher, 'mode', return_value='ws'), \
|
||||
patch.object(qmt_repo, 'request_cancel', return_value=0), \
|
||||
patch.object(qmt_repo, 'orders_for_parent', return_value=[{'status': 'PARTIAL', 'cancel_state': 'SENT'}]):
|
||||
result = dispatcher.cancel(instruction_id='P')
|
||||
self.assertTrue(result['ok']); self.assertTrue(result['cancel_pending'])
|
||||
|
||||
def test_cancel_intent_survives_status_read_failure(self):
|
||||
with patch.object(dispatcher, 'mode', return_value='ws'), \
|
||||
patch.object(qmt_repo, 'request_cancel', return_value=0), \
|
||||
patch.object(qmt_repo, 'orders_for_parent', side_effect=RuntimeError('temporarily unavailable')):
|
||||
result = dispatcher.cancel(instruction_id='P')
|
||||
self.assertTrue(result['ok']); self.assertTrue(result['cancel_pending'])
|
||||
|
||||
|
||||
class SqlTest(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.tmp = tempfile.TemporaryDirectory(); self.addCleanup(self.tmp.cleanup)
|
||||
self.engine = create_engine('sqlite:///' + self.tmp.name + '/orders.sqlite'); self.addCleanup(self.engine.dispose)
|
||||
for obj, name, kwargs in [(session, 'get_engine', {'return_value': self.engine}), (session, '_check_cooldown', {})]:
|
||||
p = patch.object(obj, name, **kwargs); p.start(); self.addCleanup(p.stop)
|
||||
with self.engine.begin() as c:
|
||||
c.execute(text('CREATE TABLE pms_qmt_order(instruction_id TEXT PRIMARY KEY,status TEXT,sent_at TEXT,updated_at TEXT,send_attempts INTEGER,cancel_state TEXT,reject_code TEXT,reject_reason TEXT,final_at TEXT)'))
|
||||
c.execute(text("INSERT INTO pms_qmt_order(instruction_id,status,send_attempts,cancel_state) VALUES('I','SENDING',0,'NONE')"))
|
||||
def row(self): return session.fetch_one("SELECT * FROM pms_qmt_order WHERE instruction_id='I'")
|
||||
|
||||
def test_send_marker_persists_before_transport(self):
|
||||
self.assertTrue(qmt_repo.mark_send_attempt('I')); self.assertTrue(self.row()['sent_at'])
|
||||
self.assertEqual(qmt_repo.abort_order('I', 'cancel'), 0)
|
||||
self.assertEqual(self.row()['status'], 'SENDING')
|
||||
|
||||
def test_cancel_wins_before_transport(self):
|
||||
qmt_repo.update_order('I', cancel_state='REQUESTED')
|
||||
self.assertFalse(qmt_repo.mark_send_attempt('I'))
|
||||
self.assertEqual(qmt_repo.abort_order('I', 'cancel'), 1)
|
||||
self.assertEqual(self.row()['status'], 'ABORTED')
|
||||
|
||||
def test_fast_ack_or_fill_never_regresses_to_sent(self):
|
||||
for status in ('ACCEPTED', 'PARTIAL', 'FILLED', 'CANCELLED'):
|
||||
qmt_repo.update_order('I', status=status)
|
||||
qmt_repo.mark_sent('I'); self.assertEqual(self.row()['status'], status)
|
||||
qmt_repo.requeue_order('I', 'error'); self.assertEqual(self.row()['status'], status)
|
||||
|
||||
def test_restart_retains_send_uncertainty(self):
|
||||
qmt_repo.mark_send_attempt('I'); qmt_repo.reset_stuck_sending()
|
||||
self.assertEqual(self.row()['status'], 'QUEUED'); self.assertTrue(self.row()['sent_at'])
|
||||
self.assertEqual(qmt_repo.abort_order('I', 'expired'), 0)
|
||||
|
||||
|
||||
class ZBookTest(unittest.TestCase):
|
||||
def test_late_trade_after_parent_cancel_books_once_in_own_strategy(self):
|
||||
from test_wiring import install_fakes
|
||||
from app.services import rotation_execution as re, rotation_accounting as ra
|
||||
from app.repo import rotation_repo
|
||||
fake = install_fakes(prices={'688100.SH': 23.3})
|
||||
fake.insert_instruction(instruction_id='P', origin_type='proposal', origin_id='X',
|
||||
ts_code='688100.SH', action='OPEN', side='buy', qty=400, status='CANCELLED')
|
||||
fake.instructions['P']['book_id'] = 'original'
|
||||
fake.qmt.put_trade(seq=1, instruction_id='P_D01', ts_code='688100.SH', side='buy', qty=100, price=23.3)
|
||||
act = {'instruction_id': 'P', 'kind': 'BUY', 'ts_code': '688100.SH', 'qty': 100, 'price': 23.3, 'lot_type': 'BASE', 'order_id': 'T1'}
|
||||
with patch.object(re.db, 'transaction', side_effect=nullcontext), \
|
||||
patch.object(rotation_repo, 'account_guard', side_effect=nullcontext), \
|
||||
patch.object(re.db, 'fetch_one', side_effect=lambda *a, **kw: {'processed': fake.qmt.inbox[1]['processed']}), \
|
||||
patch.object(pms_repo, 'get_instruction', side_effect=lambda iid: copy.deepcopy(fake.instructions.get(iid))), \
|
||||
patch.object(ra, 'record_fill') as cash:
|
||||
self.assertTrue(re.book_trade(act, [], 1))
|
||||
self.assertFalse(re.book_trade(act, [], 1))
|
||||
self.assertEqual(fake.positions['688100.SH']['total_qty'], 100)
|
||||
self.assertEqual(fake.instructions['P']['exec_qty'], 100)
|
||||
self.assertEqual(fake.instructions['P']['status'], 'CANCELLED')
|
||||
cash.assert_called_once_with('original', 'buy', 2330., 0, '1')
|
||||
|
||||
|
||||
if __name__ == '__main__': unittest.main()
|
||||
|
|
@ -0,0 +1,116 @@
|
|||
"""QMT策略类型扩展:保留原报文、签名覆盖及真实发送出口的策略归属。"""
|
||||
import unit_test_guard
|
||||
import asyncio
|
||||
import copy
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
from contextlib import ExitStack
|
||||
from unittest.mock import AsyncMock, patch
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
from config.settings import settings
|
||||
from app.core import ws_codec as wsc, strategy_book as books
|
||||
from app.repo import pms_repo, qmt_repo
|
||||
from app.services import dispatcher, execution_conflicts
|
||||
from app.ws.runner import WsRunner
|
||||
|
||||
BASE = dict(instruction_id='P_D01', ts_code='600000.SH', side='buy', qty=200,
|
||||
limit_price=12.35, valid_until=9999999999999, intent='OPEN', note='原始备注不变')
|
||||
|
||||
|
||||
class StrategyPayloadTest(unittest.TestCase):
|
||||
def test_only_adds_strategy_type(self):
|
||||
self.assertEqual(wsc.place_order_payload(**BASE), BASE)
|
||||
for kind in ('subjective_quant', 'micro_rotation'):
|
||||
self.assertEqual(wsc.place_order_payload(**BASE, strategy_type=kind),
|
||||
dict(BASE, strategy_type=kind))
|
||||
|
||||
def test_unknown_type_does_not_silently_mislabel(self):
|
||||
for kind in ('original', 'micro30', '', 'unknown'):
|
||||
with self.assertRaises(wsc.CodecError):
|
||||
wsc.place_order_payload(**BASE, strategy_type=kind)
|
||||
|
||||
def test_strategy_type_is_signed(self):
|
||||
seed = '01'*32 # 独立测试向量,不读取业务签名环境。
|
||||
body = wsc.place_order_payload(**BASE, strategy_type='micro_rotation')
|
||||
env = wsc.build('place_order', body, seed_hex=seed, msg_id='m-test')
|
||||
self.assertEqual(wsc.parse(wsc.dumps(env), peer_pubkey_b64=wsc.public_key_b64(seed))['payload'], body)
|
||||
env['payload']['strategy_type'] = 'subjective_quant'
|
||||
with self.assertRaises(wsc.CodecError) as ctx:
|
||||
wsc.parse(wsc.dumps(env), peer_pubkey_b64=wsc.public_key_b64(seed))
|
||||
self.assertEqual(ctx.exception.code, 'SIG_INVALID')
|
||||
|
||||
def test_legacy_instance_stays_original_without_parent_read(self):
|
||||
with patch.object(settings, 'INFRA_STRATEGY_BOOK_SCHEMA', False), \
|
||||
patch.object(pms_repo, 'get_instruction') as read:
|
||||
self.assertEqual(dispatcher.order_strategy_type('P'), 'subjective_quant')
|
||||
read.assert_not_called()
|
||||
|
||||
def test_cancel_payload_is_unchanged(self):
|
||||
self.assertEqual(wsc.cancel_order_payload(cancel_id='C', instruction_id='P_D01'),
|
||||
{'cancel_id': 'C', 'instruction_id': 'P_D01'})
|
||||
|
||||
|
||||
class StrategyOutboxTest(unittest.TestCase):
|
||||
def drain(self, parent, *, side='buy', lookup_error=None):
|
||||
loop = asyncio.new_event_loop()
|
||||
asyncio.set_event_loop(loop)
|
||||
runner = WsRunner()
|
||||
row = dict(BASE, side=side, parent_id='P', status='SENDING', cancel_state='NONE')
|
||||
scopes = []
|
||||
def read(_):
|
||||
scopes.append(books.CURRENT.get())
|
||||
if lookup_error:
|
||||
raise lookup_error
|
||||
return copy.deepcopy(parent)
|
||||
try:
|
||||
with ExitStack() as stack:
|
||||
for obj, name, kw in [
|
||||
(settings, 'INFRA_STRATEGY_BOOK_SCHEMA', {'new': True}),
|
||||
(qmt_repo, 'next_queued', {'return_value': [row]}),
|
||||
(qmt_repo, 'get_order', {'return_value': row}),
|
||||
(qmt_repo, 'claim_order', {'return_value': True}),
|
||||
(qmt_repo, 'mark_send_attempt', {'return_value': True}),
|
||||
(qmt_repo, 'mark_sent', {}),
|
||||
(pms_repo, 'get_instruction', {'side_effect': read}),
|
||||
(execution_conflicts, 'queued_buy_blocker', {'return_value': None}),
|
||||
]:
|
||||
stack.enter_context(patch.object(obj, name, **kw))
|
||||
send = stack.enter_context(patch.object(runner, '_send', new_callable=AsyncMock))
|
||||
retry = stack.enter_context(patch.object(qmt_repo, 'requeue_order'))
|
||||
loop.run_until_complete(runner._drain_outbox('unused'))
|
||||
return send, retry, scopes
|
||||
finally:
|
||||
loop.close()
|
||||
asyncio.set_event_loop(None)
|
||||
|
||||
def test_both_books_and_sides_use_parent_not_current_scope_or_profile(self):
|
||||
for book, expected in [('original', 'subjective_quant'), ('micro30', 'micro_rotation')]:
|
||||
for side in ('buy', 'sell'):
|
||||
# 原策略减持筹资也可能采用rotation执行方式,仍归主观量化。
|
||||
parent = {'book_id': book, 'progress': {'execution_profile': 'rotation'}}
|
||||
with books.scope('micro30' if book == 'original' else 'original'):
|
||||
send, retry, scopes = self.drain(parent, side=side)
|
||||
send.assert_awaited_once()
|
||||
self.assertEqual(send.call_args.args[:2],
|
||||
('place_order', dict(BASE, side=side, strategy_type=expected)))
|
||||
self.assertEqual(send.call_args.kwargs, {'corr_id': BASE['instruction_id']})
|
||||
self.assertEqual(scopes, ['all'])
|
||||
retry.assert_not_called()
|
||||
|
||||
def test_missing_or_unknown_parent_keeps_queue_without_send(self):
|
||||
for parent in (None, {}, {'book_id': 'other'}):
|
||||
send, retry, _ = self.drain(parent, side='sell')
|
||||
send.assert_not_called()
|
||||
retry.assert_called_once()
|
||||
self.assertFalse(retry.call_args.args[-1])
|
||||
|
||||
def test_parent_lookup_failure_keeps_queue_without_send(self):
|
||||
send, retry, _ = self.drain(None, lookup_error=RuntimeError('temporary read failure'))
|
||||
send.assert_not_called()
|
||||
retry.assert_called_once()
|
||||
self.assertFalse(retry.call_args.args[-1])
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
|
@ -0,0 +1,190 @@
|
|||
"""模拟仓重置:空仓证据、双账本SQL事务、保护配置及失败回滚。"""
|
||||
import unit_test_guard
|
||||
import copy
|
||||
import datetime as dt
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
|
||||
from sqlalchemy import create_engine, text, event
|
||||
import reset_sim_baseline_20261102 as reset
|
||||
from app.core import strategy_book as books, rotation_account
|
||||
from app.db import session as db
|
||||
from app.repo import rotation_repo as store, pms_repo
|
||||
from app.services import publish_export
|
||||
from config.settings import settings
|
||||
|
||||
NOW=dt.datetime(2026,11,2,10,0)
|
||||
|
||||
def healthy():
|
||||
return {'channel':{'online':True,'last_seq':100,'acked_seq':100,'stat':{'seq_hwm':100}},
|
||||
'positions':{'seq':98,'age_sec':2,'received_at':'2026-11-02 09:59:58','payload':{'kind':'positions','items':[]}},
|
||||
'funds':{'seq':99,'age_sec':2,'received_at':'2026-11-02 09:59:58','payload':{'kind':'funds','data':{'available_cash':1967927.74,'total_asset':1967927.74,'frozen_cash':0.,'market_value':0.}}}}
|
||||
|
||||
|
||||
class EmptyEvidenceTests(unittest.TestCase):
|
||||
def test_complete_empty_account_is_accepted(self):
|
||||
x=healthy()
|
||||
self.assertEqual(reset.validate_empty(**x,pause_at='2026-11-02 09:00:00')['available_cash'],1967927.74)
|
||||
|
||||
def test_missing_stale_nonempty_or_inconsistent_account_is_blocked(self):
|
||||
for mutate in (
|
||||
lambda x:x.update(positions=None),
|
||||
lambda x:x['positions'].update(age_sec=61),
|
||||
lambda x:x['positions'].update(received_at='2026-11-02 08:50:00'),
|
||||
lambda x:x['positions']['payload'].pop('items'),
|
||||
lambda x:x['positions']['payload'].update(items=[{'ts_code':'600000.SH','total_qty':100}]),
|
||||
lambda x:x['funds']['payload']['data'].update(frozen_cash=1),
|
||||
lambda x:x['funds']['payload']['data'].update(total_asset=2000001),
|
||||
lambda x:x['funds']['payload']['data'].update(available_cash=float('nan')),
|
||||
lambda x:x['funds']['payload']['data'].update(available_cash=2000000.,total_asset=2000000.),
|
||||
lambda x:x['channel'].update(acked_seq=99),
|
||||
lambda x:x['channel'].update(resync_required=True),
|
||||
lambda x:x['channel'].update(orphan_held=1),
|
||||
lambda x:x['channel']['stat'].update(rejects=1),
|
||||
):
|
||||
x=healthy();mutate(x)
|
||||
with self.subTest(x=x),self.assertRaises(ValueError):
|
||||
reset.validate_empty(**x,pause_at='2026-11-02 09:00:00')
|
||||
|
||||
|
||||
class ResetTransactionTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.tmp=tempfile.TemporaryDirectory();self.addCleanup(self.tmp.cleanup)
|
||||
self.engine=create_engine('sqlite:///'+self.tmp.name+'/reset.sqlite');self.addCleanup(self.engine.dispose)
|
||||
self.use(settings,'INFRA_STRATEGY_BOOK_SCHEMA',True)
|
||||
self.use(db,'get_engine',lambda *a:self.engine);self.use(db,'_check_cooldown',lambda *a:None)
|
||||
@event.listens_for(self.engine,'before_cursor_execute',retval=True)
|
||||
def sqlite(conn,cursor,sql,params,ctx,many):
|
||||
sql=sql.replace(' FOR UPDATE','')
|
||||
if 'ON DUPLICATE KEY UPDATE' in sql:
|
||||
a,b=sql.split('ON DUPLICATE KEY UPDATE',1)
|
||||
if 'pms_rotation_document' in a:
|
||||
sql=a+'ON CONFLICT(doc_id) DO NOTHING'
|
||||
elif 'pms_runtime_param' in a:
|
||||
sql=a+'ON CONFLICT(param_key) DO UPDATE SET '+b
|
||||
else:
|
||||
raise AssertionError('未覆盖的MySQL语句')
|
||||
return sql,params
|
||||
with self.engine.begin() as c:
|
||||
for table in reset.TABLES:
|
||||
if table in books.TABLES:
|
||||
c.execute(text('CREATE TABLE '+table+'(id INTEGER PRIMARY KEY,book_id TEXT,created_at TEXT,issued_at TEXT,cmd_class TEXT)'))
|
||||
for i,b in enumerate(('original','micro30'),1):
|
||||
c.execute(text('INSERT INTO '+table+' VALUES(:id,:book,:at,:at,:cls)'),{'id':i,'book':b,'at':'2026-10-30 10:00:00','cls':'task'})
|
||||
else:
|
||||
c.execute(text('CREATE TABLE '+table+'(ymd INTEGER PRIMARY KEY,nav REAL)'))
|
||||
c.execute(text('INSERT INTO '+table+' VALUES(20261030,1.1)'))
|
||||
c.execute(text("INSERT INTO pms_command VALUES(3,'original','2026-10-30','2026-10-30','param')"))
|
||||
c.execute(text('CREATE TABLE pms_runtime_param(param_key TEXT PRIMARY KEY,param_value TEXT,updated_by TEXT,updated_at TEXT)'))
|
||||
c.execute(text("INSERT INTO pms_runtime_param VALUES('PMS_TOTAL_SCALE','2000000','user','2026-10-30')"))
|
||||
c.execute(text('CREATE TABLE pms_rotation_document(doc_id TEXT PRIMARY KEY,kind TEXT,payload_json TEXT,revision INTEGER,updated_at TEXT)'))
|
||||
oldcapital=rotation_account.seed(100.,{'original':0,'micro30':0});oldcapital['fills']={'old-seq':{'book':'original','amount':100,'side':'buy','fee':5}}
|
||||
docs={'capital:live':('capital',oldcapital),'state:live':('state',{'rotation':{'cycle':4,'consumed_entry':'old-signal'}}),
|
||||
'account-execution':('funds_reservation',{'orders':{}}),'live_day:2026-10-30':('live_day',{'profit':100}),
|
||||
'snapshot:today':('snapshot',{'data':'preserve'})}
|
||||
for key,(kind,body) in docs.items():
|
||||
c.execute(text('INSERT INTO pms_rotation_document VALUES(:key,:kind,:body,1,:now)'),{'key':key,'kind':kind,'body':json.dumps(body),'now':str(NOW)})
|
||||
c.execute(text('CREATE TABLE pms_qmt_order(id INTEGER PRIMARY KEY,status TEXT,created_at TEXT)'))
|
||||
c.execute(text("INSERT INTO pms_qmt_order VALUES(1,'FILLED','2026-10-30 10:00:00')"))
|
||||
c.execute(text('CREATE TABLE pms_qmt_inbox(seq INTEGER PRIMARY KEY,msg_type TEXT,processed INTEGER,payload_json TEXT)'))
|
||||
c.execute(text("INSERT INTO pms_qmt_inbox VALUES(8,'trade',1,'old')"))
|
||||
self.log=self.use(pms_repo,'insert_op_log',lambda **kw:1)
|
||||
self.use(publish_export,'record_nav_snapshot',self.nav)
|
||||
self.backup=reset.ledger_state()
|
||||
self.funds=healthy();self.funds['parsed_funds']=reset.validate_empty(**self.funds,pause_at='2026-11-02 09:00:00')
|
||||
self.cursor={'v':2,'t':str(NOW),'seen':{'old-order':'2026-11-02 09:00:00'}}
|
||||
|
||||
def use(self,obj,name,value):
|
||||
p=patch.object(obj,name,value);p.start();self.addCleanup(p.stop);return value
|
||||
|
||||
def nav(self):
|
||||
self.assertEqual(reset.read_table('pms_position'),[])
|
||||
self.assertEqual(reset.read_table('pms_cash_flow'),[])
|
||||
db.execute('INSERT INTO pms_nav_daily VALUES(20261102,1.0)')
|
||||
return {'nav':1.,'pos_ratio':0.}
|
||||
|
||||
def run_reset(self):
|
||||
with store.account_guard(),db.transaction():
|
||||
return reset.reset_in_transaction(self.backup,'digest',self.funds,self.cursor,NOW)
|
||||
|
||||
def test_both_books_reset_preserving_user_config_channel_and_dedupe(self):
|
||||
self.run_reset()
|
||||
for table in reset.CLEAR:
|
||||
if table not in ('pms_command','pms_nav_daily'):
|
||||
self.assertEqual(reset.read_table(table),[],table)
|
||||
self.assertEqual([r['cmd_class'] for r in reset.read_table('pms_command')],['param'])
|
||||
self.assertEqual(float(pms_repo.get_param('PMS_TOTAL_SCALE')),1967927.74)
|
||||
self.assertEqual(float(pms_repo.get_param('PMS_PUBLISH_NAV_SCALE')),0.)
|
||||
current=reset.ledger_state()
|
||||
for key in ('qmt_orders','trade_inbox'):
|
||||
self.assertEqual(current[key],self.backup[key])
|
||||
capital,_=store.get('capital:live')
|
||||
self.assertEqual(capital['cash'],{'original':1967927.74,'micro30':0.})
|
||||
self.assertIn('old-seq',capital['fills'])
|
||||
metrics=rotation_account.metrics(capital,{'original':0.,'micro30':0.})
|
||||
self.assertEqual(metrics['original']['nav'],1.)
|
||||
self.assertEqual(metrics['account']['profit'],0.)
|
||||
self.assertEqual(metrics['account']['fees'],0.)
|
||||
self.assertIsNone(metrics['micro30']['nav'])
|
||||
self.assertEqual(store.get('state:live')[0]['rotation']['consumed_entry'],'old-signal')
|
||||
self.assertEqual(store.get('state:live')[0]['rotation']['cycle'],4)
|
||||
self.assertEqual(store.get('snapshot:today')[0],{'data':'preserve'})
|
||||
self.assertEqual(store.recent('live_day'),[])
|
||||
self.assertIsNotNone(store.get('archive:'+reset.RESET_ID+':live_day:2026-10-30')[0])
|
||||
|
||||
def test_backup_drift_aborts_before_deletion(self):
|
||||
with books.scope('micro30'):
|
||||
db.execute("UPDATE pms_position SET created_at='changed'")
|
||||
before=reset.ledger_state()
|
||||
with self.assertRaisesRegex(RuntimeError,'备份后数据变化'):
|
||||
self.run_reset()
|
||||
self.assertEqual(reset.ledger_state(),before)
|
||||
|
||||
def test_late_nav_failure_rolls_back_every_table_and_document(self):
|
||||
before=reset.ledger_state()
|
||||
self.use(publish_export,'record_nav_snapshot',lambda:{'nav':1.1,'pos_ratio':0.})
|
||||
with self.assertRaisesRegex(RuntimeError,'净值基线'):
|
||||
self.run_reset()
|
||||
self.assertEqual(reset.ledger_state(),before)
|
||||
|
||||
def test_trade_change_detected_and_rolls_back(self):
|
||||
before=reset.ledger_state()
|
||||
def changed():
|
||||
result=self.nav();db.execute("UPDATE pms_qmt_inbox SET payload_json='changed' WHERE seq=8");return result
|
||||
self.use(publish_export,'record_nav_snapshot',changed)
|
||||
with self.assertRaisesRegex(RuntimeError,'新增成交'):
|
||||
self.run_reset()
|
||||
self.assertEqual(reset.ledger_state(),before)
|
||||
|
||||
def test_today_order_id_cannot_be_reused_after_reset(self):
|
||||
db.execute('UPDATE pms_qmt_order SET created_at=:now',{'now':str(NOW)})
|
||||
self.backup=reset.ledger_state()
|
||||
with self.assertRaisesRegex(RuntimeError,'编号不复用'):
|
||||
self.run_reset()
|
||||
self.assertEqual(reset.ledger_state(),self.backup)
|
||||
|
||||
def test_apply_is_idempotent_and_does_not_touch_new_activity(self):
|
||||
path=Path(self.tmp.name)/'backup.json';value={'reset_id':reset.RESET_ID};reset.save_new(path,value)
|
||||
sha=reset.digest(value)
|
||||
store.put_once('maintenance:'+reset.RESET_ID,'maintenance',{'backup_sha256':sha})
|
||||
before=reset.ledger_state()
|
||||
with patch.object(reset,'require_safe',side_effect=AssertionError('不能再次操作')):
|
||||
result=reset.apply(path,sha)
|
||||
self.assertTrue(result['already_applied'])
|
||||
self.assertEqual(reset.ledger_state(),before)
|
||||
with self.assertRaisesRegex(RuntimeError,'摘要不符'):
|
||||
reset.apply(path,'bad')
|
||||
|
||||
def test_existing_transfers_require_explicit_numbering_migration(self):
|
||||
old={'capital:live':{'transfers':{'allocation:1':{}},'fills':{}}}
|
||||
with self.assertRaisesRegex(ValueError,'划拨编号'):
|
||||
reset.baseline_documents(old,self.funds,NOW)
|
||||
|
||||
|
||||
if __name__=='__main__':
|
||||
unittest.main()
|
||||
|
|
@ -283,6 +283,14 @@ class FakeRepo:
|
|||
i["updated_at"] = datetime.now()
|
||||
return 1
|
||||
|
||||
def compare_review_instruction(self, old, progress, status):
|
||||
import copy
|
||||
row = self.instructions.get(old['instruction_id'])
|
||||
if not row or any(row.get(k) != old.get(k) for k in ('status', 'exec_qty', 'progress')):
|
||||
return 0
|
||||
row.update(status=status, progress=copy.deepcopy(progress), limit_price=None)
|
||||
return 1
|
||||
|
||||
def add_instruction_exec(self, iid, qty):
|
||||
i = self.instructions.get(iid)
|
||||
if i:
|
||||
|
|
|
|||
Loading…
Reference in New Issue