接入宽基每日资金并补齐当天信号覆盖

This commit is contained in:
baobao 2026-11-06 10:38:29 +08:00
parent 15386d0573
commit bee6fc8502
18 changed files with 1154 additions and 80 deletions

View File

@ -2895,3 +2895,8 @@ PMS最终代码56db0fd已推送,155 web/WS/beat为execution-2b1c447,worker
按最新反馈,顶部在当日历史分位前增加带正负号的净额,红色表示流入、绿色表示流出。悬浮框固定60个交易日,取消周期切换、近5日汇总及分位,删除基金数量、参考样本、规模比例、连续天数和说明文案。保留日期、当日净申购估算、当日分位、趋势与原详情入口。
开发机验证1440/390/320布局、60根柱和无周期按钮、指定文案移除、待补及详情交互,无横向溢出或页面错误。仅更新独立原型及设计文档,应用与线上服务未变。最新图片与边界见[当前设计](docs/ETF每日资金与行业对比原型_2026-11-06.md)。
## 2026-11-06 宽基每日资金与信号覆盖
按用户确认原型接入每日资金,删除运营日报页面入口,补齐当天信号读取与浏览。10:15实际源5/99/105/0条,对应旧快照5/38/40/0条,定位全局及分类上限和前端过滤。仅拟发布155页面与独立观测,交易执行进程保持。实现及验收状态见[发布接续](docs/宽基每日资金与信号覆盖发布_2026-11-06.md)。

View File

@ -0,0 +1,12 @@
{
"repository": "main-trend-factor-system",
"path": "src/etf",
"sha256": {
"daily_flow.py": "9ce80d4f31227414eea84c328bf37cc3a095d322f37a32562d25bfdd4801cb7f",
"daily_transport.py": "91096a090721205041812d8618e88efc3ff0dc8510afab653c7055941d9ef2c1",
"publisher.py": "ec62ad7347bbe6c5278c13e5d7e3f413704203d820fb4c4bf28f49407a571437"
},
"dependencies": "Existing pinned consumer, signals, timing; Python standard library only",
"copied_at": "2026-11-06",
"runtime_verification": "2026-11-06 10:34 CST: exact hashes matched mtf-etf-155-worker-batch-1 /app/src/etf; existing consumer/signals/timing also matched"
}

View File

@ -0,0 +1,269 @@
"""Daily observations: ETF net subscription estimates and THS industry flows.
The two accounting bases never share a total. All rolling windows use actual
trading dates and a fixed cohort; missing observations never become zero.
"""
from __future__ import annotations
from decimal import Decimal, InvalidOperation
import hashlib
import json
from statistics import median
CONTRACT = "daily-flow-1.0"
ETF_BASIS = "ETF_SHARE_CHANGE_TIMES_NAV_ESTIMATE"
INDUSTRY_BASIS = "THS_INDUSTRY_NET_FLOW"
THRESHOLD = "daily-flow-reference-v0"
def decimal(value):
if value is None or isinstance(value, bool):
raise ValueError("MISSING_OR_INVALID_NUMBER")
try:
result = Decimal(str(value))
except InvalidOperation:
raise ValueError("INVALID_NUMBER") from None
if not result.is_finite():
raise ValueError("NONFINITE_NUMBER")
return result
def canonical(value):
return json.dumps(value, ensure_ascii=False, sort_keys=True, separators=(",", ":"), allow_nan=False)
def digest(value):
return hashlib.sha256(canonical(value).encode()).hexdigest()
def iso_day(value):
from datetime import date
text = str(value)[:10]
if len(text) == 8 and text.isdigit():
text = f"{text[:4]}-{text[4:6]}-{text[6:]}"
return date.fromisoformat(text).isoformat()
def subscription(current, previous, day, previous_day):
"""Source total_share=10,000 units, total_size=10,000 CNY, NAV=CNY/unit.
This estimates net creation/redemption asset value, including in-kind
baskets. It is NOT actual cash transferred, secondary-market turnover,
gross subscriptions/redemptions, or cash entering the stock market.
"""
result = dict(trade_date=day, net_flow_yuan=None, previous_size_yuan=None,
flow_rate=None, status="MISSING_SOURCE", corporate_action_status="UNVERIFIED")
if current is None or previous is None:
return result
if (current.get("ts_code") != previous.get("ts_code")
or iso_day(current["trade_date"]) != day
or iso_day(previous["trade_date"]) != previous_day):
raise ValueError("SHARE_DATE_OR_IDENTITY_MISMATCH")
try:
shares, old_shares = decimal(current["total_share"]), decimal(previous["total_share"])
nav, old_nav = decimal(current["nav"]), decimal(previous["nav"])
size, old_size = decimal(current["total_size"]), decimal(previous["total_size"])
if min(shares, old_shares, nav, old_nav, size, old_size) <= 0:
return dict(result, status="INVALID_SOURCE")
except (ValueError, KeyError):
return dict(result, status="INVALID_SOURCE")
# NAV is rounded by the provider. This is an identity/units sanity bound,
# not an assertion that the reported size is exactly NAV * rounded shares.
if any(abs(s * n - a) / a > Decimal("0.001")
for s, n, a in ((shares, nav, size), (old_shares, old_nav, old_size))):
return dict(result, status="NAV_SIZE_INCONSISTENT")
share_ratio, nav_ratio = shares / old_shares, nav / old_nav
if (abs(share_ratio - 1) > Decimal("0.2") and abs(nav_ratio - 1) > Decimal("0.2")
and abs(share_ratio * nav_ratio - 1) < Decimal("0.15")):
return dict(result, status="POSSIBLE_SHARE_UNIT_EVENT", corporate_action_status="REVIEW_REQUIRED")
flow = (shares - old_shares) * Decimal(10000) * nav
previous_size = old_size * Decimal(10000)
return dict(result, status="ESTIMATED", net_flow_yuan=float(flow),
previous_size_yuan=float(previous_size), flow_rate=float(flow / previous_size),
share_change_units=float((shares - old_shares) * Decimal(10000)),
nav_yuan=float(nav), assumption="NO_UNIDENTIFIED_SHARE_UNIT_EVENT")
def aggregate(records, expected_codes, day):
expected = tuple(sorted(set(expected_codes)))
selected = [records.get(code) for code in expected]
valid = [r for r in selected if r and r.get("net_flow_yuan") is not None]
total = sum((decimal(r["net_flow_yuan"]) for r in valid), Decimal(0))
base = sum((decimal(r["previous_size_yuan"]) for r in valid), Decimal(0))
complete = bool(expected) and len(valid) == len(expected)
return dict(trade_date=day, status="ESTIMATED" if complete else "INCOMPLETE_COHORT",
net_flow_yuan=float(total) if complete else None,
observed_partial_net_flow_yuan=float(total) if valid else None,
previous_size_yuan=float(base) if complete else None,
flow_rate=float(total / base) if complete and base else None,
member_count=len(expected), observed_member_count=len(valid),
missing_codes=[c for c, r in zip(expected, selected) if not r or r.get("net_flow_yuan") is None])
def reference(value, history):
values = [decimal(v) for v in history if v is not None][-252:]
result = dict(n=len(values), percentile=None, percentile252=None,
tail="UNAVAILABLE" if value is None else "INSUFFICIENT_REFERENCE",
threshold_version=THRESHOLD, calibrated=False,
percentile_semantics="MIDRANK_DESCRIPTIVE_NOT_PROBABILITY")
if value is None or not values:
return result
x = decimal(value)
less, equal = sum(v < x for v in values), sum(v == x for v in values)
rank = 100 * (less + equal / 2) / len(values)
result.update(percentile=rank, percentile252=rank if len(values) == 252 else None)
if len(values) < 60:
return result
# Use both ends of a tie's rank interval so a constant history cannot be
# labelled extreme merely because weak ECDF maps ties to 100%.
lower, upper = 100 * less / len(values), 100 * (less + equal) / len(values)
result["tail"] = "NONE"
if x > 0 and lower >= 95:
result["tail"] = "INFLOW_TOP_1PCT" if len(values) == 252 and lower >= 99 else "INFLOW_TOP_5PCT"
elif x < 0 and upper <= 5:
result["tail"] = "OUTFLOW_BOTTOM_1PCT" if len(values) == 252 and upper <= 1 else "OUTFLOW_BOTTOM_5PCT"
return result
def _window(series, end, length, basis):
if end + 1 < length:
return None, None
rows = series[end + 1 - length:end + 1]
if any(r.get("net_flow_yuan") is None for r in rows):
return None, None
value = sum((decimal(r["net_flow_yuan"]) for r in rows), Decimal(0))
base = rows[0].get("previous_size_yuan")
rate = float(value / decimal(base)) if basis == ETF_BASIS and base is not None and decimal(base) > 0 else None
return float(value), rate
def summarize(series, basis):
if not series:
raise ValueError("EMPTY_DAILY_SERIES")
dates = [iso_day(r["trade_date"]) for r in series]
if dates != sorted(set(dates)):
raise ValueError("DATES_MUST_BE_UNIQUE_AND_ORDERED")
last = series[-1]
value = last.get("net_flow_yuan")
direction = "UNKNOWN" if value is None else "INFLOW" if value > 0 else "OUTFLOW" if value < 0 else "FLAT"
field = "flow_rate" if basis == ETF_BASIS else "net_flow_yuan"
daily_ref = reference(last.get(field), [r.get(field) for r in series[:-1]])
result = dict(latest=last, direction=direction, reference=daily_ref, periods={},
reference_basis="NET_FLOW_DIVIDED_BY_PREVIOUS_SIZE" if basis == ETF_BASIS else "OWN_SECTOR_NET_FLOW_AMOUNT",
daily_series=series[-60:], model_status="uncalibrated", calibration_status="PROVISIONAL")
for length in (5, 20, 60):
amount, rate = _window(series, len(series)-1, length, basis)
history = [_window(series, i, length, basis)[1 if basis == ETF_BASIS else 0]
for i in range(length-1, len(series)-1)]
valid_days = sum(r.get("net_flow_yuan") is not None for r in series[-length:])
result["periods"][str(length)] = dict(net_flow_yuan=amount, flow_rate=rate,
expected_days=length, valid_days=valid_days,
complete=amount is not None, reference=reference(rate if basis == ETF_BASIS else amount, history))
current5, _ = _window(series, len(series)-1, 5, basis)
previous5, _ = _window(series, len(series)-6, 5, basis) if len(series) >= 10 else (None, None)
result["change_in_5d_average_yuan_per_day"] = ((current5-previous5)/5
if current5 is not None and previous5 is not None else None)
streak = 0
if direction in ("INFLOW", "OUTFLOW"):
for row in reversed(series):
flow = row.get("net_flow_yuan")
if flow is None or not ((flow > 0 and direction == "INFLOW") or (flow < 0 and direction == "OUTFLOW")):
break
streak += 1
result["same_direction_trading_days"] = streak
result["streak_is_lower_bound"] = streak == len(series) and bool(streak)
label = "ETF净申购估算" if basis == ETF_BASIS else "行业资金净额(同花顺口径)"
if value is None:
headline = f"{dates[-1]}:{label}待补数据;不判定流入、流出或极端程度。"
else:
headline = f"{dates[-1]}:{label}{value/100000000:+.2f}亿元"
if basis == ETF_BASIS and last.get("flow_rate") is not None:
headline += f",占前日规模{last['flow_rate']*100:+.2f}%"
if daily_ref["percentile"] is not None:
headline += f",历史分位{daily_ref['percentile']:.1f}%(n={daily_ref['n']})"
tail_labels = {"INFLOW_TOP_5PCT":"流入前5%档", "OUTFLOW_BOTTOM_5PCT":"流出后5%档",
"INFLOW_TOP_1PCT":"流入前1%档", "OUTFLOW_BOTTOM_1PCT":"流出后1%档",
"INSUFFICIENT_REFERENCE":"样本不足,暂不判极端", "NONE":"未达到尾部档位"}
headline += ";"+tail_labels.get(daily_ref["tail"],"历史参照不足")+";未校准。"
result["conclusion"] = {"text":headline,"direction":direction,"extreme_code":daily_ref["tail"],
"is_calibrated":False}
return result
def build_report(*, dates, share_days, industry_rows, cohort, group_names=None):
"""dates is a verified trading calendar, including previous boundary day.
cohort maps ETF to tracking index. Every historical aggregate is recomputed
using exactly this cohort; archived market totals from other pools are not
concatenated. Industry values are already normalized to CNY by the adapter.
"""
dates = [iso_day(day) for day in dates]
if len(dates) < 2 or dates != sorted(set(dates)) or not cohort:
raise ValueError("VERIFIED_DATES_AND_NONEMPTY_COHORT_REQUIRED")
share_index = {}
for day in dates:
indexed = {}
for row in share_days.get(day, []):
code = row["ts_code"]
if iso_day(row["trade_date"]) != day or code in indexed:
raise ValueError("DUPLICATE_OR_WRONG_DATE_SHARE_ROW")
indexed[code] = row
share_index[day] = indexed
series = {code: [] for code in cohort}
groups = {key: sorted(code for code, group in cohort.items() if group == key) for key in sorted(set(cohort.values()))}
group_series = {key: [] for key in groups}
market = []
for previous, day in zip(dates, dates[1:]):
rows = {code: subscription(share_index[day].get(code), share_index[previous].get(code), day, previous) for code in cohort}
for code, row in rows.items():
series[code].append(row)
market.append(aggregate(rows, cohort, day))
for group, codes in groups.items():
group_series[group].append(aggregate(rows, codes, day))
etfs = [{"subject_type":"ETF", "subject_id":code, "tracking_index":cohort[code],
**summarize(rows, ETF_BASIS)} for code, rows in sorted(series.items())]
# Detailed ETF daily history is kept in durable source facts. The public
# snapshot contains their current/rolling metrics; charts use group series.
for item in etfs:
item.pop("daily_series")
indexes = [{"subject_type":"INDEX", "subject_id":key, "name":(group_names or {}).get(key, key),
**summarize(rows, ETF_BASIS)} for key, rows in sorted(group_series.items())]
ind_index, names = {}, {}
for row in industry_rows:
day, code = iso_day(row["trade_date"]), str(row["industry_code"])
if day not in dates[1:]:
continue
if (code, day) in ind_index:
raise ValueError("DUPLICATE_INDUSTRY_ROW")
value = row.get("net_flow_yuan")
value = float(decimal(value)) if value is not None else None
ind_index[code, day] = dict(trade_date=day, net_flow_yuan=value,
status="REPORTED" if value is not None else "MISSING_SOURCE")
names[code] = row.get("industry_name", code)
industries = [{"subject_type":"INDUSTRY", "subject_id":code, "name":names[code],
**summarize([ind_index.get((code, day), dict(trade_date=day, net_flow_yuan=None,
status="MISSING_SOURCE")) for day in dates[1:]], INDUSTRY_BASIS)} for code in sorted(names)]
for subjects in (indexes, industries):
valid = [r for r in subjects if r["latest"]["net_flow_yuan"] is not None]
for rank, row in enumerate(sorted(valid, key=lambda r:-r["latest"]["net_flow_yuan"]), 1):
row["rank_by_net_flow_desc"] = rank
row["rank_population"] = len(valid)
return dict(schema_version=1, contract_version=CONTRACT, trade_date=dates[-1],
publication_mode="observation", purpose="MARKET_OBSERVATION", trade_instruction=False,
model_status="uncalibrated", calibration_status="PROVISIONAL", threshold_version=THRESHOLD,
accounting_bases_combined=False, cohort_basis="AS_OF_REPORT_FIXED_COHORT",
historical_membership_reconstructed=False, cohort_sha256=digest(cohort),
historical_knowledge_basis="FINALIZED_SOURCE_AS_LOADED_NOT_INTRADAY_REPLAY",
expected_trading_dates=dates[1:],
etf={"flow_basis":ETF_BASIS, "amount_unit":"CNY", "cohort":cohort,
"corporate_action_status":"UNVERIFIED_EXCEPT_SUSPECT_EVENTS_EXCLUDED",
"interpretation":"ESTIMATED_NET_CREATION_REDEMPTION_ASSET_VALUE_NOT_CASH_OR_STOCK_MARKET_NET_INFLOW",
"market":{"subject_type":"MARKET", "subject_id":"BROAD_ETF", **summarize(market, ETF_BASIS)},
"indexes":indexes, "etfs":etfs},
industry={"flow_basis":INDUSTRY_BASIS, "amount_unit":"CNY", "taxonomy":"THS_INDUSTRY",
"interpretation":"PROVIDER_REPORTED_ORDER_FLOW_NOT_ETF_SUBSCRIPTION",
"total":None, "sectors":industries},
limitations=["Reference tails are provisional descriptive observations, not calibrated probabilities.",
"ETF creation/redemption can be in kind; estimated flows are not literal cash movement.",
"Sector differences do not establish that the same investors moved money between sectors."])

