From 0630e55321fbe0e673e3d3c9b64ad01b04d4c392 Mon Sep 17 00:00:00 2001 From: baobao Date: Thu, 12 Nov 2026 12:38:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8F=90=E8=AE=AE=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E5=88=86=E6=9E=90=E4=BF=AE=E5=A4=8D=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=A0=B8=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DEVLOG.md | 6 + .../trader_panel_release_20261112.json | 405 ++++++++++++++++++ docs/开发入口.md | 2 +- docs/提议中性与缺失状态展示_2026-11-12.md | 2 + ...提议当前分析与交易员表达修复_2026-11-12.md | 20 +- 5 files changed, 433 insertions(+), 2 deletions(-) create mode 100644 docs/evidence/trader_panel_release_20261112.json diff --git a/DEVLOG.md b/DEVLOG.md index 523a22c..83e7ea4 100644 --- a/DEVLOG.md +++ b/DEVLOG.md @@ -3057,3 +3057,9 @@ a44c994于10:53:29仅发布155的web,镜像pms:proposal-copy-a44c994。开发 ## 2026年11月12日12:21 提议当前分析与确认含义修复 按用户指令统一普通候选、关注和详情的有效技术依据,待确认提议附当前分析,实质变化交正常扫描重评并在确认接口拦旧依据。页面去除“当时未取得”“待信号”,保留真实中性,分别解释买入依据不足与多空分歧;确认操作说明条件计划含义,执行等待原因按实际情况拆开。读取故障不退旧建仓路径,原始历史与已采纳计划不重写。开发机85组全量、19专项、页面三护栏和1440/390隔离浏览器通过;候选断网和发布结果见[发布接续](docs/提议当前分析与交易员表达修复_2026-11-12.md)。 + +### 2026年11月12日12:36 提议当前分析修复发布判收 + +12:34:58仅更新155 web、worker为trader-panel-ee1d970,代码ee1d970。最终开发机与候选各85组断网回归、19专项、页面三护栏、1440/390隔离浏览器及247源码摘要通过。只暂停目标消费并等空后重建,新worker已恢复;其他25容器、原源码/.env及唯一WS不变。 + +真实接口0.883秒,16条待处理中6条可确认;此前10条缺技术结论均已取得当前有效判断,旧建议按实际限制处理。德赛看多但择时依据不足,苏试仍中性。12:35序号1803361连续,缺口/待入账/孤儿/在途0,数量与现金差0。12:36自然消费正常,午间扫描与执行按规则跳过;午后重评及新执行判定未冒充已通过。无模型、信号或交易注入,无长期观察。见[发布接续](docs/提议当前分析与交易员表达修复_2026-11-12.md)。 diff --git a/docs/evidence/trader_panel_release_20261112.json b/docs/evidence/trader_panel_release_20261112.json new file mode 100644 index 0000000..5c70afd --- /dev/null +++ b/docs/evidence/trader_panel_release_20261112.json @@ -0,0 +1,405 @@ +{ + "code": "ee1d97093de32811935b6aba2e2e5fbccf85dd72", + "image_tag": "pms:trader-panel-ee1d970", + "image_id": "sha256:8ca9ada4a69eaac369ecfab926310d653e2882ee5a6ea8f8a7bed768ff4f3e89", + "deployed_beijing": "2026-11-12T12:34:58+08:00", + "container_verification": { + "at_utc": "2026-11-12T04:35:27.390046", + "total": 27, + "unchanged_other": 25, + "targets": [ + { + "name": "/pms-web", + "id": "72c1f5ae6666", + "image": "sha256:8ca9ada4a69eaac369ecfab926310d653e2882ee5a6ea8f8a7bed768ff4f3e89", + "started": "2026-11-12T04:34:57.765763804Z", + "health": "healthy" + }, + { + "name": "/pms-worker", + "id": "bb6bd2ed2c6c", + "image": "sha256:8ca9ada4a69eaac369ecfab926310d653e2882ee5a6ea8f8a7bed768ff4f3e89", + "started": "2026-11-12T04:34:57.764935906Z", + "health": null + } + ], + "root_head": "8413bce9c13527d031e587e390754ba6b2b92c4f", + "private_env_unchanged": true + }, + "health": { + "at": "2026-11-12T12:35:22.728807", + "prefix": "", + "pending": 0, + "orphan": 0, + "open_orders": 0, + "cash_difference": 0.0, + "valuation_ready": true, + "reconciliation": { + "ok": true, + "diffs": [], + "fixes": [], + "errors": [], + "severity": "OK", + "source": "ws", + "note": "策略数量之和核对账户;不猜测差异归属,不自动把差异并入任何策略" + }, + "funds": { + "seq": 1803355, + "received_at": "2026-11-12 12:34:54", + "age_sec": 28.4 + } + }, + "sequence": { + "last": 1803361, + "acked": 1803361, + "gap": 0 + }, + "runtime_readonly": { + "at": "2026-11-12T12:35:37.338888", + "prefix": "", + "proposal_api_seconds": 0.883, + "health": { + "status": "ok", + "version": "0.2.0-dev", + "service": "pms-web", + "now": "2026-11-12 12:35:30", + "trade_day": true, + "calendar_degraded": false, + "db_ok": true + }, + "html_sha256": "17d3e6eeceb27798a7a22777cb537a59c743741954c506140a14bb1ae9f01f2e", + "ready": 6, + "rows": [ + { + "code": "002920.SZ", + "ready": false, + "prepare_reason": "有效择时证据不足,暂不建仓", + "old_tech": "无读数", + "current_tech": "看多", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "观察", + "analysis_changed": true + }, + { + "code": "300354.SZ", + "ready": false, + "prepare_reason": "有效择时证据不足,暂不建仓", + "old_tech": "无读数", + "current_tech": "看多", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "观察", + "analysis_changed": true + }, + { + "code": "002128.SZ", + "ready": true, + "prepare_reason": "建议正在准备,完成后可采纳", + "old_tech": "中性", + "current_tech": "中性", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "交人", + "analysis_changed": false + }, + { + "code": "300416.SZ", + "ready": true, + "prepare_reason": "建议正在准备,完成后可采纳", + "old_tech": "中性", + "current_tech": "中性", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "交人", + "analysis_changed": false + }, + { + "code": "300182.SZ", + "ready": true, + "prepare_reason": "建议正在准备,完成后可采纳", + "old_tech": "看多", + "current_tech": "看多", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "交人", + "analysis_changed": false + }, + { + "code": "603699.SH", + "ready": false, + "prepare_reason": "有效择时证据不足,暂不建仓", + "old_tech": "无读数", + "current_tech": "看多", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "观察", + "analysis_changed": true + }, + { + "code": "300408.SZ", + "ready": false, + "prepare_reason": "有效择时证据不足,暂不建仓", + "old_tech": "无读数", + "current_tech": "看多", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "观察", + "analysis_changed": true + }, + { + "code": "688111.SH", + "ready": false, + "prepare_reason": "暂不建仓:等技术面转向", + "old_tech": "无读数", + "current_tech": "看空", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "观察", + "analysis_changed": true + }, + { + "code": "605319.SH", + "ready": true, + "prepare_reason": "建议正在准备,完成后可采纳", + "old_tech": "中性", + "current_tech": "中性", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "交人", + "analysis_changed": false + }, + { + "code": "002415.SZ", + "ready": true, + "prepare_reason": "建议正在准备,完成后可采纳", + "old_tech": "中性", + "current_tech": "中性", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "交人", + "analysis_changed": false + }, + { + "code": "002970.SZ", + "ready": false, + "prepare_reason": "暂不建仓:等技术面转向", + "old_tech": "无读数", + "current_tech": "看空", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "观察", + "analysis_changed": true + }, + { + "code": "603288.SH", + "ready": true, + "prepare_reason": "建议正在准备,完成后可采纳", + "old_tech": "中性", + "current_tech": "中性", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "交人", + "analysis_changed": false + }, + { + "code": "603893.SH", + "ready": false, + "prepare_reason": "有效择时证据不足,暂不建仓", + "old_tech": "无读数", + "current_tech": "看多", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "观察", + "analysis_changed": true + }, + { + "code": "300693.SZ", + "ready": false, + "prepare_reason": "有效择时证据不足,暂不建仓", + "old_tech": "无读数", + "current_tech": "看多", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "观察", + "analysis_changed": true + }, + { + "code": "300627.SZ", + "ready": false, + "prepare_reason": "暂不建仓:等技术面转向", + "old_tech": "无读数", + "current_tech": "看空", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "观察", + "analysis_changed": true + }, + { + "code": "002353.SZ", + "ready": false, + "prepare_reason": "分析结论已更新,交易计划复核后可确认", + "old_tech": "无读数", + "current_tech": "中性", + "current_tech_date": 20261111, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "old_route": "交人", + "current_route": "交人", + "analysis_changed": true + } + ], + "research": { + "002920.SZ": { + "tech": { + "stance": "看多", + "phase": "开口向上", + "data_date": 20261111 + }, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "consensus": { + "direction": "看多", + "votes": { + "fund": "看多", + "tech": "看多", + "timing": "无读数" + }, + "strength": "中", + "reason": "基本面看多、技术面看多、择时无读数 → 看多·中", + "route": "观察", + "route_reason": "等待新的有效合成择时", + "disp": "wait_timing" + } + }, + "300416.SZ": { + "tech": { + "stance": "中性", + "phase": "收口等待", + "data_date": 20261111 + }, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "consensus": { + "direction": "看多", + "votes": { + "fund": "看多", + "tech": "中性", + "timing": "无读数" + }, + "strength": "弱", + "reason": "基本面看多、技术面中性、择时无读数 → 看多·弱", + "route": "交人", + "route_reason": "方向看多但只有一方表态" + } + }, + "300364.SZ": { + "tech": { + "stance": "看多", + "phase": "开口向上", + "data_date": 20261111 + }, + "timing": { + "label": "买入依据不足", + "reason": "有效择时证据尚不足以支持买入" + }, + "consensus": { + "direction": "中性", + "votes": { + "fund": "看空", + "tech": "看多", + "timing": "无读数" + }, + "strength": null, + "reason": "基本面看空、技术面看多、择时无读数 → 中性", + "route": "交人", + "route_reason": "基本面看空、技术面看多,试探仓" + } + } + } + }, + "worker_queues": { + "celery@bb6bd2ed2c6c": [ + "celery" + ] + }, + "offline_suites_each": 85, + "focused_cases": 19, + "source_files": 247, + "browser": { + "sizes": [ + "1440x1000", + "390x844" + ], + "kind": "保存的真实响应与纯规则组合隔离复现", + "javascript_errors": 0, + "horizontal_overflow": false + }, + "natural_acceptance": "午间调度正常,proposal_scan等按原规则跳过非交易时段;午后重评尚未判收。无测试交易或模型注入。" +} diff --git a/docs/开发入口.md b/docs/开发入口.md index 8a5e2a2..9f7ccfe 100644 --- a/docs/开发入口.md +++ b/docs/开发入口.md @@ -1,6 +1,6 @@ # 开发资料入口 -11月12日按用户“直接修复”统一提议与详情的当前分析、旧建议确认保护及交易员文案,见[实施与发布接续](提议当前分析与交易员表达修复_2026-11-12.md)。开发机已验证,实际候选和发布状态以文末续记为准。 +11月12日按用户“直接修复”统一提议与详情的当前分析、旧建议确认保护及交易员文案,见[实施与发布接续](提议当前分析与交易员表达修复_2026-11-12.md)。12:34:58已仅发布155 web与worker;真实接口已确认10条技术缺失恢复,午间自然调度正常,午后重评尚待自然发生。 11月12日按用户要求重新审视提议、技术面、择时与人工确认,见[交易员视角分析](交易员视角下的提议与执行面板审视_2026-11-12.md)。上一轮“当时未取得”“待信号”设计未获用户认可;已确认取数路径与操作含义存在问题,本轮仅分析,未再次部署。 diff --git a/docs/提议中性与缺失状态展示_2026-11-12.md b/docs/提议中性与缺失状态展示_2026-11-12.md index 8bb0d95..1e51af3 100644 --- a/docs/提议中性与缺失状态展示_2026-11-12.md +++ b/docs/提议中性与缺失状态展示_2026-11-12.md @@ -1,5 +1,7 @@ # 提议中性与缺失状态展示 +后续状态:本页描述的展示已被用户否定;11月12日12:34的[当前分析修复](提议当前分析与交易员表达修复_2026-11-12.md)已替代该版本。以下保留当时的操作与证据。 + 最新核验:2026年11月12日11:26:02,北京时间。11:25:24已仅发布155模拟PMS的web,开发机与候选断网全量、页面和发布核验通过。 ## 用户反馈与当前结论 diff --git a/docs/提议当前分析与交易员表达修复_2026-11-12.md b/docs/提议当前分析与交易员表达修复_2026-11-12.md index c62c9c3..4449d09 100644 --- a/docs/提议当前分析与交易员表达修复_2026-11-12.md +++ b/docs/提议当前分析与交易员表达修复_2026-11-12.md @@ -1,6 +1,6 @@ # 提议当前分析与交易员表达修复 -2026年11月12日12:21,北京时间。按用户“直接修复”实施;开发机验证完成,候选镜像与155发布结果在文末续记。前置分析见[交易员视角审视](交易员视角下的提议与执行面板审视_2026-11-12.md)。 +2026年11月12日12:21,北京时间。按用户“直接修复”实施;开发机验证完成;12:34:58已发布155的web与worker,12:35至12:36实际核验如下。前置分析见[交易员视角审视](交易员视角下的提议与执行面板审视_2026-11-12.md)。 ## 改动 @@ -23,3 +23,21 @@ Python 3.11隔离入口85组全量通过,新增19项专项覆盖技术数据 目标仅155模拟PMS的web、worker;唯一WS、beat、行情采集、微盘监控和其他系统保持。部署前复核真实配置、任务和资金对账,先提交代码、构建候选并断网全量,再温和等完在途任务后定向重建。原目录源码和私有.env不变。 回退只恢复本次两个服务的原镜像配置,不回退提议、历史依据、账本或回报。自然重评可能依法将旧建议转为观察,不应为恢复旧卡片重新改写提议。 + +## 实际发布与当前状态 + +最终代码`ee1d97093de32811935b6aba2e2e5fbccf85dd72`已提交推送并核对远程。镜像`pms:trader-panel-ee1d970`,ID `sha256:8ca9ada4a69eaac369ecfab926310d653e2882ee5a6ea8f8a7bed768ff4f3e89`。开发机及最终候选各85组隔离全量通过,专项19项,247份源码摘要与Git匹配。前序候选仅隔离回归,未切换到运行服务。 + +12:34:58使用原Compose项目tradingsystem,仅以`--no-deps --no-build --force-recreate`重建web、worker。重建前仅暂停目标worker消费,确认在途及预取任务均为0;新worker已自动恢复celery队列。排空检查临时脚本首次因模块路径失败,补明确/app路径后检查通过,没有终止在途任务。 + +web容器`72c1f5ae6666`健康,worker为`bb6bd2ed2c6c`。两者环境、挂载均与原来相同;其余25容器的标识、镜像、启动时间保持。原源码HEAD仍8413bce,私有.env字节不变,用户买入和执行暂停均false。唯一WS、beat、采集、微盘监控及188均未操作。 + +12:35实际HTTP首页与候选源码一致,数据库和页面健康。只读提议接口耗时0.883秒;当时16条待处理记录中,6条仍可确认,其余10条以实际限制进入未建仓候选。此前10条缺失技术依据均取得有效判断,包含看多、中性和看空,未将缺失统一改成中性。德赛技术面看多、开口向上,实际提示为“有效择时证据不足,暂不建仓”;苏试仍为技术中性、收口等待。金山办公、锐明技术及华测导航的当前技术看空也得到识别。历史提议依据保持,未回填成当时已取得。 + +12:35:22确认序号1803361连续,缺口、待入账、孤儿、在途均0;策略数量合计与账户一致,现金差0.0,资金年龄28.4秒,估值可用。12:36自然任务已正常消费,人工关注同步返回9只;proposal_scan、执行依据刷新、盘中执行及成交回放按原规则跳过午间非交易时段。这证明新worker消费恢复,不等于午后自然重评或新委托已验收。没有触发测试研判、虚构信号、手工重评或测试委托,没有恢复长期观察。 + +当前仍待自然判收的是午后重评旧建议和新的执行等待记录;页面及确认接口已即时阻止采纳分析发生实质变化的旧建议。已采纳计划保持,不重新下单。 + +发布目录`/home/factor/project/pms-releases/trader-panel-ee1d970`;备份`/home/factor/project/tradingSystem/backups/trader-panel-20261112-ee1d970`;候选断网日志`/tmp/pms-trader-panel-offline-ee1d970.log`。必要时仅将两个目标服务分别回退至原web `pms:proposal-labels-4d9818b`、原worker `pms:proposal-evidence-639dcc7`,保留业务记录与回报。 + +脱敏实际证据见[发布摘要](evidence/trader_panel_release_20261112.json)。