接入宽基分时查询并保留发布信号边界

This commit is contained in:
baobao 2026-11-13 09:24:02 +08:00
parent d66f8135fd
commit 9bb5ef1193
13 changed files with 547 additions and 11 deletions

View File

@ -3097,3 +3097,8 @@ a44c994于10:53:29仅发布155的web,镜像pms:proposal-copy-a44c994。开发
按用户明确格式压缩顶部,日内成交并入原宽基悬浮框。新增固定16窗口的15分钟价量方向柱图,零值、缺失、未来和同日修订分别处理;不宣称真实资金净流入。开发机85组隔离回归、ETF28项及页面三道护栏通过。实际发布见[接续](docs/宽基紧凑汇总与十五分钟方向图_2026-11-12.md)。
16:03:36已仅发布155 web `pms:etf-compact-a3102f5`;候选85组断网回归、248文件核对和16:04实际接口判收通过,其余26容器不变。16窗口中11有效、5缺失如实保留,数量现金对账正常。
## 2026-11-13 宽基分时查询接入
接入catalog与宽基整体15分钟latest_facts,由独立观测进程按分钟查询、版本归档和ETag复用,页面只读缓存。保持顶部单标签和原悬浮框,分时柱增加时段成交额,分开处理缺失、零值、方向与金额完整性。27项查询专项、86组全量和三道页面护栏通过,1440/390/320隔离浏览器验收通过。上游11月12日16窗完整事实已只读核对,查询数据不成为交易信号。实际部署与未完成事项见[接续](docs/宽基查询接口与分时展示接续_2026-11-13.md)。

130
app/core/etf_query_view.py Normal file
View File

@ -0,0 +1,130 @@
"""宽基查询契约和展示投影。只接受整体15分钟事实,不生成交易信号。"""
from datetime import date, datetime, timedelta
import math
import re
from app.core.etf_intraday_view import SLOTS, TZ
CONTRACT = 'etf-intraday-query-1.0'
VIEW = 'latest_facts'
def timestamp(value):
at = datetime.fromisoformat(value)
if at.tzinfo is None:
raise ValueError('时间缺少时区')
return at.astimezone(TZ)
def number(value):
return type(value) in (int, float) and math.isfinite(value)
def latest_day(catalog, at):
if (catalog.get('contract_version') != CONTRACT
or 15 not in catalog.get('intervals_minutes', [])
or VIEW not in catalog.get('views', [])
or catalog.get('timezone') != 'Asia/Shanghai'):
raise ValueError('查询目录契约不匹配')
days = [date.fromisoformat(r['trade_date']) for r in catalog.get('dates', [])]
# 最新日标为不可用也请求该日,不能悄悄退回旧日并宣称更新正常。
days = [d for d in days if d <= at.astimezone(TZ).date()]
if not days:
raise ValueError('尚无可查询日期')
return max(days).isoformat()
def validate(document, day, at):
expected = {'contract_version': CONTRACT, 'trade_date': day, 'view': VIEW,
'interval_minutes': 15, 'timezone': 'Asia/Shanghai', 'amount_unit': 'CNY',
'purpose': 'MARKET_OBSERVATION',
'flow_basis': 'PRICE_VOLUME_PROXY_NOT_NET_SUBSCRIPTION',
'proxy_method': 'minute-price-change-signed-turnover-v1',
'intraday_net_subscription_status': 'UNAVAILABLE_DAILY_ONLY'}
if any(document.get(k) != v for k, v in expected.items()):
raise ValueError('查询口径不匹配')
if (document.get('trade_instruction') is not False
or document.get('live_signal_eligibility') is not False
or document.get('historical_use_allowed') is not True
or document.get('intraday_net_subscription_yuan') is not None):
raise ValueError('查询用途不匹配')
for k in ('data_version', 'cohort_sha256'):
if not re.fullmatch('[0-9a-f]{64}', str(document.get(k, ''))):
raise ValueError('查询版本缺失')
revision = document.get('projection_revision')
if type(revision) is not int or revision < 0 or timestamp(document['projected_at']) > at + timedelta(seconds=60):
raise ValueError('查询修订时间无效')
groups = document.get('groups', [])
if len(groups) != 1 or groups[0].get('subject_type') != 'MARKET' or groups[0].get('subject_id') != 'BROAD_ETF':
raise ValueError('查询必须为宽基整体')
members = groups[0].get('members', [])
if (not members or len(set(members)) != len(members)
or any(not re.fullmatch(r'\d{6}\.(SH|SZ)', str(code)) for code in members)):
raise ValueError('查询成分必须为沪深证券')
rows = document.get('rows')
if not isinstance(rows, list) or len(rows) > 16:
raise ValueError('查询窗口数量无效')
seen = set()
for row in rows:
end, start = timestamp(row['window_end']), timestamp(row['window_start'])
if (row.get('subject_type') != 'MARKET' or row.get('subject_id') != 'BROAD_ETF'
or row.get('interval_minutes') != 15 or end.date().isoformat() != day
or row.get('member_count') != len(members)
or end.strftime('%H:%M') not in SLOTS or end.second or end.microsecond
or end - start != timedelta(minutes=15) or end in seen):
raise ValueError('查询窗口不匹配')
seen.add(end)
for member in row.get('top_turnover_members', []):
if not re.fullmatch(r'\d{6}\.(SH|SZ)', str(member.get('ts_code', ''))):
raise ValueError('查询证券超出沪深范围')
if end > at and any(row.get(k) is not None for k in ('turnover_yuan', 'direction_balance', 'cumulative_turnover_yuan')):
raise ValueError('查询包含未来事实')
return document
def complete(row, kind):
count = row.get('member_count')
return (type(count) is int and count > 0
and row.get(kind + '_member_count') == count
and number(row.get(kind + '_coverage')) and row[kind + '_coverage'] == 1)
def presentation(document, at):
"""直接采用上游加权结果。缺失不补零,累计取末窗,不再相加。"""
day = document['trade_date']
base = datetime.combine(date.fromisoformat(day), datetime.min.time(), TZ)
lookup = {timestamp(r['window_end']).strftime('%H:%M'): r for r in document['rows']}
result, latest = [], None
for hm in SLOTS:
end = base.replace(hour=int(hm[:2]), minute=int(hm[3:]))
row = lookup.get(hm, {}) if end <= at else {}
amount = row.get('turnover_yuan')
amount_ok = (row.get('amount_status') == 'COMPLETE' and complete(row, 'amount')
and number(amount) and amount >= 0)
value = row.get('direction_balance')
direction_ok = (row.get('direction_status') == 'OK' and complete(row, 'direction')
and number(value) and -1 <= value <= 1
and row.get('direction') in ('BUY', 'SELL', 'MIXED'))
item = {'start': (end - timedelta(minutes=15)).strftime('%H:%M'), 'end': hm,
'value': value if direction_ok else None,
'direction': row.get('direction') if direction_ok else None,
'amount': amount if amount_ok else None,
'state': 'ok' if direction_ok else 'pending' if end > at else 'missing'}
result.append(item)
# 未来空窗、尚无事实的占位窗不夺走最后实际时间;部分到达的窗必须暴露缺失。
if row and (row.get('source_windows') and any(w.get('sources') for w in row['source_windows'])
or amount is not None or value is not None):
latest = (row, end, amount_ok)
summary = {'trade_date': day, 'window_end': None, 'cumulative_amount': None}
if latest:
row, end, amount_ok = latest
cumulative = row.get('cumulative_turnover_yuan')
# latest_facts 的累计值仅在所有前窗金额齐备时有效;方向缺失不掩盖金额。
prior = [i for i in result if i['end'] <= end.strftime('%H:%M')]
cumulative_ok = amount_ok and all(i['amount'] is not None for i in prior)
summary.update(window_end=end.isoformat(), session_closed=end.strftime('%H:%M') == '15:00',
cumulative_amount=cumulative if cumulative_ok and number(cumulative) and cumulative >= 0 else None)
return {'summary': summary, 'intraday_series': result,
'data_version': document['data_version'], 'projected_at': document['projected_at'],
'projection_revision': document['projection_revision'], 'view': VIEW,
'trade_instruction': False, 'live_signal_eligibility': False}

