From 9e14f928346ccb986c5cd6308f8fa63b6bc5b6a9 Mon Sep 17 00:00:00 2001 From: baobao Date: Wed, 28 Oct 2026 12:44:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E7=9B=98=E8=BD=AE=E5=8A=A8=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E5=85=AB=E8=BF=9B=E5=85=AB=E5=8D=81=E4=BA=94?= =?UTF-8?q?=E5=87=BA=E4=B8=8E=E4=BA=94=E5=8D=81=E8=82=A1=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/micro_rotation.py | 23 +++++--- app/services/param_store.py | 1 + app/services/rotation_service.py | 15 ++++- app/web/static/index.html | 31 ++++++----- app/web/static/rotation.html | 14 +++-- docs/复盘决定台账.md | 9 +++ docs/微盘轮动50股参数发布_2026-10-28.md | 13 +++++ scripts/run_tests.py | 2 +- scripts/test_batch48_units.py | 73 ++++++++++++++++++++----- 9 files changed, 137 insertions(+), 44 deletions(-) create mode 100644 docs/微盘轮动50股参数发布_2026-10-28.md diff --git a/app/core/micro_rotation.py b/app/core/micro_rotation.py index d0a1952..d72a25b 100644 --- a/app/core/micro_rotation.py +++ b/app/core/micro_rotation.py @@ -5,13 +5,19 @@ import hashlib import json import math -RULE = 'micro30-v1-20261027' -SIZE = 30 +LEGACY_RULE = 'micro30-v1-20261027' +RULE = 'micro50-v2-20261028' +# 参数组成不可拆分的规则版本。运行版本由服务层经ParamStore选择并核对。 +SIZE = 50 +ENTRY_PERCENTILE = .08 +EXIT_PERCENTILE = .85 +RULE_PARAMETERS = {'entry_percentile': ENTRY_PERCENTILE, 'exit_percentile': EXIT_PERCENTILE, + 'basket_size': SIZE} PHASES = ('original', 'entering_micro', 'micro', 'returning_original') def initial_state(): - return {'phase': 'original', 'cycle': 0, 'last_snapshot': None, 'entry_date': None, + return {'phase': 'original', 'rule_version': RULE, 'cycle': 0, 'last_snapshot': None, 'entry_date': None, 'exit_date': None, 'reason': None, 'target': [], 'entry_budget': 0., 'disabled': False, 'entry_quantities': {}, 'consumed_entry': None, 'closed_date': None} @@ -20,13 +26,13 @@ def snapshot_check(value, execution_date, *, require_frozen=True): errors = [] if not isinstance(value, dict): return ['没有监控快照'] - if value.get('rule_version') != RULE or value.get('basket_size') != SIZE: + if value.get('rule_version') != RULE or value.get('basket_size') != SIZE or value.get('rule_parameters') != RULE_PARAMETERS: errors.append('策略规则版本不一致') if value.get('effective_date') != execution_date or str(value.get('data_date', '')) >= execution_date: errors.append('快照日期不适用于本次执行') if require_frozen and value.get('frozen') is not True: errors.append('执行快照尚未冻结') - keys = ('rule_version', 'basket_size', 'data_date', 'effective_date', 'signal_ready', + keys = ('rule_version', 'rule_parameters', 'basket_size', 'data_date', 'effective_date', 'signal_ready', 'basket_ready', 'signal', 'members', 'source_hashes', 'errors') try: body = {k: value[k] for k in keys} @@ -42,7 +48,7 @@ def snapshot_check(value, execution_date, *, require_frozen=True): if value['basket_ready']: members = value['members'] if len(members) != SIZE or len({m['code'] for m in members}) != SIZE: - errors.append('目标名单不是30只唯一股票') + errors.append(f'目标名单不是{SIZE}只唯一股票') if any(m.get('eligible') is not True or m.get('rank') != i+1 for i, m in enumerate(members)): errors.append('名单资格或排名不完整') except (KeyError, ValueError, TypeError): @@ -58,6 +64,8 @@ def transition(state, snapshot, *, micro_qty, original_qty, budget, control='run signal = snapshot['signal'] if ready else {} if control == 'pause_all': return s + if control != 'exit_disable' and snapshot and s['phase'] in ('entering_micro', 'micro') and s.get('rule_version', LEGACY_RULE) != snapshot.get('rule_version'): + raise ValueError('持仓轮次规则与新快照不一致,不能隐式更换策略') if control == 'exit_disable': s['disabled'] = True if s['phase'] != 'original' or micro_qty: @@ -73,6 +81,7 @@ def transition(state, snapshot, *, micro_qty, original_qty, budget, control='run if micro_qty: raise ValueError('旧微盘持仓未清完,不能再次入场') s.update(phase='entering_micro', cycle=s['cycle']+1, entry_date=snapshot['effective_date'], + rule_version=snapshot['rule_version'], entry_budget=max(0., budget), entry_quantities={}, consumed_entry=snapshot['snapshot_version'], reason='成长主线瓦解' if signal['growth_break'] else '微盘活跃度极低') if snapshot and snapshot.get('basket_ready') and s['phase'] in ('entering_micro', 'micro'): @@ -110,7 +119,7 @@ def buy_qty(code, price, budget, costs): def preflight(members, budget, allowed_boards, costs): issues = [] if len(members) != SIZE: - return ['目标名单数量不是30只'] + return [f'目标名单数量不是{SIZE}只'] for m in members: if board(m['code']) not in allowed_boards: issues.append(m['code']+'板块权限未确认') diff --git a/app/services/param_store.py b/app/services/param_store.py index bff53b8..dba2964 100644 --- a/app/services/param_store.py +++ b/app/services/param_store.py @@ -44,6 +44,7 @@ RUNTIME_EXTRA = { 'PMS_ROTATION_SIM_DIRECT': (False, bool, '155模拟仓直接启用,取消观察及纸面等待;保留账本、资金、数据、权限和用户控制检查'), 'PMS_ROTATION_MONITOR_URL': ('', str, '微盘监控只读接口根地址,留空停用拉取'), 'PMS_ROTATION_CONTROL': ('run', str, '轮换控制:run运行、pause_new暂停新增、pause_all暂停全部、exit_disable退出并停用'), + 'PMS_ROTATION_RULE_VERSION': ('micro50-v2-20261028', str, '微盘完整规则版本,8%入场、85%退出、50只绑定发布;不支持持仓期间隐式换版'), 'PMS_MICRO30_ALLOWED_BOARDS': ('', str, '实际已核实板块权限,MAIN、CHINEXT、STAR逗号分隔;留空不得自动买入'), 'PMS_MICRO30_COMMISSION_RATE': (0.0002, float, '微盘佣金估算率;自动执行前核实实际费率'), 'PMS_MICRO30_MIN_COMMISSION': (5.0, float, '微盘每笔最低佣金估算,元;自动执行前核实'), diff --git a/app/services/rotation_service.py b/app/services/rotation_service.py index a1ae168..1ff77eb 100644 --- a/app/services/rotation_service.py +++ b/app/services/rotation_service.py @@ -21,6 +21,7 @@ def documents_ready(): def configuration(): return {'mode': str(param_store.get('PMS_ROTATION_MODE', 'observe')), + 'rule_version': str(param_store.get('PMS_ROTATION_RULE_VERSION', core.RULE)), 'control': str(param_store.get('PMS_ROTATION_CONTROL', 'run')), 'url': str(param_store.get('PMS_ROTATION_MONITOR_URL', '')).rstrip('/'), 'boards': set(str(param_store.get('PMS_MICRO30_ALLOWED_BOARDS', '')).split(','))-{''}, @@ -32,6 +33,8 @@ def configuration(): def pull(execution_date=None): config = configuration() + if config['rule_version'] != core.RULE: + raise ValueError('运行规则与已部署代码不一致') day = execution_date or dt.datetime.now(TZ).date().isoformat() if not config['url']: return None @@ -51,6 +54,8 @@ def activation_errors(): return ['本次策略只开放155模拟实例'] if not settings.INFRA_STRATEGY_BOOK_SCHEMA: return ['策略账本迁移尚未启用'] + if configuration()['rule_version'] != core.RULE: + return ['运行规则与已部署版本不一致'] if param_store.get_bool('PMS_ROTATION_SIM_DIRECT', False): # 用户授权155模拟仓直接运行。该授权不伪造历史验收或交易日记录。 errors = [] @@ -87,7 +92,10 @@ def signal_history(end, limit=60): day = dt.date.fromisoformat(end) if day > dt.datetime.now(TZ).date(): raise ValueError('趋势日期不能晚于今天') - url = configuration()['url'] + config = configuration() + if config['rule_version'] != core.RULE: + raise ValueError('运行规则与趋势代码不一致') + url = config['url'] if not url: raise ValueError('监控地址未配置') n = max(1, min(120, int(limit))) @@ -97,7 +105,7 @@ def signal_history(end, limit=60): raise ValueError('趋势数据超过大小限制') value = response.json() rows = value.get('records') - if value.get('rule_version') != core.RULE or not isinstance(rows, list) or len(rows) > n: + if value.get('rule_version') != core.RULE or value.get('rule_parameters') != core.RULE_PARAMETERS or not isinstance(rows, list) or len(rows) > n: raise ValueError('趋势规则或格式不符') previous = '' for row in rows: @@ -115,7 +123,8 @@ def signal_history(end, limit=60): def status(): config = configuration() - out = {'mode': config['mode'], 'control': config['control'], 'rule_version': core.RULE, + out = {'mode': config['mode'], 'control': config['control'], 'rule_version': config['rule_version'], + 'rule_parameters': dict(core.RULE_PARAMETERS) if config['rule_version'] == core.RULE else {}, 'simulation_direct': not settings.PMS_TABLE_PREFIX and param_store.get_bool('PMS_ROTATION_SIM_DIRECT', False), 'basket_size': core.SIZE, 'schema_ready': settings.INFRA_STRATEGY_BOOK_SCHEMA, 'documents_ready': documents_ready(), 'phase': 'original', 'snapshot': None, 'errors': [], 'activation_errors': []} diff --git a/app/web/static/index.html b/app/web/static/index.html index 7da68e1..e613c41 100644 --- a/app/web/static/index.html +++ b/app/web/static/index.html @@ -625,8 +625,8 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;} @@ -1057,7 +1057,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;} 持仓综合盈亏 {{ money(group.totals.pnl) }} 元 -
按日频名单调仓,退出由宏观信号触发。查看策略轮换
+
按日频名单调仓,退出由宏观信号触发。查看策略轮换