补齐用户候选隔离校验与页面验收

This commit is contained in:
baobao 2026-11-03 11:37:27 +08:00
parent 7fe3c5d046
commit 96b2ea207e
7 changed files with 133 additions and 5 deletions

View File

@ -2665,3 +2665,10 @@ QMT11:53:36至11:54:04短暂中断,自动重连恢复,外部原因未核实
用户确认QMT已清空,初始总规模1,967,927.74元。新增一次性双账本重置脚本及9项隔离测试,本地提交332f008,155补丁36d6ad7,维护镜像pms:sim-reset-332f008断网全量回归ALL SUITES PASS。09:45暂停并温和停止worker/beat,10:08:20将旧持仓、批次、任务、提议、个股策略、流水及净值完整备份后事务清理,实际空仓现金成为新本金,PMS_TOTAL_SCALE同步,净值1.0000。保留规则8%/85%/50只、429条通道委托、1279条逐笔成交及处理标记、操作审计和信号去重;旧轮换资本与收益文档归档,通道序号不动。
真机见过:暂停期间两账本持仓与任务清零,回放新增成交和动作均0;10:11:32完成资金与数量对账后仅恢复本次暂停,auto/run继续。10:12:14确认1570706,无缺口、新拒绝、在途或待入账,资金18.9秒,现金及数量差异0;10:13:39健康正常。worker/beat启动原容器,web与唯一ws未重启,镜像环境挂载保持。恢复后新信号和研判是自然调度结果,不再删除。维护首次恢复水位检查未通过时保持暂停,待新采样追平才放开。定时复核保持取消,微盘自然完整成交与费用仍未判收。备份和详细证据见[再次重置与本金基线](docs/模拟仓再次重置与本金基线_2026-11-02.md)。
# 2026-11-03 选股计划添加关注股票
在独立工作树 `codex/plan-user-candidates-20261103` 实现,保留原工作树未提交材料,并合入155已发布的委托、策略归属和跨日复核修复。选股计划抽屉新增名称搜索、代码批量添加、理由、截止日期及记录移除;沿用现有页面配色与表单。上游独立工作树同步增加登记、来源修订和失效核验,不添加独立交易账本,不改变当前研判、排序、数量或执行档位。
开发机隔离全量回归末行为 `ALL SUITES PASS`;新增8项PMS检查,上游统一59组计划契约检查通过。浏览器使用本机固定示例,已检查桌面和390像素窄屏的搜索、必填、添加、移除、历史与非法代码提示,控制台无错误或警告。未向业务系统登记示例股票或发送测试委托。
发布前只读核对:155 PMS表前缀为空,dispatch为ws,主观新建仓propose_only,版本核验开启,两个全局暂停false;上游计划地址为155:8300。运行参数未修改。此条为开发验证记录,发布及真机判收状态另行更新。

View File

