ksaa 2025.11b1__py3-none-any.whl → 2025.11b3__py3-none-any.whl

kaa/tasks/produce/common.py

@@ -1,6 +1,7 @@
-from typing import Literal
 from logging import getLogger
+from typing import Literal, Callable
 
+from cv2.typing import MatLike
 from kotonebot import (
     ocr,
     device,
@@ -10,16 +11,23 @@ from kotonebot import (
     Loop,
     Interval,
 )
-from kaa.config.schema import produce_solution
-from kaa.tasks.start_game import wait_for_home
+from kotonebot.util import Countdown
 from kotonebot.primitives import Rect
 from kaa.tasks import R
+from kaa.tasks.common import skip
 from .p_drink import acquire_p_drink
 from kotonebot.util import measure_time
+from kotonebot.backend.core import Image
+from kotonebot.errors import UnrecoverableError
+
+from kaa.tasks import R
 from kaa.config import conf
+from .p_drink import acquire_p_drink
 from kaa.tasks.actions.loading import loading
-from kaa.game_ui import CommuEventButtonUI, dialog, badge
+from kaa.config.schema import produce_solution
+from kaa.tasks.start_game import wait_for_home
 from kaa.tasks.actions.commu import handle_unread_commu
+from kaa.game_ui import CommuEventButtonUI, dialog, badge
 
 logger = getLogger(__name__)
 
@@ -257,109 +265,197 @@ def acquisition_date_change_dialog() -> AcquisitionType | None:
 
     return None
 
-@measure_time()
-@action('处理培育事件', screenshot_mode='manual')
-def fast_acquisitions() -> AcquisitionType | None:
-    """处理行动开始前和结束后可能需要处理的事件"""
-    img = device.screenshot()
-    logger.info("Acquisition stuffs...")
-    
-    # 加载画面
-    if loading():
-        logger.info("Loading...")
-        return "Loading"
-    device.click(10, 10)
-
-    # 跳过未读交流
-    logger.debug("Check skip commu...")
-    if produce_solution().data.skip_commu and handle_unread_commu(img):
-        return "SkipCommu"
-    device.click(10, 10)
-
-    # P饮料到达上限
-    logger.debug("Check PDrink max...")
-    # TODO: 需要封装一个更好的实现方式。比如 wait_stable？
-    if image.find(R.InPurodyuusu.TextPDrinkMax):
-        logger.debug("PDrink max found")
-        device.screenshot()
+# TODO: 这里要改善一下输出日志。
+# Acquisitions finished. Handled: xxx(event name or 'none'). Checked: 12(number of acquisitions) / 12(number of acquisitions)
+class ProduceInterrupt:
+    def __init__(self, *, timeout: float | None = None):
+        """
+        :param timeout: 超时时间，单位秒。默认为 None，表示使用配置文件中的时间。
+        """
+        timeout = timeout or conf().produce.interrupt_timeout
+        self.cd = Countdown(timeout)
+
+    @staticmethod
+    def _check_loading(img: MatLike) -> AcquisitionType | None:
+        """检查加载画面"""
+        if loading():
+            logger.info("Loading...")
+            return "Loading"
+        return None
+
+    @staticmethod
+    def _check_skip_commu(img: MatLike) -> AcquisitionType | None:
+        """检查跳过未读交流"""
+        logger.debug("Check skip commu...")
+        if produce_solution().data.skip_commu and handle_unread_commu(img):
+            return "SkipCommu"
+        return None
+
+    @staticmethod
+    def _check_pdrink_max(img: MatLike) -> AcquisitionType | None:
+        """检查P饮料到达上限"""
+        logger.debug("Check PDrink max...")
+        # TODO: 需要封装一个更好的实现方式。比如 wait_stable？
         if image.find(R.InPurodyuusu.TextPDrinkMax):
-            # 有对话框标题，但是没找到确认按钮
-            # 可能是需要勾选一个饮料
-            if not image.find(R.InPurodyuusu.ButtonLeave, colored=True):
-                logger.info("No leave button found, click checkbox")
-                device.click(image.expect(R.Common.CheckboxUnchecked, colored=True))
-                sleep(0.2)
-                device.screenshot()
-            if leave := image.find(R.InPurodyuusu.ButtonLeave, colored=True):
-                logger.info("Leave button found")
-                device.click(leave)
-                return "PDrinkMax"
-    # P饮料到达上限 确认提示框
-    # [kotonebot-resource\sprites\jp\in_purodyuusu\screenshot_pdrink_max_confirm.png]
-    if image.find(R.InPurodyuusu.TextPDrinkMaxConfirmTitle):
-        logger.debug("PDrink max confirm found")
-        device.screenshot()
+            logger.debug("PDrink max found")
+            device.screenshot()
+            if image.find(R.InPurodyuusu.TextPDrinkMax):
+                # 有对话框标题，但是没找到确认按钮
+                # 可能是需要勾选一个饮料
+                # 也有可能是对话框正在往下退出
+                if not image.find(R.InPurodyuusu.ButtonLeave, colored=True):
+                    logger.info("No leave button found, click checkbox")
+                    if image.find(R.Common.CheckboxUnchecked, colored=True):
+                        device.click()
+                        sleep(0.2)
+                        device.screenshot()
+                if leave := image.find(R.InPurodyuusu.ButtonLeave, colored=True):
+                    logger.info("Leave button found")
+                    device.click(leave)
+                    return "PDrinkMax"
+        return None
+
+    @staticmethod
+    def _check_pdrink_max_confirm(img: MatLike) -> AcquisitionType | None:
+        """检查P饮料到达上限确认提示框"""
+        # [kotonebot-resource/sprites/jp/in_purodyuusu/screenshot_pdrink_max_confirm.png]
         if image.find(R.InPurodyuusu.TextPDrinkMaxConfirmTitle):
-            if confirm := image.find(R.Common.ButtonConfirm):
-                logger.info("Confirm button found")
-                device.click(confirm)
-                return "PDrinkMax"
-    device.click(10, 10)
-
-    # 技能卡自选强化
-    if image.find(R.InPurodyuusu.IconTitleSkillCardEnhance):
-        if handle_skill_card_enhance():
-            return "PSkillCardEnhanceSelect"
-    device.click(10, 10)
-
-    # 技能卡自选删除
-    if image.find(R.InPurodyuusu.IconTitleSkillCardRemoval):
-        if handle_skill_card_removal():
-            return "PSkillCardRemoveSelect"
-    device.click(10, 10)
-
-    # 网络中断弹窗
-    logger.debug("Check network error popup...")
-    if (image.find(R.Common.TextNetworkError) 
-        and (btn_retry := image.find(R.Common.ButtonRetry))
-    ):
-        logger.info("Network error popup found")
-        device.click(btn_retry)
-        return "NetworkError"
-    device.click(10, 10)
-
-    # 物品选择对话框
-    logger.debug("Check award select dialog...")
-    if image.find(R.InPurodyuusu.TextClaim):
-        logger.info("Award select dialog found.")
-
-        # P饮料选择
-        logger.debug("Check PDrink select...")
-        if image.find(R.InPurodyuusu.TextPDrink):
-            logger.info("PDrink select found")
-            acquire_p_drink()
-            return "PDrinkSelect"
-        # 技能卡选择
-        logger.debug("Check skill card select...")
-        if image.find(R.InPurodyuusu.TextSkillCard):
-            logger.info("Acquire skill card found")
-            acquire_skill_card()
-            return "PSkillCardSelect"
-        # P物品选择
-        logger.debug("Check PItem select...")
-        if image.find(R.InPurodyuusu.TextPItem):
-            logger.info("Acquire PItem found")
-            select_p_item()
-            return "PItemSelect"
-    device.click(10, 10)
-
-    # 日期变更
-    result = acquisition_date_change_dialog()
-    if result is not None:
-        return result
-    device.click(10, 10)
+            logger.debug("PDrink max confirm found")
+            device.screenshot()
+            if image.find(R.InPurodyuusu.TextPDrinkMaxConfirmTitle):
+                if confirm := image.find(R.Common.ButtonConfirm):
+                    logger.info("Confirm button found")
+                    device.click(confirm)
+                    return "PDrinkMax"
+        return None
 
-    return None
+    @staticmethod
+    def _check_skill_card_enhance(img: MatLike) -> AcquisitionType | None:
+        """检查技能卡自选强化"""
+        if image.find(R.InPurodyuusu.IconTitleSkillCardEnhance):
+            if handle_skill_card_enhance():
+                return "PSkillCardEnhanceSelect"
+        return None
+
+    @staticmethod
+    def _check_skill_card_removal(img: MatLike) -> AcquisitionType | None:
+        """检查技能卡自选删除"""
+        if image.find(R.InPurodyuusu.IconTitleSkillCardRemoval):
+            if handle_skill_card_removal():
+                return "PSkillCardRemoveSelect"
+        return None
+
+    @staticmethod
+    def _check_network_error(img: MatLike) -> AcquisitionType | None:
+        """检查网络中断弹窗"""
+        logger.debug("Check network error popup...")
+        if (image.find(R.Common.TextNetworkError) 
+            and (btn_retry := image.find(R.Common.ButtonRetry))
+        ):
+            logger.info("Network error popup found")
+            device.click(btn_retry)
+            return "NetworkError"
+        return None
+
+    @staticmethod
+    def _check_award_select(img: MatLike) -> AcquisitionType | None:
+        """检查物品选择对话框"""
+        logger.debug("Check award select dialog...")
+        if image.find(R.InPurodyuusu.TextClaim):
+            logger.info("Award select dialog found.")
+
+            # P饮料选择
+            logger.debug("Check PDrink select...")
+            if image.find(R.InPurodyuusu.TextPDrink):
+                logger.info("PDrink select found")
+                acquire_p_drink()
+                return "PDrinkSelect"
+            # 技能卡选择
+            logger.debug("Check skill card select...")
+            if image.find(R.InPurodyuusu.TextSkillCard):
+                logger.info("Acquire skill card found")
+                acquire_skill_card()
+                return "PSkillCardSelect"
+            # P物品选择
+            logger.debug("Check PItem select...")
+            if image.find(R.InPurodyuusu.TextPItem):
+                logger.info("Acquire PItem found")
+                select_p_item()
+                return "PItemSelect"
+        return None
+
+    @staticmethod
+    def _check_date_change(img: MatLike) -> AcquisitionType | None:
+        """检查日期变更"""
+        result = acquisition_date_change_dialog()
+        if result is not None:
+            return result
+        return None
+
+    handlers = [
+        _check_loading,
+        _check_skip_commu,
+        _check_pdrink_max,
+        _check_pdrink_max_confirm,
+        _check_skill_card_enhance,
+        _check_skill_card_removal,
+        _check_network_error,
+        _check_award_select,
+        _check_date_change
+    ]
+
+    @classmethod
+    @action('处理培育事件', screenshot_mode='manual')
+    def check(cls) -> AcquisitionType | None:
+        """处理行动开始前和结束后可能需要处理的事件"""
+        img = device.screenshot()
+        logger.info("Acquisition stuffs...")
+        
+        # 检查各个可能的中断事件        
+        for handler in cls.handlers:
+            result = handler(img)
+            if result:
+                return result
+            skip()
+
+        return None
+
+    def resolve(self, end_condition: Callable[[], bool] | Image | None = None):
+        self.cd.reset().start()
+        result: Literal[False] | AcquisitionType | None = False
+        for l in Loop():
+            if end_condition is not None:
+                if callable(end_condition) and end_condition():
+                    break
+                elif isinstance(end_condition, Image) and image.find(end_condition):
+                    break
+            else:
+                if result is None:
+                    break
+
+            if self.cd.expired():
+                raise UnrecoverableError("ProduceInterrupt.resolve timed out after 180 seconds")
+            
+            img = l.screenshot
+            if img is None:
+                img = device.screenshot()
+            for handler in self.handlers:
+                result = handler(img)
+                if result:
+                    break
+            skip()
+
+    def handle(self):
+        """处理中断事件，并检查是否超时。"""
+        if self.cd.expired():
+            raise UnrecoverableError('Unable to detect produce scene. Reseason: timed out.')
+        return self.check()
+    
+    def until(self, end_img: Image):
+        """
+        持续处理中断事件，直到指定图片出现为止。
+        """
+        return self.resolve(lambda: image.find(end_img) is not None)
 
 def until_acquisition_clear():
     """
@@ -369,7 +465,7 @@ def until_acquisition_clear():
     结束条件：任意
     """
     interval = Interval(0.6)
-    while fast_acquisitions():
+    while ProduceInterrupt.check():
         interval.wait()
 
 ORANGE_RANGE = ((14, 87, 23)), ((37, 211, 255))

kaa/tasks/produce/in_purodyuusu.py

@@ -2,9 +2,10 @@ import logging
 from typing_extensions import assert_never
 from typing import Literal
 
-from kaa.config.schema import produce_solution
+from kaa.config.schema import conf, produce_solution
 from kaa.game_ui.schedule import Schedule
 from kaa.tasks import R
+from kaa.tasks.common import skip
 from ..actions import loading
 from kaa.game_ui import WhiteFilter, dialog
 from ..actions.scenes import at_home
@@ -14,7 +15,7 @@ from kotonebot.errors import UnrecoverableError
 from kotonebot.util import Countdown, cropped
 from kotonebot.backend.loop import Loop
 from kaa.config import ProduceAction, RecommendCardDetectionMode
-from ..produce.common import until_acquisition_clear, commu_event, fast_acquisitions
+from ..produce.common import until_acquisition_clear, commu_event, ProduceInterrupt
 from kotonebot import ocr, device, contains, image, regex, action, sleep, wait
 from ..produce.non_lesson_actions import (
     enter_allowance, allowance_available,
@@ -141,9 +142,10 @@ def handle_recommended_action(final_week: bool = False) -> ProduceAction | None:
         return recommended
 
 
-@action('等待进入行动场景')
+@action('等待进入行动场景', screenshot_mode='manual')
 def until_action_scene(week_first: bool = False):
     """等待进入行动场景"""
+    pi = ProduceInterrupt()
     for _ in Loop(interval=0.2):
         if not image.find_multi([
             R.InPurodyuusu.TextPDiary, # 普通周
@@ -158,13 +160,13 @@ def until_action_scene(week_first: bool = False):
             # [screenshots/produce/in_produce/initial_commu_event.png]
             if week_first and commu_event():
                 continue
-            if fast_acquisitions():
+            if pi.handle():
                 continue
         else:
             logger.info("Now at action scene.")
             return 
 
-@action('等待进入练习场景')
+@action('等待进入练习场景', screenshot_mode='manual')
 def until_practice_scene():
     """等待进入练习场景"""
     for _ in Loop():
@@ -173,7 +175,7 @@ def until_practice_scene():
         else:
             break
 
-@action('等待进入考试场景')
+@action('等待进入考试场景', screenshot_mode='manual')
 def until_exam_scene():
     """等待进入考试场景"""
     # NOTE: is_exam_scene() 通过 OCR 剩余回合数判断是否处于考试场景。
@@ -342,7 +344,7 @@ def produce_end(has_live: bool = True):
                 elif image.find(R.Produce.TextSkipLiveDialogTitle):
                     logger.info("Confirming skip live.")
                     device.click(image.expect_wait(R.Common.IconButtonCheck))
-                device.click(10, 10)
+                skip()
             else:
                 break
         # 选择封面
@@ -385,7 +387,7 @@ def produce_end(has_live: bool = True):
             break
         else:
             device.click_center()
-            device.click(10, 10) # 为了兼容has_live==False的情况
+            skip() # 为了兼容has_live==False的情况
         sleep(2)
     # 后续动画
     logger.info("Waiting for memory generation animation completed...")
@@ -750,8 +752,10 @@ def detect_produce_scene() -> ProduceStage:
     结束状态：游戏主页面\n
     """
     logger.info("Detecting current produce stage...")
-    
+    cd = Countdown(conf().produce.interrupt_timeout).start()
     for _ in Loop():
+        if cd.expired():
+            raise UnrecoverableError('Unable to detect produce scene. Reseason: timed out.')
         # 行动场景
         texts = ocr.ocr()
         if (
@@ -769,7 +773,7 @@ def detect_produce_scene() -> ProduceStage:
             logger.info("Detection result: At exam scene.")
             return 'exam-ongoing'
         else:
-            if fast_acquisitions():
+            if ProduceInterrupt.check():
                 # 继续循环检测
                 pass
             elif commu_event():

kaa/tasks/produce/non_lesson_actions.py

@@ -10,7 +10,7 @@ from kaa.game_ui import dialog
 
 from kaa.tasks import R
 from kaa.config import conf
-from ..produce.common import fast_acquisitions
+from ..produce.common import ProduceInterrupt
 from kaa.game_ui.commu_event_buttons import CommuEventButtonUI
 from kotonebot.util import Countdown
 from kotonebot.backend.loop import Loop
@@ -57,12 +57,7 @@ def enter_study():
     device.double_click(image.expect_wait(R.InPurodyuusu.ButtonIconStudy))
     # 等待进入页面。中间可能会出现未读交流
     # [screenshots/produce/action_study2.png]
-    for _ in Loop():
-        if not image.find(R.InPurodyuusu.IconTitleStudy):
-            logger.debug("Waiting for 授業 screen.")
-            fast_acquisitions()
-        else:
-            break
+    ProduceInterrupt().until(R.InPurodyuusu.IconTitleStudy)
     # 首先需要判断是不是自习课
     # [kotonebot-resource\sprites\jp\in_purodyuusu\screenshot_study_self_study.png]
     if image.find_multi([
@@ -105,11 +100,7 @@ def enter_study():
             device.click(target_btn)
         else:
             device.double_click(target_btn)
-        for _ in Loop():
-            if fast_acquisitions() is None:
-                logger.info("Waiting for acquisitions finished.")
-            else:
-                break
+        ProduceInterrupt().resolve()
     logger.info("授業 completed.")
 
 
@@ -126,13 +117,9 @@ def enter_allowance():
     logger.info("Double clicking on 活動支給.")
     device.double_click(image.expect(R.InPurodyuusu.ButtonTextAllowance), interval=1)
     # 等待进入页面
-    for _ in Loop():
-        if not image.find(R.InPurodyuusu.IconTitleAllowance):
-            logger.debug("Waiting for 活動支給 screen.")
-            fast_acquisitions()
-        else:
-            break
+    ProduceInterrupt().until(R.InPurodyuusu.IconTitleAllowance)
     # 领取奖励
+    pi = ProduceInterrupt()
     for _ in Loop():
         # TODO: 检测是否在行动页面应当单独一个函数
         if image.find_multi([
@@ -145,7 +132,7 @@ def enter_allowance():
             device.click()
             sleep(0.5) # 防止点击了第一个箱子后立马点击了第二个
             continue
-        if fast_acquisitions() is not None:
+        if pi.handle():
             continue
     logger.info("活動支給 completed.")
 
@@ -164,13 +151,7 @@ def enter_consult():
     device.double_click(image.expect(R.InPurodyuusu.ButtonIconConsult), interval=1)
     
     # 等待进入页面
-    for _ in Loop():
-        if not image.find(R.InPurodyuusu.IconTitleConsult):
-            device.screenshot()
-            logger.debug("Waiting for 相談 screen.")
-            fast_acquisitions()
-        else:
-            break
+    ProduceInterrupt().until(R.InPurodyuusu.IconTitleConsult)
     # # 尝试固定购买第一个物品
     # device.click(R.InPurodyuusu.PointConsultFirstItem)
     # sleep(0.5)
@@ -282,12 +263,7 @@ def enter_outing():
     logger.info("Double clicking on おでかけ.")
     device.double_click(image.expect(R.InPurodyuusu.ButtonIconOuting))
     # 等待进入页面
-    for _ in Loop():
-        if not image.find(R.InPurodyuusu.TitleIconOuting):
-            logger.debug("Waiting for おでかけ screen.")
-            fast_acquisitions()
-        else:
-            break
+    ProduceInterrupt().until(R.InPurodyuusu.TitleIconOuting)
     # 固定选中第二个选项
     # TODO: 可能需要二次处理外出事件
     # [kotonebot-resource\sprites\jp\in_purodyuusu\screenshot_outing.png]
@@ -301,10 +277,11 @@ def enter_outing():
         device.click(target_btn)
     else:
         device.double_click(target_btn)
+    pi = ProduceInterrupt()
     for _ in Loop():
         if at_action_scene():
             break
-        elif fast_acquisitions():
+        elif pi.handle():
             pass
         # [screenshots\produce\outing_ap_confirm.png]
         elif image.find(R.Common.ButtonSelect2):

kaa/tasks/produce/p_drink.py

@@ -17,6 +17,9 @@ POSTIONS = [
 def acquire_p_drink():
     """
     领取 P 饮料
+
+    前置：领取饮料弹窗
+
     :param index: 要领取的 P 饮料的索引。从 0 开始。
     """
     # TODO: 随机领取一个饮料改成根据具体情况确定最佳
@@ -26,7 +29,8 @@ def acquire_p_drink():
         logger.info("Skip claiming PDrink.")
         device.click()
         sleep(0.3)
-        device.click(image.expect_wait(R.InPurodyuusu.ButtonDontClaim))
+        if image.find(R.InPurodyuusu.ButtonDontClaim):
+            device.click()
     else:
         # 点击饮料
         device.click(POSTIONS[0])

kaa/tasks/produce/produce.py

@@ -242,7 +242,8 @@ def do_produce(
             # [kotonebot-resource\sprites\jp\produce\screenshot_no_enough_ap_2.png]
             # [kotonebot-resource\sprites\jp\produce\screenshot_no_enough_ap_3.png]
             logger.info('AP insufficient. Try to use AP drink.')
-            for _ in Loop():
+            for _ in Loop(interval=1):
+                # HACK: 这里设置 interval 是 #91 的临时 workaround
                 if image.find(R.Produce.ButtonUse, colored=True):
                     device.click()
                 elif image.find(R.Produce.ButtonRefillAP):

kaa/tasks/start_game.py

@@ -16,6 +16,7 @@ from .actions.loading import loading
 from kaa.config import Priority, conf
 from .actions.scenes import at_home, goto_home
 from .actions.commu import handle_unread_commu
+from kaa.tasks.common import skip
 from kaa.errors import ElevationRequiredError, GameUpdateNeededError, DmmGameLaunchError
 
 logger = logging.getLogger(__name__)
@@ -138,7 +139,7 @@ def wait_for_home():
             device.click()
 
         if should_click and click_cd.expired():
-            device.click(10, 10)
+            skip()
             click_cd.reset()
 
 @action('启动游戏.Android', screenshot_mode='manual-inherit')

{ksaa-2025.11b1.dist-info → ksaa-2025.11b3.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: ksaa
-Version: 2025.11b1
+Version: 2025.11b3
 Summary: Kotones Auto Assistant(kaa) is a script for game 'Gakuen Idol M@ster' that automates the dailies and produces.
-Requires-Python: ~=3.10
+Requires-Python: ~=3.10.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: opencv-python==4.10.0.84
@@ -24,11 +24,12 @@ Requires-Dist: typing-extensions==4.12.2
 Requires-Dist: python-dotenv==1.0.1
 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
+Requires-Dist: pywin32==310; sys_platform == "win32"
+Requires-Dist: ahk==1.8.3; sys_platform == "win32"
+Requires-Dist: win11toast==0.35; sys_platform == "win32"
 Requires-Dist: keyboard==0.13.5
-Requires-Dist: kotonebot[android,windows]==0.3.1
+Requires-Dist: kotonebot[android]==0.5.0
+Requires-Dist: kotonebot[windows]==0.5.0; sys_platform == "win32"
 Dynamic: license-file
 
 # Kotone's Auto Assistant 琴音小助手
@@ -123,6 +124,8 @@ kaa
 main 分支为开发分支与测试版发布分支，release 分支为稳定版发布分支。所有 PR 都应提交到 main 分支。
 其他分支均为临时分支，请不要提交到这些分支。
 
+提交 PR 前建议你先进行覆盖率自测，详见“开发指南 ##测试”。
+
 ## 路线图
 下面是待实现的功能：  
 （带删除线标记的为已完成）