diff --git a/DEVLOG.md b/DEVLOG.md index 5a3fd31..a5e2c2b 100644 --- a/DEVLOG.md +++ b/DEVLOG.md @@ -1,5 +1,9 @@ # 开发节点记录(三系统量化交易) +## 2026-11-10 择时恢复、关注入池与持仓收益 + +核实华策影视被两层候选数量截断,传导前置否决仍在,雷赛智能首次系统停买没有自动恢复路径,负净成本被截零导致收益少计。本次补齐关注入口、最新有效方向及有边界的首次停买恢复,自动网格买入使用三源合议,并修正收益展示。开发机隔离回归和1440/390浏览器复现通过。当前尚未发布,候选与真机结果更新在[接续](docs/择时恢复与关注入池修复_2026-11-10.md)。 + ## 2026-11-04 沿用原信息流风格并修复研究恢复 14:34最终只读确认六条买方评析、六条每日及六条盘中研究全部完成,且均匹配当前报告。最后一条守原一小时冷却,于14:33自然重试并在19.39秒内完成。每日数据日为11月3日,盘中为11月4日,实际盘中结论五条观察、一条风险。没有人为重投、改回执或注入交易。当前跟进完成,不新增长期观察;外部分钟采集的历史回填本次未修改。 diff --git a/app/core/holding_performance.py b/app/core/holding_performance.py new file mode 100644 index 0000000..12df9b4 --- /dev/null +++ b/app/core/holding_performance.py @@ -0,0 +1,46 @@ +"""持仓收益展示。保留负净成本,不用收益展示反推交易安全垫。""" +from decimal import Decimal, InvalidOperation + + +def calculate(row, lots): + empty = {'ready': False, 'profit': None, 'profit_pct': None, 'net_cost': None, + 'remaining_cost': None, 'realized': None, 'unrealized': None, + 'cost_recovered': False, 'reason': '持仓成本待核实'} + try: + def number(value): + if value is None or isinstance(value, bool): + raise ValueError('缺少金额') + n = Decimal(str(value)) + if not n.is_finite(): + raise ValueError('金额无效') + return n + qty = int(row['total_qty']) + if qty <= 0: + return dict(empty, ready=True, profit=0., net_cost=0., remaining_cost=0., + realized=0., unrealized=0., reason=None) + if not lots or sum(int(l['qty']) for l in lots) != qty: + return empty + remaining = Decimal(0) + realized = Decimal(0) + for lot in lots: + n = int(lot['qty']) + price = number(lot['open_price']) + if n < 0 or price <= 0: + return empty + remaining += n * price + realized += number(lot['realized_pnl']) + net = remaining - realized + result = dict(empty, net_cost=float(net), remaining_cost=float(remaining), + realized=float(realized), cost_recovered=net <= 0) + if not row.get('price_ok'): + return dict(result, reason='持仓行情待补齐') + price = number(row['price']) + if price <= 0: + return dict(result, reason='持仓行情待补齐') + value = price * qty + profit = value - net + return dict(result, ready=True, profit=float(profit.quantize(Decimal('.01'))), + profit_pct=float(profit / net) if net > 0 else None, + unrealized=float((value - remaining).quantize(Decimal('.01'))), reason=None) + except (ValueError, TypeError, KeyError, InvalidOperation): + return empty diff --git a/app/core/risk_exit.py b/app/core/risk_exit.py index 437ea9e..56c1f7b 100644 --- a/app/core/risk_exit.py +++ b/app/core/risk_exit.py @@ -27,7 +27,7 @@ def digest(value): separators=(',', ':'), allow_nan=False).encode()).hexdigest() -def signal_event(sig, *, now, since, threshold=.85, max_age=300): +def signal_event(sig, *, now, since, threshold=.85, max_age=300, actions=('SELL',)): """真正的清仓级信号才计次。过期、未来、回退结论及无出处不计数。""" code = str(sig.get('ts_code') or '') from app.core.command_spec import is_stock_code @@ -37,12 +37,14 @@ def signal_event(sig, *, now, since, threshold=.85, max_age=300): conf = float(sig.get('confidence')) except (TypeError, ValueError): return None, '没有有效置信度' - if (sig.get('action') != 'SELL' or not math.isfinite(conf) or conf < threshold or conf > 1 + if (sig.get('action') not in actions or not math.isfinite(conf) or conf < threshold or conf > 1 or sig.get('is_fallback') not in (None, False, 0, 'false', '0', '')): return None, '不是有效清仓级结论' source = sig.get('source') if source not in ('intraday', 'risk_sell'): return None, '信号来源不可核实' + if source == 'risk_sell' and sig.get('action') != 'SELL': + return None, '风控卖出流不能提供转多结论' reason = ' '.join(str(sig.get('reason') or '').split())[:500] at = stamp(sig.get('event_time')) now, start = stamp(now), stamp(since) diff --git a/app/core/signal_rules.py b/app/core/signal_rules.py index 3d389ac..ec956d2 100644 --- a/app/core/signal_rules.py +++ b/app/core/signal_rules.py @@ -79,6 +79,9 @@ def _num(v, d=0.0): def _norm_conf(v) -> float: """盘中流 (0~1 制) 的置信度归一。大于 1 的按百分制兜底处理。""" c = _num(v) + import math + if not math.isfinite(c): + return 0.0 if c > 1: c = c / 100.0 return max(0.0, min(1.0, c)) @@ -94,6 +97,9 @@ def _norm_conf_pct(v) -> float: 会被折成不足 1% 而落进"低于门槛只留痕"一档, 错的方向是漏报不是误清仓。 """ c = _num(v) + import math + if not math.isfinite(c): + return 0.0 return max(0.0, min(100.0, c)) / 100.0 @@ -114,6 +120,7 @@ def parse_intraday(fields: dict, *, msg_id: str = None) -> dict: except (ValueError, TypeError): validity = {'expires_at': 'invalid'} return {"source": SRC_INTRADAY, "msg_id": msg_id, + 'is_fallback': f.get('is_fallback'), 'signal_id': f.get('signal_id'), 'event_time': f.get('trigger_time'), 'expires_at': validity.get('expires_at') if isinstance(validity, dict) else 'invalid', "ts_code": (f.get("ts_code") or "").strip(), diff --git a/app/repo/rotation_repo.py b/app/repo/rotation_repo.py index 8a3faaf..f11499c 100644 --- a/app/repo/rotation_repo.py +++ b/app/repo/rotation_repo.py @@ -48,6 +48,13 @@ def recent(kind, limit=100): return [{'id': r['doc_id'], 'value': json.loads(r['payload_json']), 'updated_at': str(r['updated_at'])} for r in rows] +def updated_since(kind, since, limit=6001): + rows = db.fetch_all('SELECT doc_id,payload_json FROM pms_rotation_document ' + 'WHERE kind=:kind AND updated_at>=:since ORDER BY updated_at DESC LIMIT :n', + {'kind': kind, 'since': since, 'n': int(limit)}) + return [{'id': r['doc_id'], 'value': json.loads(r['payload_json'])} for r in rows] + + def stage_locked(key, value): """在既有行锁事务内先发布阶段,供同事务的下发闸读取;外部仍不可见。""" if db._TRANSACTION.get() is None: diff --git a/app/services/consensus_service.py b/app/services/consensus_service.py index 411ea96..8a73289 100644 --- a/app/services/consensus_service.py +++ b/app/services/consensus_service.py @@ -62,7 +62,8 @@ def nightly_map(codes) -> dict: return {} -def assemble(row, *, nightly=None, tech_states=None, flip_at=None, params=None) -> dict: +def assemble(row, *, nightly=None, tech_states=None, flip_at=None, params=None, + intraday_event=None, now=None) -> dict: """给一行 (候选 / 持仓) 装配四块意见。row 需带 ts_code 与 company_review。不改 row。 nightly: 该票昨夜定性 entry; tech_states: 技术面映射 (state_map); flip_at: 盘中转多时刻。""" p = params or _params() @@ -74,6 +75,15 @@ def assemble(row, *, nightly=None, tech_states=None, flip_at=None, params=None) 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) + from app.services import timing_state + if timing_state.enabled(): + # 新模式只采用带原始时间和期限的最新方向,不再把旧 BUY 留痕当作全天看多。 + tm = _timing_stance(nightly, today_ymd=tradedays.ymd(), stale_tdays=p['timing_stale_tdays']) + event = timing_state.valid(intraday_event, now) if intraday_event is not None else timing_state.latest(code, now) + if event: + tm.update(stance='看多' if event['action'] == 'BUY' 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"), @@ -91,7 +101,7 @@ def hard_keys(blocks) -> dict: "tech": tech, "tech_text": tech.get("reason") or tech.get("no_read_why"), "timing": {"stance": tm["stance"], "nightly": tm.get("nightly"), - "flip_at": tm.get("intraday_flip_at")}, + "flip_at": tm.get("intraday_flip_at"), "event": tm.get('intraday_event')}, "consensus": {"direction": con["direction"], "votes": con["votes"], "strength": con.get("strength"), "reason": con.get("reason"), "route": con.get("route"), "route_reason": con.get("route_reason")}, @@ -108,6 +118,16 @@ def state_map(): return {} +def holding_buy_consensus(code, *, now=None): + """自动网格新增买入也使用持仓的现行三源意见,不由吸筹标签单独开关。""" + from app.services import logic_state_service + review = (logic_state_service.state_map().get(code) or {}).get('company_review') + blocks = assemble({'ts_code': code, 'company_review': review}, + nightly=nightly_map([code]).get(code), tech_states=state_map(), now=now) + con = blocks['consensus'] + return con.get('route') == '放行' and con.get('direction') == '看多', blocks + + def decorate_positions(rows, *, nightly=None, tech_states=None, company_reviews=None, flip_map=None, params=None): """给持仓行装配三源合议四块 (原地改), 挂 consensus_blocks 一键 —— 动作引擎的增持门读它。 diff --git a/app/services/judge_async.py b/app/services/judge_async.py index 2d02532..66b4cca 100644 --- a/app/services/judge_async.py +++ b/app/services/judge_async.py @@ -31,12 +31,16 @@ def identity(candidate, payload): 'company_review_text', 'intraday_buy_signal', 'intraday_buy_reason', 'logic_state', 'support', 'pressure', 'ref_source')} position = (payload.get('context') or {}).get('position') or {} - return digest({'research': research, 'position': {k:position.get(k) for k in + material = {'research': research, 'position': {k:position.get(k) for k in ('total_qty', 'base_qty', 'add_qty', 'dca_qty', 'avg_cost', 'support_ref', 'pressure_ref', 'stop_ref')}, 'book': candidate.get('book'), 'source': hard.get('candidate_source'), 'stage': {k: hard.get(k) for k in ('dca_stage', 'stage', 'dca_count', 'trigger', 'logic_state')}, # OPEN数量由PMS实时复核,持仓增持的模型证据还包含本次动作数量。 - 'action_qty': candidate.get('qty') if payload.get('action') != 'OPEN' else None}) + 'action_qty': candidate.get('qty') if payload.get('action') != 'OPEN' else None} + event = (hard.get('timing') or {}).get('event') + if event: + material['timing_event'] = {k: event.get(k) for k in ('key', 'action', 'at', 'expires_at')} + return digest(material) def unavailable(reason, **extra): diff --git a/app/services/param_store.py b/app/services/param_store.py index 847b1b8..ba5ce63 100644 --- a/app/services/param_store.py +++ b/app/services/param_store.py @@ -46,6 +46,8 @@ def _valid_limit_flag(value): # 运行态开关: key -> (默认值, 类型, 说明) RUNTIME_EXTRA = { + 'PMS_SIGNAL_RECOVERY_ENABLED': (False, bool, '使用最新有效盘中方向;三源重新放行后可解除首次系统停买,不解除人工暂停或已启动清仓'), + 'PMS_SIGNAL_RECOVERY_START_AT': ('', str, '方向更新与首次停买恢复的实际启用时刻,不回补旧信号'), "PMS_SIGNAL_FOCUS_ENABLED": (False, bool, "持仓与有效关注共用完整信号读取,不扩大交易资格"), "PMS_BROAD_DAILY_ENABLED": (False, bool, "接入正式宽基与行业每日资金,仅供观测"), "PMS_UPSTREAM_DAY_SCAN": (20000, int, "信号流当天每路读取上限,达到上限明确提示"), diff --git a/app/services/plan_feed.py b/app/services/plan_feed.py index c712110..22662b5 100644 --- a/app/services/plan_feed.py +++ b/app/services/plan_feed.py @@ -517,6 +517,13 @@ def select_candidates(plan: dict, *, held=(), black=(), top_n: int = 30, tiers=N # 有机会被看见。默认关是守「宁缺毋滥」。include_observe 已开时观察档全在, 不必再叠。 pool += [r for r in (plan.get("observe") or []) if _fund_stance_of(r) == "看多"] + # 有效人工关注必须进入同一轮评估,不因榜单分组或普通候选数量截断而消失。 + # 只补上入口,后面的资格、黑名单、三源合议和资金约束照常执行。 + def watched(row): + user = row.get('user_candidate') or {} + return bool(user.get('id') and str(user.get('expires_on') or '') >= today) + pool += [r for r in plan.get('observe', []) if watched(r) and r not in pool] + theme_cap = int(theme_cap or 0) dropped = {"held": 0, "black": 0, "tier": 0, "score": 0, "sources": 0, "upside": 0, "st": 0, "theme": 0, "dup": 0, "capped": 0, "display": 0} @@ -547,7 +554,7 @@ def select_candidates(plan: dict, *, held=(), black=(), top_n: int = 30, tiers=N drop('dup', c) continue seen.add(c) - if r.get('user_required') and str((r.get('user_candidate') or {}).get('expires_on') or '') < today: + if r.get('user_required') and not watched(r): drop('display', c) display_only.append({'ts_code': c, 'basis': '用户关注已到期'}) continue @@ -592,8 +599,10 @@ def select_candidates(plan: dict, *, held=(), black=(), top_n: int = 30, tiers=N passed.append(r) n = max(0, int(top_n or 0)) or len(passed) - dropped["capped"] = max(0, len(passed) - n) - filtered.extend({'ts_code': r['ts_code'], 'reason': 'capped'} for r in passed[n:]) + kept = [r for i, r in enumerate(passed) if i < n or watched(r)] + capped = [r for i, r in enumerate(passed) if i >= n and not watched(r)] + dropped["capped"] = len(capped) + filtered.extend({'ts_code': r['ts_code'], 'reason': 'capped'} for r in capped) items = [{"ts_code": r["ts_code"], "name": r["name"], "score": r.get("score") or 0.0, "sector": r.get("theme"), "theme": r.get("theme"), "tier": r.get("tier"), "heat": r.get("heat"), "upside": r.get("upside"), "rank": r.get("rank"), @@ -620,7 +629,7 @@ def select_candidates(plan: dict, *, held=(), black=(), top_n: int = 30, tiers=N "quality_band": r.get("quality_band"), "pointed": r.get("pointed"), "rank_axis": r.get("rank_axis"), "rank_old": r.get("rank_old"), **{k: r.get(k) for k in ('research_rank', 'rating_priority', 'research', 'review_ref', 'user_candidate', 'user_required')}} - for r in passed[:n]] + for r in kept] for i, item in enumerate(items, 1): item.update(selection_rank=i, decision=plan.get('decision'), refresh_status=plan.get('refresh_status')) diff --git a/app/services/portfolio.py b/app/services/portfolio.py index b139535..33a958d 100644 --- a/app/services/portfolio.py +++ b/app/services/portfolio.py @@ -35,13 +35,33 @@ def position_groups(original_view: dict) -> list: held = [r for r in rows if r["total_qty"] > 0] totals = view.get("totals", {}) missing = view.get("price_missing", []) + from app.core.holding_performance import calculate + failures = [] + # 收益展示直接读本策略批次,避免负成本在交易安全垫中截断后丢失利润。 + # 账本、avg_cost 与策略使用的 cushion 字段均不在这里改写。 + for row in held: + try: + with books.scope(book): + lots = pms_repo.list_lots(row['ts_code'], status=None, limit=2001) + if len(lots) >= 2001: + raise ValueError('批次超过完整核验上限') + row['performance'] = calculate(row, lots) + except Exception: + logger.exception('持仓收益批次读取失败 %s %s', book, row['ts_code']) + row['performance'] = calculate(row, []) + if not row['performance']['ready']: + failures.append(row['ts_code']) + performance_ready = ready and not missing and not failures + cost = sum(row['performance']['net_cost'] for row in held) if performance_ready else None + profit = sum(row['performance']['profit'] for row in held) if performance_ready else None return {"book_id": book, "name": name, "positions": rows, "held": held, "ready": ready, "price_missing": missing, + "performance_ready": performance_ready, "performance_missing": failures, "totals": {"names_count": len(held), "market_value": totals.get("portfolio_mv", 0) if ready else None, - "cost_basis": totals.get("cost_basis", 0) if ready else None, - "pnl_pct": totals.get("float_pnl_pct") if ready and not missing else None, - "pnl": totals.get("float_pnl", 0) if ready and not missing else None}} + "cost_basis": round(cost, 2) if cost is not None else None, + "pnl_pct": profit / cost if performance_ready and cost > 0 else None, + "pnl": round(profit, 2) if performance_ready else None}} result = [group(books.ORIGINAL, "主观量化", original_view)] if not settings.INFRA_STRATEGY_BOOK_SCHEMA: @@ -62,7 +82,7 @@ def holding_performance(groups: list) -> dict: rows = [] for group in groups: totals = group["totals"] - ready = group["ready"] and not group["price_missing"] + ready = group["ready"] and not group["price_missing"] and group.get('performance_ready', True) rows.append({"book_id": group["book_id"], "name": group["name"], "ready": ready, "names_count": totals["names_count"], "profit": totals["pnl"] if ready else None, diff --git a/app/services/proposal_service.py b/app/services/proposal_service.py index 0f69ece..6a96427 100644 --- a/app/services/proposal_service.py +++ b/app/services/proposal_service.py @@ -608,7 +608,7 @@ def _attach_consensus(cands, out=None, now=None) -> None: try: flip_at = (c.get("sig_buy") or {}).get("at") or None blocks = consensus_service.assemble( - c, nightly=nightly.get(code), tech_states=tech_states, flip_at=flip_at) + c, nightly=nightly.get(code), tech_states=tech_states, flip_at=flip_at, now=now) ikind = _apply_intraday(code, blocks, icfg, now, icache) if icfg else None c["consensus"] = blocks["consensus"] c["consensus_blocks"] = blocks @@ -1670,6 +1670,9 @@ def _buy_signals_today() -> dict: 最新一条取 reason —— 最新那条若是择时程序的, 决策系统更早的那条会被盖掉, 这只票就 不插队; 方向是少插一次队, 不是多插。 """ + from app.services import timing_state + if timing_state.enabled(): + return timing_state.buy_map() try: rows = pms_repo.buy_signals_today(datetime.now().replace( hour=0, minute=0, second=0, microsecond=0)) diff --git a/app/services/reask_service.py b/app/services/reask_service.py index 07ac4e5..cbb8684 100644 --- a/app/services/reask_service.py +++ b/app/services/reask_service.py @@ -131,7 +131,9 @@ def evaluate_all(judge_keys: dict, now=None) -> dict: logger.warning("[重问] 读当日驳回行失败 (本轮不解锁任何票): %s", e) return {} try: - buys = pms_repo.buy_signals_today(since) or {} + from app.services import timing_state + current_direction = timing_state.enabled() + buys = timing_state.buy_map(now) if current_direction else (pms_repo.buy_signals_today(since) or {}) except Exception as e: logger.warning("[重问] 读当日转多留痕失败 (U1 本轮不成立): %s", e) buys = {} @@ -147,7 +149,7 @@ def evaluate_all(judge_keys: dict, now=None) -> dict: base.setdefault("price", row.get("price")) b = buys.get(code) or {} buy_at = b.get("at") or "" - if buy_at and not sr.is_bionic_buy_note(b.get("reason")): + if buy_at and not current_direction and not sr.is_bionic_buy_note(b.get("reason")): buy_at = "" # 不是决策系统发的转多留痕, 不算 U1 try: r = rr.evaluate(base=base, now_read=_now_read(code, str(buy_at).replace(" ", "T")), diff --git a/app/services/risk_exit.py b/app/services/risk_exit.py index a4e7fbf..44538c6 100644 --- a/app/services/risk_exit.py +++ b/app/services/risk_exit.py @@ -137,7 +137,7 @@ def on_signal(sig, *, now=None, dry_run=False): _sync(state, code, pos, lots, now) reset = rules.stamp(state.get('reset_at')) if reset and rules.stamp(event['at']) <= reset: - return {'accepted': False, 'reason': '信号早于人工恢复买入'} + return {'accepted': False, 'reason': '信号早于本次恢复买入'} # 持仓买入前的消息不能用来清这轮新仓。 opened = rules.stamp(pos.get('opened_date')) if opened and rules.stamp(event['at']) < opened: @@ -157,6 +157,69 @@ def on_signal(sig, *, now=None, dry_run=False): return {'accepted': True, 'duplicate': duplicate, 'count': count, 'phase': phase} +def recover_on_buy(code, event, *, now=None): + """新的有效转多只解除本轮第一次系统停买,不重开已撤指令。""" + from app.services import timing_state, strategy_service, consensus_service, logic_state_service + now = now or datetime.now() + wait = {'recovered': False} + if (not enabled() or not timing_state.enabled() or not _code_ok(code) + or not timing_state.valid(event, now) or event.get('action') != 'BUY' + or float(event.get('confidence') or 0) < param_store.get_float('PMS_SIGNAL_AUTO_EXIT_CONF', .85)): + return wait + if any(param_store.get_bool(k, False) for k in ('PMS_GLOBAL_BUY_HALT', 'PMS_GLOBAL_EXEC_HALT')): + return wait + review = (logic_state_service.state_map().get(code) or {}).get('company_review') + snapshot = rules.review_snapshot(review, now=now, + stale_days=param_store.get_int('PMS_FUND_STALE_DAYS', 120)) + if not snapshot: + return wait + blocks = consensus_service.assemble({'ts_code': code, 'company_review': review}, + nightly=consensus_service.nightly_map([code]).get(code), + tech_states=consensus_service.state_map(), intraday_event=event, now=now) + con = blocks['consensus'] + if con.get('route') != '放行' or con.get('direction') != '看多': + return wait + with rotation_repo.account_guard(), rotation_repo.locked(_key(code), KIND, {}) as state: + current = timing_state.latest(code, now) + if not current or current['key'] != event['key']: + return wait + if (state.get('phase') != 'STOP_BUY' or state.get('count') != 1 + or state.get('review_exit') or state.get('exit_iid')): + return wait + pos, lots = _holding(code) + if (not lots or not set(state.get('lot_ids') or []) & lots + or state.get('opened_date') != str(pos.get('opened_date'))): + return wait + change = rules.review_change(state.get('review'), snapshot) + if change not in ('same', 'updated'): + return wait + at = rules.stamp(event['at']) + prior = [rules.stamp(e.get('at')) for e in state.get('events', [])] + prior.append(rules.stamp(state.get('reset_at'))) + if any(t and at <= t for t in prior): + return wait + if pms_repo.list_strategies(ts_code=code, statuses=['PAUSED'], limit=1): + return wait + pause = strategy_service.buypause_map().get(code) or {} + sources = pause.get('sources') or ({pause['source']: pause} if pause.get('source') else {}) + allowed = {'risk_exit', 'intraday', 'risk_sell', 'accum'} + if (not sources or set(sources) - allowed + or any(not rules.stamp(v.get('at')) or rules.stamp(v['at']) >= at for v in sources.values())): + return wait + reason = '新的有效看多信号通过三源合议,解除首次系统停买' + evidence = {'round_id': state['round_id'], 'event': event, + 'previous_events': list(state.get('events') or []), + 'consensus': consensus_service.hard_keys(blocks), 'sources': sorted(sources)} + _ledger(code, 'SIGNAL', reason, {'buy_recovery': evidence}, event['key'][:64]) + for source in sorted(sources): + result = strategy_service.clear_buypause(code, only_source=source) + if not result.get('ok') or not result.get('cleared'): + raise RuntimeError('系统恢复买入未保存,保留原暂停') + state.update(phase='WATCH', count=0, reset_at=event['at'], reason=reason, + review=snapshot, last_recovery=evidence) + return {'recovered': True, 'reason': reason} + + def observe_review(code, review, *, now=None): if not enabled() or not _code_ok(code): return None @@ -333,6 +396,10 @@ def scan(*, now=None): for code in sorted(codes): try: out['reviews'][code] = observe_review(code, (states.get(code) or {}).get('company_review'), now=now) + from app.services import timing_state + event = timing_state.latest(code, now) + if event and event['action'] == 'BUY': + out.setdefault('recoveries', {})[code] = recover_on_buy(code, event, now=now) drive(code, now=now) except Exception as exc: out['errors'].append(f'{code}: {type(exc).__name__}: {exc}') diff --git a/app/services/signal_service.py b/app/services/signal_service.py index ddefd4d..c83b324 100644 --- a/app/services/signal_service.py +++ b/app/services/signal_service.py @@ -148,6 +148,16 @@ def _handle(sig, view, prm, seen, ymd, dry_run, out, strat_codes=frozenset()): d = sr.digest(sig, pos, prm) act = d["action"] + # 按每条真实方向事件更新,先于旧的每日去重。BUY→SELL→BUY 不丢最后一次转多。 + from app.services import timing_state + if not dry_run and timing_state.enabled(): + event = timing_state.record(sig) + if event and event['action'] == 'BUY': + from app.services import risk_exit + result = risk_exit.recover_on_buy(code, event) + if result.get('recovered'): + out.setdefault('buy_recovered', []).append({'ts_code': code, **result}) + # 已授权退出纪律独立于旧的“每股每天一次”去重;重放按原研判标识防重。 # 必须早于在途提议检查,否则第一次生成的提议会吞掉第二次真实信号。 if act == sr.ACT_EXIT: diff --git a/app/services/strategy_advisor.py b/app/services/strategy_advisor.py index 8d642bd..978a96b 100644 --- a/app/services/strategy_advisor.py +++ b/app/services/strategy_advisor.py @@ -691,6 +691,22 @@ def _tend_existing(st, p, a, fresh, hv, prm, buypause, handoff_cool, today, return if why_h: out["skipped"].append({"ts_code": code, "why": why_h}) + from app.services import timing_state, consensus_service + if timing_state.enabled(): + # 吸筹继续参与策略形态参考,不再越过三源合议单独暂停新增买入。 + pause = (buypause or {}).get(code) or {} + sources = pause.get('sources') or {pause.get('source'): pause} + if 'accum' in sources: + allowed, blocks = consensus_service.holding_buy_consensus(code) + if allowed and not dry_run and not param_store.get_bool('PMS_GLOBAL_BUY_HALT', False): + result = strategy_service.clear_buypause(code, only_source='accum') + if not result.get('ok'): + raise RuntimeError('吸筹旧暂停解除失败') + if result.get('cleared'): + out['resumed'].append({'ts_code': code, 'why': '三源合议放行,解除旧吸筹暂停'}) + _ledger(code, 'NOTE', '三源合议放行,解除旧吸筹暂停', + consensus_service.hard_keys(blocks), st['strategy_id'], out, action='NOTE') + return # ---- 边三: 派发/失效 → 暂停买入; 回明确 → 解除 accum 来源的暂停 ---- if R_EXIT not in prm["rules"]: return diff --git a/app/services/strategy_runner.py b/app/services/strategy_runner.py index 6a80d98..851f479 100644 --- a/app/services/strategy_runner.py +++ b/app/services/strategy_runner.py @@ -719,7 +719,15 @@ def tick(*, now=None, dry_run: bool = False) -> dict: "why": f"{code} 已无持仓, 策略空转 (可撤下)"}) continue if st.get('type') == 'GRID': - _tick_grid(st, pos, now, dry_run, out, paused_codes is None or code in paused_codes or macro_gated) + paused = paused_codes is None or code in paused_codes or macro_gated + from app.services import timing_state, consensus_service + if timing_state.enabled() and str(st.get('note') or '').startswith('自动挂载'): + allowed, blocks = consensus_service.holding_buy_consensus(code, now=now) + paused = paused or not allowed + if not allowed: + out['notes'].append(f"{code} 自动网格买入等待三源合议放行:" + + str(blocks['consensus'].get('route_reason') or blocks['consensus'].get('reason'))) + _tick_grid(st, pos, now, dry_run, out, paused) continue state = deepcopy(st.get("state") or {}) if st.get("type") == "T0": diff --git a/app/services/timing_state.py b/app/services/timing_state.py new file mode 100644 index 0000000..6541c71 --- /dev/null +++ b/app/services/timing_state.py @@ -0,0 +1,87 @@ +"""最新有效盘中方向。按原始时间覆盖,不用当天第一条 BUY 代表全天方向。""" +from datetime import datetime, timedelta + +from config.settings import settings +from app.core import risk_exit as rules, strategy_book as books +from app.repo import rotation_repo, pms_repo +from app.services import param_store + +KIND = 'timing_direction' + + +def enabled(): + return settings.INFRA_STRATEGY_BOOK_SCHEMA and param_store.get_bool('PMS_SIGNAL_RECOVERY_ENABLED', False) + + +def key(code): + return 'timing-direction:' + code + + +def valid(value, now=None): + if not value: + return None + now = rules.stamp(now or datetime.now()) + at, expiry = rules.stamp(value.get('at')), rules.stamp(value.get('expires_at')) + if (not at or not expiry or at.date() != now.date() or not at <= now < expiry + or value.get('action') not in ('BUY', 'SELL')): + return None + return value + + +def latest(code, now=None): + if not enabled(): + return None + return valid(rotation_repo.get(key(code))[0], now) + + +def record(sig, now=None): + if not enabled(): + return None + now = now or datetime.now() + max_age = param_store.get_int('PMS_RISK_SIGNAL_MAX_AGE_SEC', 300) + event, _ = rules.signal_event(sig, now=now, + since=param_store.get('PMS_SIGNAL_RECOVERY_START_AT', ''), + threshold=param_store.get_float('PMS_SIGNAL_SELL_CONF_MIN', .75), + max_age=max_age, actions=('BUY', 'SELL')) + if not event: + return None + expiry = rules.stamp(event['at']) + timedelta(seconds=max_age) + explicit = rules.stamp(sig.get('expires_at')) + if explicit: + expiry = min(expiry, explicit) + event.update(action=sig['action'], expires_at=expiry.isoformat()) + event['key'] = rules.digest([event['key'], event['action']]) + code = sig['ts_code'] + with rotation_repo.account_guard(), rotation_repo.locked(key(code), KIND, {}) as current: + if current: + before, after = rules.stamp(current['at']), rules.stamp(event['at']) + if after < before or (after == before and current['action'] == 'SELL'): + return None + if current.get('key') == event['key']: + return dict(current) + current.clear() + current.update(event) + with books.scope(books.ORIGINAL): + if pms_repo.insert_ledger(ts_code=code, action='SIGNAL', arbiter='system', verdict='NOTE', + price_at=float(sig.get('suggested_price') or 0), + hard_numbers={'timing_direction': event}, + reason='决策系统最新盘中方向:' + ('看多' if event['action'] == 'BUY' else '看空'), + ref_id=event['key'][:64]) != 1: + raise RuntimeError('盘中方向依据未成功入账') + return event + + +def buy_map(now=None): + if not enabled(): + return {} + today = rules.stamp(now or datetime.now()).replace(hour=0, minute=0, second=0, microsecond=0) + rows = rotation_repo.updated_since(KIND, today.replace(tzinfo=None), limit=6001) + if len(rows) >= 6001: + raise ValueError('盘中方向数量超过完整读取上限') + out = {} + for row in rows: + event = valid(row['value'], now) + if event and event['action'] == 'BUY': + code = row['id'][len('timing-direction:'):] + out[code] = {'at': event['at'], 'reason': event['reason'], 'event': event} + return out diff --git a/app/web/static/index.html b/app/web/static/index.html index 0eadf61..7cced56 100644 --- a/app/web/static/index.html +++ b/app/web/static/index.html @@ -1110,7 +1110,7 @@ body.dock-r:not(.r-fold) .side-r .strip{display:none;}