View File

@ -7,6 +7,7 @@ from threading import Event
def main():
from app.services.etf_observation import consume_once
from app.services.broad_funds import consume_once as consume_daily
from app.services.etf_query import consume_once as consume_query
logging.basicConfig(level=logging.INFO)
stopping = Event()
signal.signal(signal.SIGTERM, lambda *_: stopping.set())
@ -24,6 +25,12 @@ def main():
logging.warning('每日资金暂不可用:%s', result.get('error'))
except Exception as exc:
logging.warning('每日资金保存失败:%s', type(exc).__name__)
try:
result = consume_query()
if result.get('status') == 'unavailable':
logging.warning('宽基分时暂不可用:%s', result.get('error'))
except Exception as exc:
logging.warning('宽基分时保存失败:%s', type(exc).__name__)
stopping.wait(15)

117
app/services/etf_query.py Normal file
View File

@ -0,0 +1,117 @@
"""独立观测进程轮询查询接口,页面只读本实例持久化缓存。"""
from datetime import datetime
import hashlib
import json
import time
from urllib.parse import urlencode, urlsplit
import requests
from app.core import etf_query_view as view
from app.repo import rotation_repo as store
from app.services import param_store
from config.settings import settings
STATE_KEY = 'etf-query:state'
MAX_BYTES = 2 * 1024 * 1024
class QueryUnavailable(Exception):
"""只携带固定错误码,绝不包含请求头、连接串和上游响应正文。"""
def fetch(base, path, key, etag=None):
parsed = urlsplit(base)
if parsed.scheme not in ('http', 'https') or not parsed.hostname or parsed.username or parsed.password or parsed.query or parsed.fragment:
raise QueryUnavailable('CONFIG')
if not key:
raise QueryUnavailable('AUTH')
headers = {'X-API-Key': key, 'Accept': 'application/json'}
if etag:
headers['If-None-Match'] = etag
# 禁止重定向转发密钥、代理继承及自动重试;单次失败留待下一分钟。
with requests.Session() as session:
session.trust_env = False
try:
with session.get(base.rstrip('/') + path, headers=headers, timeout=(2, 5),
allow_redirects=False, stream=True) as response:
if response.status_code == 304:
return 304, None, etag
if response.status_code != 200:
raise QueryUnavailable('HTTP_' + str(response.status_code))
chunks, size, started = [], 0, time.monotonic()
for chunk in response.iter_content(65536):
size += len(chunk)
if size > MAX_BYTES or time.monotonic() - started > 8:
raise QueryUnavailable('BODY_LIMIT')
chunks.append(chunk)
return 200, json.loads(b''.join(chunks)), response.headers.get('ETag')
except requests.RequestException as exc:
raise QueryUnavailable('NETWORK') from exc
def consume_once(*, requester=None, clock=None):
if not param_store.get_bool('PMS_ETF_QUERY_ENABLED', False):
return {'status': 'disabled'}
clock = clock or (lambda: datetime.now(view.TZ))
at = clock()
previous, _ = store.get(STATE_KEY)
previous = previous or {}
if previous.get('attempt_at') and 0 <= (at - view.timestamp(previous['attempt_at'])).total_seconds() < 60:
return {'status': 'idle'}
base = str(param_store.get('PMS_ETF_QUERY_BASE_URL', '')).rstrip('/')
requester = requester or fetch
key = settings.PMS_ETF_QUERY_API_KEY
update = {'attempt_at': at.isoformat()}
try:
code, catalog, _ = requester(base, '/api/etf/v1/catalog', key)
if code != 200:
raise QueryUnavailable('CATALOG')
day = view.latest_day(catalog, at)
path = '/api/etf/v1/intraday?' + urlencode({'trade_date': day, 'interval_minutes': 15,
'index_code': 'BROAD_ETF', 'view': view.VIEW})
identity = hashlib.sha256((base + path).encode()).hexdigest()
same = previous.get('identity') == identity and previous.get('document')
code, document, etag = requester(base, path, key, previous.get('etag') if same else None)
if code == 304:
if not same:
raise QueryUnavailable('CACHE_MISS')
document = previous['document']
elif code != 200:
raise QueryUnavailable('RESPONSE')
view.validate(document, day, clock())
if same:
old = previous['document']
if (document['projection_revision'] < old['projection_revision']
or view.timestamp(document['projected_at']) < view.timestamp(old['projected_at'])
or document['projection_revision'] == old['projection_revision'] and document != old):
raise QueryUnavailable('OLDER_REVISION')
digest = hashlib.sha256(json.dumps(document, sort_keys=True, ensure_ascii=False, allow_nan=False).encode()).hexdigest()
if code == 200:
store.put_once('etf-query:raw:' + digest, 'etf_query_raw', document)
update.update(identity=identity, etag=etag, document=document, error=None,
last_success_at=clock().isoformat(), response_status=code)
except (QueryUnavailable, ValueError, KeyError, TypeError) as exc:
update['error'] = str(exc) if isinstance(exc, QueryUnavailable) else 'CONTRACT'
# 网络请求不占数据库锁;先保存原始版本,再移动当前指针。
with store.locked(STATE_KEY, 'etf_query', {}) as state:
state.update(update)
return {'status': 'unavailable' if update.get('error') else 'ok', 'error': update.get('error')}
def status():
at = datetime.now(view.TZ)
if not param_store.get_bool('PMS_ETF_QUERY_ENABLED', False):
return {'enabled': False, 'status': 'disabled'}
state, _ = store.get(STATE_KEY)
state = state or {}
result = {'enabled': True, 'status': 'waiting', 'server_at': at.isoformat(),
'summary': {}, 'intraday_series': [], 'trade_instruction': False}
if state.get('document'):
result.update(view.presentation(state['document'], at))
result['status'] = 'ok'
success = state.get('last_success_at')
if state.get('error') or not success or not 0 <= (at - view.timestamp(success)).total_seconds() <= 180:
result['status'] = 'unavailable' if state else 'waiting'
result['last_success_at'] = success
return result

