Improve Telegram rebalance notifications

Author: Pigbibi

notifications/renderers.py

@@ -16,6 +16,9 @@
     ("pending_orders_detected", "检测到未完成订单"),
     ("same_day_execution_locked", "当日执行锁已存在"),
     ("same_day_fills_detected", "检测到当日成交"),
+    ("target_diff_below_threshold", "调仓差异低于阈值"),
+    ("min_notional", "低于最小订单金额"),
+    ("quantity_zero", "整数股数量为0"),
     ("fail_reason=", "失败原因="),
     ("decision=", "决策="),
 )
@@ -186,6 +189,13 @@ def _build_notification_trade_lines(
                 snapshot_date=_format_text(execution_summary.get("snapshot_as_of"), fallback="<none>"),
             )
         )
+    elif no_op_reason:
+        lines.append(
+            translator(
+                "no_order_plan_reason",
+                reason=_localize_notification_text(f"reason={no_op_reason}", translator=translator),
+            )
+        )
 
     fallback_symbols = tuple(execution_summary.get("snapshot_price_fallback_symbols") or ())
     if execution_summary.get("snapshot_price_fallback_used") and fallback_symbols:
@@ -215,7 +225,7 @@ def _build_notification_trade_lines(
             continue
         if "execution_lock_acquired" in text or "已获取执行锁" in text:
             continue
-        if text.startswith(("profile=", "strategy_profile=", "策略=")):
+        if text.startswith(("profile=", "strategy_profile=", "execution_profile=", "策略=", "执行配置=")):
             continue
         if "same_day_execution_locked" in text or "当日执行锁已存在" in text:
             continue
@@ -225,6 +235,16 @@ def _build_notification_trade_lines(
     return lines
 
 
+def _build_detailed_trade_lines(trade_logs, *, translator) -> list[str]:
+    lines: list[str] = []
+    for raw_line in trade_logs or ():
+        text = _localize_notification_text(str(raw_line).strip(), translator=translator)
+        if not text:
+            continue
+        lines.extend(_split_labeled_text(text))
+    return lines
+
+
 def _resolve_weight_allocation(signal_metadata, *, required: bool) -> dict:
     metadata = dict(signal_metadata or {})
     allocation = dict(metadata.get("allocation") or {})
@@ -384,10 +404,27 @@ def build_dashboard(
     )
 
 
-def _first_prefixed_line(prefix: str, text: str, *, translator) -> str | None:
+def _first_summary_text(text: str, *, translator) -> str:
     localized = _localize_notification_text(text, translator=translator)
-    lines = _format_prefixed_text(prefix, localized)
-    return lines[0] if lines else None
+    lines = _split_labeled_text(localized)
+    return lines[0] if lines else ""
+
+
+def _localize_signal_state(text: str, *, translator) -> str:
+    value = str(text or "").strip()
+    if value.lower() not in {"hold", "entry", "reduce", "exit", "idle"}:
+        return value
+    key = f"signal_state_{value.lower()}"
+    translated = translator(key)
+    return value if translated == key else str(translated)
+
+
+def _extract_timing_lines(text: str) -> list[str]:
+    return [
+        line.strip()
+        for line in _format_dashboard_text(text).splitlines()
+        if line.strip().startswith("⏱")
+    ]
 
 
 def _build_compact_message(
@@ -402,19 +439,26 @@ def _build_compact_message(
     body_lines,
     dashboard_text: str = "",
     extra_notification_lines=(),
+    include_dashboard: bool = False,
 ) -> str:
     lines = [title]
     strategy_name = _format_text(strategy_display_name, fallback="<unknown>")
     lines.append(translator("strategy_label", name=strategy_name))
     lines.extend(_extra_notification_lines(extra_notification_lines))
     dashboard = _format_dashboard_text(dashboard_text)
-    if dashboard:
+    if include_dashboard and dashboard:
         lines.append(separator)
         lines.extend(dashboard.splitlines())
-    status_line = _first_prefixed_line(status_icon, status_desc, translator=translator)
-    if status_line:
+    elif dashboard:
+        lines.extend(_extract_timing_lines(dashboard))
+    status_summary = _first_summary_text(status_desc, translator=translator)
+    signal_summary = _first_summary_text(signal_desc, translator=translator)
+    status_summary = _localize_signal_state(status_summary, translator=translator)
+    signal_summary = _localize_signal_state(signal_summary, translator=translator)
+    status_line = f"{status_icon} {status_summary}".strip() if status_summary else None
+    if status_line and status_summary != signal_summary:
         lines.append(status_line)
-    signal_line = _first_prefixed_line("🎯", signal_desc, translator=translator)
+    signal_line = f"🎯 {signal_summary}".strip() if signal_summary else None
     if signal_line:
         lines.append(signal_line)
     compact_body = [str(line).strip() for line in body_lines or () if str(line).strip()]
@@ -451,6 +495,7 @@ def render_heartbeat_notification(
         body_lines=[no_op_text],
         dashboard_text=strategy_dashboard,
         extra_notification_lines=extra_lines,
+        include_dashboard=True,
     )
     return RenderedNotification(detailed_text=detailed_text, compact_text=compact_text)
 
@@ -476,12 +521,16 @@ def render_trade_notification(
             execution_summary=execution_summary,
             translator=translator,
         )
+        detailed_trade_lines = _build_detailed_trade_lines(
+            trade_logs,
+            translator=translator,
+        )
         detailed_text = (
             f"{translator('rebalance_title')}\n"
             f"{chr(10).join(extra_lines) + chr(10) if extra_lines else ''}"
             f"{dashboard}\n"
             f"{separator}\n"
-            f"{chr(10).join(notification_trade_lines)}"
+            f"{chr(10).join(detailed_trade_lines)}"
         )
         compact_text = _build_compact_message(
             title=translator("rebalance_title"),
@@ -494,6 +543,7 @@ def render_trade_notification(
             body_lines=notification_trade_lines,
             dashboard_text=strategy_dashboard,
             extra_notification_lines=extra_lines,
+            include_dashboard=True,
         )
         return RenderedNotification(detailed_text=detailed_text, compact_text=compact_text)
 
@@ -510,5 +560,6 @@ def render_trade_notification(
         body_lines=[translator("no_trades")],
         dashboard_text=strategy_dashboard,
         extra_notification_lines=extra_lines,
+        include_dashboard=True,
     )
     return RenderedNotification(detailed_text=detailed_text, compact_text=compact_text)

notifications/telegram.py

@@ -39,6 +39,7 @@
         "dry_run_snapshot_prices": "🧪 模拟运行估价: 使用快照收盘价 {count}个标的 ({symbols})",
         "price_fallback_prices": "📌 执行估价: 使用最近收盘价 {count}个标的 ({symbols})",
         "target_diff_summary": "调仓变化: {details}",
+        "no_order_plan_reason": "未下单: {reason}",
         "trade_date_detail": "交易日={value}",
         "target_diff": "目标差异 {symbol}: 当前={current} 目标={target} 变化={delta}",
         "pending_orders_detected": "检测到未完成订单: 策略={profile} 标的={symbols}",
@@ -102,6 +103,11 @@
         "paper_liquidation_only": "IBKR 模拟账户清仓模式",
         "paper_liquidation_status": "模式={mode} 状态={status}",
         "paper_liquidation_positions_seen": "识别持仓={count}",
+        "signal_state_hold": "趋势持有",
+        "signal_state_entry": "入场信号",
+        "signal_state_reduce": "减仓信号",
+        "signal_state_exit": "离场信号",
+        "signal_state_idle": "等待信号",
         "small_account_warning_note": "小账户提示：净值 {portfolio_equity} 低于建议 {min_recommended_equity}；{reason}",
         "small_account_warning_reason_integer_shares_min_position_value_may_prevent_backtest_replication": "整数股和最小仓位限制可能导致实盘无法完全复现回测",
         "strategy_name_global_etf_rotation": "全球 ETF 轮动",
@@ -148,6 +154,7 @@
         "dry_run_snapshot_prices": "🧪 dry-run pricing: snapshot close for {count} symbols ({symbols})",
         "price_fallback_prices": "📌 execution pricing: recent close for {count} symbols ({symbols})",
         "target_diff_summary": "Target changes: {details}",
+        "no_order_plan_reason": "No order submitted: {reason}",
         "trade_date_detail": "trade_date={value}",
         "target_diff": "target_diff {symbol}: current={current} target={target} delta={delta}",
         "pending_orders_detected": "pending_orders_detected profile={profile} symbols={symbols}",
@@ -211,6 +218,11 @@
         "paper_liquidation_only": "IBKR paper liquidation only",
         "paper_liquidation_status": "mode={mode} status={status}",
         "paper_liquidation_positions_seen": "positions_seen={count}",
+        "signal_state_hold": "Trend Hold",
+        "signal_state_entry": "Entry Signal",
+        "signal_state_reduce": "Reduce Signal",
+        "signal_state_exit": "Exit Signal",
+        "signal_state_idle": "Idle",
         "small_account_warning_note": "small account warning: portfolio equity {portfolio_equity} is below recommended {min_recommended_equity}; {reason}",
         "small_account_warning_reason_integer_shares_min_position_value_may_prevent_backtest_replication": "integer-share minimum position sizing may prevent backtest replication",
         "strategy_name_global_etf_rotation": "Global ETF Rotation",

tests/test_rebalance_service.py

@@ -1,7 +1,11 @@
 import json
 
 from application.rebalance_service import run_strategy_core
-from notifications.renderers import _build_notification_trade_lines, build_dashboard
+from notifications.renderers import (
+    _build_notification_trade_lines,
+    build_dashboard,
+    render_trade_notification,
+)
 from notifications.telegram import build_translator
 
 
@@ -46,6 +50,7 @@ def _build_test_translator():
         "same_day_execution_locked_notice": "same_day_execution_locked_notice {mode} {trade_date} {snapshot_date}",
         "dry_run_snapshot_prices": "dry_run_snapshot_prices count={count} symbols={symbols}",
         "price_fallback_prices": "price_fallback_prices count={count} symbols={symbols}",
+        "no_order_plan_reason": "no_order_plan_reason {reason}",
         "dry_run_buy_batch": "dry_run_buy_batch count={count} details={details}",
         "dry_run_sell_batch": "dry_run_sell_batch count={count} details={details}",
         "submitted_buy_batch": "submitted_buy_batch count={count} details={details}",
@@ -146,7 +151,7 @@ def test_build_dashboard_localizes_qqq_tech_diagnostics_for_zh():
     assert "入选标的数=8 前排标的=CIEN(0.92)" in dashboard
 
 
-def test_notification_trade_lines_localize_runtime_diagnostic_tail_for_zh():
+def test_notification_trade_lines_suppress_runtime_diagnostic_tail_for_zh():
     lines = _build_notification_trade_lines(
         [
             (
@@ -158,15 +163,54 @@ def test_notification_trade_lines_localize_runtime_diagnostic_tail_for_zh():
         translator=build_translator("zh"),
     )
 
-    assert lines == [
-        "执行配置=SOXL/SOXX 半导体趋势收益",
-        "市场阶段=无",
-        "宽度=0.0%",
-        "目标股票仓位=0.0%",
-        "实际股票仓位=0.0%",
-        "快照日期=无",
-        "交易日=无",
-    ]
+    assert lines == []
+
+
+def test_notification_trade_lines_include_no_order_reason_for_small_account_zh():
+    lines = _build_notification_trade_lines(
+        [],
+        execution_summary={"no_op_reason": "min_notional:BOXX,QQQ,TQQQ"},
+        translator=build_translator("zh"),
+    )
+
+    assert lines == ["未下单: 原因=低于最小订单金额:BOXX,QQQ,TQQQ"]
+
+
+def test_notification_trade_lines_include_no_order_reason_for_small_account_en():
+    lines = _build_notification_trade_lines(
+        [],
+        execution_summary={"no_op_reason": "min_notional:BOXX,QQQ,TQQQ"},
+        translator=build_translator("en"),
+    )
+
+    assert lines == ["No order submitted: reason=min_notional:BOXX,QQQ,TQQQ"]
+
+
+def test_trade_notification_localizes_compact_signal_state_for_zh_and_en():
+    common_kwargs = dict(
+        dashboard="",
+        strategy_dashboard="",
+        trade_logs=[],
+        execution_summary={},
+        signal_desc="entry",
+        status_desc="entry",
+        status_icon="🐤",
+        separator="---",
+        strategy_display_name="TQQQ Growth Income",
+        extra_notification_lines=(),
+    )
+
+    zh_notification = render_trade_notification(
+        **common_kwargs,
+        translator=build_translator("zh"),
+    )
+    en_notification = render_trade_notification(
+        **common_kwargs,
+        translator=build_translator("en"),
+    )
+
+    assert "🎯 入场信号" in zh_notification.compact_text
+    assert "🎯 Entry Signal" in en_notification.compact_text
 
 
 def test_run_strategy_core_passes_signal_metadata_to_execution():
@@ -325,6 +369,41 @@ def disconnect(self):
     assert "目标差异" not in observed["messages"][0]
 
 
+def test_trade_notification_keeps_detailed_logs_out_of_compact_message():
+    notification = render_trade_notification(
+        dashboard="📌 Strategy portfolio\n  - Total assets: $1,000.00",
+        strategy_dashboard=(
+            "📌 Strategy portfolio\n"
+            "  - Total assets: $1,000.00\n"
+            "⏱ Timing: 2026-04-01 -> 2026-04-02 (next trading day)"
+        ),
+        trade_logs=[
+            (
+                "execution_profile=tqqq_growth_income | regime=<none> | breadth=0.0% | "
+                "target_stock=0.0% | realized_stock=0.0% | snapshot_as_of=<none> | trade_date=2026-04-02"
+            )
+        ],
+        execution_summary={"no_op_reason": "min_notional:QQQ,TQQQ"},
+        signal_desc="entry | small account warning",
+        status_desc="entry",
+        status_icon="🐤",
+        translator=_build_test_translator(),
+        separator="---",
+        strategy_display_name="TQQQ Growth Income",
+        extra_notification_lines=(
+            "🆔 Account: U18308207",
+            "🧩 Plugin: Crisis Watch Notice | status: no crisis detected | notice: no action",
+        ),
+    )
+
+    assert "execution_profile=tqqq_growth_income" in notification.detailed_text
+    assert "execution_profile=tqqq_growth_income" not in notification.compact_text
+    assert "📌 Strategy portfolio" in notification.compact_text
+    assert "⏱ Timing: 2026-04-01 -> 2026-04-02 (next trading day)" in notification.compact_text
+    assert "no_order_plan_reason reason=min_notional:QQQ,TQQQ" in notification.compact_text
+    assert notification.compact_text.index("🆔 Account: U18308207") < notification.compact_text.index("🧩 Plugin:")
+
+
 def test_run_strategy_core_writes_reconciliation_record_under_strategy_dir(tmp_path):
     class FakeIB:
         def isConnected(self):