From 4ae63786524baa3faf5b43e8ac590ca528fd5d5a Mon Sep 17 00:00:00 2001 From: zlt Date: Thu, 17 Sep 2026 12:55:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=8A=A5=E8=BF=98=E5=8E=9F=20PMS=20?= =?UTF-8?q?=E4=BA=A4=E4=BB=98=E5=90=8D=E5=8D=95=E5=BA=8F=EF=BC=9Apms=5Fros?= =?UTF-8?q?ter=20=E6=8C=89=E5=90=8D=E5=86=8C=E5=85=83=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?rank=5Fmode=20=E6=8E=92=EF=BC=88=E5=B7=A5=E4=BD=9C=E5=8C=85?= =?UTF-8?q?=E4=B9=99=E9=80=89=E8=82=A1=E4=BE=A7=E5=B0=8F=E6=94=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 上线协同阶段工作包乙的选股系统一处小改。plan_review.pms_roster 查询多取 meta_json:名册元数据 rank_mode 为 upstream(上游质地序)时按上游名次升序取前 N,不再按强传导过滤,与持仓管理系统 select_candidates 的 upstream 分支同口径;否则保持旧口径(档位强传导、分数降序)。注记写明序按 rank_mode 还原,让四周复核的生产名单对得上 PMS 当天真正交付的那份。 只加 meta_json 读取与一个 upstream 分支;旧口径分支逐字不变。持仓管理系统那侧改动在 tradingSystem 提交 f5cc1b8(台账 016)。实测:本地 test_plan_review_heads、test_plan_review_source 均 ALL OK。 Co-Authored-By: Claude Opus 4.8 --- plan_review.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/plan_review.py b/plan_review.py index 2cc68c6..652b1c1 100644 --- a/plan_review.py +++ b/plan_review.py @@ -118,10 +118,12 @@ def cap_bucket(day: str) -> dict[str, str]: def pms_roster(day: str) -> tuple[list[str], str]: - """PMS 当日拿到的生产名单:计划快照名册里档位强传导、按分数序前 N。返回 (代码, 注记)。""" + """PMS 当日拿到的生产名单。返回 (代码, 注记)。序按名册元数据 rank_mode 还原当天真正交付的那份 + (2026-09-17 工作包乙):upstream(上游质地序)按上游名次升序取前 N;否则按旧口径(档位强传导、 + 分数降序)取前 N。""" try: df = db.read_mysql( - "pms", "SELECT roster_json, fetched_at FROM pms_plan_snapshot " + "pms", "SELECT roster_json, meta_json, fetched_at FROM pms_plan_snapshot " "WHERE plan_date = %s ORDER BY id DESC LIMIT 1", (day,)) n_df = db.read_mysql( "pms", "SELECT param_value FROM pms_runtime_param WHERE param_key='PMS_PLAN_TOP_N'") @@ -133,10 +135,20 @@ def pms_roster(day: str) -> tuple[list[str], str]: return [], "PMS 无当日快照,生产名单退为桥重算" n = int(n_df.iloc[0, 0]) if not n_df.empty else 30 roster = json.loads(df.iloc[0]["roster_json"] or "[]") - rows = [r for r in roster if str(r.get("t") or "") == "强传导" and str(r.get("b") or "main") == "main"] - rows.sort(key=lambda r: -(r.get("s") or 0)) - return [common.to_prefix(str(r["c"]).strip()) for r in rows[:n] if r.get("c")], \ - f"PMS 快照名册(N={n} 为现值,历史 N 不可还原)" + try: + meta = json.loads(df.iloc[0]["meta_json"] or "{}") + except (TypeError, ValueError): + meta = {} + main_rows = [r for r in roster if str(r.get("b") or "main") == "main"] + if meta.get("rank_mode") == "upstream": + # 上游质地序:PMS 按上游名次升序取前 N(不再按强传导过滤,与 PMS 的 select_candidates 同口径) + main_rows.sort(key=lambda r: r.get("r") if r.get("r") is not None else 1 << 60) + note = f"PMS 快照名册(序按名册元数据 rank_mode=upstream 还原,上游名次升序,N={n})" + else: + main_rows = [r for r in main_rows if str(r.get("t") or "") == "强传导"] + main_rows.sort(key=lambda r: -(r.get("s") or 0)) + note = f"PMS 快照名册(N={n} 为现值,历史 N 不可还原)" + return [common.to_prefix(str(r["c"]).strip()) for r in main_rows[:n] if r.get("c")], note def _uniq_codes(values) -> list[str]: