From 9bb5ef11936c5053c9d1782355d6be0a6bd4dc2e Mon Sep 17 00:00:00 2001 From: baobao Date: Fri, 13 Nov 2026 09:24:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E5=AE=BD=E5=9F=BA=E5=88=86?= =?UTF-8?q?=E6=97=B6=E6=9F=A5=E8=AF=A2=E5=B9=B6=E4=BF=9D=E7=95=99=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=BF=A1=E5=8F=B7=E8=BE=B9=E7=95=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DEVLOG.md | 5 + app/core/etf_query_view.py | 130 +++++++++++ app/observation_worker.py | 7 + app/services/etf_query.py | 117 ++++++++++ app/services/param_store.py | 4 +- app/web/main.py | 7 + app/web/static/index.html | 35 ++- config/settings.py | 1 + docs/宽基查询接口与分时展示接续_2026-11-13.md | 39 ++++ docs/开发入口.md | 2 + scripts/run_tests.py | 3 +- scripts/test_batch10_units.py | 1 + scripts/test_etf_query.py | 207 ++++++++++++++++++ 13 files changed, 547 insertions(+), 11 deletions(-) create mode 100644 app/core/etf_query_view.py create mode 100644 app/services/etf_query.py create mode 100644 docs/宽基查询接口与分时展示接续_2026-11-13.md create mode 100644 scripts/test_etf_query.py diff --git a/DEVLOG.md b/DEVLOG.md index cb50844..ad4526e 100644 --- a/DEVLOG.md +++ b/DEVLOG.md @@ -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)。 diff --git a/app/core/etf_query_view.py b/app/core/etf_query_view.py new file mode 100644 index 0000000..c0dd521 --- /dev/null +++ b/app/core/etf_query_view.py @@ -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} diff --git a/app/observation_worker.py b/app/observation_worker.py index 86b06de..111e7c8 100644 --- a/app/observation_worker.py +++ b/app/observation_worker.py @@ -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) diff --git a/app/services/etf_query.py b/app/services/etf_query.py new file mode 100644 index 0000000..800206f --- /dev/null +++ b/app/services/etf_query.py @@ -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 diff --git a/app/services/param_store.py b/app/services/param_store.py index 62f1656..fd4bf1e 100644 --- a/app/services/param_store.py +++ b/app/services/param_store.py @@ -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, '清仓信号最大时龄,秒;消息期限更短时服从消息期限'), diff --git a/app/web/main.py b/app/web/main.py index e164d5b..d58df41 100644 --- a/app/web/main.py +++ b/app/web/main.py @@ -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)。 diff --git a/app/web/static/index.html b/app/web/static/index.html index 4a6caa8..3d980cd 100644 --- a/app/web/static/index.html +++ b/app/web/static/index.html @@ -691,23 +691,23 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;} 微盘 {{ microChipText }} - +