View File

@ -0,0 +1,165 @@
"""Daily immutable facts use the existing two-Redis commit mechanism.
DAILY_UPSERT revisions are deliberately distinct from intraday signal leases.
The consumer must supply the date it intends to display.
"""
from datetime import datetime, time, timedelta
import hashlib
import json
from .daily_flow import CONTRACT, ETF_BASIS, INDUSTRY_BASIS, THRESHOLD, canonical, iso_day
from .signals import SHANGHAI, aware_time
from .publisher import PREPARE_LUA, COMMIT_LUA, LATEST_LUA, _text
from .consumer import _json
NAMESPACE = "mtf:funds:daily:observation:v1"
MAX_REPORT_BYTES = 8 * 1024 * 1024
REVOKE_COMPLETE_LUA = """-- DAILY_REVOKE_COMPLETE_V1
local old = redis.call('GET', KEYS[1])
if not old then return 0 end
local v = cjson.decode(old)
if v.trade_date == ARGV[1] and tonumber(v.revision) < tonumber(ARGV[2]) then
return redis.call('DEL', KEYS[1])
end
return 0
"""
def validate_report(report):
day = iso_day(report["trade_date"])
if (report.get("schema_version") != 1 or report.get("contract_version") != CONTRACT
or report.get("model_status") != "uncalibrated" or report.get("calibration_status") != "PROVISIONAL"
or report.get("purpose") != "MARKET_OBSERVATION" or report.get("publication_mode") != "observation"
or report.get("trade_instruction") is not False or report.get("accounting_bases_combined") is not False
or report.get("threshold_version") != THRESHOLD
or report.get("etf", {}).get("flow_basis") != ETF_BASIS
or report.get("industry", {}).get("flow_basis") != INDUSTRY_BASIS
or report.get("industry", {}).get("total") is not None
or report.get("valid_for_trade_date") != day):
raise ValueError("DAILY_CONTRACT_MISMATCH")
revision = report.get("revision")
if type(revision) is not int or revision < 0 or report.get("supersedes_revision") != (revision-1 if revision else None):
raise ValueError("DAILY_REVISION_INVALID")
if aware_time(report["published_at"]).date().isoformat() < day:
raise ValueError("DAILY_PUBLICATION_BEFORE_FACT_DATE")
market = report["etf"]["market"]["latest"]
sectors = report["industry"]["sectors"]
covered = sum(s["latest"]["net_flow_yuan"] is not None for s in sectors)
expected = {"etf":"AVAILABLE_ESTIMATE" if market["net_flow_yuan"] is not None else "AWAITING_COMPLETE_SHARES_NAV",
"industry":"AVAILABLE_REPORTED" if sectors and covered == len(sectors)
else "PARTIAL_REPORTED" if covered else "AWAITING_SOURCE"}
if report.get("component_status") != expected or market.get("trade_date") != day:
raise ValueError("DAILY_COMPONENT_QUALITY_MISMATCH")
if market["net_flow_yuan"] is not None and (market.get("member_count",0) <= 0
or market.get("observed_member_count") != market.get("member_count")):
raise ValueError("DAILY_INCOMPLETE_MARKET_MISLABELLED")
return day, revision
class DailyPublisher:
def __init__(self, snapshots, events):
self.snapshots, self.events = snapshots, events
def publish(self, report, delivery_at):
day, revision = validate_report(report)
now = aware_time(delivery_at)
if aware_time(report["published_at"]) > now:
raise ValueError("DAILY_DELIVERY_BEFORE_PUBLICATION")
expiry = int((datetime.combine(datetime.fromisoformat(day).date(), time(23, 59), SHANGHAI)
+ timedelta(days=90)).timestamp())
if expiry <= now.timestamp():
return {"status":"HISTORY_ONLY", "trade_date":day, "revision":revision}
raw = canonical(report)
if len(raw.encode()) > MAX_REPORT_BYTES:
raise ValueError("DAILY_REPORT_TOO_LARGE")
suffix = f"{day}:r{revision}"
snapshot_key = NAMESPACE+":snapshot:"+suffix
manifest_key = NAMESPACE+":manifest:"+suffix
manifest = dict(schema_version=1, contract_version=CONTRACT, namespace=NAMESPACE, status="READY",
trade_date=day, revision=revision, snapshot_key=snapshot_key, manifest_key=manifest_key,
snapshot_sha256=hashlib.sha256(raw.encode()).hexdigest(), published_at=report["published_at"],
purpose="MARKET_OBSERVATION", model_status="uncalibrated", calibration_status="PROVISIONAL",
trade_instruction=False, event_type="DAILY_UPSERT", window_epoch=int(datetime.fromisoformat(day).replace(tzinfo=SHANGHAI).timestamp()))
event = dict(manifest, event_id=f"daily-flow:{day}:r{revision}", supersedes_revision=report["supersedes_revision"],
component_status=report["component_status"])
# Stream/set expiry uses delivery month to prevent an older-date retry
# shortening the retention of newer entries sharing the same stream.
stream_expiry = int((now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)+timedelta(days=123)).timestamp())
self.snapshots.eval(PREPARE_LUA, 1, snapshot_key, raw, expiry)
committed = self.events.eval(COMMIT_LUA, 4, NAMESPACE+":unused_state", NAMESPACE+":events:"+day[:7],
NAMESPACE+":event_ids:"+day[:7], manifest_key, "0", 0, "{}", canonical(manifest),
canonical([{"key":event["event_id"], "data":canonical(event)}]), expiry, stream_expiry, 100000)
actual = _json(_text(committed))
if actual != manifest:
raise ValueError("DAILY_MANIFEST_CONFLICT")
# A per-date pointer exposes revisions even when correcting an older
# date. Global latest never moves back to that older date.
for key in (NAMESPACE+":latest:"+day, NAMESPACE+":latest"):
self.snapshots.eval(LATEST_LUA, 1, key, manifest["window_epoch"], revision, canonical(manifest), expiry)
if (report["component_status"].get("etf") == "AVAILABLE_ESTIMATE"
and report["component_status"].get("industry") == "AVAILABLE_REPORTED"):
self.snapshots.eval(LATEST_LUA, 1, NAMESPACE+":latest_complete", manifest["window_epoch"],
revision, canonical(manifest), expiry)
else:
self.snapshots.eval(REVOKE_COMPLETE_LUA, 1, NAMESPACE+":latest_complete", day, revision)
self.snapshots.publish(NAMESPACE+":daily_ready", canonical(manifest))
return manifest
def _read(client, key, limit):
length = client.strlen(key)
if type(length) is not int or not 0 < length <= limit:
raise ValueError("DAILY_MISSING_OR_OVERSIZED_RECORD")
# Fetch the bounded, complete UTF-8 value in one GETRANGE. Arbitrary byte
# chunks can split a Chinese character before a decode_responses client
# returns it. Both binary and decoded Redis clients are supported.
value = client.getrange(key, 0, length-1)
if not isinstance(value, (str, bytes)):
raise ValueError("DAILY_JSON_TEXT_REQUIRED")
raw = value.encode() if isinstance(value, str) else value
if len(raw) != length or client.strlen(key) != length:
raise ValueError("DAILY_INCOMPLETE_READ")
return raw
def read_daily_report(snapshot_client, event_client, manifest_key, *, expected_trade_date, last_revision=-1):
expected = iso_day(expected_trade_date)
if not isinstance(manifest_key, str) or not manifest_key.startswith(NAMESPACE+":manifest:"+expected+":r"):
raise ValueError("DAILY_EXPECTED_DATE_OR_NAMESPACE_MISMATCH")
manifest_raw = _read(event_client, manifest_key, 32768)
manifest = _json(manifest_raw)
revision = manifest.get("revision")
suffix = f"{expected}:r{revision}"
if (manifest.get("namespace") != NAMESPACE or manifest.get("status") != "READY"
or manifest.get("trade_date") != expected or manifest.get("manifest_key") != manifest_key
or manifest_key != NAMESPACE+":manifest:"+suffix
or manifest.get("snapshot_key") != NAMESPACE+":snapshot:"+suffix):
raise ValueError("DAILY_COMMIT_IDENTITY_MISMATCH")
raw = _read(snapshot_client, manifest["snapshot_key"], MAX_REPORT_BYTES)
if hashlib.sha256(raw).hexdigest() != manifest.get("snapshot_sha256"):
raise ValueError("DAILY_SNAPSHOT_HASH_MISMATCH")
if _read(event_client, manifest_key, 32768) != manifest_raw:
raise ValueError("DAILY_MANIFEST_CHANGED")
report = _json(raw)
day, revision = validate_report(report)
if day != expected or revision != manifest["revision"]:
raise ValueError("DAILY_SNAPSHOT_IDENTITY_MISMATCH")
for field in ("contract_version", "published_at", "purpose", "model_status", "calibration_status", "trade_instruction"):
if report.get(field) != manifest.get(field):
raise ValueError("DAILY_METADATA_MISMATCH")
latest_key = NAMESPACE+":latest:"+day
superseded = False
if snapshot_client.strlen(latest_key):
latest = _json(_read(snapshot_client, latest_key, 32768))
if latest.get("namespace") != NAMESPACE or latest.get("trade_date") != day:
raise ValueError("DAILY_LATEST_IDENTITY_MISMATCH")
latest_manifest = _json(_read(event_client, latest["manifest_key"], 32768))
if latest_manifest != latest or latest.get("status") != "READY":
raise ValueError("DAILY_LATEST_NOT_COMMITTED")
superseded = latest["revision"] > revision
return dict(report=report, manifest=manifest, apply=revision > last_revision and not superseded,
superseded=superseded,
revision_gap=revision > last_revision+1,
read_completed_at=datetime.now(SHANGHAI).isoformat(),
valid_for_trade_date=day, is_trading_signal=False)

View File

