vibego 0.2.36__tar.gz → 0.2.38__tar.gz

{vibego-0.2.36 → vibego-0.2.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vibego
-Version: 0.2.36
+Version: 0.2.38
 Summary: vibego CLI：用于初始化与管理 Telegram Master Bot 的工具
 Author: Hypha
 License-Expression: LicenseRef-Proprietary

{vibego-0.2.36 → vibego-0.2.38}/bot.py

@@ -482,7 +482,6 @@ _ESCAPED_CODE_BLOCK_PATTERN = re.compile(
     re.DOTALL
 )
 
-
 def _is_already_escaped(text: str) -> bool:
     """检测文本是否已经包含 MarkdownV2 转义字符。
 
@@ -583,6 +582,25 @@ def _prepare_model_payload(text: str) -> str:
     return text
 
 
+def _optimize_markdown_v2_payload(payload: str) -> str:
+    """占位函数：保留严格转义版本，确保 MarkdownV2 合规。"""
+
+    return payload
+
+
+def _prepare_model_payload_variants(text: str) -> tuple[str, Optional[str]]:
+    """返回首选与备用的 MarkdownV2 内容，首选尽量减少转义。"""
+
+    strict_payload = _prepare_model_payload(text)
+    if not _IS_MARKDOWN_V2:
+        return strict_payload, None
+
+    optimized_payload = _optimize_markdown_v2_payload(strict_payload)
+    if optimized_payload != strict_payload:
+        return optimized_payload, strict_payload
+    return strict_payload, None
+
+
 def _extract_bad_request_message(exc: TelegramBadRequest) -> str:
     message = getattr(exc, "message", None)
     if not message:
@@ -636,6 +654,7 @@ async def _send_with_markdown_guard(
     sender: Callable[[str], Awaitable[None]],
     *,
     raw_sender: Optional[Callable[[str], Awaitable[None]]] = None,
+    fallback_payload: Optional[str] = None,
 ) -> str:
     try:
         await sender(text)
@@ -644,6 +663,19 @@ async def _send_with_markdown_guard(
         if not _is_markdown_parse_error(exc):
             raise
 
+        if fallback_payload and fallback_payload != text:
+            try:
+                await sender(fallback_payload)
+                worker_log.debug(
+                    "Markdown 优化回退为严格转义版本",
+                    extra={"length": len(fallback_payload)},
+                )
+                return fallback_payload
+            except TelegramBadRequest as fallback_exc:
+                if not _is_markdown_parse_error(fallback_exc):
+                    raise
+                exc = fallback_exc
+
         sanitized: Optional[str]
         if _IS_MARKDOWN_V2:
             sanitized = _escape_markdown_v2(text)
@@ -740,7 +772,11 @@ async def reply_large_text(
     """
     bot = current_bot()
     parse_mode_value = parse_mode if parse_mode is not None else _parse_mode_value()
-    prepared = text if preformatted else _prepare_model_payload(text)
+    if preformatted:
+        prepared = text
+        fallback_payload = None
+    else:
+        prepared, fallback_payload = _prepare_model_payload_variants(text)
 
     async def _send_formatted_message(payload: str) -> None:
         await bot.send_message(
@@ -757,6 +793,7 @@ async def reply_large_text(
             prepared,
             _send_formatted_message,
             raw_sender=_send_raw_message,
+            fallback_payload=fallback_payload,
         )
 
         worker_log.info(
@@ -775,10 +812,12 @@ async def reply_large_text(
         f"内容较长，已生成附件 `{attachment_name}`，请下载查看全文。"
     )
 
+    summary_prepared, summary_fallback = _prepare_model_payload_variants(summary_text)
     delivered_summary = await _send_with_markdown_guard(
-        summary_text,
+        summary_prepared,
         _send_formatted_message,
         raw_sender=_send_raw_message,
+        fallback_payload=summary_fallback,
     )
 
     document = BufferedInputFile(text.encode("utf-8"), filename=attachment_name)
@@ -1492,7 +1531,7 @@ async def _broadcast_worker_keyboard(bot: Bot) -> None:
             continue
 
         parse_mode = _parse_mode_value()
-        prepared = _prepare_model_payload(text)
+        prepared, fallback_payload = _prepare_model_payload_variants(text)
 
         async def _send_formatted(payload: str) -> None:
             await bot.send_message(
@@ -1515,6 +1554,7 @@ async def _broadcast_worker_keyboard(bot: Bot) -> None:
                 prepared,
                 _send_formatted,
                 raw_sender=_send_raw,
+                fallback_payload=fallback_payload,
             )
         except TelegramForbiddenError as exc:
             worker_log.warning("推送任务列表被拒绝：%s", exc, extra={**_session_extra(), "chat": chat_id})
@@ -2598,7 +2638,7 @@ def _build_status_buttons(task_id: str, current_status: str) -> list[list[Inline
     for status in STATUS_DISPLAY_ORDER:
         text = _format_status(status)
         if status == current_status:
-            text = f"👉 {text} (当前)"
+            text = f"{text} (当前)"
         row.append(
             InlineKeyboardButton(
                 text=text,
@@ -2772,13 +2812,32 @@ async def _answer_with_markdown(
     *,
     reply_markup: InlineKeyboardMarkup | ReplyKeyboardMarkup | None = None,
 ) -> Optional[Message]:
-    prepared = _prepare_model_payload(text)
-    try:
-        sent = await message.answer(
-            prepared,
+    prepared, fallback_payload = _prepare_model_payload_variants(text)
+    sent_message: Optional[Message] = None
+
+    async def _send(payload: str) -> None:
+        nonlocal sent_message
+        sent_message = await message.answer(
+            payload,
             parse_mode=_parse_mode_value(),
             reply_markup=reply_markup,
         )
+
+    async def _send_raw(payload: str) -> None:
+        nonlocal sent_message
+        sent_message = await message.answer(
+            payload,
+            parse_mode=None,
+            reply_markup=reply_markup,
+        )
+
+    try:
+        await _send_with_markdown_guard(
+            prepared,
+            _send,
+            raw_sender=_send_raw,
+            fallback_payload=fallback_payload,
+        )
     except TelegramBadRequest as exc:
         worker_log.warning(
             "发送消息失败：%s",
@@ -2786,7 +2845,7 @@ async def _answer_with_markdown(
             extra={"chat": getattr(message.chat, "id", None)},
         )
         return None
-    return sent
+    return sent_message
 
 
 async def _edit_message_with_markdown(
@@ -2795,11 +2854,27 @@ async def _edit_message_with_markdown(
     *,
     reply_markup: InlineKeyboardMarkup | None = None,
 ) -> None:
-    prepared = _prepare_model_payload(text)
-    await callback.message.edit_text(
+    prepared, fallback_payload = _prepare_model_payload_variants(text)
+
+    async def _send(payload: str) -> None:
+        await callback.message.edit_text(
+            payload,
+            parse_mode=_parse_mode_value(),
+            reply_markup=reply_markup,
+        )
+
+    async def _send_raw(payload: str) -> None:
+        await callback.message.edit_text(
+            payload,
+            parse_mode=None,
+            reply_markup=reply_markup,
+        )
+
+    await _send_with_markdown_guard(
         prepared,
-        parse_mode=_parse_mode_value(),
-        reply_markup=reply_markup,
+        _send,
+        raw_sender=_send_raw,
+        fallback_payload=fallback_payload,
     )
 
 
@@ -2811,13 +2886,29 @@ async def _try_edit_message(
 ) -> bool:
     if message is None:
         return False
-    prepared = _prepare_model_payload(text)
-    try:
+    prepared, fallback_payload = _prepare_model_payload_variants(text)
+
+    async def _send(payload: str) -> None:
         await message.edit_text(
-            prepared,
+            payload,
             parse_mode=_parse_mode_value(),
             reply_markup=reply_markup,
         )
+
+    async def _send_raw(payload: str) -> None:
+        await message.edit_text(
+            payload,
+            parse_mode=None,
+            reply_markup=reply_markup,
+        )
+
+    try:
+        await _send_with_markdown_guard(
+            prepared,
+            _send,
+            raw_sender=_send_raw,
+            fallback_payload=fallback_payload,
+        )
         return True
     except TelegramBadRequest as exc:
         worker_log.info(

{vibego-0.2.36 → vibego-0.2.38}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vibego"
-version = "0.2.36"
+version = "0.2.38"
 description = "vibego CLI：用于初始化与管理 Telegram Master Bot 的工具"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -42,7 +42,7 @@ include = ["vibego_cli", "tasks", "scripts", "telegram_markdown"]
 "scripts" = ["*.sh", "models/*.sh"]
 
 [tool.bumpversion]
-current_version = "0.2.36"
+current_version = "0.2.38"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{vibego-0.2.36 → vibego-0.2.38}/tests/test_telegram_markdown_renderer.py

@@ -1,5 +1,6 @@
-from pathlib import Path
 import sys
+import os
+from pathlib import Path
 
 sys.path.append(str(Path(__file__).resolve().parents[1]))
 
@@ -7,6 +8,10 @@ import pytest
 
 from telegram_markdown import render_markdown_to_telegram
 
+os.environ.setdefault("BOT_TOKEN", "dummy")
+
+from bot import _prepare_model_payload, _prepare_model_payload_variants  # noqa: E402
+
 
 @pytest.mark.parametrize(
     "source, expected",
@@ -56,3 +61,36 @@ def test_render_blockquote() -> None:
 def test_render_link() -> None:
     markdown = "[link](https://example.com/path?a=1&b=2)"
     assert render_markdown_to_telegram(markdown) == "[link](https://example.com/path?a=1&b=2)"
+
+
+@pytest.mark.parametrize(
+    "text, expect_primary, expect_change",
+    [
+        ("A. 采用方案", "A\\. 采用方案", False),
+        ("示例.\n第二行", "示例\\.\n第二行", False),
+        ("- [ ] 待办事项", "- \\[ \\] 待办事项", False),
+        ("- [ ] 待办事项\n- [ ] 第二条", "- \\[ \\] 待办事项\n- \\[ \\] 第二条", False),
+        ("任务编码：/TASK_0023", None, False),
+        ("纯文本，无需转义", None, False),
+        ("带内联代码 `A.` 示例", None, False),
+        ("```\nA. print\n```", None, False),
+        ("段落结束. 继续下一句", "段落结束\\. 继续下一句", False),
+        ("- [ ] 包含句点. 并继续", "- \\[ \\] 包含句点\\. 并继续", False),
+    ],
+)
+def test_prepare_model_payload_variants(text: str, expect_primary: str | None, expect_change: bool) -> None:
+    primary, fallback = _prepare_model_payload_variants(text)
+    strict = _prepare_model_payload(text)
+    if expect_primary is not None:
+        assert primary == expect_primary
+    else:
+        assert primary == strict
+    if expect_change:
+        assert fallback is not None
+        assert fallback != primary
+        assert fallback == strict
+    else:
+        if fallback is None:
+            assert primary == strict
+        else:
+            assert fallback == primary == strict

{vibego-0.2.36 → vibego-0.2.38}/vibego.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vibego
-Version: 0.2.36
+Version: 0.2.38
 Summary: vibego CLI：用于初始化与管理 Telegram Master Bot 的工具
 Author: Hypha
 License-Expression: LicenseRef-Proprietary

{vibego-0.2.36 → vibego-0.2.38}/vibego_cli/__init__.py

@@ -7,6 +7,6 @@ from __future__ import annotations
 
 __all__ = ["main", "__version__"]
 
-__version__ = "0.2.36"
+__version__ = "0.2.38"
 
 from .main import main  # noqa: E402