diff --git a/DEVLOG.md b/DEVLOG.md index 4164068..4f1ed75 100644 --- a/DEVLOG.md +++ b/DEVLOG.md @@ -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)。 diff --git a/app/scheduler.py b/app/scheduler.py index 7d0cfb8..a880ad8 100644 --- a/app/scheduler.py +++ b/app/scheduler.py @@ -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 diff --git a/app/services/judge_async.py b/app/services/judge_async.py index 50b3b34..d331570 100644 --- a/app/services/judge_async.py +++ b/app/services/judge_async.py @@ -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 diff --git a/app/services/param_store.py b/app/services/param_store.py index b33d97f..62f1656 100644 --- a/app/services/param_store.py +++ b/app/services/param_store.py @@ -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), diff --git a/app/web/static/index.html b/app/web/static/index.html index 8b18f7c..fc21662 100644 --- a/app/web/static/index.html +++ b/app/web/static/index.html @@ -1396,7 +1396,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}
决策系统 {{ propJudgeTag(p).text }} - 把握 {{ (p.hard_numbers||{}).judge_conf }}› + {{ propJudgeSub(p) }}›
@@ -2387,11 +2387,19 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}