@ -0,0 +1,245 @@
"""Redis transport for ETF snapshots and lifecycle events.
The two Redis instances cannot share a transaction. An immutable snapshot is
prepared first; one Lua operation on the event instance commits events,
CAS-protected state and the READY manifest. Only then can a monotonic latest
pointer move and a notification be published. Consumers verify the manifest.
"""
from __future__ import annotations
from datetime import datetime, time, timedelta
import hashlib
import json
from .signals import SHANGHAI, aware_time, lease_until, validate_snapshot
from .timing import LEGACY_POLICY, admission_until, policy_version
from .consumer import OBSERVATION_NAMESPACE, validate_publication_contract, validate_observation_event_metadata
class PublishConflict(RuntimeError):
pass
def _json(value):
return json.dumps(value, ensure_ascii=False, sort_keys=True, separators=(",", ":"),
allow_nan=False,
default=lambda x: aware_time(x).isoformat() if isinstance(x, datetime) else _unsupported(x))
def _unsupported(value):
raise TypeError("not JSON serializable: " + type(value).__name__)
def _text(value):
return value.decode() if isinstance(value, bytes) else value
PREPARE_LUA = """-- ETF_PREPARE_V1
local old = redis.call('GET', KEYS[1])
if old and old ~= ARGV[1] then return redis.error_reply('IMMUTABLE_ROUND_CONFLICT') end
if not old then redis.call('SET', KEYS[1], ARGV[1]) end
redis.call('EXPIREAT', KEYS[1], ARGV[2])
return 1
"""
COMMIT_LUA = """-- ETF_COMMIT_V1
local kinds = {'string', 'stream', 'set', 'string'}
for i, key in ipairs(KEYS) do
local kind = redis.call('TYPE', key).ok
if kind ~= 'none' and kind ~= kinds[i] then return redis.error_reply('WRONGTYPE_ETF_KEY') end
end
local done = redis.call('GET', KEYS[4])
if done then return done end
local current = redis.call('GET', KEYS[1])
local actual = 0
if current then actual = tonumber(cjson.decode(current).state_version or 0) end
if ARGV[1] == '1' and actual ~= tonumber(ARGV[2]) then
return redis.error_reply('STATE_CAS_CONFLICT')
end
local events = cjson.decode(ARGV[5])
for _, e in ipairs(events) do
if redis.call('SISMEMBER', KEYS[3], e.key) == 0 then
redis.call('XADD', KEYS[2], 'MAXLEN', '~', ARGV[8], '*', 'data', e.data)
redis.call('SADD', KEYS[3], e.key)
end
end
if ARGV[1] == '1' then
redis.call('SET', KEYS[1], ARGV[3])
redis.call('EXPIREAT', KEYS[1], ARGV[6])
end
if #events > 0 then
redis.call('EXPIREAT', KEYS[2], ARGV[7])
redis.call('EXPIREAT', KEYS[3], ARGV[7])
end
redis.call('SET', KEYS[4], ARGV[4])
redis.call('EXPIREAT', KEYS[4], ARGV[7])
return ARGV[4]
"""
LATEST_LUA = """-- ETF_LATEST_V1
local old = redis.call('GET', KEYS[1])
if old then
local v = cjson.decode(old)
if tonumber(v.window_epoch) > tonumber(ARGV[1]) then return 0 end
if tonumber(v.window_epoch) == tonumber(ARGV[1]) and tonumber(v.revision) > tonumber(ARGV[2]) then return 0 end
end
redis.call('SET', KEYS[1], ARGV[3])
redis.call('EXPIREAT', KEYS[1], ARGV[4])
return 1
"""
FAILURE_LUA = """-- ETF_FAILURE_V1
redis.call('SET', KEYS[1], ARGV[1])
redis.call('EXPIREAT', KEYS[1], ARGV[2])
return 1
"""
class RedisPublisher:
def __init__(self, snapshot_client, event_client, namespace="mtf:etf:shadow:v1", maxlen=100000):
if not namespace or namespace.endswith(":" ):
raise ValueError("namespace must be nonempty without a trailing colon")
if maxlen <= 0:
raise ValueError("maxlen must be positive")
self.snapshots = snapshot_client
self.events = event_client
self.namespace = namespace
self.maxlen = int(maxlen)
self.channel = namespace + ":round_ready"
def state_key(self, trade_date):
return f"{self.namespace}:state:{trade_date}"
def load_state(self, trade_date):
raw = self.events.get(self.state_key(trade_date))
return json.loads(_text(raw)) if raw else {}
def _expiry(self, trade_date, days):
close = datetime.combine(datetime.fromisoformat(trade_date).date(), time(15), SHANGHAI)
return int((close + timedelta(days=days)).timestamp())
def publish(self, snapshot, events, new_state, published_at, delivery_at=None):
"""Commit a frozen publication; delivery_at is the real retry clock.
Late retries retain original event timestamps for audit but never move
the live pointer. The runner must pass its current clock as delivery_at.
Omitting it preserves deterministic replay/test behavior.
"""
end = validate_snapshot(snapshot)
publication_metadata = validate_publication_contract(snapshot, self.namespace)
timing_policy = policy_version(snapshot)
now = aware_time(published_at)
if self.namespace == OBSERVATION_NAMESPACE:
if aware_time(snapshot.get("published_at")) != now:
raise ValueError("observation snapshot must retain the frozen publication timestamp")
if type(snapshot.get("session_closed")) is not bool or snapshot["session_closed"] != (end.hour == 15):
raise ValueError("observation session_closed must match the fixed closing window")
delivery = aware_time(delivery_at) if delivery_at is not None else now
if delivery < now:
raise ValueError("delivery_at cannot precede the frozen publication timestamp")
if end > now:
raise ValueError("cannot publish an unfinished future window")
date = snapshot["trade_date"]
revision = snapshot.get("revision", 0)
round_id = snapshot["round_id"]
suffix = f"{date}:{round_id}:r{revision}"
snapshot_key = f"{self.namespace}:snapshot:{suffix}"
manifest_key = f"{self.namespace}:manifest:{suffix}"
snapshot_expiry, stream_expiry = self._expiry(date, 2), self._expiry(date, 7)
canonical = _json(snapshot)
lease = lease_until(end, timing_policy)
admission = admission_until(end, timing_policy)
original_eligible = (snapshot.get("mode", "LIVE") == "LIVE"
and snapshot.get("data_status") == "OK"
and end <= now < admission and not snapshot.get("session_closed", False))
current = original_eligible and end <= delivery < lease
manifest = {
"schema_version": 1, "status": "READY", "round_id": round_id,
"revision": revision, "trade_date": date, "window_end": end.isoformat(),
"window_epoch": int(end.timestamp()), "published_at": now.isoformat(),
"valid_until": lease.isoformat(),
"timing_policy_version": timing_policy, "admission_until": admission.isoformat(),
"session_closed": bool(snapshot.get("session_closed")) or end.hour == 15,
"live_eligible": current,
"mode": snapshot.get("mode", "LIVE"), "snapshot_key": snapshot_key,
"manifest_key": manifest_key, "event_count": len(events),
"snapshot_sha256": hashlib.sha256(canonical.encode()).hexdigest(),
}
if self.namespace == OBSERVATION_NAMESPACE:
manifest.update(publication_mode="observation", **publication_metadata)
# Historical backfills belong in the durable results store. Never
# resurrect Redis data beyond its fixed retention boundary.
if snapshot_expiry <= int(delivery.timestamp()):
return dict(manifest, status="HISTORY_ONLY", cached=False)
if events and snapshot.get("mode", "LIVE") == "REPLAY":
raise ValueError("REPLAY must not publish live lifecycle events")
encoded_events = []
for event in events:
if self.namespace == OBSERVATION_NAMESPACE:
validate_observation_event_metadata(event, snapshot)
event_policy = policy_version(event)
if event.get("round_id") != round_id or event.get("revision") != revision:
raise ValueError("event round/revision does not match snapshot")
if event.get("trade_date") != date or event.get("window_end") != end.isoformat():
raise ValueError("event time partition does not match snapshot")
if aware_time(event["published_at"]) != now:
raise ValueError("retry the exact frozen publication timestamp")
if event.get("event_state") in ("OPEN", "CONTINUE"):
if not original_eligible:
raise ValueError("stale, replay or closed rounds cannot publish active events")
if event_policy != timing_policy:
raise ValueError("active event timing policy must match its snapshot")
if aware_time(event["valid_until"]) > lease_until(end, event_policy):
raise ValueError("event lease cannot extend beyond its window lease or market close")
key = f"{event['event_id']}:{event['event_seq']}:{event['revision']}"
encoded_events.append({"key": key, "data": _json(event)})
write_state = bool(new_state.get("_write_state", False))
if events and not write_state:
raise ValueError("lifecycle events require an atomic state update")
if write_state and (snapshot.get("mode", "LIVE") == "REPLAY" or new_state.get("trade_date") != date):
raise ValueError("state update must belong to this LIVE trading date")
if write_state and policy_version(new_state) != timing_policy:
raise ValueError("state timing policy must match its current snapshot")
expected = int(new_state.get("_expected_version", new_state.get("state_version", 0)))
persisted_state = {k: v for k, v in new_state.items() if not k.startswith("_")}
if write_state and persisted_state.get("state_version") != expected + 1:
raise ValueError("state_version must increment exactly once")
try:
self.snapshots.eval(PREPARE_LUA, 1, snapshot_key, canonical, snapshot_expiry)
committed = self.events.eval(
COMMIT_LUA, 4, self.state_key(date), f"{self.namespace}:events:{date}",
f"{self.namespace}:event_ids:{date}", manifest_key,
"1" if write_state else "0", expected, _json(persisted_state), _json(manifest),
_json(encoded_events), snapshot_expiry, stream_expiry, self.maxlen,
)
manifest = json.loads(_text(committed))
if current:
switched = self.snapshots.eval(
LATEST_LUA, 1, self.namespace + ":latest", int(end.timestamp()), revision,
_json(manifest), snapshot_expiry,
)
if switched:
self.snapshots.publish(self.channel, _json(manifest))
return manifest
except Exception as exc:
if "CONFLICT" in str(exc):
raise PublishConflict(str(exc)) from exc
raise
def publish_failure(self, round_id, trade_date, window_end, error_code, published_at, revision=0,
timing_policy_version=LEGACY_POLICY):
"""Diagnostic status only; never changes a READY manifest or latest."""
end, now = aware_time(window_end), aware_time(published_at)
payload = {
"schema_version": 1, "status": "FAILED", "round_id": round_id,
"trade_date": trade_date, "window_end": end.isoformat(), "revision": revision,
"published_at": now.isoformat(), "error_code": str(error_code),
"timing_policy_version": policy_version({"timing_policy_version": timing_policy_version}),
}
key = f"{self.namespace}:failure:{trade_date}:{round_id}:r{revision}"
self.events.eval(FAILURE_LUA, 1, key, _json(payload), self._expiry(trade_date, 2))
self.snapshots.publish(self.channel, _json(payload))
return payload

View File

@ -6,6 +6,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
logging.basicConfig(level=logging.INFO)
stopping = Event()
signal.signal(signal.SIGTERM, lambda *_: stopping.set())
@ -17,6 +18,12 @@ def main():
logging.warning('ETF观测暂不可用:%s', result.get('error'))
except Exception as exc:
logging.warning('ETF观测保存失败:%s', type(exc).__name__)
try:
result = consume_daily()
if result.get('status') == 'unavailable':
logging.warning('每日资金暂不可用:%s', result.get('error'))
except Exception as exc:
logging.warning('每日资金保存失败:%s', type(exc).__name__)
stopping.wait(15)

150
app/services/broad_funds.py Normal file
View File

@ -0,0 +1,150 @@
"""宽基每日资金只读接入;原文留存后确认,仅供页面观测。"""
from __future__ import annotations
import hashlib
import json
import re
from datetime import datetime, timedelta
from app.core.etf_contract import daily_transport as contract
from app.repo import rotation_repo as store
from app.services import etf_observation as minute, param_store
NS = contract.NAMESPACE
GROUP = 'pms-broad-daily-v1'
STATE = 'broad-funds:state'
INDEX_NAMES = {'000016.SH': '上证50', '000300.SH': '沪深300', '000510.SH': '中证A500',
'000688.SH': '科创50', '000852.SH': '中证1000', '000905.SH': '中证500',
'399006.SZ': '创业板指', '932000.CSI': '中证2000'}
def initial():
return {'days': {}, 'latest': None, 'last_success_at': None, 'error': None}
def validate_scope(report, at):
if report['trade_date'] > at.date().isoformat() or datetime.fromisoformat(report['published_at']) > at:
raise ValueError('DAILY_FUTURE_FACT')
for code in report['etf'].get('cohort', []):
if not re.fullmatch(r'\d{6}\.(SH|SZ)', str(code)):
raise ValueError('DAILY_OUT_OF_SCOPE')
for row in report['etf'].get('etfs', []):
if not minute.subject_allowed('ETF', row['subject_id']):
raise ValueError('DAILY_OUT_OF_SCOPE')
for row in report['etf'].get('indexes', []):
if not minute.subject_allowed('INDEX', row['subject_id']):
raise ValueError('DAILY_OUT_OF_SCOPE')
def ingest(snapshots, events, manifest_key, day, at, delivery=None):
"""契约核验、同日修订防倒退、事实与回执在同一事务落库。"""
audit_key = 'broad-funds:event:' + delivery[0] + ':' + delivery[1] if delivery else None
if audit_key and store.get(audit_key)[0] is not None:
return
result = contract.read_daily_report(snapshots, events, manifest_key, expected_trade_date=day)
report, manifest = result['report'], result['manifest']
validate_scope(report, at)
if manifest.get('event_type') != 'DAILY_UPSERT':
raise ValueError('DAILY_EVENT_TYPE_MISMATCH')
raw = contract._read(snapshots, manifest['snapshot_key'], contract.MAX_REPORT_BYTES)
if hashlib.sha256(raw).hexdigest() != manifest['snapshot_sha256']:
raise ValueError('DAILY_ARCHIVE_HASH_MISMATCH')
if delivery:
fields = delivery[2]
event = contract._json(fields.get('data'))
expected = dict(manifest, event_id=f"daily-flow:{day}:r{report['revision']}",
supersedes_revision=report['supersedes_revision'], component_status=report['component_status'])
if event != expected:
raise ValueError('DAILY_EVENT_COMMIT_MISMATCH')
key = f"broad-funds:report:{day}:r{report['revision']}"
with store.locked(STATE, 'broad_funds_state', initial()) as state:
if audit_key and store.get(audit_key)[0] is not None:
return
store.put_once(key, 'broad_funds_report', {'manifest': manifest, 'snapshot_text': raw.decode('utf-8')})
old = state['days'].get(day, {})
apply = not result['superseded'] and report['revision'] > old.get('revision', -1)
if apply:
state['days'][day] = {'revision': report['revision'], 'key': key,
'component_status': report['component_status'], 'published_at': report['published_at']}
if not state['latest'] or day >= state['latest']:
state['latest'] = day
if audit_key:
store.put_once(audit_key, 'broad_funds_event', {'stream': delivery[0], 'stream_id': delivery[1],
'raw': delivery[2], 'manifest_key': manifest_key, 'applied': apply,
'superseded': result['superseded'], 'received_at': at.isoformat()})
# 只限制状态索引大小,原始快照与事件审计均保留。
state['days'] = {k: state['days'][k] for k in sorted(state['days'])[-100:]}
def consume_once(snapshots=None, events=None, clock=minute.now):
if not param_store.get_bool('PMS_BROAD_DAILY_ENABLED', False):
return {'status': 'disabled'}
snapshots, events = (snapshots, events) if snapshots is not None else minute.clients()
at = clock().astimezone(minute.TZ)
failures, processed = [], 0
# 正式保留期内的月流,固定边界,不扫描整个Redis,也不触碰交易消费组。
months = sorted({(at.date() - timedelta(days=n)).isoformat()[:7] for n in range(91)})
try:
for month in months:
stream = NS + ':events:' + month
if not events.exists(stream):
continue
try:
events.xgroup_create(stream, GROUP, id='0-0')
except Exception as exc:
if 'BUSYGROUP' not in str(exc):
raise
for cursor in ('0-0', '>'):
for _stream, rows in events.xreadgroup(GROUP, minute.CONSUMER, {stream: cursor}, count=100):
for sid, fields in rows:
try:
event = contract._json(fields.get('data'))
day = event['trade_date']
if day[:7] != month:
raise ValueError('DAILY_STREAM_DATE_MISMATCH')
ingest(snapshots, events, event['manifest_key'], day, clock(), (stream, sid, fields))
events.xack(stream, GROUP, sid)
processed += 1
except Exception as exc:
failures.append(type(exc).__name__)
# 即使月流暂缺或某条待补,也核验最新正式提交;没有事实时不沿用旧日冒充今天。
if snapshots.strlen(NS + ':latest'):
pointer = contract._json(contract._read(snapshots, NS + ':latest', 32768))
manifest = contract._json(contract._read(events, pointer['manifest_key'], 32768))
if pointer != manifest:
raise ValueError('DAILY_POINTER_NOT_COMMITTED')
ingest(snapshots, events, pointer['manifest_key'], pointer['trade_date'], clock())
except Exception as exc:
failures.append(type(exc).__name__)
with store.locked(STATE, 'broad_funds_state', initial()) as state:
if failures:
state.update(error=failures[0], last_failure_at=clock().isoformat())
else:
state.update(error=None, last_success_at=clock().isoformat())
return {'status': 'unavailable' if failures else 'ok', 'processed': processed,
'error': failures[0] if failures else None}
def status(clock=minute.now):
if not param_store.get_bool('PMS_BROAD_DAILY_ENABLED', False):
return {'enabled': False, 'trade_instruction': False}
state = store.get(STATE)[0] or initial()
entry = state['days'].get(state['latest'], {})
saved = store.get(entry['key'])[0] if entry.get('key') else None
at = clock()
healthy = bool(state['last_success_at']) and not state['error'] and (
at - datetime.fromisoformat(state['last_success_at'])).total_seconds() <= 180
result = {'enabled': True, 'status': 'ok' if healthy and saved else 'waiting' if healthy else 'unavailable',
'trade_instruction': False, 'last_success_at': state['last_success_at'], 'error': state['error'],
'server_at': at.isoformat(), 'report': None}
if saved:
report = json.loads(saved['snapshot_text'])
# 页面只需市场、指数、行业;完整逐基金事实保存在不可变档案中。
for key in ('etfs', 'cohort'):
report['etf'].pop(key, None)
report.pop('source_observations', None)
for row in report['etf'].get('indexes', []):
row['name'] = INDEX_NAMES.get(row['subject_id']) or row.get('name') or row['subject_id']
result['report'] = report
result['manifest'] = saved['manifest']
return result

