From 02837fae941b135808695bdb520d0d9978c59a69 Mon Sep 17 00:00:00 2001 From: baobao Date: Wed, 28 Oct 2026 11:15:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E4=BB=B7=E5=A7=94=E6=89=98=E4=BA=A4?= =?UTF-8?q?=E7=94=B1QMT=E7=AD=89=E5=BE=85=E5=B9=B6=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E5=BE=AE=E7=9B=98=E8=B6=8B=E5=8A=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BIONIC_PMS_INTERFACE.md | 2 + QMT_WS_PROTOCOL.md | 2 + app/core/rule_gate.py | 54 ++++++------- app/services/exec_advisor.py | 83 ++++++++++++++++++-- app/services/executor.py | 13 +++- app/services/param_store.py | 1 + app/web/static/index.html | 19 ++--- config/settings.py | 1 + scripts/run_tests.py | 2 + scripts/test_batch50_units.py | 143 ++++++++++++++++++++++++++++++++++ 10 files changed, 274 insertions(+), 46 deletions(-) create mode 100644 scripts/test_batch50_units.py diff --git a/BIONIC_PMS_INTERFACE.md b/BIONIC_PMS_INTERFACE.md index 286ab59..364cc34 100644 --- a/BIONIC_PMS_INTERFACE.md +++ b/BIONIC_PMS_INTERFACE.md @@ -182,6 +182,8 @@ PMS 侧对建议价有一道保护:偏离现价超过 `PMS_EXEC_LIMIT_BAND`( ### 3.4 下一个迭代(本轮明确不做) +2026-10-28的155模拟接入修订:启用`PMS_EXEC_QMT_PRICE_MONITOR`时,PMS仍使用本接口给出的执行区间,但不采用“现价尚未进入区间”的等待判断。PMS把买入上沿或卖出下沿作为限价直接交QMT。`observed.today_exit`、昨夜回避结论与参考位漂移仍有效,不能把它们误当价格等待。取数失败或区间缺失时等待补齐,不退回现价追单。旧缓存缺少离场字段时先重新咨询;旧模式行为保持。 + 凌晨管线加一步大模型推理,对每只票明示写出买入区间与卖出区间,盘中改为直接读它——届时 只换本模块第一步的取数来源和 `advisor` 版本标记,应答结构与 PMS 侧都不动。动凌晨管线 属于重大迭代,做之前会先出细方案确认(覆盖范围、存放位置、算不出来怎么办)。 diff --git a/QMT_WS_PROTOCOL.md b/QMT_WS_PROTOCOL.md index 0db5870..a1586ec 100644 --- a/QMT_WS_PROTOCOL.md +++ b/QMT_WS_PROTOCOL.md @@ -191,6 +191,8 @@ def sign(seed_hex, canon): `valid_until` 是这套设计里替代「10 秒轮询撤单」的关键:PMS 不必盯着撤,到点 QMT 自己收。 +2026-10-28补充:155模拟实例可启用`PMS_EXEC_QMT_PRICE_MONITOR`。已生成的计划由PMS给出限价、数量和有效期,即可提交QMT等待成交,不再等待现价进入区间。买单限价为执行区间上沿,卖单为下沿;买入可在更低价格成交,卖出可在更高价格成交。这不是上下界条件单,协议字段没有增加。用户暂停、资金占用、配额、可卖量和回报入账仍由PMS负责。原执行模式默认保留,不改变其他实例。 + ### 4.3 `cancel_order` —— 撤单 ```json diff --git a/app/core/rule_gate.py b/app/core/rule_gate.py index 515eeeb..527c40a 100644 --- a/app/core/rule_gate.py +++ b/app/core/rule_gate.py @@ -192,33 +192,35 @@ def _check_buy(failed, warns, qty, price, ctx, pos, day, prm, flg, is_cmd, hard, else: failed.append("BRAKE_ACTIVE: 组合刹车中, 自主增持暂停") - if day.get("limit_up"): - failed.append("LIMIT_UP: 涨停封板, 不追买") - elif day.get("limit_down"): - # 一字跌停不接 (2026-10-08): 方向修对之前它被误判成涨停而拦在上一行, 现在单独拦。 - # 用 elif: 方向不明时两个标记都亮, 只记上一行那一条, 与修之前逐字相同。 - failed.append("LIMIT_DOWN: 跌停封板, 不接") + hard["qmt_price_monitor"] = bool(flg.get("qmt_price_monitor")) + if not flg.get("qmt_price_monitor"): + if day.get("limit_up"): + failed.append("LIMIT_UP: 涨停封板, 不追买") + elif day.get("limit_down"): + # 一字跌停不接 (2026-10-08): 方向修对之前它被误判成涨停而拦在上一行, 现在单独拦。 + # 用 elif: 方向不明时两个标记都亮, 只记上一行那一条, 与修之前逐字相同。 + failed.append("LIMIT_DOWN: 跌停封板, 不接") - # 不追高: 当日涨幅 与 距 MA5 两道 - dayup = day.get("day_chg_from_open") - cap_dayup = _num(prm.get("buy_halt_dayup"), 0.05) - if dayup is None: - # 缺输入**必须留痕**, 与下面 MA5_MISSING 同口径。原来只有 `is not None` 一个条件, - # 缺了就整道闸无声跳过 —— 而自主提议那条路一直硬编码 None, 于是动作引擎产出的每一笔 - # 买单都没过过这道闸, 返回值还是 `passed=True, failed=[], warnings=[]`, 与 - # 「涨幅 2%、检查通过」一字不差, 账本里也查不出来。 - warns.append("DAYUP_MISSING: 取不到当日涨幅, 不追高(涨幅)一项未校验") - elif _num(dayup) > cap_dayup: - failed.append(f"NO_CHASE_DAYUP: 当日涨幅 {_num(dayup):.2%} > 上限 {cap_dayup:.0%}") - ma5 = _num(day.get("ma5")) - cap_ma5 = _num(prm.get("no_chase_ma5"), 0.06) - if ma5 > 0: - gap = price / ma5 - 1 - hard["ma5_gap"] = round(gap, 4) - if gap > cap_ma5: - failed.append(f"NO_CHASE_MA5: 距 MA5 {gap:.2%} > 上限 {cap_ma5:.0%}") - else: - warns.append("MA5_MISSING: 取不到 MA5, 距均线一项未校验") + # 不追高: 当日涨幅 与 距 MA5 两道 + dayup = day.get("day_chg_from_open") + cap_dayup = _num(prm.get("buy_halt_dayup"), 0.05) + if dayup is None: + # 缺输入**必须留痕**, 与下面 MA5_MISSING 同口径。原来只有 `is not None` 一个条件, + # 缺了就整道闸无声跳过 —— 而自主提议那条路一直硬编码 None, 于是动作引擎产出的每一笔 + # 买单都没过过这道闸, 返回值还是 `passed=True, failed=[], warnings=[]`, 与 + # 「涨幅 2%、检查通过」一字不差, 账本里也查不出来。 + warns.append("DAYUP_MISSING: 取不到当日涨幅, 不追高(涨幅)一项未校验") + elif _num(dayup) > cap_dayup: + failed.append(f"NO_CHASE_DAYUP: 当日涨幅 {_num(dayup):.2%} > 上限 {cap_dayup:.0%}") + ma5 = _num(day.get("ma5")) + cap_ma5 = _num(prm.get("no_chase_ma5"), 0.06) + if ma5 > 0: + gap = price / ma5 - 1 + hard["ma5_gap"] = round(gap, 4) + if gap > cap_ma5: + failed.append(f"NO_CHASE_MA5: 距 MA5 {gap:.2%} > 上限 {cap_ma5:.0%}") + else: + warns.append("MA5_MISSING: 取不到 MA5, 距均线一项未校验") caps = ctx.get("caps") if caps: diff --git a/app/services/exec_advisor.py b/app/services/exec_advisor.py index 8c2bc00..ce9f7e4 100644 --- a/app/services/exec_advisor.py +++ b/app/services/exec_advisor.py @@ -23,6 +23,7 @@ from __future__ import annotations import logging +import math from app.core import exec_timing as et from app.core import tradedays as td @@ -52,6 +53,9 @@ def available() -> bool: def status() -> dict: """页面/排查用的一句话状态。""" + if param_store.get_bool("PMS_EXEC_QMT_PRICE_MONITOR", False): + return {"impl": impl(), "available": available(), "price_monitor": "qmt", + "note": "PMS确定限价和数量,QMT等待成交;执行区间缺失时等待补齐"} if impl() != IMPL_A: return {"impl": IMPL_B, "available": False, "note": "内置保守择时 (PMS_EXEC_IMPL=B)。切实现A: 页面改 PMS_EXEC_IMPL=A"} @@ -107,7 +111,7 @@ def _strategy_immediate(*, side, now, day, quota, fired_today, def decide(*, side: str, action: str, ts_code: str, now, day: dict, params: dict, is_last_day: bool, is_command: bool = True, urgent: bool = False, fired_today: int = 0, quota: int = 0, - pos: dict = None, tdays_left=None, prog: dict = None) -> dict: + pos: dict = None, tdays_left=None, prog: dict = None, instruction_limit=None) -> dict: """择时判定统一入口 (executor.run_tick 的唯一调用点)。 返回结构与 exec_timing.decide 相同, 另带 source 字段标明这条决定是谁做的: @@ -118,6 +122,12 @@ def decide(*, side: str, action: str, ts_code: str, now, day: dict, params: dict prog 由调用方传入指令的 progress dict, 咨询结果/失败冷却会写进 prog["exec_advice"], 随调用方既有的落表动作持久化; 传 None 则本轮结论不缓存 (dry_run 语义)。 """ + if param_store.get_bool("PMS_EXEC_QMT_PRICE_MONITOR", False): + return _qmt_limit(side=side, action=action, ts_code=ts_code, now=now, day=day, + params=params, is_last_day=is_last_day, urgent=urgent, + fired_today=fired_today, quota=quota, pos=pos or {}, + tdays_left=tdays_left, prog=prog, instruction_limit=instruction_limit) + # 网格/跟踪止盈: 策略层已按档位触发, 这里不做择时博弈, 到价即时成交、收盘不强制。 # 只识别策略来源且类型为 GRID/TRAIL 的指令; 做T(T0)与其余来源一律走原有逻辑, 不受影响。 if (prog or {}).get("origin") == "strategy" and str((prog or {}).get("stype")) in ("GRID", "TRAIL"): @@ -164,6 +174,63 @@ def decide(*, side: str, action: str, ts_code: str, now, day: dict, params: dict return d +def _qmt_limit(*, side, action, ts_code, now, day, params, is_last_day, urgent, + fired_today, quota, pos, tdays_left, prog, instruction_limit): + """计划已确定后只定限价,不等现价进入区间;数据故障不能转成追价买入。""" + left = max(0, int(quota) - int(fired_today)) + + def result(action, reason, limit=None, **extra): + return {"action": action, "qty_hint": left, "limit_price": limit, + "reason": reason, "forced": False, "source": "QMT限价", + "qmt_price_monitor": True, **extra} + + price = _f(day.get("price")) + if side not in ("buy", "sell"): + return result(et.ACT_SKIP, "委托方向无效") + if not price or day.get("halted"): + 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)): + return result(et.ACT_WAIT, "非交易时段") + + strategy = (prog or {}).get("origin") == "strategy" and (prog or {}).get("stype") in ("GRID", "TRAIL") + if (urgent and side == "sell") or strategy: + # 已触发的网格、跟踪止盈和紧急退出沿用自己的定价,不再附加价格到位检查。 + limit = _f(instruction_limit) + if not limit: + ratio = (params.get("urgent_sell_discount", 0.995) if urgent and side == "sell" + else 1.002 if side == "buy" else 0.998) + limit = round(price * float(ratio), 2) + return result(et.ACT_FIRE, "按策略限价提交QMT等待成交", round(limit, 2)) + + if not available(): + return result(et.ACT_WAIT, "未配置有效执行区间来源,暂不提交限价") + advice, note = _advice(ts_code=ts_code, side=side, action=action, now=now, day=day, + pos=pos, left=left, is_last_day=is_last_day, + tdays_left=tdays_left, prog=prog) + if advice is None: + return result(et.ACT_WAIT, "执行价格暂不可用:" + note) + if advice.get("ref_drift"): + return result(et.ACT_WAIT, advice["ref_drift"], ref_drift=advice["ref_drift"]) + if side == "buy" and (advice.get("today_exit") or + str(advice.get("y_signal") or "").upper() in ("SELL", "AVOID", "DROPPED")): + return result(et.ACT_WAIT, "已有离场或回避结论,暂停买入", y_signal=advice.get("y_signal")) + band = advice.get("buy_band" if side == "buy" else "sell_band") + if not isinstance(band, (list, tuple)) or len(band) != 2: + return result(et.ACT_WAIT, "执行区间缺失,暂不提交限价") + lo, hi = (_f(x) for x in band) + if not lo or not hi or lo > hi: + return result(et.ACT_WAIT, "执行区间无效,暂不提交限价") + limit = round(hi if side == "buy" else lo, 2) + if limit <= 0: + return result(et.ACT_WAIT, "执行限价无效,暂不提交") + # WAIT只表示当前价格未进区间。限价买单允许更低成交,卖单允许更高成交。 + # 不因距离现价较远而改价,也不在尾盘把锁定买价改成追价。 + return result(et.ACT_FIRE, f"限价{limit:.2f}提交QMT等待成交", limit, + y_signal=advice.get("y_signal")) + + def _advice(*, ts_code, side, action, now, day, pos, left, is_last_day, tdays_left, prog): """取一份有效研判: 缓存命中 → 直接用; 冷却中 → (None, 原因); 否则咨询一次。 返回 (advice|None, 不可用原因)。advice 带 _source 标明 A / A缓存。""" @@ -174,6 +241,8 @@ def _advice(*, ts_code, side, action, now, day, pos, left, is_last_day, tdays_le if int(cached.get("ymd") or 0) == today: if (cached.get("verdict") in (FIRE, WAIT) + and (not param_store.get_bool("PMS_EXEC_QMT_PRICE_MONITOR", False) + or cached.get("price_facts_version") == 1) and now_min <= int(cached.get("valid_until_min") or -1)): c = dict(cached) c["_source"] = "A缓存" @@ -195,6 +264,8 @@ def _advice(*, ts_code, side, action, now, day, pos, left, is_last_day, tdays_le } to = max(1, param_store.get_int("PMS_EXEC_TIMEOUT_SEC", 8)) url = base_url() + (param_store.get("PMS_EXEC_PATH", "/api/intraday/pms_exec") or "") + fallback_note = ("等待有效执行价格" if param_store.get_bool("PMS_EXEC_QMT_PRICE_MONITOR", False) + else "本轮退实现B") def _cool(err: str): cool = max(1, param_store.get_int("PMS_EXEC_FAIL_COOLDOWN_MIN", 5)) @@ -207,7 +278,7 @@ def _advice(*, ts_code, side, action, now, day, pos, left, is_last_day, tdays_le data = _post(url, payload, to) except Exception as e: err = f"{type(e).__name__}: {e}" - logger.error("[择时A] 咨询失败, 本轮退实现B (%s %s): %s", ts_code, side, err) + logger.error("[择时A] 咨询失败, %s (%s %s): %s", fallback_note, ts_code, side, err) _cool(err) return None, err @@ -215,8 +286,8 @@ def _advice(*, ts_code, side, action, now, day, pos, left, is_last_day, tdays_le if verdict not in (FIRE, WAIT): # 对端明说给不出结论 (UNAVAILABLE), 或答复不认识 —— 都按拿不到处理, 退实现B reason = str(data.get("reason") or f"verdict={verdict or '空'}")[:200] - logger.warning("[择时A] 决策系统给不出结论 (%s %s): %s —— 本轮退实现B", - ts_code, side, reason) + logger.warning("[择时A] 决策系统给不出结论 (%s %s): %s —— %s", + ts_code, side, reason, fallback_note) _cool(f"UNAVAILABLE: {reason}") return None, f"UNAVAILABLE: {reason}" @@ -235,6 +306,8 @@ def _advice(*, ts_code, side, action, now, day, pos, left, is_last_day, tdays_le # 支撑/压力/买入区间也一并存下来 —— 新建仓的漂移比对要用 (见 _check_ref_drift) "support": obs.get("support"), "pressure": obs.get("pressure"), "buy_band": obs.get("buy_band"), + "sell_band": obs.get("sell_band"), "today_exit": obs.get("today_exit"), + "price_facts_version": 1, "valid_until_min": et.add_trade_minutes(now_min, valid_min), "consulted_at": et._fmt(now_min)} drift = _check_ref_drift(action=action, prog=prog, adv=adv, today=today) @@ -253,7 +326,7 @@ def _advice(*, ts_code, side, action, now, day, pos, left, is_last_day, tdays_le def _f(v): try: x = float(v) - return x if x > 0 else 0.0 + return x if math.isfinite(x) and x > 0 else 0.0 except (TypeError, ValueError): return 0.0 diff --git a/app/services/executor.py b/app/services/executor.py index fad17e4..50dc84d 100644 --- a/app/services/executor.py +++ b/app/services/executor.py @@ -16,6 +16,7 @@ progress_json.children[]; exec_qty 由回放认领回填 (账本以下游成交 from __future__ import annotations import logging +from copy import deepcopy from datetime import datetime import hashlib @@ -251,7 +252,7 @@ def run_tick(*, now=None, dry_run: bool = False) -> dict: # 择时判定统一走 exec_advisor: PMS_EXEC_IMPL=B (默认) 时它就是 et.decide 原样; # =A 时先过硬闸 (配额/兜底等 PMS 自留地), 再委托决策系统, 不可用退实现B。 # 咨询结论会写进 prog["exec_advice"], 随下面既有的 update_instruction 落表; - # dry_run 传 None —— 只算不落库, 试算不该占用/刷新研判缓存。 + # dry_run 传进度副本,保留参考位锁定,但不落库或刷新真实缓存。 # is_command 必须一路传到 hard_gate: 窗口末日的强制完成只对命令驱动生效, # 自主买入到期作废 (与 window_verdict 的口径对齐, 见 exec_timing 里那段说明)。 d = exec_advisor.decide(side=side, action=ins.get("action"), ts_code=code, @@ -261,7 +262,8 @@ def run_tick(*, now=None, dry_run: bool = False) -> dict: urgent=bool(prog.get("urgent")), fired_today=fired_today, quota=quota, pos=pos, tdays_left=tdays_left, - prog=(None if dry_run else prog)) + prog=(deepcopy(prog) if dry_run else prog), + instruction_limit=ins.get("limit_price")) if d["action"] != et.ACT_FIRE: prog["last_decision"] = {"at": now.strftime("%H:%M"), **d} @@ -302,7 +304,7 @@ def run_tick(*, now=None, dry_run: bool = False) -> dict: "action": et.ACT_WAIT, "reason": "可卖量不足, 顺延"}) continue - ma5 = market.get_ma5(code) if side == "buy" else None + ma5 = market.get_ma5(code) if side == "buy" and not d.get("qmt_price_monitor") else None # 新建仓 (从没持仓过的票) 的组合上下文必须显式带 is_new_name 与行业名: # caps_ctx 在 view 里找不到该票时带不出行业, 行业集中度终检会静默跳过 # (与 proposal_service._route_one 已修过的同一个洞, 2026-08-28 补齐执行终检侧) @@ -318,7 +320,9 @@ def run_tick(*, now=None, dry_run: bool = False) -> dict: caps = portfolio.caps_ctx(view, ts_code=code, is_new_name=is_new, sector=sec) \ if is_new else portfolio.caps_ctx(view, ts_code=code) gate = rule_gate.check( - side=side, action=ins.get("action"), qty=qty, price=day_ctx.get("price"), + side=side, action=ins.get("action"), qty=qty, + price=(max(float(day_ctx.get("price") or 0), float(d["limit_price"])) + if side == "buy" and d.get("qmt_price_monitor") else day_ctx.get("price")), ctx={"ts_code": code, "position": pos, "day": {**day_ctx, "ma5": ma5}, "params": {**exec_prm, "sector_source_ready": view["sector_ready"]}, "caps": caps, @@ -329,6 +333,7 @@ def run_tick(*, now=None, dry_run: bool = False) -> dict: # 只告警不拦截, 告警随 hard_numbers 落进评审账本。 "stop_price": stock_params.get(code, {}).get("stop_price"), "is_command": bool(prog.get("is_command")), + "qmt_price_monitor": bool(d.get("qmt_price_monitor")), # 决策系统昨夜对该股的定性, 由择时应答带回 (退实现B 时为 None) "y_signal": d.get("y_signal")}}) diff --git a/app/services/param_store.py b/app/services/param_store.py index 70fac40..bff53b8 100644 --- a/app/services/param_store.py +++ b/app/services/param_store.py @@ -264,6 +264,7 @@ DESC = { "PMS_SECTOR_MAX_RATIO": "同行业最大占总仓比例 (硬拦截)", "PMS_EXEC_WINDOW_TDAYS": "任务命令默认执行窗口 (交易日)", "PMS_EXEC_IMPL": "择时实现: B=内置保守择时 / A=委托决策系统按凌晨结论给执行区间 (不可用自动退B)", + "PMS_EXEC_QMT_PRICE_MONITOR": "限价直接提交QMT等待成交,PMS保留数量、资金及用户命令检查", "PMS_EXEC_API_BASE": "择时实现A接口根地址; 留空=沿用 PMS_JUDGE_API_BASE", "PMS_EXEC_PATH": "择时接口路径 (bionic 侧 /api/intraday/pms_exec)", "PMS_EXEC_TIMEOUT_SEC": "择时咨询超时 (秒), 超时本轮退实现B", diff --git a/app/web/static/index.html b/app/web/static/index.html index 2e76767..7da68e1 100644 --- a/app/web/static/index.html +++ b/app/web/static/index.html @@ -612,7 +612,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
暂无有效趋势数据
-
冷 < {{ (macro.params||{}).cold_th }} · 热 > +{{ (macro.params||{}).hot_th }} · 两值有差异,按执行值择时
+
冷 < {{ (macro.params||{}).cold_th }} · 热 > +{{ (macro.params||{}).hot_th }} · 两值有差异,按执行值择时
偏热,自动买入暂停
{{ mzSig.advice.direction==='REDUCE' ? '降仓' : '升仓' }}建议 {{ (mzSig.advice.pct*100).toFixed(1) }}%
@@ -638,11 +638,11 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
暂无有效趋势数据
{{ microHistoryError }}
-
低于5%入场 · 高于95%退出 · 成长瓦解 {{ microReady ? microSignal.growth_break ? '已触发' : '未触发' : '待核实' }}
-
历史按当前数据计算策略详情 →
+
低于5%入场 · 高于95%退出 · 成长瓦解 {{ microReady ? microSignal.growth_break ? '已触发' : '未触发' : '待核实' }}
+
历史按当前数据计算策略详情 →
- 微盘 {{ microChipText }} + 微盘 {{ microChipText }} 下发 {{ dm.mode || '-' }} @@ -4324,7 +4324,7 @@ createApp({ return bad.map(s => (s.label || s.key) + (s.note ? (':' + s.note) : '')).join(';'); }); function mzLabel(z) { return { HOT: '偏热', COLD: '偏冷', NEUTRAL: '中性', UNAVAILABLE: '数据不可用' }[z] || (z || '—'); } - function mzColor(z) { return { HOT: '#d8574a', COLD: '#3d7ff0', NEUTRAL: '#8a8f9c', UNAVAILABLE: '#d0a53c' }[z] || '#8a8f9c'; } + function mzColor(z) { return { HOT: '#d8a632', COLD: '#3d7eff', NEUTRAL: '#8a8f9c', UNAVAILABLE: '#d0a53c' }[z] || '#8a8f9c'; } function mzBarStyle(h) { const v = (h && h.value != null) ? Math.max(-40, Math.min(40, Number(h.value))) : 0; return { height: (3 + Math.round(Math.abs(v) / 40 * 27)) + 'px', background: mzColor(h && h.zone) }; @@ -4400,15 +4400,12 @@ createApp({ } const macroChart = computed(() => { const p=macro.value.params||{},rows=((mzSig.value||{}).history||[]).map(r=>({...r,date:mzDate(r.data_ymd||r.ymd)})); - return barTrend('股汇执行值',rows,r=>r.value,(r,v)=>p.hot_th!=null&&v>p.hot_th?'#d8574a':p.cold_th!=null&&vr.value,(r,v)=>p.hot_th!=null&&v>p.hot_th?'#d8a632':p.cold_th!=null&&v { const rows=microHistory.value,g=microSignal.value; - const color=(r,v,low,high)=>low!=null&&vhigh?'#158a4c':'#969ba7'; - const a=barTrend('微盘活跃度',rows,r=>r.activity,(r,v)=>color(r,v,r.low_threshold,r.high_threshold)); - a.current=microReady.value?microNumber(g.activity):'—'; - const b=barTrend('活跃度历史分位',rows,r=>r.activity_percentile==null?null:r.activity_percentile*100,(r,v)=>color(r,v,5,95),true); - b.current=microReady.value?microPercent(g.activity_percentile):'—';return [a,b]; + const b=barTrend('活跃度历史分位',rows,r=>r.activity_percentile==null?null:r.activity_percentile*100,(r,v)=>v<5?'#3d7eff':v>95?'#d8a632':'#969ba7',true); + b.current=microReady.value?microPercent(g.activity_percentile):'—';return [b]; }); // 首行徽标 (2026-08-19 用户要求由大面板改为首行紧凑显示, 详情进悬浮提示) diff --git a/config/settings.py b/config/settings.py index ad1fb48..b7b0557 100644 --- a/config/settings.py +++ b/config/settings.py @@ -225,6 +225,7 @@ class Settings(BaseSettings): # 配额/兜底/停牌/一字板/不追高(当日涨幅) 这些检查始终留在 PMS 本地。 # 不可用自动退实现B (设计 §13), 绝不因对端故障停出手。 PMS_EXEC_IMPL: str = "B" # B=内置保守择时(默认) / A=委托决策系统 + PMS_EXEC_QMT_PRICE_MONITOR: bool = False # 已生成指令直接提交限价,由QMT等待价格;按实例启用 PMS_EXEC_API_BASE: str = "" # 实现A接口根地址; 留空=沿用 PMS_JUDGE_API_BASE (同一个 bionic 服务) PMS_EXEC_PATH: str = "/api/intraday/pms_exec" PMS_EXEC_TIMEOUT_SEC: int = 8 # 咨询超时(秒)。盘中 tick 等不起长超时, 超了本轮退B diff --git a/scripts/run_tests.py b/scripts/run_tests.py index ff4aed3..2580786 100644 --- a/scripts/run_tests.py +++ b/scripts/run_tests.py @@ -5,6 +5,7 @@ 运行: 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_batch48_units.py 策略账本隔离、微盘轮换优先级、真实交易单位、模拟直接启用及市场读数 (47例) test_batch47_units.py 账户资金去重、买入额度与账户展示和策略估值分离 (9 例) @@ -206,6 +207,7 @@ SUITES = ["test_core_units.py", "test_batch2_units.py", "test_batch3_units.py", "test_batch47_units.py", "test_batch48_units.py", "test_batch49_units.py", + "test_batch50_units.py", "test_page_copy_guard.py", "test_page_enum_guard.py", "test_page_wiring_guard.py", diff --git a/scripts/test_batch50_units.py b/scripts/test_batch50_units.py new file mode 100644 index 0000000..a152fd1 --- /dev/null +++ b/scripts/test_batch50_units.py @@ -0,0 +1,143 @@ +"""限价交给QMT等待,数量、资金与用户命令仍在PMS检查。""" +import unit_test_guard +import copy +import unittest +from datetime import datetime +from unittest.mock import patch +from test_wiring import install_fakes +from app.services import exec_advisor as ea, executor, market + +CODE = '300693.SZ' +NOW = datetime(2026, 10, 28, 11, 10) + + +class QmtPriceTests(unittest.TestCase): + def setUp(self): + self.fake = install_fakes(prices={CODE: 31.10}, params={ + 'PMS_EXEC_QMT_PRICE_MONITOR': True, 'PMS_EXEC_IMPL': 'A', + 'PMS_JUDGE_API_BASE': 'http://fake', 'PMS_TOTAL_SCALE': 2000000, + 'PMS_DISPATCH_MODE': 'ws'}) + self.fake.qmt.set_channel() + self.response = {'verdict': 'WAIT', 'reason': '价格未进区间', 'observed': { + 'support': 29.1, 'pressure': 32.15, 'buy_band': [28.81, 30.02], + 'sell_band': [31.24, 32.47], 'y_signal': 'WATCH', 'today_exit': None}} + self.post = patch.object(ea, '_post', side_effect=lambda *a: copy.deepcopy(self.response)).start() + patch.object(ea.td, 'ymd', return_value=20261028).start() + patch.object(executor.td, 'trade_days_left', return_value=3).start() + self.addCleanup(patch.stopall) + + def decide(self, **kw): + args = dict(side='buy', action='OPEN', ts_code=CODE, now=NOW, + day={'price': 31.1, 'day_chg_from_open': .2, 'limit_up': True}, + params={}, is_last_day=False, quota=200, fired_today=0, prog={}) + args.update(kw) + return ea.decide(**args) + + def parent(self): + self.fake.insert_instruction(instruction_id='P', origin_type='plan', origin_id='PLAN', + ts_code=CODE, action='OPEN', side='buy', qty=600, status='PROPOSED', + progress={'deadline': '2026-10-30', 'is_command': True, 'children': []}) + + def test_outside_band_submits_limit_without_chasing(self): + for price in (31.10, 100, 20): + r = self.decide(day={'price': price, 'day_chg_from_open': .2}) + self.assertEqual((r['action'], r['limit_price'], r['qty_hint']), ('FIRE', 30.02, 200)) + + def test_sell_below_band_uses_sell_floor(self): + r = self.decide(side='sell', action='TRIM', now='09:35') + self.assertEqual((r['action'], r['limit_price']), ('FIRE', 31.24)) + + def test_missing_invalid_prices_and_service_error_never_fallback_to_market(self): + for band in (None, [], [30, 20], [0, 20], [20, float('nan')], [20, float('inf')]): + self.response['observed']['buy_band'] = band + self.assertEqual(self.decide()['action'], 'WAIT') + self.post.side_effect = RuntimeError('unavailable') + self.assertEqual(self.decide()['action'], 'WAIT') + + def test_unavailable_and_missing_source_wait(self): + self.response['verdict'] = 'UNAVAILABLE' + self.assertEqual(self.decide()['action'], 'WAIT') + self.fake.params['PMS_EXEC_IMPL'] = 'B' + self.assertEqual(self.decide()['action'], 'WAIT') + + def test_today_exit_bad_signal_and_reference_drift_still_block(self): + self.response['observed']['today_exit'] = 'EXIT' + self.assertEqual(self.decide()['action'], 'WAIT') + self.response['observed'].update(today_exit=None, y_signal='AVOID') + self.assertEqual(self.decide()['action'], 'WAIT') + self.response['observed']['y_signal'] = 'WATCH' + r = self.decide(prog={'ref_lock': {'ymd': 20261028, 'support': 25, 'pressure': 32.15}}) + self.assertEqual(r['action'], 'WAIT') + self.assertTrue(r['ref_drift']) + + def test_old_cache_must_refresh_exit_facts(self): + old = {'exec_advice': {'ymd': 20261028, 'verdict': 'WAIT', 'buy_band': [28, 30], + 'valid_until_min': 900}} + self.response['observed']['today_exit'] = 'EXIT' + self.assertEqual(self.decide(prog=old)['action'], 'WAIT') + self.assertEqual(self.post.call_count, 1) + + def test_valid_cache_does_not_poll_price_again(self): + prog = {} + self.decide(prog=prog) + self.decide(prog=prog) + self.assertEqual(self.post.call_count, 1) + + def test_quota_session_halt_and_missing_quote_remain(self): + for kw in ({'fired_today': 200}, {'now': '12:00'}, {'day': {'price': 0}}, + {'day': {'price': float('nan')}}, {'day': {'price': 31, 'halted': True}}): + self.assertNotEqual(self.decide(**kw)['action'], 'FIRE') + self.assertEqual(self.post.call_count, 0) + + def test_late_day_does_not_reprice_buy_to_market(self): + r = self.decide(now='14:50', is_last_day=True) + self.assertEqual(r['limit_price'], 30.02) + self.assertFalse(r['forced']) + + 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') + + def test_grid_and_urgent_keep_own_limit(self): + grid = self.decide(prog={'origin': 'strategy', 'stype': 'GRID'}, instruction_limit=29.8) + urgent = self.decide(side='sell', urgent=True) + self.assertEqual(grid['limit_price'], 29.8) + self.assertEqual(urgent['action'], 'FIRE') + self.assertEqual(self.post.call_count, 0) + + def test_run_tick_reserves_one_daily_slice_and_does_not_repeat(self): + self.parent() + with patch.object(market, 'get_ma5', side_effect=AssertionError('should not monitor MA5')), \ + patch.object(market, 'day_snapshot', return_value={'price': 31.10, 'day_chg_from_open': .2}): + r = executor.run_tick(now=NOW) + self.assertTrue(r['ok'], r) + self.assertEqual([(x['qty'], x['limit']) for x in r['fired']], [(200, 30.02)]) + self.assertEqual(executor.run_tick(now=NOW)['fired'], []) + self.assertEqual(len(self.fake.qmt.orders), 1) + self.assertEqual(self.fake.instructions['P']['exec_qty'], 0) + + def test_pause_and_cash_limits_still_reject(self): + self.parent() + self.fake.params['PMS_GLOBAL_BUY_HALT'] = True + r = executor.run_tick(now=NOW) + self.assertEqual(r['fired'], []) + self.assertIn('BUY_HALT', str(r)) + self.fake.params['PMS_GLOBAL_BUY_HALT'] = False + self.fake.params['PMS_TOTAL_SCALE'] = 1 + r = executor.run_tick(now=NOW) + self.assertEqual(r['fired'], []) + self.assertTrue(r['rejected'], r) + + def test_dry_run_preserves_reference_lock_and_writes_nothing(self): + self.parent() + self.fake.instructions['P']['progress']['ref_lock'] = { + 'ymd': 20261028, 'support': 25, 'pressure': 32.15} + before = copy.deepcopy(self.fake.instructions) + r = executor.run_tick(now=NOW, dry_run=True) + self.assertEqual(r['fired'], []) + self.assertEqual(self.fake.instructions, before) + self.assertEqual(len(self.fake.qmt.orders), 0) + + +if __name__ == '__main__': + unittest.main()