View File

@ -36,7 +36,7 @@ INFRA_PREFIX = ("PROXY_DB", "SOURCE_DB", "DB_MYSQL", "SIGNAL_REDIS", "PMS_REDIS"
# 2026-09-03 补进会话票签名密钥 PMS_SESSION_SECRET: 它 2026-08 随登录一起加进 settings,
# 当时漏了这份名单, 于是参数设置页把它当普通业务参数原文显示出来 (登录中间件读的是
# settings, 功能没受影响, 但密钥不该出现在页面上)。
SECRET_KEYS = ("PMS_QMT_SIGN_SEED_HEX", "PMS_QMT_PEER_PUBKEY_B64", "PMS_SESSION_SECRET", "PMS_PLAN_WRITE_KEY", "PMS_TUSHARE_TOKEN", "PMS_ETF_SNAPSHOT_REDIS_URL", "PMS_ETF_EVENT_REDIS_URL")
SECRET_KEYS = ("PMS_QMT_SIGN_SEED_HEX", "PMS_QMT_PEER_PUBKEY_B64", "PMS_SESSION_SECRET", "PMS_PLAN_WRITE_KEY", "PMS_TUSHARE_TOKEN", "PMS_ETF_SNAPSHOT_REDIS_URL", "PMS_ETF_EVENT_REDIS_URL", "PMS_ETF_QUERY_API_KEY")
LIMIT_FLAGS = ('PMS_LIMIT_CACHE_ENABLED', 'PMS_LIMIT_COLLECT_ENABLED')
@ -54,6 +54,8 @@ RUNTIME_EXTRA = {
"PMS_BROAD_DAILY_ENABLED": (False, bool, "接入正式宽基与行业每日资金,仅供观测"),
"PMS_UPSTREAM_DAY_SCAN": (20000, int, "信号流当天每路读取上限,达到上限明确提示"),
"PMS_ETF_OBSERVATION_ENABLED": (False, bool, "接入正式ETF观测,仅展示,不生成交易指令"),
"PMS_ETF_QUERY_ENABLED": (False, bool, "宽基分时查询,仅更新观测曲线,不生成信号或交易指令"),
"PMS_ETF_QUERY_BASE_URL": ('', str, "宽基分时只读查询地址,密钥仅注入独立观测进程"),
'PMS_RISK_EXIT_ENABLED': (False, bool, '原策略退出纪律:第一次清仓级信号停买,第二次独立信号清仓;买方整体评级下降直接清仓'),
'PMS_RISK_EXIT_START_AT': ('', str, '退出纪律启用时刻,北京时间;只接收此后有效新信号,既有真实停买最多承接第一次'),
'PMS_RISK_SIGNAL_MAX_AGE_SEC': (300, int, '清仓信号最大时龄,秒;消息期限更短时服从消息期限'),

View File

@ -911,6 +911,13 @@ def api_etf_observation():
return ok(etf_observation.status)
@app.get("/api/etf/intraday")
def api_etf_intraday():
"""只读已保存的宽基分时事实,页面请求不访问上游。"""
from app.services import etf_query
return ok(etf_query.status)
@app.get("/api/upstream/signals/{ts_code}")
def api_upstream_signals_by_code(ts_code: str):
"""一只票**今天的全部**上游信号 (2026-09-09, 台账 055)。

View File

@ -691,23 +691,23 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
</template>
<a class="hst hd-micro" :class="microChipClass" href="/rotation" target="_blank" rel="noopener noreferrer" style="text-decoration:none">微盘 {{ microChipText }}</a>
</el-tooltip>
<el-tooltip v-if="broad.enabled || etf.enabled" :trigger="['hover','focus']" placement="bottom" effect="light" :show-after="200" :enterable="true" :disabled="broadOpen || etfOpen">
<el-tooltip v-if="broad.enabled || etf.enabled || etfQuery.enabled" :trigger="['hover','focus']" placement="bottom" effect="light" :show-after="200" :enterable="true" :disabled="broadOpen || etfOpen">
<template #content><div class="market-popover broad-popover">
<div class="trend-heading"><b>宽基资金 · {{ broadDate }}</b><span class="broad-badge" :class="broadTail(broadMarket.reference)">{{ broadRef(broadMarket.reference) }}</span></div>
<div class="broad-amount"><strong :class="broadColor(broadMarket.latest?.net_flow_yuan)">{{ broadAmount(broadMarket.latest?.net_flow_yuan) }}</strong><span class="muted">亿元 · 净申购估算</span></div>
<div class="trend-heading"><b>每日净额</b><span class="muted">近60个交易日</span></div>
<div class="broad-chart" v-html="broadChart(broadMarket,60,true)"></div>
<div v-if="broad.status==='unavailable'" class="muted">更新暂不可用 · {{ broadDate }}</div>
<template v-if="etf.enabled">
<div class="broad-intraday-line"><span>日内成交 <b>{{ etfAmount(etfFacts.cumulative_amount) }}</b> 亿</span><span class="muted">{{ etfSummary.trade_date?.slice(5).replace('-','/') }} {{ etfTime(etfSummary.window_end) }}{{ etfSummary.session_closed?' 收盘':etfLive?'':' 更新中断' }}</span></div>
<template v-if="etfQuery.enabled || etf.enabled">
<div class="broad-intraday-line"><span>日内成交 <b>{{ etfAmount(etfTopSummary.cumulative_amount) }}</b> 亿</span><span class="muted">{{ etfTopSummary.trade_date?.slice(5).replace('-','/') }} {{ etfTime(etfTopSummary.window_end) }}{{ etfTopStatus }}</span></div>
<div class="trend-heading"><b>买卖方向</b><span class="muted">每15分钟</span></div>
<div class="broad-chart" v-html="etfDirectionChart(etf.intraday_series)"></div>
<div class="broad-chart" v-html="etfDirectionChart(etfTopSeries)"></div>
<div class="broad-direction-note">价量方向,非资金净流入;虚线为数据缺失。</div>
</template>
<div class="broad-pop-footer"><button v-if="etf.enabled" class="lnk" @click="openEtf()">日内观测 ›</button><button class="lnk" @click="openBroad">资金与行业 ›</button></div>
</div></template>
<button class="hst hd-etf broad-chip" :class="broadMarket.latest?.net_flow_yuan==null?'etf-missing':broadTail(broadMarket.reference)" @click="openBroad" title="宽基每日净申购与日内成交,金额单位亿元">
宽基&nbsp;<b :class="broadColor(broadMarket.latest?.net_flow_yuan)">{{ broadAmount(broadMarket.latest?.net_flow_yuan) }}</b>/<span>{{ broadMarket.reference?.percentile==null?'—':Number(broadMarket.reference.percentile).toFixed(1)+'%' }}</span><span v-if="etf.enabled">(日内 {{ etfAmount(etfFacts.cumulative_amount) }})</span>
宽基&nbsp;<b :class="broadColor(broadMarket.latest?.net_flow_yuan)">{{ broadAmount(broadMarket.latest?.net_flow_yuan) }}</b>/<span>{{ broadMarket.reference?.percentile==null?'—':Number(broadMarket.reference.percentile).toFixed(1)+'%' }}</span><span v-if="etfQuery.enabled || etf.enabled">(日内 {{ etfAmount(etfTopSummary.cumulative_amount) }})</span>
</button>
</el-tooltip>
<span class="hst" :class="dm.shadow?'idle':'ok'" v-show="mode==='ops'" title="下发模式。实盘=真的发到 QMT 下单;影子=只记录,不真下单,用来观察。">下发 {{ dm.mode || '-' }}</span>
@ -4820,6 +4820,15 @@ createApp({
// —— 宏观择时 (MACRO_TIMING_PLAN.md): 面板取数 / 手动扫描 / 建议采纳 ——
// ETF观测只读状态;即使关闭自动刷新,也按真实时间到期。
const etf=ref({enabled:false,events:[]}),etfOpen=ref(false),etfSelectedId=ref(null);
const etfQuery=ref({enabled:false,summary:{},intraday_series:[]});
const etfTopSummary=computed(()=>etfQuery.value.enabled ? etfQuery.value.summary||{} : {...etfSummary.value,cumulative_amount:etfFacts.value.cumulative_amount});
const etfTopSeries=computed(()=>etfQuery.value.enabled ? etfQuery.value.intraday_series : etf.value.intraday_series);
const etfTopStatus=computed(()=>{
if(!etfQuery.value.enabled)return etfSummary.value.session_closed?' 收盘':etfLive.value?'':' 更新中断';
if(etfQuery.value.status==='unavailable')return ' 更新暂不可用';
if(!etfTopSummary.value.window_end)return ' 尚未发布';
return etfTopSummary.value.session_closed?' 收盘':'';
});
const etfClock=ref(Date.now()); let etfOffset=0;
const etfTimer=setInterval(()=>{etfClock.value=Date.now()+etfOffset;},1000);
onUnmounted(()=>clearInterval(etfTimer));
@ -4865,10 +4874,11 @@ createApp({
const x=l+i*cw+(i>=8?gap:0)+(cw-bw)/2,valid=row.state==='ok'&&typeof row.value==='number'&&Number.isFinite(row.value)&&Math.abs(row.value)<=1;
const label={BUY:'偏买',SELL:'偏卖',MIXED:'无明显方向'}[row.direction]||'方向不可用';
const time=/^\d{2}:\d{2}$/.test(row.end)?row.end:'',start=/^\d{2}:\d{2}$/.test(row.start)?row.start:'';
const amount=row.amount==null?'成交额暂缺':'成交 '+etfAmount(row.amount)+' 亿';
if(valid){
const y=zero-row.value*half,color={BUY:'#d97064',SELL:'#6fa887',MIXED:'#b5b8b4'}[row.direction]||'#b5b8b4';
out+=`<rect x="${x}" y="${Math.min(y,zero)-(row.value===0?.75:0)}" width="${bw}" height="${Math.max(1.5,Math.abs(y-zero))}" rx="1.5" fill="${color}"><title>${start}–${time}:${label}</title></rect>`;
}else if(row.state==='missing')out+=`<rect x="${x}" y="${zero-4}" width="${bw}" height="8" rx="1.5" fill="none" stroke="#aaa" stroke-dasharray="2 2"><title>${start}–${time}:方向数据缺失</title></rect>`;
out+=`<rect x="${x}" y="${Math.min(y,zero)-(row.value===0?.75:0)}" width="${bw}" height="${Math.max(1.5,Math.abs(y-zero))}" rx="1.5" fill="${color}"><title>${start}–${time}:${label} · ${amount}</title></rect>`;
}else if(row.state==='missing')out+=`<rect x="${x}" y="${zero-4}" width="${bw}" height="8" rx="1.5" fill="none" stroke="#aaa" stroke-dasharray="2 2"><title>${start}–${time}:方向数据缺失 · ${amount}</title></rect>`;
if([0,7,8,15].includes(i))out+=`<text x="${x+bw/2}" y="${h-5}" text-anchor="middle">${time}</text>`;
});
return out+'</svg>';
@ -4885,6 +4895,12 @@ createApp({
etfClock.value=Date.now()+etfOffset;
}else etf.value={...etf.value,status:'unavailable'};
}
async function loadEtfQuery(){
const response=await call('get','/api/etf/intraday');
const d=response?.ok===true?response.data:null;
if(d && typeof d.enabled==='boolean' && d.status)etfQuery.value=d;
else etfQuery.value={...etfQuery.value,status:'unavailable'};
}
const broad=ref({enabled:false,report:null}),broadOpen=ref(false),broadTab=ref('market'),broadDays=ref(20),broadPeriod=ref(1),broadSearch=ref(''),broadSectorId=ref('');
const broadMarket=computed(()=>broad.value.report?.etf?.market||{});
const broadDate=computed(()=>broad.value.report?.trade_date||'待补');
@ -5103,7 +5119,7 @@ createApp({
// (通道告警对交易员改由 dispatch-mode 里的 channel 兜底, 见 wsc 的注释)
(isAdmin.value ? loadWs() : Promise.resolve()),
loadStrategies(), loadOpLog(), loadOpenScan(), loadDividend(), loadUpstream(),
loadMacro(), loadEtf(), loadBroad(), loadMicro(), loadTech()]);
loadMacro(), loadEtf(), loadEtfQuery(), loadBroad(), loadMicro(), loadTech()]);
await loadNames();
lastRefresh.value = new Date().toTimeString().slice(0, 8);
loading.value = false;
@ -5474,7 +5490,7 @@ createApp({
async function refreshLive() {
// allSettled: 单个 loader 失败/超时(axios 60s 兜底)不拖累其余与时间戳更新。
await Promise.allSettled([loadOverview(), loadPositions(), loadInstructions(), loadLedger(),
loadProposals(), loadStrategies(), loadOpLog(), loadOpenScan(), loadDividend(), loadUpstream(), loadMacro(), loadEtf(), loadBroad(), loadMicro(), loadPlanUsers()]);
loadProposals(), loadStrategies(), loadOpLog(), loadOpenScan(), loadDividend(), loadUpstream(), loadMacro(), loadEtf(), loadEtfQuery(), loadBroad(), loadMicro(), loadPlanUsers()]);
try { await loadNames(); } catch (e) {}
// 用客户端钟, 保证"自动·HH:MM:SS"稳定跳动, 不依赖 /health 的 now。
lastRefresh.value = new Date().toTimeString().slice(0, 8);
@ -5842,6 +5858,7 @@ createApp({
openCodeSignals, closeCodeSignals, csLoadFull,
techFeed, techFeedErr, techStanceCls,
etf, etfOpen, etfSelected, etfSummary, etfFacts, etfLive, etfTime, etfAmount, etfRatio,
etfQuery, etfTopSummary, etfTopSeries, etfTopStatus,
etfStateText, etfCaption, etfDirectionClass, etfRows, etfActiveCount, etfStatusText, etfChipText,
etfOverall, etfBars, etfScopeText, etfDirectionText, etfDirectionChart, openEtf, openFlowSignal, loadEtf,
macro, macroGateOn, macroUnavailable, mzLabel, mzColor, mzBarStyle,

View File

@ -20,6 +20,7 @@ class Settings(BaseSettings):
# ETF观测专用连接,不进入参数页面。只注入独立消费服务。
PMS_ETF_SNAPSHOT_REDIS_URL: str = ""
PMS_ETF_EVENT_REDIS_URL: str = ""
PMS_ETF_QUERY_API_KEY: str = ""
# 当日限制价缓存与独立采集。业务开关和预算统一从ParamStore读取。
PMS_LIMIT_CACHE_ENABLED: bool = False

View File

@ -0,0 +1,39 @@
# 宽基查询接口与分时展示接续
## 本轮范围
沿用顶部“宽基 -28.44/34.4%(日内 982.97)”及原悬浮框,接入上游查询接口补充分时历史;不新增顶部位置。每日净申购与60日趋势仍来自已有正式每日报告,信号流仍来自原发布流。
依据上游《21_ETF日内汇总查询接口与观测口径_20261112.md》及11月13日更新。接口根地址为155的18086端口,契约`etf-intraday-query-1.0`。
## 实际使用的接口
| 接口 | 用途与边界 |
| --- | --- |
| `/api/etf/v1/catalog` | 每分钟确认真实可查日期;最新日不可用时显式报错,不悄悄用旧日当今日。 |
| `/api/etf/v1/intraday?trade_date=实际日期&interval_minutes=15&index_code=BROAD_ETF&view=latest_facts` | 只取宽基整体15分钟事实;日期、视图、范围和粒度独立使用ETag,304复用本地缓存。 |
| `/healthz` | 发布时检查查询服务与目录健康,不替代数据质量校验。 |
| `/api/etf/v1/daily`、30分钟、单指数、ALL | 本轮不接入;每日已有正式消费,当前图只需整体15分钟,不重复取全池、合并或加权。 |
| `as_published` | 本轮只读对照发布历史;不用于当前回看曲线,不把事实补齐冒充当时发布。 |
新增PMS本地只读`/api/etf/intraday`。独立`pms-observation`每60秒轮询,页面只读本实例文档缓存,不使上游超时阻塞页面或交易worker。请求连接2秒、读5秒,限制响应大小与读取预算,不自动重试或跟随重定向。失败保留带日期历史并明确更新暂不可用。原始版本不可覆盖,先归档再移动当前指针;拒绝旧修订、同修订变更、未来事实、跨日及沪深以外成分。
运行开关`PMS_ETF_QUERY_ENABLED`与地址`PMS_ETF_QUERY_BASE_URL`经ParamStore;密钥`PMS_ETF_QUERY_API_KEY`只注入独立观测容器并登记SECRET_KEYS,不进数据库、页面、日志或Git。
## 展示口径
直接使用上游已按成交额加权的方向比例及分类,不重复加权。日内累计取最后实际窗口累计值,不累计相加。金额完整与方向完整分别检查:方向不可用不遮蔽完整成交额,缺金额不补零或按覆盖率放大。固定16窗,午休留间距;缺失虚线、真实零值实心短横、未来窗口留空。悬停每根柱显示时段、偏买/偏卖/无明显方向和该窗成交额。
价量方向不等于真实资金流入流出、净申购赎回或买卖建议。查询事实可能盘后修复,始终`trade_instruction=false`、`live_signal_eligibility=false`。信号原始回执、时效和交易规则保持。
## 09:09至09:21核验与开发机验证
实际目录最新为11月12日,今日开盘前尚无11月13日窗口。11月12日latest_facts修订3,16个方向窗口完整,累计成交982.97217004667亿元,累计价量方向−0.01673169,不能描述为净流出16.45亿元。与as_published对照,后者仍存在缺方向,证明回看与当时可见信号需分开。
开发机86组隔离全量通过,包括新增27项查询专项及三道页面护栏。新HTTP依赖使用内存请求替身,禁止联网。1440、390和320宽度浏览器验收通过,单标签、16根柱、原抽屉入口正常,控制台无页面错误;另用隔离合成场景验证失败、缺失、真实零值和未来窗口。页面回放使用真实宽基只读响应,其他账户内容为样例,不是真实登录或交易验收。
发布前09:11只读核对155:模拟表前缀为空,dispatch=ws,买入与执行暂停均false;连续确认1823123,待入账/孤儿/在途均0,数量与现金差0。开盘前估值尚不可用,未用旧时点健康代替盘中状态。
## 发布与回退
候选断网回归及实际发布结果将在完成后追加。仅更新155的web和独立观测服务;保持原目录源码、共享.env、唯一WS及交易worker、beat不变。新增查询密钥仅进入观测服务专用环境文件。回退只针对上述两个镜像和查询开关,保留账本、队列、原始归档及其他服务后续配置。

View File

@ -1,5 +1,7 @@
# 开发资料入口
11月13日宽基查询接口接入与分时图更新见[最新接续](宽基查询接口与分时展示接续_2026-11-13.md)。保持顶部紧凑格式,以15分钟最新事实补齐回看曲线;正式信号与每日报告消费保持独立。
11月12日按最新意见改为[宽基紧凑汇总与15分钟方向图](宽基紧凑汇总与十五分钟方向图_2026-11-12.md),取代下方双入口方案;顶部单标签,日内信息及分时柱图并入原悬浮框。
11月12日宽基展示调整见[日内汇总与范围文案](宽基日内汇总与信号范围文案_2026-11-12.md):每日净申购和日内成交并列,范围、价量方向及缺失状态分开表达;发布结果以该接续为准。

View File

@ -16,6 +16,7 @@
策略资金缺行情展示与严格划拨专项19例;成本均价展示与导出精度专项14例。
执行依据数据库数值序列化专项5例。
人工关注独立观察发布、回执有效性与只读展示专项23例。
宽基查询接口、版本缓存、金额方向质量与密钥隔离专项27例。
包含 (例数按 2026-10-26 隔离回归实跑校正):
test_batch57_units.py 异步请求持久化、截止时间、旧结果隔离、结果优先收取、真实调度入口及行情来源 (32例)
@ -208,7 +209,7 @@ SUITES = [
"test_timing_fusion.py", # 三组证据契约、二次清仓与恢复(14例)
"test_signal_recovery.py", # 最新方向、停买恢复、网格合议、关注入口与负净成本(16例)
"test_grid_execution.py",
"test_broad_funds.py", "test_etf_observation.py", "test_risk_exit.py", "test_rotation_accounting_units.py", "test_cost_precision.py", "test_execution_basis_decimal.py",
"test_broad_funds.py", "test_etf_observation.py", "test_etf_query.py", "test_risk_exit.py", "test_rotation_accounting_units.py", "test_cost_precision.py", "test_execution_basis_decimal.py",
"test_trade_correction_units.py", "test_trade_correction_transport.py",
"test_trade_correction_service.py", "test_trade_lineage_units.py",
"test_trade_correction_strategy.py",

View File

@ -50,6 +50,7 @@ ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# 这些函数**写失败时不抛异常**, 只把失败写在返回值里。调用点必须接住。
# key = 函数名, value = 允许的调用者模块名 (None = 不限, 用于 _db(f, ...) 这种间接调用)
SOFT_FAIL = {
"consume_once": {"etf_query"},
"scan": {"risk_exit"},
"refresh_reviews": {"risk_exit"},
"consume": {"trade_correction"},

207
scripts/test_etf_query.py Normal file
View File

@ -0,0 +1,207 @@
"""宽基查询离线契约、缓存隔离及页面只读接入。数据均为合成测试数据。"""
import unit_test_guard
import contextlib
import copy
from datetime import datetime, timedelta
import json
from pathlib import Path
import sys
from unittest import TestCase, main
from unittest.mock import MagicMock, patch
sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
from app.core import etf_query_view as view
from app.services import etf_query as svc, param_store
DAY = '2026-11-12'
NOW = datetime.fromisoformat(DAY + 'T10:02:00+08:00')
def fixture(day=DAY, revision=1):
rows = []
for hm, amount, direction, balance in [('09:45', 1e8, 'BUY', .3), ('10:00', 2e8, 'SELL', -.4)]:
end = datetime.fromisoformat(day + 'T' + hm + ':00+08:00')
rows.append(dict(subject_type='MARKET', subject_id='BROAD_ETF', interval_minutes=15,
window_start=(end-timedelta(minutes=15)).isoformat(), window_end=end.isoformat(),
member_count=1, amount_member_count=1, direction_member_count=1,
amount_coverage=1., direction_coverage=1., amount_status='COMPLETE', direction_status='OK',
direction=direction, direction_balance=balance, turnover_yuan=amount,
cumulative_turnover_yuan=1e8 if hm=='09:45' else 3e8,
source_windows=[{'window_end':end.isoformat(),'sources':[{'source':'TEST_FACT'}]}],
top_turnover_members=[{'ts_code':'510300.SH'}]))
return dict(contract_version=view.CONTRACT, trade_date=day, view=view.VIEW, interval_minutes=15,
timezone='Asia/Shanghai', amount_unit='CNY', purpose='MARKET_OBSERVATION',
flow_basis='PRICE_VOLUME_PROXY_NOT_NET_SUBSCRIPTION', proxy_method='minute-price-change-signed-turnover-v1',
intraday_net_subscription_status='UNAVAILABLE_DAILY_ONLY', intraday_net_subscription_yuan=None,
trade_instruction=False, live_signal_eligibility=False, historical_use_allowed=True,
projection_revision=revision, projected_at=day+'T10:01:00+08:00',
data_version=str(revision)*64, cohort_sha256='b'*64,
groups=[dict(subject_type='MARKET',subject_id='BROAD_ETF',members=['510300.SH'])], rows=rows)
def catalog(day=DAY):
return dict(contract_version=view.CONTRACT, intervals_minutes=[15,30], views=['latest_facts','as_published'],
timezone='Asia/Shanghai',dates=[{'trade_date':day,'status':'AVAILABLE'}])
class MemoryStore:
def __init__(self): self.docs = {}; self.fail = False
def get(self, key): return copy.deepcopy(self.docs.get(key)), 1
def put_once(self, key, kind, value):
if self.fail: raise RuntimeError('store unavailable')
if key in self.docs: assert self.docs[key] == value
self.docs[key] = copy.deepcopy(value)
@contextlib.contextmanager
def locked(self, key, kind, initial):
value = copy.deepcopy(self.docs.get(key, initial))
yield value
self.docs[key] = value
class ViewTests(TestCase):
def test_real_weights_kept_and_cumulative_not_summed(self):
doc=fixture();view.validate(doc,DAY,NOW);out=view.presentation(doc,NOW)
self.assertEqual(out['summary']['cumulative_amount'],3e8)
self.assertEqual([r['value'] for r in out['intraday_series'][:2]],[.3,-.4])
self.assertFalse(out['trade_instruction']);self.assertFalse(out['live_signal_eligibility'])
def test_fixed_slots_and_lunch_gap(self):
rows=view.presentation(fixture(),NOW)['intraday_series']
self.assertEqual(len(rows),16);self.assertEqual((rows[7]['end'],rows[8]['start']),('11:30','13:00'))
self.assertEqual(rows[2]['state'],'pending')
def test_missing_direction_preserves_complete_amount(self):
doc=fixture();doc['rows'][1].update(direction_status='UNAVAILABLE',direction_balance=None)
out=view.presentation(doc,NOW);self.assertEqual(out['summary']['cumulative_amount'],3e8)
self.assertIsNone(out['intraday_series'][1]['value'])
def test_true_zero_and_missing_differ(self):
doc=fixture();doc['rows'][0].update(direction_balance=0,direction='MIXED')
doc['rows'][1].update(direction_coverage=.5)
rows=view.presentation(doc,NOW)['intraday_series']
self.assertEqual((rows[0]['state'],rows[0]['value']),('ok',0))
self.assertEqual((rows[1]['state'],rows[1]['value']),('missing',None))
def test_incomplete_amount_never_shown_as_complete_cumulative(self):
doc=fixture();doc['rows'][0]['amount_status']='INCOMPLETE'
self.assertIsNone(view.presentation(doc,NOW)['summary']['cumulative_amount'])
def test_nonfinite_bool_and_out_of_range_not_neutral(self):
for bad in (True,float('nan'),float('inf'),1.01,'0'):
doc=fixture();doc['rows'][0]['direction_balance']=bad
self.assertIsNone(view.presentation(doc,NOW)['intraday_series'][0]['value'])
def test_contract_purpose_and_scope_rejected(self):
for key,bad in [('view','as_published'),('interval_minutes',30),('trade_date','2026-11-11'),
('trade_instruction',True),('live_signal_eligibility',True),('amount_unit','万元')]:
doc=fixture();doc[key]=bad
with self.assertRaises(ValueError):view.validate(doc,DAY,NOW)
def test_duplicate_window_and_future_facts_rejected(self):
doc=fixture();doc['rows'].append(copy.deepcopy(doc['rows'][0]))
with self.assertRaises(ValueError):view.validate(doc,DAY,NOW)
with self.assertRaises(ValueError):view.validate(fixture(),DAY,NOW-timedelta(minutes=20))
def test_only_sh_sz_group_accepted(self):
for code in ('920001.BJ','bad','000300.CSI'):
doc=fixture();doc['groups'][0]['members']=[code]
with self.assertRaises(ValueError):view.validate(doc,DAY,NOW)
def test_catalog_selects_actual_day_not_future_or_available_fallback(self):
doc=catalog();doc['dates'] += [{'trade_date':'2026-11-11'},{'trade_date':'2026-11-13'}]
self.assertEqual(view.latest_day(doc,NOW),DAY)
doc['dates'][0]['status']='UNAVAILABLE';self.assertEqual(view.latest_day(doc,NOW),DAY)
def test_expired_signal_does_not_hide_history(self):
out=view.presentation(fixture(),NOW+timedelta(days=1))
self.assertEqual(out['summary']['trade_date'],DAY);self.assertEqual(out['intraday_series'][0]['value'],.3)
self.assertEqual(out['intraday_series'][2]['state'],'missing')
class ConsumerTests(TestCase):
def setUp(self):
self.stack=contextlib.ExitStack();self.addCleanup(self.stack.close);self.store=MemoryStore()
self.stack.enter_context(patch.object(svc,'store',self.store))
self.stack.enter_context(patch.object(param_store,'get_bool',return_value=True))
self.stack.enter_context(patch.object(param_store,'get',return_value='http://example.test'))
self.stack.enter_context(patch.object(svc.settings,'PMS_ETF_QUERY_API_KEY','synthetic-secret'))
self.at=NOW;self.doc=fixture();self.cat=catalog();self.code=200;self.calls=[]
def request(self,base,path,key,etag=None):
self.calls.append((path,etag))
if path.endswith('/catalog'):return 200,self.cat,None
return self.code,copy.deepcopy(self.doc) if self.code==200 else None,'"test"'
def runonce(self):return svc.consume_once(requester=self.request,clock=lambda:self.at)
def state(self):return self.store.docs[svc.STATE_KEY]
def test_200_archives_before_cache_and_304_retains(self):
self.assertEqual(self.runonce()['status'],'ok');first=copy.deepcopy(self.state()['document'])
self.assertEqual(len(self.store.docs),2);self.at+=timedelta(seconds=60);self.code=304
self.assertEqual(self.runonce()['status'],'ok');self.assertEqual(self.calls[-1][1],'"test"')
self.assertEqual(self.state()['document'],first);self.assertEqual(len(self.store.docs),2)
def test_poll_minute_budget(self):
self.runonce();self.at+=timedelta(seconds=59);self.assertEqual(self.runonce()['status'],'idle')
self.assertEqual(len(self.calls),2)
def test_errors_preserve_document_and_hide_sensitive_details(self):
self.runonce();old=copy.deepcopy(self.state()['document']);self.at+=timedelta(seconds=60)
for code in ('HTTP_401','HTTP_404','HTTP_503','NETWORK'):
def failing(*a):raise svc.QueryUnavailable(code)
svc.consume_once(requester=failing,clock=lambda:self.at)
self.assertEqual(self.state()['document'],old);self.assertEqual(self.state()['error'],code)
self.at+=timedelta(seconds=60)
def test_bad_contract_does_not_replace_cache(self):
self.runonce();self.at+=timedelta(seconds=60);self.doc['amount_unit']='万元'
self.assertEqual(self.runonce()['status'],'unavailable');self.assertEqual(self.state()['document']['amount_unit'],'CNY')
def test_old_revision_and_same_revision_mutation_rejected(self):
self.runonce();self.at+=timedelta(seconds=60);self.doc=fixture(revision=0)
self.assertEqual(self.runonce()['status'],'unavailable')
self.at+=timedelta(seconds=60);self.doc=fixture();self.doc['rows'][0]['turnover_yuan']=9e8
self.assertEqual(self.runonce()['status'],'unavailable')
def test_new_revision_archived_without_erasing_old(self):
self.runonce();self.at+=timedelta(seconds=60);self.doc=fixture(revision=2)
self.assertEqual(self.runonce()['status'],'ok');self.assertEqual(len(self.store.docs),3)
def test_day_change_never_reuses_etag(self):
self.runonce();self.at+=timedelta(days=1);self.cat=catalog('2026-11-13');self.doc=fixture('2026-11-13')
self.runonce();self.assertIsNone(self.calls[-1][1]);self.assertEqual(self.state()['document']['trade_date'],'2026-11-13')
def test_url_change_never_reuses_etag(self):
self.runonce();self.at+=timedelta(seconds=60)
with patch.object(param_store,'get',return_value='http://other.test'):self.runonce()
self.assertIsNone(self.calls[-1][1])
def test_304_without_cache_rejected(self):
self.code=304;self.assertEqual(self.runonce()['status'],'unavailable');self.assertNotIn('document',self.state())
def test_archive_failure_does_not_advance_cache(self):
self.store.fail=True
with self.assertRaises(RuntimeError):self.runonce()
self.assertNotIn(svc.STATE_KEY,self.store.docs)
def test_read_endpoint_never_fetches_or_reveals_secret(self):
self.runonce()
with patch.object(svc,'fetch',side_effect=AssertionError('no HTTP in page')):out=svc.status()
self.assertNotIn('synthetic-secret',json.dumps(out));self.assertNotIn('etag',out)
self.assertIn('PMS_ETF_QUERY_API_KEY',param_store.SECRET_KEYS)
self.assertNotIn('PMS_ETF_QUERY_API_KEY',param_store._editable_keys())
def test_stopped_poll_marks_unavailable_but_keeps_dated_history(self):
self.runonce()
with patch.object(svc,'datetime') as clock:
clock.now.return_value=NOW+timedelta(seconds=181)
result=svc.status()
self.assertEqual(result['status'],'unavailable')
self.assertEqual(result['summary']['trade_date'],DAY)
self.assertEqual(result['intraday_series'][0]['value'],.3)
def test_disabled_no_network_or_storage(self):
with patch.object(param_store,'get_bool',return_value=False):
self.assertEqual(self.runonce()['status'],'disabled');self.assertFalse(svc.status()['enabled'])
self.assertFalse(self.calls);self.assertFalse(self.store.docs)
class HttpTests(TestCase):
def session(self,status,body):
response=MagicMock();response.status_code=status;response.headers={'ETag':'"a"'}
response.iter_content.return_value=[body];response.__enter__.return_value=response
session=MagicMock();session.get.return_value=response;session.__enter__.return_value=session
return session
def test_timeout_redirect_and_conditional_header(self):
session=self.session(200,b'{"test":1}')
with patch.object(svc.requests,'Session',return_value=session):
self.assertEqual(svc.fetch('http://example.test','/path','synthetic-secret','"before"')[1],{'test':1})
self.assertFalse(session.trust_env);kw=session.get.call_args.kwargs
self.assertEqual(kw['timeout'],(2,5));self.assertFalse(kw['allow_redirects'])
self.assertEqual(kw['headers']['If-None-Match'],'"before"')
def test_unauthorized_redirect_and_size_limit(self):
for code,body in [(401,b'secret'),(302,b''),(200,b' '* (svc.MAX_BYTES+1))]:
with patch.object(svc.requests,'Session',return_value=self.session(code,body)):
with self.assertRaises(svc.QueryUnavailable) as cm:svc.fetch('http://example.test','/path','synthetic-secret')
self.assertNotIn('secret',str(cm.exception))
def test_url_credentials_and_missing_key_rejected(self):
with self.assertRaises(svc.QueryUnavailable):svc.fetch('http://user:password@example.test','/path','key')
with self.assertRaises(svc.QueryUnavailable):svc.fetch('http://example.test','/path','')
if __name__ == '__main__':main()