@ -690,3 +690,24 @@ make changes # 页面同款结论
- PMS meta.kind 区分 received、consumed、rechecked;消费记录包括真实顺序、有效参数和过滤原因。
- 采纳核验由 PMS_PLAN_VERSION_RECHECK 控制,默认关闭;内容更新时接口返回 ok=false、原因及更新后的 proposal,页面必须重新确认其 proposal_revision。
- 旧消费者可忽略新增字段,新消费者接受旧字段为空;无版本旧数据不能通过已启用的自主采纳核验。
## 2026-11-03 补充:在选股计划中添加关注股票
PMS 在原选股计划抽屉提供“添加股票”。支持按名称或代码搜索、批量输入沪深 A 股代码、填写理由和关注截止日。北交所在登记入口排除。同一股票的有效登记不重复创建,移除和到期保留历史;不会由此生成卖出或撤单命令。
| 上游接口 | 用途 |
| --- | --- |
| `GET /plan/user-candidates/search?q=名称或代码` | 返回最多 30 个匹配的沪深 A 股名称和前缀代码 |
| `GET /plan/user-candidates` | 返回登记及其等待评估、已评估、已到期、已移除状态 |
| `POST /plan/user-candidates` | 登记 `codes`、`reason`、`expires_on` 和服务端提供的 `actor` |
| `POST /plan/user-candidates/{id}/remove` | 停止该条人工关注,保留原记录 |
PMS 对应路径统一为 `/api/plan/user-candidates`,沿用交易员登录权限并记操作日志。写请求以环境变量 `PMS_PLAN_WRITE_KEY` 作为 `X-Job-Key` 调用上游;值须与上游既有 `XXL_TRIGGER_KEY` 一致,仅通过环境注入,禁止进入 ParamStore、页面和日志。未配置或上游未升级时明确提示不可用。
登记先持久化,再由上游计划修订任务评估。每次最多 30 只,理由最多 300 字,截止日为北京当天至未来 90 个自然日,页面默认未来 7 日。登记成功表示已保存,不等于候选合格或已下单。非修订时段等待后续有效生成或修订,不倒填晨版。
人工来源仅补充原有发现条件,`pointed` 继续表示真实产业传导状态。券商覆盖、估值空间、风险、吸筹、基本面、技术面、择时及资金约束仍走原逻辑;不加分、不插队、不放大仓位,也不绕过当前前列数量和档位配置。没有原分数时返回 `score=null`,不生成虚构档位。证券名称资料缺失时仅展示。
完整计划顶层 `user_candidates` 保存本版采用的登记;对应行带 `user_candidate` 和 `user_required`。后者表示候选需要人工来源才能成立。移除、到期及重新登记但尚未发布时,最新计划和逐票核验的 `pending_codes` 阻止旧来源继续被采纳。来源信息进入 PMS 依据指纹、提议与评审材料,既有版本核验和跨日复核继续生效。
人工来源只接入自主建仓候选链。资金投放命令不会额外吸收仅靠人工来源新增的股票;已有系统来源仍正常参与。盘中加入的合格基础候选可补读已有技术面数据,并进入现有盘中扫描关注范围,不自行生成技术面或择时结论。到期或移除不改变已经建立的持仓管理规则。

View File

