From 38f91d2bddd27ff2727c2209df687a5a73278bd5 Mon Sep 17 00:00:00 2001 From: baobao Date: Thu, 5 Nov 2026 13:04:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=8F=E4=BC=A0=E8=AF=84=E7=BA=A7=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E4=BE=9D=E6=8D=AE=E5=B9=B6=E4=BF=9D=E6=8C=81=E7=A0=94?= =?UTF-8?q?=E5=88=A4=E6=8C=87=E7=BA=B9=E7=A8=B3=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DEVLOG.md | 5 +++++ UPSTREAM_PLAN_API.md | 7 +++++++ app/services/plan_feed.py | 4 +++- scripts/run_tests.py | 2 +- scripts/test_batch54_units.py | 12 ++++++++++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/DEVLOG.md b/DEVLOG.md index ad6c40e..72a28ba 100644 --- a/DEVLOG.md +++ b/DEVLOG.md @@ -2838,3 +2838,8 @@ PMS最终代码56db0fd已推送,155 web/WS/beat为execution-2b1c447,worker 64449c6在155候选断网78套件全量通过,含35项退出专项。12:28排空目标worker后,12:29:50只更新web、worker、唯一WS为pms:risk-exit-64449c6;15个非目标容器完整基线不变,环境、挂载及私有文件保持。12:30:46在155开启,使用真实持仓及正式报告完成初始化:五份评级未下降,雷赛智能一次真实信号、停买、1600股,未新增EXIT。手工试探仓不改变系统仓位计算。 12:31确认1642021、近200条连续、待入账及孤儿0、数量现金一致、资金3.5秒。三个进程均核实开关和停买生效,微盘排除,worker消费恢复、QMT连接唯一。午休自然调度正常跳过,第二次信号或评级下降的真实自动清仓尚未发生;初始化不冒充自然判收。188未操作,不新建观察任务。提交、镜像、回退及证据见[退出纪律接续](docs/两次清仓信号与评级下降退出_2026-11-05.md)。 + + +### 2026-11-05 评级变动与三十日排序开发 + +用户选择降级保留候选、只降低优先级。同质地档内近30天升级优先、降级后置,原分数及三源合议保持。基座新增正式评级版本历史,选股系统固定截止时间计算窗口,PMS透传依据并沿用上游研究排名。开发机PMS78组及选股39组配置隔离、禁网全量通过;基座验证与部署事实见评级排序接续。当前未切换运行服务或排序开关。 diff --git a/UPSTREAM_PLAN_API.md b/UPSTREAM_PLAN_API.md index 70d582e..d50c6e1 100644 --- a/UPSTREAM_PLAN_API.md +++ b/UPSTREAM_PLAN_API.md @@ -748,3 +748,10 @@ PMS每分钟执行`pms.monitor_watch_sync`。来源是完整有效人工登记 Bionic回执保存在`bionic:monitor_watch:status:v1:pms-sim-155`。PMS核对来源、关注编号、登记版本、报告版本、名单有效期和任务截止时间。`QUEUED`、`RUNNING`表示等待或在途,只有有效的`COMPLETE`表示已有结果;`UNAVAILABLE`和`EXPIRED`保留原因。调度日`analysis_date`、真实行情日`data_date`及完成时间`completed_at`分别展示,盘前使用上一交易日日线时不能强行改成同一天。 信号页的人工关注入口持续保留至到期或主动移除。单票已有信号沿用点击触发的只读接口,不加入全流轮询。独立观察分析展开后显示真实结论、原因、行情数据日和完成时间,并注明研究结论不是交易授权。页面GET不派模型任务;覆盖回执不作为买卖信号进入交易消费链。旧`DROPPED`标为历史停止覆盖,既不恢复旧`BUY/WATCH`,也不冒充今天的新看空结论。完整快照与回执结构见[修复规格](docs/人工关注分析链修复规格_2026-11-04.md)。 + + +## 2026-11-05 补充:评级变动排序依据 + +计划行增加可选 `rating_priority`,包含 `priority`(升级1、普通0、降级-1)、`status`、`window_days`、`change`、`expires_at`和`history_event_id`。变化记录含前后评级、前后固定报告引用及真实发生时刻。缺少历史时明确标记,不推断升级或降级。 + +现有质地带仍是首要排序条件,评级优先级只参与同带顺序,原分数与门槛不变。PMS继承`research_rank`,透传依据,不自行重复加分。该字段位于计划行顶层,不进入`company_review`及提议研究指纹;单纯期限届满不重新请求模型。固定计划版本不受当前时间影响。 diff --git a/app/services/plan_feed.py b/app/services/plan_feed.py index c47537b..c712110 100644 --- a/app/services/plan_feed.py +++ b/app/services/plan_feed.py @@ -341,6 +341,7 @@ def _rows(raw, bucket: str) -> list: "rank_axis": _text_or_none(it.get("rank_axis")), "rank_old": _int_or_none(it.get("rank_old")), "research_rank": _int_or_none(it.get('research_rank')), + "rating_priority": it.get("rating_priority") if isinstance(it.get("rating_priority"), dict) else None, "research": it.get('research') if isinstance(it.get('research'), dict) else None, "review_ref": _text_or_none(it.get('review_ref')), 'user_candidate': it.get('user_candidate') if isinstance(it.get('user_candidate'), dict) else None, @@ -618,7 +619,7 @@ def select_candidates(plan: dict, *, held=(), black=(), top_n: int = 30, tiers=N # 排序轴四键 (2026-09-17 工作包乙): 原样透传给动作引擎与提议卡, 缺就是 None。 "quality_band": r.get("quality_band"), "pointed": r.get("pointed"), "rank_axis": r.get("rank_axis"), "rank_old": r.get("rank_old"), - **{k: r.get(k) for k in ('research_rank', 'research', 'review_ref', 'user_candidate', 'user_required')}} + **{k: r.get(k) for k in ('research_rank', 'rating_priority', 'research', 'review_ref', 'user_candidate', 'user_required')}} for r in passed[:n]] for i, item in enumerate(items, 1): item.update(selection_rank=i, decision=plan.get('decision'), @@ -842,6 +843,7 @@ def parse_logic_states(payload) -> dict: st['observation_at'] = it.get('observation_at') st['observation_scope'] = it.get('observation_scope') st['research'] = it.get('research') + st['rating_priority'] = it.get('rating_priority') if isinstance(it.get('rating_priority'), dict) else None st['review_ref'] = it.get('review_ref') out[code] = st return out diff --git a/scripts/run_tests.py b/scripts/run_tests.py index e10381d..ddca22b 100644 --- a/scripts/run_tests.py +++ b/scripts/run_tests.py @@ -4,7 +4,7 @@ ====================================== 运行: docker compose run --rm pms-web python scripts/run_tests.py - test_batch54_units.py 用户候选来源、到期核验、权限、显式取用与技术面补读 (9例) + test_batch54_units.py 用户候选来源、到期核验、权限、显式取用、技术面补读及评级排序透传 (10例) 成交修正专项:批次投影36例、传输与执行保护29例、服务事务36例、 普通成交凭据与仓储13例、网格更正版本与并发20例。 diff --git a/scripts/test_batch54_units.py b/scripts/test_batch54_units.py index 1a24219..71daf89 100644 --- a/scripts/test_batch54_units.py +++ b/scripts/test_batch54_units.py @@ -29,6 +29,18 @@ class UserCandidateTests(unittest.TestCase): 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_rating_priority_passthrough_keeps_upstream_order_and_judgement_basis(self): + raw = payload() + raw['main'][0]['rating_priority'] = {'priority': -1, 'status': 'active', 'change': {'direction': 'down'}} + parsed = pf.parse_plan(raw) + rows = pf.select_candidates(parsed, rank_by_upstream=True, top_n=2)['items'] + self.assertEqual([r['ts_code'] for r in rows], ['600002.SH', CODE]) + self.assertEqual(rows[1]['rating_priority'], raw['main'][0]['rating_priority']) + before = plan_revision.basis(rows[1]) + rows[1].update(rating_priority={'priority': 0, 'status': 'expired'}, research_rank=1) + self.assertEqual(before, plan_revision.basis(rows[1])) + self.assertFalse(plan_revision.needs_new_judgement({'plan_basis': before}, {'plan_basis': plan_revision.basis(rows[1])})) + 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']])