ksaa 2025.7.20.0__py3-none-any.whl → 2025.7.27.0__py3-none-any.whl

kotonebot/kaa/tasks/produce/in_purodyuusu.py

@@ -12,9 +12,8 @@ from .cards import do_cards, CardDetectResult
 from ..actions.commu import handle_unread_commu
 from kotonebot.errors import UnrecoverableError
 from kotonebot.util import Countdown, Interval, cropped
-from kotonebot.backend.dispatch import DispatcherContext
+from kotonebot.backend.loop import Loop
 from kotonebot.kaa.config import ProduceAction, RecommendCardDetectionMode
-from kotonebot.kaa.config import conf
 from ..produce.common import until_acquisition_clear, commu_event, fast_acquisitions
 from kotonebot import ocr, device, contains, image, regex, action, sleep, wait
 from ..produce.non_lesson_actions import (
@@ -705,8 +704,8 @@ ProduceStage = Literal[
     'unknown', # 未知场景
 ]
 
-@action('检测当前培育场景', dispatcher=True)
-def detect_produce_scene(ctx: DispatcherContext) -> ProduceStage:
+@action('检测当前培育场景')
+def detect_produce_scene() -> ProduceStage:
     """
     判断当前是培育的什么阶段，并开始 Regular 培育。
 
@@ -715,31 +714,35 @@ def detect_produce_scene(ctx: DispatcherContext) -> ProduceStage:
     """
     logger.info("Detecting current produce stage...")
     
-    # 行动场景
-    texts = ocr.ocr()
-    if (
-        image.find_multi([
-            R.InPurodyuusu.TextPDiary, # 普通周
-            R.InPurodyuusu.ButtonFinalPracticeDance # 离考试剩余一周
-        ]) 
-    ):
-        logger.info("Detection result: At action scene.")
-        ctx.finish()
-        return 'action'
-    elif texts.where(regex('CLEARまで|PERFECTまで')):
-        logger.info("Detection result: At practice ongoing.")
-        ctx.finish()
-        return 'practice-ongoing'
-    elif is_exam_scene():
-        logger.info("Detection result: At exam scene.")
-        ctx.finish()
-        return 'exam-ongoing'
-    else:
-        if fast_acquisitions():
-            return 'unknown'
-        if commu_event():
-            return 'unknown'
-        return 'unknown'
+    for _ in Loop():
+        # 行动场景
+        texts = ocr.ocr()
+        if (
+            image.find_multi([
+                R.InPurodyuusu.TextPDiary, # 普通周
+                R.InPurodyuusu.ButtonFinalPracticeDance # 离考试剩余一周
+            ])
+        ):
+            logger.info("Detection result: At action scene.")
+            return 'action'
+        elif texts.where(regex('CLEARまで|PERFECTまで')):
+            logger.info("Detection result: At practice ongoing.")
+            return 'practice-ongoing'
+        elif is_exam_scene():
+            logger.info("Detection result: At exam scene.")
+            return 'exam-ongoing'
+        else:
+            if fast_acquisitions():
+                # 继续循环检测
+                pass
+            elif commu_event():
+                # 继续循环检测
+                pass
+            else:
+                return 'unknown'
+        # 如果没有返回，说明需要继续检测
+        sleep(0.5)  # 等待一段时间再重新检测
+    return 'unknown'
 
 @action('开始 Hajime 培育')
 def hajime_from_stage(stage: ProduceStage, type: Literal['regular', 'pro', 'master'], week: int):

kotonebot/kaa/tasks/produce/produce.py

@@ -15,6 +15,7 @@ from kotonebot.kaa.game_ui.idols_overview import locate_idol, match_idol
 from ..produce.in_purodyuusu import hajime_pro, hajime_regular, hajime_master, resume_pro_produce, resume_regular_produce, \
     resume_master_produce
 from kotonebot import device, image, ocr, task, action, sleep, contains, regex
+from kotonebot.kaa.errors import IdolCardNotFoundError
 
 logger = logging.getLogger(__name__)
 
@@ -58,7 +59,7 @@ def select_idol(skin_id: str):
     # 选择偶像
     pos = locate_idol(skin_id)
     if pos is None:
-        raise ValueError(f"Idol {skin_id} not found.")
+        raise IdolCardNotFoundError(skin_id)
     # 确认
     it.reset()
     while btn_confirm := image.find(R.Common.ButtonConfirmNoIcon):

kotonebot/kaa/tasks/start_game.py

@@ -12,6 +12,7 @@ from .actions.scenes import at_home, goto_home
 from .actions.commu import handle_unread_commu
 from kotonebot.errors import GameUpdateNeededError
 from kotonebot import task, action, sleep, device, image, ocr, config
+from kotonebot.backend.context.context import vars
 
 logger = logging.getLogger(__name__)
 
@@ -170,6 +171,7 @@ def windows_launch():
     # 等待游戏窗口出现
     it = Interval()
     while True:
+        vars.flow.check()
         if ahk.find_window(title='gakumas', title_match_mode=3):
             logger.debug('Game window found.')
             break

kotonebot/ui/user.py

@@ -4,6 +4,7 @@ import time
 
 import cv2
 from cv2.typing import MatLike
+from win11toast import toast
 
 from .pushkit import Wxpusher
 from .. import logging
@@ -25,17 +26,6 @@ def retry(func):
                 continue
     return wrapper
 
-def ask(
-    question: str,
-    options: list[str],
-    *,
-    timeout: float = -1,
-) -> bool:
-    """
-    询问用户
-    """
-    raise NotImplementedError
-
 def _save_local(
     title: str,
     message: str,
@@ -74,6 +64,43 @@ def push(
         logger.warning('push remote message failed: %s', e)
         _save_local(title, message, images)
 
+def _show_toast(title: str, message: str | None = None, buttons: list[str] | None = None):
+    """
+    统一的 Toast 通知函数
+
+    :param title: 通知标题
+    :param message: 通知消息内容
+    :param buttons: 按钮列表，如果提供则显示带按钮的通知
+    """
+    try:
+        if buttons:
+            logger.verbose('showing toast notification with buttons: %s - %s', title, message or '')
+            toast(title, message or '', buttons=buttons)
+        else:
+            # 如果没有 message，只显示 title
+            if message:
+                logger.verbose('showing toast notification: %s - %s', title, message)
+                toast(title, message)
+            else:
+                logger.verbose('showing toast notification: %s', title)
+                toast(title)
+    except Exception as e:
+        logger.warning('toast notification failed: %s', e)
+
+def ask(
+    question: str,
+    options: list[tuple[str, str]],
+    *,
+    timeout: float = -1,
+) -> str:
+    """
+    询问用户
+    """
+    # 将选项转换为按钮列表
+    buttons = [option[1] for option in options]
+    _show_toast("琴音小助手询问", question, buttons=buttons)
+    raise NotImplementedError
+
 def info(
     title: str,
     message: str | None = None,
@@ -83,6 +110,7 @@ def info(
 ):
     logger.info('user.info: %s', message)
     push('KAA：' + title, message, images=images)
+    _show_toast('KAA：' + title, message)
 
 def warning(
     title: str,
@@ -98,7 +126,8 @@ def warning(
     :param once: 每次运行是否只显示一次。
     """
     logger.warning('user.warning: %s', message)
-    push("KAA 警告：" + title, message, images=images)
+    push("琴音小助手警告：" + title, message, images=images)
+    _show_toast("琴音小助手警告：" + title, message)
 
 def error(
     title: str,
@@ -111,4 +140,5 @@ def error(
     错误信息。
     """
     logger.error('user.error: %s', message)
-    push("KAA 错误：" + title, message, images=images)
+    push("琴音小助手错误：" + title, message, images=images)
+    _show_toast("琴音小助手错误：" + title, message)

{ksaa-2025.7.20.0.dist-info → ksaa-2025.7.27.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ksaa
-Version: 2025.7.20.0
+Version: 2025.7.27.0
 Summary: Kotones Auto Assistant(kaa) is a script for game 'Gakuen Idol M@ster' that automates the dailies and produces.
 Requires-Python: ~=3.10
 Description-Content-Type: text/markdown
@@ -26,6 +26,7 @@ Requires-Dist: onnxruntime==1.14.0
 Requires-Dist: numpy<2.0
 Requires-Dist: pywin32==310
 Requires-Dist: ahk==1.8.3
+Requires-Dist: win11toast==0.35
 Dynamic: license-file
 
 # Kotone's Auto Assistant 琴音小助手