@ -797,7 +797,7 @@ def _candidates(view: dict) -> list:
if src in (plan_feed.SRC_PLAN_API, plan_feed.SRC_BOTH):
try:
sel = plan_feed.candidates(held=held, black=black)
sel = plan_feed.candidates(held=held, black=black, allow_user=False)
for r in sel["items"]:
_push(r["ts_code"], r["score"], "plan_api", theme=r.get("theme"),
plan_provenance={k: r.get(k) for k in ('decision', 'consumption_id',

View File

@ -1188,7 +1188,7 @@ def snapshot_log(*, plan_date=None, limit: int = 50) -> dict:
# ================================================================ 对外: 候选与状态
def candidates(*, held=(), black=(), route_by_verdict: bool = False, force=False,
record=True, recheck_code=None, plan_override=None) -> dict:
record=True, recheck_code=None, plan_override=None, allow_user=True) -> dict:
"""参数驱动的候选清单 (不含价格 —— 价格由调用方用 market.get_price 现取)。
route_by_verdict 默认 False: 命令驱动建仓 (command_service._candidates) 不传, 于是用户
@ -1200,7 +1200,7 @@ def candidates(*, held=(), black=(), route_by_verdict: bool = False, force=False
p = _params()
plan = plan_override if plan_override is not None else (get_plan(force=force) if force else get_plan())
route = bool(route_by_verdict)
if not route:
if not allow_user:
plan = dict(plan, **{b: [r for r in plan.get(b, []) if not r.get('user_required')] for b in ('main', 'observe')})
out = select_candidates(plan, held=held, black=black, top_n=0 if recheck_code else p["top_n"], tiers=p["tiers"],
include_observe=p["include_observe"],

View File

@ -572,6 +572,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
.plan-add-panel{margin:14px 0 18px;padding:18px;background:var(--surface-2);border:1px solid var(--hair);border-radius:10px}
.plan-add-panel .el-form-item{margin-bottom:14px}.plan-add-panel .el-select{width:100%}
.plan-add-panel .el-form-item__content>.muted{width:100%;line-height:1.6}
.plan-user-list{margin:16px 0 20px;border:1px solid var(--hair);border-radius:10px;overflow:hidden}
.plan-user-head{display:flex;align-items:center;justify-content:space-between;padding:11px 14px;background:var(--surface-2);font-weight:600}
.plan-user-item{padding:12px 14px;border-top:1px solid var(--hair)}
@ -2593,7 +2594,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
<div class="muted" style="margin-bottom:16px">添加后按现有规则评估,满足条件时按当前执行档位处理。</div>
<el-form label-position="top" @submit.prevent="submitPlanAdd">
<el-form-item label="股票">
<el-select v-model="planAdd.codes" multiple filterable remote allow-create default-first-option
<el-select v-model="planAdd.codes" multiple filterable remote :allow-create="!planSearchBusy && !planSearchRows.length" default-first-option
:remote-method="searchPlanStocks" :loading="planSearchBusy" :reserve-keyword="false"
placeholder="搜索名称或代码,也可输入代码后回车" :disabled="planUserBusy">
<el-option v-for="r in planSearchRows" :key="r.code" :value="r.code" :label="r.name+' '+r.code"></el-option>

View File

@ -4,6 +4,8 @@
======================================
运行: docker compose run --rm pms-web python scripts/run_tests.py
test_batch54_units.py 用户候选来源、到期核验、权限与技术面补读 (8例)
包含 (例数按 2026-10-26 隔离回归实跑校正):
test_sim_reset_units.py 双账本重置、空仓证据、配置与去重保留、幂等及SQL回滚 (9例)
test_batch53_units.py QMT下单策略类型、原字段与签名、双策略买卖归属及读取故障保留队列 (8例)
@ -184,7 +186,7 @@ import sys
HERE = os.path.dirname(os.path.abspath(__file__))
ROOT = os.path.dirname(HERE)
SUITES = [
SUITES = ["test_batch54_units.py",
"test_sim_reset_units.py",
"test_batch53_units.py",
"test_batch52_units.py",

View File

@ -0,0 +1,97 @@
"""用户候选沿用原评估链路,不创建命令、不修改资格结论。"""
import unit_test_guard
import unittest
from unittest.mock import patch, Mock
from datetime import datetime
from test_wiring import install_fakes
from app.services import plan_feed as pf, plan_candidates as pc, tech_service as tech
from app.core import plan_revision, consensus
from config.settings import settings
CODE='600001.SH'
def payload(expiry='2099-01-01'):
return {'date':'2026-11-02','decision':{'id':'v1'},'main':[
{'code':'SH600001','name':'甲','rank':2,'research_rank':2,'score':240,'verdict':'候选',
'user_candidate':{'id':'a'*32,'reason':'需求变化','expires_on':expiry},'user_required':True},
{'code':'SH600002','name':'乙','rank':1,'research_rank':1,'score':250,'verdict':'候选'}], 'observe':[], 'rank_axis':'quality'}
class UserCandidateTests(unittest.TestCase):
def setUp(self):
self.fake=install_fakes(params={'PMS_PLAN_API_BASE':'http://plan.test','PMS_PLAN_TIERS':'',
'PMS_PLAN_MIN_UPSIDE':0,'PMS_PLAN_MIN_SCORE':0,'PMS_PLAN_TOP_N':30})
def test_source_passes_through_without_priority_or_score_change(self):
plan=pf.parse_plan(payload())
rows=pf.select_candidates(plan,rank_by_upstream=True,top_n=2)['items']
self.assertEqual([r['ts_code'] for r in rows],['600002.SH',CODE])
self.assertEqual(rows[1]['score'],240)
self.assertTrue(rows[1]['user_required'])
self.assertEqual(pf.select_candidates(plan,rank_by_upstream=True,top_n=1)['items'][0]['ts_code'],'600002.SH')
def test_expired_source_not_used_but_system_source_survives(self):
plan=pf.parse_plan(payload('2000-01-01'))
self.assertNotIn(CODE,[r['ts_code'] for r in pf.select_candidates(plan)['items']])
plan['main'][0]['user_required']=False
self.assertIn(CODE,[r['ts_code'] for r in pf.select_candidates(plan)['items']])
def test_blacklist_and_display_still_reject_user_candidate(self):
plan=pf.parse_plan(payload())
self.assertNotIn(CODE,[r['ts_code'] for r in pf.select_candidates(plan,black=[CODE])['items']])
plan['main'][0]['verdict']='仅展示'
self.assertNotIn(CODE,[r['ts_code'] for r in pf.select_candidates(plan,route_by_verdict=True)['items']])
self.assertEqual(consensus.decide('无读数','看多','看多',fund_required=True)['route'],'跳过')
self.assertEqual(consensus.decide('中性','看多','看空')['route'],'观察')
def test_user_metadata_changes_invalidate_basis(self):
row=pf.parse_plan(payload())['main'][0]
old=plan_revision.basis(row)
row['user_candidate']=dict(row['user_candidate'],id='b'*32)
row['decision']={'id':'v2'}
self.assertEqual(plan_revision.compare(old,row,CODE),'material')
def test_command_source_does_not_gain_user_only_candidates(self):
plan=pf.parse_plan(payload())
with patch.object(pf,'get_plan',return_value=plan):
rows=pf.candidates(record=False,allow_user=False)['items']
self.assertNotIn(CODE,[r['ts_code'] for r in rows])
self.assertEqual(len(plan['main']),2)
def test_proxy_secret_actor_failure_and_redirect(self):
import requests
from app.services import param_store
self.assertIn('PMS_PLAN_WRITE_KEY',param_store.SECRET_KEYS)
response=Mock(status_code=200)
response.json.return_value={'ok':True,'added':1}
with patch.object(settings,'PMS_PLAN_WRITE_KEY','test-key'),patch.object(requests,'request',return_value=response) as send:
self.assertTrue(pc.request('POST',payload={'codes':['600001'],'actor':'冒名'},actor='会话用户')['ok'])
self.assertEqual(send.call_args.kwargs['json']['actor'],'会话用户')
self.assertEqual(send.call_args.kwargs['headers'],{'X-Job-Key':'test-key'})
self.assertFalse(send.call_args.kwargs['allow_redirects'])
response.status_code=302
with self.assertRaises(ValueError):pc.request('POST')
with patch.object(settings,'PMS_PLAN_WRITE_KEY',''),patch.object(requests,'request') as send:
with self.assertRaises(ValueError):pc.request('POST')
send.assert_not_called()
def test_on_demand_technical_read_rejects_stale_or_missing_today(self):
from app.repo import tech_repo
with patch.object(tech_repo,'latest_date',return_value=20261102),patch.object(tech,'_tdays_elapsed',return_value=9):
self.assertEqual(tech.read_states_for([CODE]),{})
with patch.object(tech_repo,'latest_date',return_value=20261102),patch.object(tech,'_tdays_elapsed',return_value=1),\
patch.object(tech.tradedays,'prev_trade_day',return_value=20261001),\
patch.object(tech_repo,'history_multi',return_value={CODE:[{'data_date':20261030}]}) as read:
self.assertEqual(tech.read_states_for([CODE]),{})
self.assertEqual(read.call_args.args[0],[CODE])
def test_trader_route_and_server_actor(self):
from app.web import auth, main
self.assertNotEqual(auth.authz_decision('POST','/api/plan/user-candidates'),'admin')
request=Mock();request.state.user={'username':'交易员甲'}
with patch.object(pc,'request',return_value={'ok':True,'added':1}) as send, \
patch.object(main.pms_repo,'insert_op_log',return_value=1) as log:
result=main.api_add_user_candidates(request,{'codes':['600001'],'by':'冒名'})
self.assertTrue(result['ok']);self.assertEqual(send.call_args.kwargs['actor'],'交易员甲')
self.assertEqual(log.call_args.kwargs['by'],'交易员甲')
if __name__=='__main__':unittest.main()