vibego 0.2.44__tar.gz → 0.2.45__tar.gz

{vibego-0.2.44 → vibego-0.2.45}/PKG-INFO

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

{vibego-0.2.44 → vibego-0.2.45}/master.py

@@ -261,6 +261,25 @@ def _ensure_numbered_markup(markup: Optional[InlineKeyboardMarkup]) -> Optional[
     return markup
 
 
+def _get_project_runtime_state(manager: "MasterManager", slug: str) -> Optional["ProjectState"]:
+    """归一化查询项目运行状态，避免误用 FSMContext。
+
+    这里集中处理 slug 大小写并注释说明原因，防止在路由中覆盖 aiogram
+    提供的 `FSMContext`（详见官方文档：https://docs.aiogram.dev/en/dev-3.x/dispatcher/fsm/context.html）。
+    """
+
+    normalized = (slug or "").strip().lower()
+    if not normalized:
+        return None
+    store = manager.state_store
+    if normalized in store.data:
+        return store.data[normalized]
+    for known_slug, runtime_state in store.data.items():
+        if known_slug.lower() == normalized:
+            return runtime_state
+    return None
+
+
 def _terminate_other_master_processes(grace: float = 3.0) -> None:
     """在新 master 启动后终止其他残留 master 进程"""
     existing: list[int] = []
@@ -1554,8 +1573,9 @@ async def _start_project_delete(
     repository = _ensure_repository()
     original_record = repository.get_by_slug(cfg.project_slug)
     original_slug = original_record.project_slug if original_record else cfg.project_slug
-    project_state = manager.state_store.data.get(cfg.project_slug)
-    if project_state and project_state.status == "running":
+    # 删除前再次读取运行态，避免 FSM 上下文被误覆盖
+    project_runtime_state = _get_project_runtime_state(manager, cfg.project_slug)
+    if project_runtime_state and project_runtime_state.status == "running":
         await callback.answer("请先停止该项目的 worker 后再删除。", show_alert=True)
         return
     current_state = await state.get_state()
@@ -2177,7 +2197,8 @@ async def on_project_action(callback: CallbackQuery, state: FSMContext) -> None:
         await callback.answer("未知项目", show_alert=True)
         return
 
-    state = manager.state_store.data.get(cfg.project_slug) if cfg else None
+    # 关键：避免覆盖 aiogram 传入的 FSMContext，因此运行态单独保存在 project_runtime_state 中
+    project_runtime_state = _get_project_runtime_state(manager, cfg.project_slug) if cfg else None
     model_name_map = dict(SWITCHABLE_MODELS)
 
     if cfg:
@@ -2224,7 +2245,9 @@ async def on_project_action(callback: CallbackQuery, state: FSMContext) -> None:
                 callback_data=f"project:edit:{cfg.project_slug}",
             )
         )
