取消重复方向门槛并保留人工关注扫描入口
This commit is contained in:
parent
9304f0b115
commit
9ae5d98894
|
|
@ -98,6 +98,7 @@ MONGO_DB=stock_predictions
|
|||
# 回退时把这三个加下面的 POOL_SOURCE 一起设回旧值即逐字回旧,不用回代码、不用重启 ---
|
||||
# PLAN_RANK_AXIS=quality # 默认 quality(质地带为主键,传导降为带内次级键);transmission=回 09-14 旧轴
|
||||
# CARD_SORT_BY_QUALITY=1 # 候选卡内序先质地带;0=回"先判决再涨幅"
|
||||
# CARD_CONSENSUS_ADMISSION_ENABLED=0 # 授权切换后为1:传导/吸筹/昨夜方向只作参考,建仓交PMS三源合议
|
||||
# REVIEW_TARGETS_AXIS=both # 评析名单=原始分前100 ∪ 新序前50;score=只按原始分前100(旧)
|
||||
|
||||
# --- 周报底本(2026-09-17 拍板,工作包丙):snapshot=每个计划日先读当天落盘快照(当天真出过的那份),
|
||||
|
|
|
|||
22
card.py
22
card.py
|
|
@ -99,7 +99,8 @@ def judge(ev: dict[str, Any], *, start_pct: float = 3.0,
|
|||
accum_max_age: int = 30, neg_tol: float = 0.0,
|
||||
logic_stale_days: int = 90, require_started: bool = True,
|
||||
company_review: dict | None = None, quality_gate: bool = True,
|
||||
stale_days: int = 120, require_accum_confirm: bool = True) -> dict[str, Any]:
|
||||
stale_days: int = 120, require_accum_confirm: bool = True,
|
||||
consensus_admission: bool = False) -> dict[str, Any]:
|
||||
"""一只票的证据字典 -> 判决字典。
|
||||
|
||||
ev 里认的键(缺键按缺失处理,不报错):
|
||||
|
|
@ -121,6 +122,7 @@ def judge(ev: dict[str, Any], *, start_pct: float = 3.0,
|
|||
分歧条数、按环节展开的条数),取数层在截断前算好带上来,与判决无关
|
||||
failed_gates 是未过的门槛名;三门槛全过但吸筹评分为非明确状态而落仅展示时,附加 "confirm"
|
||||
"""
|
||||
require_accum_confirm = bool(require_accum_confirm and not consensus_admission)
|
||||
pct0 = _num(ev.get("pct0"))
|
||||
upside = _num(ev.get("upside"))
|
||||
accum_score = _num(ev.get("accum_score"))
|
||||
|
|
@ -154,6 +156,10 @@ def judge(ev: dict[str, Any], *, start_pct: float = 3.0,
|
|||
risk.append("用的传导快照不是计划当天的")
|
||||
if "派发" in accum_state:
|
||||
risk.append("资金在高位派发")
|
||||
reference_risk = []
|
||||
if consensus_admission:
|
||||
reference_risk = [x for x in risk if x != '用的传导快照不是计划当天的']
|
||||
risk = [x for x in risk if x == '用的传导快照不是计划当天的']
|
||||
|
||||
missing: list[str] = []
|
||||
if pct0 is None:
|
||||
|
|
@ -170,7 +176,7 @@ def judge(ev: dict[str, Any], *, start_pct: float = 3.0,
|
|||
elif require_accum_confirm and confirm_negative and "派发" not in accum_state:
|
||||
state_short = accum_state.split("·")[0].strip()
|
||||
missing.append(f"吸筹只到「{state_short}」,没到明确吸筹这条线")
|
||||
if not gates["pointed"]:
|
||||
if not gates["pointed"] and not consensus_admission:
|
||||
missing.append("所在环节当日没有被传导指向")
|
||||
# 研报论断的质量提示。放进缺失项是因为它和"吸筹评分陈旧"是同一类事:证据还在,
|
||||
# 但已经旧到不该当新证据用。两者此前一个会过期一个不会,卡上看着一样新,
|
||||
|
|
@ -207,16 +213,17 @@ def judge(ev: dict[str, Any], *, start_pct: float = 3.0,
|
|||
if user_selected and not gates['pointed']:
|
||||
missing = [x for x in missing if x != '所在环节当日没有被传导指向']
|
||||
reasons.insert(0, '用户添加,按现有条件评估')
|
||||
effective = dict(gates, pointed=gates['pointed'] or user_selected)
|
||||
effective = dict(gates, pointed=gates['pointed'] or user_selected or consensus_admission)
|
||||
all_gates = all(effective.values())
|
||||
failed = [k for k, ok in effective.items() if not ok]
|
||||
# 判决依据是这张卡上唯一一句"为什么",PMS 原样显示在页面上给人读。所以它必须是
|
||||
# 一句完整的中文,带上具体数字,不许出现门槛的变量名(started 这类)或信号的
|
||||
# 枚举值(SELL 这类)——那些是系统之间传递用的,不是给人看的。
|
||||
if risk:
|
||||
# 旧择时与吸筹方向交给 PMS 的最新三源合议;快照日期和证券资格继续拦截。
|
||||
if risk and (not consensus_admission or ev.get('stale_snapshot')):
|
||||
verdict = VERDICT_SHOW
|
||||
basis = ";".join(risk)
|
||||
elif all_gates and not require_accum_confirm:
|
||||
elif all_gates and (consensus_admission or not require_accum_confirm):
|
||||
verdict = VERDICT_CANDIDATE
|
||||
basis = "选股资格通过,进入基本面、技术面和择时合议"
|
||||
elif all_gates and confirm:
|
||||
|
|
@ -255,7 +262,10 @@ def judge(ev: dict[str, Any], *, start_pct: float = 3.0,
|
|||
basis = f"{basis};{company_gate}"
|
||||
|
||||
return {"verdict": verdict, "reasons": reasons, "missing": missing, "risk": risk,
|
||||
"gates": gates, "confirm": confirm, "confirm_required": bool(require_accum_confirm),
|
||||
"reference_risk": reference_risk,
|
||||
"gates": gates, "effective_gates": effective,
|
||||
"consensus_admission": bool(consensus_admission),
|
||||
"confirm": confirm, "confirm_required": bool(require_accum_confirm and not consensus_admission),
|
||||
"failed_gates": failed, "basis": basis,
|
||||
"company_gate": company_gate, "quality_band": qband,
|
||||
"logic": logic_lines(ev.get("logic")),
|
||||
|
|
|
|||
|
|
@ -232,6 +232,7 @@ CARD_ACCUM_MAX_AGE = int(os.environ.get("CARD_ACCUM_MAX_AGE", "30")) # 确认
|
|||
# 2026-11-04:155显式关闭旧吸筹准入确认,吸筹转为三源合议的参考。
|
||||
# 默认保留旧模式以兼容其他调用方;切换必须发布新计划版本,不能改历史快照。
|
||||
CARD_ACCUM_CONFIRM_REQUIRED = os.environ.get("CARD_ACCUM_CONFIRM_REQUIRED", "1").lower() not in ("0", "false", "no")
|
||||
CARD_CONSENSUS_ADMISSION_ENABLED = os.environ.get('CARD_CONSENSUS_ADMISSION_ENABLED', '0').lower() in ('1', 'true', 'yes')
|
||||
# 计划快照落点(容器内路径;仓库根挂在 /app,故默认落在仓库 data/plan/)。
|
||||
# 每日 JSON 含主榜与观察档全部行与全部证据线,是复盘与对账的唯一底本。
|
||||
PLAN_SNAPSHOT_DIR = os.environ.get("PLAN_SNAPSHOT_DIR", "data/plan")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
# 三源合议与人工关注入口
|
||||
|
||||
2026年11月10日12:05,开发机已实现,尚未发布。
|
||||
|
||||
155运行产品仍为0945fa2。11:33返回主榜300条中203条仅展示,其中89条含“所在环节当日没有被传导指向”。华策影视有效关注却落在返回截断之外;即使返回,PMS普通扫描数量仍会截断。此前仅取消明确吸筹确认,传导和昨夜方向的前置门槛没有一并取消。
|
||||
|
||||
新开关`CARD_CONSENSUS_ADMISSION_ENABLED`默认关闭,授权发布时开启。证券资格、覆盖、估值和快照日期仍核验;传导、吸筹及昨夜方向保留原始事实,交PMS现行基本面、技术面、择时三源合议。方向参考不再装成硬风险下发,质地排序和三十日评级变动优先级保持。
|
||||
|
||||
显式订阅人工关注的消费者,返回原榜正常截取与有效关注的并集,保持原质地顺序;未订阅消费者保持原返回规则。PMS负责登记有效期和扫描限制。关注不自动等于建仓,不伪造传导、研究或交易信号。
|
||||
|
||||
规则切换由正常plan-refresh生成真实时刻的新修订,旧晨版与输入保留;历史冻结配置缺少新参数时按关闭解释,不借当前环境改变历史。
|
||||
|
||||
开发机通过全部离线测试及新增5项资格、旧输入隔离、截断保留、规则修订测试。`offline_tests.py`使用空环境和临时目录,阻断套接字,吞掉联网异常也判失败。发布需用候选镜像再做断网全量回归,独立发布目录挂载,不覆盖原源码或环境文件。后续补记实际版本、自然修订及PMS消费结果。
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
"""逐批离线验证;空配置、临时目录,任何套接字访问都判失败。"""
|
||||
import os
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
ROOT = Path(__file__).resolve().parent
|
||||
CHILD = r'''
|
||||
import os, runpy, socket, sys
|
||||
attempts=[]
|
||||
def blocked(*a, **k):
|
||||
attempts.append('socket')
|
||||
raise RuntimeError('离线测试禁止联网')
|
||||
socket.socket.connect=socket.socket.connect_ex=blocked
|
||||
socket.create_connection=socket.getaddrinfo=blocked
|
||||
import dotenv
|
||||
dotenv.load_dotenv=lambda *a,**k:False
|
||||
sys.path.insert(0,sys.argv[1])
|
||||
target=sys.argv[2]; sys.argv=[target]
|
||||
status=0
|
||||
try: runpy.run_path(target,run_name='__main__')
|
||||
except SystemExit as exc: status=exc.code or 0
|
||||
if attempts: raise RuntimeError('测试曾尝试联网,禁止以吞异常通过')
|
||||
raise SystemExit(status)
|
||||
'''
|
||||
|
||||
if __name__ == '__main__':
|
||||
files = [ROOT / p for p in sys.argv[1:]] if len(sys.argv)>1 else sorted(ROOT.glob('test_*.py'))
|
||||
for path in files:
|
||||
if path.name == 'test_api_support.py':
|
||||
continue
|
||||
if not path.is_file():
|
||||
raise FileNotFoundError(path)
|
||||
print('=== '+path.name+' ===', flush=True)
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
env={'PATH':os.environ.get('PATH',''), 'HOME':tmp, 'TZ':'Asia/Shanghai',
|
||||
'PYTHONDONTWRITEBYTECODE':'1','PYTHONIOENCODING':'utf-8'}
|
||||
subprocess.run([sys.executable,'-c',CHILD,str(ROOT),str(path)],cwd=tmp,env=env,check=True)
|
||||
print('ALL SUITES PASS')
|
||||
24
plan.py
24
plan.py
|
|
@ -449,6 +449,7 @@ def _assemble_cards(ds: str, codes: list, ev: dict, upside: pd.Series,
|
|||
j = card.judge(evd, start_pct=config.CARD_START_PCT,
|
||||
accum_max_age=config.CARD_ACCUM_MAX_AGE,
|
||||
require_accum_confirm=config.CARD_ACCUM_CONFIRM_REQUIRED,
|
||||
consensus_admission=config.CARD_CONSENSUS_ADMISSION_ENABLED,
|
||||
neg_tol=config.UPSIDE_NEG_TOLERANCE,
|
||||
logic_stale_days=config.LOGIC_STALE_DAYS,
|
||||
require_started=config.CARD_REQUIRE_STARTED,
|
||||
|
|
@ -630,7 +631,7 @@ def collect(date: str | None = None, top: int = 20, obs_top: int = 10,
|
|||
# 2026-09-03 新增只联入:basis(判决依据一句话)、logic(因果论断带出处的文字行)、
|
||||
# card.chain_fit(链符,入池上下文用)、card.logic_claims(论断原值)、card.failed_gates。
|
||||
r.update(verdict=c["verdict"], reasons=c["reasons"], missing=c["missing"],
|
||||
risk=c["risk"], card_rank=c["card_rank"],
|
||||
risk=c["risk"], reference_risk=c.get('reference_risk') or [], card_rank=c["card_rank"],
|
||||
basis=c.get("basis"), logic=c.get("logic") or [],
|
||||
# 2026-09-04 新增:逻辑状态四态。只发状态、子因、每路的来龙去脉与
|
||||
# 截止日,不发权重也不发判决改动——四态怎么作用于建仓通道是 PMS
|
||||
|
|
@ -780,14 +781,19 @@ def collect(date: str | None = None, top: int = 20, obs_top: int = 10,
|
|||
"transmission 时按 09-14 的质地调整分序",
|
||||
# ---- 候选卡(2026-09-02):分数与档位之外的另一份产物,不受 top / theme_cap 裁剪 ----
|
||||
"card_params": {"start_pct": config.CARD_START_PCT,
|
||||
"consensus_admission": config.CARD_CONSENSUS_ADMISSION_ENABLED,
|
||||
"accum_confirm_required": config.CARD_ACCUM_CONFIRM_REQUIRED,
|
||||
"admission_rule": ("accum-confirm-v1" if config.CARD_ACCUM_CONFIRM_REQUIRED
|
||||
"admission_rule": ("consensus-admission-v3-20261110" if config.CARD_CONSENSUS_ADMISSION_ENABLED else
|
||||
"accum-confirm-v1" if config.CARD_ACCUM_CONFIRM_REQUIRED
|
||||
else "accum-reference-v2-20261104"),
|
||||
"require_started": config.CARD_REQUIRE_STARTED,
|
||||
"accum_max_age": config.CARD_ACCUM_MAX_AGE,
|
||||
"neg_tol": config.UPSIDE_NEG_TOLERANCE,
|
||||
"logic_per_stock": config.LOGIC_CLAIMS_PER_STOCK,
|
||||
"rules": ("候选=环节被指向∧当日涨幅达标∧券商覆盖且非ST∧明确吸筹∧无硬风险;"
|
||||
"rules": ("沿用质地排序,传导与吸筹仅作参考;旧择时结论不在选股层单独否决;"
|
||||
"保留证券资格、有效数据及覆盖空间约束,建仓由PMS按最新基本面、技术面和择时三源合议决定"
|
||||
if config.CARD_CONSENSUS_ADMISSION_ENABLED else
|
||||
"候选=环节被指向∧当日涨幅达标∧券商覆盖且非ST∧明确吸筹∧无硬风险;"
|
||||
"关注=三门槛全过∧无硬风险∧确认线缺失或陈旧(系统无法判断,交人裁决);"
|
||||
"其余仅展示(只差覆盖、潜在吸筹等非明确状态都不升格,台账 013);"
|
||||
"因果论断只展示不进判决" if config.CARD_ACCUM_CONFIRM_REQUIRED else
|
||||
|
|
@ -1123,10 +1129,14 @@ def from_snapshot(date: str | None = None, top: int = 20, obs_top: int = 10,
|
|||
data = {k: v for k, v in snap.items()
|
||||
# 落盘那次的裁剪参数与本次请求无关,研究及环境仍来自同一版本。
|
||||
if k not in ("main_shown", "observe_shown", "shown_params")}
|
||||
data["main"] = [{**r, "rank": i}
|
||||
for i, r in enumerate(pick_rows(full_main, top, theme_cap), 1)]
|
||||
data["observe"] = [{**r, "rank": i}
|
||||
for i, r in enumerate(pick_rows(full_obs, obs_top, theme_cap), 1)]
|
||||
def picked(rows, count):
|
||||
chosen = {r['code'] for r in pick_rows(rows, count, theme_cap)}
|
||||
if include_user_candidates:
|
||||
chosen.update(r['code'] for r in rows if (r.get('user_candidate') or {}).get('id'))
|
||||
# 仍按同一份冻结榜单排序,人工来源只免于返回数量截断,不另排一份优先榜。
|
||||
return [{**r, 'rank': i} for i, r in enumerate((r for r in rows if r['code'] in chosen), 1)]
|
||||
data["main"] = picked(full_main, top)
|
||||
data["observe"] = picked(full_obs, obs_top)
|
||||
data["theme_cap"] = theme_cap
|
||||
data["plan_source"] = "snapshot"
|
||||
data["snapshot_generated_at"] = snap.get("generated_at")
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ class Config:
|
|||
if bundle is not None and name in bundle.params:
|
||||
return bundle.params[name]
|
||||
# 老冻结版本从未启用新规则,不能继承今天服务器的开关。
|
||||
if bundle is not None and bundle.replay and name == 'PLAN_RATING_PRIORITY_ENABLED':
|
||||
if bundle is not None and bundle.replay and name in ('PLAN_RATING_PRIORITY_ENABLED', 'CARD_CONSENSUS_ADMISSION_ENABLED'):
|
||||
return False
|
||||
return getattr(self.module, name)
|
||||
|
||||
|
|
|
|||
|
|
@ -49,6 +49,9 @@ def refresh(day=None, *, now=None, regime_value=None):
|
|||
previous_confirm = params.get('CARD_ACCUM_CONFIRM_REQUIRED', True)
|
||||
desired_confirm = bool(config.CARD_ACCUM_CONFIRM_REQUIRED)
|
||||
policy_changed = previous_confirm != desired_confirm
|
||||
consensus_changed = params.get('CARD_CONSENSUS_ADMISSION_ENABLED', False) != config.CARD_CONSENSUS_ADMISSION_ENABLED
|
||||
params['CARD_CONSENSUS_ADMISSION_ENABLED'] = config.CARD_CONSENSUS_ADMISSION_ENABLED
|
||||
policy_changed = policy_changed or consensus_changed
|
||||
if policy_changed:
|
||||
params['CARD_ACCUM_CONFIRM_REQUIRED'] = desired_confirm
|
||||
pending.update(r['code'] for b in ('main', 'observe') for r in old.get(b, []))
|
||||
|
|
@ -116,6 +119,8 @@ def refresh(day=None, *, now=None, regime_value=None):
|
|||
reason = '启用评级变动三十日排序' if config.PLAN_RATING_PRIORITY_ENABLED else '关闭评级变动排序'
|
||||
elif config.PLAN_RATING_PRIORITY_ENABLED and pending:
|
||||
reason = '评析或评级排序期限更新'
|
||||
if consensus_changed:
|
||||
reason = '选股方向统一交由三源合议' if config.CARD_CONSENSUS_ADMISSION_ENABLED else '恢复原选股方向门槛'
|
||||
published = pv.publish(root, data, inputs, params, cutoff_at=now.isoformat(), reason=reason)
|
||||
plan.write_published_md(published)
|
||||
return {'status': 'published', 'decision': published['decision']}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,77 @@
|
|||
import copy
|
||||
import datetime as dt
|
||||
import tempfile
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
import test_api_support
|
||||
import card
|
||||
import config
|
||||
import plan
|
||||
import plan_inputs
|
||||
|
||||
|
||||
class AdmissionTests(unittest.TestCase):
|
||||
def test_rule_revision_uses_new_cutoff_and_preserves_morning_version(self):
|
||||
import plan_refresh, plan_versions as pv
|
||||
with tempfile.TemporaryDirectory() as root:
|
||||
now=dt.datetime.fromisoformat('2026-11-10T12:00:00+08:00')
|
||||
old={'date':'2026-11-09','main':[{'code':'SH600001','verdict':'仅展示'}],'observe':[]}
|
||||
inputs={'records':{},'user_candidates':[],'market':{},'regime':None}
|
||||
first=pv.publish(root,old,inputs,{'CARD_ACCUM_CONFIRM_REQUIRED':False},
|
||||
cutoff_at='2026-11-10T07:10:00+08:00',reason='晨版')
|
||||
def collect(*a,**k):
|
||||
self.assertTrue(plan.config.CARD_CONSENSUS_ADMISSION_ENABLED)
|
||||
return {**copy.deepcopy(old),'_full':{'main':[{'code':'SH600001','verdict':'候选'}],'observe':[]}}
|
||||
with patch.object(config,'PLAN_SNAPSHOT_DIR',root), \
|
||||
patch.object(config,'CARD_CONSENSUS_ADMISSION_ENABLED',True), \
|
||||
patch.object(config,'CARD_ACCUM_CONFIRM_REQUIRED',False), \
|
||||
patch.object(plan_refresh,'in_window',return_value=True), \
|
||||
patch.object(plan,'collect',side_effect=collect),patch.object(plan,'write_published_md'):
|
||||
self.assertEqual(plan_refresh.refresh(now=now)['status'],'published')
|
||||
newest=pv.load(root)
|
||||
self.assertEqual(newest['decision']['reason'],'选股方向统一交由三源合议')
|
||||
self.assertEqual(newest['decision']['cutoff_at'],now.isoformat())
|
||||
self.assertEqual(pv.load(root,morning=True),first)
|
||||
self.assertEqual(plan_refresh.refresh(now=now)['status'],'unchanged')
|
||||
|
||||
def test_unpointed_and_old_direction_reach_consensus_without_faking_evidence(self):
|
||||
for signal in ['SELL','AVOID','DROPPED','WATCH']:
|
||||
result=card.judge(dict(pointed=False,covered=True,upside=.2,pct0=4,
|
||||
accum_state='高位派发',accum_age=0,y_signal=signal),consensus_admission=True)
|
||||
self.assertEqual(result['verdict'],'候选')
|
||||
self.assertFalse(result['gates']['pointed'])
|
||||
self.assertNotIn('pointed',result['failed_gates'])
|
||||
self.assertEqual(result['risk'],[])
|
||||
self.assertIn('资金在高位派发',result['reference_risk'])
|
||||
self.assertNotIn('所在环节当日没有被传导指向',str(result))
|
||||
|
||||
def test_security_coverage_valuation_and_stale_snapshot_still_block(self):
|
||||
ev=dict(pointed=False,covered=True,upside=.2,pct0=4,accum_state='')
|
||||
for changes in [{'risk_name':True},{'covered':False},{'upside':-.1},{'stale_snapshot':True}]:
|
||||
self.assertEqual(card.judge(dict(ev,**changes),consensus_admission=True)['verdict'],'仅展示')
|
||||
self.assertEqual(card.judge(ev,consensus_admission=True,company_review={'overall':'差','age_days':1})['verdict'],'关注')
|
||||
|
||||
def test_old_frozen_config_does_not_inherit_new_environment_switch(self):
|
||||
with patch.object(config,'CARD_CONSENSUS_ADMISSION_ENABLED',True):
|
||||
bundle=plan_inputs.Bundle(records={},params={})
|
||||
with bundle.use():
|
||||
self.assertFalse(plan.config.CARD_CONSENSUS_ADMISSION_ENABLED)
|
||||
|
||||
def test_manual_rows_survive_snapshot_top_only_for_opted_in_consumer(self):
|
||||
import plan_versions
|
||||
a=dict(code='SH600001',score=200,rank=1,research_rank=1)
|
||||
b=dict(code='SZ300133',score=100,rank=100,research_rank=100,
|
||||
user_candidate={'id':'x','expires_on':'2099-01-01'},user_required=True)
|
||||
snap={'date':'2026-11-09','main':[a,b],'observe':[], 'shown_params':{},
|
||||
'decision':{'id':'test'},'rank_axis':'quality'}
|
||||
before=copy.deepcopy(snap)
|
||||
with patch.object(plan_versions,'load',return_value=snap), \
|
||||
patch.object(plan_versions,'health',return_value={}):
|
||||
yes=plan.from_snapshot(date="2026-11-09",top=1,include_user_candidates=True)
|
||||
no=plan.from_snapshot(date="2026-11-09",top=1,include_user_candidates=False)
|
||||
self.assertEqual([r['code'] for r in yes['main']],['SH600001','SZ300133'])
|
||||
self.assertEqual([r['code'] for r in no['main']],['SH600001'])
|
||||
self.assertEqual(snap,before)
|
||||
|
||||
|
||||
if __name__ == '__main__':unittest.main()
|
||||
Loading…
Reference in New Issue