View File

@ -72,6 +72,8 @@ def bundle(snapshots, events, key):
def subject_allowed(kind, code):
if kind == 'MARKET':
return code == 'BROAD_ETF'
if kind == 'INDEX' and code == '932000.CSI':
return True
return kind in ('ETF', 'INDEX') and bool(re.fullmatch(r'\d{6}\.(SH|SZ)', str(code)))

View File

@ -47,6 +47,8 @@ def _valid_limit_flag(value):
# 运行态开关: key -> (默认值, 类型, 说明)
RUNTIME_EXTRA = {
"PMS_SIGNAL_FOCUS_ENABLED": (False, bool, "持仓与有效关注共用完整信号读取,不扩大交易资格"),
"PMS_BROAD_DAILY_ENABLED": (False, bool, "接入正式宽基与行业每日资金,仅供观测"),
"PMS_UPSTREAM_DAY_SCAN": (20000, int, "信号流当天每路读取上限,达到上限明确提示"),
"PMS_ETF_OBSERVATION_ENABLED": (False, bool, "接入正式ETF观测,仅展示,不生成交易指令"),
'PMS_RISK_EXIT_ENABLED': (False, bool, '原策略退出纪律:第一次清仓级信号停买,第二次独立信号清仓;买方整体评级下降直接清仓'),
'PMS_RISK_EXIT_START_AT': ('', str, '退出纪律启用时刻,北京时间;只接收此后有效新信号,既有真实停买最多承接第一次'),
@ -616,6 +618,7 @@ _RANGES = {
# 任务会先被 celery 打死 (而且是在已经落了一部分表之后)。
"PMS_UPSTREAM_ALERT_SCAN": (1, 20000), "PMS_UPSTREAM_ALERT_PER_CAT": (1, 1000),
"PMS_UPSTREAM_ALERT_MAX_AGE_MIN": (0, 1440), # 0=不限龄, 上限 24 小时
"PMS_UPSTREAM_DAY_SCAN": (500, 50000),
"PMS_UPSTREAM_BYCODE_SCAN": (100, 50000), # 下限 100 保证至少扫得到一页
# 解锁重问 (2026-09-09)
"PMS_OPEN_REASK_MIN_GAP_MIN": (5, 240), "PMS_OPEN_REASK_MAX_PER_DAY": (0, 5),

View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""上游信号只读快照 (2026-08-12: 只展示、不进任何下单/决策逻辑)。
把三系统盘中信号取最近若干条给页面看:
把三系统当天正式发布的信号分页读全,供页面按原分类浏览:
· 决策系统(bionic) 买卖广播 + 风控卖出动作 —— 208 db2 intraday_signals / db3 llm_sell_actions
· 盘中择时层(intraday_timing) BUY 入场 + 双向风控告警 —— 208 db2 intraday_signals / intraday_alerts
· mtf 资金异动 + 实况分关注/回避榜 —— 208 db2 stream:metrics / 214 db0 mr:board
@ -80,25 +80,16 @@ def _focus_codes():
def _entries(c, key, count):
"""每路统一扫描一次并缓存,不逐股轮询完整上游流。"""
codes = _focus_codes()
if not codes:
return [(sid, row) for sid, row in c.xrevrange(key, count=count) if _entry_code(row)]
cache_key = (key, tuple(sorted(codes)))
_focus_codes()
cache_key = (key, _today_start_ms())
cached = _focused_streams.get(cache_key)
if cached and time.time() - cached['at'] < 30:
return cached['rows']
rows, truncated = _scan_stream(c, key, cap=_bycode_scan(), stop_before_ms=_today_start_ms())
result, per_code = [], {}
for i, (sid, fields) in enumerate(rows):
code = _entry_code(fields)
if not code:
continue
selected = code in codes and per_code.get(code, 0) < 60
if i < count or selected:
result.append((sid, fields))
if selected:
per_code[code] = per_code.get(code, 0) + 1
_focused_streams[cache_key] = {'at': time.time(), 'rows': result, 'truncated': truncated}
cap = max(500, min(50000, param_store.get_int('PMS_UPSTREAM_DAY_SCAN', 20000)))
rows, truncated = _scan_stream(c, key, cap=cap, stop_before_ms=_today_start_ms())
result = [(sid, fields) for sid, fields in rows if _entry_code(fields)]
_focused_streams[cache_key] = {'at': time.time(), 'rows': result, 'truncated': truncated,
'scanned': len(rows), 'eligible': len(result)}
for old in list(_focused_streams):
if old != cache_key and time.time() - _focused_streams[old]['at'] > 60:
del _focused_streams[old]
@ -228,12 +219,9 @@ _ALERT_META = {
def _read_alerts(c, ymd):
key = "intraday_alerts:%s" % ymd
per_cat = _alert_per_cat()
max_age = _alert_max_age_sec() # 秒; 0=不限龄。超龄不删, 只标 stale 供页面置灰。
now = time.time()
counts = {} # cat -> 已收数量; 每类只留最新 per_cat 条(仍按 newest-first)
out = []
focused = _focus_codes()
for _id, f in _entries(c, key, _alert_scan()):
src = str(f.get("source") or "")
meta = f.get("metadata")
@ -243,8 +231,6 @@ def _read_alerts(c, ymd):
except Exception:
meta = {}
dir_fixed, cat, cat_label = _ALERT_META.get(src, (None, "other", "其他"))
if counts.get(cat, 0) >= per_cat and _norm_code(f.get('ts_code')) not in focused: # 该类已满 → 跳过, 高频源不挤掉别的类
continue
if dir_fixed is None:
# multi_source 或未登记源: 方向以 metadata.direction 为准, 拿不到就 —
mdir = str((meta or {}).get("direction") or "").lower()
@ -259,8 +245,6 @@ def _read_alerts(c, ymd):
except (TypeError, ValueError):
age_sec, age_min = None, None
stale = bool(max_age) and age_sec is not None and age_sec > max_age
if _norm_code(f.get('ts_code')) not in focused:
counts[cat] = counts.get(cat, 0) + 1
out.append({"id": _id, "ts_code": f.get("ts_code"), "source": src, "direction": d,
"cat": cat, "cat_label": cat_label,
"level": f.get("level"), "value": _num(f.get("value")),
@ -337,7 +321,7 @@ def _read_mr(c):
key = "mtf:mr:intraday:board"
top = c.zrevrange(key, 0, 9, withscores=True)
bottom = c.zrange(key, 0, 9, withscores=True)
fmt = lambda pairs: [{"ts_code": k, "score": round(float(v), 3)} for k, v in pairs]
fmt = lambda pairs: [{"ts_code": k, "score": round(float(v), 3)} for k, v in pairs if _entry_code({"ts_code": k})]
return {"key": key, "watch": fmt(top), "avoid": fmt(bottom)}
@ -364,6 +348,8 @@ def snapshot(force: bool = False) -> dict:
_try("sell_actions", lambda: _read_sell_actions(_c208(dba)))
_try("mr", lambda: _read_mr(_c214()))
out['coverage'] = {key[0]: {k: v[k] for k in ('truncated', 'scanned', 'eligible')}
for key, v in _focused_streams.items() if key[1] == _today_start_ms()}
if param_store.get_bool('PMS_SIGNAL_FOCUS_ENABLED', False):
out['focus'] = {'count': len(_focus_cache['codes']), 'error': _focus_cache['error'],
'truncated': any(v['truncated'] for v in _focused_streams.values())}
@ -620,7 +606,7 @@ def _bycode_metrics(c, code, cap):
def by_code(ts_code: str, force: bool = False) -> dict:
"""一只票今天的全部上游信号。点击触发, 不进任何轮询。"""
code = _norm_code(ts_code)
if not code:
if not _entry_code({"ts_code": code}):
return {"ok": False, "error": "认不出的股票代码: %s" % ts_code, "timeline": [],
"snapshot": {"metrics": [], "mr": {"watch": None, "avoid": None}}}
six = _code6(code)

View File

@ -894,6 +894,12 @@ def api_upstream_signals():
return ok(upstream_signals.snapshot)
@app.get("/api/broad/funds")
def api_broad_funds():
from app.services import broad_funds
return ok(broad_funds.status)
@app.get("/api/etf/observation")
def api_etf_observation():
"""读取本实例已验证的ETF观测,不发任务或交易命令。"""

View File

@ -593,6 +593,10 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
@media(max-width:640px){.plan-add-panel{padding:14px}.plan-user-top{gap:6px}.plan-user-item{padding:10px}.plan-add-actions .el-button{flex:1}}
.etf-total{display:flex;align-items:baseline;gap:5px;margin:12px 0}.etf-total b{font-size:25px;font-weight:650}.etf-stats{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:12px;margin:16px 0}.etf-stats b{font-size:22px;font-weight:650}.etf-stats small{display:block;color:var(--muted);font-size:11px}.etf-events{margin-top:12px;border-top:1px solid var(--hair)}.etf-event{padding:12px 0;display:flex;align-items:center;gap:8px;border-bottom:1px solid var(--hair);font-size:12px}.etf-event .etf-name{flex:1;min-width:0;border:0;background:none;text-align:left;cursor:pointer;font:inherit}.etf-event small{display:block;font-size:11px;color:var(--muted)}.etf-note{font-size:11.5px;color:var(--muted);line-height:1.8;margin:12px 0}.etf-selected{border:1px solid var(--hair);border-radius:8px;padding:12px;margin:12px 0}.etf-selected dt{color:var(--muted)}.etf-selected dd{margin:0 0 9px}.etf-bars{display:flex;gap:8px;align-items:flex-end;height:85px;margin:8px 0 20px;border-bottom:1px solid var(--hair)}.etf-bar{flex:1;position:relative;background:#80a6dc;min-width:0}.etf-bar span{position:absolute;bottom:-18px;font-size:9px;left:50%;transform:translateX(-50%);color:var(--muted)}.etf-bar i{position:absolute;bottom:100%;font:10px inherit;left:50%;transform:translateX(-50%);color:var(--muted)}.etf-drawer{width:min(580px,100vw)}.hd .hd-etf{cursor:pointer;border:0;font-family:inherit}.etf-bar.missing{background:none;border-bottom:1px dashed var(--muted)}.etf-missing{border:1px dashed var(--muted)!important;background:none!important;color:var(--muted)!important}.signal-flow .disp.etf-state{font-size:10px;padding:1px 4px}.signal-flow .nm.etf-name{font-size:11.5px}.sigrow2.etf-flow{gap:2.5px;font-size:12px}.sigrow2.etf-flow .cat{font-size:11px}.sigrow2.etf-flow .t{font-size:10.5px}.sig-observe{color:var(--accent);background:var(--accent-bg,#ecf3fd)}
@media(max-width:600px){.hd-tags>.hst.hd-etf{display:inline-flex}.etf-stats{gap:6px}.etf-stats b{font-size:19px}}
/* 宽基每日观测沿用原顶部提示、右侧抽屉与红绿资金方向。 */
.broad-chip{white-space:nowrap;gap:3px}.broad-chip b{margin:0 4px;font-variant-numeric:tabular-nums}.broad-chip-date{font-weight:400;opacity:.8}.broad-popover{width:370px;max-width:calc(100vw - 46px)}.broad-amount{display:flex;align-items:baseline;gap:6px;margin:16px 0 20px}.broad-amount strong{font-size:29px;font-weight:650;line-height:1.3;font-variant-numeric:tabular-nums}.broad-pop-footer{text-align:right;border-top:1px solid var(--hair);padding-top:10px;margin-top:10px}.broad-pop-footer button{border:0;background:none;font-size:12px}.broad-chart svg{display:block;width:100%;height:auto}.broad-chart text{font-size:10px;fill:var(--muted);font-family:inherit}.broad-badge{display:inline-block;padding:2px 7px;border-radius:7px;background:#f2f3f1;color:var(--muted);font-size:11px;white-space:nowrap}.broad-gold{background:#fbf4e2!important;color:#9a792c!important}.broad-neutral{background:#edf3fb;color:#4e7daf}.broad-chip.broad-neutral{background:#edf3fb;color:#4e7daf}.broad-drawer{max-width:100vw}.broad-drawer .el-drawer__header{margin-bottom:0;padding:18px 22px;border-bottom:1px solid var(--hair);color:var(--ink)}.broad-drawer .el-drawer__title{font-size:16px;font-weight:650}.broad-drawer .el-drawer__body{padding:18px 22px;font-size:12px}.broad-tabs{display:flex;gap:22px;border-bottom:1px solid var(--hair);margin-bottom:19px}.broad-tabs button{border:0;background:none;padding:0 0 10px;color:var(--muted);font-size:14px;cursor:pointer}.broad-tabs .on{color:var(--ink);border-bottom:2px solid var(--ink);font-weight:650}.broad-heading{display:flex;justify-content:space-between;align-items:center;gap:8px;font-size:13px;margin:18px 0 8px}.broad-heading:first-child{margin-top:0}.broad-heading .muted{font-size:11px;font-weight:400}.broad-sub{font-size:11px}.broad-periods{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:10px}.broad-periods button{border:1px solid var(--hair);background:#fafaf8;border-radius:8px;text-align:left;padding:12px 10px;cursor:pointer}.broad-periods button.on{border-color:#9eafc0;background:#f6f8fb}.broad-periods small{display:block;color:var(--muted);font-size:11px}.broad-periods strong{display:block;font-size:21px;margin:7px 0 8px;font-weight:600;font-variant-numeric:tabular-nums}.broad-seg{display:flex;gap:2px;background:#f3f3f0;border-radius:6px;padding:2px}.broad-seg button{padding:4px 8px;background:none;border:0;border-radius:4px;font-size:11px;color:var(--muted);cursor:pointer}.broad-seg button.on{background:white;color:var(--ink);box-shadow:0 1px 3px #0001}.broad-table{width:100%;border-collapse:collapse;font-size:12px;font-variant-numeric:tabular-nums}.broad-table th{font-weight:500;color:var(--muted);font-size:11px;background:#fafaf8}.broad-table th,.broad-table td{padding:10px 7px;text-align:right;border-bottom:1px solid var(--hair);white-space:nowrap}.broad-table th:first-child,.broad-table td:first-child{text-align:left}.broad-table .selected{background:#f3f6fa}.broad-table .lnk,.broad-rank .lnk{border:0;background:none;color:inherit;font:inherit;padding:0;cursor:pointer}.broad-table .lnk{text-decoration:underline dotted;text-underline-offset:3px}.broad-foot{font-size:11px;color:var(--muted);line-height:1.8;margin-top:18px;border-top:1px solid var(--hair);padding-top:12px}.broad-notice,.broad-basis{padding:10px 12px;border-radius:7px;background:#f6f6f2;color:#78776e;line-height:1.6;margin-bottom:12px}.broad-counts{display:flex;gap:8px;flex-wrap:wrap;margin:13px 0 8px}.broad-in{background:#fcf0ed;color:var(--up)}.broad-out{background:#eef5f0;color:var(--down)}.broad-countbar{height:6px;display:flex;border-radius:5px;overflow:hidden;background:#eee;margin-bottom:14px}.broad-countbar i:first-child{background:#df9b90}.broad-countbar i:last-child{background:#9bbca5}.broad-ranks{display:grid;grid-template-columns:1fr 1fr;gap:22px;margin-bottom:20px}.broad-ranks h4{font-size:12px;margin:8px 0;color:var(--muted);font-weight:500}.broad-rank{display:flex;gap:7px;align-items:center;margin:12px 0;font-size:11px}.broad-rank button{min-width:60px;text-align:left;white-space:nowrap}.broad-track{height:8px;flex:1;background:#f4f4f0;border-radius:3px;overflow:hidden}.broad-track i{height:100%;display:block}.broad-track .positive{background:#e5a098}.broad-track .negative{background:#94b8a0}.broad-rank>span{min-width:48px;text-align:right}.broad-sector-detail{padding:13px 14px;background:#fafaf8;border:1px solid var(--hair);border-radius:9px}.broad-sector-detail .broad-heading{margin-top:0}.broad-search{width:145px;border:1px solid var(--hair);padding:6px 9px;border-radius:6px;font-size:12px;background:white}.broad-allrows{max-height:400px;overflow:auto}.broad-empty{padding:25px 0;text-align:center;color:var(--muted)}.sig-more{display:block;margin:8px auto;border:0;background:none;color:var(--muted);font-size:11px;cursor:pointer}
@media(max-width:600px){.hd-tags{flex-wrap:wrap;overflow:visible;row-gap:5px}.broad-drawer .el-drawer__header{padding:15px}.broad-drawer .el-drawer__body{padding:15px}.broad-periods{gap:6px}.broad-periods button{padding:10px 7px}.broad-periods strong{font-size:18px}.broad-ranks{grid-template-columns:1fr;gap:3px}.broad-table th,.broad-table td{padding:9px 4px;font-size:11px}.broad-table .broad-badge{font-size:10px;padding:2px 4px}.broad-heading{flex-wrap:wrap}.broad-search{max-width:130px}.broad-chip{font-size:11px!important}}
</style>
</head>
<body>
@ -672,20 +676,18 @@ 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="etf.enabled" placement="bottom" effect="light" :show-after="200" :enterable="true">
<template #content><div class="market-popover etf-popover">
<div class="trend-heading"><b>宽基ETF观测</b><span>仅观测</span></div>
<div class="trend-meta"><span>{{ etfTime(etfSummary.window_end) }}窗口 · {{ etfTime(etfSummary.published_at) }}更新</span><span>{{ etfStatusText }}</span></div>
<div class="etf-total"><b>{{ etfLive ? etfAmount(etfFacts.cumulative_amount) : '—' }}</b><span class="muted">亿元 · 今日累计</span></div>
<div class="trend-meta"><span>相当于常日 <b>{{ etfLive ? etfRatio(etfFacts.cumulative_to_full_day_median20) : '—' }}</b></span><span>本窗 <b>{{ etfLive ? etfAmount(etfFacts.amount) : '—' }}</b> 亿元</span></div>
<div class="trend-section"><div class="trend-heading"><b>十五分钟成交额</b><span>亿元</span></div>
<div class="etf-bars"><div v-for="bar in etfBars" :key="bar.key" class="etf-bar" :class="{missing:bar.missing}" :style="{height:bar.height+'px'}" :title="bar.title"><i>{{ bar.value }}</i><span>{{ bar.time }}</span></div></div>
</div>
<div class="trend-foot">{{ etfOverall }} · 当前异动{{ etfActiveCount }}项</div>
<div class="trend-foot">常日基准:前20个完整交易日全日中位数</div>
<div class="trend-meta"><span>阈值待校准</span><button class="tbtn" @click="openEtf()">查看明细 ›</button></div>
<el-tooltip v-if="broad.enabled" placement="bottom" effect="light" :show-after="200" :enterable="true" :disabled="broadOpen">
<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>
<div class="broad-pop-footer"><button class="lnk" @click="openBroad">查看资金与行业 ›</button></div>
</div></template>
<button class="hst hd-etf" :class="etfLive?'ok':'etf-missing'" @click="openEtf()">ETF {{ etfChipText }}</button>
<button class="hst hd-etf broad-chip" :class="broadMarket.latest?.net_flow_yuan==null?'etf-missing':broadTail(broadMarket.reference)" @click="openBroad" title="每日净申购估算与当日历史分位">
宽基 <span class="broad-chip-date">{{ broadShortDate }}</span> <b :class="broadColor(broadMarket.latest?.net_flow_yuan)">{{ broadMarket.latest?.net_flow_yuan==null?'待补':broadAmount(broadMarket.latest.net_flow_yuan)+'亿' }}</b> <span v-if="broadMarket.reference?.percentile!=null">分位{{ Number(broadMarket.reference.percentile).toFixed(1) }}%</span>
</button>
</el-tooltip>
<span class="hst" :class="dm.shadow?'idle':'ok'" v-show="mode==='ops'" title="下发模式。实盘=真的发到 QMT 下单;影子=只记录,不真下单,用来观察。">下发 {{ dm.mode || '-' }}</span>
</div>
@ -700,7 +702,6 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
<el-dropdown-menu>
<el-dropdown-item v-if="isAdmin" command="view">切换到{{ mode==='ops' ? '交易员' : '运维' }}视图</el-dropdown-item>
<el-dropdown-item command="plan" :divided="isAdmin">选股计划</el-dropdown-item>
<el-dropdown-item command="report">日报</el-dropdown-item>
<el-dropdown-item command="rotation">策略轮换</el-dropdown-item>
<el-dropdown-item v-if="authed" command="export" title="按公司《量化数据》模板导出当日持仓、平仓与净值(系统接管后的数据)">导出持仓表</el-dropdown-item>
<el-dropdown-item v-if="isAdmin && mode==='ops'" command="ops">运维操作</el-dropdown-item>
@ -826,7 +827,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
<aside class="rail" id="railL" :class="{open:railOpen==='l'}">
<div class="rail-h">
<span class="ttl">信号流</span>
<span class="cnt">今天 {{ sigBriefHeld.length + sigBriefOther.length }} 条 · 持仓 {{ sigBriefHeldCount }}</span>
<span class="cnt">今天 {{ sigToday.length }} 条 · 持仓 {{ sigBriefHeldCount }}</span>
<div class="spacer"></div>
<button class="iconbtn" title="刷新信号" @click="refreshSignalView">↻</button>
<button class="iconbtn btn-pull" title="放大成浮层" @click="openRailSide('l',true)">⤢</button>
@ -848,9 +849,11 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
<span class="help" data-tip="点一下可以把这一档的信号收起来或放出来。级别说的是信号有多强,不是看涨看跌。">?</span>
</div>
<!-- 速览: 持仓和用户关注合并置顶, 其余只收重要和警告 -->
<!-- 速览:当天原始信号按持仓与关注置顶,级别仅由用户筛选。 -->
<template v-if="sigTab==='brief'">
<div class="sig-fail" v-if="flowCoverageIncomplete">当天信号达到读取上限,早盘记录可能尚未完整。</div>
<div class="sig-fail" v-if="upstream.focus && (upstream.focus.error || upstream.focus.truncated)">{{ upstream.focus.error || '信号回扫达到上限,部分早盘记录可能不完整' }}</div>
<div class="sig-fail" v-if="srcFail('sell_actions')">决策系统卖出信号读取失败,不能当作没有信号。</div>
<div class="sig-fail" v-if="srcFail('metrics')">资金观测读取失败,不能当作没有信号。</div>
<div class="sig-fail" v-if="srcFail('alerts') || srcFail('intraday')">
上游信号读不到({{ (srcFail('alerts')||srcFail('intraday')).error }})。
@ -868,6 +871,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
<span v-else-if="g.flowKind==='metrics'" class="disp wait">观测</span>
<span v-else-if="g.level" class="disp" :class="lvClass(g.level)">{{ lvLabel(g.level) }}</span>
</div>
<button class="sig-more" v-if="flowTotals.primary>sigBriefHeld.length" @click="flowShown.primary+=60">显示更多 · {{ sigBriefHeld.length }}/{{ flowTotals.primary }}</button>
<div class="muted" v-if="sigBriefOther.length"
style="margin:10px 0 5px;font-weight:600;font-size:11.5px;border-top:1px dashed var(--hair);padding-top:8px">
其他信号</div>
@ -882,6 +886,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
<span v-else-if="g.flowKind==='metrics'" class="disp wait">观测</span>
<span v-else-if="g.level" class="disp" :class="lvClass(g.level)">{{ lvLabel(g.level) }}</span>
</div>
<button class="sig-more" v-if="flowTotals.other>sigBriefOther.length" @click="flowShown.other+=60">显示更多 · {{ sigBriefOther.length }}/{{ flowTotals.other }}</button>
<div v-if="sigToday.some(g=>g.stale)" class="muted" style="margin-top:9px;font-size:11.5px">
淡色信号已过时,仅供回顾。</div>
</template>
@ -904,7 +909,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
</template>
<div v-if="sigTab!=='brief' && etf.enabled" class="srcgroup">
<div class="srch" @click="openEtf()">ETF观测 <span class="n">· {{ etfActiveCount }}项</span><span class="sp"></span><span>查看明细 ›</span></div>
<div class="srch" @click="openEtf()">宽基观测 <span class="n">· {{ etfActiveCount }}项</span><span class="sp"></span><span>查看明细 ›</span></div>
</div>
<!-- 按来源: 原来的「完整信号中心」搬到这里, 就地展开不跳转 -->
<template v-if="sigTab!=='brief'">
@ -2435,7 +2440,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
<teleport to="body"><div v-if="etfOpen">
<div class="cs-scrim" @click="etfOpen=false"></div>
<aside class="cs-drawer etf-drawer" role="dialog" aria-label="ETF观测详情" aria-modal="true">
<div class="cs-h"><span class="ttl">ETF观测</span><span class="sp" style="flex:1"></span><button class="iconbtn" @click="etfOpen=false" title="关闭ETF详情">✕</button></div>
<div class="cs-h"><span class="ttl">宽基观测</span><span class="sp" style="flex:1"></span><button class="iconbtn" @click="etfOpen=false" title="关闭ETF详情">✕</button></div>
<div class="cs-b">
<div class="trend-heading"><b>宽基ETF量能</b><span>仅观测 · 阈值待校准</span></div>
<p class="etf-note">{{ etfSummary.trade_date || '—' }} · {{ etfTime(etfSummary.window_end) }}窗口 · {{ etfTime(etfSummary.published_at) }}发布<br>{{ etfStatusText }};最后成功读取 {{ etfTime(etf.last_success_at) }}</p>
@ -2449,7 +2454,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
</section>
<div class="trend-heading"><b>个别异动</b><span>当前{{ etfActiveCount }}项 · 当日{{ etfRows.length }}项记录</span></div>
<div class="etf-events"><div v-for="row in etfRows" :key="row.event_id" class="etf-event" :class="{muted:row.stale}">
<span class="pin plan">{{ row.subject_type==='INDEX'?'指数':row.subject_type==='MARKET'?'市场':'ETF' }}</span>
<span class="pin plan">{{ row.subject_type==='INDEX'?'指数':row.subject_type==='MARKET'?'市场':'宽基' }}</span>
<button class="etf-name" @click="etfSelected=row"><b>{{ row.full_name }}</b><small>{{ row.subject_id }} · {{ row.scope==='SESSION_CUM'?'日内累计量能':'十五分钟量能' }}</small></button>
<span :class="etfDirectionClass(row)">{{ etfCaption(row) }}</span><span class="disp" :class="row.stale?'wait':'strong'">{{ etfStateText(row.display_state) }}</span>
</div></div>
@ -2647,7 +2652,6 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
<el-button @click="ops('reconcile')" :loading="opsLoading">账本对账</el-button>
<el-button @click="ops('premarket')" :loading="opsLoading">盘前准备</el-button>
<el-button @click="ops('daily-settle')" :loading="opsLoading">日终结算</el-button>
<el-button @click="ops('report')" :loading="opsLoading">生成日报</el-button>
<el-button @click="loadSchema" :loading="opsLoading">导出下游表结构</el-button>
</div>
<div class="row" style="margin-top:8px" v-if="(wsc||{}).resync_required">
@ -2914,19 +2918,38 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
<pre class="json" v-if="planResult">{{ planResult }}</pre>
</el-drawer>
<!-- 日报抽屉 -->
<el-drawer v-model="reportDrawer" :title="'运营日报 ' + (report.ymd||'')" size="52%">
<div v-if="(report.report||{}).attention">
<h3 style="color:#409EFF;font-size:14px">关注区</h3>
<el-table :data="report.report.attention" size="small" border>
<el-table-column prop="type" label="事项" width="130"></el-table-column>
<el-table-column label="内容">
<template #default="s"><span class="mono muted">{{ JSON.stringify(s.row) }}</span></template>
</el-table-column>
</el-table>
</div>
<pre class="json">{{ JSON.stringify(report.report||{}, null, 2) }}</pre>
<el-drawer v-model="broadOpen" class="broad-drawer" size="690px" :title="'每日资金观测 · '+broadDate" :z-index="3100">
<nav class="broad-tabs"><button :class="{on:broadTab==='market'}" @click="broadTab='market'">宽基资金</button><button :class="{on:broadTab==='industry'}" @click="broadTab='industry'">行业资金</button></nav>
<div v-if="broad.status==='unavailable'" class="broad-notice">更新暂不可用,以下保留 {{ broadDate }} 已核验的数据。</div>
<div v-if="!broad.report" class="broad-empty">每日资金数据待补齐。</div>
<template v-else-if="broadTab==='market'">
<div class="broad-heading"><b>宽基净申购估算</b><span class="broad-badge" :class="broadTail(broadMarket.reference)">{{ broadRef(broadMarket.reference) }}</span></div>
<div class="muted broad-sub">{{ broadDate }} · {{ broadIndexes.length }}类宽基指数</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 v-if="broadMarket.latest?.net_flow_yuan==null" class="broad-notice">当日份额与净值尚未完整,净申购估算待补。</div>
<div class="broad-heading"><b>阶段累计</b><span class="muted">截至{{ broadShortDate }} · 亿元</span></div>
<div class="broad-periods"><button v-for="d in [5,20,60]" :key="d" :class="{on:broadDays===d}" @click="broadDays=d"><small>近{{ d }}个交易日</small><strong :class="broadColor(broadMetric(broadMarket,d).net_flow_yuan)">{{ broadAmount(broadMetric(broadMarket,d).net_flow_yuan) }}</strong><span class="broad-badge" :class="broadTail(broadMetric(broadMarket,d).reference)">{{ broadRef(broadMetric(broadMarket,d).reference) }}</span></button></div>
<div class="broad-heading"><b>每日净申购变化</b><div class="broad-seg"><button v-for="d in [5,20,60]" :class="{on:broadDays===d}" @click="broadDays=d">近{{ d }}日</button></div></div>
<div class="broad-chart" v-html="broadChart(broadMarket,broadDays)"></div>
<div class="broad-heading"><b>宽基指数对比</b><span class="muted">所跟踪基金合计 · 亿元</span></div>
<table class="broad-table"><thead><tr><th>指数</th><th>当日</th><th>近5日</th><th>近20日</th></tr></thead><tbody><tr v-for="s in broadIndexes" :key="s.subject_id"><td>{{ s.name }}</td><td v-for="p in [1,5,20]" :key="p" :class="broadColor(broadMetric(s,p).net_flow_yuan)">{{ broadAmount(broadMetric(s,p).net_flow_yuan) }}</td></tr></tbody></table>
<div class="broad-foot">净申购估算根据份额变化及净值计算,不等于股票市场资金净流入。<br>极端区间仅作历史参考;样本不足时不判断极端。</div>
</template>
<template v-else>
<div class="broad-heading"><b>行业资金流向</b><span class="muted">{{ broadDate }}</span></div>
<div class="muted broad-sub">同花顺行业资金净额 · 单位:亿元</div>
<div class="broad-counts"><span class="broad-badge broad-in">{{ broadSectorCounts.positive }}个行业净流入</span><span class="broad-badge broad-out">{{ broadSectorCounts.negative }}个行业净流出</span><span v-if="broadSectorCounts.missing" class="broad-badge">{{ broadSectorCounts.missing }}个待补</span></div>
<div class="broad-countbar"><i :style="{width:broadSectorCounts.inWidth+'%'}"></i><i :style="{width:broadSectorCounts.outWidth+'%'}"></i></div>
<div class="broad-basis">与宽基净申购是两种独立口径,分别观察,不相加。</div>
<div class="broad-heading"><b>{{ broadPeriod===1?'当日':'近'+broadPeriod+'日' }}流入流出</b><div class="broad-seg"><button v-for="p in [1,5,20,60]" :class="{on:broadPeriod===p}" @click="broadPeriod=p">{{ p===1?'当日':'近'+p+'日' }}</button></div></div>
<div class="broad-ranks"><div v-for="group in broadRanks" :key="group.title"><h4>{{ group.title }}</h4><div v-for="s in group.rows" :key="s.subject_id" class="broad-rank"><button class="lnk" @click="broadSectorId=s.subject_id">{{ s.name }}</button><div class="broad-track"><i :class="broadMetric(s,broadPeriod).net_flow_yuan>0?'positive':'negative'" :style="{width:Math.abs(broadMetric(s,broadPeriod).net_flow_yuan)/broadRankMax*100+'%'}"></i></div><span :class="broadColor(broadMetric(s,broadPeriod).net_flow_yuan)">{{ broadAmount(broadMetric(s,broadPeriod).net_flow_yuan) }}</span></div><div v-if="!group.rows.length" class="muted">暂无</div></div></div>
<div v-if="broadSelected" class="broad-sector-detail"><div class="broad-heading"><b>{{ broadSelected.name }}</b><span class="broad-badge" :class="broadTail(broadMetric(broadSelected,broadPeriod).reference)">{{ broadRef(broadMetric(broadSelected,broadPeriod).reference) }}</span></div><div>净额 <b :class="broadColor(broadMetric(broadSelected,broadPeriod).net_flow_yuan)">{{ broadAmount(broadMetric(broadSelected,broadPeriod).net_flow_yuan) }}亿元</b><span class="muted"> · {{ broadPeriod===1?'当日':'近'+broadPeriod+'日' }}</span></div><div class="broad-chart" v-html="broadChart(broadSelected,20)"></div><small class="muted">近20个交易日 · 每日净额</small></div>
<div class="broad-heading"><b>行业与阶段对比</b><input v-model="broadSearch" class="broad-search" placeholder="搜索行业" aria-label="搜索行业" type="search"></div>
<div class="broad-allrows"><table class="broad-table"><thead><tr><th>行业</th><th>{{ broadPeriod===1?'当日':'近'+broadPeriod+'日' }}净额 ↓</th><th>近{{ broadPeriod===20?5:20 }}日</th><th>历史分位</th></tr></thead><tbody><tr v-for="s in broadSectorRows" :key="s.subject_id" :class="{selected:s.subject_id===broadSelected?.subject_id}"><td><button class="lnk" @click="broadSectorId=s.subject_id">{{ s.name }}</button></td><td :class="broadColor(broadMetric(s,broadPeriod).net_flow_yuan)">{{ broadAmount(broadMetric(s,broadPeriod).net_flow_yuan) }}</td><td :class="broadColor(broadMetric(s,broadPeriod===20?5:20).net_flow_yuan)">{{ broadAmount(broadMetric(s,broadPeriod===20?5:20).net_flow_yuan) }}</td><td><span class="broad-badge" :class="broadTail(broadMetric(s,broadPeriod).reference)">{{ broadRef(broadMetric(s,broadPeriod).reference) }}</span></td></tr></tbody></table></div>
<div class="broad-foot">点击行业查看趋势。各行业与自身历史比较,不推断行业之间的直接资金转移。</div>
</template>
</el-drawer>
</div>
<script>
@ -3015,7 +3038,7 @@ createApp({
total_qty:0, avail_qty:0, cushion_pct:null, type:'T0', autonomy:'auto',
p:{ t_ratio:0.2, lower:0, upper:0, center:0, step_pct:0.02, per_lot:100, max_capital:0,
start_line:0.03, giveback:0.05, sell_ratio:1.0, hard_target:0 } });
const report = ref({}), reportDrawer = ref(false), dm = ref({});
const dm = ref({});
const opsDrawer = ref(false), opsResult = ref(''), opsLoading = ref(false);
// 上游选股计划: 单独取数, 不塞进 /api/overview —— overview 是轮询的, 上游不通时
// 会把 10 秒超时拖进每一次页面刷新。
@ -4388,7 +4411,7 @@ createApp({
const flowSort = rows => rows.sort((a,b)=>flowStamp(b)-flowStamp(a));
const flowTime = row => row.ymd && row.ymd!==flowDay()
? row.ymd.slice(5)+' '+(hm(row.time)||'—') : (hm(row.time)||'—');
const flowLabel = row => row.flowKind==='etf' ? (row.subject_type==='INDEX'?'指数':row.subject_type==='MARKET'?'市场':'ETF') : (row.held ?? heldCodeSet.value.has(code6(row.ts_code))) ? '持仓' :
const flowLabel = row => row.flowKind==='etf' ? (row.subject_type==='INDEX'?'指数':row.subject_type==='MARKET'?'市场':'宽基') : (row.held ?? heldCodeSet.value.has(code6(row.ts_code))) ? '持仓' :
(row.watched ?? watchedCodeSet.value.has(code6(row.ts_code))) ? '关注' :
(row.plan ?? planCodeSet.value.has(code6(row.ts_code))) ? '计划' : '';
// 关注只扩大原信号的归类范围;研究观察、完成回执和等待状态不生成信号行。
@ -4397,7 +4420,6 @@ createApp({
const out = [];
for (const a of alertItems.value) {
const isHeld = held.has(code6(a.ts_code));
if (!isHeld && !watchedCodeSet.value.has(code6(a.ts_code)) && !['DANGER', 'WARNING'].includes(normLv(a.level))) continue;
out.push({ ...a, flowKind:'alerts', ts_code: a.ts_code, time: a.time || '', cat: a.cat_label || a.cat,
direction: a.direction, level: a.level, held: isHeld, stale: a.stale });
}
@ -4415,13 +4437,12 @@ createApp({
direction: '买入', level: 'INFO', held: held.has(code6(r.ts_code)) });
if(showObservations.value){
for(const r of s.metrics||[]){
if(!held.has(code6(r.ts_code)) && !watchedCodeSet.value.has(code6(r.ts_code)))continue;
if(!['inflow','outflow'].includes(r.direction) || !r.ts)continue;
out.push({...r,flowKind:'metrics',cat:'资金异动',direction:flowText(r.direction),level:null,
held:held.has(code6(r.ts_code)),sortAt:r.ts});
}
for(const r of etfRows.value)out.push({...r,flowKind:'etf',ts_code:r.subject_id,time:etfTime(r.published_at),
ymd:r.trade_date,today:r.trade_date===flowDay(),sortAt:Date.parse(r.published_at),cat:'ETF观测',
ymd:r.trade_date,today:r.trade_date===flowDay(),sortAt:Date.parse(r.published_at),cat:'宽基观测',
direction:etfCaption(r),level:null,held:false,watched:false,plan:false});
}
const inPlan = planCodeSet.value;
@ -4683,7 +4704,7 @@ createApp({
}));
const etfSelected=computed({get:()=>etfRows.value.find(r=>r.event_id===etfSelectedId.value)||null,set:r=>{etfSelectedId.value=r?r.event_id:null;}});
const etfActiveCount=computed(()=>etfRows.value.filter(r=>!r.stale).length);
const observationCount=computed(()=>etfRows.value.length+(SIG.value.metrics||[]).filter(r=>heldCodeSet.value.has(code6(r.ts_code))||watchedCodeSet.value.has(code6(r.ts_code))).length);
const observationCount=computed(()=>etfRows.value.length+(SIG.value.metrics||[]).length);
const etfStatusText=computed(()=>etf.value.status==='unavailable'?'读取失败':etfSummary.value.session_closed?'已收盘':etfLive.value?'有效至'+etfTime(etfSummary.value.valid_until):etfSummary.value.valid_until?'已过期':'等待数据');
const etfChipText=computed(()=>etf.value.status==='unavailable'?'读取失败':etfLive.value?'累计'+etfRatio(etfFacts.value.cumulative_to_full_day_median20):etfStatusText.value);
const etfOverall=computed(()=>!etfSummary.value.market?'暂无整体读数':!etfLive.value?'历史观测,仅供回看':
@ -4705,6 +4726,44 @@ createApp({
etfClock.value=Date.now()+etfOffset;
}else etf.value={...etf.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||'待补');
const broadShortDate=computed(()=>broad.value.report?.trade_date?.slice(5).replace('-','/')||'');
const broadAmount=v=>v==null||!Number.isFinite(Number(v))?'—':(Number(v)>0?'+':'')+(Number(v)/1e8).toLocaleString('zh-CN',{minimumFractionDigits:2,maximumFractionDigits:2});
const broadColor=v=>v==null||Number(v)===0?'muted':Number(v)>0?'clr-up':'clr-down';
const broadTail=r=>['INFLOW_TOP_5PCT','OUTFLOW_BOTTOM_5PCT'].includes(r?.tail)?'broad-gold':'broad-neutral';
const broadRef=r=>r?.tail==='INSUFFICIENT_REFERENCE'?'样本不足':r?.percentile==null?'待补':'历史分位 '+Number(r.percentile).toFixed(1)+'%';
const broadMetric=(s,p)=>Number(p)===1?{...(s?.latest||{}),reference:s?.reference}:(s?.periods?.[String(p)]||{});
const broadIndexes=computed(()=>[...(broad.value.report?.etf?.indexes||[])].sort((a,b)=>(b.latest?.net_flow_yuan??-Infinity)-(a.latest?.net_flow_yuan??-Infinity)));
const broadSectors=computed(()=>broad.value.report?.industry?.sectors||[]);
const broadSectorSorted=computed(()=>[...broadSectors.value].sort((a,b)=>(broadMetric(b,broadPeriod.value).net_flow_yuan??-Infinity)-(broadMetric(a,broadPeriod.value).net_flow_yuan??-Infinity)));
const broadSectorRows=computed(()=>broadSectorSorted.value.filter(s=>(s.name||s.subject_id).includes(broadSearch.value.trim())));
const broadSelected=computed(()=>broadSectors.value.find(s=>s.subject_id===broadSectorId.value)||broadSectorSorted.value[0]||null);
const broadRanks=computed(()=>[{title:'净流入前三',rows:broadSectorSorted.value.filter(s=>broadMetric(s,broadPeriod.value).net_flow_yuan>0).slice(0,3)},
{title:'净流出前三',rows:broadSectorSorted.value.filter(s=>broadMetric(s,broadPeriod.value).net_flow_yuan<0).reverse().slice(0,3)}]);
const broadRankMax=computed(()=>Math.max(1,...broadSectors.value.map(s=>Math.abs(broadMetric(s,broadPeriod.value).net_flow_yuan||0))));
const broadSectorCounts=computed(()=>{const a=broadSectors.value.map(s=>broadMetric(s,broadPeriod.value).net_flow_yuan),n=a.length||1,positive=a.filter(v=>v>0).length,negative=a.filter(v=>v<0).length;return {positive,negative,missing:a.filter(v=>v==null).length,inWidth:positive/n*100,outWidth:negative/n*100};});
function broadChart(subject,days,compact=false){
const a=(subject?.daily_series||[]).slice(-days);
if(!a.length)return '<div class="broad-empty">趋势数据待补</div>';
const esc=v=>String(v).replace(/[&<>"']/g,c=>({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[c]));
const w=compact?340:628,h=compact?137:154,l=compact?31:40,r=8,t=16,b=27;
const vals=a.map(x=>x.net_flow_yuan==null||!Number.isFinite(Number(x.net_flow_yuan))?null:Number(x.net_flow_yuan)/1e8),max=Math.max(1,...vals.filter(x=>x!=null)),min=Math.min(0,...vals.filter(x=>x!=null)),range=max-min,y=v=>t+(max-v)/range*(h-t-b),zero=y(0),cw=(w-l-r)/a.length,bw=Math.max(2,cw*.52);
let out=`<svg viewBox="0 0 ${w} ${h}" role="img" aria-label="最近${Number(days)}个交易日净额,单位亿元"><text x="0" y="10">亿元</text>`;
[...new Set([max,Math.abs(min)>.01?0:max/2,min])].forEach(v=>{const yy=y(v);out+=`<line x1="${l}" y1="${yy}" x2="${w-r}" y2="${yy}" stroke="var(--hair)" stroke-dasharray="${v===0?'0':'3 4'}"></line><text x="${l-6}" y="${yy+3}" text-anchor="end">${Math.round(v)}</text>`;});
a.forEach((q,i)=>{const v=vals[i],x=l+i*cw+(cw-bw)/2,date=esc(q.trade_date||'');
if(v!=null)out+=`<rect x="${x}" y="${Math.min(y(v),zero)}" width="${bw}" height="${Math.max(1,Math.abs(y(v)-zero))}" rx="1.5" fill="${v>=0?'#d97064':'#6fa887'}" opacity="${i===a.length-1?1:.78}"><title>${date}:${broadAmount(q.net_flow_yuan)}亿元</title></rect>`;
else out+=`<circle cx="${x+bw/2}" cy="${zero}" r="2" fill="none" stroke="#999"><title>${date}:待补</title></circle>`;
if(i===0||i===a.length-1||i===Math.floor(a.length/2))out+=`<text x="${x+bw/2}" y="${h-7}" text-anchor="middle">${esc(String(q.trade_date||'').slice(5).replace('-','/'))}</text>`;
});return out+'</svg>';
}
function openBroad(){broadTab.value='market';broadOpen.value=true;}
async function loadBroad(){
const response=await call('get','/api/broad/funds'),d=response?.ok===true?response.data:null;
if(d && typeof d.enabled==='boolean')broad.value=d;
else broad.value={...broad.value,status:'unavailable'};
}
const macro = ref({});
const macroGateOn = computed(() => !!(((macro.value || {}).gate || {}).active));
const macroUnavailable = computed(() => {
@ -4885,7 +4944,7 @@ createApp({
// (通道告警对交易员改由 dispatch-mode 里的 channel 兜底, 见 wsc 的注释)
(isAdmin.value ? loadWs() : Promise.resolve()),
loadStrategies(), loadOpLog(), loadOpenScan(), loadDividend(), loadUpstream(),
loadMacro(), loadEtf(), loadMicro(), loadTech()]);
loadMacro(), loadEtf(), loadBroad(), loadMicro(), loadTech()]);
await loadNames();
lastRefresh.value = new Date().toTimeString().slice(0, 8);
loading.value = false;
@ -5191,7 +5250,6 @@ createApp({
if (c === 'rotation') { window.location.href = '/rotation'; return; }
if (c === 'view') mode.value = mode.value === 'ops' ? 'trader' : 'ops';
else if (c === 'plan') openPlan();
else if (c === 'report') openReport();
else if (c === 'export') doExport();
else if (c === 'ops') opsDrawer.value = true;
else if (c === 'auto') autoRefresh.value = !autoRefresh.value;
@ -5250,17 +5308,14 @@ createApp({
planLoading.value = false;
await Promise.all([loadPlan(), loadChanges(), loadOverview()]);
}
async function openReport() {
const d = await call('get', '/api/report'); report.value = d.data || d || {};
reportDrawer.value = true;
}
// —— 自动刷新: 盘中 30s、休市 5min; 只拉快变数据, 不动 params(免得冲掉设置里在改的输入) ——
let refreshTimer = null;
async function refreshLive() {
// allSettled: 单个 loader 失败/超时(axios 60s 兜底)不拖累其余与时间戳更新。
await Promise.allSettled([loadOverview(), loadPositions(), loadInstructions(), loadLedger(),
loadProposals(), loadStrategies(), loadOpLog(), loadOpenScan(), loadDividend(), loadUpstream(), loadMacro(), loadEtf(), loadMicro(), loadPlanUsers()]);
loadProposals(), loadStrategies(), loadOpLog(), loadOpenScan(), loadDividend(), loadUpstream(), loadMacro(), loadEtf(), loadBroad(), loadMicro(), loadPlanUsers()]);
try { await loadNames(); } catch (e) {}
// 用客户端钟, 保证"自动·HH:MM:SS"稳定跳动, 不依赖 /health 的 now。
lastRefresh.value = new Date().toTimeString().slice(0, 8);
@ -5426,8 +5481,11 @@ createApp({
const sigOld = computed(() => sigBrief.value.filter(x => x.today === false));
const showOldSig = ref(false);
// 持仓和关注使用同一信号入口、时间排序和数量上限;无信号不生成占位。
const flowShown=reactive({primary:60,other:60});
const flowTotals=computed(()=>({primary:sigToday.value.filter(x=>x.held||x.watched).length,other:sigToday.value.filter(x=>!x.held&&!x.watched).length}));
const flowCoverageIncomplete=computed(()=>Object.values(upstream.value.coverage||{}).some(x=>x.truncated));
function flowRowsFor(primary) {
return flowSort(sigToday.value.filter(x=>Boolean(x.held||x.watched)===primary)).slice(0,60);
return flowSort(sigToday.value.filter(x=>Boolean(x.held||x.watched)===primary)).slice(0,flowShown[primary?'primary':'other']);
}
const sigBriefHeld = computed(() => flowRowsFor(true));
const sigBriefOther = computed(() => flowRowsFor(false));
@ -5513,7 +5571,7 @@ createApp({
openRailSide(side);
}
function scrimTE(e) { e.preventDefault(); closeRail(); }
function _onEsc(e) { if (e.key === 'Escape') {if(etfOpen.value)etfOpen.value=false;else closeRail();} }
function _onEsc(e) { if (e.key === 'Escape') {if(broadOpen.value)broadOpen.value=false;else if(etfOpen.value)etfOpen.value=false;else closeRail();} }
onMounted(() => {
_railClasses(); applyDock();
window.addEventListener('resize', applyDock);
@ -5524,14 +5582,17 @@ createApp({
document.removeEventListener('keydown', _onEsc);
});
return { tab, loading, err, health, ov, params, catalog, commands, plans, plansOf,
positions, positionGroups, positionTab, positionLedgerTab, positionKey, lotsByPosition, instructions, ledger, ledgerToday, proposals, preparingProposals, report, reportDrawer,
return { broad, broadOpen, broadTab, broadDays, broadPeriod, broadSearch, broadSectorId,
broadMarket, broadDate, broadShortDate, broadAmount, broadColor, broadTail, broadRef, broadMetric,
broadIndexes, broadSectorRows, broadSelected, broadRanks, broadRankMax, broadSectorCounts, broadChart, openBroad,
flowShown, flowTotals, flowCoverageIncomplete, tab, loading, err, health, ov, params, catalog, commands, plans, plansOf,
positions, positionGroups, positionTab, positionLedgerTab, positionKey, lotsByPosition, instructions, ledger, ledgerToday, proposals, preparingProposals,
opsDrawer, opsResult, opsLoading, issuing, form, curSpec, dirtyCount, dm,
money, costPrice, pct, groupLabel, fieldLabel, stTag, cuTag, logicTag, canCancel, progPct, insPct,
scaleGap,
wsRaw, wsAuto, wsHidePong, wsc, wst, wsMode, wsOrders, wsInbox, wsWarnings, loadWs,
loadAll, loadParams, saveParams, loadPlans, loadLots, onCmdChange, issue,
cancelCmd, replan, decide, decideDlg, decideCodes, submitDecide, ops, loadSchema, openReport, cancelIns, researchData, researchSections, researchMaterials, researchSource, openResearch,
cancelCmd, replan, decide, decideDlg, decideCodes, submitDecide, ops, loadSchema, cancelIns, researchData, researchSections, researchMaterials, researchSource, openResearch,
planDrawer, planLoading, planStatus, planFetchedText, planRows, planCand, planResult,
loadPlan, openPlan, refreshPlan,
planAddOpen, planUserBusy, planAddError, planUserError, planUserRows, planUserHistory,

View File

@ -1,5 +1,7 @@
# 宽基每日资金与行业对比原型
11月6日后续:用户已批准按此最终原型实施并盘中部署,当前执行状态见[实施与发布接续](宽基每日资金与信号覆盖发布_2026-11-06.md)。以下保留设计阶段核验记录。
核验时间:2026年11月06日10:01,北京时间。状态:用户认可整体样式与交互,已按最新精简意见修订独立原型,尚未实施到应用。没有修改应用代码、线上页面、消费组、运行参数或服务,也没有新增观察任务。
## 现有逻辑和上游变化

View File

@ -0,0 +1,33 @@
# 宽基每日资金与信号覆盖发布
核验时间:2026年11月6日10:35,北京时间。状态:开发机实现与验证中,尚未部署。用户已批准按最终原型实施并盘中部署,范围为155模拟PMS页面及独立观测进程。
## 本次范围
顶部按日显示宽基数据日期、日净额及当日历史分位。金额红色为流入、绿色为流出;缺失显示待补。悬浮固定60个交易日柱状图,只保留当日金额、当日分位、趋势与详情入口。抽屉提供宽基阶段累计、八类指数对比,以及行业当日和5、20、60日对比、前三排名、搜索与个别行业趋势。分钟事件仍在原信号流和原详情。
移除日报菜单、运维生成日报按钮及JSON抽屉。后台日报任务与归档不在本次移除范围。
## 每日数据边界
接入正式`mtf:funds:daily:observation:v1`,复用已有独立观测进程的私有连接。新参数`PMS_BROAD_DAILY_ENABLED`默认关闭,发布后按本次授权开启。页面只读本实例持久化事实,不直接连接上游。
固定官方`daily-flow-1.0`读取契约,核对双库READY提交、日期、SHA256和同日版本指针。11月6日10:34已经只读核对155上游运行容器,三个新增契约文件及既有依赖哈希均一致。原始每日报告、提交、事件单独留存;数据库提交成功后才确认消息。重复不改首次回执,旧修订不覆盖新修订,坏包待补且不阻塞后续正常项。每日数据与分钟有效期独立,明确标注事实日期,较新待补修订不以旧完整值填充。
宽基净申购估算与同花顺行业净额独立展示,不相加。个股及基金排除北交所;中证2000指数932000.CSI是指数正式标识,允许接入,并不扩大北交所证券范围。既有分钟消费者此前误拒绝该指数,已纠正,按原契约处理已过期消息。
## 信号覆盖调查
10:15只读回扫当天四条正式股票事件流,沪深有效消息分别为:决策/择时5条,提醒99条,资金异动105条,风控卖出0条。旧页面快照分别为5、38、40、0条。提醒每类限20、全局限40及普通股票观测筛选造成遗漏;不是上游没有发布。
四路信号改为当天分页读取、30秒进程缓存,`PMS_UPSTREAM_DAY_SCAN`默认每路20000条、最大50000条,达到边界明确提示不完整。持仓和关注只影响分组,不影响读取资格;级别及观测按钮仍由用户决定隐藏或显示。默认每组显示60条,并可继续浏览全部已取回记录,不增加行内折叠或长理由。源名称、可点击股票、方向、过期置灰规则保持。
来源逐一核对:`intraday_signals:日期`含决策与择时,`intraday_alerts:日期`含日QRS、资金强度、资金分布、股价异动、多源升级及买入镜像,`mtf:intraday:stream:metrics`为资金异动,`bionic:signals:llm_sell_actions`为风控卖出。未登记提醒保留在其他来源。实况分榜为状态排名,保留原来源面板,不制造时点信号。Bionic内部时间线与内部提醒是这些流的镜像,不重复制造事件。分钟宽基按事件身份和序号维护状态并保留原始推送审计,每次持续更新不重复新增一行。每日研判完成及“继续观察”不当作发布信号。
## 验证与发布待办
开发机80批全量回归通过,包含新增每日资金及覆盖专项17项和页面三道护栏。浏览器1440、390、320布局、行业搜索、趋势与阶段切换已检查;320顶部挤压已修复。候选断网回归和实际消费结果待发布阶段补记。
155 10:31脱敏基线记录19个运行容器,本次仅更新`pms-web`与`pms-observation`。页面现用`pms:etf-chip-6c10116`,独立观测现用`pms:watch-etf-f6cf445`。页面仅挂载日志,观测没有源码挂载;私有环境及覆盖保留。唯一WS、交易worker、beat、行情采集、微盘及其他项目不重建,188不操作。
回退只恢复两个目标服务镜像和本次新增每日开关,保留观测事实、审计与消费水位,不清空账本、回报或队列。

View File

@ -6,6 +6,7 @@
| 任务 | 入口 |
| --- | --- |
| 宽基每日资金展示、日报入口移除与当天信号完整覆盖 | [11月6日发布接续](宽基每日资金与信号覆盖发布_2026-11-06.md),最终原型、独立日度接入、四路信号覆盖及定向发布 |
| 当前微盘接入、参数和运行待办 | [阶段接续与实验意见](微盘轮动阶段接续_2026-10-28.md);需要部署证据再读[50股发布记录](微盘轮动50股参数发布_2026-10-28.md) |
| 全市场热度、涨跌幅与持有期标定 | [热度策略研究接续](全市场热度四维标定接续_2026-10-28.md),含回填限制、参数结果和复现入口;[热度反复活跃矩阵接续](热度反复活跃矩阵研究接续_2026-10-29.md),含前20日次数、持有期、数据可用性与阶段指数对照 |
| 综合分与聪明资金分阈值及市场阶段比较 | [评分策略研究接续](综合分与聪明资金分标定接续_2026-10-28.md),含810组结果、历史版本限制和复现入口;[反复活跃矩阵接续](反复活跃矩阵研究接续_2026-10-29.md),含20日次数、1至10日持有期与指数隔离 |

View File

@ -199,7 +199,7 @@ import sys
HERE = os.path.dirname(os.path.abspath(__file__))
ROOT = os.path.dirname(HERE)
# 退出纪律专项:两次独立清仓信号、评级下降、事务、双策略隔离及撤单收尾。
SUITES = ["test_etf_observation.py", "test_risk_exit.py", "test_rotation_accounting_units.py", "test_cost_precision.py", "test_execution_basis_decimal.py",
SUITES = ["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_trade_correction_units.py", "test_trade_correction_transport.py",
"test_trade_correction_service.py", "test_trade_lineage_units.py",
"test_trade_correction_strategy.py",

127
scripts/test_broad_funds.py Normal file
View File

@ -0,0 +1,127 @@
"""每日资金接入与完整信号覆盖;合成事实和内存存储,不读取线上行情。"""
import unit_test_guard
import contextlib
import copy
import hashlib
import json
import sys
from datetime import datetime, timedelta
from pathlib import Path
from unittest import TestCase, main
from unittest.mock import patch
sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
from test_etf_observation import MemoryStore, RedisFake
from app.services import broad_funds as svc, upstream_signals as up, param_store
from app.core.etf_contract.daily_flow import CONTRACT, ETF_BASIS, INDUSTRY_BASIS, THRESHOLD, canonical
AT = datetime.fromisoformat('2026-11-06T10:00:00+08:00')
DAY = '2026-11-05'
def facts(rev=0, day=DAY, amount=100., sectors=True):
subject = {'subject_id': 'BROAD_ETF', 'subject_type': 'MARKET', 'latest': {
'trade_date': day, 'net_flow_yuan': amount, 'member_count': 1, 'observed_member_count': int(amount is not None)},
'daily_series': [{'trade_date': day, 'net_flow_yuan': amount}], 'periods': {}, 'reference': {'percentile': None}}
industry = {'subject_id': 'test-industry', 'name': '测试行业', 'latest': {'net_flow_yuan': 1.}}
return dict(schema_version=1, contract_version=CONTRACT, threshold_version=THRESHOLD,
model_status='uncalibrated', calibration_status='PROVISIONAL', purpose='MARKET_OBSERVATION',
publication_mode='observation', trade_instruction=False, accounting_bases_combined=False,
trade_date=day, valid_for_trade_date=day, published_at=(AT-timedelta(minutes=1)).isoformat(),
revision=rev, supersedes_revision=rev-1 if rev else None,
component_status={'etf': 'AVAILABLE_ESTIMATE' if amount is not None else 'AWAITING_COMPLETE_SHARES_NAV',
'industry': 'AVAILABLE_REPORTED' if sectors else 'AWAITING_SOURCE'},
etf={'flow_basis': ETF_BASIS, 'cohort': {'510300.SH': '000300.SH'}, 'market': subject,
'etfs': [], 'indexes': [dict(subject, subject_id='932000.CSI', subject_type='INDEX')]},
industry={'flow_basis': INDUSTRY_BASIS, 'total': None, 'sectors': [industry] if sectors else []})
class DailyBus(RedisFake):
def exists(self,key): return key.endswith(DAY[:7])
class DailyTests(TestCase):
def setUp(self):
self.stack=contextlib.ExitStack();self.addCleanup(self.stack.close)
self.store=MemoryStore();self.snap,self.bus=RedisFake(),DailyBus(self.store)
self.stack.enter_context(patch.object(svc,'store',self.store))
self.stack.enter_context(patch.object(param_store,'get_bool',return_value=True))
def load(self,rev=0,day=DAY,amount=100.,sectors=True,sid=None):
r=facts(rev,day,amount,sectors);raw=canonical(r);suffix=f'{day}:r{rev}'
mf={k:r[k] for k in ('schema_version','contract_version','trade_date','revision','published_at',
'purpose','model_status','calibration_status','trade_instruction')}
mf.update(namespace=svc.NS,status='READY',manifest_key=svc.NS+':manifest:'+suffix,
snapshot_key=svc.NS+':snapshot:'+suffix,snapshot_sha256=hashlib.sha256(raw.encode()).hexdigest(),
event_type='DAILY_UPSERT',window_epoch=1)
e=dict(mf,event_id=f'daily-flow:{day}:r{rev}',supersedes_revision=r['supersedes_revision'],component_status=r['component_status'])
self.bus.values[mf['manifest_key']]=canonical(mf);self.snap.values[mf['snapshot_key']]=raw
self.snap.values[svc.NS+':latest:'+day]=canonical(mf);self.snap.values[svc.NS+':latest']=canonical(mf)
self.bus.rows.append((sid or f'{rev+1}-0',{'data':canonical(e)}))
return r,mf,e
def runat(self,at=AT):return svc.consume_once(self.snap,self.bus,clock=lambda:at)
def view(self):return svc.status(clock=lambda:AT)
def test_valid_report_is_durable_before_ack_and_csi_index_kept(self):
self.load();self.assertEqual(self.runat()['status'],'ok');self.assertEqual(self.bus.acks,['1-0'])
v=self.view();self.assertEqual(v['report']['etf']['market']['latest']['net_flow_yuan'],100)
self.assertEqual(v['report']['etf']['indexes'][0]['name'],'中证2000');self.assertNotIn('etfs',v['report']['etf'])
self.assertFalse(v['trade_instruction'])
saved=self.store.docs[self.store.docs[svc.STATE]['days'][DAY]['key']]
self.assertEqual(hashlib.sha256(saved['snapshot_text'].encode()).hexdigest(), saved['manifest']['snapshot_sha256'])
def test_duplicate_is_acked_without_overwriting_first_receipt(self):
self.load();self.runat();first={k:v for k,v in self.store.docs.items() if ':event:' in k}
self.load();self.runat(AT+timedelta(seconds=3));self.assertEqual(first,{k:v for k,v in self.store.docs.items() if ':event:' in k})
def test_superseded_full_report_cannot_replace_new_pending_revision(self):
self.load();self.runat();self.load(rev=2,amount=None);self.runat();self.load(rev=1,sid='4-0');self.runat()
self.assertEqual(self.view()['report']['revision'],2);self.assertIsNone(self.view()['report']['etf']['market']['latest']['net_flow_yuan'])
def test_same_date_latest_pointer_blocks_old_event_before_first_ingestion(self):
self.load();self.load(rev=1,amount=None);self.runat();self.assertEqual(self.view()['report']['revision'],1)
audit=next(v for k,v in self.store.docs.items() if k.endswith(':1-0'));self.assertFalse(audit['applied']);self.assertTrue(audit['superseded'])
def test_partial_industry_does_not_hide_valid_etf(self):
self.load(sectors=False);self.runat();self.assertEqual(self.view()['report']['etf']['market']['latest']['net_flow_yuan'],100)
self.assertEqual(self.view()['report']['component_status']['industry'],'AWAITING_SOURCE')
def test_missing_etf_does_not_hide_industry_or_become_zero(self):
self.load(amount=None);self.runat();v=self.view()['report'];self.assertIsNone(v['etf']['market']['latest']['net_flow_yuan']);self.assertEqual(len(v['industry']['sectors']),1)
def test_database_failure_cannot_ack(self):
self.load();self.store.fail=True
with self.assertRaises(RuntimeError):self.runat()
self.assertFalse(self.bus.acks);self.store.fail=False;self.runat();self.assertEqual(self.bus.acks,['1-0'])
def test_corrupt_hash_pending_then_recovers(self):
r,m,e=self.load();raw=self.snap.values[m['snapshot_key']];self.snap.values[m['snapshot_key']]=raw+' '
self.assertEqual(self.runat()['status'],'unavailable');self.assertFalse(self.bus.acks)
self.snap.values[m['snapshot_key']]=raw;self.runat();self.assertEqual(self.bus.acks,['1-0'])
def test_bad_event_does_not_prevent_valid_later_event(self):
self.load();self.bus.rows[0][1]['data']='{}';self.load(rev=1)
self.assertEqual(self.runat()['status'],'unavailable');self.assertEqual(self.bus.acks,['2-0']);self.assertEqual(self.view()['report']['revision'],1)
def test_event_cannot_disagree_with_committed_version(self):
r,m,e=self.load();e['component_status']={'etf':'UNKNOWN'};self.bus.rows[0][1]['data']=canonical(e)
self.runat();self.assertFalse(self.bus.acks)
def test_latest_without_stream_can_recover(self):
self.load();self.bus.rows=[];self.runat();self.assertEqual(self.view()['report']['trade_date'],DAY)
def test_expected_date_and_future_and_bse_rejected(self):
r,m,e=self.load()
with self.assertRaises(ValueError):svc.ingest(self.snap,self.bus,m['manifest_key'],'2026-11-04',AT)
with self.assertRaises(ValueError):svc.validate_scope(dict(r,published_at=(AT+timedelta(seconds=1)).isoformat()),AT)
r['etf']['cohort']={'920001.BJ':'000300.SH'}
with self.assertRaises(ValueError):svc.validate_scope(r,AT)
def test_unavailable_keeps_explicit_old_date_and_facts(self):
self.load();self.runat();self.store.docs[svc.STATE]['error']='TimeoutError'
v=self.view();self.assertEqual(v['status'],'unavailable');self.assertEqual(v['report']['trade_date'],DAY)
def test_disabled_never_connects(self):
with patch.object(param_store,'get_bool',return_value=False),patch.object(svc.minute,'clients',side_effect=AssertionError('network')):
self.assertEqual(svc.consume_once()['status'],'disabled');self.assertFalse(self.view()['enabled'])
def test_official_vendor_bytes_pinned(self):
path=Path(svc.contract.__file__).parent;d=json.loads((path/'DAILY_PROVENANCE.json').read_text())
for name,digest in d['sha256'].items():self.assertEqual(hashlib.sha256((path/name).read_bytes()).hexdigest(),digest)
class CoverageTests(TestCase):
def setUp(self):up._focused_streams.clear()
def test_all_day_rows_and_categories_survive_old_limits(self):
rows=[(f'{int(AT.timestamp()*1000)+i}-0',{'ts_code':'600001.SH','source':'price_notice_up','level':'INFO','trigger_time':str(int(AT.timestamp()*1000))}) for i in range(501)]
rows.append(('1-0',{'ts_code':'920001.BJ'}))
with patch.object(up,'_focus_codes',return_value=set()),patch.object(param_store,'get_int',side_effect=lambda k,d=0:d),patch.object(up,'_scan_stream',return_value=(rows,False)):
self.assertEqual(len(up._read_alerts(None,DAY)['items']),501)
def test_cap_status_is_retained_in_coverage_cache(self):
with patch.object(up,'_focus_codes',return_value=set()),patch.object(param_store,'get_int',side_effect=lambda k,d=0:d),patch.object(up,'_scan_stream',return_value=([('1-0',{'ts_code':'600001.SH'})],True)):
up._entries(None,'test',1);self.assertTrue(next(iter(up._focused_streams.values()))['truncated'])
if __name__=='__main__':main()

View File

@ -131,16 +131,16 @@ class FocusTests(TestCase):
def test_old_watched_and_held_rows_survive_global_limit_and_are_cached(self):
rows=[(str(1000-i)+'-0',{'ts_code':'600009.SH'})for i in range(70)]+[('800-0',{'ts_code':'300001.SZ'}),('799-0',{'ts_code':'600001.SH'})]
with patch.object(upstream,'_focus_codes',return_value={'300001.SZ','600001.SH'}),patch.object(upstream,'_scan_stream',return_value=(rows,False)) as scan:
got=upstream._entries(None,'test',40);self.assertEqual(len(got),42);self.assertEqual(upstream._entries(None,'test',40),got);self.assertEqual(scan.call_count,1)
got=upstream._entries(None,'test',40);self.assertEqual(len(got),72);self.assertEqual(upstream._entries(None,'test',40),got);self.assertEqual(scan.call_count,1)
def test_metrics_use_original_stream_time_not_refresh_time(self):
ms=int(NOW.timestamp()*1000)
with patch.object(upstream,'_entries',return_value=[(str(ms)+'-0',{'ts_code':'SZ300001','data':json.dumps({'direction':'inflow','z_dd':6})})]):
row=upstream._read_metrics(None)['items'][0];self.assertEqual(row['ts'],ms);self.assertEqual(row['id'],str(ms)+'-0');self.assertEqual(row['ts_from'],'stream_id')
def test_empty_source_creates_no_placeholder(self):
with patch.object(upstream,'_entries',return_value=[]):self.assertEqual(upstream._read_metrics(None)['items'],[])
def test_focus_removed_no_longer_reused(self):
def test_focus_changes_only_grouping_not_source_coverage(self):
rows=[('1-0',{'ts_code':'300001.SZ'})]
with patch.object(upstream,'_focus_codes',return_value={'300001.SZ'}),patch.object(upstream,'_scan_stream',return_value=(rows,False)):self.assertEqual(len(upstream._entries(None,'test',0)),1)
with patch.object(upstream,'_focus_codes',return_value={'600001.SH'}),patch.object(upstream,'_scan_stream',return_value=(rows,False)):self.assertEqual(upstream._entries(None,'test',0),[])
with patch.object(upstream,'_focus_codes',return_value={'600001.SH'}),patch.object(upstream,'_scan_stream',return_value=(rows,False)):self.assertEqual(len(upstream._entries(None,'test',0)),1)
if __name__=='__main__':main()