合并宽基顶部并补充分时方向柱图

This commit is contained in:
baobao 2026-11-12 15:57:14 +08:00
parent 8b0f698e75
commit a3102f543c
7 changed files with 161 additions and 26 deletions

View File

@ -3090,3 +3090,8 @@ a44c994于10:53:29仅发布155的web,镜像pms:proposal-copy-a44c994。开发
顶部并列每日净申购与日内累计成交、倍数和方向;单行信号区分15分钟和日内累计,偏多/偏空改为偏买/偏卖,方向不可用不视为中性。仅页面改动,开发机85组隔离回归及三道页面护栏通过。发布与真实只读数据见[接续](docs/宽基日内汇总与信号范围文案_2026-11-12.md)。
15:37:26已仅在155发布web `pms:etf-copy-1fd4c9c`,候选85组断网全量通过,其余26容器不变。15:38真实页面、宽基数据与账本只读核对通过;方向不可用仍照实显示。
## 2026-11-12 宽基单标签与分时方向
按用户明确格式压缩顶部,日内成交并入原宽基悬浮框。新增固定16窗口的15分钟价量方向柱图,零值、缺失、未来和同日修订分别处理;不宣称真实资金净流入。开发机85组隔离回归、ETF28项及页面三道护栏通过。实际发布见[接续](docs/宽基紧凑汇总与十五分钟方向图_2026-11-12.md)。

View File

@ -0,0 +1,53 @@
"""宽基已发布的15分钟市场方向,仅供历史展示,不推算资金净流入。"""
from datetime import datetime, timedelta
import math
from zoneinfo import ZoneInfo
TZ = ZoneInfo('Asia/Shanghai')
SLOTS = tuple(f'{m // 60:02d}:{m % 60:02d}' for start in (9 * 60 + 30, 13 * 60)
for m in range(start + 15, start + 121, 15))
def intraday_series(history, day, at):
"""午休不占柱;最新修订优先,缺失、未来窗口和真实零值分开。"""
try:
base = datetime.strptime(day, '%Y-%m-%d').replace(tzinfo=TZ)
except (TypeError, ValueError):
return []
latest = {}
for row in history or []:
try:
end = datetime.fromisoformat(row['window_end'])
published = datetime.fromisoformat(row['published_at'])
if end.tzinfo is None or published.tzinfo is None:
continue
end = end.astimezone(TZ)
hm = end.strftime('%H:%M')
if (row.get('trade_date') != day or end.date() != base.date()
or hm not in SLOTS or end.second or end.microsecond
or end > at or published > at):
continue
rank = (int(row.get('revision', 0)), published)
if hm not in latest or rank > latest[hm][0]:
latest[hm] = (rank, row)
except (KeyError, TypeError, ValueError):
continue
result = []
for hm in SLOTS:
hour, minute = map(int, hm.split(':'))
end = base.replace(hour=hour, minute=minute)
row = latest.get(hm, (None, {}))[1]
scope = (row.get('scopes') or {}).get('WINDOW_15M') or {}
block = (row.get('market') or {}).get('WINDOW_15M') or {}
value = (block.get('metrics') or {}).get('direction_balance')
direction = block.get('direction')
valid = (scope.get('quality_eligible') is True
and block.get('direction_status') == 'OK'
and direction in ('BUY', 'SELL', 'MIXED')
and type(value) in (int, float) and math.isfinite(value)
and -1 <= value <= 1)
result.append({'start': (end - timedelta(minutes=15)).strftime('%H:%M'),
'end': hm, 'value': value if valid else None,
'direction': direction if valid else None,
'state': 'ok' if valid else 'pending' if end > at else 'missing'})
return result

View File

@ -9,6 +9,7 @@ from datetime import datetime, timedelta
from zoneinfo import ZoneInfo
from app.core.etf_contract import consumer as contract
from app.core.etf_intraday_view import intraday_series
from app.repo import rotation_repo as store
from app.services import param_store
from config.settings import settings
@ -250,6 +251,7 @@ def presentation(state, at, names=None):
enabled=True, trade_instruction=False, server_at=at.isoformat(), current_eligible=live)
data.pop('sequences', None)
data.pop('rounds', None)
data['intraday_series'] = intraday_series(data.get('history'), data.get('day'), at)
return data

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,21 @@
# 宽基紧凑汇总与十五分钟方向图
## 用户要求与展示
本轮取代15:37的双入口设计。顶部只保留一个标签,格式严格为“宽基 -28.44/34.4%(日内 982.97)”,数字均按亿元,净申购仍正红负绿。取消单独日内入口、顶部日期、成交倍数及方向文字,恢复原顶部高度。
原宽基悬浮框保留每日净申购与60日柱图,下面只新增一行日内累计成交和数据截至时间,再显示15分钟买卖方向柱图。图中按上游市场汇总的WINDOW_15M方向比例绘制,固定正负范围;BUY红、SELL绿、MIXED灰,保留上游分类,不重算阈值。午休不计交易窗口,上午、下午之间留间距。缺失以零轴空心虚线标记,真实零值为实心短横,未来窗口留空。首次或修订快照只按有效同日证据显示;新修订缺方向不回退旧方向。
这不是15分钟真实资金净流入图。已阅读上游`src/etf/source.py`:它按分钟涨跌对成交额赋正负,再汇总为价量方向比例,没有真实买卖资金或申赎净额。故图名为“买卖方向”,不把成交额或价量代理冒称资金净流入;悬浮框仅留一句短注。真正的日内净流入须由上游另外提供相应数据。
## 数据核对
11月12日只读状态共14个已发布窗口。固定16窗口中11个方向有效,11:30、13:15无快照,14:30、14:45、15:00方向不可用。按15分钟展示比30分钟更贴合上游发布粒度,合并为半小时不能消除缺失。无窗口补造、无累计方向替代分时方向、无基金与指数重复加总。
当前每日数据日11月11日,净申购估算−28.44亿元、分位34.4%;日内11月12日15:00成交982.97亿元。日期分开留在悬浮框中。
## 验证与发布
开发机85组隔离全量回归通过;ETF相关28项,包括新增5项分时展示边界测试。页面三道护栏通过。浏览器使用155真实宽基响应重放,其余账户数据是隔离样例,不是真实登录验收。桌面1440宽验证顶部仅一枚宽基标签、原46像素高度;窄屏与两入口、悬浮图、关闭、刷新结果和实际发布信息追加于下。
按既有授权,仅发布155模拟PMS的web。新增整理分时数据的纯函数由web读接口使用,不改变消费者、信号源、交易规则或现有开关。188不操作。

