vibego 0.2.35__py3-none-any.whl → 0.2.36__py3-none-any.whl

bot.py

@@ -534,68 +534,46 @@ def _unescape_markdown_v2(text: str) -> str:
     return re.sub(r"\\([_*\[\]()~`>#+=|{}.!:-])", r"\1", text)
 
 
-def _unescape_if_already_escaped(text: str) -> str:
-    """智能检测并清理预转义文本，特别保护代码块。
-
-    改进的分段处理策略：
-    1. 先识别已转义的代码块（\`\`\`...\`\`\` 和 \`...\`）
-    2. 对这些代码块先反转义边界反引号，变成正常代码块
-    3. 然后用正常的 CODE_SEGMENT_RE 识别代码块
-    4. 只对非代码块的普通文本进行反转义
-    5. 代码块内容保持转义状态（因为是代码本身）
-    6. 重新组合所有段落
-
-    Args:
-        text: 待处理的文本
-
-    Returns:
-        处理后的文本（如未检测到预转义，返回原文本）
-    """
+def _force_unescape_markdown(text: str) -> str:
+    """强制移除 MarkdownV2 转义，同时保护代码块语法不被破坏。"""
     if not text:
         return text
 
-    # 快速检测：如果没有任何转义字符，直接返回
-    if not _is_already_escaped(text):
-        return text
-
-    # 第一步：处理已转义的代码块，将边界反引号反转义
-    # 这样后续可以用正常的 CODE_SEGMENT_RE 识别它们
     processed = text
-
-    # 先标记所有已转义的代码块，用占位符替换
     code_blocks: list[str] = []
 
     def _preserve_code_block(match: re.Match[str]) -> str:
-        """保存代码块并返回占位符"""
+        """临时替换代码块，防止内部字符被错误反转义。"""
         block = match.group(0)
-        # 代码块边界的反引号需要反转义，但内容保持不变
-        # 例如：\`\`\`bash\npython -m vibego\_cli\`\`\`
-        #    -> ```bash\npython -m vibego\_cli```
         if block.startswith(r"\`\`\`"):
-            # 多行代码块
-            unescaped_block = block.replace(r"\`", "`", 6)  # 只替换前后各3个反引号
+            # 多行代码块保留内容，只修复边界反引号
+            unescaped_block = block.replace(r"\`", "`", 6)
         else:
-            # 单行代码块
-            unescaped_block = block.replace(r"\`", "`", 2)  # 只替换前后各1个反引号
+            # 单行代码块同理处理首尾反引号
+            unescaped_block = block.replace(r"\`", "`", 2)
 
         placeholder = f"__CODE_BLOCK_{len(code_blocks)}__"
         code_blocks.append(unescaped_block)
         return placeholder
 
     processed = _ESCAPED_CODE_BLOCK_PATTERN.sub(_preserve_code_block, processed)
+    processed = _unescape_markdown_v2(processed)
 
-    # 第二步：对非代码块部分进行反转义
-    if _is_already_escaped(processed):
-        processed = _unescape_markdown_v2(processed)
-
-    # 第三步：恢复代码块
-    for i, block in enumerate(code_blocks):
-        placeholder = f"__CODE_BLOCK_{i}__"
-        processed = processed.replace(placeholder, block)
+    for index, block in enumerate(code_blocks):
+        processed = processed.replace(f"__CODE_BLOCK_{index}__", block)
 
     return processed
 
 
+def _unescape_if_already_escaped(text: str) -> str:
+    """智能检测并清理预转义文本，必要时触发强制反转义。"""
+    if not text:
+        return text
+    if not _is_already_escaped(text):
+        return text
+    return _force_unescape_markdown(text)
+
+
 def _prepare_model_payload(text: str) -> str:
     if _IS_MARKDOWN_V2:
         cleaned = _unescape_if_already_escaped(text)
