diff --git a/DEVLOG.md b/DEVLOG.md index 9af7c2c..1aca0fa 100644 --- a/DEVLOG.md +++ b/DEVLOG.md @@ -1,5 +1,11 @@ # 开发节点记录(三系统量化交易) +## 2026年11月16日 技术读数保存修复(候选待发布) + +按用户授权推送并核验既有整改时,13:54读取155自然提议任务发现:任务状态虽为成功,内部仍有8项提议保存错误及1项当日买入复核错误。数据库技术日线中的DECIMAL值经`latest`进入提议审计,普通JSON保存失败;不能据任务成功声称业务链路全部正常。这是共享读数输出类型问题,不是预算或交易判断变化。 + +仅在技术读数输出边界转换已有数字,保留原始数据库行、缺失值、方向、预算与数量。新增两项测试通过真实提议仓库的JSON保存路径,先复现相同错误,再验证新提议及当日复核可以保存。开发机Python3.12专项21项与全部88组断网回归通过。将基于155各角色实际镜像叠加本次补丁,经候选断网全量后只重建web与worker;服务器候选、实际发布和自然回执仍待后续记录。本次不启用整体合理性分析中的待讨论方案。 + ## 2026年11月16日11:08 试探预算约束发布155 提交`6c5afe2`于11:05:35定向更新155的web与worker。开发机87组全量及41项预算专项通过;155候选web 87组、worker 86组断网全量通过,按各自实际镜像应用补丁,保留角色差异及原测试范围。排空后再次核对无在途再重建,其他28容器及唯一WS不变,私有配置、环境、挂载和业务参数保持。 diff --git a/app/services/tech_service.py b/app/services/tech_service.py index be37448..dc75b65 100644 --- a/app/services/tech_service.py +++ b/app/services/tech_service.py @@ -389,16 +389,16 @@ def attach(rows, states=None): def _row_view(r: dict) -> dict: - """一行落表读数 → 页面友好的三块 (布林/多空布林/SAR)。""" + """已有日线的三块读数;转成JSON数值供页面和提议审计共用。""" return { - "data_date": r.get("data_date"), - "boll": {"upper": r.get("boll_upper"), "mid": r.get("boll_mid"), "lower": r.get("boll_lower"), - "bw_pct": r.get("boll_bw_pct"), "pos": r.get("boll_pos"), + "data_date": _i(r.get("data_date")), + "boll": {"upper": _f(r.get("boll_upper")), "mid": _f(r.get("boll_mid")), "lower": _f(r.get("boll_lower")), + "bw_pct": _f(r.get("boll_bw_pct")), "pos": _f(r.get("boll_pos")), "state": r.get("boll_state"), "squeeze": bool(r.get("boll_squeeze"))}, - "bbi": {"bbi": r.get("bbi"), "pos": r.get("bbi_pos"), - "state": r.get("bbi_state"), "dist_pct": r.get("bbi_dist_pct")}, - "sar": {"value": r.get("sar_value"), "side": r.get("sar_side"), - "flip_days": r.get("sar_flip_days"), "dist_pct": r.get("sar_dist_pct")}, + "bbi": {"bbi": _f(r.get("bbi")), "pos": _f(r.get("bbi_pos")), + "state": r.get("bbi_state"), "dist_pct": _f(r.get("bbi_dist_pct"))}, + "sar": {"value": _f(r.get("sar_value")), "side": r.get("sar_side"), + "flip_days": _i(r.get("sar_flip_days")), "dist_pct": _f(r.get("sar_dist_pct"))}, "quality": r.get("quality"), "reanchored": bool(r.get("reanchored")), } diff --git a/scripts/run_tests.py b/scripts/run_tests.py index a4f418b..c206b6d 100644 --- a/scripts/run_tests.py +++ b/scripts/run_tests.py @@ -205,7 +205,7 @@ HERE = os.path.dirname(os.path.abspath(__file__)) ROOT = os.path.dirname(HERE) # 退出纪律专项:两次独立清仓信号、评级下降、事务、双策略隔离及撤单收尾。 SUITES = [ - "test_proposal_trader_view.py", # 当前分析、旧确认保护及交易员操作含义(19例) + "test_proposal_trader_view.py", # 当前分析、数据库读数保存及旧确认保护(21例) "test_watch_missing_fund.py", "test_timing_fusion.py", # 三组证据契约、二次清仓可达性与恢复(19例) "test_signal_recovery.py", # 最新方向、停买恢复、网格合议、关注入口与负净成本(16例) diff --git a/scripts/test_proposal_trader_view.py b/scripts/test_proposal_trader_view.py index 72b01a6..6db9df4 100644 --- a/scripts/test_proposal_trader_view.py +++ b/scripts/test_proposal_trader_view.py @@ -1,10 +1,13 @@ -"""交易员面板:当前依据一致、缺失不等于中性、旧确认与执行条件隔离(19例)。""" +"""交易员面板:当前依据一致、数据库读数可保存、旧确认与执行条件隔离(21例)。""" import unit_test_guard import os import sys sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) import copy +import json import unittest +from contextlib import nullcontext +from decimal import Decimal from unittest.mock import patch from datetime import datetime from app.core import proposal_analysis as pa, plan_revision @@ -127,4 +130,42 @@ class TechnicalCoverageTests(unittest.TestCase): tech.read_states_for([CODE,'920000.BJ']) self.assertEqual(read.call_args.args[0],[CODE]) + def decimal_reading(self): + row={'data_date':20261111,'sar_side':'long','sar_flip_days':2, + 'quality':'OK','reanchored':1,'boll_squeeze':0, + **{k:Decimal('23.125') for k in ('boll_upper','boll_mid','boll_lower', + 'boll_bw_pct','boll_pos','bbi','bbi_pos','bbi_dist_pct','sar_value','sar_dist_pct')}} + with patch.object(tech_repo,'history_multi',return_value={CODE:[row]}): + result=tech.read_states_for([CODE])[CODE] + self.assertIsInstance(row['sar_value'],Decimal) + return result + + def test_database_numeric_reading_can_be_saved_in_new_proposal(self): + h=hard();h['tech']=self.decimal_reading() + c={'ts_code':CODE,'action':'OPEN','qty':100,'reason':'等待人工确认','hard_numbers':h} + with patch.object(ps.param_store,'get_int',return_value=60),\ + patch.object(ps.param_store,'get_bool',return_value=False),\ + patch.object(pms_repo,'get_proposal',return_value=None),\ + patch.object(pms_repo,'execute',return_value=1) as execute: + ps._make_proposal(c,23.125,{'verdict':'UNAVAILABLE','confidence':0}) + saved=json.loads(execute.call_args.args[1]['hn']) + self.assertEqual(saved['tech']['latest']['sar']['value'],23.125) + self.assertEqual(saved['tech']['stance'],h['tech']['stance']) + self.assertEqual(execute.call_args.args[1]['qty'],100) + + def test_database_numeric_reading_can_be_saved_in_daily_confirmation(self): + from app.services import daily_buy_review as daily + h=hard();h['tech']=self.decimal_reading() + c={'ts_code':CODE,'action':'OPEN','qty':100,'hard_numbers':h,'confirm_why':'等待人工确认'} + ins={'instruction_id':'existing','ts_code':CODE,'action':'OPEN','progress':{}} + with patch.object(daily,'transaction',return_value=nullcontext()),\ + patch.object(daily,'_save',return_value=True),\ + patch.object(pms_repo,'get_proposal',return_value=None),\ + patch.object(pms_repo,'execute',return_value=1) as execute: + self.assertTrue(daily._queue(ins,{'candidate':c,'verdict':{'verdict':'UNAVAILABLE'}},NOW)) + saved=json.loads(execute.call_args.args[1]['hn']) + self.assertEqual(saved['tech']['latest']['boll']['upper'],23.125) + self.assertEqual(saved['daily_parent'],'existing') + self.assertEqual(execute.call_args.args[1]['qty'],100) + if __name__=='__main__':unittest.main()