From 35838b826600ec1ad5ae62786d48f2c626748a86 Mon Sep 17 00:00:00 2001 From: baobao Date: Mon, 16 Nov 2026 11:41:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=B5=E5=BE=AA=E6=97=A2=E5=AE=9A=E5=BB=BA?= =?UTF-8?q?=E4=BB=93=E8=A7=84=E5=88=99=E5=B9=B6=E6=81=A2=E5=A4=8D=E4=BA=BA?= =?UTF-8?q?=E5=B7=A5=E6=AD=A2=E6=8D=9F=E6=B8=85=E4=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DEVLOG.md | 7 + app/core/action_engine.py | 1 + app/core/buy_budget.py | 15 + app/core/command_spec.py | 6 +- app/core/risk_exit.py | 26 + app/core/rule_gate.py | 27 +- app/services/buy_budget.py | 74 +- app/services/command_service.py | 2 +- app/services/executor.py | 2 +- app/services/param_store.py | 4 +- app/services/proposal_service.py | 3 +- app/services/risk_exit.py | 114 +- app/services/strategy_advisor.py | 5 - app/services/strategy_runner.py | 8 - app/web/main.py | 4 +- app/web/static/index.html | 4 +- docs/evidence/entry_exit_rules_20261116.json | 1088 +++++++++++++++++ docs/交易计划与风险约束整改接续_2026-11-16.md | 16 +- docs/交易计划与风险约束整改规格_2026-11-16.md | 21 +- ...建平仓规则对齐与人工止损验收_2026-11-16.md | 83 ++ docs/开发入口.md | 2 + docs/试探预算约束实现与验收_2026-11-16.md | 4 +- scripts/run_tests.py | 5 +- scripts/test_batch3_units.py | 8 +- scripts/test_buy_budget.py | 69 +- scripts/test_risk_exit.py | 11 +- scripts/test_timing_fusion.py | 45 + scripts/test_trade_correction_strategy.py | 4 +- scripts/test_user_stop.py | 185 +++ 29 files changed, 1650 insertions(+), 193 deletions(-) create mode 100644 docs/evidence/entry_exit_rules_20261116.json create mode 100644 docs/建平仓规则对齐与人工止损验收_2026-11-16.md create mode 100644 scripts/test_user_stop.py diff --git a/DEVLOG.md b/DEVLOG.md index 369a0e2..bbadbbc 100644 --- a/DEVLOG.md +++ b/DEVLOG.md @@ -3153,3 +3153,10 @@ a44c994于10:53:29仅发布155的web,镜像pms:proposal-copy-a44c994。开发 09:26:38在155只读核实杰普特原提议确实将15695元试探金额抬到62780元,四方两笔31.37元网格库存与旧批次未占新版买入档相互吻合。保存脱敏事实和七个运行源码摘要;未更改账本或参数。完成首个可独立发布的网格修复:真实未平库存要求新的完整低价台阶,评估与落单前共同复核,部分卖出不释放整批约束,全部入账卖出后可恢复同价循环。开发机Python3.12专项62例、全量86组通过。试探预算与退出方案仍按规格继续,不能把网格修复当作全部整改完成。尚未部署。 09:50:15将`0ea114f`定向发布至155 web和worker,各自候选断网全量86组、85组通过。温和排空worker后重建,其他28容器、私有配置、运行参数及历史批次不变。09:52自然调度已恢复,最后核验连续确认1892889、缺口及待入账和在途均0,数量现金对账无差。真实价格触发库存拦截与完整循环尚待发生;试探预算仍待开发。具体镜像、回退与后续入口见[整改接续](docs/交易计划与风险约束整改接续_2026-11-16.md)。 + + +## 2026年11月16日 建平仓既定规则对齐与人工止损恢复 + +先读总体设计与11月5日、10日、11日明确决定,发现6c5afe2把试探预算扩展为整轮自动新增禁令,与既定规则冲突。用户明确按既定规则修正:原建仓预算保持硬限,后续补仓、网格和做T独立审批;同时恢复预算内分批合并。用户另确认人工止损价按总体设计触价清仓,复用退出流程,保存命令与有效行情,遵守全局暂停、撤单和入账收尾、T+1、部分成交及迟到买入,不等第二条模型信号。 + +11:19在155只读核验四方新择时以来7条相关审计:11月12日首次QRS加资金异动,随后资金异动失效,13日和16日仅QRS看空,没有保存的第二个有效合成看空。当前四只持仓均无人工止损价命令,不替用户补设。规则来源、测试矩阵和证据已入[建平仓规则对齐](docs/建平仓规则对齐与人工止损验收_2026-11-16.md)。开发机预算45例、二次确认19例、人工止损17例及最终88组断网隔离回归通过;候选镜像和发布另记,不将本地通过当作真机成交判收。 diff --git a/app/core/action_engine.py b/app/core/action_engine.py index b129eb1..51677e1 100644 --- a/app/core/action_engine.py +++ b/app/core/action_engine.py @@ -896,6 +896,7 @@ def eval_open(c: dict, params: dict, caps: dict, room_amt: float): # 理由见那边的 OPEN_JUDGE_KEYS —— 决策系统本来就不管仓位, 别送过去带偏它。 "target_pct": target_pct, "target_amount": round(full_amt, 2), "sizing_scale": scale, "requested_budget": round(want, 2), + "min_lot_merge": bool(params.get("min_lot_merge", True)), "base_amount": round(qty * price, 2), "batch_scheme": ",".join(str(x) for x in (sp.get("scheme") or ())), "names_before": caps.get("names_count"), "max_names": caps.get("max_names"), diff --git a/app/core/buy_budget.py b/app/core/buy_budget.py index 735eed4..26258dc 100644 --- a/app/core/buy_budget.py +++ b/app/core/buy_budget.py @@ -70,16 +70,31 @@ def resize(advice, hard, code): if abs(sum(ratios)-1) > Decimal('.00000001'): raise ValueError('分批比例不完整,暂不建仓') quantities = [quantity(amount*r, price, code) for r in ratios] + # 沿用总体设计的合批阶梯;只改变分批,不扩大本次批准金额。 + merged = False + merge = bool((old or {}).get('min_lot_merge', hard.get('min_lot_merge', True))) + if not all(quantities) and merge and not trial: + from app.core.sizer import MERGE_LADDER + for _, alternate in MERGE_LADDER[1:]: + if len(alternate) >= len(splits): + continue + counts = [quantity(amount*number(r, '分批比例'), price, code) for r in alternate] + if all(counts): + splits, quantities, merged = alternate, counts, True + break executable = all(quantities) first = quantities[0] if executable else 0 maximum = sum(quantities) if executable else 0 budget = {'version': VERSION, 'ts_code': code, 'amount': str(amount), 'scale': str(scale), 'target_pct': str(amount/scale), 'quantity_limit': maximum, 'tier': old['tier'] if old and old.get('tier') == '试探仓' else advice.get('tier'), + 'min_lot_merge': merge, 'basis': '买入成交金额,不含另记的交易费用'} budget['revision'] = identity(budget) minimum_amount = price * lot_of(code) reason = '' if first else f'当前预算{amount:.2f}元不足分批最低买入量,暂不建仓(每批最低{lot_of(code)}股,需{minimum_amount:.2f}元)' + if merged: + reason = '原分批不足最低买入量,已在原预算内合并为' + '/'.join(f'{v:.0%}' for v in splits) return {'qty': first, 'target_pct': float(amount/scale), 'target_amount': float(amount), 'minimum_order_amount': float(minimum_amount), 'base_amount': float(first*price), 'batch_scheme': ','.join(str(v) for v in splits), diff --git a/app/core/command_spec.py b/app/core/command_spec.py index de67181..771363c 100644 --- a/app/core/command_spec.py +++ b/app/core/command_spec.py @@ -212,10 +212,8 @@ SPECS = { "cls": CLS_PARAM, "label": "设定某股止损价", "group": "C", "scope": "stock", "fields": {"ts_code": _f(F_CODE), "price": _f(F_PRICE, min=0)}, "projection": {"stop_ref": "@price", "ref_source": "user"}, - # 2026-09-03 改口径 (原文写的是「触发即生成卖出方案」, 而实现里从来没有这一步): - # 止损价现在参与规则检查, 但**只披露不拦截、也不自动卖**。跌破时每条买入指令的 - # 评审账本上会带一句 STOP_BREACHED, 页面参考位列也显示它。要真卖请下清仓/减持命令。 - "note": "覆盖系统参考位; 跌破只在合规检查里告警留痕, 不自动卖出", + # 2026-11-16 用户确认按总体设计恢复;执行依据读取命令,不读取每日重算的投影。 + "note": "触价后停止买入并安排清仓,遵守全局暂停、旧委托收尾和T+1;填0取消未触发条件,已生成清仓须另行撤销", }, "SET_TARGET_PRICE": { "cls": CLS_PARAM, "label": "设定某股目标价", "group": "C", "scope": "stock", diff --git a/app/core/risk_exit.py b/app/core/risk_exit.py index 56c1f7b..47781cd 100644 --- a/app/core/risk_exit.py +++ b/app/core/risk_exit.py @@ -27,6 +27,32 @@ def digest(value): separators=(',', ':'), allow_nan=False).encode()).hexdigest() +def user_stop_event(command, quote, *, now, max_age=90): + """人工止损只认有效命令与生效后的当日行情,不读取系统参考位。""" + from app.core.execution_policy import positive, timestamp, supported_code + command, quote = command or {}, quote or {} + code = command.get('ts_code') + if (not supported_code(code) or command.get('cmd_type') != 'SET_STOP_PRICE' + or command.get('status') != 'EFFECTIVE' or not command.get('command_id')): + return None, '没有有效的人工止损命令' + stop = positive((command.get('params') or {}).get('price')) + if not stop: + return None, '未设置有效人工止损价' + current, issued = stamp(now), stamp(command.get('issued_at')) + at, price = timestamp(quote.get('as_of')), positive(quote.get('last')) + if (not current or not issued or issued > current or not at or not price + or quote.get('kind') != 'minute' or not quote.get('source')): + return None, '人工止损等待可核实的命令时间与当日行情' + if (at.date() != current.date() or at < issued or at > current + or (current-at).total_seconds() > max_age): + return None, '人工止损等待命令生效后的有效行情' + if price > stop: + return None, '尚未触及人工止损价' + return {'command_id': command['command_id'], 'issued_at': issued.isoformat(), + 'stop_price': stop, 'price': price, 'quote_at': at.isoformat(), + 'quote_source': quote['source'], 'observed_at': current.isoformat()}, '' + + def signal_event(sig, *, now, since, threshold=.85, max_age=300, actions=('SELL',)): """真正的清仓级信号才计次。过期、未来、回退结论及无出处不计数。""" code = str(sig.get('ts_code') or '') diff --git a/app/core/rule_gate.py b/app/core/rule_gate.py index 527c40a..73e31e1 100644 --- a/app/core/rule_gate.py +++ b/app/core/rule_gate.py @@ -110,7 +110,7 @@ def check(*, side: str, action: str, qty: int, price: float, ctx: dict) -> dict: if flg.get("exec_halt"): failed.append("EXEC_HALT: 全局暂停执行 生效中") - _check_user_stop(warns, side, price, flg, hard) + _check_user_stop(failed, side, price, flg, hard) ml = lot_of(ctx.get("ts_code")) # 最小申报数量 (科创板 200, 其余 100) if side == SELL: @@ -123,32 +123,17 @@ def check(*, side: str, action: str, qty: int, price: float, ctx: dict) -> dict: return {"passed": not failed, "failed": failed, "warnings": warns, "hard_numbers": hard} -def _check_user_stop(warns, side, price, flg, hard): - """用户设的止损价: **只披露不拦截** (2026-09-03 接通「设定某股止损价」这条命令)。 - - 在此之前这条命令的价格只存进命令表, 全库没有一处读它 —— 页面能设、状态是生效中, - 而跌破那天什么都不会发生。这里把它接进规则闸的告警层, 与既有的敞口披露、 - LIMIT_DOWN、CASH_ESTIMATED 同一层: 进 warnings, 同时无条件写进 hard_numbers, - 于是每一条指令的评审账本上都查得到「当时你设的止损价是多少、破没破」。 - - 为什么只告警不拦: 止损价是**你的意思**, 不是一道硬约束。真按它自动卖出属于 - 「系统替你决定卖」, 不在纪律允许的范围内; 而拿它去拦别的指令 (比如禁止在止损位 - 之下买入) 是凭空多出一条没人拍过板的规则。所以这里只做一件事 —— 让它被看见。 - 告警只在增持方向发一句: 在自己设的止损位之下还加仓, 是最该被人看见的一种情形; - 减持方向本来就是止损位该做的事, 不必再提示一遍。 - - **没有告警不等于没跌破** —— 取不到现价 (price<=0) 或没设止损价时这里什么都不做, - hard_numbers 里 stop_price 会是 None, 与「设了且没破」在账本上分得开。 - """ - stop = _num(flg.get("stop_price")) +def _check_user_stop(failed, side, price, flg, hard): + """人工止损触价停止买入;清仓意图与收尾由risk_exit按命令和新鲜行情驱动。""" + from app.core.execution_policy import positive + stop = positive(flg.get("stop_price")) hard["stop_price"] = stop or None if stop <= 0 or price <= 0: return breached = price <= stop hard["stop_breached"] = breached if breached and side == BUY: - warns.append(f"STOP_BREACHED: 现价 {price} 已跌破你设的止损价 {stop}, 本单仍是买入 " - f"—— 只提示不拦截; 止损价也不会自动挂单卖出") + failed.append(f"STOP_BREACHED: 现价 {price} 已触及你设的止损价 {stop},停止新增买入,按止损安排清仓") def _check_sell(failed, warns, qty, total_qty, avail_qty, day, min_lot: int = LOT): diff --git a/app/services/buy_budget.py b/app/services/buy_budget.py index 6fdd34d..afca3b0 100644 --- a/app/services/buy_budget.py +++ b/app/services/buy_budget.py @@ -2,7 +2,7 @@ from copy import deepcopy from decimal import Decimal from app.core import buy_budget as core, strategy_book as books -from app.repo import pms_repo, qmt_repo +from app.repo import pms_repo from config.settings import settings LIVE = ('PROPOSED', 'RULE_PASSED', 'JUDGE_PASSED', 'DISPATCHED', 'WAIT_REVIEW') @@ -98,71 +98,7 @@ def parent_budget(parent): return None -def _holding_blocker(code, *, parent_id=None): - """当前轮次只要仍有试探仓,不经明确新命令扩大;底仓卖光也不解除。""" - if not settings.INFRA_STRATEGY_BOOK_SCHEMA or books.CURRENT.get() != books.ORIGINAL: - return '' - pending = pms_repo.list_instructions(ts_code=code, side='buy', statuses=LIVE, limit=1001) - if len(pending) >= 1001: - return '买入安排超过完整核验范围,暂停自动加仓' - for other in pending: - if other['instruction_id'] == parent_id or other.get('action') != 'OPEN': - continue - limit = parent_budget(other) - if limit and limit.get('tier') == '试探仓': - return '该股已有试探建仓安排,不能从其他路径重复增加投入' - position = pms_repo.get_position(code) or {} - if int(position.get('total_qty') or 0) <= 0: - return '' - opened = str(position.get('opened_date') or '')[:10] - if not opened: - return '本轮持仓的建仓预算尚未核实,暂停自动加仓' - lots = pms_repo.list_lots(code, status='', limit=2001) - if len(lots) >= 2001: - return '持仓批次超过完整核验范围,暂停自动加仓' - active = [r for r in lots if r.get('status') == 'OPEN' and int(r.get('qty') or 0) > 0] - if sum(int(r['qty']) for r in active) != int(position['total_qty']): - return '持仓与批次数量待核对,暂停自动加仓' - roots = {} - for lot in lots: - if str(lot.get('open_date') or '')[:10] < opened or lot.get('lot_type') != 'BASE': - continue - pid = lot.get('instruction_id') - if not pid: - return '本轮底仓来源无法核实,暂停自动加仓' - parent = pms_repo.get_instruction(pid) - if not parent or parent.get('book_id', books.ORIGINAL) != books.ORIGINAL or parent.get('ts_code') != code: - return '本轮底仓归属无法核实,暂停自动加仓' - roots[pid] = parent - if not roots: - return '本轮建仓依据尚未核实,暂停自动加仓' - for pid, parent in roots.items(): - if explicit_command(parent): - continue - budget = parent_budget(parent) - if budget is None: - return '本轮原建仓预算尚未核实,暂停自动加仓' - if budget.get('tier') == '试探仓' and pid != parent_id: - return '本轮为试探仓,暂停网格及其他自动加仓;扩大投入须明确新的买入命令' - return '' - - -def holding_blocker(code, *, parent_id=None): - # 缺预算只暂停新增;不得因为查询失败而挡住同一轮的正常网格卖出。 - try: - return _holding_blocker(code, parent_id=parent_id) - except ValueError as exc: - return str(exc) - except Exception: - import logging - logging.getLogger('pms.buy_budget').exception('核对持仓建仓预算失败 %s', code) - return '本轮建仓预算暂不可核实,暂停自动加仓;已有卖出安排继续' - - def before_parent(code, *, action='OPEN', exclude=None): - blocked = holding_blocker(code) - if blocked: - raise ValueError(blocked) if settings.INFRA_STRATEGY_BOOK_SCHEMA and action == 'OPEN': parents = pms_repo.list_instructions(ts_code=code, side='buy', statuses=LIVE, limit=1001) if len(parents) >= 1001 or any(p['instruction_id'] != exclude for p in parents): @@ -175,14 +111,8 @@ def allowed_quantity(parent, price, requested): return int(requested), '' from app.services import execution_orders code = parent['ts_code'] - prog = parent.get('progress') or {} budget = parent_budget(parent) - # 平回做T只恢复先前卖出的库存;新增腿仍受持仓预算约束。 - closing = prog.get('stype') == 'T0' and prog.get('leg') == 'close' - if not explicit_command(parent) and not closing: - blocked = holding_blocker(code, parent_id=parent['instruction_id']) - if blocked: - return 0, blocked + # 原建仓预算仅约束该父指令;后续策略沿各自审批、额度和退出纪律。 if budget is None: return int(requested), '' state = execution_orders.replacement_state(parent['instruction_id']) diff --git a/app/services/command_service.py b/app/services/command_service.py index 0b9f0df..15c722d 100644 --- a/app/services/command_service.py +++ b/app/services/command_service.py @@ -169,7 +169,7 @@ def issue(cmd_type: str, params: dict, *, note=None, issued_by="user", # 只有明确解冻才能恢复;新买入方案失败或旧命令重规划都不能顺带清掉风控停买。 from app.services import risk_exit - if cmd_type == 'UNFREEZE_STOCK' and risk_exit.enabled(): + if cmd_type == 'UNFREEZE_STOCK' and risk_exit.supported(): from app.db import session as db try: with db.transaction(): diff --git a/app/services/executor.py b/app/services/executor.py index 047d11b..7e1a37d 100644 --- a/app/services/executor.py +++ b/app/services/executor.py @@ -365,7 +365,7 @@ def run_tick(*, now=None, dry_run: bool = False) -> dict: "brake_active": brake_active, "blacklisted": bool(stock_params.get(code, {}).get("black")), # 用户设的止损价, 与黑名单同一份事实源 (命令表)。规则闸拿它 - # 只告警不拦截, 告警随 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")), diff --git a/app/services/param_store.py b/app/services/param_store.py index fd4bf1e..f15c300 100644 --- a/app/services/param_store.py +++ b/app/services/param_store.py @@ -274,8 +274,8 @@ FAIL_CLOSED = { # 二、个股参数命令里同一种毛病 (不在本表, 但病因一样, 一并记在这里): # 设定某股目标价 SET_TARGET_PRICE 2026-09-03 已接通 —— 动作引擎 eval_target 到价产出 # 清仓提议, 必定交人拍板。接通前它只存进命令表没人读。 -# 设定某股止损价 SET_STOP_PRICE 2026-09-03 已接进规则闸的告警层 (只披露不拦截, -# 不自动卖)。它投影到持仓行的 stop_ref 每天盘前会被 +# 设定某股止损价 SET_STOP_PRICE 2026-11-16 按用户决定恢复触价清仓,复用退出收尾。 +# 命令与新鲜行情是依据;投影到持仓行的 stop_ref 每天盘前会被 # ledger_service.premarket() 的参考位取数覆盖掉, # 所以判断一律读命令表 (事实源), 别读投影。 # 这处覆盖是系统自算参考位的正常行为, 保留不动; diff --git a/app/services/proposal_service.py b/app/services/proposal_service.py index 1e47e39..e1cc7ea 100644 --- a/app/services/proposal_service.py +++ b/app/services/proposal_service.py @@ -1380,7 +1380,8 @@ def _apply_advice_tier(c, hn, verdict, *, force_trial=False): old_qty = c.get('qty') c['qty'] = fix['qty'] hn.update({k: fix[k] for k in ('target_pct', 'target_amount', 'base_amount', 'batch_scheme', 'buy_budget', 'minimum_order_amount')}) - value = dict(value, target_pct=fix['target_pct'], tier=fix['buy_budget']['tier']) + value = dict(value, target_pct=fix['target_pct'], tier=fix['buy_budget']['tier'], + splits=tuple(float(v) for v in fix['batch_scheme'].split(','))) if value['tier'] == adv.TIER_TRIAL: value['splits'] = (1.0,) value['hold_type'] = '试探仓' diff --git a/app/services/risk_exit.py b/app/services/risk_exit.py index 2c2ae1d..02fbab7 100644 --- a/app/services/risk_exit.py +++ b/app/services/risk_exit.py @@ -11,9 +11,12 @@ PAUSED = {'STOP_BUY', 'EXIT_PENDING', 'EXITING', 'CLOSED', 'MANUAL'} LIVE = ('PROPOSED', 'RULE_PASSED', 'JUDGE_PASSED', 'DISPATCHED', 'WAIT_REVIEW') +def supported(): + return settings.INFRA_STRATEGY_BOOK_SCHEMA and books.CURRENT.get() == books.ORIGINAL + + def enabled(): - return (settings.INFRA_STRATEGY_BOOK_SCHEMA and books.CURRENT.get() == books.ORIGINAL - and param_store.get_bool('PMS_RISK_EXIT_ENABLED', False)) + return supported() and param_store.get_bool('PMS_RISK_EXIT_ENABLED', False) def _key(code): @@ -26,17 +29,17 @@ def _code_ok(code): def buy_blocker(code): - if not enabled() or not _code_ok(code): + if not supported() or not _code_ok(code): return None state, _ = rotation_repo.get(_key(code)) - if state and state.get('phase') in PAUSED: + if state and (enabled() or state.get('user_stop')) and state.get('phase') in PAUSED: return state.get('reason') or '该股退出纪律已生效,停止新增买入' return None def decorate_positions(rows): """只读展示退出纪律,非方案持仓也不能把停买误写成等待补仓。""" - if not enabled(): + if not supported(): return labels = {'STOP_BUY': '只卖不买', 'EXIT_PENDING': '等待清仓', 'EXITING': '清仓中', 'MANUAL': '退出待处理', 'CLOSED': '退出待核实'} @@ -45,7 +48,7 @@ def decorate_positions(rows): continue try: state, _ = rotation_repo.get(_key(row['ts_code'])) - if state and state.get('phase') in labels: + if state and (enabled() or state.get('user_stop')) and state.get('phase') in labels: row['exit_status_text'] = labels[state['phase']] row['exit_status_reason'] = state.get('reason') or '退出纪律已生效,停止新增买入' except Exception: @@ -71,7 +74,7 @@ def _ledger(code, action, reason, hard, ref): raise RuntimeError('退出纪律依据未入账') -def _sync(state, code, pos, lots, now): +def _sync(state, code, pos, lots, now, *, seed=True): """以真实未平批次衔接持仓轮次,清空后再开仓不继承上轮信号。""" if not lots: return @@ -85,13 +88,14 @@ def _sync(state, code, pos, lots, now): round_id=rules.digest([code, str(pos.get('opened_date')), sorted(lots)])[:20], phase='WATCH', events=[], lot_ids=sorted(lots), count=0, exit_seq=0, initialized_at=rules.stamp(now).isoformat()) - from app.services import logic_state_service - entry = logic_state_service.entry_view(code) or {} - baseline = rules.review_snapshot(entry.get('company_review'), now=now, - stale_days=param_store.get_int('PMS_FUND_STALE_DAYS', 120)) - if baseline: - state['review'] = baseline - _seed_legacy_first(state, code, pos, now) + if seed: + from app.services import logic_state_service + entry = logic_state_service.entry_view(code) or {} + baseline = rules.review_snapshot(entry.get('company_review'), now=now, + stale_days=param_store.get_int('PMS_FUND_STALE_DAYS', 120)) + if baseline: + state['review'] = baseline + _seed_legacy_first(state, code, pos, now) else: state['lot_ids'] = sorted(set(state['lot_ids']) | lots) if state.get('phase') == 'CLOSED' and late: @@ -100,6 +104,40 @@ def _sync(state, code, pos, lots, now): {r['instruction_id'] for r in pos.get('_risk_lots', []) if r.get('instruction_id')}) +def _stop_commands(): + rows = pms_repo.list_effective_stock_params(('SET_STOP_PRICE',)) + if len(rows) >= 500: + raise ValueError('人工止损命令超过完整核验上限') + out = {} + for row in sorted(rows, key=lambda r: r['id']): + if _code_ok(row.get('ts_code')): + out[row['ts_code']] = row + return out + + +def observe_user_stop(code, quote, *, now=None): + """用户价格条件已授权清仓;只记退出意图,统一由drive撤单与收尾。""" + if not supported() or not _code_ok(code): + return None + now = now or datetime.now() + with rotation_repo.account_guard(), rotation_repo.locked(_key(code), KIND, {}) as state: + event, why = rules.user_stop_event(_stop_commands().get(code), quote, now=now, + max_age=param_store.get_int('PMS_EXEC_MINUTE_MAX_AGE_SEC', 90)) + if not event: + return {'triggered': False, 'reason': why} + pos, lots = _holding(code) + if not lots: + return {'triggered': False, 'reason': '当前没有原策略持仓'} + _sync(state, code, pos, lots, now, seed=False) + if state.get('user_stop') or state['phase'] in ('EXIT_PENDING', 'EXITING', 'CLOSED', 'MANUAL'): + return {'triggered': False, 'reason': '已有退出安排,沿原流程收尾'} + reason = f"现价{event['price']:g}已触及人工止损价{event['stop_price']:g},按用户命令清仓" + state.update(phase='EXIT_PENDING', reason=reason, user_stop=event) + _ledger(code, 'EXIT', reason, {'user_stop': event, 'round_id': state['round_id'], + 'stage': 'intent'}, event['command_id']) + return {'triggered': True, 'reason': reason} + + def _seed_legacy_first(state, code, pos, now): """只承接已有的真实停买及待确认清仓,不回扫历史凑第二次信号。""" from app.services import strategy_service @@ -296,13 +334,19 @@ def _stop_buys(code, state): def drive(code, *, now=None): """同账户串行收尾。T+1、迟到成交、部分成交继续沿已有执行与回报链处理。""" - if not enabled() or not _code_ok(code) or param_store.get_bool('PMS_GLOBAL_EXEC_HALT', False): + if not supported() or not _code_ok(code) or param_store.get_bool('PMS_GLOBAL_EXEC_HALT', False): return now = now or datetime.now() from app.services import execution_conflicts, execution_orders, strategy_service with rotation_repo.account_guard(), rotation_repo.locked(_key(code), KIND, {}) as state: - if not state or state.get('phase') not in PAUSED: + if not state or not (enabled() or state.get('user_stop')) or state.get('phase') not in PAUSED: return + if state.get('user_stop'): + # 人工命令独立于评级扫描;清零后旧买单迟到仍须重开本轮收尾。 + pos, lots = _holding(code) + _sync(state, code, pos, lots, now, seed=False) + if state.get('phase') not in PAUSED: + return _stop_buys(code, state) if state['phase'] in ('STOP_BUY', 'CLOSED', 'MANUAL'): return @@ -339,6 +383,9 @@ def drive(code, *, now=None): owned.append(child) if any(c.get('side') == 'sell' for c in owned): return + if current.get('user_stop') and (owned or pms_repo.list_instructions( + statuses=list(LIVE), side='buy', ts_code=code, limit=1)): + return # 人工止损先完成旧买单撤销,保留迟到成交后再核实全量。 if qmt_repo.inbox_pending_count() or qmt_repo.inbox_orphan_count(): return rows = pms_repo.list_instructions(statuses=list(LIVE), side='sell', ts_code=code, limit=501) @@ -363,9 +410,10 @@ def drive(code, *, now=None): raise RuntimeError(blocker) seq = int(current.get('exit_seq') or 0) + 1 iid = f"RX_{current['round_id']}_{seq}" - progress = {'is_command': False, 'urgent': True, 'from_signal': True, + user_stop = current.get('user_stop') + progress = {'is_command': bool(user_stop), 'urgent': True, 'from_signal': not bool(user_stop), 'risk_exit': {'round_id': current['round_id'], 'events': current['events'], - 'review_exit': current.get('review_exit')}, + 'review_exit': current.get('review_exit'), 'user_stop': user_stop}, 'reason': current['reason'], 'children': [], 'deadline': str(now.date())} if pms_repo.insert_instruction(instruction_id=iid, origin_type='system', origin_id='risk_exit', ts_code=code, action='EXIT', side='sell', qty=qty, limit_price=None, @@ -388,9 +436,11 @@ def drive(code, *, now=None): def resume_buy(code): """仅响应用户明确恢复;清仓已启动时不能用恢复买入撤销卖出安排。""" - if not enabled(): + if not supported(): return with rotation_repo.account_guard(), rotation_repo.locked(_key(code), KIND, {}) as state: + if not (enabled() or state.get('user_stop')): + return if state.get('phase') in ('EXIT_PENDING', 'EXITING'): raise ValueError('该股已进入清仓流程,请先处理清仓安排') if state.get('phase') == 'MANUAL': @@ -402,6 +452,7 @@ def resume_buy(code): if state: state.update(phase='WATCH', count=0, reset_at=rules.stamp(datetime.now()).isoformat(), reason='用户明确恢复买入') state.pop('exit_iid', None) + state.pop('user_stop', None) from app.services import strategy_service result = strategy_service.clear_buypause(code) or {} if not result.get('ok'): @@ -411,12 +462,18 @@ def resume_buy(code): def scan(*, now=None): - out = {'enabled': enabled(), 'reviews': {}, 'errors': []} - if not out['enabled']: + out = {'enabled': enabled(), 'reviews': {}, 'user_stops': {}, 'errors': []} + if not supported(): return out now = now or datetime.now() from app.services import logic_state_service - states = logic_state_service.state_map() + commands = _stop_commands() + # 人工止损不依赖模型资料可用;评析读取异常不阻断已记录的退出收尾。 + try: + states = logic_state_service.state_map() if out['enabled'] else {} + except Exception as exc: + states = {} + out['errors'].append(f'评析读取失败: {type(exc).__name__}: {exc}') positions = pms_repo.list_positions(only_open=True) codes = {p['ts_code'] for p in positions if _code_ok(p['ts_code'])} pending = rotation_repo.recent(KIND, limit=1000) @@ -424,15 +481,26 @@ def scan(*, now=None): raise RuntimeError('退出纪律记录超过核验上限') codes.update(r['value']['code'] for r in pending if r['value'].get('phase') in PAUSED) for code in sorted(codes): + try: + command = commands.get(code) + if command and (command.get('params') or {}).get('price'): + from app.services import market + quote = market.execution_quote(code, now=now, limits={}) + out['user_stops'][code] = observe_user_stop(code, quote, now=now) + except Exception as exc: + out['errors'].append(f'{code}人工止损: {type(exc).__name__}: {exc}') try: out['reviews'][code] = observe_review(code, (states.get(code) or {}).get('company_review'), now=now) from app.services import timing_state event = timing_state.latest(code, now) if event and event['action'] == 'BUY': out.setdefault('recoveries', {})[code] = recover_on_buy(code, event, now=now) - drive(code, now=now) except Exception as exc: out['errors'].append(f'{code}: {type(exc).__name__}: {exc}') + try: + drive(code, now=now) + except Exception as exc: + out['errors'].append(f'{code}退出收尾: {type(exc).__name__}: {exc}') out['ok'] = not out['errors'] return out diff --git a/app/services/strategy_advisor.py b/app/services/strategy_advisor.py index 4a0459e..978a96b 100644 --- a/app/services/strategy_advisor.py +++ b/app/services/strategy_advisor.py @@ -779,11 +779,6 @@ def _attach_one(edge, why, p, a, hv, prm, view, black, live_codes, optout, prm_view = view["params"] if edge == R_GRID: - from app.services.buy_budget import holding_blocker - budget_wait = holding_blocker(code) - if budget_wait: - out['blocked'].append({'ts_code': code, 'edge': edge, 'why': budget_wait}) - return cap_room = max(0.0, _f(prm_view.get("stock_cap"), 0.08) * _f(prm_view.get("scale"), 0.0) - _f(p.get("market_value"), 0.0)) diff --git a/app/services/strategy_runner.py b/app/services/strategy_runner.py index 3035dfa..13d9d7b 100644 --- a/app/services/strategy_runner.py +++ b/app/services/strategy_runner.py @@ -174,9 +174,6 @@ def _emit_instruction(st: dict, dec: dict, *, forced: bool = False) -> str: if st.get('type') == 'GRID': prog.update({k: deepcopy(dec.get(k)) for k in ('grid_entry', 'grid_exit', 'grid_params', 'grid_lot_id', 'grid_lots')}) with _current_strategy(st): - if dec.get('side') == 'buy' and dec.get('leg') != 'close': - from app.services.buy_budget import before_parent - before_parent(code, action=dec['action']) if st.get('type') == 'GRID': _validate_grid_decision(st, dec) if pms_repo.insert_instruction( @@ -569,11 +566,6 @@ def _tick_grid(st, pos, now, dry_run, out, buy_paused): out['skipped'].append({'strategy_id': st['strategy_id'], 'why': blocker}) return state.update(grid_inventory.snapshot(st, pos)) - from app.services.buy_budget import holding_blocker - budget_wait = holding_blocker(st['ts_code']) - if budget_wait: - buy_paused = True - out['notes'].append(st['ts_code'] + ' ' + budget_wait) dec = EVALUATORS['GRID'](st, pos, day, now, {'state': state, 'notes': out['notes'], 'buy_paused': buy_paused}) if dec: if dry_run: diff --git a/app/web/main.py b/app/web/main.py index e6a17da..679ee62 100644 --- a/app/web/main.py +++ b/app/web/main.py @@ -601,9 +601,7 @@ def api_decide(request: Request, proposal_id: str, payload: dict = Body(default= hn0 = p.get('hard_numbers') or {} side0 = hn0.get('side') if hn0.get('kind') == 'strategy' else ('sell' if p['action'] in ('TRIM', 'EXIT') else 'buy') if side0 == 'buy': - from app.services.buy_budget import holding_blocker - closing_t0 = hn0.get('kind') == 'strategy' and hn0.get('stype') == 'T0' and hn0.get('leg') == 'close' - blocked = ('' if closing_t0 else holding_blocker(p['ts_code'])) or buy_blocker(p['ts_code']) + blocked = buy_blocker(p['ts_code']) if blocked: return {'ok': False, 'error': blocked, 'proposal_id': proposal_id} expected_hard = None diff --git a/app/web/static/index.html b/app/web/static/index.html index cc0e361..23cad9c 100644 --- a/app/web/static/index.html +++ b/app/web/static/index.html @@ -4192,8 +4192,8 @@ createApp({ async function actStop(row) { const v = await promptNum(curSet(row.user_stop_price) + '现价 ' + row.price + ',成本 ' + costPrice(row.avg_cost) - + '。止损价只做提醒:跌破了会在合规检查里留一条记录,系统不会据此自动卖出。' - + '真要卖请下清仓或减持命令。填多少元?', '设止损 ' + nm(row.ts_code)); + + '。触及止损价后停止买入并安排清仓;遵守全局暂停,旧委托收尾后按可卖数量执行,当日不可卖部分顺延。' + + '填0取消未触发的条件;已生成的清仓安排需另行撤销。填多少元?', '设止损 ' + nm(row.ts_code)); if (v != null) quickCmd('SET_STOP_PRICE', { ts_code: row.ts_code, price: v }); } async function actTargetPrice(row) { diff --git a/docs/evidence/entry_exit_rules_20261116.json b/docs/evidence/entry_exit_rules_20261116.json new file mode 100644 index 0000000..2e096c1 --- /dev/null +++ b/docs/evidence/entry_exit_rules_20261116.json @@ -0,0 +1,1088 @@ +{ + "at": "2026-11-16T11:19:13.366415", + "prefix": "", + "scope": "pms-sim-155", + "params": { + "PMS_DISPATCH_MODE": "ws", + "PMS_GLOBAL_BUY_HALT": false, + "PMS_GLOBAL_EXEC_HALT": false, + "PMS_AUTONOMY": "full", + "PMS_TOTAL_SCALE": 1967927.74, + "PMS_PORTFOLIO_CAP": 0.7, + "PMS_STOCK_CAP": 0.08, + "PMS_STOCK_TARGET_DEFAULT": 0.06, + "PMS_BATCH_SPLIT": "0.5,0.25,0.25", + "PMS_MIN_LOT_MERGE": true, + "PMS_SELF_DECIDE_TRIAL": true, + "PMS_RISK_EXIT_ENABLED": true, + "PMS_RISK_EXIT_START_AT": "2026-11-05T12:30:46.261348+08:00", + "PMS_TIMING_FUSION_ENABLED": true, + "PMS_TIMING_FUSION_START_AT": "2026-11-11T16:17:11.269641+08:00", + "PMS_SIGNAL_RECOVERY_ENABLED": true, + "PMS_SIGNAL_RECOVERY_START_AT": "2026-11-10T12:21:30.354275+08:00", + "PMS_SIGNAL_AUTO_EXIT_CONF": 0.85, + "PMS_RISK_SIGNAL_MIRROR_SEC": 120, + "PMS_RISK_SIGNAL_MAX_AGE_SEC": 300, + "PMS_TECH_ENABLED": true, + "PMS_TECH_EXIT_AUTONOMY": "full", + "PMS_TECH_EXIT_TRIM_RATIO": 0.3333, + "PMS_TECH_FLIP_FRESH_DAYS": 2, + "PMS_TECH_SAR_STOP_ON_TRAIL": true, + "PMS_TECH_SAR_STOP_BUFFER": 0.003, + "PMS_TECH_TIGHT_TRAIL_GIVEBACK": 0.03, + "PMS_TECH_TIGHT_TRAIL_TARGET": 0.08, + "PMS_AUTO_GRID_STEP_PCT": 0.04, + "PMS_AUTO_GRID_CAP_RATIO": 0.5, + "PMS_AUTO_TRAIL_GIVEBACK": 0.05, + "PMS_AUTO_TRAIL_SELL_RATIO": 0.5, + "PMS_TRIM_PEAK": 0.06, + "PMS_TRIM_GIVEBACK": 0.5, + "PMS_CUSHION_SOLID": 0.03, + "PMS_BUILD_WINDOW_TDAYS": 10, + "PMS_FILL_MAX_LOSS": -0.03, + "PMS_DCA_TRIGGERS": "-0.08,-0.15", + "PMS_DCA_DEEP_CONFIRM": -0.15, + "PMS_DCA_MAX_RATIO": 0.5, + "PMS_RISK_WARN_ENTRY": 0.01, + "PMS_RISK_WARN_PORTFOLIO": 0.06 + }, + "files": { + "app/core/action_engine.py": "38ddcfcba8dd381dc01221a6d851ea3866ca7d8f0298d5f14df4d407aa84ed0e", + "app/core/timing_fusion_contract.py": "09c306d489053d09ef838fc272dfff29ff95cd96c3d508ce4a2b35f3f9af2c62", + "app/services/risk_exit.py": "ea9d71b27f79baebe766e9b71aa19f49ebd78ffa5647f1f4a19b9ea47372e95c", + "app/services/timing_fusion.py": "8222f8c7980d7f6c6358be159513a76e766882d30e8a59c867b5d8111b61cf5b", + "app/services/strategy_runner.py": "5ae8a87757b17ca03d8a4492cc637017382c1491b0734242c340779b2aa6fd8f", + "app/core/buy_budget.py": "3c8637a67c72a77fc0fd760013116a62075485de596696b88d5eefafefe083ae", + "app/services/buy_budget.py": "e6d6636027483ef4aee0f9c2177a73130fd7bb88ef712e467d0d1b073d63af70" + }, + "stocks": { + "002979.SZ": { + "position": { + "book_id": "original", + "ts_code": "002979.SZ", + "total_qty": 100, + "avail_qty": 100, + "opened_date": "2026-11-03" + }, + "risk_exit": { + "book_id": "original", + "code": "002979.SZ", + "count": 1, + "events": [ + { + "at": "2026-11-05T09:38:00+08:00", + "confidence": 0.95, + "content": "c2ce2d3356a931fedaa2f71a697b64fbb784ee378ea1aa4a67a2c81417f69573", + "key": "22b2592673f336bff46ddb92fad2047ad18d9ffa5c3817093a2c04fbcfad5b6d", + "legacy_proposal": "PRP_20261105_002979SZ_SIGSELL", + "msg_id": "legacy:PRP_20261105_002979SZ_SIGSELL", + "reason": "量比3.82倍放量但主力净流出10%、主散背离-20,RECHECK判定为诱多分布而非突破,兑现离场", + "source": "intraday", + "source_id": "PRP_20261105_002979SZ_SIGSELL" + } + ], + "exit_seq": 0, + "initialized_at": "2026-11-05T12:30:46.297993+08:00", + "lot_ids": [ + "1450", + "1451" + ], + "opened_date": "2026-11-03", + "phase": "STOP_BUY", + "reason": "第一次清仓信号已确认,停止新增买入,等待第二次独立信号", + "review": { + "at": "2026-11-07T02:41:09.701344+08:00", + "grade": "好", + "ref": "fc1d7677b32b2c031616afcae1b726f019953f25c8f343358865933e7dba6081" + }, + "round_id": "aba55771d5d2f4daaeec", + "stopped_parents": [ + "INS_20261103_002979SZ_OPEN_001_134e680ae814", + "STR20261104094500_002979SZ_g" + ] + }, + "timing": null, + "tech": { + "stance": "看多", + "strength": "弱", + "phase": "趋势多", + "confirm": null, + "sar_side": "多", + "sar_value": 46.756, + "sar_flip_days": 2, + "choppy": true, + "boll_upper": 58.084, + "reason": "SAR 多、多空布林线中性区:偏多但不强", + "data_date": 20261112 + }, + "logic": { + "company_review": { + "period": "2026Q3", + "overall": "好", + "valuation": "中", + "doubt_hard": false, + "groups": { + "回报与护城河": "好", + "盈余质量与财务安全": "中", + "成长与含金量": "好" + }, + "grade_counts": { + "好": 3, + "中": 5, + "差": 2, + "证据不足": 0 + }, + "thesis": "公司经营质地与年度盈利能力较好,但当前价格隐含预期远超历史,预期下修是主要矛盾。", + "confidence": "中", + "invalidation": "下一期若C16现金转化<0.8x、C2收入同比转负、C3毛利率<25%,或M100预期EPS下修至接近1.12元,则论据失效。", + "antithesis": "最近四季自由现金流与经营现金流转负,账面利润未变成现金。", + "catalyst": "无法判断具体时间窗;S3/S4提及机器人核心部件批量供货与国产替代,但未给时点。", + "brain_status": "ok", + "ran_at": "2026-11-06", + "age_days": 7, + "report_url": "http://192.168.16.178:8000/company/002979.SZ/review", + "review_ref": "fc1d7677b32b2c031616afcae1b726f019953f25c8f343358865933e7dba6081", + "report_version_url": "http://192.168.16.178:8000/company/002979.SZ/review?ref=fc1d7677b32b2c031616afcae1b726f019953f25c8f343358865933e7dba6081", + "report_ran_at": "2026-11-06T18:41:09.701344+00:00", + "period_fi": "2026Q1", + "period_rf": "2026Q3", + "qual": "ok", + "n_materials": 42, + "unknown_n": 6, + "numbers_unmatched": 1, + "expectation": { + "gap_pts": 73.61111111111111, + "implied_pe_vs_cons": 0.9153318077803203, + "text": "一致预期2026Q4 EPS中位1.25元、隐含增速73.6%,显著高于历史三年复合0.0%,预期偏乐观(M100/M89/M90/C127)。" + }, + "cycle": { + "grade": "好", + "stance": "偏多" + }, + "thesis_lens_refs": [ + "L1", + "L2", + "L7", + "L16", + "L18" + ] + } + }, + "strategies": [ + { + "id": 21, + "strategy_id": "STR_20261104_002979SZ_756400", + "ts_code": "002979.SZ", + "type": "GRID", + "status": "ACTIVE", + "autonomy": "auto", + "params_json": "{\"center\": 47.18, \"lower\": 46.035, \"upper\": 52.823, \"step_pct\": 0.04, \"per_lot\": 1600, \"max_capital\": 76358.11}", + "state_json": "{\"pending\": null, \"below_floor\": false, \"last_band\": 2, \"cap_hit\": false, \"filled_levels\": {}, \"invested\": 0.0, \"inventory_source\": \"booked_lots\", \"grid_revision\": \"grid-four-percent-20261109\"}", + "note": "自动挂载: 明确吸筹(评分 73.0, 结论日 20261103) → 网格 [46.035~52.823] 档距 4.0% 上限 76,358 元;2026-11-09经用户批准改为4%,库存按已入账批次核验", + "created_at": "2026-11-04 09:40:00", + "updated_at": "2026-11-16 11:17:02", + "archived_at": null, + "book_id": "original", + "params": { + "center": 47.18, + "lower": 46.035, + "upper": 52.823, + "step_pct": 0.04, + "per_lot": 1600, + "max_capital": 76358.11 + }, + "state": { + "pending": null, + "below_floor": false, + "last_band": 2, + "cap_hit": false, + "filled_levels": {}, + "invested": 0.0, + "inventory_source": "booked_lots", + "grid_revision": "grid-four-percent-20261109" + } + } + ], + "stock_commands": [], + "ledger": [] + }, + "300750.SZ": { + "position": { + "book_id": "original", + "ts_code": "300750.SZ", + "total_qty": 100, + "avail_qty": 100, + "opened_date": "2026-11-09" + }, + "risk_exit": { + "book_id": "original", + "code": "300750.SZ", + "count": 1, + "events": [ + { + "at": "2026-11-09T10:30:28.262000+08:00", + "confidence": 0.95, + "content": "18b753a2e1a701268e470cb7a82c3558e6eff306455e85d38067d09d591de2fb", + "key": "da626c281f1deddaa9f1c5ce1fb98ca81f6aa090870eee655484a899b5ac0a9c", + "msg_id": "1794191161506-0", + "reason": "放量破249缺口下沿,岛形反转结构破坏,主力净流出印证,执行止损离场", + "source": "intraday", + "source_id": "20261109_103028_300750.SZ" + } + ], + "exit_seq": 0, + "initialized_at": "2026-11-09T09:58:03.529900+08:00", + "lot_ids": [ + "1459" + ], + "opened_date": "2026-11-09", + "phase": "STOP_BUY", + "reason": "第一次清仓信号已确认,停止新增买入,等待第二次独立信号", + "review": { + "at": "2026-11-10T03:08:05.814280+08:00", + "grade": "好", + "ref": "3d3ae1d536521e82893ec1b5735e6d49cb865e83b86d023194b35f1d316c9132" + }, + "round_id": "a313e69d301cdcd29f71", + "stopped_parents": [ + "INS_20261109_300750SZ_OPEN_93201" + ] + }, + "timing": null, + "tech": { + "stance": "中性", + "strength": null, + "phase": "分歧", + "confirm": null, + "sar_side": "多", + "sar_value": 237.909, + "sar_flip_days": 9, + "choppy": false, + "boll_upper": 278.244, + "reason": "SAR 与多空布林线方向相反,不表态", + "data_date": 20261112 + }, + "logic": { + "company_review": { + "period": "2026Q3", + "overall": "好", + "valuation": "便宜", + "doubt_hard": false, + "groups": { + "回报与护城河": "好", + "盈余质量与财务安全": "中", + "成长与含金量": "好" + }, + "grade_counts": { + "好": 4, + "中": 6, + "差": 0, + "证据不足": 0 + }, + "thesis": null, + "confidence": null, + "invalidation": null, + "antithesis": null, + "catalyst": null, + "brain_status": "gave_up", + "ran_at": "2026-11-14", + "age_days": 0, + "report_url": "http://192.168.16.178:8000/company/300750.SZ/review", + "review_ref": "7f71fd1dd41a89f7aeb1aefa61084086b0ebc72145f9e6f90ebf24a57d957ac6", + "report_version_url": "http://192.168.16.178:8000/company/300750.SZ/review?ref=7f71fd1dd41a89f7aeb1aefa61084086b0ebc72145f9e6f90ebf24a57d957ac6", + "report_ran_at": "2026-11-14T16:06:02.376916+00:00", + "period_fi": "2026Q2", + "period_rf": "2026Q3", + "qual": "ok", + "n_materials": 114, + "unknown_n": 0, + "numbers_unmatched": null, + "expectation": { + "gap_pts": 11.067624209298144, + "implied_pe_vs_cons": 0.9538140524056016, + "text": null + }, + "cycle": { + "grade": "好", + "stance": "偏多" + }, + "thesis_lens_refs": [] + } + }, + "strategies": [], + "stock_commands": [], + "ledger": [] + }, + "601126.SH": { + "position": { + "book_id": "original", + "ts_code": "601126.SH", + "total_qty": 2700, + "avail_qty": 2700, + "opened_date": "2026-11-06" + }, + "risk_exit": { + "book_id": "original", + "code": "601126.SH", + "count": 1, + "events": [ + { + "action": "SELL", + "at": "2026-11-12T13:56:48+08:00", + "coverage": 2, + "expires_at": "2026-11-12T13:59:05.546250+08:00", + "groups": { + "main_fund": { + "direction": 0, + "evidence": [], + "state": "UNKNOWN", + "weight": 0.3333333333333333 + }, + "qrs": { + "direction": -1, + "evidence": [ + { + "at": "2026-11-12T09:30:00+08:00", + "direction": -1, + "expires_at": "2026-11-12T15:00:00+08:00", + "group": "qrs", + "identity": "372dc66d4823b83b47aecef68c7e62c1ba3a19025a7cbaff0a9bff35358dcedb", + "source": "daily_qrs_symmetric_down", + "ts_code": "601126.SH" + } + ], + "state": "VALID", + "weight": 0.3333333333333333 + }, + "v3f": { + "direction": -1, + "evidence": [ + { + "at": "2026-11-12T13:56:48+08:00", + "direction": -1, + "expires_at": "2026-11-12T14:41:48+08:00", + "group": "v3f", + "identity": "9b4548fc81f478ec3d7fcc717a806254691eb03756577a0af7d5b0b3fe6c9211", + "source": "mtf_v3f", + "ts_code": "601126.SH" + } + ], + "state": "VALID", + "weight": 0.3333333333333333 + } + }, + "key": "e7f7eb097cb26ead20fdb6cf6674c4abd1a1ad6768fd8392f110c51aa6af2b8d", + "reason": "三组独立证据:同向看空", + "score": -0.666666667, + "source": "timing_fusion", + "ts_code": "601126.SH", + "verified_at": "2026-11-12T13:57:05.546250+08:00", + "version": "timing_fusion_v1" + } + ], + "exit_seq": 0, + "initialized_at": "2026-11-06T09:45:02.283085+08:00", + "lot_ids": [ + "1456", + "1458", + "1460" + ], + "opened_date": "2026-11-06", + "phase": "STOP_BUY", + "reason": "第一次清仓信号已确认,停止新增买入,等待第二次独立信号", + "review": { + "at": "2026-11-02T12:15:00.791329+08:00", + "grade": "好", + "ref": "5caefe48f8776bc10d22c1e4802cbdbec3f49af24c14b17920e988c6490b3358" + }, + "round_id": "c4d5ad09d8b4c8720940", + "stopped_parents": [ + "INS_20261106_601126SH_OPEN_93200", + "STR20261109094705_601126SH_g", + "STR20261110094004_601126SH_g" + ] + }, + "timing": { + "action": "WAIT", + "at": "2026-11-16T09:30:00+08:00", + "coverage": 1, + "expires_at": "2026-11-16T11:20:00.115234+08:00", + "groups": { + "main_fund": { + "direction": 0, + "evidence": [], + "state": "UNKNOWN", + "weight": 0.3333333333333333 + }, + "qrs": { + "direction": -1, + "evidence": [ + { + "at": "2026-11-16T09:30:00+08:00", + "direction": -1, + "expires_at": "2026-11-16T15:00:00+08:00", + "group": "qrs", + "identity": "5ba6fa755e77cf4b0cde2111f68fcb1f7fd5c2818c15ab52ca06cb5d04d00080", + "source": "daily_qrs_symmetric_down", + "ts_code": "601126.SH" + } + ], + "state": "VALID", + "weight": 0.3333333333333333 + }, + "v3f": { + "direction": 0, + "evidence": [], + "state": "UNKNOWN", + "weight": 0.3333333333333333 + } + }, + "key": "63a2f3b523052fc404636ec7e886bd6a01234729a0466cf29c35f9c8c5b85031", + "reason": "三组独立证据:证据不足或方向冲突,等待", + "score": -0.333333333, + "source": "timing_fusion", + "ts_code": "601126.SH", + "verified_at": "2026-11-16T11:18:00.115234+08:00", + "version": "timing_fusion_v1" + }, + "tech": { + "stance": "看多", + "strength": "弱", + "phase": "趋势多", + "confirm": null, + "sar_side": "多", + "sar_value": 28.405, + "sar_flip_days": 8, + "choppy": false, + "boll_upper": 32.857, + "reason": "SAR 多、多空布林线中性区:偏多但不强", + "data_date": 20261112 + }, + "logic": { + "company_review": { + "period": "2026Q3", + "overall": "好", + "valuation": "便宜", + "doubt_hard": false, + "groups": { + "回报与护城河": "好", + "盈余质量与财务安全": "中", + "成长与含金量": "好" + }, + "grade_counts": { + "好": 5, + "中": 4, + "差": 1, + "证据不足": 0 + }, + "thesis": "公司经营现金流扎实、市场预期不高且价格位于低位,存在由悲观定位修复的预期差。", + "confidence": "中", + "invalidation": "下期年报若M31降至<0.8、M36应计>5%、M57收入同比转负,则经营含金量失效", + "antithesis": "估值分位仍在高位,并非防御型便宜标的", + "catalyst": "无法判断", + "brain_status": "ok", + "ran_at": "2026-11-02", + "age_days": 11, + "report_url": "http://192.168.16.178:8000/company/601126.SH/review", + "review_ref": "5caefe48f8776bc10d22c1e4802cbdbec3f49af24c14b17920e988c6490b3358", + "report_version_url": "http://192.168.16.178:8000/company/601126.SH/review?ref=5caefe48f8776bc10d22c1e4802cbdbec3f49af24c14b17920e988c6490b3358", + "report_ran_at": "2026-11-02T04:15:00.791329+00:00", + "period_fi": "2026Q1", + "period_rf": "2026Q3", + "qual": "ok", + "n_materials": 37, + "unknown_n": 6, + "numbers_unmatched": 0, + "expectation": { + "gap_pts": 2.2187279622897904, + "implied_pe_vs_cons": 0.6418693371483071, + "text": "一致预期隐含增速16.5%仅比历史三年14.3%高2.2个点,价格预期不高(M89/M91/C127)" + }, + "cycle": { + "grade": "好", + "stance": "偏多" + }, + "thesis_lens_refs": [ + "L10", + "L16", + "L1", + "L2" + ] + } + }, + "strategies": [ + { + "id": 22, + "strategy_id": "STR_20261109_601126SH_188403", + "ts_code": "601126.SH", + "type": "GRID", + "status": "ACTIVE", + "autonomy": "auto", + "params_json": "{\"center\": 31.39, \"lower\": 30.116, \"upper\": 32.825, \"step_pct\": 0.04, \"per_lot\": 1000, \"max_capital\": 67730.61}", + "state_json": "{\"pending\": null, \"below_floor\": true, \"last_band\": -1, \"cap_hit\": false, \"filled_levels\": {\"1460\": {\"qty\": 1000, \"price\": 31.37, \"sell_target\": 32.63, \"entry_level\": 31.372, \"original_entry_level\": 31.372, \"buy_instruction_id\": \"STR20261110094004_601126SH_g\", \"lot_id\": 1460}, \"1458\": {\"qty\": 1000, \"price\": 31.37, \"sell_target\": 32.63, \"entry_level\": null, \"original_entry_level\": null, \"buy_instruction_id\": \"STR20261109094705_601126SH_g\", \"lot_id\": 1458}}, \"invested\": 62740.0, \"inventory_source\": \"booked_lots\", \"grid_revision\": \"grid-four-percent-20261109\"}", + "note": "自动挂载: 明确吸筹(评分 71.4, 结论日 20261106) → 网格 [30.116~32.825] 档距 4.0% 上限 67,731 元;2026-11-09经用户批准改为4%,库存按已入账批次核验", + "created_at": "2026-11-09 09:40:04", + "updated_at": "2026-11-16 11:17:02", + "archived_at": null, + "book_id": "original", + "params": { + "center": 31.39, + "lower": 30.116, + "upper": 32.825, + "step_pct": 0.04, + "per_lot": 1000, + "max_capital": 67730.61 + }, + "state": { + "pending": null, + "below_floor": true, + "last_band": -1, + "cap_hit": false, + "filled_levels": { + "1460": { + "qty": 1000, + "price": 31.37, + "sell_target": 32.63, + "entry_level": 31.372, + "original_entry_level": 31.372, + "buy_instruction_id": "STR20261110094004_601126SH_g", + "lot_id": 1460 + }, + "1458": { + "qty": 1000, + "price": 31.37, + "sell_target": 32.63, + "entry_level": null, + "original_entry_level": null, + "buy_instruction_id": "STR20261109094705_601126SH_g", + "lot_id": 1458 + } + }, + "invested": 62740.0, + "inventory_source": "booked_lots", + "grid_revision": "grid-four-percent-20261109" + } + } + ], + "stock_commands": [], + "ledger": [ + { + "id": 7551, + "ts_code": "601126.SH", + "decided_at": "2026-11-12 13:57:06", + "action": "SIGNAL", + "arbiter": "system", + "verdict": "NOTE", + "price_at": "0.000", + "reason": "三组独立证据:同向看空", + "ref_id": "e7f7eb097cb26ead20fdb6cf6674c4abd1a1ad6768fd8392f110c51aa6af2b8d", + "outcome_scored": 0, + "book_id": "original", + "hard_numbers": { + "timing_direction": { + "version": "timing_fusion_v1", + "ts_code": "601126.SH", + "source": "timing_fusion", + "key": "e7f7eb097cb26ead20fdb6cf6674c4abd1a1ad6768fd8392f110c51aa6af2b8d", + "action": "SELL", + "score": -0.666666667, + "coverage": 2, + "groups": { + "qrs": { + "weight": 0.3333333333333333, + "state": "VALID", + "direction": -1, + "evidence": [ + { + "ts_code": "601126.SH", + "group": "qrs", + "direction": -1, + "at": "2026-11-12T09:30:00+08:00", + "expires_at": "2026-11-12T15:00:00+08:00", + "identity": "372dc66d4823b83b47aecef68c7e62c1ba3a19025a7cbaff0a9bff35358dcedb", + "source": "daily_qrs_symmetric_down" + } + ] + }, + "main_fund": { + "weight": 0.3333333333333333, + "state": "UNKNOWN", + "direction": 0, + "evidence": [] + }, + "v3f": { + "weight": 0.3333333333333333, + "state": "VALID", + "direction": -1, + "evidence": [ + { + "ts_code": "601126.SH", + "group": "v3f", + "direction": -1, + "at": "2026-11-12T13:56:48+08:00", + "expires_at": "2026-11-12T14:41:48+08:00", + "identity": "9b4548fc81f478ec3d7fcc717a806254691eb03756577a0af7d5b0b3fe6c9211", + "source": "mtf_v3f" + } + ] + } + }, + "at": "2026-11-12T13:56:48+08:00", + "verified_at": "2026-11-12T13:57:05.546250+08:00", + "expires_at": "2026-11-12T13:59:05.546250+08:00", + "reason": "三组独立证据:同向看空" + } + } + }, + { + "id": 7552, + "ts_code": "601126.SH", + "decided_at": "2026-11-12 13:57:06", + "action": "SIGNAL", + "arbiter": "system", + "verdict": "PASS", + "price_at": "0.000", + "reason": "第一次清仓信号已确认,停止新增买入,等待第二次独立信号", + "ref_id": "e7f7eb097cb26ead20fdb6cf6674c4abd1a1ad6768fd8392f110c51aa6af2b8d", + "outcome_scored": 0, + "book_id": "original", + "hard_numbers": { + "event": { + "version": "timing_fusion_v1", + "ts_code": "601126.SH", + "source": "timing_fusion", + "key": "e7f7eb097cb26ead20fdb6cf6674c4abd1a1ad6768fd8392f110c51aa6af2b8d", + "action": "SELL", + "score": -0.666666667, + "coverage": 2, + "groups": { + "qrs": { + "weight": 0.3333333333333333, + "state": "VALID", + "direction": -1, + "evidence": [ + { + "ts_code": "601126.SH", + "group": "qrs", + "direction": -1, + "at": "2026-11-12T09:30:00+08:00", + "expires_at": "2026-11-12T15:00:00+08:00", + "identity": "372dc66d4823b83b47aecef68c7e62c1ba3a19025a7cbaff0a9bff35358dcedb", + "source": "daily_qrs_symmetric_down" + } + ] + }, + "main_fund": { + "weight": 0.3333333333333333, + "state": "UNKNOWN", + "direction": 0, + "evidence": [] + }, + "v3f": { + "weight": 0.3333333333333333, + "state": "VALID", + "direction": -1, + "evidence": [ + { + "ts_code": "601126.SH", + "group": "v3f", + "direction": -1, + "at": "2026-11-12T13:56:48+08:00", + "expires_at": "2026-11-12T14:41:48+08:00", + "identity": "9b4548fc81f478ec3d7fcc717a806254691eb03756577a0af7d5b0b3fe6c9211", + "source": "mtf_v3f" + } + ] + } + }, + "at": "2026-11-12T13:56:48+08:00", + "verified_at": "2026-11-12T13:57:05.546250+08:00", + "expires_at": "2026-11-12T13:59:05.546250+08:00", + "reason": "三组独立证据:同向看空" + }, + "count": 1, + "round_id": "c4d5ad09d8b4c8720940" + } + }, + { + "id": 7559, + "ts_code": "601126.SH", + "decided_at": "2026-11-12 14:42:01", + "action": "SIGNAL", + "arbiter": "system", + "verdict": "NOTE", + "price_at": "0.000", + "reason": "三组独立证据:证据不足或方向冲突,等待", + "ref_id": "0aa18cb19c70fed688865f5dc4b5f1a9520fdd420c0a2938faabce85e6027b4a", + "outcome_scored": 0, + "book_id": "original", + "hard_numbers": { + "timing_direction": { + "version": "timing_fusion_v1", + "ts_code": "601126.SH", + "source": "timing_fusion", + "key": "0aa18cb19c70fed688865f5dc4b5f1a9520fdd420c0a2938faabce85e6027b4a", + "action": "WAIT", + "score": -0.333333333, + "coverage": 1, + "groups": { + "qrs": { + "weight": 0.3333333333333333, + "state": "VALID", + "direction": -1, + "evidence": [ + { + "ts_code": "601126.SH", + "group": "qrs", + "direction": -1, + "at": "2026-11-12T09:30:00+08:00", + "expires_at": "2026-11-12T15:00:00+08:00", + "identity": "372dc66d4823b83b47aecef68c7e62c1ba3a19025a7cbaff0a9bff35358dcedb", + "source": "daily_qrs_symmetric_down" + } + ] + }, + "main_fund": { + "weight": 0.3333333333333333, + "state": "UNKNOWN", + "direction": 0, + "evidence": [] + }, + "v3f": { + "weight": 0.3333333333333333, + "state": "UNKNOWN", + "direction": 0, + "evidence": [] + } + }, + "at": "2026-11-12T09:30:00+08:00", + "verified_at": "2026-11-12T14:42:00.119752+08:00", + "expires_at": "2026-11-12T14:44:00.119752+08:00", + "reason": "三组独立证据:证据不足或方向冲突,等待" + } + } + }, + { + "id": 7571, + "ts_code": "601126.SH", + "decided_at": "2026-11-12 15:00:01", + "action": "SIGNAL", + "arbiter": "system", + "verdict": "NOTE", + "price_at": "0.000", + "reason": "三组独立证据:证据不足或方向冲突,等待", + "ref_id": "8d58864513852bbb067c47fc263c8c18a2e7c5494d04345f8b81131373e0886d", + "outcome_scored": 0, + "book_id": "original", + "hard_numbers": { + "timing_direction": { + "version": "timing_fusion_v1", + "ts_code": "601126.SH", + "source": "timing_fusion", + "key": "8d58864513852bbb067c47fc263c8c18a2e7c5494d04345f8b81131373e0886d", + "action": "WAIT", + "score": 0.0, + "coverage": 0, + "groups": { + "qrs": { + "weight": 0.3333333333333333, + "state": "UNKNOWN", + "direction": 0, + "evidence": [] + }, + "main_fund": { + "weight": 0.3333333333333333, + "state": "UNKNOWN", + "direction": 0, + "evidence": [] + }, + "v3f": { + "weight": 0.3333333333333333, + "state": "UNKNOWN", + "direction": 0, + "evidence": [] + } + }, + "at": "2026-11-12T15:00:01.032502+08:00", + "verified_at": "2026-11-12T15:00:01.032502+08:00", + "expires_at": "2026-11-12T15:01:01.032502+08:00", + "reason": "三组独立证据:证据不足或方向冲突,等待" + } + } + }, + { + "id": 7588, + "ts_code": "601126.SH", + "decided_at": "2026-11-13 09:32:01", + "action": "SIGNAL", + "arbiter": "system", + "verdict": "NOTE", + "price_at": "0.000", + "reason": "三组独立证据:证据不足或方向冲突,等待", + "ref_id": "00837866c4169f942a726886f7e25f066130f0a869a4f588cce4ba50e3d0ed7e", + "outcome_scored": 0, + "book_id": "original", + "hard_numbers": { + "timing_direction": { + "version": "timing_fusion_v1", + "ts_code": "601126.SH", + "source": "timing_fusion", + "key": "00837866c4169f942a726886f7e25f066130f0a869a4f588cce4ba50e3d0ed7e", + "action": "WAIT", + "score": -0.333333333, + "coverage": 1, + "groups": { + "qrs": { + "weight": 0.3333333333333333, + "state": "VALID", + "direction": -1, + "evidence": [ + { + "ts_code": "601126.SH", + "group": "qrs", + "direction": -1, + "at": "2026-11-13T09:30:00+08:00", + "expires_at": "2026-11-13T15:00:00+08:00", + "identity": "e155c192986f8d65abf03c58f3787aaaa2398dd4b5a0bc5497bd737a96d6704a", + "source": "daily_qrs_symmetric_down" + } + ] + }, + "main_fund": { + "weight": 0.3333333333333333, + "state": "UNKNOWN", + "direction": 0, + "evidence": [] + }, + "v3f": { + "weight": 0.3333333333333333, + "state": "UNKNOWN", + "direction": 0, + "evidence": [] + } + }, + "at": "2026-11-13T09:30:00+08:00", + "verified_at": "2026-11-13T09:32:00.049057+08:00", + "expires_at": "2026-11-13T09:34:00.049057+08:00", + "reason": "三组独立证据:证据不足或方向冲突,等待" + } + } + }, + { + "id": 7783, + "ts_code": "601126.SH", + "decided_at": "2026-11-13 15:00:06", + "action": "SIGNAL", + "arbiter": "system", + "verdict": "NOTE", + "price_at": "0.000", + "reason": "三组独立证据:证据不足或方向冲突,等待", + "ref_id": "f96bc56b1a9a389d1fb053cb386c2cdf2c63ee938f3b633537be8224f5a2a0fd", + "outcome_scored": 0, + "book_id": "original", + "hard_numbers": { + "timing_direction": { + "version": "timing_fusion_v1", + "ts_code": "601126.SH", + "source": "timing_fusion", + "key": "f96bc56b1a9a389d1fb053cb386c2cdf2c63ee938f3b633537be8224f5a2a0fd", + "action": "WAIT", + "score": 0.0, + "coverage": 0, + "groups": { + "qrs": { + "weight": 0.3333333333333333, + "state": "UNKNOWN", + "direction": 0, + "evidence": [] + }, + "main_fund": { + "weight": 0.3333333333333333, + "state": "UNKNOWN", + "direction": 0, + "evidence": [] + }, + "v3f": { + "weight": 0.3333333333333333, + "state": "UNKNOWN", + "direction": 0, + "evidence": [] + } + }, + "at": "2026-11-13T15:00:05.499280+08:00", + "verified_at": "2026-11-13T15:00:05.499280+08:00", + "expires_at": "2026-11-13T15:01:05.499280+08:00", + "reason": "三组独立证据:证据不足或方向冲突,等待" + } + } + }, + { + "id": 7811, + "ts_code": "601126.SH", + "decided_at": "2026-11-16 09:32:04", + "action": "SIGNAL", + "arbiter": "system", + "verdict": "NOTE", + "price_at": "0.000", + "reason": "三组独立证据:证据不足或方向冲突,等待", + "ref_id": "63a2f3b523052fc404636ec7e886bd6a01234729a0466cf29c35f9c8c5b85031", + "outcome_scored": 0, + "book_id": "original", + "hard_numbers": { + "timing_direction": { + "version": "timing_fusion_v1", + "ts_code": "601126.SH", + "source": "timing_fusion", + "key": "63a2f3b523052fc404636ec7e886bd6a01234729a0466cf29c35f9c8c5b85031", + "action": "WAIT", + "score": -0.333333333, + "coverage": 1, + "groups": { + "qrs": { + "weight": 0.3333333333333333, + "state": "VALID", + "direction": -1, + "evidence": [ + { + "ts_code": "601126.SH", + "group": "qrs", + "direction": -1, + "at": "2026-11-16T09:30:00+08:00", + "expires_at": "2026-11-16T15:00:00+08:00", + "identity": "5ba6fa755e77cf4b0cde2111f68fcb1f7fd5c2818c15ab52ca06cb5d04d00080", + "source": "daily_qrs_symmetric_down" + } + ] + }, + "main_fund": { + "weight": 0.3333333333333333, + "state": "UNKNOWN", + "direction": 0, + "evidence": [] + }, + "v3f": { + "weight": 0.3333333333333333, + "state": "UNKNOWN", + "direction": 0, + "evidence": [] + } + }, + "at": "2026-11-16T09:30:00+08:00", + "verified_at": "2026-11-16T09:32:03.942316+08:00", + "expires_at": "2026-11-16T09:34:03.942316+08:00", + "reason": "三组独立证据:证据不足或方向冲突,等待" + } + } + } + ] + }, + "603259.SH": { + "position": { + "book_id": "original", + "ts_code": "603259.SH", + "total_qty": 100, + "avail_qty": 100, + "opened_date": "2026-11-06" + }, + "risk_exit": { + "book_id": "original", + "code": "603259.SH", + "count": 0, + "events": [], + "exit_seq": 0, + "initialized_at": "2026-11-06T09:57:02.207649+08:00", + "lot_ids": [ + "1457" + ], + "opened_date": "2026-11-06", + "phase": "WATCH", + "review": { + "at": "2026-11-05T12:34:32.085489+08:00", + "grade": "好", + "ref": "09942b49613cf22d1b1f5008593a2dde19011d3248c6864d8cb2b0bf344ecb74" + }, + "round_id": "cbfbb3748fe303d9c7b4", + "stopped_parents": [ + "INS_20261106_603259SH_OPEN_001_feed045bd695" + ] + }, + "timing": null, + "tech": { + "stance": "看多", + "strength": "强", + "phase": "趋势多", + "confirm": null, + "sar_side": "多", + "sar_value": 135.333, + "sar_flip_days": 6, + "choppy": false, + "boll_upper": 154.447, + "reason": "SAR 多且多空布林线多头区:上升趋势延续", + "data_date": 20261112 + }, + "logic": { + "company_review": { + "period": "2026Q3", + "overall": "好", + "valuation": "便宜", + "doubt_hard": false, + "groups": { + "回报与护城河": "好", + "盈余质量与财务安全": "中", + "成长与含金量": "中" + }, + "grade_counts": { + "好": 6, + "中": 2, + "差": 2, + "证据不足": 0 + }, + "thesis": "高利润率、净现金、低资本开支的优质生意,市场预期增速低于历史,估值偏低,存在预期差机会", + "confidence": "中", + "invalidation": "下期看C16(OCF/NI<0.8)、C37(应计>10%)、C24(ROE<15%)、C129(PE/十年中位>1.3),出现即转弱", + "antithesis": "现金转化不足,经营现金流仅为净利润0.72倍,利润含金量弱于报表净利(C16、C38)", + "catalyst": "在手订单同比增28.8%为潜在催化;具体兑现时间窗无法判断(S3)", + "brain_status": "ok", + "ran_at": "2026-11-05", + "age_days": 8, + "report_url": "http://192.168.16.178:8000/company/603259.SH/review", + "review_ref": "09942b49613cf22d1b1f5008593a2dde19011d3248c6864d8cb2b0bf344ecb74", + "report_version_url": "http://192.168.16.178:8000/company/603259.SH/review?ref=09942b49613cf22d1b1f5008593a2dde19011d3248c6864d8cb2b0bf344ecb74", + "report_ran_at": "2026-11-05T04:34:32.085489+00:00", + "period_fi": "2026Q2", + "period_rf": "2026Q3", + "qual": "ok", + "n_materials": 81, + "unknown_n": 6, + "numbers_unmatched": 0, + "expectation": { + "text": "一致预期隐含EPS增速20.1%低于历史三年复合30.6%,预期差-10.5个百分点,市场要求不高(C127、M91)", + "gap_pts": -10.49317789419526, + "implied_pe_vs_cons": 1.0391687208888205 + }, + "cycle": { + "grade": "中", + "stance": null + }, + "thesis_lens_refs": [ + "L1", + "L3", + "L7", + "L16", + "L18" + ] + } + }, + "strategies": [], + "stock_commands": [], + "ledger": [] + } + }, + "additional_params": { + "PMS_SELF_DECIDE": "full", + "PMS_SELF_DECIDE_DAILY_MAX": 3, + "PMS_TECH_GATE_INCREASE": true, + "PMS_CONSENSUS_ROUTE": true + }, + "note": "155只读核验;附加参数单独读取。没有交易tick、模型调用或写操作。缺失择时不解释为中性。" +} diff --git a/docs/交易计划与风险约束整改接续_2026-11-16.md b/docs/交易计划与风险约束整改接续_2026-11-16.md index 39caca9..df30b13 100644 --- a/docs/交易计划与风险约束整改接续_2026-11-16.md +++ b/docs/交易计划与风险约束整改接续_2026-11-16.md @@ -1,6 +1,8 @@ # 交易计划与风险约束整改接续 -最新运行核验时间:2026年11月16日11:08:06,北京时间。网格库存约束与试探预算约束均已发布155模拟PMS。下一工作包是退出纪律的证据与可达性核验;新的止损阈值尚未上线。 +最新规则核验:2026年11月16日11:19,北京时间。本批已按用户决定修正原试探建仓预算的适用范围,并恢复人工止损触价清仓;开发机验证与候选发布正在推进,尚不能把本批记作已上线。前次11:08运行回执仅属历史。 + +规则来源、四方证据时间线、开发落点与验收标准见[建平仓规则对齐与人工止损验收](建平仓规则对齐与人工止损验收_2026-11-16.md)。上一版“一律暂停试探持仓自动新增”的扩展错误,已由用户明确纠正,原预算保护保留,后续策略独立审批。 ## 当前工作 @@ -19,14 +21,14 @@ | 关键交易核验 | 主要路径已确认 | 杰普特两次模型完整输入仍缺;不阻塞确定性数量与库存修复 | | 试探预算约束 | 已开发并发布155,隔离回归与自然调度通过 | 自然最低申报拒绝、报价变化及部分成交后的预算限制 | | 网格库存约束 | 已开发并发布155,隔离回归与自然调度通过 | 自然行情触发库存限制,以及卖出入账后恢复同价循环 | -| 退出方案 | 待核验与设计 | 二次确认可达性和价格失效比较 | +| 退出方案 | 二次确认可达性与四方真实证据已核验;人工止损恢复开发完成 | 本批发布、自然触价场景与价格失效比较 | | 分层评价与产品验收 | 待实施 | 历史冻结名单覆盖与当前页面任务检查 | -## 155试探预算发布与实际回执 +## 155试探预算发布与实际回执(历史,整轮禁买口径已纠正) 代码`6c5afe2`于11:05:35完成定向发布。开发机Python3.12全量87组、预算专项41项与batch51的38项隔离通过。155候选web断网全量87组、worker断网全量86组通过。实现和预算01至09映射见[试探预算验收记录](试探预算约束实现与验收_2026-11-16.md)。 -| 服务 | 当前镜像 | 镜像摘要 | +| 服务 | 11:05镜像 | 镜像摘要 | | --- | --- | --- | | web | `pms:remediation-budget-6c5afe2-web` | `sha256:dc04b401c1640d914d2f8321114c9bd1dbccf3948a152dd7a882ddaafcfd7949` | | worker | `pms:remediation-budget-6c5afe2-worker` | `sha256:96bfd729fc83cdebf7a87393795898f893f7c16c4296fc152f15cac6840d42fd` | @@ -62,8 +64,8 @@ ## 下一步开发入口 -工作包二已完成上述发布。下一步按规格工作包四,先读取四方等现有停买轮次的首次证据、后续证据和去重原因,逐组检查同日获得第二次独立确认的可能性;再形成正常兑现、风险失效和等待超期复核三条路径的开发规格。离线比较现行规则、原入场支撑或网格下沿失效、超期转人工复核,不凭单一股票确定固定止损百分比。 +本批先完成已确认规则的纠偏和人工止损命令恢复。四方自11月12日第一次有效看空后,已保存记录中没有第二个有效合成看空,不修改退出次数、不把缺数据改成中性或看空。首批二次确认可达性用例已覆盖同日与跨日证据组合。 -完整最大亏损、失效价与等待期限尚未确定;计划升级的产品流程、分层收益评价、页面任务验收及上述自然交易样本仍待完成。 +发布完成后补退出等待状态的业务表达,再按规格离线比较入场支撑或网格下沿失效、超期转人工复核。完整最大亏损、失效价与等待期限尚未确定,不凭单一个股选固定止损比例。分层收益评价及自然交易样本仍待完成。 -本轮已修改网格和预算业务代码、测试及文档并完成上述定向发布,没有修改运行参数、人工触发模型或交易tick、注入测试委托。退出方案和分层评价仍未完成,不能将本阶段发布标为整项整改完成。 +本轮不修改运行参数,不调用模型或交易tick,不注入测试委托。当前四只持仓均没有有效人工止损价命令,不能把本次恢复解释成替它们补设了止损价。 diff --git a/docs/交易计划与风险约束整改规格_2026-11-16.md b/docs/交易计划与风险约束整改规格_2026-11-16.md index 1b4a488..151b3c0 100644 --- a/docs/交易计划与风险约束整改规格_2026-11-16.md +++ b/docs/交易计划与风险约束整改规格_2026-11-16.md @@ -2,6 +2,8 @@ 本规格面向实施开发的AI和验收人员,解决研究结论转成建仓、加仓与退出安排时风险意图丢失的问题。用户于2026年11月16日要求先形成可指导开发且有验收标准的方案,再逐步推进。主观察期为11月9日至13日,建仓原因追溯至11月2日模拟仓重置之后。 +11月16日用户再次确认:原试探建仓只约束本次建仓预算,后续策略独立审批;人工止损按总体设计恢复触价清仓。此决定覆盖本规格初版中“一律禁止试探仓自动新增”的错误扩展,规则来源与实现验收见[建平仓规则对齐](建平仓规则对齐与人工止损验收_2026-11-16.md)。 + 第一批先修复确定性的预算放大和网格重复准入问题。新的亏损阈值、网格适用性判断与自动退出条件,须完成下述重放比较后形成单独的规则版本;不能由开发AI凭个案填入百分比。 ## 一 范围与基线 @@ -31,9 +33,9 @@ ### 1 本轮计划必须可追溯 -每只股票的一轮持仓只有一份当前有效交易计划。至少记录证券、账本、持仓轮次、计划版本、来源提议或命令、批准时刻、建仓类型、资金预算、数量上限、入场价格上限、有效期限,以及退出约束的版本。已结束轮次不能承接到新仓,内部策略名称变化不新建持仓轮次。 +同一轮持仓可包含原建仓计划与后续独立批准的补仓、网格等策略安排。每份计划应记录证券、账本、持仓轮次、版本、来源提议或命令、批准时刻、资金预算或明确数量、价格约束、有效期限和退出依据;不能把初始试探金额误当整轮终身额度。后续动作沿用其既定审批与资金约束,共享账户和单股上限。已结束轮次不能承接到新仓,内部策略名称变化不新建持仓轮次。 -新版本保留旧版本和变更依据。仅改变模型解释、报价刷新、日期或网格档距不能提高预算;从试探转为标准仓或提高总投入必须产生明确的计划变更。人工“采纳”批准界面所示的有条件计划,不等于绕过择时与价格上限。 +新版本保留旧版本和变更依据。仅改变模型解释、报价刷新、日期或网格档距不能提高原建仓预算;调整原建仓须产生明确的新计划,后续策略按独立预算和规则审批。人工“采纳”批准界面所示的有条件计划,不等于绕过择时与价格上限。 ### 2 资金预算与亏损预算分别表达 @@ -43,15 +45,15 @@ 最低申报数量仍超过预算时,输出“当前预算不足最低买入量,暂不建仓”,本计划产生零买入指令。用户若决定扩大预算,须看到新的金额、股数与风险后形成新计划;普通采纳按钮不能默认为扩大预算。 -### 3 所有买入共用同一约束 +### 3 原建仓与后续策略分别承担预算约束 -首次建仓、普通补仓、网格及做T新增买入均不能借用另一条路径扩大试探计划。使用已有统一资金占用口径,不重复计已成交、在途和未结算回报。原始投入预算不能因股价下跌、市值下降、参数刷新或卖出利润而自动提高。 +首次建仓按其原预算和数量上限执行;后续FILL、ADD、DCA、GRID、T0遵守自身审批、数量、资金与退出规则,不因试探标签一律停买,也不能冒充原建仓续单提高其预算。使用已有统一资金占用口径,不重复计已成交、在途和未结算回报。原建仓预算不能因股价下跌、市值下降、参数刷新或卖出利润而自动提高。 本轮风险额度计算、在途预留和并发落指令应在现有账户锁内完成。晚到成交、撤单未确认与部分成交继续占用相应额度;只有实际终态和入账才能释放。显式用户命令若与现有计划冲突,应按命令规则形成明确的新计划或交用户裁决,不能静默丢弃命令,也不能把普通策略动作冒充用户授权。 ### 4 已有持仓按实际事实处理 -上线不会撤销历史成交或强制把持仓压回初始数量。历史超预算持仓停止自动扩大,卖出和已有退出安排继续有效。无法确认归属或原预算时,新增风险动作等待核实,不能以零预算、零持仓或新标准仓预算替代缺失事实。 +上线不会撤销历史成交或强制把持仓压回初始数量。历史超预算的原建仓父指令停止续买,后续策略仍独立审批;卖出和已有退出安排继续有效。原建仓预算无法追溯时停止该父指令续买;策略归属或账实无法确认时按既定守卫停止相关新增,不能以零预算、零持仓或新标准仓预算替代缺失事实。 ## 四 分批实施任务 @@ -72,7 +74,7 @@ 3. 重算异常或必要输入缺失时停止该买入路径,不吞异常后沿用旧数量。卖出路径不受此买入约束阻断。 4. 提议准备、异步结果收取、自动采纳、人工采纳和执行前检查使用同一预算语义。旧提议不得依赖新页面才能被拦截。 5. 报价提高后仍受总金额约束,不能因为提议时数量合法就忽略执行金额;部分成交后的余量以已成交金额和未结算预留计算。 -6. 自动网格与补仓识别试探计划,未获升级时不能把单股8%上限余量当作可新增预算。无法安全完成跨路径改造前,试探持仓的自动新增路径按保守方式阻断并给出业务原因。 +6. 原建仓预算只绑定原父指令。后续策略按各自明确预算、数量、仓位上限、择时与退出规则独立审批,不因试探标签暂停。标准分批不足最低申报时,沿既定50%/25%/25%→60%/40%→100%合并,金额不变;试探仓不向上补足。 优先保持现有页面结构,通过现有未建仓原因和采纳结果展示限制,不新增开发参数面板。实现中如需新字段,先补计划版本与序列化契约,再接消费者。 @@ -83,7 +85,7 @@ | 1 | `advice_service.resize_to_advice`与`proposal_service._apply_advice_tier` | 先实现不可放大的原预算和明确的成功/阻断结果;消除同档短路、强制降档未重算比例、异常沿用旧数量三条旁路 | | 2 | 提议准备、异步收取、`plan_recheck.before_accept`与`web.main.api_decide` | 原预算和计划版本贯穿自动、人工及缓存提议;点击普通采纳不生成预算扩大授权;数据库原子采纳前重新核对 | | 3 | `executor`及`execution_orders.account_guard`内的最终发单路径 | 用当前合法限价、已成交金额与有效预留计算剩余额度;覆盖首次、改价、部分成交和撤单未确认,不能只约束父指令的股数 | -| 4 | `strategy_runner`及自动策略挂载 | 网格和补仓读取同一持仓轮次的计划;尚未建立可靠关联时,试探持仓只阻断新增,不影响卖出 | +| 4 | `strategy_runner`及自动策略挂载 | 移除试探标签一律停买;保留策略自身资金上限、库存、择时、在途与退出守卫 | | 5 | 旧提议与在手轮次兼容 | 不改写原始提议;能追溯的预算形成带来源的新约束,不能追溯的记录等待核实;补齐预算01至09后再发布该工作包 | 其中计划金额应独立保存,不能继续把按股数取整后的预计成交金额当作原预算。计划升级须留下旧版本、明确授权来源和新上限;并发提交按当前版本重验,不能仅依赖页面校验。 @@ -111,7 +113,7 @@ 新增自动退出阈值的前置交付是离线比较表,至少比较现行规则、价格失效配合原确认、等待超期转人工复核。价格失效候选用入场时已知的支撑或网格下沿;如加波动缓冲,记录计算窗口和参数版本。观察窗口覆盖已保存的上涨、震荡、下跌样本,按时间划分验证段;不能用四方一只票选择最佳阈值。 -未形成明确参数和样本外结论前,本工作包只交付核验、复核安排和开发规格,不自动启用新止损条件。完整交易风险计划中的最大亏损、失效价、等待期限缺一时,不能宣称已完成风险定量。 +人工设置止损价属于用户已确认的既定命令,按触价清仓恢复,不受第二次模型信号约束。依次核验命令、当日有效行情、全局暂停、旧单撤销、回报入账、实际总持仓及T+1;复用统一退出收尾,不新增固定亏损百分比。除此之外,未形成明确参数和样本外结论前,不自动启用新的止损条件。完整交易风险计划中的最大亏损、失效价、等待期限缺一时,不能宣称已完成风险定量。 ### 工作包五 分层评价与交易员验收 @@ -134,7 +136,8 @@ | 预算05 | 缺预算、价格非法、NaN或重算抛异常 | 不生成新买入;明确原因;卖出正常 | | 预算06 | 自动采纳、人工采纳、旧缓存提议、异步旧结果 | 所有入口遵守同一预算,旧版本不能覆盖新计划 | | 预算07 | 报价上涨、部分成交、未确认撤单、迟到成交 | 总成交与有效预留不超预算;不重复扣减或提前释放 | -| 预算08 | 试探持仓自动挂网格或补仓 | 未有明确升级计划时不能扩大本轮预算 | +| 预算08 | 试探持仓后续网格、补仓或做T | 初始试探标签不阻断独立策略;各策略原资金、数量、择时和退出守卫继续有效 | +| 预算10 | 标准仓分批不足最低申报 | 启用合并时仅在原金额内依次尝试60%/40%、100%;禁用合并或整体不足时返回0 | | 预算09 | 两条买入并发与计划升级并发 | 在账户锁内按当前版本复核,不能双重获得余额 | | 网格01 | 四方原参数2%改4%,31.37元库存未平,再下穿31.372 | 不生成第二笔同价买入,旧库存与成本不变 | | 网格02 | 改中枢、档距或单档数量 | 不清除既有库存限制;无迁移补单 | diff --git a/docs/建平仓规则对齐与人工止损验收_2026-11-16.md b/docs/建平仓规则对齐与人工止损验收_2026-11-16.md new file mode 100644 index 0000000..79e249c --- /dev/null +++ b/docs/建平仓规则对齐与人工止损验收_2026-11-16.md @@ -0,0 +1,83 @@ +# 建平仓规则对齐与人工止损验收 + +本次按用户要求,先复核总体设计、后续明确决定和运行值,再继续整改。用户已裁定两项冲突:试探预算限制本次建仓,后续策略独立审批;人工设置止损价恢复为触价后生成清仓安排,遵守全局暂停、撤单收尾与T+1。 + +上一版`6c5afe2`将试探标签扩展成整轮自动新增禁令,是整改时错误扩大了约束,现予以纠正。历史成交与当次发布证据保留。本文件供开发AI继续实施和验收,不把代码现状自动当成设计授权。 + +## 规则来源与取舍 + +优先采用当前用户指令,其次采用后续明确决定,再以[总体设计](../POSITION_MGMT_DESIGN.md)补足未变更部分。运行参数须到ParamStore核实;实际代码与旧核验记录用于识别差异。 + +已读依据包括[复盘决定台账](复盘决定台账.md)、[11月5日退出纪律](两次清仓信号与评级下降退出_2026-11-05.md)、[11月10日停买恢复](择时恢复与关注入池修复_2026-11-10.md)、[11月11日多源择时](多源择时发布接续_2026-11-11.md)和[网格成交余量](网格档距与成交余量修复_2026-11-09.md)。11月5日已明确试探建仓后可以继续按系统规则规划,不能新增“必须先升级试探标签”的门槛。9月14日系统自决已调整部分原人工确认环节,不能机械恢复旧文档的所有人工限制。 + +11月16日11:19在155只读核实:原策略、空表前缀、WS执行;全局停买与全局暂停均为false。总规模1967927.74元,组合上限70%、单股上限8%、默认目标6%,合并分批开启。系统自决为full。70%是现行值,旧设计中的60%不能直接覆盖它。风险披露1%和6%是告警线,不是新批准的最大亏损硬限。 + +## 建仓与后续动作 + +| 动作 | 保留的条件与边界 | 本次变化 | +| --- | --- | --- | +| 原OPEN建仓 | 原金额、批准数量上限、当前合法报价、实际累计成交、有效预留和账户上限 | 保留预算不足最低申报时零数量;不能被采纳、改价或最低200股向上放大 | +| 标准仓分批 | 原50%/25%/25%不足最低量时,合并开关允许依次尝试60%/40%、100% | 恢复预算内合并,不扩大总金额;关闭合并则保持原分批约束 | +| FILL补仓 | 建仓10交易日内,安全垫大于-3%且不大于0,支撑未破,仅一次,仍有目标空间 | 按自身规则,不受试探标签一律阻断 | +| ADD加仓 | 安全垫至少3%,五日新高或阻力突破、间隔和MA5不追高等现行条件 | 独立审批与数量计算,不改原OPEN预算 | +| DCA摊薄 | -8%、-15%分档,累计不超过底仓50%,次数及既定研判、自决规则 | 不因原设计曾写人工而绕过后续自决决定,也不额外放宽 | +| GRID网格 | 策略资金上限、单档数量、真实下穿、择时、停买、在途、库存价差与账户上限 | 去掉试探持仓总禁令,保留本日已发布的跨参数库存约束 | +| T0做T | 原授权、增量、回补和收口规则,账本归属清楚 | 不把做T内部命令标志当原建仓扩大预算授权 | + +同股已有买入父指令时,新的OPEN仍不能重复分配预算。后续策略获准不等于原建仓额度增加,也不等于当前一定能买。雷赛、宁德、四方仍有首次看空停买,移除试探禁令不会解除这些停买。 + +## 平仓规则及人工止损实现 + +| 路径 | 当前有效规则 | +| --- | --- | +| 首次正式清仓信号 | 停止新增买入并撤原买入,正常卖出继续;不能当作已决定全仓退出 | +| 第二次独立确认 | 至少两个支持组有新的有效证据;整票原策略持仓清仓,保留撤单、回报与T+1收尾 | +| 正式买方评级下降 | 好降中、中降差等任一级下降触发退出;缺数、过期或同版本冲突不当降级 | +| 新有效看多 | 只可按现行共识规则恢复第一次系统停买,不覆盖用户暂停或已启动退出 | +| 普通持仓技术退出 | 新鲜SAR转空,确认后清可卖量、未确认按现行三分之一减仓;活跃策略票不重复走普通技术减仓 | +| TRAIL保护 | 既有SAR、目标位与回撤条件,试探弱质地用已有紧保护参数;不能套用到GRID | +| GRID兑现与下破 | 网格卖出保护BASE,只卖实际ADD库存;正常卖出仍满足成本和4%价差。下破下沿停买,现行规则未授权仅据下沿全仓止损 | +| 人工止损价 | 本次按用户决定恢复触价清仓。读取最新有效SET_STOP_PRICE命令及生效后的当日有效分钟行情,等于或低于止损价即记录退出意图,不等第二条信号,不依赖研判或系统自决档位 | + +人工止损复用`risk_exit`持仓轮次与退出状态,不新建另一套卖出执行器。先保存命令ID、命令时间、触价、止损价、行情来源与时间;全局暂停时不撤单或发单。可执行后先停买、撤策略买卖单,待原策略旧委托及待入账回报收尾,再按实际总持仓生成一条紧急EXIT。已有用户卖单先完成,剩余再清,避免超卖。持仓与批次不符或成交修正未核实则等待。 + +EXIT保留总清仓数量,发单仍限当前可卖量。部分成交和跨日不生成重复清仓;旧买单迟到的新增持仓继续归原轮次收尾。人工撤销或拒绝的清仓转待处理,不由下一跳重新开单。填0或修改止损价只改变未触发条件,不自动撤回已生成的退出意图;恢复买入须先处理清仓安排。 + +行情必须有当日日期、时区和来源,不能早于命令生效或晚于当前时间;时龄复用ParamStore的`PMS_EXEC_MINUTE_MAX_AGE_SEC`。不读取每天被重算的`stop_ref`投影,不用昨收替代现价,不用历史分钟最低价补造触价。止损价是触发条件,实际报价继续走既有执行规则。盘中每分钟扫描,不能宣称逐笔即时触发。 + +## 四方证据与二次确认可达性 + +只读原记录,未调用模型、交易tick或回放。11月11日多源择时生效后,四方共有7条相关退出与信号审计,未截断;详细脱敏依据见[规则核验快照](evidence/entry_exit_rules_20261116.json)。 + +| 时点 | 保存的事实 | 退出含义 | +| --- | --- | --- | +| 11月12日13:56:48 | 当日09:30 QRS看空,加当时资金异动看空;主力资金组缺有效证据 | 首次有效合成看空 | +| 11月12日13:57:06 | 合成信号与首次退出登记各一条审计 | 两条账本记录是同一事件,不能算两次 | +| 11月12日14:42 | 资金异动过期,只余QRS | 合成为等待,不是第二次看空 | +| 11月13日09:32、11月16日09:32 | 各有当日新QRS看空,另外两组缺有效支持 | 仍不构成有效合成看空 | +| 11月16日11:18核验 | 最新合成仍等待;四方退出计数1、网格下沿状态已破 | 2700股仍持有,原规则要求停买;不能说第二次信号被程序吞掉 | + +首次QRS与资金异动后,同日只有资金异动更新,不满足两个组都独立更新;若资金异动与主力资金均有新有效看空,可在同日确认。次日新QRS加新的资金组也可确认。只改变发布时间、消息ID或模型文案不构成新证据。 + +本次核验没有证明现行等待期限或退出结果最优,也没有用后来的价格倒推应卖。现有保存记录支持“后续两组覆盖不足”,不能把未成交记作准确预测。当前四只持仓均无有效人工止损价,不能用本次恢复功能追溯触发四方历史价格或替用户补设止损价。 + +## 验收标准与状态 + +| 编号 | 最终状态验收 | 测试入口 | +| --- | --- | --- | +| 规则01 | 杰普特15695元仍不能买200股;原OPEN部分成交、涨价与并发不越预算 | `test_buy_budget.py` | +| 规则02 | 后续独立ADD/FILL/DCA/T0不因试探标签拒绝,原OPEN仍受限;网格自身资金和停买约束不变 | `test_buy_budget.py`、`test_grid_execution.py` | +| 规则03 | 标准仓30000元、100元价格合并60%/40%;科创板整体够最低量可合一批;关闭合并不抬量 | `test_buy_budget.py` | +| 退出01 | 原始QRS不变、仅一组更新不计二次;同日两新组或次日新QRS加新资金组生成且只生成一条EXIT | `test_timing_fusion.py` | +| 止损01 | 等价和低价触发,高价不触发;零价取消,最新命令覆盖旧命令;未知、未来、过期行情不触发 | `test_user_stop.py` | +| 止损02 | 不等模型和第二信号;人工止损不被模型风险开关关闭;全局暂停留意图不动作,单纯停买允许清仓 | `test_user_stop.py` | +| 止损03 | 旧买卖单撤单失败、撤单未确认、待入账时不叠加EXIT;已有用户卖出完成后按实际余量清仓 | `test_user_stop.py` | +| 止损04 | T+1保留总量,部分成交不重复,清零后旧买单迟到继续退出;其他账本和空仓不被处理 | `test_user_stop.py` | +| 止损05 | 审计失败回滚,指令失败保留退出意图,重试幂等;人工撤销不自动重开 | `test_user_stop.py` | +| 产品01 | 设置止损弹窗明确触价清仓、暂停与T+1;不再显示“只提醒、不自动卖”,沿用现有样式 | 页面三道护栏;本次无布局或交互改动 | + +开发机已完成预算45例、二次确认19例、人工止损17例隔离检查;最终全量和155候选镜像、自然调度结果在[整改接续](交易计划与风险约束整改接续_2026-11-16.md)登记。代码通过不等于真实触价成交判收,当前没有止损命令,保留自然场景待验。 + +## 后续推进 + +先完成本批规则纠偏与155定向发布,再补退出等待状态的交易员表达:何时开始等待、当前缺哪类证据、哪些既定退出条件仍有效。之后按整改规格做原入场支撑、网格区间失效和等待超期复核的离线比较,再决定是否改变自动退出规则。未定的新亏损比例、网格止损线或等待天数继续保持未启用,不由开发AI自行选值。 diff --git a/docs/开发入口.md b/docs/开发入口.md index b7151c3..6264ba5 100644 --- a/docs/开发入口.md +++ b/docs/开发入口.md @@ -1,5 +1,7 @@ # 开发资料入口 +11月16日继续整改前已完成[建平仓规则对齐](建平仓规则对齐与人工止损验收_2026-11-16.md):用户确认原试探预算仅限本次建仓,后续策略独立审批;人工止损恢复触价清仓。四方仍只有首次有效看空,后续两组证据不足。本批开发验证及最新发布状态以[整改接续](交易计划与风险约束整改接续_2026-11-16.md)为准。下列11:05试探整轮禁买回执保留为历史,该口径已纠正。 + 11月16日11:05:35已在155发布试探预算约束,范围与预算01至09验收见[实现与验收](试探预算约束实现与验收_2026-11-16.md)。11:08对账正常,雷赛自然回执已识别试探新增限制;报价及部分成交自然样本仍待判收。实际镜像与后续退出工作入口见[整改接续](交易计划与风险约束整改接续_2026-11-16.md)。 11月13日宽基查询、当日分时和类别简称见[最新接续](宽基查询接口与分时展示接续_2026-11-13.md)。13:17仅更新web为etf-names-975fa5a,177只ETF按8类跟踪指数显示简称,取消前置标签和名称悬停,点击保留原基金详情。日内只显示北京时间当日,每日净额与60日趋势保持;13:18线上映射、页面及只读对账通过。 diff --git a/docs/试探预算约束实现与验收_2026-11-16.md b/docs/试探预算约束实现与验收_2026-11-16.md index 5886b3f..6414da0 100644 --- a/docs/试探预算约束实现与验收_2026-11-16.md +++ b/docs/试探预算约束实现与验收_2026-11-16.md @@ -2,7 +2,9 @@ 本记录对应[整改规格](交易计划与风险约束整改规格_2026-11-16.md)工作包二。11月16日11:05:35已发布155模拟PMS,11:08:06完成运行核验;镜像与回执见[整改接续](交易计划与风险约束整改接续_2026-11-16.md)。 -## 交易行为 +> 口径更正:下文记录11:05发布版本的历史行为。其中“试探持仓一律暂停自动新增”与11月5日既定规则冲突,用户已要求移除;原建仓预算限制保留,后续策略独立审批。最新规则、测试与发布状态以[建平仓规则对齐](建平仓规则对齐与人工止损验收_2026-11-16.md)和[整改接续](交易计划与风险约束整改接续_2026-11-16.md)为准。原回执保留,不能作为当前规则。 + +## 当次交易行为(历史) 试探预算不足最低申报数量时不建仓。杰普特原15695元预算、313.90元价格的场景,可买数量为0,不再抬到200股62780元。强制降为试探时,同时更新比例、金额、数量、分批与文字;旧记录只有标签降档、比例仍为标准仓时,使用原记录的机械比例核实,无法核实则停止新增。 diff --git a/scripts/run_tests.py b/scripts/run_tests.py index 9d5f7b4..a4f418b 100644 --- a/scripts/run_tests.py +++ b/scripts/run_tests.py @@ -42,7 +42,7 @@ 含在途报价变化不重复确认、真实承诺变化仍重核。 test_core_units.py 仓位规划器 / 安全垫与成本账 (14 例) test_batch2_units.py 命令状态机 / 方案生成器 / 回放对账纯逻辑 (35 例) - test_batch3_units.py 规则闸 / 择时执行器实现B 纯逻辑 / 用户止损价只披露不拦截 (26 例) + test_batch3_units.py 规则闸 / 择时执行器实现B 纯逻辑 / 人工止损触价停止买入 (26 例) test_batch4_units.py 动作引擎 四类自主动作触发与数量口径 + 目标价到价产出清仓候选 (必定交人裁决) + 同轮只发一条减持 (到价清仓优先于保垫减仓) + @@ -207,10 +207,11 @@ ROOT = os.path.dirname(HERE) SUITES = [ "test_proposal_trader_view.py", # 当前分析、旧确认保护及交易员操作含义(19例) "test_watch_missing_fund.py", - "test_timing_fusion.py", # 三组证据契约、二次清仓与恢复(14例) + "test_timing_fusion.py", # 三组证据契约、二次清仓可达性与恢复(19例) "test_signal_recovery.py", # 最新方向、停买恢复、网格合议、关注入口与负净成本(16例) "test_grid_execution.py", "test_buy_budget.py", + "test_user_stop.py", # 人工止损命令、行情边界及撤单、T+1、迟到成交收尾 "test_broad_funds.py", "test_etf_observation.py", "test_etf_query.py", "test_risk_exit.py", "test_rotation_accounting_units.py", "test_cost_precision.py", "test_execution_basis_decimal.py", "test_trade_correction_units.py", "test_trade_correction_transport.py", "test_trade_correction_service.py", "test_trade_lineage_units.py", diff --git a/scripts/test_batch3_units.py b/scripts/test_batch3_units.py index 351577f..4855c25 100644 --- a/scripts/test_batch3_units.py +++ b/scripts/test_batch3_units.py @@ -255,13 +255,13 @@ def ctx(**kw): return d -@case("规则闸·用户止损价只披露不拦截: 破位买入告警 / 卖出不吵 / 无价与未设分得开") +@case("规则闸·人工止损触价阻断买入 / 卖出继续 / 无价与未设分得开") def _(): - # 设了止损价 9.5, 现价 9.2 已跌破 —— 买入方向出告警, 但**不进 failed**, 照样放行 + # 触价按用户止损意图停止买入,清仓由统一退出扫描驱动 r = rg.check(side="buy", action="ADD", qty=1000, price=9.2, ctx=ctx(flags={"stop_price": 9.5}, day={"price": 9.2})) - assert r["passed"] and r["failed"] == [], r - assert any(x.startswith("STOP_BREACHED") for x in r["warnings"]), r["warnings"] + assert not r["passed"], r + assert any(x.startswith("STOP_BREACHED") for x in r["failed"]), r["failed"] assert r["hard_numbers"]["stop_price"] == 9.5, r["hard_numbers"] assert r["hard_numbers"]["stop_breached"] is True, r["hard_numbers"] # 没破位: 留痕说得出「设了且没破」, 不发告警 diff --git a/scripts/test_buy_budget.py b/scripts/test_buy_budget.py index 05df9f3..5a7ec0b 100644 --- a/scripts/test_buy_budget.py +++ b/scripts/test_buy_budget.py @@ -60,6 +60,35 @@ class BudgetMath(unittest.TestCase): r=core.resize(h['advice'],h,CODE) self.assertEqual((r['qty'],r['base_amount'],r['target_amount']),(400,19420,20000)) + def test_standard_batches_merge_to_sixty_forty_within_budget(self): + h=hard(100,30000,.06,target=.06,tier='标准仓') + h['advice']['splits']=(.5,.25,.25) + r=core.resize(h['advice'],h,CODE) + self.assertEqual((r['qty'],r['batch_scheme'],r['target_amount']),(100,'0.6,0.4',30000)) + self.assertIn('原预算内',r['note']) + + def test_star_batches_merge_to_one_without_raising_amount(self): + h=hard(150,60000,.06,target=.06,tier='标准仓') + h['advice']['splits']=(.5,.25,.25) + r=core.resize(h['advice'],h,'688001.SH') + self.assertEqual((r['qty'],r['batch_scheme'],r['target_amount']),(400,'1.0',60000)) + + def test_disabled_merge_preserves_explicit_batch_constraint(self): + h=hard(100,30000,.06,target=.06,tier='标准仓') + h['advice']['splits']=(.5,.25,.25);h['min_lot_merge']=False + r=core.resize(h['advice'],h,CODE) + self.assertEqual(r['qty'],0) + self.assertFalse(r['buy_budget']['min_lot_merge']) + + def test_merged_scheme_also_updates_advice_text(self): + h=hard(100,30000,.06,target=.06,tier='标准仓') + h['advice']['splits']=(.5,.25,.25) + c={'action':'OPEN','ts_code':CODE,'qty':100} + with patch.object(ps.param_store,'get_int',return_value=60): + ps._apply_advice_tier(c,h,{'verdict':'PASS','confidence':90}) + self.assertEqual(h['advice']['splits'],(.6,.4)) + self.assertIn('60%/40%',h['advice_text']) + def test_refresh_price_scale_or_tier_cannot_raise_budget(self): h=hard();h['buy_budget']=budget();h.update(sizing_scale=3000000,target_amount=180000) h['advice'].update(tier='标准仓',target_pct=.06,splits=(.5,.25,.25)) @@ -176,26 +205,29 @@ class ServiceBudget(unittest.TestCase): def test_flat_then_new_round_does_not_inherit_old_trial(self): self.root()['status']='CONFIRMED';self.pos={};self.rows[0].update(status='CLOSED',qty=0) - self.assertEqual(service.holding_blocker(CODE),'') + self.assertIsNone(service.before_parent(CODE)) - def test_trial_blocks_new_grid_or_add_even_if_price_fell(self): + def test_trial_label_does_not_block_independently_approved_followup(self): self.root()['status']='EXPIRED' - for action in ('ADD','FILL','DCA','OPEN'): - with self.assertRaisesRegex(ValueError,'试探仓'):service.before_parent(CODE,action=action) + for action in ('ADD','FILL','DCA'): + p={'instruction_id':'NEXT','action':action,'side':'buy','ts_code':CODE, + 'origin_type':'strategy' if action=='ADD' else 'proposal','progress':{}} + self.assertIsNone(service.before_parent(CODE,action=action)) + self.assertEqual(service.allowed_quantity(p,50,100),(100,'')) - def test_closed_base_with_remaining_add_still_restricts_trial_round(self): + def test_closed_base_does_not_turn_trial_amount_into_strategy_lifetime_cap(self): self.root()['status']='EXPIRED';self.rows[0].update(qty=0,status='CLOSED') self.rows.append(dict(self.rows[0],id=2,qty=100,status='OPEN',lot_type='ADD',instruction_id='GRID')) - self.assertIn('试探仓',service.holding_blocker(CODE)) + self.assertIsNone(service.before_parent(CODE,action='ADD')) def test_unknown_origin_or_budget_blocks_instead_of_standard_default(self): p=self.root();p['progress']={};p['status']='EXPIRED' - self.assertIn('无法核实',service.holding_blocker(CODE)) + with self.assertRaisesRegex(ValueError,'无法核实'):service.parent_budget(p) def test_query_failure_restricts_buy_but_sell_continues(self): - p=self.root();p['status']='EXPIRED' + p=self.root();self.filled() with patch.object(pms_repo,'list_lots',side_effect=RuntimeError('offline')): - self.assertIn('暂停自动加仓',service.holding_blocker(CODE)) + with self.assertRaises(RuntimeError):service.allowed_quantity(p,50,100) self.assertEqual(service.allowed_quantity(dict(p,side='sell'),50,100),(100,'')) def test_new_parent_keeps_budget_in_progress(self): @@ -268,11 +300,11 @@ class ServiceBudget(unittest.TestCase): def test_standard_holding_keeps_original_grid_permission(self): h=hard(target=.06,tier='标准仓');b=core.resize(h['advice'],h,CODE)['buy_budget'] self.root(b=b) - self.assertEqual(service.holding_blocker(CODE),'') + self.assertIsNone(service.before_parent(CODE,action='ADD')) - def test_pending_trial_prevents_grid_preempting_before_first_fill(self): + def test_pending_trial_cannot_allocate_a_second_opening_budget(self): p=self.root(holding=0);p['exec_qty']=0 - with self.assertRaisesRegex(ValueError,'试探建仓安排'):service.before_parent(CODE,action='ADD') + with self.assertRaisesRegex(ValueError,'重复分配建仓预算'):service.before_parent(CODE,action='OPEN') def test_verified_user_command_has_separate_explicit_budget(self): self.root()['status']='EXPIRED' @@ -281,12 +313,11 @@ class ServiceBudget(unittest.TestCase): self.commands['CMD']={'issued_by':'trader','cmd_type':'OPEN_TARGET'} self.assertEqual(service.allowed_quantity(p,60,200),(200,'')) self.assertEqual(service.allowed_quantity(p,61,200)[0],100) - self.assertIn('试探仓',service.holding_blocker(CODE),'明确命令不自动升级其他策略额度') + self.assertEqual(self.parents['P']['progress']['buy_budget']['amount'],'10000.00') - def test_fake_command_flag_cannot_bypass_trial(self): - self.root() - p=dict(self.parents['P'],instruction_id='G',origin_type='strategy',action='ADD',progress={'is_command':True,'stype':'GRID'}) - self.assertEqual(service.allowed_quantity(p,1,100)[0],0) + def test_fake_command_flag_cannot_raise_original_opening_budget(self): + p=self.root(holding=0);p['exec_qty']=0;p['progress']['is_command']=True + self.assertEqual(service.allowed_quantity(p,51,200)[0],100) def test_other_strategy_book_keeps_its_own_budget_path(self): p=self.root();p['book_id']='micro30' @@ -306,13 +337,13 @@ class ServiceBudget(unittest.TestCase): smaller=budget(amount=30000);p['progress']['buy_budget']=smaller with self.assertRaises(ValueError):service.check_order(p,prepared) - def test_t0_cover_does_not_open_a_new_trial_leg(self): + def test_t0_uses_its_own_approved_strategy_for_both_legs(self): self.root() p=dict(self.parents['P'],instruction_id='T',origin_type='strategy',action='T0', progress={'stype':'T0','leg':'close'}) self.assertEqual(service.allowed_quantity(p,50,100),(100,'')) p['progress']['leg']='open' - self.assertEqual(service.allowed_quantity(p,50,100)[0],0) + self.assertEqual(service.allowed_quantity(p,50,100),(100,'')) class AtomicAccept(unittest.TestCase): diff --git a/scripts/test_risk_exit.py b/scripts/test_risk_exit.py index 60e383d..ddf1ddc 100644 --- a/scripts/test_risk_exit.py +++ b/scripts/test_risk_exit.py @@ -142,6 +142,7 @@ class ServiceTests(unittest.TestCase): return {'ok':True,'pending':self.cancel_pending} self.use(executor,'cancel_instruction',cancel) schema={ + 'pms_command':'id INTEGER PRIMARY KEY,book_id TEXT,command_id TEXT,cmd_class TEXT,cmd_type TEXT,ts_code TEXT,params_json TEXT,status TEXT,progress_json TEXT,issued_by TEXT,issued_at TEXT,archived_at TEXT', 'pms_position':'id INTEGER PRIMARY KEY,book_id TEXT,ts_code TEXT,total_qty INTEGER,avail_qty INTEGER,opened_date TEXT,status TEXT', 'pms_lot':'id INTEGER PRIMARY KEY,book_id TEXT,ts_code TEXT,instruction_id TEXT,qty INTEGER,status TEXT,open_date TEXT', 'pms_instruction':'id INTEGER PRIMARY KEY,book_id TEXT,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 DEFAULT 0,exec_avg_price REAL,progress_json TEXT,created_at TEXT,updated_at TEXT,archived_at TEXT', @@ -412,27 +413,27 @@ class ServiceTests(unittest.TestCase): class DisplayTests(unittest.TestCase): def test_first_stop_without_strategy_is_visible(self): rows=[{'ts_code':CODE,'total_qty':100}] - with patch.object(service,'enabled',return_value=True), patch.object(store,'get',return_value=({'phase':'STOP_BUY','reason':'第一次信号'},1)): + with patch.object(service,'supported',return_value=True), patch.object(service,'enabled',return_value=True), patch.object(store,'get',return_value=({'phase':'STOP_BUY','reason':'第一次信号'},1)): service.decorate_positions(rows) self.assertEqual(rows[0]['exit_status_text'],'只卖不买') def test_exit_stages_are_not_mislabelled_as_add(self): for phase,text in [('EXIT_PENDING','等待清仓'),('EXITING','清仓中'),('MANUAL','退出待处理')]: rows=[{'ts_code':CODE,'total_qty':100}] - with patch.object(service,'enabled',return_value=True), patch.object(store,'get',return_value=({'phase':phase},1)): + with patch.object(service,'supported',return_value=True), patch.object(service,'enabled',return_value=True), patch.object(store,'get',return_value=({'phase':phase},1)): service.decorate_positions(rows) self.assertEqual(rows[0]['exit_status_text'],text) def test_failure_is_visible_without_changing_trade_state(self): rows=[{'ts_code':CODE,'total_qty':100}] - with patch.object(service,'enabled',return_value=True), patch.object(store,'get',side_effect=ValueError('unavailable')): + with patch.object(service,'supported',return_value=True), patch.object(service,'enabled',return_value=True), patch.object(store,'get',side_effect=ValueError('unavailable')): service.decorate_positions(rows) self.assertEqual(rows[0]['exit_status_text'],'退出状态待核实') def test_disabled_and_empty_positions_do_not_read_state(self): - with patch.object(service,'enabled',return_value=False), patch.object(store,'get') as get: + with patch.object(service,'supported',return_value=False), patch.object(store,'get') as get: service.decorate_positions([{'ts_code':CODE,'total_qty':100}]);get.assert_not_called() - with patch.object(service,'enabled',return_value=True), patch.object(store,'get') as get: + with patch.object(service,'supported',return_value=True), patch.object(service,'enabled',return_value=True), patch.object(store,'get') as get: service.decorate_positions([{'ts_code':CODE,'total_qty':0}]);get.assert_not_called() diff --git a/scripts/test_timing_fusion.py b/scripts/test_timing_fusion.py index 9afb658..71d25fa 100644 --- a/scripts/test_timing_fusion.py +++ b/scripts/test_timing_fusion.py @@ -25,6 +25,18 @@ def fused(action='SELL', at=base.NOW, n=1): 'action':action,'score':sign*2/3,'coverage':2,'groups':groups,'at':at.isoformat(), 'verified_at':at.isoformat(),'expires_at':end.isoformat(),'reason':'隔离测试证据'} + +def daily_qrs_and_v3f(at=base.NOW, n=1): + value=fused(at=at,n=n) + qrs=copy.deepcopy(value['groups']['main_fund']) + start=at.replace(hour=9,minute=30,second=0,microsecond=0) + qrs['evidence'][0].update(group='qrs',source='daily_qrs_symmetric_down', + at=start.isoformat(),expires_at=at.replace(hour=15,minute=0,second=0,microsecond=0).isoformat(), + identity=rules.digest(['daily_qrs',str(at.date())])) + value['groups']['qrs']=qrs + value['groups']['main_fund']={'weight':1/3,'direction':0,'state':'UNKNOWN','evidence':[]} + return value + class ContractTests(unittest.TestCase): def test_valid_not_a_model_probability(self): value=fused();self.assertNotIn('confidence',value);self.assertIsNotNone(contract.valid(value,base.NOW)) @@ -46,6 +58,29 @@ class ContractTests(unittest.TestCase): def test_two_new_groups_confirm_second_exit(self): self.assertFalse(contract.duplicate([fused()],fused(at=base.NOW+dt.timedelta(minutes=5),n=2))) + def test_daily_qrs_does_not_refresh_when_only_intraday_group_changes(self): + a=daily_qrs_and_v3f();later=base.NOW+dt.timedelta(minutes=5) + b=daily_qrs_and_v3f(later,2) + self.assertIsNotNone(contract.valid(b,later)) + self.assertTrue(contract.duplicate([a],b)) + + def test_two_new_intraday_groups_can_confirm_despite_same_daily_qrs(self): + a=daily_qrs_and_v3f();later=base.NOW+dt.timedelta(minutes=5) + b=fused(at=later,n=2);b['groups']['qrs']=copy.deepcopy(a['groups']['qrs']);b['score']=-1 + self.assertIsNotNone(contract.valid(b,later)) + self.assertFalse(contract.duplicate([a],b)) + + def test_next_day_new_qrs_and_intraday_group_can_confirm(self): + a=daily_qrs_and_v3f();later=base.NOW+dt.timedelta(days=1) + b=daily_qrs_and_v3f(later,2) + self.assertIsNotNone(contract.valid(b,later)) + self.assertFalse(contract.duplicate([a],b)) + + def test_group_with_retained_old_subsource_is_not_independent_refresh(self): + a=fused();later=base.NOW+dt.timedelta(minutes=5);b=fused(at=later,n=2) + b['groups']['main_fund']['evidence'].extend(copy.deepcopy(a['groups']['main_fund']['evidence'])) + self.assertTrue(contract.duplicate([a],b)) + class ServiceTests(recovery.DirectionTests): # 只运行本类专用测试,沿用已有SQLite双策略和持仓桩。 def setup_fusion(self): @@ -62,6 +97,16 @@ class ServiceTests(recovery.DirectionTests): b=fused(at=now+dt.timedelta(minutes=5),n=2);self.save(b) self.assertEqual(risk_exit.on_signal(b,now=now+dt.timedelta(minutes=5))['count'],2) self.assertEqual(len(self.instructions()),1) + + def test_daily_qrs_waits_then_next_day_evidence_creates_one_exit(self): + now=self.setup_fusion();a=daily_qrs_and_v3f(now);self.save(a) + self.assertEqual(risk_exit.on_signal(a,now=now)['count'],1) + later=now+dt.timedelta(minutes=5);b=daily_qrs_and_v3f(later,2);self.save(b) + self.assertEqual(risk_exit.on_signal(b,now=later)['count'],1) + self.assertEqual(self.instructions(),[]) + tomorrow=now+dt.timedelta(days=1);c=daily_qrs_and_v3f(tomorrow,3);self.save(c) + self.assertEqual(risk_exit.on_signal(c,now=tomorrow)['count'],2) + self.assertEqual(len(self.instructions()),1) def test_fusion_new_buy_recovers_without_confidence_fabrication(self): now=self.setup_fusion();a=fused(at=now);self.save(a);risk_exit.on_signal(a,now=now) later=now+dt.timedelta(minutes=5);b=fused('BUY',later,2);self.save(b) diff --git a/scripts/test_trade_correction_strategy.py b/scripts/test_trade_correction_strategy.py index 42f6435..db4761b 100644 --- a/scripts/test_trade_correction_strategy.py +++ b/scripts/test_trade_correction_strategy.py @@ -14,7 +14,7 @@ from sqlalchemy import create_engine, event, text from app.core import strategy_book as books from app.db import session as db from app.repo import pms_repo -from app.services import strategy_runner as runner, rotation_service, grid_inventory, buy_budget +from app.services import strategy_runner as runner, rotation_service, grid_inventory from config.settings import settings CODE = '600001.SH' @@ -60,8 +60,6 @@ class StrategyCorrectionTests(unittest.TestCase): (runner.market, 'day_snapshot', lambda code: {'price': 10, 'bar_time': self.now.isoformat()}), (pms_repo, 'get_position', lambda code: {'total_qty':100, 'add_qty':100, 'avail_qty':100}), (grid_inventory, 'snapshot', lambda st, pos: {'invested':1000, 'filled_levels':{'0':{'price':10,'qty':100,'sell_target':10.4}}}), - # 本套为有明确标准仓预算的事务夹具;试探、未知及跨轮预算由test_buy_budget独立验证。 - (buy_budget, 'holding_blocker', lambda code, **kw: ''), # 此套只测事务与更正交错;真实批次和报价校验由 test_grid_execution 覆盖。 (runner, '_validate_grid_decision', lambda st, dec: None), ]: diff --git a/scripts/test_user_stop.py b/scripts/test_user_stop.py new file mode 100644 index 0000000..f7140d8 --- /dev/null +++ b/scripts/test_user_stop.py @@ -0,0 +1,185 @@ +"""人工止损命令、行情边界、SQLite清仓收尾;全部隔离,不连接运行账户。""" +import unit_test_guard +import copy +import datetime as dt +import json +import unittest +from unittest.mock import patch +import test_risk_exit as base +from app.core import risk_exit as core, strategy_book as books +from app.repo import pms_repo, qmt_repo +from app.services import risk_exit as service, market, executor, logic_state_service + +CODE, NOW = base.CODE, base.NOW + + +def command(price=10, cid='STOP1', issued=None): + return dict(command_id=cid, cmd_type='SET_STOP_PRICE', ts_code=CODE, status='EFFECTIVE', + issued_at=issued or NOW-dt.timedelta(minutes=2), params={'price':price}) + + +def quote(price=10, at=NOW): + return dict(kind='minute', source='isolated-test', last=price, as_of=at.isoformat()) + + +class CoreTests(unittest.TestCase): + def test_equal_and_below_trigger_above_does_not(self): + for price, trigger in [(9.99,True),(10,True),(10.01,False)]: + self.assertEqual(bool(core.user_stop_event(command(),quote(price),now=NOW)[0]),trigger) + + def test_missing_disabled_invalid_command_never_triggers(self): + for value in [None,0,-1,float('nan'),float('inf'),'bad']: + self.assertIsNone(core.user_stop_event(command(value),quote(),now=NOW)[0]) + for changes in [dict(command_id=None),dict(status='CANCELLED'),dict(ts_code='920001.BJ'), + dict(issued_at=None),dict(issued_at=NOW+dt.timedelta(seconds=1))]: + self.assertIsNone(core.user_stop_event({**command(),**changes},quote(),now=NOW)[0]) + + def test_quote_time_source_and_finite_price_required(self): + changes=[dict(as_of=None),dict(as_of='2026-11-05T10:00:00'),dict(source=''), + dict(kind='unknown'),dict(last=float('nan')),dict(last=float('inf')), + dict(last=0),dict(as_of=(NOW-dt.timedelta(days=1)).isoformat()), + dict(as_of=(NOW+dt.timedelta(seconds=1)).isoformat()), + dict(as_of=(NOW-dt.timedelta(seconds=91)).isoformat())] + for value in changes: + with self.subTest(value=value): + self.assertIsNone(core.user_stop_event(command(),{**quote(),**value},now=NOW)[0]) + self.assertIsNotNone(core.user_stop_event(command(),quote(at=NOW-dt.timedelta(seconds=90)),now=NOW)[0]) + + def test_quote_must_follow_effective_command(self): + self.assertIsNone(core.user_stop_event(command(issued=NOW),quote(at=NOW-dt.timedelta(seconds=1)),now=NOW)[0]) + + +class ServiceTests(base.ServiceTests): + def put_stop(self, price=10, cid='STOP1'): + c=command(price,cid) + self.insert('pms_command',dict(book_id='original',command_id=cid,cmd_class='param',cmd_type=c['cmd_type'], + ts_code=CODE,status='EFFECTIVE',issued_at=c['issued_at'].isoformat(),params_json=json.dumps(c['params']))) + + def trigger(self): + result=service.observe_user_stop(CODE,quote(),now=NOW) + service.drive(CODE,now=NOW) + return result + + def test_scan_generates_one_exit_without_model_or_second_signal(self): + self.put_stop() + with patch.object(market,'execution_quote',return_value=quote()) as fetch, \ + patch.object(logic_state_service,'state_map',side_effect=RuntimeError('offline')): + first=service.scan(now=NOW);service.scan(now=NOW) + self.assertTrue(first['user_stops'][CODE]['triggered']) + self.assertEqual(self.state()['count'],0) + ins=self.instructions();self.assertEqual(len(ins),1);self.assertEqual(ins[0]['qty'],1600) + self.assertTrue(ins[0]['progress']['is_command']);self.assertTrue(ins[0]['progress']['urgent']) + self.assertFalse(ins[0]['progress']['from_signal']) + self.assertEqual(ins[0]['progress']['risk_exit']['user_stop']['command_id'],'STOP1') + self.assertEqual(fetch.call_args.kwargs['limits'],{}) + + def test_all_execution_halt_retains_intent_but_buy_halt_allows_exit(self): + self.put_stop();self.params['PMS_GLOBAL_EXEC_HALT']=True + self.trigger();self.assertEqual(self.instructions(),[]);self.assertEqual(self.state()['phase'],'EXIT_PENDING') + self.params['PMS_GLOBAL_EXEC_HALT']=False;self.params['PMS_GLOBAL_BUY_HALT']=True + service.drive(CODE,now=NOW);self.assertEqual(len(self.instructions()),1) + + def test_command_is_not_disabled_by_model_risk_switch(self): + self.params['PMS_RISK_EXIT_ENABLED']=False;self.put_stop();self.trigger() + self.assertEqual(len(self.instructions()),1);self.assertTrue(service.buy_blocker(CODE)) + + def test_latest_zero_price_disables_trigger_and_new_price_replaces_old(self): + self.put_stop(11);self.put_stop(0,'STOP2') + self.assertFalse(self.trigger()['triggered']);self.assertEqual(self.instructions(),[]) + self.put_stop(10,'STOP3');self.assertTrue(self.trigger()['triggered']) + self.assertEqual(self.state()['user_stop']['command_id'],'STOP3') + + def test_stale_quote_and_system_reference_do_not_trigger(self): + self.put_stop(9) + self.assertFalse(service.observe_user_stop(CODE,quote(),now=NOW)['triggered']) + self.put_stop(11,'STOP2') + self.assertFalse(service.observe_user_stop(CODE,quote(at=NOW-dt.timedelta(days=1)),now=NOW)['triggered']) + self.assertEqual(self.instructions(),[]) + + def test_old_buy_cancel_and_pending_report_finish_before_full_exit(self): + self.put_stop();self.cancel_pending=True + pms_repo.insert_instruction(instruction_id='BUY',origin_type='proposal',origin_id=None, + ts_code=CODE,action='ADD',side='buy',qty=100,status='DISPATCHED') + self.insert('pms_qmt_order',dict(instruction_id='CHILD',parent_id='BUY',ts_code=CODE,side='buy',status='ACCEPTED')) + self.trigger();self.assertEqual(len(self.instructions()),1) + self.cancel_pending=False;self.change("UPDATE pms_qmt_order SET status='CANCELLED'") + self.pending=1;service.drive(CODE,now=NOW);self.assertEqual(len(self.instructions()),1) + self.pending=0;service.drive(CODE,now=NOW) + self.assertEqual(self.instructions()[0]['action'],'EXIT');self.assertEqual(self.instructions()[0]['qty'],1600) + + def test_cancel_failure_keeps_intent_and_no_exit_then_retries(self): + self.put_stop() + pms_repo.insert_instruction(instruction_id='BUY',origin_type='proposal',origin_id=None, + ts_code=CODE,action='ADD',side='buy',qty=100,status='PROPOSED') + with patch.object(executor,'cancel_instruction',return_value={'ok':False}): + with self.assertRaises(RuntimeError):self.trigger() + self.assertEqual(self.state()['phase'],'EXIT_PENDING');self.assertEqual(len(self.instructions()),1) + service.drive(CODE,now=NOW);self.assertEqual(self.instructions()[0]['action'],'EXIT') + + def test_old_grid_sell_and_strategy_are_cancelled_before_exit(self): + self.put_stop() + self.insert('pms_strategy',dict(book_id='original',strategy_id='GRID',ts_code=CODE,type='GRID',status='ACTIVE',params_json='{}',state_json='{}')) + pms_repo.insert_instruction(instruction_id='SELL',origin_type='strategy',origin_id='GRID', + ts_code=CODE,action='TRIM',side='sell',qty=100,status='DISPATCHED') + self.insert('pms_qmt_order',dict(instruction_id='CHILD',parent_id='SELL',ts_code=CODE,side='sell',status='ACCEPTED')) + self.trigger();self.assertEqual(len(self.instructions()),1) + self.assertEqual(pms_repo.get_instruction('SELL')['status'],'CANCELLED') + self.assertEqual(pms_repo.list_strategies(ts_code=CODE,statuses=['ACTIVE'],limit=1),[]) + self.change("UPDATE pms_qmt_order SET status='CANCELLED'") + service.drive(CODE,now=NOW);self.assertEqual(self.instructions()[0]['qty'],1600) + + def test_user_sell_finishes_then_exit_covers_actual_remainder(self): + self.put_stop() + pms_repo.insert_instruction(instruction_id='SELL',origin_type='plan',origin_id=None, + ts_code=CODE,action='TRIM',side='sell',qty=100,status='PROPOSED') + self.trigger();self.assertEqual(len(self.instructions()),1) + pms_repo.update_instruction('SELL',status='CONFIRMED',exec_qty=100) + self.change('UPDATE pms_position SET total_qty=1500,avail_qty=1500');self.change('UPDATE pms_lot SET qty=1500') + service.drive(CODE,now=NOW);self.assertEqual(self.instructions()[0]['qty'],1500) + + def test_t1_partial_fill_and_late_buy_keep_full_remaining_exit(self): + self.params['PMS_RISK_EXIT_ENABLED']=False + self.put_stop();self.change('UPDATE pms_position SET avail_qty=0');self.trigger() + ins=self.instructions()[0];self.assertEqual(ins['qty'],1600) + pms_repo.update_instruction(ins['instruction_id'],status='DISPATCHED',exec_qty=600) + self.change('UPDATE pms_position SET total_qty=1000,avail_qty=0');self.change('UPDATE pms_lot SET qty=1000') + service.drive(CODE,now=NOW+dt.timedelta(days=1));self.assertEqual(len(self.instructions()),1) + pms_repo.update_instruction(ins['instruction_id'],status='CONFIRMED',exec_qty=1600) + self.change('UPDATE pms_position SET total_qty=0,avail_qty=0');self.change("UPDATE pms_lot SET qty=0,status='CLOSED'") + service.drive(CODE,now=NOW);self.assertEqual(self.state()['phase'],'CLOSED') + self.insert('pms_lot',dict(id=2,book_id='original',ts_code=CODE,instruction_id='BASE',qty=100,status='OPEN')) + self.change('UPDATE pms_position SET total_qty=100,avail_qty=0') + with patch.object(market,'execution_quote',return_value=quote(11)): + service.scan(now=NOW) + self.assertEqual(self.instructions()[0]['qty'],100);self.assertEqual(len(self.instructions()),2) + + def test_clearing_price_does_not_undo_trigger_or_reopen_cancelled_exit(self): + self.put_stop();self.trigger();iid=self.instructions()[0]['instruction_id'] + self.put_stop(0,'STOP2');service.drive(CODE,now=NOW) + self.assertEqual(self.state()['phase'],'EXITING') + pms_repo.update_instruction(iid,status='CANCELLED');service.drive(CODE,now=NOW) + self.assertEqual(self.state()['phase'],'MANUAL');self.put_stop(10,'STOP3');self.trigger() + self.assertEqual(len(self.instructions()),1) + + def test_audit_or_instruction_failure_cannot_lose_intent(self): + self.put_stop() + with patch.object(pms_repo,'insert_ledger',return_value=0): + with self.assertRaises(RuntimeError):service.observe_user_stop(CODE,quote(),now=NOW) + self.assertEqual(self.state(),{}) + with patch.object(pms_repo,'insert_instruction',return_value=0): + with self.assertRaises(RuntimeError):self.trigger() + self.assertEqual(self.state()['phase'],'EXIT_PENDING');self.assertEqual(self.instructions(),[]) + service.drive(CODE,now=NOW);self.assertEqual(len(self.instructions()),1) + + def test_other_book_and_no_holding_do_not_create_orders(self): + self.put_stop() + with books.scope('micro30'): + self.assertIsNone(service.observe_user_stop(CODE,quote(),now=NOW)) + self.change('UPDATE pms_position SET total_qty=0,avail_qty=0');self.change("UPDATE pms_lot SET qty=0,status='CLOSED'") + self.assertFalse(self.trigger()['triggered']);self.assertEqual(self.instructions(),[]) + + +for name in base.ServiceTests.__dict__: + if name.startswith('test_') and name not in ServiceTests.__dict__: + setattr(ServiceTests,name,None) +if __name__=='__main__':unittest.main()