-        current_model_value = state.model if state else cfg.default_model
+        current_model_value = (
+            project_runtime_state.model if project_runtime_state else cfg.default_model
+        )
         current_model_key = (current_model_value or "").lower()
         current_model_label = model_name_map.get(current_model_key, current_model_value or current_model_key or "-")
         builder.row(
@@ -2258,7 +2281,9 @@ async def on_project_action(callback: CallbackQuery, state: FSMContext) -> None:
         if cfg is None or callback.message is None:
             await callback.answer("未知项目", show_alert=True)
             return
-        current_model = (state.model if state else cfg.default_model).lower()
+        current_model = (
+            project_runtime_state.model if project_runtime_state else cfg.default_model
+        ).lower()
         builder = InlineKeyboardBuilder()
         for value, label in SWITCHABLE_MODELS:
             prefix = "✅ " if current_model == value else ""

{vibego-0.2.44 → vibego-0.2.45}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vibego"
-version = "0.2.44"
+version = "0.2.45"
 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.44"
+current_version = "0.2.45"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{vibego-0.2.44 → vibego-0.2.45}/tests/test_master_project_management.py

@@ -447,6 +447,98 @@ def test_delete_flow_fallbacks_to_original_slug(repo: ProjectRepository, tmp_pat
     assert repo.get_by_bot_name(record.bot_name) is None
 
 
+def test_get_project_runtime_state_handles_casefold(repo: ProjectRepository, tmp_path: Path):
+    """确保辅助函数能兼容大小写差异并返回同一状态实例。"""
+    manager = _build_manager(repo, tmp_path)
+    master.MANAGER = manager
+    master.PROJECT_REPOSITORY = repo
+
+    # slug 大小写不同仍应命中
+    runtime_state_upper = master._get_project_runtime_state(manager, "SAMPLE")
+    runtime_state_lower = master._get_project_runtime_state(manager, "sample")
+    assert runtime_state_upper is runtime_state_lower
+    assert runtime_state_upper.status == "stopped"
+
+    # 不存在的 slug 返回 None
+    runtime_state_none = master._get_project_runtime_state(manager, "not-found")
+    assert runtime_state_none is None
+
+
+def test_on_project_action_delete_starts_confirmation_flow(repo: ProjectRepository, tmp_path: Path):
+    """模拟按钮点击，验证删除流程可以正确进入确认状态。"""
+    manager = _build_manager(repo, tmp_path)
+    master.MANAGER = manager
+    master.PROJECT_REPOSITORY = repo
+    storage, fsm_state = _build_fsm_state()
+    callback = DummyCallback("project:delete:sample")
+
+    async def _invoke():
+        await master.on_project_action(callback, fsm_state)
+
+    asyncio.run(_invoke())
+    state_value = asyncio.run(fsm_state.get_state())
+    assert state_value == master.ProjectDeleteStates.confirming.state
+    assert callback.message._answers, "应提示用户确认删除"
+    answer_text, _ = callback.message._answers[-1]
+    assert "确认删除项目" in answer_text
+
+
+def test_on_project_action_delete_blocks_when_running(repo: ProjectRepository, tmp_path: Path):
+    """worker 运行中时应拒绝删除请求。"""
+    manager = _build_manager(repo, tmp_path)
+    master.MANAGER = manager
+    master.PROJECT_REPOSITORY = repo
+    manager.state_store.data["sample"].status = "running"
+    storage, fsm_state = _build_fsm_state()
+    callback = DummyCallback("project:delete:sample")
+
+    async def _invoke():
+        await master.on_project_action(callback, fsm_state)
+
+    asyncio.run(_invoke())
+    assert callback._answers[-1] == ("请先停止该项目的 worker 后再删除。", True)
+    assert not callback.message._answers
+    assert asyncio.run(fsm_state.get_state()) is None
+
+
+def test_on_project_action_delete_unknown_slug(repo: ProjectRepository, tmp_path: Path):
+    """未知项目 slug 应立即返回提示。"""
+    manager = _build_manager(repo, tmp_path)
+    master.MANAGER = manager
+    master.PROJECT_REPOSITORY = repo
+    storage, fsm_state = _build_fsm_state()
+    callback = DummyCallback("project:delete:missing")
+
+    async def _invoke():
+        await master.on_project_action(callback, fsm_state)
+
+    asyncio.run(_invoke())
+    assert callback._answers[-1] == ("未知项目", True)
+    assert asyncio.run(fsm_state.get_state()) is None
+
+
+def test_on_project_action_delete_repeated_request(repo: ProjectRepository, tmp_path: Path):
+    """重复点击删除按钮时应提示流程已存在，避免重复覆盖 FSM。"""
+    manager = _build_manager(repo, tmp_path)
+    master.MANAGER = manager
+    master.PROJECT_REPOSITORY = repo
+    storage, fsm_state = _build_fsm_state()
+    first_callback = DummyCallback("project:delete:sample")
+
+    async def _first():
+        await master.on_project_action(first_callback, fsm_state)
+
+    asyncio.run(_first())
+    # 第二次点击
+    second_callback = DummyCallback("project:delete:sample")
+
+    async def _second():
+        await master.on_project_action(second_callback, fsm_state)
+
+    asyncio.run(_second())
+    assert second_callback._answers[-1] == ("当前删除流程已在确认中，请使用按钮完成操作。", True)
+
+
 def test_projects_overview_hides_create_button(repo: ProjectRepository, tmp_path: Path):
     manager = _build_manager(repo, tmp_path)
     text, markup = master._projects_overview(manager)

{vibego-0.2.44 → vibego-0.2.45}/vibego.egg-info/PKG-INFO

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

{vibego-0.2.44 → vibego-0.2.45}/vibego_cli/__init__.py

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