vibego 0.2.44__py3-none-any.whl → 0.2.45__py3-none-any.whl

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.dist-info → vibego-0.2.45.dist-info}/METADATA

@@ -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.dist-info → vibego-0.2.45.dist-info}/RECORD

@@ -1,6 +1,6 @@
 bot.py,sha256=TthqY_Rvndzd3pgLH6lvPcsDXQbwkuMfB4W9qt_Li8I,273832
 logging_setup.py,sha256=gvxHi8mUwK3IhXJrsGNTDo-DR6ngkyav1X-tvlBF_IE,4613
-master.py,sha256=uFRhROoRvd93CTRzS6DdlvxMYok7q1jRWZwe8QrTqIY,113997
+master.py,sha256=pba43vEuUWUl9sbRrl6YtFtYLCqA5z4yTbuOY2hhMZ4,115085
 project_repository.py,sha256=UcthtSGOJK0cTE5bQCneo3xkomRG-kyc1N1QVqxeHIs,17577
 scripts/__init__.py,sha256=LVrXUkvWKoc6Sb47X5G0gbIxu5aJ2ARW-qJ14vwi5vM,65
 scripts/bump_version.sh,sha256=a4uB8V8Y5LPsoqTCdzQKsEE8HhwpBmqRaQInG52LDig,4089
@@ -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=sMLnwzYulAP_Q8uYOcW_39L0BHzfzHQtdJ3iGiivoQQ,311
+vibego_cli/__init__.py,sha256=vkjlYE-1XFlODsNR3y6j5DOAjO18Tivxh9D5tWiEhw8,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.44.dist-info/METADATA,sha256=MUqjLTXp0J9uHaYEa1ihXzLOh5bv6OPyVvxwAGXTTmM,10519
-vibego-0.2.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vibego-0.2.44.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
-vibego-0.2.44.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
-vibego-0.2.44.dist-info/RECORD,,
+vibego-0.2.45.dist-info/METADATA,sha256=j9LQ8f3IaH0QT5WlaPPKopquoSPcEvA9YrzTbLTdC7Q,10519
+vibego-0.2.45.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vibego-0.2.45.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
+vibego-0.2.45.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
+vibego-0.2.45.dist-info/RECORD,,

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