fix compact notifications and longport runtime (#281)

Author: Pigbibi

constraints.txt

@@ -4,7 +4,7 @@
 # Auto-updated by update-qpk-pin.yml on every push to QPK main.
 
 quant-platform-kit @ git+https://github.com/QuantStrategyLab/QuantPlatformKit.git@d786c1140967f0e96e35599d057f0655e5a9ba25
-us-equity-strategies @ git+https://github.com/QuantStrategyLab/UsEquityStrategies.git@c8df5f9659340965bd7f53998892ed1018ed4254
+us-equity-strategies @ git+https://github.com/QuantStrategyLab/UsEquityStrategies.git@c57fb20528d40f363ae149ae6e3f6b1a240ec237
 hk-equity-strategies @ git+https://github.com/QuantStrategyLab/HkEquityStrategies.git@700c8b19c46336d3d8fcba687e58553afcf0235f
 cn-equity-strategies @ git+https://github.com/QuantStrategyLab/CnEquityStrategies.git@e09fd557c2bd9ae5f4d44228915c4e52c4b0dd21
 crypto-strategies @ git+https://github.com/QuantStrategyLab/CryptoStrategies.git@565be005e4186fd6d750884e7b0bc59f779f9549

notifications/renderers.py

@@ -346,11 +346,26 @@ def _build_risk_control_lines(execution, *, translator):
 def _relabel_dashboard_buying_power(text: str, *, cash_only_execution: bool, translator) -> str:
     value = str(text or "")
     if cash_only_execution:
+        value = value.replace("总资产（策略净值）", "总资产（策略标的+现金，不含融资额度）")
+        value = value.replace(
+            "Total assets (strategy net liquidation)",
+            "Total assets (strategy symbols + cash, ex-margin)",
+        )
         target = translator("buying_power")
         for source in ("Buying power", "购买力"):
             if source != target:
                 value = value.replace(source, target)
         return value
+    value = value.replace("总资产（策略标的+现金，不含融资额度）", "总资产（策略净值）")
+    value = value.replace("总资产（策略标的+现金）", "总资产（策略净值）")
+    value = value.replace(
+        "Total assets (strategy symbols + cash, ex-margin)",
+        "Total assets (strategy net liquidation)",
+    )
+    value = value.replace(
+        "Total assets (strategy symbols + cash)",
+        "Total assets (strategy net liquidation)",
+    )
     target = translator("buying_power_margin")
     for source in ("Available cash", "可用现金"):
         if source != target:
@@ -377,16 +392,30 @@ def _format_dashboard_text(text, *, translator=None, cash_only_execution: bool =
     return result
 
 
-def _append_dashboard_block(lines, *, execution, separator, translator) -> None:
+def _is_compact_dashboard_audit_line(line: str) -> bool:
+    text = str(line or "").strip()
+    lowered = text.lower()
+    return (
+        text.startswith(("⏱", "🧾", "🧩 输入状态", "📊", "🎯", "🛡️"))
+        or lowered.startswith(("signal:", "signal：", "market status:"))
+        or text.startswith(("信号:", "信号：", "市场状态:", "市场状态："))
+    )
+
+
+def _append_dashboard_block(lines, *, execution, separator, translator, compact: bool = False) -> None:
     cash_only_execution = bool(execution.get("cash_only_execution", True))
     dashboard_text = _format_dashboard_text(
         execution.get("dashboard_text"),
         translator=translator,
         cash_only_execution=cash_only_execution,
     )
-    if dashboard_text:
+    dashboard_lines = [
+        line for line in dashboard_text.splitlines()
+        if not (compact and _is_compact_dashboard_audit_line(line))
+    ]
+    if dashboard_lines:
         lines.append(separator)
-        lines.extend(dashboard_text.splitlines())
+        lines.extend(dashboard_lines)
 
 
 def _append_timing_lines(lines, *, execution, translator) -> None:
@@ -570,8 +599,7 @@ def render_rebalance_notification(
     if dry_run_only:
         compact_lines.append(translator("dry_run_banner"))
     _append_extra_notification_lines(compact_lines, extra_notification_lines)
-    compact_lines.append(separator)
-    _append_dashboard_block(compact_lines, execution=execution, separator=separator, translator=translator)
+    _append_dashboard_block(compact_lines, execution=execution, separator=separator, translator=translator, compact=True)
     compact_lines.append(separator)
     compact_lines.append(formatted_logs)
     return RenderedNotification(
@@ -633,16 +661,7 @@ def render_heartbeat_notification(
     if dry_run_only:
         compact_lines.append(translator("dry_run_banner"))
     _append_extra_notification_lines(compact_lines, extra_notification_lines)
-    _append_dashboard_block(compact_lines, execution=execution, separator=separator, translator=translator)
-    _append_timing_lines(compact_lines, execution=execution, translator=translator)
-    _append_signal_snapshot_line(compact_lines, execution=execution, translator=translator)
-    _append_source_input_line(compact_lines, execution=execution, translator=translator)
-    _append_compact_status_lines(
-        compact_lines,
-        execution=execution,
-        translator=translator,
-        signal_key="heartbeat_signal",
-    )
+    _append_dashboard_block(compact_lines, execution=execution, separator=separator, translator=translator, compact=True)
     compact_lines.extend(
         [
             separator,

notifications/telegram.py

@@ -158,6 +158,7 @@ def _break_telegram_market_symbol_auto_links(value) -> str:
         "strategy_name_qqq_tech_enhancement": "科技通信回调增强",
         "strategy_name_russell_top50_leader_rotation": "罗素 Top50 领涨轮动",
         "strategy_name_ibit_smart_dca": "IBIT 比特币 ETF 智能定投",
+        "strategy_name_nasdaq_sp500_smart_dca": "纳指100 / 标普500 智能定投",
         "strategy_name_hk_global_etf_tactical_rotation": "港股全球 ETF 战术轮动",
         "strategy_name_hk_low_vol_dividend_quality_snapshot": "港股低波股息质量快照",
         "strategy_name_cn_industry_etf_rotation": "A股行业ETF轮动",
@@ -344,6 +345,7 @@ def _break_telegram_market_symbol_auto_links(value) -> str:
         "strategy_name_qqq_tech_enhancement": "Tech/Communication Pullback Enhancement",
         "strategy_name_russell_top50_leader_rotation": "Russell Top50 Leader Rotation",
         "strategy_name_ibit_smart_dca": "IBIT Smart DCA",
+        "strategy_name_nasdaq_sp500_smart_dca": "Nasdaq 100 / S&P 500 Smart DCA",
         "strategy_name_hk_global_etf_tactical_rotation": "HK Global ETF Tactical Rotation",
         "strategy_name_hk_low_vol_dividend_quality_snapshot": "HK Low-Vol Dividend Quality Snapshot",
         "strategy_name_cn_industry_etf_rotation": "CN Industry ETF Rotation",

requirements.txt

@@ -7,7 +7,7 @@ pandas-market-calendars
 google-cloud-secret-manager
 google-cloud-storage
 google-auth
-longport
+longport==3.0.23
 quant-platform-kit @ git+https://github.com/QuantStrategyLab/QuantPlatformKit.git@d786c1140967f0e96e35599d057f0655e5a9ba25
-us-equity-strategies @ git+https://github.com/QuantStrategyLab/UsEquityStrategies.git@c8df5f9659340965bd7f53998892ed1018ed4254
+us-equity-strategies @ git+https://github.com/QuantStrategyLab/UsEquityStrategies.git@c57fb20528d40f363ae149ae6e3f6b1a240ec237
 hk-equity-strategies @ git+https://github.com/QuantStrategyLab/HkEquityStrategies.git@700c8b19c46336d3d8fcba687e58553afcf0235f

tests/test_dependency_pins.py

@@ -0,0 +1,7 @@
+from pathlib import Path
+
+
+def test_longport_stays_on_python_312_compatible_major() -> None:
+    requirements = Path("requirements.txt").read_text(encoding="utf-8")
+
+    assert "longport==3.0.23" in requirements

tests/test_notifications.py

@@ -171,10 +171,11 @@ def test_heartbeat_signal_snapshot_localizes_price_source(self):
             dry_run_only=False,
         )
 
-        self.assertIn("数据源 LongBridge 日线K线", rendered.compact_text)
-        self.assertIn("🧩 输入状态: 价格 2026-05-28 | 股票池 2026-04-30 | 股票池复用 连续1次", rendered.compact_text)
-        self.assertNotIn("报价覆盖", rendered.compact_text)
-        self.assertIn("📊 市场状态: 🚀 风险开启（SOXX+SOXL）", rendered.compact_text)
+        self.assertIn("数据源 LongBridge 日线K线", rendered.detailed_text)
+        self.assertIn("🧩 输入状态: 价格 2026-05-28 | 股票池 2026-04-30 | 股票池复用 连续1次", rendered.detailed_text)
+        self.assertIn("📊 市场状态: 🚀 风险开启（SOXX+SOXL）", rendered.detailed_text)
+        self.assertNotIn("数据源 LongBridge 日线K线", rendered.compact_text)
+        self.assertNotIn("📊 市场状态", rendered.compact_text)
         self.assertNotIn("longbridge_candlesticks", rendered.compact_text)
 
     def test_dry_run_heartbeat_uses_dry_run_title(self):
@@ -264,12 +265,14 @@ def test_heartbeat_renders_tqqq_volatility_delever_risk_control(self):
 
         self.assertIn(
             "🛡️ 风控: QQQ 5 日年化波动率 31.2% 高于实际阈值 30.0%（动态 p90，252日窗口，范围 24.0%-36.0%，样本 252），TQQQ 转向 QQQ（杠杆仓位：TQQQ 保留 25.0%，QQQ 75.0%）",
-            zh_rendered.compact_text,
+            zh_rendered.detailed_text,
         )
+        self.assertNotIn("🛡️ 风控:", zh_rendered.compact_text)
         self.assertIn(
             "🛡️ Risk control: QQQ 5d annualized volatility 31.2% is above effective threshold 30.0% (dynamic p90, 252d lookback, bounded 24.0%-36.0%, samples 252); TQQQ redirects to QQQ (leveraged sleeve: TQQQ retained 25.0%, QQQ 75.0%)",
-            en_rendered.compact_text,
+            en_rendered.detailed_text,
         )
+        self.assertNotIn("🛡️ Risk control:", en_rendered.compact_text)
 
     def test_heartbeat_renders_tqqq_volatility_delever_hysteresis_risk_control(self):
         zh_rendered = render_heartbeat_notification(
@@ -331,12 +334,14 @@ def test_heartbeat_renders_tqqq_volatility_delever_hysteresis_risk_control(self)
 
         self.assertIn(
             "🛡️ 风控: QQQ 5 日年化波动率 26.2% 仍高于退出阈值 24.0%；入场实际阈值 30.0%（动态 p90，252日窗口，范围 24.0%-36.0%，样本 252），维持 TQQQ 转向 QQQM（杠杆仓位：TQQQ 保留 0.0%，QQQM 100.0%）",
-            zh_rendered.compact_text,
+            zh_rendered.detailed_text,
         )
+        self.assertNotIn("🛡️ 风控:", zh_rendered.compact_text)
         self.assertIn(
             "🛡️ Risk control: QQQ 5d annualized volatility 26.2% remains above exit threshold 24.0%; entry effective threshold 30.0% (dynamic p90, 252d lookback, bounded 24.0%-36.0%, samples 252); keep TQQQ redirected to QQQM (leveraged sleeve: TQQQ retained 0.0%, QQQM 100.0%)",
-            en_rendered.compact_text,
+            en_rendered.detailed_text,
         )
+        self.assertNotIn("🛡️ Risk control:", en_rendered.compact_text)
 
     def test_heartbeat_localizes_strategy_diagnostics_and_source_input_status(self):
         rendered = render_heartbeat_notification(
@@ -369,25 +374,37 @@ def test_heartbeat_localizes_strategy_diagnostics_and_source_input_status(self):
             dry_run_only=False,
         )
 
-        self.assertIn("🧩 输入状态: 价格 2026-06-01 | 股票池 2026-05-14 | 状态 部分行情刷新", rendered.compact_text)
-        self.assertIn(
-            "🎯 信号: 市场阶段=进攻 市场宽度=68.0% 基准趋势=向上 "
-            "目标股票仓位=100.0% 实际股票仓位=100.0% 入选标的数=4 "
-            "前排标的=MU(4.07), INTC(2.23), AMD(1.96)",
-            rendered.compact_text,
-        )
-        self.assertIn("📊 市场状态: 市场阶段=进攻", rendered.compact_text)
-        self.assertIn(
-            "🎯 信号: 市场阶段=进攻 市场宽度=68.0% 基准趋势=向上 "
-            "目标股票仓位=100.0% 实际股票仓位=100.0% 入选标的数=4 "
-            "前排标的=MU(4.07), INTC(2.23), AMD(1.96)",
-            rendered.compact_text,
-        )
+        self.assertIn("🧩 输入状态: 价格 2026-06-01 | 股票池 2026-05-14 | 状态 部分行情刷新", rendered.detailed_text)
+        self.assertNotIn("🎯 信号:", rendered.compact_text)
+        self.assertIn("📊 市场状态: 市场阶段=进攻", rendered.detailed_text)
+        self.assertNotIn("🧩 输入状态", rendered.compact_text)
+        self.assertNotIn("📊 市场状态", rendered.compact_text)
         self.assertNotIn("regime=risk_on", rendered.compact_text)
         self.assertNotIn("benchmark_trend=up", rendered.compact_text)
         self.assertNotIn("target_stock=", rendered.compact_text)
         self.assertNotIn("partial_history_refresh", rendered.compact_text)
 
+    def test_dashboard_relabels_total_assets_for_margin_execution(self):
+        rendered = render_rebalance_notification(
+            execution={
+                "dashboard_text": "  - 总资产（策略标的+现金，不含融资额度）: $50,000.00\n  - 可用现金: $75,000.00",
+                "cash_only_execution": False,
+                "signal_display": "hold",
+                "status_display": "hold",
+            },
+            logs=(),
+            skip_logs=(),
+            note_logs=(),
+            translator=build_translator("zh"),
+            separator="━━━━━━━━━━━━━━━━━━",
+            strategy_display_name="TQQQ 增长收益",
+            dry_run_only=False,
+        )
+
+        self.assertIn("总资产（策略净值）: $50,000.00", rendered.compact_text)
+        self.assertIn("购买力: $75,000.00", rendered.compact_text)
+        self.assertNotIn("不含融资额度", rendered.compact_text)
+
     def test_dashboard_relabels_buying_power_for_cash_only_execution(self):
         rendered = render_rebalance_notification(
             execution={