vibego 0.2.50__tar.gz → 0.2.52__tar.gz

{vibego-0.2.50 → vibego-0.2.52}/PKG-INFO

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

{vibego-0.2.50 → vibego-0.2.52}/bot.py

@@ -37,6 +37,8 @@ from aiogram.types import (
     ReplyKeyboardRemove,
     Update,
     User,
+    PhotoSize,
+    Document,
 )
 from aiogram.client.session.aiohttp import AiohttpSession
 from aiogram.enums import ParseMode
@@ -85,6 +87,15 @@ def load_env(p: str = ".env"):
 
 load_env()
 
+# 导入媒体处理器
+try:
+    from media_handler import MediaHandler, MediaConfig
+    HAS_MEDIA_HANDLER = True
+except ImportError:
+    HAS_MEDIA_HANDLER = False
+    MediaHandler = None
+    MediaConfig = None
+
 # --- 日志 & 上下文 ---
 PROJECT_NAME = os.environ.get("PROJECT_NAME", "").strip()
 ACTIVE_MODEL = (os.environ.get("ACTIVE_MODEL") or os.environ.get("MODEL_NAME") or "").strip()
@@ -1160,6 +1171,7 @@ async def _push_task_to_model(
     supplement: Optional[str],
     actor: Optional[str],
     is_bug_report: bool = False,
+    media_files: Optional[List[Dict[str, Any]]] = None,
 ) -> tuple[bool, str, Optional[Path]]:
     """推送任务信息到模型，并附带补充描述。
 
@@ -1170,17 +1182,30 @@ async def _push_task_to_model(
         supplement: 补充描述
         actor: 操作者
         is_bug_report: 是否为缺陷报告推送
+        media_files: 媒体文件列表
     """
 
     history_text, history_count = await _build_history_context_for_model(task.id)
     notes = await TASK_SERVICE.list_notes(task.id)