@@ -695,7 +673,7 @@ async def _send_with_markdown_guard(
             raise
 
         # Markdown 彻底失败时退回纯文本发送，需要先清理 MarkdownV2 转义符号
-        fallback_payload = _unescape_if_already_escaped(text)
+        fallback_payload = _force_unescape_markdown(text)
         if fallback_payload != text:
             worker_log.debug(
                 "Markdown 降级为纯文本发送，已移除转义符号",

{vibego-0.2.35.dist-info → vibego-0.2.36.dist-info}/METADATA

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

{vibego-0.2.35.dist-info → vibego-0.2.36.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bot.py,sha256=bp1j-Dyp6FLsRkwbnxnFixFyJefFM4noJcpH_WIjzHQ,271364
+bot.py,sha256=jVPxYu3rUCFmypgJzgc8iy97zOXidhvCnlZNwFtkxv4,270454
 logging_setup.py,sha256=gvxHi8mUwK3IhXJrsGNTDo-DR6ngkyav1X-tvlBF_IE,4613
 master.py,sha256=ZW4A3Gh0MUKFnfZX-VJ7OCNnBzlEcOWkPKYH92OfyKA,112967
 project_repository.py,sha256=UcthtSGOJK0cTE5bQCneo3xkomRG-kyc1N1QVqxeHIs,17577
@@ -427,14 +427,14 @@ tasks/fsm.py,sha256=rKXXLEieQQU4r2z_CZUvn1_70FXiZXBBugF40gpe_tQ,1476
 tasks/models.py,sha256=N_qqRBo9xMSV0vbn4k6bLBXT8C_dp_oTFUxvdx16ZQM,2459
 tasks/service.py,sha256=w_S_aWiVqRXzXEpimLDsuCCCX2lB5uDkff9aKThBw9c,41916
 telegram_markdown/__init__.py,sha256=bG3H9fWn5GfTqC6xvd49xbVdYWfSFeaX2nefweOYcWY,9757
-vibego_cli/__init__.py,sha256=_5XgkMeh6CuhPHHa6ulRX3B_Ja_dtOgJp9oowplquDg,311
+vibego_cli/__init__.py,sha256=p-CPmV5XSaL8LOoFcrAi-ds8pvLeygAon4JKakgK7MY,311
 vibego_cli/__main__.py,sha256=qqTrYmRRLe4361fMzbI3-CqpZ7AhTofIHmfp4ykrrBY,158
 vibego_cli/config.py,sha256=VxkPJMq01tA3h3cOkH-z_tiP7pMgfSGGicRvUnCWkhI,3054
 vibego_cli/deps.py,sha256=1nRXI7Dd-S1hYE8DligzK5fIluQWETRUj4_OKL0DikQ,1419
 vibego_cli/main.py,sha256=X__NXwZnIDIFbdKSTbNyZgZHKcPlN0DQz9sqTI1aQ9E,12158
 vibego_cli/data/worker_requirements.txt,sha256=QSt30DSSSHtfucTFPpc7twk9kLS5rVLNTcvDiagxrZg,62
-vibego-0.2.35.dist-info/METADATA,sha256=EuDdzAX4rdAXErzufZdXP8aW326sLBDDj4oAPj7NvjM,10519
-vibego-0.2.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vibego-0.2.35.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
-vibego-0.2.35.dist-info/top_level.txt,sha256=rWDj9KERtbJL6Lar9Xa0O6dthaFSY_jc1WNpQgUrXCM,87
-vibego-0.2.35.dist-info/RECORD,,
+vibego-0.2.36.dist-info/METADATA,sha256=MP9mOr2c7s7mckhdVFBeVeHx0MQH0VKuZqRPSFUoshE,10519
+vibego-0.2.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vibego-0.2.36.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
+vibego-0.2.36.dist-info/top_level.txt,sha256=rWDj9KERtbJL6Lar9Xa0O6dthaFSY_jc1WNpQgUrXCM,87
+vibego-0.2.36.dist-info/RECORD,,

vibego_cli/__init__.py

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