按跟踪指数统一宽基信号简称
This commit is contained in:
parent
b95235ed9e
commit
975fa5a866
|
|
@ -3120,3 +3120,8 @@ a44c994于10:53:29仅发布155的web,镜像pms:proposal-copy-a44c994。开发
|
|||
移除宽基信号行的前置范围标签,保留原“宽基观测”来源、内容、级别和详情范围;普通股票标签不变。三道页面护栏及桌面、窄屏隔离浏览器通过。发布范围仅155 web,结果见[接续](docs/宽基查询接口与分时展示接续_2026-11-13.md)。
|
||||
|
||||
12:52:36已仅发布155 web `pms:etf-label-ad5b1a6`,候选86组断网全量及251源码核对通过,其他29容器、私有配置与挂载不变。12:53实际页面确认新标签逻辑,宽基自然304正常,数量现金差0,缺口、待入账、孤儿与在途0。展示及后续规则已更新,无新增观察任务。
|
||||
|
||||
|
||||
## 2026-11-13 宽基名称按指数类别统一
|
||||
|
||||
按用户确认方案,将177只宽基ETF统一显示为8类跟踪指数简称,保留逐条原信号和点击基金详情,去掉名称悬停。未知归属显示代码,不猜测分类。32项专项、三道页面护栏、177成员断网资料回放及桌面/窄屏验收通过。定向发布仅155 web,见[接续](docs/宽基查询接口与分时展示接续_2026-11-13.md)。
|
||||
|
|
|
|||
|
|
@ -203,33 +203,33 @@ def consume_once(snapshots=None, events=None, clock=now):
|
|||
return {'status': 'unavailable', 'error': type(exc).__name__, 'processed': processed}
|
||||
|
||||
|
||||
INDEX_LABELS = {
|
||||
'000016.SH': '上证50', '000300.SH': '沪深300',
|
||||
'000905.SH': '中证500', '000852.SH': '中证1000',
|
||||
'932000.CSI': '中证2000', '000510.SH': '中证A500',
|
||||
'000688.SH': '科创50', '399006.SZ': '创业板指',
|
||||
}
|
||||
|
||||
|
||||
def name_map():
|
||||
"""只读ETF基础资料;缺名显示代码,不借用同代码股票名称。"""
|
||||
"""只读基金全名与跟踪指数;简称按指数代码确定,不从基金名称猜测。"""
|
||||
from app.db import session as db
|
||||
try:
|
||||
rows = db.fetch_all('SELECT ts_code,csname,index_code,index_name FROM gp_etf_basic WHERE ts_code LIKE :sh OR ts_code LIKE :sz', {'sh': '%.SH', 'sz': '%.SZ'})
|
||||
result = {}
|
||||
for row in rows:
|
||||
code = str(row.get('ts_code') or '')
|
||||
if subject_allowed('ETF', code):
|
||||
result[code] = str(row.get('csname') or code)
|
||||
if not subject_allowed('ETF', code):
|
||||
continue
|
||||
index = str(row.get('index_code') or '')
|
||||
result[code] = {'full_name': str(row.get('csname') or code), 'index_code': index}
|
||||
if subject_allowed('INDEX', index):
|
||||
result[index] = str(row.get('index_name') or index)
|
||||
result[index] = {'full_name': str(row.get('index_name') or index), 'index_code': index}
|
||||
return result
|
||||
except Exception:
|
||||
return {}
|
||||
|
||||
|
||||
def short_name(name, code):
|
||||
text = str(name or code)
|
||||
for old, new in [('工银瑞信', '工银'), ('华泰柏瑞', '华泰'), ('上证科创板50成份增强策略', '科创50'),
|
||||
('上证科创板50成份', '科创50'), ('中证A500', 'A500'), ('中证2000', '2000'), ('交易型开放式指数证券投资基金', ''),
|
||||
('交易型开放式指数', ''), ('证券投资基金', ''), ('ETF', '')]:
|
||||
text = text.replace(old, new)
|
||||
return text if 0 < sum(1 if ord(c) < 128 else 2 for c in text) <= 10 else code.split('.')[0]
|
||||
|
||||
|
||||
def presentation(state, at, names=None):
|
||||
names = names or {}
|
||||
data = copy.deepcopy(state)
|
||||
|
|
@ -241,9 +241,12 @@ def presentation(state, at, names=None):
|
|||
rows = []
|
||||
for item in data.get('events', {}).values():
|
||||
e = item['event']
|
||||
full = names.get(e['subject_id']) or ('宽基ETF' if e['subject_type'] == 'MARKET' else e['subject_id'])
|
||||
profile = names.get(e['subject_id']) or {}
|
||||
full = profile.get('full_name') or ('宽基ETF' if e['subject_type'] == 'MARKET' else e['subject_id'])
|
||||
index = e['subject_id'] if e['subject_type'] == 'INDEX' else profile.get('index_code')
|
||||
label = '宽基' if e['subject_type'] == 'MARKET' else INDEX_LABELS.get(index, e['subject_id'].split('.')[0])
|
||||
stale = e['event_state'] not in contract.ACTIVE_STATES or at >= datetime.fromisoformat(e['valid_until'])
|
||||
rows.append({**e, 'name': full if e['subject_type'] == 'INDEX' and len(full) <= 9 else short_name(full, e['subject_id']), 'full_name': full,
|
||||
rows.append({**e, 'name': label, 'full_name': full,
|
||||
'observation': item['observation'], 'member_count': item.get('member_count'),
|
||||
'received_at': item['received_at'], 'stale': stale,
|
||||
'display_state': 'EXPIRED' if stale and e['event_state'] in contract.ACTIVE_STATES else e['event_state']})
|
||||
|
|
|
|||
|
|
@ -10,6 +10,6 @@
|
|||
- 后续页面修改沿用现有布局、字号、间距、配色、组件和交互习惯。新增信息优先融入原有区域,不另起一套视觉样式;整体改版以用户明确要求为准。
|
||||
- 信号流按已确认原型保持完整单行,顺序为时间、持仓或关注标签、可点击股票名称、原信号系统名称、原信号短内容、原级别。保留“决策系统”“资金分布”等用户可理解的现有名称,不改为内部项目名。持仓标签优先,关注与持仓共用现有信号入口、排序、上限和分类,不另设关注区;无真实信号不占行。研究观察、每日完成、等待和超时均留在原个股详情,不生成信号行。不增加原始读数、长理由、行内折叠或展开按钮;原有效期和其他信号规则保持。
|
||||
- 看多红、看空绿、中性灰、无读数虚框。指标的冷暖阈值柱图沿用现有蓝、金、灰,不把阈值高低强行解释成看多看空。
|
||||
- 宽基信号行不加“宽基”“15分”“日内”等前置标签,保留“宽基观测”来源、信号短内容和级别;观察范围留在悬停或详情中。普通股票的持仓、关注和计划标签保持原规则。
|
||||
- 宽基信号行不加“宽基”“15分”“日内”等前置标签,保留“宽基观测”来源、信号短内容和级别;观察范围留在悬停或详情中。宽基名称按跟踪指数显示固定类别简称,不显示基金公司,不从全名删词猜测;同类产品不合并信号,点击仍查看对应基金全名和代码,不增加名称悬停。普通股票的持仓、关注和计划标签保持原规则。
|
||||
- 策略展示为“主观量化”和“微盘轮动”,持仓分别用标签页。数量和阈值来自当前规则,不能把30或50写死;策略详情新标签页打开,不替换当前管理页。
|
||||
- 明确区分计划数量、实际委托、受理、成交与入账。没有出口委托不能显示“已下单”,请求失败或旧行情不能显示成正常完成。
|
||||
|
|
|
|||
|
|
@ -887,7 +887,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
<div v-for="(g,i) in sigBriefHeld" :key="'h'+i" class="sigrow2 signal-flow" :class="{old:g.stale,'etf-flow':g.flowKind==='etf'}">
|
||||
<span class="t mono" :title="g.time">{{ flowTime(g) }}</span>
|
||||
<span v-if="flowLabel(g)" class="pin" :class="{plan:flowLabel(g)!=='持仓'}">{{ flowLabel(g) }}</span>
|
||||
<button class="nm" :class="{'etf-name':g.flowKind==='etf'}" :title="g.full_name || g.ts_code+' · 查看信号与研究'" @click.stop="openFlowSignal(g)">{{ g.flowKind==='etf' ? g.name : nm(g.ts_code) }}</button>
|
||||
<button class="nm" :class="{'etf-name':g.flowKind==='etf'}" :title="g.flowKind==='etf' ? null : (g.full_name || g.ts_code+' · 查看信号与研究')" @click.stop="openFlowSignal(g)">{{ g.flowKind==='etf' ? g.name : nm(g.ts_code) }}</button>
|
||||
<span class="cat">{{ g.cat }}</span>
|
||||
<span v-if="g.direction" class="direction" :class="g.flowKind==='etf'?g.directionClass:dirCls(g.direction)" :title="g.flowKind==='etf'?g.captionDetail:null">{{ g.direction }}</span>
|
||||
<span class="sp"></span>
|
||||
|
|
@ -900,7 +900,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
<div v-for="(g,i) in sigBriefOther" :key="'o'+i" class="sigrow2 signal-flow" :class="{old:g.stale,'etf-flow':g.flowKind==='etf'}">
|
||||
<span class="t mono" :title="g.time">{{ flowTime(g) }}</span>
|
||||
<span v-if="flowLabel(g)" class="pin" :class="{plan:flowLabel(g)!=='持仓'}">{{ flowLabel(g) }}</span>
|
||||
<button class="nm" :class="{'etf-name':g.flowKind==='etf'}" :title="g.full_name || g.ts_code+' · 查看信号与研究'" @click.stop="openFlowSignal(g)">{{ g.flowKind==='etf' ? g.name : nm(g.ts_code) }}</button>
|
||||
<button class="nm" :class="{'etf-name':g.flowKind==='etf'}" :title="g.flowKind==='etf' ? null : (g.full_name || g.ts_code+' · 查看信号与研究')" @click.stop="openFlowSignal(g)">{{ g.flowKind==='etf' ? g.name : nm(g.ts_code) }}</button>
|
||||
<span class="cat">{{ g.cat }}</span>
|
||||
<span v-if="g.direction" class="direction" :class="g.flowKind==='etf'?g.directionClass:dirCls(g.direction)" :title="g.flowKind==='etf'?g.captionDetail:null">{{ g.direction }}</span>
|
||||
<span class="sp"></span>
|
||||
|
|
@ -917,7 +917,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
<div v-for="(g,i) in sigOld.slice(0,60)" :key="'d'+i" class="sigrow2 signal-flow history-row old">
|
||||
<span class="t mono" :title="g.time">{{ flowTime(g) }}</span>
|
||||
<span v-if="flowLabel(g)" class="pin" :class="{plan:flowLabel(g)!=='持仓'}">{{ flowLabel(g) }}</span>
|
||||
<button class="nm" :class="{'etf-name':g.flowKind==='etf'}" :title="g.full_name || g.ts_code+' · 查看信号与研究'" @click.stop="openFlowSignal(g)">{{ g.flowKind==='etf' ? g.name : nm(g.ts_code) }}</button>
|
||||
<button class="nm" :class="{'etf-name':g.flowKind==='etf'}" :title="g.flowKind==='etf' ? null : (g.full_name || g.ts_code+' · 查看信号与研究')" @click.stop="openFlowSignal(g)">{{ g.flowKind==='etf' ? g.name : nm(g.ts_code) }}</button>
|
||||
<span class="cat">{{ g.cat }}</span>
|
||||
<span v-if="g.direction" class="direction" :class="g.flowKind==='etf'?g.directionClass:dirCls(g.direction)" :title="g.flowKind==='etf'?g.captionDetail:null">{{ g.direction }}</span>
|
||||
<span class="sp"></span>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -92,3 +92,14 @@
|
|||
12:53:04实际页面及health均HTTP200,服务返回页面与候选逐字一致,已确认宽基前置标签为空。运行中三条宽基信号仍按原有效期淡色显示,未为验收延长或制造新信号;观察服务12:52:57自然304正常。12:53:08连续确认1826683,缺口、待入账、孤儿及在途委托均0,数量差异为空、现金差0,资金快照4.6秒。
|
||||
|
||||
证据见[信号标签发布](evidence/etf_label_release_20261113.json)。备份`/home/factor/project/tradingSystem/backups/etf-label-20261113-ad5b1a6`,候选日志`/tmp/pms-etf-label-offline-ad5b1a6.log`。回退仅将web镜像恢复`pms:etf-today-654577f`并定向重建,不用完整旧覆盖文件覆盖其他服务后续修改。代码已推送并核对远程;本次无待完成事项,不新增观察任务。
|
||||
|
||||
|
||||
## 按跟踪指数统一宽基简称
|
||||
|
||||
用户确认名称以ETF类别为主,不保留基金公司、不新增名称悬停,点击保持原基金详情。13:04:48只读核对155当日宽基监测池177只成员及`gp_etf_basic`,全部有跟踪指数:上证50 12只、沪深300 30只、中证500 29只、中证1000 15只、中证2000 14只、中证A500 40只、科创50 20只、创业板指17只。这里只覆盖已接入的沪深宽基监测池,不扩展其他ETF或北交所证券。
|
||||
|
||||
简称直接按指数代码映射,去掉旧的基金名称删词及超长回退规则。未知或缺少指数资料时保留代码,不根据名称猜测类别。资料沿用原小时缓存与只读查询,不增加采集任务。相同类别的基金仍按原事件ID逐条保留,点击仍显示对应基金全名和代码,不把个别基金告警合并为指数组结论。增强产品的具体身份留在原详情。名称悬停移除,其他股票交互及宽基观察范围详情保持。
|
||||
|
||||
开发机32项ETF专项、页面三道护栏通过;新增50类区分、同类双事件及原始详情保留、未知归属不猜测、基础资料范围等边界用例。实际177只资料在断网环境回放,映射全部命中;当前三条自然事件除展示简称外字段不变。1440和390隔离浏览器验证单行无溢出、无前置标签及名称悬停,点击中证500仍打开嘉实159922详情,控制台无错误。账号区域为预览样例,不将预览中的“无后端”提示当作运行故障。
|
||||
|
||||
全量目录见[简称核对清单](evidence/etf_name_catalog_20261113.json)。修改仅用于web展示读取,独立观测消费与交易worker无需追平版本。候选断网及实际发布结果随后登记。
|
||||
|
|
|
|||
|
|
@ -125,6 +125,56 @@ 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 DisplayNameTests(TestCase):
|
||||
def state(self, codes):
|
||||
state = svc.initial(DAY)
|
||||
for i, code in enumerate(codes):
|
||||
event, _, _ = fixture()
|
||||
event.update(subject_type='ETF', subject_id=code, event_id='name-test-'+str(i))
|
||||
state['events'][event['event_id']] = {'event': event, 'observation': {}, 'received_at': NOW.isoformat()}
|
||||
return state
|
||||
|
||||
def test_index_code_decides_label_not_fund_name(self):
|
||||
names = {'510050.SH': {'full_name': '合成科创50名称', 'index_code': '000016.SH'},
|
||||
'588000.SH': {'full_name': '合成上证50增强名称', 'index_code': '000688.SH'}}
|
||||
rows = svc.presentation(self.state(names), NOW, names)['events']
|
||||
self.assertEqual({r['subject_id']: r['name'] for r in rows},
|
||||
{'510050.SH': '上证50', '588000.SH': '科创50'})
|
||||
|
||||
def test_same_category_keeps_two_events_and_original_details(self):
|
||||
names = {'510300.SH': {'full_name': '合成甲基金', 'index_code': '000300.SH'},
|
||||
'159300.SZ': {'full_name': '合成乙增强基金', 'index_code': '000300.SH'}}
|
||||
state = self.state(names); before = copy.deepcopy(state)
|
||||
rows = svc.presentation(state, NOW, names)['events']
|
||||
self.assertEqual(len(rows), 2)
|
||||
self.assertEqual({r['name'] for r in rows}, {'沪深300'})
|
||||
for row in rows:
|
||||
self.assertEqual(row['full_name'], names[row['subject_id']]['full_name'])
|
||||
self.assertEqual(row['event_id'], state['events'][row['event_id']]['event']['event_id'])
|
||||
self.assertEqual(state, before)
|
||||
|
||||
def test_missing_or_unknown_index_does_not_guess_from_name(self):
|
||||
names = {'159001.SZ': {'full_name': '合成中证500ETF', 'index_code': 'UNKNOWN'}}
|
||||
rows = svc.presentation(self.state(['159001.SZ', '159002.SZ']), NOW, names)['events']
|
||||
self.assertEqual({r['subject_id']: r['name'] for r in rows},
|
||||
{'159001.SZ': '159001', '159002.SZ': '159002'})
|
||||
state = self.state(['159001.SZ'])
|
||||
state['events']['name-test-0']['event'].update(subject_type='INDEX', subject_id='000688.SH')
|
||||
self.assertEqual(svc.presentation(state, NOW)['events'][0]['name'], '科创50')
|
||||
|
||||
def test_catalog_preserves_index_metadata_and_excludes_disallowed_exchange(self):
|
||||
from app.db import session as db
|
||||
rows = [{'ts_code': '159001.SZ', 'csname': '合成基金', 'index_code': '000905.SH', 'index_name': '中证500'},
|
||||
{'ts_code': '920001.BJ', 'csname': '不纳入范围', 'index_code': '000688.SH', 'index_name': '科创50'}]
|
||||
with patch.object(db, 'fetch_all', return_value=rows) as fetch:
|
||||
names = svc.name_map()
|
||||
fetch.assert_called_once()
|
||||
self.assertEqual(names['159001.SZ'], {'full_name': '合成基金', 'index_code': '000905.SH'})
|
||||
self.assertEqual(names['000905.SH']['full_name'], '中证500')
|
||||
self.assertNotIn('920001.BJ', names)
|
||||
self.assertNotIn('000688.SH', names)
|
||||
|
||||
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',
|
||||
|
|
|
|||
Loading…
Reference in New Issue