-    prompt = _build_model_push_payload(
-        task,
-        supplement=supplement,
-        history=history_text,
-        notes=notes,
-        is_bug_report=is_bug_report,
-    )
+
+    # 使用增强版函数（如果有媒体文件）
+    if media_files:
+        prompt = _build_model_push_payload_with_media(
+            task,
+            supplement=supplement,
+            history=history_text,
+            notes=notes,
+            media_files=media_files,
+            is_bug_report=is_bug_report,
+        )
+    else:
+        prompt = _build_model_push_payload(
+            task,
+            supplement=supplement,
+            history=history_text,
+            notes=notes,
+            is_bug_report=is_bug_report,
+        )
     success, session_path = await _dispatch_prompt_to_model(
         chat_id,
         prompt,
@@ -1998,6 +2023,57 @@ def _build_model_push_payload(
     return _strip_legacy_bug_header(result or body)
 
 
+def _build_model_push_payload_with_media(
+    task: TaskRecord,
+    supplement: Optional[str] = None,
+    history: Optional[str] = None,
+    notes: Optional[Sequence[TaskNoteRecord]] = None,
+    media_files: Optional[List[Dict[str, Any]]] = None,
+    is_bug_report: bool = False,
+) -> str:
+    """构造包含媒体文件引用的模型推送 payload"""
+
+    # 先构造基础 payload
+    base_payload = _build_model_push_payload(
+        task=task,
+        supplement=supplement,
+        history=history,
+        notes=notes,
+        is_bug_report=is_bug_report
+    )
+
+    # 如果没有媒体文件，直接返回
+    if not media_files:
+        return base_payload
+
+    # 添加媒体文件信息
+    lines = [base_payload]
+    lines.append("\n相关文件：")
+
+    for idx, media in enumerate(media_files, 1):
+        file_type = media["type"]
+        file_path = media["file_path"]
+
+        if file_type == "image":
+            width = media.get("width", "?")
+            height = media.get("height", "?")
+            lines.append(f"{idx}. 图片 ({width}×{height}): {file_path}")
+        elif file_type == "document":
+            original_name = media.get("original_name", "未命名文档")
+            size_mb = media.get("size", 0) / 1024 / 1024
+            lines.append(f"{idx}. 文档 [{original_name}] ({size_mb:.1f}MB): {file_path}")
+
+    # 为不同模型添加特定指令
+    if _is_claudecode_model():
+        lines.append("\n请使用 Read 工具查看上述文件以理解其内容。")
+    elif MODEL_CANONICAL_NAME == "codex":
+        lines.append("\n请分析上述文件并结合任务要求进行处理。")
+    elif "gemini" in MODEL_CANONICAL_NAME:
+        lines.append("\n请查看并分析上述文件。")
+
+    return "\n".join(lines)
+
+
 try:
     SHANGHAI_TZ = ZoneInfo("Asia/Shanghai")
 except ZoneInfoNotFoundError:
@@ -2975,6 +3051,61 @@ def _collect_message_payload(message: Message) -> str:
     return "\n".join(parts).strip()
 
 
+async def _collect_message_payload_with_media(
+    message: Message,
+    task_id: Optional[str] = None
+) -> Tuple[str, List[Dict[str, Any]], Optional[str]]:
+    """
+    收集消息内容和媒体文件（增强版）
+    返回: (文本内容, 媒体文件列表, 用户提示消息)
+    """
+    parts = []
+    media_files = []
+    user_feedback = None
+
+    # 处理文本
+    text = _normalize_choice_token(message.text or message.caption)
+    if text:
+        parts.append(text)
+
+    # 处理媒体文件
+    if media_handler and (message.photo or message.document):
+        media_info, feedback_msg = await media_handler.process_message_media(
+            message, task_id
+        )
+
+        if media_info["type"] not in ["none", "error"]:
+            media_files.append(media_info)
+            # 添加文件引用到文本
+            if media_info["type"] == "image":
+                parts.append(f"[图片: {media_info['file_path']}]")
+            elif media_info["type"] == "document":
+                parts.append(f"[文档: {media_info['file_path']}]")
+        elif media_info["type"] == "error":
+            # 添加错误信息到文本
+            parts.append(f"[媒体处理失败: {media_info.get('error', '未知错误')}]")
+
+        # 设置用户反馈
+        user_feedback = feedback_msg
+    else:
+        # 没有媒体处理器时，使用原有逻辑
+        if message.photo:
+            file_id = message.photo[-1].file_id
+            parts.append(f"[图片:{file_id}]")
+        if message.document:
+            doc = message.document
+            name = doc.file_name or doc.file_id
+            parts.append(f"[文件:{name}]")
+
+    # 处理其他媒体类型（保持原有逻辑）
+    if message.voice:
+        parts.append(f"[语音: {message.voice.file_id}]")
+    if message.video:
+        parts.append(f"[视频: {message.video.file_id}]")
+
+    return "\n".join(parts).strip(), media_files, user_feedback
+
+
 def _summarize_note_text(value: str) -> str:
     """压缩备注内容，维持主要信息并控制长度。"""
 
@@ -3431,6 +3562,9 @@ def tmux_capture_since(log_path: Path | str, start_pos: int, idle: float = 2.0,
     return "".join(buf)
 
 
+# 全局媒体处理器
+media_handler: Optional[MediaHandler] = None
+
 SESSION_OFFSETS: Dict[str, int] = {}
 CHAT_SESSION_MAP: Dict[int, str] = {}
 CHAT_WATCHERS: Dict[int, asyncio.Task] = {}
@@ -5177,6 +5311,7 @@ async def on_help_command(message: Message) -> None:
         "*指令总览*\n"
         "- /help — 查看全部命令\n"
         "- /tasks — 任务管理命令清单\n"
+        "- /media — 查看媒体文件统计和管理\n"
         "- /task_new — 创建任务（交互式或附带参数）\n"
         "- /task_list — 查看任务列表，支持 status/limit/offset\n"
         "- /task_show — 查看某个任务详情\n"
@@ -5205,6 +5340,158 @@ async def on_tasks_help(message: Message) -> None:
     await _answer_with_markdown(message, text)
 
 
+@router.message(Command("media"))
+async def on_media_command(message: Message) -> None:
+    """处理 /media 命令，显示媒体文件统计和管理选项"""
+    global media_handler
+
+    if not media_handler:
+        await message.reply("❌ 媒体处理功能未初始化")
+        return
+
+    try:
+        # 获取媒体文件统计
+        stats = await media_handler.get_stats()
+
+        # 构建统计信息文本
+        lines = [
+            "*📊 媒体文件统计*",
+            "",
+            f"📁 存储位置: `{stats['storage_path']}`",
+            f"📷 图片文件: {stats['image_count']} 个",
+            f"📄 文档文件: {stats['document_count']} 个",
+            f"💾 总占用空间: {stats['total_size_mb']:.2f} MB",
+            "",
+            f"⏰ 普通文件保留: {stats['normal_retention_days']} 天",
+            f"🎯 任务文件保留: {stats['task_retention_days']} 天",
+            "",
+            f"🗑️ 待清理文件: {stats['expired_count']} 个",
+        ]
+
+        if stats['expired_count'] > 0:
+            lines.append(f"   ({stats['expired_size_mb']:.2f} MB 可释放)")
+
+        # 最近的文件
+        if stats['recent_files']:
+            lines.extend([
+                "",
+                "*📝 最近下载的文件:*"
+            ])
+            for file_info in stats['recent_files'][:5]:
+                file_type = "📷" if file_info['type'] == 'image' else "📄"
+                lines.append(f"{file_type} {file_info['name']} ({file_info['size_mb']:.2f} MB)")
+
+        text = "\n".join(lines)
+
+        # 创建管理按钮
+        keyboard = InlineKeyboardMarkup(
+            inline_keyboard=[
+                [
+                    InlineKeyboardButton(text="🗑️ 立即清理过期文件", callback_data="media_cleanup"),
+                    InlineKeyboardButton(text="🔄 刷新统计", callback_data="media_refresh")
+                ]
+            ]
+        )
+
+        await _answer_with_markdown(message, text, reply_markup=keyboard)
+
+    except Exception as e:
+        worker_log.error(f"获取媒体统计失败: {e}", exc_info=True)
+        await message.reply(f"❌ 获取媒体统计失败: {e}")
+
+
+@router.callback_query(F.data == "media_cleanup")
+async def on_media_cleanup_callback(callback: CallbackQuery) -> None:
+    """处理清理过期文件的回调"""
+    global media_handler
+
+    if not media_handler:
+        await callback.answer("❌ 媒体处理功能未初始化", show_alert=True)
+        return
+
+    try:
+        # 执行清理
+        cleaned_count = await media_handler.cleanup_old_files()
+
+        if cleaned_count > 0:
+            await callback.answer(f"✅ 已清理 {cleaned_count} 个过期文件", show_alert=True)
+        else:
+            await callback.answer("📭 没有需要清理的文件", show_alert=True)
+
+        # 更新统计信息
+        await on_media_refresh_callback(callback)
+
+    except Exception as e:
+        worker_log.error(f"清理媒体文件失败: {e}", exc_info=True)
+        await callback.answer(f"❌ 清理失败: {e}", show_alert=True)
+
+
+@router.callback_query(F.data == "media_refresh")
+async def on_media_refresh_callback(callback: CallbackQuery) -> None:
+    """处理刷新统计的回调"""
+    global media_handler
+
+    if not media_handler:
+        await callback.answer("❌ 媒体处理功能未初始化", show_alert=True)
+        return
+
+    try:
+        # 获取最新统计
+        stats = await media_handler.get_stats()
+
+        # 构建更新的文本
+        lines = [
+            "*📊 媒体文件统计*",
+            "",
+            f"📁 存储位置: `{stats['storage_path']}`",
+            f"📷 图片文件: {stats['image_count']} 个",
+            f"📄 文档文件: {stats['document_count']} 个",
+            f"💾 总占用空间: {stats['total_size_mb']:.2f} MB",
+            "",
+            f"⏰ 普通文件保留: {stats['normal_retention_days']} 天",
+            f"🎯 任务文件保留: {stats['task_retention_days']} 天",
+            "",
+            f"🗑️ 待清理文件: {stats['expired_count']} 个",
+        ]
+
+        if stats['expired_count'] > 0:
+            lines.append(f"   ({stats['expired_size_mb']:.2f} MB 可释放)")
+
+        # 最近的文件
+        if stats['recent_files']:
+            lines.extend([
+                "",
+                "*📝 最近下载的文件:*"
+            ])
+            for file_info in stats['recent_files'][:5]:
+                file_type = "📷" if file_info['type'] == 'image' else "📄"
+                lines.append(f"{file_type} {file_info['name']} ({file_info['size_mb']:.2f} MB)")
+
+        text = "\n".join(lines)
+
+        # 保持按钮
+        keyboard = InlineKeyboardMarkup(
+            inline_keyboard=[
+                [
+                    InlineKeyboardButton(text="🗑️ 立即清理过期文件", callback_data="media_cleanup"),
+                    InlineKeyboardButton(text="🔄 刷新统计", callback_data="media_refresh")
+                ]
+            ]
+        )
+
+        await callback.message.edit_text(
+            text,
+            parse_mode="MarkdownV2" if _IS_MARKDOWN_V2 else "Markdown",
+            reply_markup=keyboard
+        )
+
+        await callback.answer("✅ 统计已更新")
+
+    except Exception as e:
+        worker_log.error(f"刷新媒体统计失败: {e}", exc_info=True)
+        await callback.answer(f"❌ 刷新失败: {e}", show_alert=True)
+
+
 def _normalize_status(value: Optional[str]) -> Optional[str]:
     if not value:
         return None
@@ -6885,21 +7172,40 @@ async def on_task_bug_report(callback: CallbackQuery, state: FSMContext) -> None
 
 @router.message(TaskBugReportStates.waiting_description)
 async def on_task_bug_description(message: Message, state: FSMContext) -> None:
-    """处理缺陷描述输入。"""
+    """处理缺陷描述输入（支持图片和文档）。"""
 
     if _is_cancel_message(message.text):
         await state.clear()
         await message.answer("已取消缺陷上报。", reply_markup=_build_worker_main_keyboard())
         return
-    content = _collect_message_payload(message)
-    if not content:
+
+    # 获取任务 ID
+    data = await state.get_data()
+    task_id = data.get("task_id")
+
+    # 使用增强版收集函数（如果有媒体处理器）
+    if media_handler:
+        content, media_files, feedback = await _collect_message_payload_with_media(
+            message, task_id
+        )
+        # 发送用户反馈
+        if feedback:
+            await message.answer(feedback)
+    else:
+        # 使用原有函数
+        content = _collect_message_payload(message)
+        media_files = []
+
+    if not content and not media_files:
         await message.answer(
             "缺陷描述不能为空，请重新输入：",
             reply_markup=_build_description_keyboard(),
         )
         return
+
     await state.update_data(
         description=content,
+        media_files=media_files,
         reporter=_actor_from_message(message),
     )
     await state.set_state(TaskBugReportStates.waiting_reproduction)
@@ -6908,18 +7214,36 @@ async def on_task_bug_description(message: Message, state: FSMContext) -> None:
 
 @router.message(TaskBugReportStates.waiting_reproduction)
 async def on_task_bug_reproduction(message: Message, state: FSMContext) -> None:
-    """处理复现步骤输入。"""
+    """处理复现步骤输入（支持图片）。"""
 
     if _is_cancel_message(message.text):
         await state.clear()
         await message.answer("已取消缺陷上报。", reply_markup=_build_worker_main_keyboard())
         return
+
     options = [SKIP_TEXT, "取消"]
     resolved = _resolve_reply_choice(message.text or "", options=options)
     reproduction = ""
+    reproduction_media = []
+
     if resolved not in {SKIP_TEXT, "取消"}:
-        reproduction = _collect_message_payload(message)
-    await state.update_data(reproduction=reproduction)
+        # 获取任务 ID
+        data = await state.get_data()
+        task_id = data.get("task_id")
+
+        if media_handler:
+            reproduction, reproduction_media, feedback = await _collect_message_payload_with_media(
+                message, task_id
+            )
+            if feedback:
+                await message.answer(feedback)
+        else:
+            reproduction = _collect_message_payload(message)
+
+    await state.update_data(
+        reproduction=reproduction,
+        reproduction_media=reproduction_media
+    )
     await state.set_state(TaskBugReportStates.waiting_logs)
     await message.answer(_build_bug_log_prompt(), reply_markup=_build_description_keyboard())
 
@@ -6997,11 +7321,21 @@ async def on_task_bug_confirm(message: Message, state: FSMContext) -> None:
     reproduction = data.get("reproduction", "")
     logs = data.get("logs", "")
     reporter = data.get("reporter") or _actor_from_message(message)
+
+    # 收集所有媒体文件
+    all_media_files = []
+    if "media_files" in data:
+        all_media_files.extend(data["media_files"])
+    if "reproduction_media" in data:
+        all_media_files.extend(data["reproduction_media"])
+
     payload = {
         "action": "bug_report",
         "description_length": len(description),
         "has_reproduction": bool(reproduction.strip()),
         "has_logs": bool(logs.strip()),
+        "has_media": len(all_media_files) > 0,
+        "media_count": len(all_media_files),
         "description": description,
         "reproduction": reproduction,
         "logs": logs,
@@ -7015,7 +7349,12 @@ async def on_task_bug_confirm(message: Message, state: FSMContext) -> None:
         payload=payload,
     )
     await state.clear()
-    await _auto_push_after_bug_report(task, message=message, actor=reporter)
+    await _auto_push_after_bug_report(
+        task,
+        message=message,
+        actor=reporter,
+        media_files=all_media_files
+    )
 
 
 @router.callback_query(F.data.startswith("task:add_note:"))
@@ -7408,21 +7747,53 @@ async def on_start(m: Message):
     if ENV_ISSUES:
         await m.answer(_format_env_issue_message())
 
-@router.message(F.text)
+@router.message(F.text | F.photo | F.document | F.caption)
 async def on_text(m: Message):
+    """
+    处理用户消息：支持纯文本、带图片和文档的消息
+    - 纯文本消息：使用 m.text
+    - 带媒体消息：使用 m.caption，并下载媒体文件
+    """
     # 首次收到消息时自动记录 chat_id 到 state 文件
     _auto_record_chat_id(m.chat.id)
 
-    prompt = (m.text or "").strip()
+    # 提取文本内容（优先使用 caption，用于带媒体的消息）
+    prompt = (m.caption or m.text or "").strip()
+
+    # 如果有媒体文件，使用增强收集函数
+    has_media = m.photo or m.document
+    if media_handler and has_media:
+        try:
+            content, media_files, feedback = await _collect_message_payload_with_media(m, None)
+            # 发送用户反馈（下载成功/失败提示）
+            if feedback:
+                await m.answer(feedback)
+            # 使用包含媒体路径引用的完整内容
+            prompt = content
+        except Exception as e:
+            worker_log.error(
+                "处理媒体文件失败: %s",
+                e,
+                exc_info=True,
+                extra={**_session_extra(), "chat": m.chat.id}
+            )
+            # 降级处理：继续使用文本部分
+            await m.answer(f"⚠️ 媒体文件处理失败，仅使用文本内容：{str(e)}")
+
     if not prompt:
         return await m.answer("请输入非空提示词")
+
+    # 快捷查询任务详情（如输入 TASK_0001）
     task_id_candidate = _normalize_task_id(prompt)
     if task_id_candidate:
         await _reply_task_detail_message(m, task_id_candidate)
         return
+
+    # 忽略以 / 开头的未识别命令
     if prompt.startswith("/"):
         return
 
+    # 环境异常检查
     if ENV_ISSUES:
         message = _format_env_issue_message()
         worker_log.warning(
@@ -7434,7 +7805,7 @@ async def on_text(m: Message):
         return
 
     bot = current_bot()
-    await bot.send_chat_action(m.chat.id, "typing")  # “正在输入”提示
+    await bot.send_chat_action(m.chat.id, "typing")  # "正在输入"提示
 
     if MODE == "A":
         if not AGENT_CMD:
@@ -7517,8 +7888,28 @@ async def _ensure_worker_menu_button(bot: Bot) -> None:
             extra={**_session_extra(), "text": WORKER_MENU_BUTTON_TEXT},
         )
 
+async def _media_cleanup_worker():
+    """媒体文件定期清理任务"""
+    if not media_handler or not MediaConfig:
+        return
+
+    while True:
+        try:
+            await asyncio.sleep(MediaConfig.AUTO_CLEANUP_INTERVAL_HOURS * 3600)
+
+            if media_handler:
+                cleaned = await media_handler.cleanup_old_files()
+                worker_log.info(
+                    "定期清理完成，删除了 %d 个过期文件",
+                    cleaned,
+                    extra=_session_extra()
+                )
+
+        except Exception as e:
+            worker_log.error("媒体清理任务失败: %s", e, extra=_session_extra())
+
 async def main():
-    global _bot, CHAT_LONG_POLL_LOCK
+    global _bot, CHAT_LONG_POLL_LOCK, media_handler
     # 初始化长轮询锁
     CHAT_LONG_POLL_LOCK = asyncio.Lock()
     _bot = build_bot()
@@ -7536,6 +7927,16 @@ async def main():
         if _bot:
             await _bot.session.close()
         raise SystemExit(1)
+
+    # 初始化媒体处理器
+    if HAS_MEDIA_HANDLER and _bot:
+        try:
+            media_handler = MediaHandler(_bot)
+            # 启动定期清理任务
+            asyncio.create_task(_media_cleanup_worker())
+            worker_log.info("媒体处理器已初始化", extra=_session_extra())
+        except Exception as exc:
+            worker_log.error("媒体处理器初始化失败：%s", exc, extra=_session_extra())
     await _ensure_bot_commands(_bot)
     await _ensure_worker_menu_button(_bot)
     await _broadcast_worker_keyboard(_bot)

{vibego-0.2.50 → vibego-0.2.52}/pyproject.toml

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

{vibego-0.2.50 → vibego-0.2.52}/vibego.egg-info/PKG-INFO

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

{vibego-0.2.50 → vibego-0.2.52}/vibego_cli/__init__.py

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