diff --git a/plan.py b/plan.py index 97a25e8..c33a087 100644 --- a/plan.py +++ b/plan.py @@ -783,10 +783,15 @@ def collect(date: str | None = None, top: int = 20, obs_top: int = 10, "accum_max_age": config.CARD_ACCUM_MAX_AGE, "neg_tol": config.UPSIDE_NEG_TOLERANCE, "logic_per_stock": config.LOGIC_CLAIMS_PER_STOCK, - "rules": "候选=环节被指向∧当日涨幅达标∧券商覆盖且非ST∧明确吸筹∧无硬风险;" - "关注=三门槛全过∧无硬风险∧确认线缺失或陈旧(系统无法判断,交人裁决);" - "其余仅展示(只差覆盖、潜在吸筹等非明确状态都不升格,台账 013);" - "因果论断只展示不进判决"}, + "rules": ("候选=环节被指向∧当日涨幅达标∧券商覆盖且非ST∧明确吸筹∧无硬风险;" + "关注=三门槛全过∧无硬风险∧确认线缺失或陈旧(系统无法判断,交人裁决);" + "其余仅展示(只差覆盖、潜在吸筹等非明确状态都不升格,台账 013);" + "因果论断只展示不进判决" if config.CARD_ACCUM_CONFIRM_REQUIRED else + "质地排序不变,候选须满足现行选股资格、覆盖及风险条件;" + "吸筹仅作参考,非明确、潜在、缺评分或陈旧本身不否决;" + "高位派发及其他真实风险仍拦截,质地差仍按现行规则降为关注;" + "建仓看基本面、技术面和择时三源合议,由PMS按命令、风控与现行自决档处理;" + "因果论断只展示不进判决")}, "card_counts": card_counts, "candidates": _by_verdict(card.VERDICT_CANDIDATE), "watch": _by_verdict(card.VERDICT_WATCH), diff --git a/test_accum_reference.py b/test_accum_reference.py index 25e87ad..b7ba396 100644 --- a/test_accum_reference.py +++ b/test_accum_reference.py @@ -3,8 +3,11 @@ import copy import datetime as dt import tempfile import unittest +from contextlib import ExitStack from unittest.mock import patch +import pandas as pd + import test_api_support import card import config @@ -14,6 +17,35 @@ import plan_versions as pv class ReferenceTests(unittest.TestCase): + def test_published_rule_description_matches_confirmation_mode(self): + legacy = ("候选=环节被指向∧当日涨幅达标∧券商覆盖且非ST∧明确吸筹∧无硬风险;" + "关注=三门槛全过∧无硬风险∧确认线缺失或陈旧(系统无法判断,交人裁决);" + "其余仅展示(只差覆盖、潜在吸筹等非明确状态都不升格,台账 013);" + "因果论断只展示不进判决") + with ExitStack() as stack: + for name, value in (('_factor', pd.Series([240.], index=['SH600001'])), + ('_latest_date', None), ('_prev_date', None), + ('_names', {}), ('_evidence', ({}, set())), + ('_assemble_cards', ({}, []))): + stack.enter_context(patch.object(plan, name, return_value=value)) + stack.enter_context(patch.object(plan.plan_inputs, 'factor_read', return_value=set())) + stack.enter_context(patch.object(plan.version, 'git_short_rev', return_value='test')) + for enabled in (True, False, True): + with self.subTest(confirm_required=enabled), patch.object(config, 'CARD_ACCUM_CONFIRM_REQUIRED', enabled): + params = plan.collect('2026-11-03')['card_params'] + self.assertEqual(params['accum_confirm_required'], enabled) + if enabled: + self.assertEqual(params['admission_rule'], 'accum-confirm-v1') + self.assertEqual(params['rules'], legacy) + else: + self.assertEqual(params['admission_rule'], 'accum-reference-v2-20261104') + for phrase in ('质地排序不变', '吸筹仅作参考', '非明确、潜在、缺评分或陈旧本身不否决', + '现行选股资格', '高位派发及其他真实风险仍拦截', + '基本面、技术面和择时三源合议', '现行自决档'): + self.assertIn(phrase, params['rules']) + self.assertNotIn('∧明确吸筹', params['rules']) + self.assertNotIn('交人裁决', params['rules']) + def test_nonconfirmed_evidence_no_longer_blocks_qualified_stock(self): for state, age in [('潜在吸筹·低位企稳', 0), ('无吸筹迹象', 0), ('量能温和、信号不明', 1), ('', None), ('明确吸筹', 45), ('明确吸筹', None)]: