diff --git a/DEVLOG.md b/DEVLOG.md index 94e4c81..44f8ff7 100644 --- a/DEVLOG.md +++ b/DEVLOG.md @@ -3090,3 +3090,8 @@ a44c994于10:53:29仅发布155的web,镜像pms:proposal-copy-a44c994。开发 顶部并列每日净申购与日内累计成交、倍数和方向;单行信号区分15分钟和日内累计,偏多/偏空改为偏买/偏卖,方向不可用不视为中性。仅页面改动,开发机85组隔离回归及三道页面护栏通过。发布与真实只读数据见[接续](docs/宽基日内汇总与信号范围文案_2026-11-12.md)。 15:37:26已仅在155发布web `pms:etf-copy-1fd4c9c`,候选85组断网全量通过,其余26容器不变。15:38真实页面、宽基数据与账本只读核对通过;方向不可用仍照实显示。 + + +## 2026-11-12 宽基单标签与分时方向 + +按用户明确格式压缩顶部,日内成交并入原宽基悬浮框。新增固定16窗口的15分钟价量方向柱图,零值、缺失、未来和同日修订分别处理;不宣称真实资金净流入。开发机85组隔离回归、ETF28项及页面三道护栏通过。实际发布见[接续](docs/宽基紧凑汇总与十五分钟方向图_2026-11-12.md)。 diff --git a/app/core/etf_intraday_view.py b/app/core/etf_intraday_view.py new file mode 100644 index 0000000..2d93433 --- /dev/null +++ b/app/core/etf_intraday_view.py @@ -0,0 +1,53 @@ +"""宽基已发布的15分钟市场方向,仅供历史展示,不推算资金净流入。""" +from datetime import datetime, timedelta +import math +from zoneinfo import ZoneInfo + +TZ = ZoneInfo('Asia/Shanghai') +SLOTS = tuple(f'{m // 60:02d}:{m % 60:02d}' for start in (9 * 60 + 30, 13 * 60) + for m in range(start + 15, start + 121, 15)) + + +def intraday_series(history, day, at): + """午休不占柱;最新修订优先,缺失、未来窗口和真实零值分开。""" + try: + base = datetime.strptime(day, '%Y-%m-%d').replace(tzinfo=TZ) + except (TypeError, ValueError): + return [] + latest = {} + for row in history or []: + try: + end = datetime.fromisoformat(row['window_end']) + published = datetime.fromisoformat(row['published_at']) + if end.tzinfo is None or published.tzinfo is None: + continue + end = end.astimezone(TZ) + hm = end.strftime('%H:%M') + if (row.get('trade_date') != day or end.date() != base.date() + or hm not in SLOTS or end.second or end.microsecond + or end > at or published > at): + continue + rank = (int(row.get('revision', 0)), published) + if hm not in latest or rank > latest[hm][0]: + latest[hm] = (rank, row) + except (KeyError, TypeError, ValueError): + continue + result = [] + for hm in SLOTS: + hour, minute = map(int, hm.split(':')) + end = base.replace(hour=hour, minute=minute) + row = latest.get(hm, (None, {}))[1] + scope = (row.get('scopes') or {}).get('WINDOW_15M') or {} + block = (row.get('market') or {}).get('WINDOW_15M') or {} + value = (block.get('metrics') or {}).get('direction_balance') + direction = block.get('direction') + valid = (scope.get('quality_eligible') is True + and block.get('direction_status') == 'OK' + and direction in ('BUY', 'SELL', 'MIXED') + and type(value) in (int, float) and math.isfinite(value) + and -1 <= value <= 1) + result.append({'start': (end - timedelta(minutes=15)).strftime('%H:%M'), + 'end': hm, 'value': value if valid else None, + 'direction': direction if valid else None, + 'state': 'ok' if valid else 'pending' if end > at else 'missing'}) + return result diff --git a/app/services/etf_observation.py b/app/services/etf_observation.py index 081a7d2..65fbe3d 100644 --- a/app/services/etf_observation.py +++ b/app/services/etf_observation.py @@ -9,6 +9,7 @@ from datetime import datetime, timedelta from zoneinfo import ZoneInfo from app.core.etf_contract import consumer as contract +from app.core.etf_intraday_view import intraday_series from app.repo import rotation_repo as store from app.services import param_store from config.settings import settings @@ -250,6 +251,7 @@ def presentation(state, at, names=None): enabled=True, trade_instruction=False, server_at=at.isoformat(), current_eligible=live) data.pop('sequences', None) data.pop('rounds', None) + data['intraday_series'] = intraday_series(data.get('history'), data.get('day'), at) return data diff --git a/app/web/static/index.html b/app/web/static/index.html index 313131b..4a6caa8 100644 --- a/app/web/static/index.html +++ b/app/web/static/index.html @@ -33,7 +33,7 @@ body{margin:0;background:var(--plane);color:var(--ink); margin:0 -16px 6px;padding:8px 16px;background:rgba(244,245,242,.94);backdrop-filter:blur(8px);border-bottom:1px solid var(--hair);} .hd h1{font-size:15px;margin:0;font-weight:680;letter-spacing:.2px;white-space:nowrap;flex:none;} .hd .ver{color:var(--muted);font-size:12px;font-weight:400;margin-left:6px;} -.hd-tags{display:flex;align-items:center;gap:6px;flex:0 1 auto;min-width:0;flex-wrap:wrap;white-space:normal;} +.hd-tags{display:flex;align-items:center;gap:6px;flex:0 1 auto;min-width:0;overflow:hidden;white-space:nowrap;} .hd-acts{display:flex;align-items:center;gap:8px;flex:none;margin-left:auto;} .hst{display:inline-flex;align-items:center;font-size:11.5px;font-weight:560;padding:2px 8px;border-radius:6px;flex:none;line-height:1.5;cursor:default;white-space:nowrap;} .hst.ok{background:var(--accent-weak);color:var(--accent);} @@ -609,7 +609,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;} @media(max-width:360px){.sigrow2.etf-flow{gap:1px;font-size:11px}.sigrow2.etf-flow .cat{font-size:10px}.signal-flow .nm.etf-name{font-size:10.5px}} @media(max-width:600px){.hd-tags>.hst.hd-etf{display:inline-flex}.etf-stats{gap:6px}.etf-stats b{font-size:19px}} /* 宽基每日观测沿用原顶部提示、右侧抽屉与红绿资金方向。 */ -.hd-broad{display:flex;gap:6px;flex:0 0 auto;flex-wrap:wrap;max-width:100%}.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} +.broad-chip{white-space:nowrap;gap:0}.broad-chip b{margin:0;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-intraday-line{display:flex;align-items:center;justify-content:space-between;gap:8px;border-top:1px solid var(--hair);padding-top:12px;margin:10px 0 14px;font-size:12px}.broad-intraday-line .muted,.broad-direction-note{font-size:10px;color:var(--muted)}.broad-direction-note{margin:2px 0 0}.broad-pop-footer{display:flex;justify-content:flex-end;gap:20px;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}} @@ -691,33 +691,25 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;} 微盘 {{ microChipText }} -
- + - - - - - -
下发 {{ dm.mode || '-' }}
@@ -4849,11 +4841,6 @@ createApp({ const etfFlowCaption=r=>etfDirectionText(r)==='方向不可用'?'方向不可用':'放量·'+etfDirectionText(r,true); const etfCaption=r=>etfScopeText(r.scope)+'放量·'+etfDirectionText(r); const etfDirectionClass=r=>r?.direction_status!=='OK'?'muted':r.direction==='BUY'?'clr-up':r.direction==='SELL'?'clr-down':'muted'; - const etfMarketDirection=computed(()=>{ - const s=etfSummary.value,scope=s.session_closed?'EOD':'SESSION_CUM',quality=(s.scopes||{})[scope]||(s.scopes||{}).SESSION_CUM; - const block=(s.market||{})[scope]||(s.market||{}).SESSION_CUM||{}; - return quality?.quality_eligible?block:{direction_status:'UNAVAILABLE'}; - }); const etfRows=computed(()=>(etf.value.events||[]).map(r=>{ const expired=['OPEN','CONTINUE'].includes(r.event_state) && etfClock.value>=Date.parse(r.valid_until); return {...r,stale:r.stale||expired,display_state:expired?'EXPIRED':r.display_state}; @@ -4869,6 +4856,23 @@ createApp({ const history=(etf.value.history||[]).slice(-4), vals=history.map(h=>((h.scopes||{}).WINDOW_15M||{}).quality_eligible?((h.market||{}).observation||{}).amount:null),max=Math.max(1,...vals.filter(v=>v!=null)); return history.map((h,i)=>({key:h.round_id,time:etfTime(h.window_end),value:etfAmount(vals[i]),missing:vals[i]==null,height:vals[i]==null?1:Math.max(1,vals[i]/max*65),title:etfTime(h.window_end)+' · '+(vals[i]==null?'数据暂缺':etfAmount(vals[i])+'亿元')})); }); + function etfDirectionChart(series){ + const rows=Array.isArray(series)?series:[]; + if(!rows.length)return '
暂无分时方向数据
'; + const w=340,h=132,l=30,r=8,t=10,b=25,zero=(t+h-b)/2,half=(h-b-t)/2,gap=14,cw=(w-l-r-gap)/16,bw=cw*.52; + let out=`偏买0偏卖`; + rows.slice(0,16).forEach((row,i)=>{ + const x=l+i*cw+(i>=8?gap:0)+(cw-bw)/2,valid=row.state==='ok'&&typeof row.value==='number'&&Number.isFinite(row.value)&&Math.abs(row.value)<=1; + const label={BUY:'偏买',SELL:'偏卖',MIXED:'无明显方向'}[row.direction]||'方向不可用'; + const time=/^\d{2}:\d{2}$/.test(row.end)?row.end:'',start=/^\d{2}:\d{2}$/.test(row.start)?row.start:''; + if(valid){ + const y=zero-row.value*half,color={BUY:'#d97064',SELL:'#6fa887',MIXED:'#b5b8b4'}[row.direction]||'#b5b8b4'; + out+=`${start}–${time}:${label}`; + }else if(row.state==='missing')out+=`${start}–${time}:方向数据缺失`; + if([0,7,8,15].includes(i))out+=`${time}`; + }); + return out+''; + } function openEtf(row){etfSelected.value=row||null;etfOpen.value=true;} function openFlowSignal(row){if(row.flowKind==='etf')openEtf(row);else openCodeSignals(row.ts_code);} async function loadEtf(){ @@ -5839,7 +5843,7 @@ createApp({ techFeed, techFeedErr, techStanceCls, etf, etfOpen, etfSelected, etfSummary, etfFacts, etfLive, etfTime, etfAmount, etfRatio, etfStateText, etfCaption, etfDirectionClass, etfRows, etfActiveCount, etfStatusText, etfChipText, - etfOverall, etfBars, etfScopeText, etfDirectionText, etfMarketDirection, openEtf, openFlowSignal, loadEtf, + etfOverall, etfBars, etfScopeText, etfDirectionText, etfDirectionChart, openEtf, openFlowSignal, loadEtf, macro, macroGateOn, macroUnavailable, mzLabel, mzColor, mzBarStyle, loadMacro, macroScan, macroAdopt, macroChart, microCharts, microHistoryError, microParameters, microThreshold, microDataReady, microSnapshot, microSignal, microState, microError, microReady, microPhaseText, microModeText, microNumber, microPercent, microChipClass, microChipText, diff --git a/docs/宽基紧凑汇总与十五分钟方向图_2026-11-12.md b/docs/宽基紧凑汇总与十五分钟方向图_2026-11-12.md new file mode 100644 index 0000000..18b666b --- /dev/null +++ b/docs/宽基紧凑汇总与十五分钟方向图_2026-11-12.md @@ -0,0 +1,21 @@ +# 宽基紧凑汇总与十五分钟方向图 + +## 用户要求与展示 + +本轮取代15:37的双入口设计。顶部只保留一个标签,格式严格为“宽基 -28.44/34.4%(日内 982.97)”,数字均按亿元,净申购仍正红负绿。取消单独日内入口、顶部日期、成交倍数及方向文字,恢复原顶部高度。 + +原宽基悬浮框保留每日净申购与60日柱图,下面只新增一行日内累计成交和数据截至时间,再显示15分钟买卖方向柱图。图中按上游市场汇总的WINDOW_15M方向比例绘制,固定正负范围;BUY红、SELL绿、MIXED灰,保留上游分类,不重算阈值。午休不计交易窗口,上午、下午之间留间距。缺失以零轴空心虚线标记,真实零值为实心短横,未来窗口留空。首次或修订快照只按有效同日证据显示;新修订缺方向不回退旧方向。 + +这不是15分钟真实资金净流入图。已阅读上游`src/etf/source.py`:它按分钟涨跌对成交额赋正负,再汇总为价量方向比例,没有真实买卖资金或申赎净额。故图名为“买卖方向”,不把成交额或价量代理冒称资金净流入;悬浮框仅留一句短注。真正的日内净流入须由上游另外提供相应数据。 + +## 数据核对 + +11月12日只读状态共14个已发布窗口。固定16窗口中11个方向有效,11:30、13:15无快照,14:30、14:45、15:00方向不可用。按15分钟展示比30分钟更贴合上游发布粒度,合并为半小时不能消除缺失。无窗口补造、无累计方向替代分时方向、无基金与指数重复加总。 + +当前每日数据日11月11日,净申购估算−28.44亿元、分位34.4%;日内11月12日15:00成交982.97亿元。日期分开留在悬浮框中。 + +## 验证与发布 + +开发机85组隔离全量回归通过;ETF相关28项,包括新增5项分时展示边界测试。页面三道护栏通过。浏览器使用155真实宽基响应重放,其余账户数据是隔离样例,不是真实登录验收。桌面1440宽验证顶部仅一枚宽基标签、原46像素高度;窄屏与两入口、悬浮图、关闭、刷新结果和实际发布信息追加于下。 + +按既有授权,仅发布155模拟PMS的web。新增整理分时数据的纯函数由web读接口使用,不改变消费者、信号源、交易规则或现有开关。188不操作。 diff --git a/docs/开发入口.md b/docs/开发入口.md index 18aea38..c6e8493 100644 --- a/docs/开发入口.md +++ b/docs/开发入口.md @@ -1,5 +1,7 @@ # 开发资料入口 +11月12日按最新意见改为[宽基紧凑汇总与15分钟方向图](宽基紧凑汇总与十五分钟方向图_2026-11-12.md),取代下方双入口方案;顶部单标签,日内信息及分时柱图并入原悬浮框。 + 11月12日宽基展示调整见[日内汇总与范围文案](宽基日内汇总与信号范围文案_2026-11-12.md):每日净申购和日内成交并列,范围、价量方向及缺失状态分开表达;发布结果以该接续为准。 11月12日14:52已发布[入池历史补齐与统一标定](入池历史补齐与统一标定_2026-11-12.md)。机器、人工与持仓共用后台准备流程;128只分钟量价、成交额和日资金基线完成,独立分钟净额历史仍为16天。明确纠正此前将分钟价格归档与分钟资金历史混称的表述。 diff --git a/scripts/test_etf_observation.py b/scripts/test_etf_observation.py index f4ab6d1..bc7fd9b 100644 --- a/scripts/test_etf_observation.py +++ b/scripts/test_etf_observation.py @@ -14,6 +14,7 @@ from app.services import etf_observation as svc, upstream_signals as upstream, p from app.core.etf_contract import consumer as contract from app.core.etf_contract.timing import DELAYED_POLICY, lease_until, admission_until from config.settings import settings +from app.core.etf_intraday_view import intraday_series NOW=datetime.fromisoformat('2026-11-05T10:03:00+08:00') DAY=NOW.date().isoformat() @@ -124,6 +125,53 @@ class ETFTests(TestCase): path=Path(contract.__file__).parent;manifest=json.loads((path/'PROVENANCE.json').read_text()) for name,digest in manifest['sha256'].items():self.assertEqual(hashlib.sha256((path/name).read_bytes()).hexdigest(),digest) +class IntradayViewTests(TestCase): + def row(self, hm='10:00', value=.3, direction='BUY', revision=0): + return {'trade_date': DAY, 'window_end': DAY+'T'+hm+':00+08:00', + 'published_at': DAY+'T'+hm+':01+08:00', 'revision': revision, + 'scopes': {'WINDOW_15M': {'quality_eligible': True}}, + 'market': {'WINDOW_15M': {'direction_status': 'OK', + 'direction': direction, 'metrics': {'direction_balance': value}}}} + + def test_fixed_fifteen_minutes_no_lunch_and_no_zero_fill(self): + rows = intraday_series([self.row()], DAY, NOW) + self.assertEqual(len(rows), 16) + self.assertEqual((rows[7]['end'], rows[8]['start']), ('11:30', '13:00')) + self.assertEqual(rows[1]['value'], .3) + self.assertEqual(rows[0]['state'], 'missing') + self.assertIsNone(rows[0]['value']) + self.assertEqual(rows[2]['state'], 'pending') + + def test_true_zero_is_visible_and_unknown_is_not_neutral(self): + zero = self.row(value=0, direction='MIXED') + self.assertEqual(intraday_series([zero], DAY, NOW)[1]['state'], 'ok') + zero['market']['WINDOW_15M']['direction_status'] = 'UNAVAILABLE' + self.assertIsNone(intraday_series([zero], DAY, NOW)[1]['value']) + for bad in (True, float('nan'), float('inf'), 1.01, -.01-1, '0.3'): + self.assertIsNone(intraday_series([self.row(value=bad)], DAY, NOW)[1]['value']) + + def test_new_invalid_revision_does_not_reuse_older_direction(self): + old, new = self.row(), self.row(revision=1) + new['scopes']['WINDOW_15M']['quality_eligible'] = False + for rows in ([old, new], [new, old]): + self.assertIsNone(intraday_series(rows, DAY, NOW)[1]['value']) + + def test_cross_day_future_publication_and_wrong_window_are_ignored(self): + old = self.row();old['trade_date'] = '2026-11-04' + future = self.row();future['published_at'] = DAY+'T10:10:00+08:00' + rows = intraday_series([old, future, self.row(hm='10:01')], DAY, NOW) + self.assertTrue(all(row['value'] is None for row in rows)) + + def test_historical_direction_survives_signal_expiry_without_summing_etfs(self): + row = self.row(value=-.4, direction='SELL') + row['scopes']['WINDOW_15M']['observation_eligible'] = False + row['market']['SESSION_CUM'] = {'direction_status': 'OK', 'direction': 'BUY', + 'metrics': {'direction_balance': .8}} + result = intraday_series([row], DAY, NOW+timedelta(hours=6)) + self.assertEqual(result[1]['value'], -.4) + self.assertEqual(result[1]['direction'], 'SELL') + + class FocusTests(TestCase): def setUp(self): upstream._focused_streams.clear()