修复提议技术依据展示与异步结果收取
This commit is contained in:
parent
e677ed56e9
commit
60440adb8e
|
|
@ -3017,3 +3017,7 @@ PMS最终代码56db0fd已推送,155 web/WS/beat为execution-2b1c447,worker
|
|||
开发机和188候选镜像985项断网全量通过,新增27项边界验证。真实缺失掩码回放的窗口有效记录12/12/10恢复到30/30/26。17:27:56仅重建188两个ITD消费者,新增worker运行2b9f96b,三容器健康,其他47容器标识、镜像和启动时间不变,188真实PMS未动。155无重建和参数修改。初始候选缺requests的问题在消费者切换前改为标准库并重新回归。
|
||||
|
||||
收盘后实际读到5只持仓和8只关注;官方两接口只读连通性通过,但没有自动采集、造信号或盘后追跑。盘中时效与候选覆盖等待自然调度,未创建观察任务。镜像、范围、回退及证据见[发布接续](docs/分钟缓存与异步补齐发布接续_2026-11-11.md)。
|
||||
|
||||
## 2026年11月12日 提议技术依据与异步结果收取复核
|
||||
|
||||
针对中文在线缺少技术行的截图,确认其提议已保存11月11日看多技术读数,页面错误依赖盘前映射导致隐藏。另发现中文在线和苏试试验的上游规则检查早已完成,PMS逐票预算延迟结果查询,最终覆盖为通用超时。已改为展示提议快照,并在原每分钟扫描前有限收取已有请求;保留原截止、证据校验、人工确认及全部交易门槛。开发机84组隔离全量、异步32项、页面三护栏及桌面/窄屏重放通过。服务器发布和自然判收后续见[接续](docs/提议依据展示与异步收取修复_2026-11-12.md)。
|
||||
|
|
|
|||
|
|
@ -286,9 +286,12 @@ def execution_cancel_confirm():
|
|||
def proposal_scan():
|
||||
if not param_store.get_bool('PMS_JUDGE_ASYNC_ENABLED', False):
|
||||
return {'skipped': '异步研判未开启'}
|
||||
from app.services import proposal_service, daily_buy_review
|
||||
from app.services import proposal_service, daily_buy_review, judge_async, judge
|
||||
# 已完成结果不能因候选排序、资金检查或待确认提议刷新耗尽预算而饿死。
|
||||
collected = judge_async.collect_pending(judge.base_url())
|
||||
review = daily_buy_review.process()
|
||||
result = proposal_service.scan_and_route()
|
||||
result['judge_results'] = collected
|
||||
result['daily_buy_review'] = review
|
||||
return result
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import hashlib
|
|||
import json
|
||||
import logging
|
||||
import re
|
||||
import time
|
||||
import uuid
|
||||
from datetime import timedelta
|
||||
|
||||
|
|
@ -153,3 +154,64 @@ def resumable_reasks(now=None):
|
|||
scope = doc['scope']
|
||||
values[(scope['code'],scope['action'])] = copy.deepcopy(doc['reask'])
|
||||
return values
|
||||
|
||||
|
||||
def collect_pending(base, now=None):
|
||||
"""优先收取已登记请求;只保存结果,不重跑候选、不发模型任务或交易动作。"""
|
||||
out = {'polled': 0, 'completed': 0, 'errors': []}
|
||||
if not param_store.get_bool('PMS_JUDGE_ASYNC_ENABLED', False):
|
||||
return out
|
||||
current = local_now(now)
|
||||
end = time.monotonic() + max(0, param_store.get_int('PMS_JUDGE_ASYNC_POLL_BUDGET_SEC', 8))
|
||||
rows = [r for r in repo.recent(KIND, 1000)
|
||||
if (r['value'].get('scope') or {}).get('day') == str(current.date())
|
||||
and r['value'].get('submitted') and not r['value'].get('result')]
|
||||
rows.sort(key=lambda r: r['value'].get('deadline_at') or '')
|
||||
import requests
|
||||
for row in rows:
|
||||
saved = row['value']
|
||||
code = str((saved.get('scope') or {}).get('code') or '')
|
||||
if not re.fullmatch(r'(?:60[0-9]{4}\.SH|68[0-9]{4}\.SH|00[0-9]{4}\.SZ|30[0-9]{4}\.SZ)', code):
|
||||
continue
|
||||
current = local_now(now)
|
||||
left = end-time.monotonic()
|
||||
if left < .1:
|
||||
break
|
||||
due = timestamp(saved.get('deadline_at'))
|
||||
if not due or current >= due:
|
||||
continue # 不延长截止时间,不补收已过期结果。
|
||||
timeout = min(max(1, param_store.get_int('PMS_JUDGE_ASYNC_HTTP_TIMEOUT', 3)),
|
||||
left, (due-current).total_seconds())
|
||||
try:
|
||||
with repo.locked(row['id'], KIND, {}) as doc:
|
||||
lease = timestamp(doc.get('poll_until'))
|
||||
if (doc.get('request_id') != saved['request_id'] or doc.get('result')
|
||||
or (lease and current < lease)):
|
||||
continue
|
||||
doc['poll_until'] = (current+timedelta(seconds=timeout+2)).isoformat()
|
||||
response = requests.get(base+'/api/intraday/pms_judge_result/'+saved['request_id'], timeout=timeout)
|
||||
response.raise_for_status()
|
||||
data = response.json()
|
||||
finished = local_now(now)
|
||||
out['polled'] += 1
|
||||
with repo.locked(row['id'], KIND, {}) as doc:
|
||||
if doc.get('request_id') != saved['request_id'] or doc.get('result'):
|
||||
continue # 新证据和其他消费者已保存的结果优先。
|
||||
doc.pop('poll_until', None)
|
||||
if finished >= timestamp(doc['deadline_at']):
|
||||
data = {'verdict':'UNAVAILABLE', 'reason':'结果到达时已超过截止时间,转人工确认', 'error_code':'EXPIRED'}
|
||||
elif (not isinstance(data, dict) or data.get('request_id') != doc['request_id']
|
||||
or (data.get('verdict') in ('PASS','REJECT','PENDING') and
|
||||
data.get('evidence_fingerprint') != doc['fingerprint'])):
|
||||
data = {'verdict':'UNAVAILABLE', 'reason':'研判结果编号或证据不匹配,转人工确认', 'error_code':'INVALID_RESPONSE'}
|
||||
if data.get('error_code') == 'NOT_FOUND':
|
||||
doc['submitted'] = False
|
||||
elif data.get('verdict') != 'PENDING':
|
||||
doc['result'] = data
|
||||
doc['completed_at'] = finished.isoformat()
|
||||
doc['cache_until'] = (finished+timedelta(seconds=param_store.get_int('PMS_JUDGE_ASYNC_CACHE_SEC',120))).isoformat()
|
||||
out['completed'] += 1
|
||||
# delivered仍由逐票评估设置;收取结果不等于采纳结果。
|
||||
except Exception as exc:
|
||||
out['errors'].append({'ts_code':code, 'error':type(exc).__name__})
|
||||
return out
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@ RUNTIME_EXTRA = {
|
|||
'PMS_JUDGE_ASYNC_DEADLINE_SEC': (120, int, '含排队时间的研判总截止秒数'),
|
||||
'PMS_JUDGE_ASYNC_CACHE_SEC': (120, int, '相同研究依据结果可复用时间,秒'),
|
||||
'PMS_JUDGE_ASYNC_SCAN_BUDGET_SEC': (20, int, '每轮异步研判登记与查询总预算,秒'),
|
||||
'PMS_JUDGE_ASYNC_POLL_BUDGET_SEC': (8, int, '每轮扫描前收取已登记研判结果的独立预算,秒'),
|
||||
|
||||
"PMS_DAILY_BUY_REVIEW": (False, bool, "跨日买入先撤旧委托,再按当日候选、研判、数量和价格完整复核;未通过不得续单"),
|
||||
'PMS_ROTATION_MODE': ('observe', str, '微盘轮换模式:observe观察、paper独立纸面、auto自动。自动须通过验收门槛'),
|
||||
|
|
@ -602,6 +603,7 @@ _RANGES = {
|
|||
'PMS_JUDGE_ASYNC_DEADLINE_SEC': (10, 180),
|
||||
'PMS_JUDGE_ASYNC_CACHE_SEC': (0, 3600),
|
||||
'PMS_JUDGE_ASYNC_SCAN_BUDGET_SEC': (0, 3600),
|
||||
'PMS_JUDGE_ASYNC_POLL_BUDGET_SEC': (0, 30),
|
||||
'PMS_EXEC_MAX_SLIPPAGE_PCT': (0, 0.1),
|
||||
'PMS_EXEC_MINUTE_SLIPPAGE_PCT': (0, 0.05),
|
||||
|
||||
|
|
|
|||
|
|
@ -1396,7 +1396,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
<div class="prop-src-row" v-if="propJudgeTag(p)" @click="openPropDetail(p,'judge')">
|
||||
<span class="lbl">决策系统</span>
|
||||
<span class="ptag" :class="propJudgeTag(p).cls">{{ propJudgeTag(p).text }}</span>
|
||||
<span class="sub" v-if="(p.hard_numbers||{}).judge_conf!=null">把握 {{ (p.hard_numbers||{}).judge_conf }}</span><i class="car">›</i>
|
||||
<span class="sub">{{ propJudgeSub(p) }}</span><i class="car">›</i>
|
||||
</div>
|
||||
<!-- 三个维度与抽屉、候选栏同一套 (2026-09-15): 基本面 / 技术面 / 择时, 立场词按看多红看空绿中性灰。
|
||||
合计那一行不再重复显示 —— 结论已在建议档位里; 点择时可看三路意见与系统结论。 -->
|
||||
|
|
@ -2387,11 +2387,19 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
</template>
|
||||
|
||||
<template v-else-if="propDetailKind==='tech'">
|
||||
<div class="cs-sect">
|
||||
<div class="h">提议形成时</div>
|
||||
<span class="ptag" :class="propTechTag(propDetailP).cls">{{ propTechTag(propDetailP).text }}</span>
|
||||
<span class="st">{{ propTechSub(propDetailP) }}</span>
|
||||
<div class="st muted">{{ propTechSnapshot(propDetailP).reason || propTechSnapshot(propDetailP).no_read_why || '该提议未保存技术依据' }}</div>
|
||||
<div class="st muted" v-if="propTechSnapshot(propDetailP).data_date">读数日 {{ propTechSnapshot(propDetailP).data_date }}</div>
|
||||
</div>
|
||||
<div class="cs-sect"><div class="h">当前技术读数</div></div>
|
||||
<div class="muted" v-if="propTechErr">{{ propTechErr }}</div>
|
||||
<div class="muted" v-else-if="!propTechFull">正在读技术面…</div>
|
||||
<template v-else>
|
||||
<div style="display:flex;align-items:center;gap:8px;margin-bottom:8px;flex-wrap:wrap">
|
||||
<span class="ptag" :class="propTechTag(propDetailP).cls">{{ propTechFull.stance }}<template v-if="propTechFull.strength"> · {{ propTechFull.strength }}</template></span>
|
||||
<span class="ptag" :class="dimCls(propTechFull.stance)">{{ propTechFull.stance }}<template v-if="propTechFull.strength"> · {{ propTechFull.strength }}</template></span>
|
||||
<span class="muted" v-if="propTechFull.phase">{{ propTechFull.phase }}</span>
|
||||
<span class="ptag warn" v-if="propTechFull.choppy">震荡市</span>
|
||||
<span class="spacer"></span>
|
||||
|
|
@ -2400,7 +2408,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
<div class="prop-metric" v-if="propTechFull.latest">
|
||||
<div class="m"><span class="nm">布林线<template v-if="(propTechFull.latest.boll||{}).bw_pct!=null"><span class="dt"> · 带宽 {{ (propTechFull.latest.boll||{}).bw_pct }}%</span></template><template v-if="(propTechFull.latest.boll||{}).squeeze"><span class="dt"> · 收口</span></template></span><span class="ptag accent" v-if="(propTechFull.latest.boll||{}).state">{{ (propTechFull.latest.boll||{}).state }}</span></div>
|
||||
<div class="m"><span class="nm">多空布林线</span><span class="ptag accent" v-if="(propTechFull.latest.bbi||{}).state">{{ (propTechFull.latest.bbi||{}).state }}</span></div>
|
||||
<div class="m"><span class="nm">SAR 跟踪止损<template v-if="(propTechFull.latest.sar||{}).value!=null"><span class="dt"> · 止损位 {{ (propTechFull.latest.sar||{}).value }}</span></template><template v-if="propTechFull.sar_flip_days!=null"><span class="dt"> · 翻向 {{ propTechFull.sar_flip_days }} 天</span></template></span><span class="ptag" :class="propTechTag(propDetailP).cls" v-if="(propTechFull.latest.sar||{}).side">{{ (propTechFull.latest.sar||{}).side }}</span></div>
|
||||
<div class="m"><span class="nm">SAR 跟踪止损<template v-if="(propTechFull.latest.sar||{}).value!=null"><span class="dt"> · 止损位 {{ (propTechFull.latest.sar||{}).value }}</span></template><template v-if="propTechFull.sar_flip_days!=null"><span class="dt"> · 翻向 {{ propTechFull.sar_flip_days }} 天</span></template></span><span class="ptag" :class="dimCls(propTechFull.stance)" v-if="(propTechFull.latest.sar||{}).side">{{ (propTechFull.latest.sar||{}).side }}</span></div>
|
||||
</div>
|
||||
<div class="st muted" v-if="propTechFull.reason">{{ propTechFull.reason }}</div>
|
||||
</template>
|
||||
|
|
@ -2411,7 +2419,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
|
|||
<template v-else>
|
||||
<div style="display:flex;align-items:center;gap:8px;margin-bottom:10px;flex-wrap:wrap" v-if="propTimingTag(propDetailP)">
|
||||
<span class="ptag" :class="propTimingTag(propDetailP).cls">{{ propTimingTag(propDetailP).text }}</span>
|
||||
<span class="st">{{ propTimingSub(propDetailP) || '决策系统昨夜没有这只票的结论' }}</span>
|
||||
<span class="st">{{ propTimingSub(propDetailP) || '该提议未取得有效择时方向' }}</span>
|
||||
</div>
|
||||
<div class="cs-sect"><div class="h">三路意见</div>
|
||||
<div class="prop-metric">
|
||||
|
|
@ -3862,18 +3870,29 @@ createApp({
|
|||
return String(p.judge_verdict || '').trim() === 'PASS'
|
||||
? { text: '通过', cls: 'accent' } : { text: '需人工确认', cls: 'warn' };
|
||||
};
|
||||
const propJudgeSub = (p) => {
|
||||
if (p.judge_verdict === 'UNAVAILABLE') return /超时|等待时间|截止/.test(p.judge_reason || '') ? '研判超时' : '研判不可用';
|
||||
const confidence = (p.hard_numbers || {}).judge_conf;
|
||||
return confidence == null ? '' : '把握 ' + confidence;
|
||||
};
|
||||
const propCompanyTag = (p) => {
|
||||
const c = cr(p);
|
||||
if (!c || !c.overall) return null;
|
||||
return { text: '质地' + c.overall, cls: c.overall === '好' ? 'accent' : (c.overall === '差' ? 'warn' : 'neutral') };
|
||||
};
|
||||
// 提议与另外两票统一使用形成时保存的依据,不能由当前映射覆盖或隐藏。
|
||||
const propTechSnapshot = (p) => {
|
||||
const h = (p && p.hard_numbers) || {};
|
||||
if (h.tech && typeof h.tech === 'object') return h.tech;
|
||||
const stance = ((h.consensus || {}).votes || {}).tech;
|
||||
return stance ? { stance, reason: h.tech_text } : {};
|
||||
};
|
||||
const propTechTag = (p) => {
|
||||
const t = p.tech;
|
||||
if (!t || !t.stance) return null;
|
||||
return { text: t.stance, cls: t.stance === '看多' ? 'up' : (t.stance === '看空' ? 'down' : 'neutral') };
|
||||
const t = propTechSnapshot(p);
|
||||
return { text: t.stance || '无读数', cls: dimCls(t.stance) };
|
||||
};
|
||||
const propTechSub = (p) => {
|
||||
const t = p.tech || {}, bits = [];
|
||||
const t = propTechSnapshot(p), bits = [];
|
||||
if (t.phase) bits.push(t.phase);
|
||||
if (t.sar_side) bits.push('SAR ' + t.sar_side);
|
||||
return bits.join(' · ');
|
||||
|
|
@ -3891,7 +3910,6 @@ createApp({
|
|||
const propFundTag = (p) => {
|
||||
const fs = ((p.hard_numbers || {}).fund_stance || {}).stance, c = cr(p);
|
||||
const st = fs || (c && c.overall ? (c.overall === '好' ? '看多' : (c.overall === '差' ? '看空' : '中性')) : null);
|
||||
if (!st && !c) return null;
|
||||
return { text: st || '无读数', cls: dimCls(st) };
|
||||
};
|
||||
const propFundSub = (p) => {
|
||||
|
|
@ -3904,8 +3922,7 @@ createApp({
|
|||
// 择时行: 硬数字里的 timing (合议六键), 昨夜定性翻成中文。
|
||||
const NIGHT_CN = { BUY: '建议买入', WATCH: '观望', SELL: '建议卖出', AVOID: '回避', DROPPED: '已剔除' };
|
||||
const propTimingTag = (p) => {
|
||||
const t = (p.hard_numbers || {}).timing;
|
||||
if (!t) return null;
|
||||
const t = (p.hard_numbers || {}).timing || {};
|
||||
return { text: t.stance || '无读数', cls: dimCls(t.stance) };
|
||||
};
|
||||
const propTimingSub = (p) => {
|
||||
|
|
@ -3946,12 +3963,12 @@ createApp({
|
|||
function openPropDetail(p, kind) {
|
||||
propDetailP.value = p; propDetailKind.value = kind; propDetailOpen.value = true;
|
||||
propTechFull.value = null; propTechErr.value = '';
|
||||
if (kind === 'tech') loadPropTech(p.ts_code);
|
||||
if (kind === 'tech') loadPropTech(p);
|
||||
}
|
||||
function closePropDetail() { propDetailOpen.value = false; }
|
||||
async function loadPropTech(code) {
|
||||
const d = await call('get', '/api/research/' + encodeURIComponent(code));
|
||||
if (!propDetailOpen.value || propDetailKind.value !== 'tech') return;
|
||||
async function loadPropTech(p) {
|
||||
const d = await call('get', '/api/research/' + encodeURIComponent(p.ts_code));
|
||||
if (!propDetailOpen.value || propDetailKind.value !== 'tech' || propDetailP.value !== p) return;
|
||||
if (d && d.ok === false) { propTechErr.value = d.error || '读不到技术面'; return; }
|
||||
const data = (d && d.data) ? d.data : d;
|
||||
propTechFull.value = (data && data.tech) || null;
|
||||
|
|
@ -5682,7 +5699,7 @@ createApp({
|
|||
propScale, propAmount, propExpiry, propSizePct, propAdviceTier, propSizeMismatch, propResized, propJudgeShort,
|
||||
propMoreOpen, togglePropMore,
|
||||
// 2026-09-12 提议卡重构: 来源结论标签 + 详情弹窗
|
||||
cr, propPlanTag, propPlanSub, propJudgeTag, propCompanyTag, propTechTag, propTechSub,
|
||||
cr, propPlanTag, propPlanSub, propJudgeTag, propJudgeSub, propCompanyTag, propTechSnapshot, propTechTag, propTechSub,
|
||||
propCon, propConsensusTag, propConsensusSub,
|
||||
propFundTag, propFundSub, propTimingTag, propTimingSub, propConclusion, dimCls, dimsOf, dimTip,
|
||||
propDetailOpen, propDetailKind, propDetailP, propTechFull, propTechErr, PROP_SRC_LABEL,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
# 开发资料入口
|
||||
|
||||
11月12日提议卡片技术依据与异步收取核验,见[修复接续](提议依据展示与异步收取修复_2026-11-12.md)。中文在线技术读数已保存,原页面漏显;异步结果收取改为扫描前优先查询,交易门槛不变。
|
||||
|
||||
人工关注缺评析豁免已于11月12日09:26定向发布155,见[规则与发布接续](人工关注缺评析门槛调整_2026-11-12.md)。仅有效人工关注缺评析时基本面弃权,技术与择时双看多继续建仓评估;普通候选及其他风控保持。候选84组断网全量通过,自然缺评析建仓尚无样本。
|
||||
|
||||
分钟缓存已于11月11日17:27在188定向发布,见[缓存与异步补齐发布接续](分钟缓存与异步补齐发布接续_2026-11-11.md)。仅两个ITD消费者和新增worker,985项断网回归通过;自然盘中时效待判收。第三方行情源保持只读,接口与一年归档表的研究边界见[可行性评估](分钟数据补齐可行性与工作价值_2026-11-11.md)。
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
# 提议依据展示与异步收取修复
|
||||
|
||||
最新核验:2026年11月12日10:03,北京时间。开发机修复与验证已完成;本节尚不是服务器发布回执,发布结果补充于末节。
|
||||
|
||||
## 两张自然提议的实际依据
|
||||
|
||||
09:42只读核对155模拟PMS的原始提议、页面装配、技术映射和研判请求,并对照188 Bionic已有任务记录;没有发送模型请求、测试委托或更改提议。
|
||||
|
||||
| 股票 | 提议形成时基本面 | 提议形成时技术面 | 择时与路由 |
|
||||
| --- | --- | --- | --- |
|
||||
| 中文在线 300364.SZ | 看空,质地差、估值贵 | 看多、强,开口向上、SAR多;数据日11月11日 | 无读数;意见冲突,沿原规则转人工确认1%试探仓600股 |
|
||||
| 苏试试验 300416.SZ | 看多,质地好、估值便宜 | 中性,收口等待、SAR多;数据日11月11日 | 无读数;只有一方明确看多,沿原弱表态规则转人工确认1%试探仓1500股 |
|
||||
|
||||
中文在线的技术分析已经保存在提议`hard_numbers.tech`。页面却只读盘前技术映射装配的`p.tech`,中文在线不在该映射,整行被隐藏。动态补读技术数据的分析路径没有缺失,是提议卡片选错了展示来源。
|
||||
|
||||
两张提议都有评析,均未使用本次“有效人工关注缺评析时弃权”的豁免。中文在线明确看空仍然参与冲突判断。当前弱表态或意见冲突允许提交人工试探提议,研判不可用强制人工确认;这与自动建仓通过是不同状态。读取时两张均为WAIT_USER,没有这两张提议对应的实际下单。采纳仍经过现有计划版本、资格、数量、资金与执行依据检查;本次没有改变人工降级路径或自动交易门槛。
|
||||
|
||||
## 超时根因
|
||||
|
||||
中文在线请求09:31:08.106995登记,截止09:33:08.106995;上游09:31:08.122839已完成规则检查。苏试试验请求09:36:20.455284登记,截止09:38:20.455284;上游09:36:20.497096已完成规则检查。两者实际结果都是“合成择时未转多或证据版本已变化,等待按新证据评估”,不是模型长时间运算。
|
||||
|
||||
PMS的提议扫描每分钟自然运行,但候选处理共用20秒预算。前序候选的计划核验、提议刷新等耗时,使后序请求结果迟迟没被读取。中文在线直到09:36:25、苏试试验直到09:39:22落人工提议,均已超过120秒截止,最终显示通用超时。上游和PMS的迟到保护都不能补接已过期结果,因此不能通过延长有效期、回写旧提议来修饰本次记录。
|
||||
|
||||
## 本次修复边界
|
||||
|
||||
1. 提议技术行优先读取形成时保存的技术依据;旧提议仅有合议技术票时使用该历史票,不能用当前读数冒充历史依据。基本面、技术面、择时均保留行,缺失明确显示无读数。
|
||||
2. 技术详情沿原有组件分列“提议形成时”和“当前技术读数”。切换股票后,前一股票的迟到页面响应不能覆盖后一股票。决策系统保留原名称,短文案区分研判超时和其他不可用。
|
||||
3. 每分钟原有提议扫描先收取当日已登记的沪深异步结果,再处理每日复核和候选。仅查询、持久化已有结果,不提交新模型任务,不标记已采纳,也不发交易动作。
|
||||
4. 独立收取预算由ParamStore的`PMS_JUDGE_ASYNC_POLL_BUDGET_SEC`读取,默认8秒,可设0至30秒;各请求仍受原HTTP超时和原120秒总截止约束。旧请求、过期结果及证据不匹配不能授权交易,网络失败保留待收状态,未找到请求仍沿原编号重试路径。
|
||||
5. 保留截图中的历史提议与原超时审计,不重新生成或改写历史结果。本次不修改Bionic、QMT、三组权重、分批比例、试探仓条件和已发布的缺评析规则。
|
||||
|
||||
## 开发机验证
|
||||
|
||||
使用Python 3.11隔离环境运行`python scripts/run_tests.py`,84组全量通过,末行为`ALL SUITES PASS`。其中异步相关32项通过,新增覆盖13个排队请求优先收取、无重复提交、预算和开关、网络失败、截止包含网络耗时、旧请求隔离、证据校验和原编号重试。页面三道护栏通过。
|
||||
|
||||
隔离浏览器以09:42真实只读提议响应重放,其他区域为已有预览桩,不是实际登录验收。1440×1000与390×844检查通过:中文在线技术行完整,苏试试验原读数保持,技术详情可打开和关闭,窄屏未超出侧栏,控制台无JS错误。未触碰采纳或驳回按钮。预览中“无后端”等提示来自未模拟的其他接口,不能作为服务器健康判断。
|
||||
|
||||
本机证据目录:`/private/tmp/pms-proposal-audit-20261112`,包含原始只读提议、上下游请求时间、日志、断网测试与浏览器截图。私有原始响应不提交Git。
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
人工关注独立观察发布、回执有效性与只读展示专项23例。
|
||||
|
||||
包含 (例数按 2026-10-26 隔离回归实跑校正):
|
||||
test_batch57_units.py 异步请求持久化、截止时间、旧结果隔离、失败续查、真实调度入口及行情来源 (24例)
|
||||
test_batch57_units.py 异步请求持久化、截止时间、旧结果隔离、结果优先收取、真实调度入口及行情来源 (32例)
|
||||
test_batch56_units.py 微盘v3冻结候选、按序递补与部分成交保护 (40例)
|
||||
test_batch55_units.py 共同撤换状态、报价、依据监控与取消确认 (34例)
|
||||
test_sim_reset_units.py 双账本重置、空仓证据、配置与去重保留、幂等及SQL回滚 (9例)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ class AsyncJudgeTests(unittest.TestCase):
|
|||
yield value
|
||||
self.docs[key] = value
|
||||
patch.object(ja.repo,'locked',locked).start()
|
||||
patch.object(ja.repo,'recent',side_effect=lambda *a:[{'value':v} for v in self.docs.values()]).start()
|
||||
patch.object(ja.repo,'recent',side_effect=lambda *a:[{'id':k,'value':copy.deepcopy(v)} for k,v in self.docs.items()]).start()
|
||||
self.post = patch('requests.post',side_effect=self.submit).start()
|
||||
self.get = patch('requests.get',side_effect=self.poll).start()
|
||||
self.state = 'PENDING'
|
||||
|
|
@ -89,6 +89,76 @@ class AsyncJudgeTests(unittest.TestCase):
|
|||
self.state='PASS';self.ask();self.ask(NOW+timedelta(seconds=10))
|
||||
self.assertEqual(self.post.call_count,1);self.get.assert_not_called()
|
||||
|
||||
def test_collect_completed_results_before_candidate_budget_or_ranking(self):
|
||||
for i in range(13):
|
||||
self.c['ts_code']=self.payload['ts_code']=f'6000{i:02d}.SH'
|
||||
self.ask()
|
||||
def complete(url, **kwargs):
|
||||
doc=next(d for d in self.docs.values() if url.endswith(d['request_id']))
|
||||
return self.response({'request_id':doc['request_id'],'evidence_fingerprint':doc['fingerprint'],
|
||||
'verdict':'UNAVAILABLE','reason':'合成择时未转多'})
|
||||
self.get.side_effect=complete
|
||||
result=ja.collect_pending('http://stub',NOW+timedelta(seconds=60))
|
||||
self.assertEqual(result,{'polled':13,'completed':13,'errors':[]})
|
||||
self.assertEqual(self.post.call_count,13)
|
||||
self.assertTrue(all(not d.get('delivered') for d in self.docs.values()))
|
||||
self.assertEqual(self.ask(NOW+timedelta(seconds=125))['reason'],'合成择时未转多')
|
||||
self.assertEqual(self.get.call_count,13)
|
||||
|
||||
def test_collector_does_not_poll_expired_or_unsubmitted(self):
|
||||
self.ask();ja.collect_pending('http://stub',NOW+timedelta(seconds=121))
|
||||
self.get.assert_not_called()
|
||||
doc=next(iter(self.docs.values()));doc['submitted']=False
|
||||
ja.collect_pending('http://stub',NOW+timedelta(seconds=60));self.get.assert_not_called()
|
||||
|
||||
def test_collector_preserves_new_request_on_old_http_reply(self):
|
||||
self.ask()
|
||||
def change(*a,**kw):
|
||||
next(iter(self.docs.values()))['request_id']='new-request'
|
||||
self.state='PASS';return self.answer()
|
||||
self.get.side_effect=change
|
||||
ja.collect_pending('http://stub',NOW+timedelta(seconds=60))
|
||||
doc=next(iter(self.docs.values()))
|
||||
self.assertEqual(doc['request_id'],'new-request');self.assertNotIn('result',doc)
|
||||
|
||||
def test_collector_rejects_wrong_fingerprint(self):
|
||||
self.ask()
|
||||
self.get.side_effect=lambda *a,**k:self.response({'verdict':'PASS',
|
||||
'request_id':self.sent['request_id'],'evidence_fingerprint':'wrong'})
|
||||
ja.collect_pending('http://stub',NOW+timedelta(seconds=60))
|
||||
self.assertEqual(next(iter(self.docs.values()))['result']['error_code'],'INVALID_RESPONSE')
|
||||
|
||||
def test_collector_deadline_includes_http_time(self):
|
||||
self.ask();self.state='PASS'
|
||||
with patch.object(ja,'local_now',side_effect=[NOW,NOW+timedelta(seconds=119),NOW+timedelta(seconds=121)]):
|
||||
ja.collect_pending('http://stub')
|
||||
self.assertEqual(next(iter(self.docs.values()))['result']['error_code'],'EXPIRED')
|
||||
|
||||
def test_collector_budget_and_flag_stop_network(self):
|
||||
self.ask();original=ja.param_store.get_int
|
||||
# 显式模拟预算关闭,避免受到已缓存参数的影响。
|
||||
with patch.object(ja.param_store,'get_int',side_effect=lambda k,d=0:
|
||||
0 if k=='PMS_JUDGE_ASYNC_POLL_BUDGET_SEC' else original(k,d)):
|
||||
ja.collect_pending('http://stub',NOW+timedelta(seconds=60))
|
||||
self.get.assert_not_called()
|
||||
with patch.object(ja.param_store,'get_bool',return_value=False):
|
||||
ja.collect_pending('http://stub',NOW+timedelta(seconds=60))
|
||||
self.get.assert_not_called()
|
||||
|
||||
def test_collector_transport_failure_keeps_pending(self):
|
||||
self.ask();self.get.side_effect=TimeoutError('isolated')
|
||||
out=ja.collect_pending('http://stub',NOW+timedelta(seconds=60))
|
||||
self.assertEqual(out['completed'],0);self.assertEqual(out['errors'][0]['error'],'TimeoutError')
|
||||
self.assertNotIn('result',next(iter(self.docs.values())))
|
||||
|
||||
def test_collector_not_found_reuses_same_request_for_next_submit(self):
|
||||
self.ask();rid=self.sent['request_id']
|
||||
self.get.side_effect=lambda *a,**k:self.response({'verdict':'UNAVAILABLE',
|
||||
'request_id':rid,'error_code':'NOT_FOUND'})
|
||||
ja.collect_pending('http://stub',NOW+timedelta(seconds=60))
|
||||
self.ask(NOW+timedelta(seconds=61))
|
||||
self.assertEqual(self.sent['request_id'],rid);self.assertEqual(self.post.call_count,2)
|
||||
|
||||
def test_late_old_response_cannot_replace_new_request(self):
|
||||
self.ask()
|
||||
def replace(*a,**kw):
|
||||
|
|
@ -181,6 +251,7 @@ class SchedulerEntryTests(unittest.TestCase):
|
|||
patch.object(scheduler.td,'is_trade_day',return_value=True).start()
|
||||
patch.object(scheduler,'in_session',return_value=True).start()
|
||||
self.model = patch.object(proposal_service,'scan_and_route',return_value={'ok':True}).start()
|
||||
self.collect = patch.object(ja,'collect_pending',return_value={'polled':0,'completed':0,'errors':[]}).start()
|
||||
self.review = patch.object(daily_buy_review,'process',return_value={'waiting':[]}).start()
|
||||
self.refresh = patch.object(execution_basis,'refresh',return_value={'enabled':True}).start()
|
||||
self.monitor = patch.object(execution_basis,'monitor',return_value={'cancelled':[]}).start()
|
||||
|
|
@ -204,9 +275,14 @@ class SchedulerEntryTests(unittest.TestCase):
|
|||
self.model.assert_called_once_with();self.review.assert_called_once_with()
|
||||
|
||||
def test_async_proposal_entry_runs_its_own_daily_review(self):
|
||||
order=[]
|
||||
self.collect.side_effect=lambda *a:order.append('collect') or {}
|
||||
self.review.side_effect=lambda:order.append('review') or {}
|
||||
self.model.side_effect=lambda:order.append('scan') or {'ok':True}
|
||||
result=self.sch.proposal_scan.run()
|
||||
self.assertTrue(result['ok'])
|
||||
self.review.assert_called_once_with();self.model.assert_called_once_with()
|
||||
self.assertEqual(order,['collect','review','scan'])
|
||||
|
||||
def test_basis_refresh_entry_uses_new_flag(self):
|
||||
result = self.sch.execution_basis_refresh.run()
|
||||
|
|
|
|||
Loading…
Reference in New Issue