Compare commits
2 Commits
e7c9aac476
...
e677ed56e9
| Author | SHA1 | Date |
|---|---|---|
|
|
e677ed56e9 | |
|
|
ad6bff2d80 |
10
DEVLOG.md
10
DEVLOG.md
|
|
@ -1,5 +1,15 @@
|
|||
# 开发节点记录(三系统量化交易)
|
||||
|
||||
## 2026-11-12 09:28 人工关注缺评析规则定向发布
|
||||
|
||||
按用户批准,将侧会话提交ad6bff2发布到155模拟PMS,仅web与worker于09:26:45重建,镜像pms:watch-fund-ad6bff2。开发机96项相关隔离测试通过,155候选Python 3.11下84组断网全量ALL SUITES PASS,本机3.9的两组兼容错误未复现。目标worker暂停新消费后等待在途自然结束;其他25个容器、唯一WS、私有环境与挂载保持不变,188未操作。
|
||||
|
||||
09:27自然关注同步、信号消费、回放及提议扫描正常;确认与落库1800349,缺口/待入账/孤儿/在途0,双策略数量和现金差0。估值等待盘前行情。09:28实际9只关注均已有评析,缺评析双看多自然建仓尚无样本,不把隔离验证写成自然成交。规则边界、镜像、备份及回退见[发布接续](docs/人工关注缺评析门槛调整_2026-11-12.md)。
|
||||
|
||||
## 2026-11-12 人工关注缺评析不再一票否决(仅本地)
|
||||
|
||||
按用户要求,在独立本地仓库修改人工关注的新建仓入口:有效关注缺买方评析时基本面弃权,技术面与择时双看多继续评估,首次合议、盘中复议及仓位建议一致。普通候选、明确风险、评级下降退出和已有持仓恢复规则保持。开发机新增专项及相关回归96项通过;全量84组中2组存在Python 3.9事件循环错误,未修改基线复现相同7项错误,未写成全量通过。未部署、未推送、未触发模型或交易任务,见[修改与验证接续](docs/人工关注缺评析门槛调整_2026-11-12.md)。
|
||||
|
||||
## 2026-11-11 按独立信息研究信号权重
|
||||
|
||||
按用户澄清,不使用未来收益或买卖成功率。只读提取24个已结束交易日的沪深信号,先固定协议,再做来源去重、共同观察相关和时间匹配。资金流强度与资金分布相关0.898,长期对照0.888,应合组。发现QRS354条中337条引用旧日线,实际告警循环未清跨日日线缓存,九组断网边界含真实缓存类复现通过。仅将原公式重算作为单列探索对照,得到三基础组36/32/32点估计,日期及股票重采样均覆盖等权,建议三组各1/3,Bionic组合研判不另增独立预算。未改线上规则或上游服务,根因和待办见[研究接续](docs/信号独立性权重研究接续_2026-11-11.md)。
|
||||
|
|
|
|||
|
|
@ -11,6 +11,11 @@ valuation 估值、grade_counts 十视角计数、groups 三类、doubt_hard 硬
|
|||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import date, datetime
|
||||
from zoneinfo import ZoneInfo
|
||||
|
||||
from app.core.command_spec import is_stock_code, normalize_code
|
||||
|
||||
_GROUPS = ("回报与护城河", "盈余质量与财务安全", "成长与含金量")
|
||||
|
||||
DEFAULTS = {
|
||||
|
|
@ -19,6 +24,31 @@ DEFAULTS = {
|
|||
}
|
||||
|
||||
|
||||
def manual_watch_missing_fund(row, fund, *, now=None) -> bool:
|
||||
"""有效人工关注只豁免缺评析,不豁免明确看空、硬疑点或已失效的关注。"""
|
||||
if (fund or {}).get("stance") != "无读数":
|
||||
return False
|
||||
row = row or {}
|
||||
code = normalize_code(str(row.get("ts_code") or ""))
|
||||
if not code.endswith((".SH", ".SZ")) or not is_stock_code(code):
|
||||
return False
|
||||
user = row.get("user_candidate")
|
||||
if not isinstance(user, dict) or not user.get("id"):
|
||||
return False
|
||||
if user.get("removed_at") or user.get("active") is False or user.get("status") in ("removed", "expired"):
|
||||
return False
|
||||
review = row.get("company_review") or {}
|
||||
if isinstance(review, dict) and (review.get("doubt_hard") or review.get("overall") == "差"):
|
||||
return False
|
||||
try:
|
||||
tz = ZoneInfo("Asia/Shanghai")
|
||||
at = now or datetime.now(tz)
|
||||
at = at.replace(tzinfo=tz) if at.tzinfo is None else at.astimezone(tz)
|
||||
return date.fromisoformat(str(user.get("expires_on"))) >= at.date()
|
||||
except (TypeError, ValueError, AttributeError):
|
||||
return False
|
||||
|
||||
|
||||
def _out(stance, *, fact=None, why=None, mark=None, priced_in=False, valuation=None, overall=None):
|
||||
return {"stance": stance, "fact": fact, "mark": mark, "priced_in": priced_in,
|
||||
"valuation": valuation, "overall": overall, "no_read_why": why}
|
||||
|
|
|
|||
|
|
@ -121,8 +121,10 @@ def advise_v2(c: dict, params: dict, *, fund: dict, tech: dict) -> dict:
|
|||
if ls == "逻辑存疑":
|
||||
adv.update(tier=TIER_NONE, factor=0.0, splits=(), route="跳过")
|
||||
return finish("逻辑存疑:判决与分流已拦,不建")
|
||||
# 基本面无读数 → 不建 (没有买方评析)
|
||||
if fs == "无读数":
|
||||
from app.core import fund_rules
|
||||
missing_watch = fund_rules.manual_watch_missing_fund(c, fund)
|
||||
# 普通候选仍要求评析;有效人工关注缺评析时继续使用其余意见评估。
|
||||
if fs == "无读数" and not missing_watch:
|
||||
adv.update(tier=TIER_NONE, factor=0.0, splits=(), route="跳过")
|
||||
return finish("没有买方评析(质地无读数或超期)")
|
||||
# 基本面看空
|
||||
|
|
@ -155,10 +157,11 @@ def advise_v2(c: dict, params: dict, *, fund: dict, tech: dict) -> dict:
|
|||
else:
|
||||
adv["conditions"].append("估值贵:减半仓")
|
||||
adv["why"].append(f"基本面看多、技术面{ts}")
|
||||
else: # 基本面中性
|
||||
adv.update(splits=(0.3, 0.35, 0.35), hold_type="事件驱动类")
|
||||
else: # 基本面中性或人工关注缺评析
|
||||
adv.update(splits=(0.3, 0.35, 0.35), hold_type="待补评析" if missing_watch else "事件驱动类")
|
||||
adv["conditions"].append("后两批要求技术面看多且非高位兑现")
|
||||
adv["why"].append(f"基本面中性、技术面{ts}")
|
||||
adv["why"].append(f"人工关注的基本面暂无有效读数、技术面{ts}" if missing_watch
|
||||
else f"基本面中性、技术面{ts}")
|
||||
# 既有叠加: 赔率低 → 试探; 高位兑现 → 首批推迟
|
||||
if odds is not None and odds < 1.0:
|
||||
adv.update(tier=TIER_TRIAL, factor=1.0 / 6.0, splits=(1.0,))
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ def assemble(row, *, nightly=None, tech_states=None, flip_at=None, params=None,
|
|||
|
||||
fund = fund_rules.synthesize(cr, params={"stale_days": p["fund_stale_days"],
|
||||
"consensus_good_min": p["fund_consensus_good_min"]})
|
||||
fund["manual_watch_missing_exempt"] = fund_rules.manual_watch_missing_fund(row, fund, now=now)
|
||||
tech = (tech_states or {}).get(code) or {"stance": "无读数", "no_read_why": "没有技术面读数"}
|
||||
tm = _timing_stance(nightly, today_ymd=tradedays.ymd(),
|
||||
stale_tdays=p["timing_stale_tdays"], flip_at=flip_at)
|
||||
|
|
@ -87,10 +88,11 @@ def assemble(row, *, nightly=None, tech_states=None, flip_at=None, params=None,
|
|||
tm.update(stance='看多' if event['action'] == 'BUY' else '看空' if event['action'] == 'SELL' else '无读数', fresh=True,
|
||||
intraday_flip_at=event['at'] if event['action'] == 'BUY' else None,
|
||||
intraday_event=event, no_read_why=None)
|
||||
# 合议参与分流的开关关掉时, 基本面无读数不由合议这层拦 (回到只按判决分流)
|
||||
# 只取消有效人工关注的缺评析硬门槛,缺失本身仍是弃权。
|
||||
con = consensus.decide(fund["stance"], tech.get("stance") or "无读数", tm["stance"],
|
||||
tech_phase=tech.get("phase"),
|
||||
fund_required=(p["fund_required"] and p["consensus_route"]),
|
||||
fund_required=(p["fund_required"] and p["consensus_route"]
|
||||
and not fund.get("manual_watch_missing_exempt")),
|
||||
weak_confirm=p.get("weak_confirm", True),
|
||||
timing_dissent=p.get("timing_dissent", "confirm"))
|
||||
from app.services import timing_fusion
|
||||
|
|
@ -103,7 +105,8 @@ def hard_keys(blocks) -> dict:
|
|||
"""四块意见 → 提议硬数字六键 (方案附录丁)。这六键不进 judge.OPEN_JUDGE_KEYS。"""
|
||||
fund, tech, tm, con = blocks["fund"], blocks["tech"], blocks["timing"], blocks["consensus"]
|
||||
return {
|
||||
"fund_stance": {"stance": fund["stance"], "mark": fund.get("mark"), "fact": fund.get("fact")},
|
||||
"fund_stance": {"stance": fund["stance"], "mark": fund.get("mark"), "fact": fund.get("fact"),
|
||||
"manual_watch_missing_exempt": bool(fund.get("manual_watch_missing_exempt"))},
|
||||
"tech": tech,
|
||||
"tech_text": tech.get("reason") or tech.get("no_read_why"),
|
||||
"timing": {"stance": tm["stance"], "nightly": tm.get("nightly"),
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ RUNTIME_EXTRA = {
|
|||
"PMS_TECH_FLIP_FRESH_DAYS": (2, int, "SAR 翻向后这么多个交易日内算「刚转向」(转多/转空相位用)"),
|
||||
"PMS_TECH_STATE_MAP": ("", str, "技术面读数映射 (tech_pull 与 08:40 补拉写入的 JSON: 时刻/读数日/逐票紧凑立场), 扫描层与页面只读, 勿手改"),
|
||||
# ── 2026-09-11 三源合议工作包二 (台账 007/009): 基本面立场与合议分流的开关。
|
||||
"PMS_FUND_REQUIRED": (True, bool, "无买方评析不建仓 (既定: 没有读数或超 120 天的候选一律不建仓)"),
|
||||
"PMS_FUND_REQUIRED": (True, bool, "普通候选无有效买方评析不建仓;有效人工关注缺评析时弃权,继续三源合议"),
|
||||
"PMS_FUND_STALE_DAYS": (120, int, "买方评析报告超过这么多天算无读数"),
|
||||
"PMS_FUND_CONSENSUS_GOOD_MIN": (8, int, "十视角好达这么多个且估值贵 → 打共识已定价标记, 让首批推迟"),
|
||||
"PMS_CONSENSUS_ROUTE": (True, bool, "三源合议参与新建仓分流 (既定: 上线即开; 关掉即回到只按选股判决分流)"),
|
||||
|
|
|
|||
|
|
@ -554,7 +554,8 @@ def _apply_intraday(code, blocks, cfg, now, cache) -> str | None:
|
|||
new_tech.get("stance") or "无读数",
|
||||
(blocks.get("timing") or {}).get("stance") or "无读数",
|
||||
tech_phase=new_tech.get("phase"),
|
||||
fund_required=(cp.get("fund_required") and cp.get("consensus_route")),
|
||||
fund_required=(cp.get("fund_required") and cp.get("consensus_route")
|
||||
and not (blocks.get("fund") or {}).get("manual_watch_missing_exempt")),
|
||||
weak_confirm=cp.get("weak_confirm", True),
|
||||
timing_dissent=cp.get("timing_dissent", "confirm"))
|
||||
new_tech["intraday"] = {"kind": kind, "reads": r["reads"]}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,211 @@
|
|||
{
|
||||
"checked_at": "2026-11-12T09:28:01+08:00",
|
||||
"code_commit": "ad6bff2d80b86bd2beffefd23b6405e270a8107a",
|
||||
"image_tag": "pms:watch-fund-ad6bff2",
|
||||
"image_id": "sha256:839c76fdba3a5b8849449285a4773164bb4421b7190bd7af958ac2999ef41fe3",
|
||||
"deployment": {
|
||||
"at_utc": "2026-11-12T01:26:57.571202",
|
||||
"total": 27,
|
||||
"unchanged_other": 25,
|
||||
"targets": [
|
||||
{
|
||||
"name": "/pms-web",
|
||||
"id": "cc863b945f45",
|
||||
"image": "sha256:839c76fdba3a5b8849449285a4773164bb4421b7190bd7af958ac2999ef41fe3",
|
||||
"started": "2026-11-12T01:26:45.731122491Z",
|
||||
"health": "healthy"
|
||||
},
|
||||
{
|
||||
"name": "/pms-worker",
|
||||
"id": "fabb94d4ede9",
|
||||
"image": "sha256:839c76fdba3a5b8849449285a4773164bb4421b7190bd7af958ac2999ef41fe3",
|
||||
"started": "2026-11-12T01:26:45.730295967Z",
|
||||
"health": null
|
||||
}
|
||||
],
|
||||
"root_head": "8413bce9c13527d031e587e390754ba6b2b92c4f",
|
||||
"private_env_unchanged": true
|
||||
},
|
||||
"offline": {
|
||||
"machine": "155",
|
||||
"python": "3.11",
|
||||
"network": "none",
|
||||
"suites": 84,
|
||||
"result": "ALL SUITES PASS",
|
||||
"log_sha256": "b9c7ae3c4e527a48f1372957bcefddd2d98f3f12660224cac47f7aa74b9cd4be"
|
||||
},
|
||||
"runtime": {
|
||||
"table_prefix": "",
|
||||
"parameters": {
|
||||
"PMS_DISPATCH_MODE": "ws",
|
||||
"PMS_GLOBAL_BUY_HALT": false,
|
||||
"PMS_GLOBAL_EXEC_HALT": false,
|
||||
"PMS_SIGNAL_RECOVERY_ENABLED": true,
|
||||
"PMS_SIGNAL_ENABLED": true,
|
||||
"PMS_JUDGE_ASYNC_ENABLED": true,
|
||||
"PMS_EXEC_REPRICE_ENABLED": true,
|
||||
"PMS_TIMING_FUSION_ENABLED": true,
|
||||
"PMS_TIMING_FUSION_START_AT": "2026-11-11T16:17:11.269641+08:00"
|
||||
},
|
||||
"acked_seq": 1800349,
|
||||
"last_seq": 1800349,
|
||||
"pending_gap": 0,
|
||||
"funds_age_sec": 6.9,
|
||||
"open_orders": 0,
|
||||
"pending": 0,
|
||||
"orphan": 0,
|
||||
"reconciliation": {
|
||||
"ok": true,
|
||||
"diffs": [],
|
||||
"fixes": [],
|
||||
"errors": [],
|
||||
"severity": "OK",
|
||||
"source": "ws",
|
||||
"note": "策略数量之和核对账户;不猜测差异归属,不自动把差异并入任何策略"
|
||||
},
|
||||
"cash_difference": 0.0,
|
||||
"valuation_ready": false
|
||||
},
|
||||
"natural_tasks": {
|
||||
"at": "2026-11-12T09:27:00+08:00",
|
||||
"watch_sync_count": 9,
|
||||
"signal_digest_errors": [],
|
||||
"replay_fills_errors": [],
|
||||
"proposal_scan_ok": true,
|
||||
"proposal_scan_executed": []
|
||||
},
|
||||
"watch_read_only_components": {
|
||||
"at": "2026-11-12T09:28:01.671213",
|
||||
"plan_date": "2026-11-11",
|
||||
"plan_age_tdays": 1,
|
||||
"watches": [
|
||||
{
|
||||
"code": "603259.SH",
|
||||
"name": "药明康德",
|
||||
"expires_on": "2026-11-30",
|
||||
"has_identity": true,
|
||||
"fund": "看多",
|
||||
"exempt": false,
|
||||
"tech": "看多",
|
||||
"timing": "无读数",
|
||||
"route": "观察",
|
||||
"reason": "等待新的有效合成择时",
|
||||
"advice_tier": "标准仓",
|
||||
"hold_type": "长期持有类"
|
||||
},
|
||||
{
|
||||
"code": "688625.SH",
|
||||
"name": "呈和科技",
|
||||
"expires_on": "2026-12-31",
|
||||
"has_identity": true,
|
||||
"fund": "看多",
|
||||
"exempt": false,
|
||||
"tech": "看多",
|
||||
"timing": "无读数",
|
||||
"route": "观察",
|
||||
"reason": "等待新的有效合成择时",
|
||||
"advice_tier": "标准仓",
|
||||
"hold_type": "长期持有类"
|
||||
},
|
||||
{
|
||||
"code": "603533.SH",
|
||||
"name": "掌阅科技",
|
||||
"expires_on": "2026-11-24",
|
||||
"has_identity": true,
|
||||
"fund": "中性",
|
||||
"exempt": false,
|
||||
"tech": "看多",
|
||||
"timing": "无读数",
|
||||
"route": "交人",
|
||||
"reason": "方向看多但只有一方表态",
|
||||
"advice_tier": "标准仓",
|
||||
"hold_type": "事件驱动类"
|
||||
},
|
||||
{
|
||||
"code": "301052.SZ",
|
||||
"name": "果麦文化",
|
||||
"expires_on": "2026-11-24",
|
||||
"has_identity": true,
|
||||
"fund": "中性",
|
||||
"exempt": false,
|
||||
"tech": "看多",
|
||||
"timing": "无读数",
|
||||
"route": "交人",
|
||||
"reason": "方向看多但只有一方表态",
|
||||
"advice_tier": "标准仓",
|
||||
"hold_type": "事件驱动类"
|
||||
},
|
||||
{
|
||||
"code": "688485.SH",
|
||||
"name": "九州一轨",
|
||||
"expires_on": "2026-11-30",
|
||||
"has_identity": true,
|
||||
"fund": "看空",
|
||||
"exempt": false,
|
||||
"tech": "中性",
|
||||
"timing": "无读数",
|
||||
"route": "跳过",
|
||||
"reason": "方向看空(基本面看空、技术面中性、择时无读数)",
|
||||
"advice_tier": "不建",
|
||||
"hold_type": "待定"
|
||||
},
|
||||
{
|
||||
"code": "300133.SZ",
|
||||
"name": "华策影视",
|
||||
"expires_on": "2026-11-24",
|
||||
"has_identity": true,
|
||||
"fund": "看空",
|
||||
"exempt": false,
|
||||
"tech": "看多",
|
||||
"timing": "无读数",
|
||||
"route": "交人",
|
||||
"reason": "基本面看空、技术面看多,试探仓",
|
||||
"advice_tier": "试探仓",
|
||||
"hold_type": "试探仓"
|
||||
},
|
||||
{
|
||||
"code": "300182.SZ",
|
||||
"name": "捷成股份",
|
||||
"expires_on": "2026-11-24",
|
||||
"has_identity": true,
|
||||
"fund": "看空",
|
||||
"exempt": false,
|
||||
"tech": "看多",
|
||||
"timing": "无读数",
|
||||
"route": "交人",
|
||||
"reason": "基本面看空、技术面看多,试探仓",
|
||||
"advice_tier": "试探仓",
|
||||
"hold_type": "试探仓"
|
||||
},
|
||||
{
|
||||
"code": "300364.SZ",
|
||||
"name": "中文在线",
|
||||
"expires_on": "2026-11-24",
|
||||
"has_identity": true,
|
||||
"fund": "看空",
|
||||
"exempt": false,
|
||||
"tech": "看多",
|
||||
"timing": "无读数",
|
||||
"route": "交人",
|
||||
"reason": "基本面看空、技术面看多,试探仓",
|
||||
"advice_tier": "试探仓",
|
||||
"hold_type": "试探仓"
|
||||
},
|
||||
{
|
||||
"code": "300291.SZ",
|
||||
"name": "百纳千成",
|
||||
"expires_on": "2026-11-24",
|
||||
"has_identity": true,
|
||||
"fund": "看空",
|
||||
"exempt": false,
|
||||
"tech": "看多",
|
||||
"timing": "无读数",
|
||||
"route": "交人",
|
||||
"reason": "基本面看空、技术面看多,试探仓",
|
||||
"advice_tier": "试探仓",
|
||||
"hold_type": "试探仓"
|
||||
}
|
||||
]
|
||||
},
|
||||
"natural_missing_review_entry": "not_observed"
|
||||
}
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
# 人工关注缺评析门槛调整
|
||||
|
||||
最新核验:2026年11月12日09:28,北京时间。用户在主会话批准部署后,09:26:45已定向发布155模拟PMS的web和worker。以下09:14的本地交付状态保留为历史,当前发布结果见末节。
|
||||
|
||||
核验时间:2026年11月12日09:14,北京时间。本次是独立侧会话中的本地修改,基于主线已提交版本`e7c9aac476a2ff9649d7798d8df28ea32d382be8`,没有操作服务器、数据库、运行参数或主会话工作目录。
|
||||
|
||||
## 行为
|
||||
|
||||
用户明确取消人工关注股票“没有有效买方评析就不能进入建仓评估”的硬门槛。有效人工关注缺报告或报告过期时,基本面仍记无读数并弃权;技术面与择时均看多,可继续进入仓位、资金与异步研判流程。
|
||||
|
||||
关注资格依据上游传来的`user_candidate.id`与`expires_on`,按北京时间核验,已移除、已过期、显式非活跃和非沪深股票不取得豁免。仅有`user_selected`标记不能取得豁免。已知质地差或硬疑点不因报告过期变成缺失豁免;明确看空、逻辑存疑、研判不可用、用户约束及原风险纪律保持原处理。
|
||||
|
||||
修改覆盖首次三源合议、盘中技术突破后的重新合议、仓位建议三处。缺评析的关注沿用现有非基本面看多档的目标比例和30%/35%/35%分批规则,展示“待补评析”,不伪造中性或看多基本面。弱表态仍走原交人或试探分流,不因取消缺评析门槛而直接下单。普通候选门槛不变。
|
||||
|
||||
上游选股桥`d579d15`的`card.judge`明确不以没有报告作为剔除条件,本次未修改上游。评级下降退出、持仓恢复和自动网格持仓合议没有改动,不能将本次新建仓入口豁免扩大到这些路径。
|
||||
|
||||
## 验证
|
||||
|
||||
开发机使用`/private/tmp/pms-chain-audit-venv/bin/python`,经`unit_test_guard.py`清除业务配置、在空临时目录阻断网络。新增10项专项、既有28/29/32批共86项均通过,合计96项。覆盖双看多放行、普通候选、失效关注、北京时间边界、过期报告、明确看空及疑点、缺择时、真实动作扫描数量、盘中复议和研判不可用。
|
||||
|
||||
全量入口运行84组,82组通过;`test_trade_correction_transport.py`的6项和`test_batch55_units.py`的1项因本机Python 3.9构造`asyncio.Event`时没有事件循环而报错。在未修改的基线工作目录分别重跑两组,复现相同错误。未为通过回归而修改无关WS实现,不能记录为全量通过。收敛最终代码后重跑上述96项,全部通过。
|
||||
|
||||
全量日志:`/private/tmp/pms-watch-fund-tests-20261112.log`。两组基线日志:`/private/tmp/pms-watch-fund-baseline-20261112.log`与`/private/tmp/pms-watch-fund-baseline55-20261112.log`。
|
||||
|
||||
## 交付状态
|
||||
|
||||
独立本地仓库:`/private/tmp/pms-watch-fund-20261112`,分支`codex/watch-fund-20261112`。没有推送到主工作目录或远程,没有构建部署候选镜像,也没有上线或制造自然交易验收。发布前仍需在匹配Python 3.11的候选镜像中完成断网全量回归,再按实际授权发布;本次本地完成不代表155已经生效。
|
||||
|
||||
|
||||
## 09:28发布接续
|
||||
|
||||
用户明确要求部署上述边界。发布代码为`ad6bff2d80b86bd2beffefd23b6405e270a8107a`,已推送并核对项目远程。镜像`pms:watch-fund-ad6bff2`,实际ID为`sha256:839c76fdba3a5b8849449285a4773164bb4421b7190bd7af958ac2999ef41fe3`。
|
||||
|
||||
开发机重新通过96项相关隔离测试。155候选沿用现网Python 3.11及依赖,只复制已提交源码;构建禁止联网,回归容器使用`--network none --read-only`、无业务环境和临时目录。完整84组全部通过,末行为`ALL SUITES PASS`。本机Python 3.9出现的两组事件循环兼容错误在实际候选环境未出现,没有改动无关WS实现来绕过测试。
|
||||
|
||||
155主机为`factorevaluation`,原Compose项目`tradingsystem`,实例表前缀为空,实际ParamStore下发模式为`ws`。配置文件里的`shadow`仅是初值,不能替代现用ParamStore。全局买入和执行暂停均为false,原三源合议、信号恢复、合成择时、异步研判、盘中改价开关保持开启。本次没有修改业务参数。
|
||||
|
||||
仅将现用私有覆盖中的`pms-web`与`pms-worker`镜像改为候选;包含全部profile比较有效Compose配置,除此没有差异。先暂停目标worker原队列消费,等待2个执行中和2个预取任务自然完成,确认在途、预取及消费队列均为空后,使用原项目`up -d --no-deps --no-build --force-recreate pms-web pms-worker`定向重建。两个容器于09:26:45启动。没有强杀在途任务。
|
||||
|
||||
27个既有容器中,仅上述两个更换;其他25个容器的标识、镜像和启动时间完全一致,包括唯一pms-ws、beat、行情采集与微盘监控。目标容器环境与挂载逐项相同,原目录HEAD仍为`8413bce9c13527d031e587e390754ba6b2b92c4f`,原.env及服务器私有源码修改保留。188及其他上游服务均未操作。
|
||||
|
||||
09:27:34,web健康接口返回ok、数据库可用,新worker已恢复celery消费并注册信号消费与成交回放任务。09:27自然任务已完成关注同步(9只)、信号消费、成交回放、执行依据刷新和提议扫描;该轮没有执行新交易。没有手动发送模型、信号、成交或测试委托。
|
||||
|
||||
09:27:00只读核验:确认序号与落库序号均1800349,缺口0,待入账0,孤儿0,在途委托0,最新资金6.9秒,双策略合计数量对账一致、现金差0。估值仍等待盘前行情,发布前也是该状态,不把它写成估值已通过。
|
||||
|
||||
09:28:01只读上游现有计划,日期11月11日,距当天1个交易日,在现有允许范围内。9只人工关注均有有效身份、未过期且已有评析,尚无缺评析豁免的自然样本。按照原入口补读已有日线并装配意见,没有触发研究或交易;这些是只读组件结果,不替代完整资金、研判和自然建仓判收。当前择时尚无有效盘中方向,因此不能把部署成功表述为新增建仓已自然通过。
|
||||
|
||||
本次只豁免新建仓入口的缺评析条件。普通候选、明确看空与疑点、其他风险、资金和用户约束、研判不可用保持原处理;不把豁免扩大到评级下降清仓、持仓自动恢复或网格持仓合议。缺报告时沿用30%/35%/35%分批档并标记待补评析,基本面仍是无读数。
|
||||
|
||||
### 证据与回退
|
||||
|
||||
- 脱敏结果:[发布证据](evidence/watch_fund_release_20261112.json)。
|
||||
- 开发机证据目录:`/private/tmp/watch-fund-release-20261112`。
|
||||
- 155候选源码:`/home/factor/project/pms-releases/watch-fund-ad6bff2`。
|
||||
- 155断网全量日志:`/tmp/pms-watch-fund-offline-ad6bff2.log`。
|
||||
- 155私有备份:`/home/factor/project/tradingSystem/backups/watch-fund-20261112-ad6bff2`;其中环境与容器配置不提交Git。
|
||||
|
||||
若发生与本改动有关的实质异常,先核对是否已产生新提议或成交,保留账本和回报;回退仅恢复两个目标的原镜像`pms:timing-fusion-ce91a35`及对应已备份覆盖,温和排空后定向重建。不倒退账本,不重放旧委托,不重建WS。缺评析人工关注的自然双看多、异步研判及实际建仓仍待真实样本,本次未创建长期观察任务。
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
# 开发资料入口
|
||||
|
||||
人工关注缺评析豁免已于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)。
|
||||
|
||||
当前多源择时已发布,见[11月11日发布接续](多源择时发布接续_2026-11-11.md)。三组各三分之一,日线缓存已修复,155已启用。第三方分钟数据不回填,缺口见[逐票清单](分钟行情缺口核验清单_2026-11-11.md)。部署、隔离测试与后续自然判收分别记录。以下研究和审视中的未实施说明仅代表各自历史时点。
|
||||
|
|
|
|||
|
|
@ -145,6 +145,7 @@
|
|||
降级)/mark_decide 优先级/eval_dca 深档打 decide_kind/三参数登记与范围/两个 repo 查询
|
||||
+ 评审补: 真通过只认带应答体的 PASS、弱表态按强弱打标记 (24 例)
|
||||
test_batch44_units.py 高股息独立来源、后台准备、快速采纳及失败守成 (24例)
|
||||
test_watch_missing_fund.py 人工关注缺评析豁免、定档、盘中复议与风险边界 (10例)
|
||||
test_batch35_units.py 单测隔离:观察读数内存仓储、整轮扫描与覆盖重建、
|
||||
异常吞掉仍判联网失败、配置隔离与独立入口护栏 (8 例)
|
||||
test_batch36_units.py 命令按方案额结算:原分支回归、未解锁批次收尾与故障重试 (13 例)
|
||||
|
|
@ -202,6 +203,7 @@ HERE = os.path.dirname(os.path.abspath(__file__))
|
|||
ROOT = os.path.dirname(HERE)
|
||||
# 退出纪律专项:两次独立清仓信号、评级下降、事务、双策略隔离及撤单收尾。
|
||||
SUITES = [
|
||||
"test_watch_missing_fund.py",
|
||||
"test_timing_fusion.py", # 三组证据契约、二次清仓与恢复(14例)
|
||||
"test_signal_recovery.py", # 最新方向、停买恢复、网格合议、关注入口与负净成本(16例)
|
||||
"test_grid_execution.py",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,120 @@
|
|||
"""人工关注缺评析的入口、定档、盘中复议和风险边界,全部隔离离线。"""
|
||||
import unit_test_guard # noqa: F401
|
||||
import datetime as dt
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
import test_batch29_units as fixtures
|
||||
from app.core import fund_rules, action_engine as ae
|
||||
from app.services import advice_service, consensus_service, proposal_service, timing_state, timing_fusion, param_store
|
||||
|
||||
NOW = dt.datetime(2026, 11, 12, 10, tzinfo=dt.timezone(dt.timedelta(hours=8)))
|
||||
CP = dict(fund_required=True, fund_stale_days=120, fund_consensus_good_min=8,
|
||||
consensus_route=True, weak_confirm=True, timing_dissent='observe', timing_stale_tdays=3)
|
||||
|
||||
|
||||
class WatchMissingFundTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.row = fixtures.cand('600000.SH', user_candidate={'id':'watch-1','expires_on':'2099-01-01'})
|
||||
self.event = {'action':'BUY','at':NOW.isoformat()}
|
||||
for target, name, replacement in [
|
||||
(timing_state,'enabled',lambda:True), (timing_fusion,'enabled',lambda:True),
|
||||
(timing_state,'latest',lambda code,now=None:self.event),
|
||||
(consensus_service,'_timing_stance',lambda *a,**k:{'stance':'无读数'}),
|
||||
(param_store,'get_int',lambda key,default=0:default),
|
||||
]:
|
||||
p = patch.object(target,name,replacement);p.start();self.addCleanup(p.stop)
|
||||
|
||||
def blocks(self, row=None, tech='看多'):
|
||||
return consensus_service.assemble(self.row if row is None else row,
|
||||
tech_states={'600000.SH':{'stance':tech}}, params=CP, now=NOW)
|
||||
|
||||
def test_manual_missing_review_abstains_and_two_bulls_pass(self):
|
||||
b=self.blocks()
|
||||
self.assertEqual(b['fund']['stance'],'无读数')
|
||||
self.assertTrue(b['fund']['manual_watch_missing_exempt'])
|
||||
self.assertEqual(b['consensus']['route'],'放行')
|
||||
self.assertEqual(b['consensus']['votes']['fund'],'无读数')
|
||||
self.assertTrue(consensus_service.hard_keys(b)['fund_stance']['manual_watch_missing_exempt'])
|
||||
|
||||
def test_ordinary_candidates_keep_required_review(self):
|
||||
for change in ({'user_candidate':None},{'user_candidate':{}},{'user_candidate':None,'user_selected':True}):
|
||||
row={**self.row,**change};b=self.blocks(row)
|
||||
self.assertEqual(b['consensus']['route'],'跳过')
|
||||
a=advice_service.advise_v2(row,fixtures.params(),fund=b['fund'],tech=b['tech'])
|
||||
self.assertEqual(a['tier'],advice_service.TIER_NONE)
|
||||
|
||||
def test_expired_removed_invalid_and_out_of_scope_watch_not_exempt(self):
|
||||
users=[{'id':'a','expires_on':'2026-11-11'}, {'id':'a','expires_on':'not-a-date'},
|
||||
{'id':'a','expires_on':'2099-01-01','removed_at':'2026-11-12'},
|
||||
{'id':'a','expires_on':'2099-01-01','active':False},
|
||||
{'id':'a','expires_on':'2099-01-01','status':'expired'}, 'bad']
|
||||
for u in users:
|
||||
self.assertFalse(fund_rules.manual_watch_missing_fund({**self.row,'user_candidate':u},
|
||||
{'stance':'无读数'},now=NOW))
|
||||
self.assertFalse(fund_rules.manual_watch_missing_fund({**self.row,'ts_code':'920001.BJ'},
|
||||
{'stance':'无读数'},now=NOW))
|
||||
|
||||
def test_watch_expiry_uses_beijing_date(self):
|
||||
row={**self.row,'user_candidate':{'id':'a','expires_on':'2026-11-12'}}
|
||||
self.assertTrue(fund_rules.manual_watch_missing_fund(row,{'stance':'无读数'},now=NOW))
|
||||
utc=dt.datetime(2026,11,12,16,tzinfo=dt.timezone.utc)
|
||||
self.assertFalse(fund_rules.manual_watch_missing_fund(row,{'stance':'无读数'},now=utc))
|
||||
|
||||
def test_stale_good_report_abstains_without_changing_its_grade(self):
|
||||
row={**self.row,'company_review':{'overall':'好','age_days':121}}
|
||||
b=self.blocks(row)
|
||||
self.assertEqual(b['fund']['stance'],'无读数')
|
||||
self.assertEqual(b['consensus']['route'],'放行')
|
||||
self.assertEqual(row['company_review']['overall'],'好')
|
||||
|
||||
def test_explicit_bearish_review_and_hard_doubts_keep_original_routes(self):
|
||||
for review in ({'overall':'差','age_days':0},{'overall':'好','doubt_hard':True}):
|
||||
row={**self.row,'company_review':review};b=self.blocks(row)
|
||||
self.assertFalse(b['fund']['manual_watch_missing_exempt'])
|
||||
self.assertEqual(b['fund']['stance'],'看空')
|
||||
self.assertEqual(b['consensus']['route'],'交人')
|
||||
for review in ({'doubt_hard':True},{'overall':'差','age_days':121}):
|
||||
self.assertEqual(self.blocks({**self.row,'company_review':review})['consensus']['route'],'跳过')
|
||||
|
||||
def test_missing_conflicting_or_single_direction_does_not_auto_pass(self):
|
||||
for event,tech in [(None,'看多'),({'action':'WAIT'},'看多'),
|
||||
({'action':'SELL'},'看多'),(self.event,'无读数'),(self.event,'看空')]:
|
||||
with self.subTest(event=event,tech=tech):
|
||||
old=self.event;self.event=event
|
||||
self.assertNotEqual(self.blocks(tech=tech)['consensus']['route'],'放行')
|
||||
self.event=old
|
||||
|
||||
def test_entry_scan_produces_quantity_without_fabricating_fundamental_vote(self):
|
||||
b=self.blocks();row={**self.row,'consensus':b['consensus'],'consensus_blocks':b,
|
||||
'consensus_hard':consensus_service.hard_keys(b)}
|
||||
result=ae.scan_open(candidates=[row],params=fixtures.params(consensus_route=True,plan_by_advice=True),
|
||||
caps=fixtures.caps(),room_amt=1_000_000,slots=1,skip={})
|
||||
self.assertEqual(len(result['candidates']),1,result)
|
||||
c=result['candidates'][0]
|
||||
self.assertEqual(c['qty'],3600)
|
||||
self.assertEqual(c['hard_numbers']['fund_stance']['stance'],'无读数')
|
||||
self.assertEqual(c['hard_numbers']['advice']['hold_type'],'待补评析')
|
||||
|
||||
def test_intraday_breakout_keeps_exemption_and_missing_timing_guard(self):
|
||||
for timing in ('看多','无读数'):
|
||||
b=self.blocks();b['tech']={'stance':'中性','phase':'收口等待'};b['timing']['stance']=timing
|
||||
cfg={'window':'0945-1430','vol_min':1.5,'breakout_on':True,'cparams':CP}
|
||||
with patch.object(proposal_service,'_intraday_market',return_value=(10,9,2)), \
|
||||
patch.object(proposal_service.tech_rules,'intraday_confirm',return_value={
|
||||
'kind':'breakout','state':{'stance':'看多','phase':'开口向上'},'reads':{}}):
|
||||
proposal_service._apply_intraday('600000.SH',b,cfg,NOW,{})
|
||||
self.assertEqual(b['consensus']['route'],'放行' if timing=='看多' else '交人')
|
||||
|
||||
def test_logic_doubt_and_judge_unavailable_are_not_bypassed(self):
|
||||
b=self.blocks()
|
||||
a=advice_service.advise_v2({**self.row,'logic_state':{'state':'逻辑存疑'}},
|
||||
fixtures.params(),fund=b['fund'],tech=b['tech'])
|
||||
self.assertEqual(a['tier'],advice_service.TIER_NONE)
|
||||
c={'action':ae.A_OPEN,'consensus':b['consensus'],'hard_numbers':{}}
|
||||
r=proposal_service._self_decide(c,{'verdict':'UNAVAILABLE','degraded':True},
|
||||
{'self_decide':'full'},0)
|
||||
self.assertEqual(r['decision'],'confirm')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
Loading…
Reference in New Issue