vibego 0.2.54__py3-none-any.whl → 0.2.55__py3-none-any.whl

bot.py

@@ -7,7 +7,7 @@
 
 from __future__ import annotations
 
-import asyncio, os, sys, time, uuid, shlex, subprocess, socket, re, json, shutil, hashlib, html
+import asyncio, os, sys, time, uuid, shlex, subprocess, socket, re, json, shutil, hashlib, html, mimetypes
 from datetime import datetime, UTC
 from pathlib import Path
 from typing import Any, Dict, Optional, Sequence, Tuple, List, Callable, Awaitable, Literal
@@ -108,6 +108,19 @@ def _env_int(name: str, default: int) -> int:
         worker_log.warning("环境变量 %s=%r 解析为整数失败，已使用默认值 %s", name, raw, default)
         return default
 
+
+def _env_float(name: str, default: float) -> float:
+    """读取浮点型环境变量，解析失败时回退默认值。"""
+
+    raw = os.environ.get(name)
+    if raw is None or not raw.strip():
+        return default
+    try:
+        return float(raw.strip())
+    except ValueError:
+        worker_log.warning("环境变量 %s=%r 解析为浮点数失败，已使用默认值 %s", name, raw, default)
+        return default
+
 _PARSE_MODE_CANDIDATES: Dict[str, Optional[ParseMode]] = {
     "": None,
     "none": None,
@@ -1290,6 +1303,439 @@ PROJECT_SLUG = (PROJECT_NAME or "default").replace("/", "-") or "default"
 TASK_DB_PATH = DATA_ROOT / f"{PROJECT_SLUG}.db"
 TASK_SERVICE = TaskService(TASK_DB_PATH, PROJECT_SLUG)
 
+ATTACHMENT_STORAGE_ROOT = (DATA_ROOT / "telegram").expanduser()
+ATTACHMENT_STORAGE_ROOT.mkdir(parents=True, exist_ok=True)
+_ATTACHMENT_TOTAL_MB = max(_env_int("TELEGRAM_ATTACHMENT_MAX_TOTAL_MB", 512), 16)
+ATTACHMENT_TOTAL_LIMIT_BYTES = _ATTACHMENT_TOTAL_MB * 1024 * 1024
+MEDIA_GROUP_AGGREGATION_DELAY = max(_env_float("TELEGRAM_MEDIA_GROUP_DELAY", 0.8), 0.1)
+
+
+@dataclass
+class TelegramSavedAttachment:
+    """记录单个附件的落地信息，便于提示模型读取。"""
+
+    kind: str
+    display_name: str
+    mime_type: str
+    absolute_path: Path
+    relative_path: str
+
+
+@dataclass
+class PendingMediaGroupState:
+    """聚合 Telegram 媒体组的临时缓存。"""
+
+    chat_id: int
+    origin_message: Message
+    attachment_dir: Path
+    attachments: list[TelegramSavedAttachment]
+    captions: list[str]
+    finalize_task: Optional[asyncio.Task] = None
+
+
+MEDIA_GROUP_STATE: dict[str, PendingMediaGroupState] = {}
+MEDIA_GROUP_LOCK = asyncio.Lock()
+
+ATTACHMENT_USAGE_HINT = (
+    "请按需读取附件：图片可使用 Codex 的 view_image 功能或 Claude Code 的文件引用能力；"
+    "文本/日志可直接通过 @<路径> 打开；若需其他处理请说明。"
+)
+
+_FS_SAFE_PATTERN = re.compile(r"[^A-Za-z0-9._-]")
+
+
+def _sanitize_fs_component(value: str, fallback: str) -> str:
+    """清理路径片段中的特殊字符，避免越权访问。"""
+
+    stripped = (value or "").strip()
+    cleaned = _FS_SAFE_PATTERN.sub("_", stripped)
+    cleaned = cleaned.strip("._")
+    return cleaned or fallback
+
+
+def _format_relative_path(path: Path) -> str:
+    """将绝对路径转换为模型更易识别的相对路径。"""
+
+    try:
+        rel = path.relative_to(ROOT_DIR_PATH)
+        rel_str = rel.as_posix()
+        if not rel_str.startswith("."):
+            return f"./{rel_str}"
+        return rel_str
+    except ValueError:
+        return path.resolve().as_posix()
+
+
+def _directory_size(path: Path) -> int:
+    """计算目录占用的总字节数。"""
+
+    total = 0
+    if not path.exists():
+        return 0
+    for entry in path.rglob("*"):
+        try:
+            if entry.is_file():
+                total += entry.stat().st_size
+        except FileNotFoundError:
+            continue
+    return total
+
+
+def _cleanup_attachment_storage() -> None:
+    """控制附件目录容量，避免磁盘被占满。"""
+
+    if ATTACHMENT_TOTAL_LIMIT_BYTES <= 0:
+        return
+    total = _directory_size(ATTACHMENT_STORAGE_ROOT)
+    if total <= ATTACHMENT_TOTAL_LIMIT_BYTES:
+        return
+    candidates = sorted(
+        (p for p in ATTACHMENT_STORAGE_ROOT.iterdir() if p.is_dir()),
+        key=lambda item: item.stat().st_mtime,
+    )
+    for folder in candidates:
+        try:
+            shutil.rmtree(folder, ignore_errors=True)
+        except Exception as exc:  # noqa: BLE001
+            worker_log.warning(
+                "清理旧附件目录失败：%s",
+                exc,
+                extra=_session_extra(path=folder),
+            )
+        if _directory_size(ATTACHMENT_STORAGE_ROOT) <= ATTACHMENT_TOTAL_LIMIT_BYTES:
+            break
+
+
+def _guess_extension(mime_type: Optional[str], fallback: str = ".bin") -> str:
+    """根据 MIME 类型推断扩展名。"""
+
+    if mime_type:
+        guessed = mimetypes.guess_extension(mime_type, strict=False)
+        if guessed:
+            return guessed
+    return fallback
+
+
+def _attachment_dir_for_message(message: Message, media_group_id: Optional[str] = None) -> Path:
+    """为当前消息（或媒体组）生成稳定的附件目录。"""
+
+    chat_part = _sanitize_fs_component(str(message.chat.id), "chat")
+    base = ATTACHMENT_STORAGE_ROOT / chat_part
+    if media_group_id:
+        group_part = _sanitize_fs_component(media_group_id, str(message.message_id))
+        target = base / f"group_{group_part}"
+    else:
+        timestamp = int((message.date or datetime.now(UTC)).timestamp())
+        target = base / f"msg_{timestamp}_{message.message_id}"
+    target.mkdir(parents=True, exist_ok=True)
+    return target
+
+
+async def _download_telegram_file(
+    message: Message,
+    *,
+    file_id: str,
+    file_name_hint: str,
+    mime_type: Optional[str],
+    target_dir: Path,
+) -> Path:
+    """从 Telegram 下载文件并返回本地路径。"""
+
+    bot = message.bot or current_bot()
+    telegram_file = await bot.get_file(file_id)
+    stem = _sanitize_fs_component(Path(file_name_hint).stem, "file")
+    extension = Path(file_name_hint).suffix or _guess_extension(mime_type, ".bin")
+    if not extension.startswith("."):
+        extension = f".{extension}"
+    filename = f"{stem}{extension}"
+    destination = target_dir / filename
+    counter = 1
+    while destination.exists():
+        destination = target_dir / f"{stem}_{counter}{extension}"
+        counter += 1
+    await bot.download_file(telegram_file.file_path, destination=destination)
+    return destination
+
+
+async def _collect_saved_attachments(message: Message, target_dir: Path) -> list[TelegramSavedAttachment]:
+    """下载消息中的所有附件，并返回保存记录。"""
+
+    saved: list[TelegramSavedAttachment] = []
+
+    if message.photo:
+        photo = message.photo[-1]
+        path = await _download_telegram_file(
+            message,
+            file_id=photo.file_id,
+            file_name_hint=f"photo_{photo.file_unique_id}.jpg",
+            mime_type="image/jpeg",
+            target_dir=target_dir,
+        )
+        saved.append(
+            TelegramSavedAttachment(
+                kind="photo",
+                display_name=path.name,
+                mime_type="image/jpeg",
+                absolute_path=path,
+                relative_path=_format_relative_path(path),
+            )
+        )
+
+    document = message.document
+    if document:
+        file_name = document.file_name or f"document_{document.file_unique_id}"
+        path = await _download_telegram_file(
+            message,
+            file_id=document.file_id,
+            file_name_hint=file_name,
+            mime_type=document.mime_type or "application/octet-stream",
+            target_dir=target_dir,
+        )
+        saved.append(
+            TelegramSavedAttachment(
+                kind="document",
+                display_name=file_name,
+                mime_type=document.mime_type or "application/octet-stream",
+                absolute_path=path,
+                relative_path=_format_relative_path(path),
+            )
+        )
+
+    video = message.video
+    if video:
+        file_name = video.file_name or f"video_{video.file_unique_id}"
+        path = await _download_telegram_file(
+            message,
+            file_id=video.file_id,
+            file_name_hint=file_name,
+            mime_type=video.mime_type or "video/mp4",
+            target_dir=target_dir,
+        )
+        saved.append(
+            TelegramSavedAttachment(
+                kind="video",
+                display_name=file_name,
+                mime_type=video.mime_type or "video/mp4",
+                absolute_path=path,
+                relative_path=_format_relative_path(path),
+            )
+        )
+
+    audio = message.audio
+    if audio:
+        file_name = audio.file_name or f"audio_{audio.file_unique_id}"
+        path = await _download_telegram_file(
+            message,
+            file_id=audio.file_id,
+            file_name_hint=file_name,
+            mime_type=audio.mime_type or "audio/mpeg",
+            target_dir=target_dir,
+        )
+        saved.append(
+            TelegramSavedAttachment(
+                kind="audio",
+                display_name=file_name,
+                mime_type=audio.mime_type or "audio/mpeg",
+                absolute_path=path,
+                relative_path=_format_relative_path(path),
+            )
+        )
+
+    voice = message.voice
+    if voice:
+        file_name = f"voice_{voice.file_unique_id}.ogg"
+        path = await _download_telegram_file(
+            message,
+            file_id=voice.file_id,
+            file_name_hint=file_name,
+            mime_type=voice.mime_type or "audio/ogg",
+            target_dir=target_dir,
+        )
+        saved.append(
+            TelegramSavedAttachment(
+                kind="voice",
+                display_name=file_name,
+                mime_type=voice.mime_type or "audio/ogg",
+                absolute_path=path,
+                relative_path=_format_relative_path(path),
+            )
+        )
+
+    animation = message.animation
+    if animation:
+        file_name = animation.file_name or f"animation_{animation.file_unique_id}"
+        path = await _download_telegram_file(
+            message,
+            file_id=animation.file_id,
+            file_name_hint=file_name,
+            mime_type=animation.mime_type or "video/mp4",
+            target_dir=target_dir,
+        )
+        saved.append(
+            TelegramSavedAttachment(
+                kind="animation",
+                display_name=file_name,
+                mime_type=animation.mime_type or "video/mp4",
+                absolute_path=path,
+                relative_path=_format_relative_path(path),
+            )
+        )
+
+    video_note = message.video_note
+    if video_note:
+        file_name = f"video_note_{video_note.file_unique_id}.mp4"
+        path = await _download_telegram_file(
+            message,
+            file_id=video_note.file_id,
+            file_name_hint=file_name,
+            mime_type=video_note.mime_type or "video/mp4",
+            target_dir=target_dir,
+        )
+        saved.append(
+            TelegramSavedAttachment(
+                kind="video_note",
+                display_name=file_name,
+                mime_type=video_note.mime_type or "video/mp4",
+                absolute_path=path,
+                relative_path=_format_relative_path(path),
+            )
+        )
+
+    if saved:
+        _cleanup_attachment_storage()
+    return saved
+
+
+def _build_prompt_with_attachments(
+    text_part: Optional[str],
+    attachments: Sequence[TelegramSavedAttachment],
+) -> str:
+    """将文字与附件描述拼接成模型可读的提示。"""
+
+    sections: list[str] = []
+    base_text = (text_part or "").strip()
+    if base_text:
+        sections.append(base_text)
+    if attachments:
+        lines = ["附件列表（文件位于项目工作目录，可直接读取）："]
+        for idx, item in enumerate(attachments, 1):
+            lines.append(
+                f"{idx}. {item.display_name}（{item.mime_type}）→ {item.relative_path}"
+            )
+        lines.append("")
+        lines.append(ATTACHMENT_USAGE_HINT)
+        sections.append("\n".join(lines))
+    if not sections:
+        fallback = [
+            "收到一条仅包含附件的消息，没有额外文字说明。",
+            "请直接阅读列出的附件并给出观察结果或结论。",
+        ]
+        sections.append("\n".join(fallback))
+    return "\n\n".join(sections).strip()
+
+
+async def _finalize_media_group_after_delay(media_group_id: str) -> None:
+    """在短暂延迟后合并媒体组消息，确保 Telegram 全部照片到齐。"""
+
+    try:
+        await asyncio.sleep(MEDIA_GROUP_AGGREGATION_DELAY)
+    except asyncio.CancelledError:
+        return
+
+    async with MEDIA_GROUP_LOCK:
+        state = MEDIA_GROUP_STATE.pop(media_group_id, None)
+
+    if state is None:
+        return
+
+    text_block = "\n".join(state.captions).strip()
+    prompt = _build_prompt_with_attachments(text_block, state.attachments)
+    try:
+        await _handle_prompt_dispatch(state.origin_message, prompt)
+    except Exception as exc:  # noqa: BLE001
+        worker_log.exception(
+            "媒体组消息推送模型失败：%s",
+            exc,
+            extra=_session_extra(media_group=media_group_id),
+        )
+
+
+async def _enqueue_media_group_message(message: Message, text_part: Optional[str]) -> None:
+    """收集媒体组中的每一条消息，统一延迟推送。"""
+
+    media_group_id = message.media_group_id
+    if not media_group_id:
+        return
+
+    async with MEDIA_GROUP_LOCK:
+        state = MEDIA_GROUP_STATE.get(media_group_id)
+        if state is None:
+            attachment_dir = _attachment_dir_for_message(message, media_group_id=media_group_id)
+            state = PendingMediaGroupState(
+                chat_id=message.chat.id,
+                origin_message=message,
+                attachment_dir=attachment_dir,
+                attachments=[],
+                captions=[],
+            )
+            MEDIA_GROUP_STATE[media_group_id] = state
+        else:
+            attachment_dir = state.attachment_dir
+
+    attachments = await _collect_saved_attachments(message, attachment_dir)
+    caption = (text_part or "").strip()
+
+    async with MEDIA_GROUP_LOCK:
+        state = MEDIA_GROUP_STATE.get(media_group_id)
+        if state is None:
+            # 若期间被清理，重新创建并继续积累，避免丢失后续内容。
+            state = PendingMediaGroupState(
+                chat_id=message.chat.id,
+                origin_message=message,
+                attachment_dir=attachment_dir,
+                attachments=[],
+                captions=[],
+            )
+            MEDIA_GROUP_STATE[media_group_id] = state
+        state.attachments.extend(attachments)
+        if caption:
+            state.captions.append(caption)
+        # 使用首条消息作为引用对象，便于 Telegram 回复。
+        if state.origin_message.message_id > message.message_id:
+            state.origin_message = message
+        if state.finalize_task and not state.finalize_task.done():
+            state.finalize_task.cancel()
+        state.finalize_task = asyncio.create_task(_finalize_media_group_after_delay(media_group_id))
+
+
+async def _handle_prompt_dispatch(message: Message, prompt: str) -> None:
+    """统一封装向模型推送提示词的流程。"""
+
+    if ENV_ISSUES:
+        message_text = _format_env_issue_message()
+        worker_log.warning(
+            "拒绝处理消息，环境异常: %s",
+            message_text,
+            extra={**_session_extra(), "chat": message.chat.id},
+        )
+        await message.answer(message_text)
+        return
+
+    bot = current_bot()
+    await bot.send_chat_action(message.chat.id, "typing")
+
+    if MODE == "A":
+        if not AGENT_CMD:
+            await message.answer("AGENT_CMD 未配置（.env）")
+            return
+        rc, out = run_subprocess_capture(AGENT_CMD, input_text=prompt)
+        out = out or ""
+        out = out + ("" if rc == 0 else f"\n(exit={rc})")
+        await reply_large_text(message.chat.id, out)
+        return
+
+    await _dispatch_prompt_to_model(message.chat.id, prompt, reply_to=message)
+
 BOT_COMMANDS: list[tuple[str, str]] = [
     ("help", "查看全部命令"),
     ("tasks", "任务命令清单"),
@@ -7390,6 +7836,28 @@ async def on_edit_new_value(message: Message, state: FSMContext) -> None:
     await _answer_with_markdown(message, f"任务已更新：\n{detail_text}", reply_markup=markup)
 
 
+@router.message(
+    F.photo | F.document | F.video | F.audio | F.voice | F.animation | F.video_note
+)
+async def on_media_message(message: Message) -> None:
+    """处理带附件的普通消息，将附件下载并拼接提示词。"""
+
+    _auto_record_chat_id(message.chat.id)
+    text_part = (message.caption or message.text or "").strip()
+
+    if message.media_group_id:
+        await _enqueue_media_group_message(message, text_part)
+        return
+
+    attachment_dir = _attachment_dir_for_message(message)
+    attachments = await _collect_saved_attachments(message, attachment_dir)
+    if not attachments and not text_part:
+        await message.answer("未检测到可处理的附件或文字内容。")
+        return
+    prompt = _build_prompt_with_attachments(text_part, attachments)
+    await _handle_prompt_dispatch(message, prompt)
+
+
 @router.message(CommandStart())
 async def on_start(m: Message):
     # 首次收到消息时自动记录 chat_id 到 state 文件
@@ -7422,30 +7890,7 @@ async def on_text(m: Message):
         return
     if prompt.startswith("/"):
         return
-
-    if ENV_ISSUES:
-        message = _format_env_issue_message()
-        worker_log.warning(
-            "拒绝处理消息，环境异常: %s",
-            message,
-            extra={**_session_extra(), "chat": m.chat.id},
-        )
-        await m.answer(message)
-        return
-
-    bot = current_bot()
-    await bot.send_chat_action(m.chat.id, "typing")  # “正在输入”提示
-
-    if MODE == "A":
-        if not AGENT_CMD:
-            return await m.answer("AGENT_CMD 未配置（.env）")
-        rc, out = run_subprocess_capture(AGENT_CMD, input_text=prompt)
-        out = out or ""
-        out = out + ("" if rc == 0 else f"\n(exit={rc})")
-        await reply_large_text(m.chat.id, out)
-
-    else:
-        await _dispatch_prompt_to_model(m.chat.id, prompt, reply_to=m)
+    await _handle_prompt_dispatch(m, prompt)
 
 
 async def ensure_telegram_connectivity(bot: Bot, timeout: float = 30.0):

{vibego-0.2.54.dist-info → vibego-0.2.55.dist-info}/METADATA

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

{vibego-0.2.54.dist-info → vibego-0.2.55.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bot.py,sha256=EEU9Z-X1QcsIN70nKNDA19zYGoJLt7BKWyQpDNTPtEU,274675
+bot.py,sha256=hjebHpgW7tR9fNxkdbgNLFNYaz4MNgtsq_Sci2VljPM,289835
 logging_setup.py,sha256=gvxHi8mUwK3IhXJrsGNTDo-DR6ngkyav1X-tvlBF_IE,4613
 master.py,sha256=Jwxf6I94jOADzb9Xio1wb-tWy5wgQ9PlmdpKW4mhQMg,117114
 project_repository.py,sha256=UcthtSGOJK0cTE5bQCneo3xkomRG-kyc1N1QVqxeHIs,17577
@@ -426,14 +426,14 @@ tasks/constants.py,sha256=tS1kZxBIUm3JJUMHm25XI-KHNUZl5NhbbuzjzL_rF-c,299
 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
-vibego_cli/__init__.py,sha256=X2jkHBM3C13k76pNE_JPkacyuxp6z5r0XZwb58Ik-YY,311
+vibego_cli/__init__.py,sha256=asbT5tFazlPcS692PW0b6GBg_fWkYpf-mZn02hiG-p4,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.54.dist-info/METADATA,sha256=9wx4NUWLXvv6D4nSbVqwvmzyY0oKyILEknrZ8aY8egI,10519
-vibego-0.2.54.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vibego-0.2.54.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
-vibego-0.2.54.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
-vibego-0.2.54.dist-info/RECORD,,
+vibego-0.2.55.dist-info/METADATA,sha256=McMxELuZfQ_ByCmOD3gRCEIqec4IHYK1pPNjMpn8xxM,10519
+vibego-0.2.55.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vibego-0.2.55.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
+vibego-0.2.55.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
+vibego-0.2.55.dist-info/RECORD,,

vibego_cli/__init__.py

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