View File

@ -1,5 +1,7 @@
# 开发资料入口
11月12日按最新意见改为[宽基紧凑汇总与15分钟方向图](宽基紧凑汇总与十五分钟方向图_2026-11-12.md),取代下方双入口方案;顶部单标签,日内信息及分时柱图并入原悬浮框。
11月12日宽基展示调整见[日内汇总与范围文案](宽基日内汇总与信号范围文案_2026-11-12.md):每日净申购和日内成交并列,范围、价量方向及缺失状态分开表达;发布结果以该接续为准。
11月12日14:52已发布[入池历史补齐与统一标定](入池历史补齐与统一标定_2026-11-12.md)。机器、人工与持仓共用后台准备流程;128只分钟量价、成交额和日资金基线完成,独立分钟净额历史仍为16天。明确纠正此前将分钟价格归档与分钟资金历史混称的表述。

View File

@ -14,6 +14,7 @@ from app.services import etf_observation as svc, upstream_signals as upstream, p
from app.core.etf_contract import consumer as contract
from app.core.etf_contract.timing import DELAYED_POLICY, lease_until, admission_until
from config.settings import settings
from app.core.etf_intraday_view import intraday_series
NOW=datetime.fromisoformat('2026-11-05T10:03:00+08:00')
DAY=NOW.date().isoformat()
@ -124,6 +125,53 @@ class ETFTests(TestCase):
path=Path(contract.__file__).parent;manifest=json.loads((path/'PROVENANCE.json').read_text())
for name,digest in manifest['sha256'].items():self.assertEqual(hashlib.sha256((path/name).read_bytes()).hexdigest(),digest)
class IntradayViewTests(TestCase):
def row(self, hm='10:00', value=.3, direction='BUY', revision=0):
return {'trade_date': DAY, 'window_end': DAY+'T'+hm+':00+08:00',
'published_at': DAY+'T'+hm+':01+08:00', 'revision': revision,
'scopes': {'WINDOW_15M': {'quality_eligible': True}},
'market': {'WINDOW_15M': {'direction_status': 'OK',
'direction': direction, 'metrics': {'direction_balance': value}}}}
def test_fixed_fifteen_minutes_no_lunch_and_no_zero_fill(self):
rows = intraday_series([self.row()], DAY, NOW)
self.assertEqual(len(rows), 16)
self.assertEqual((rows[7]['end'], rows[8]['start']), ('11:30', '13:00'))
self.assertEqual(rows[1]['value'], .3)
self.assertEqual(rows[0]['state'], 'missing')
self.assertIsNone(rows[0]['value'])
self.assertEqual(rows[2]['state'], 'pending')
def test_true_zero_is_visible_and_unknown_is_not_neutral(self):
zero = self.row(value=0, direction='MIXED')
self.assertEqual(intraday_series([zero], DAY, NOW)[1]['state'], 'ok')
zero['market']['WINDOW_15M']['direction_status'] = 'UNAVAILABLE'
self.assertIsNone(intraday_series([zero], DAY, NOW)[1]['value'])
for bad in (True, float('nan'), float('inf'), 1.01, -.01-1, '0.3'):
self.assertIsNone(intraday_series([self.row(value=bad)], DAY, NOW)[1]['value'])
def test_new_invalid_revision_does_not_reuse_older_direction(self):
old, new = self.row(), self.row(revision=1)
new['scopes']['WINDOW_15M']['quality_eligible'] = False
for rows in ([old, new], [new, old]):
self.assertIsNone(intraday_series(rows, DAY, NOW)[1]['value'])
def test_cross_day_future_publication_and_wrong_window_are_ignored(self):
old = self.row();old['trade_date'] = '2026-11-04'
future = self.row();future['published_at'] = DAY+'T10:10:00+08:00'
rows = intraday_series([old, future, self.row(hm='10:01')], DAY, NOW)
self.assertTrue(all(row['value'] is None for row in rows))
def test_historical_direction_survives_signal_expiry_without_summing_etfs(self):
row = self.row(value=-.4, direction='SELL')
row['scopes']['WINDOW_15M']['observation_eligible'] = False
row['market']['SESSION_CUM'] = {'direction_status': 'OK', 'direction': 'BUY',
'metrics': {'direction_balance': .8}}
result = intraday_series([row], DAY, NOW+timedelta(hours=6))
self.assertEqual(result[1]['value'], -.4)
self.assertEqual(result[1]['direction'], 'SELL')
class FocusTests(TestCase):
def setUp(self):
upstream._focused_streams.clear()