ksaa 2025.5.23.1__py3-none-any.whl → 2025.5.23.3__py3-none-any.whl

kotonebot/client/factory.py

@@ -1,4 +1,4 @@
-from time import sleep
+import logging
 from typing import Literal
 
 from .implements.adb import AdbImpl
@@ -11,6 +11,7 @@ from .device import Device, AndroidDevice, WindowsDevice
 from adbutils import adb
 
 DeviceImpl = Literal['adb', 'adb_raw', 'uiautomator2', 'windows', 'remote_windows']
+logger = logging.getLogger(__name__)
 
 def create_device(
     addr: str,
@@ -39,14 +40,19 @@ def create_device(
     """
     if impl in ['adb', 'adb_raw', 'uiautomator2']:
         if disconnect:
+            logger.debug('adb disconnect %s', addr)
             adb.disconnect(addr)
         if connect:
+            logger.debug('adb connect %s', addr)
             result = adb.connect(addr)
             if 'cannot connect to' in result:
                 raise ValueError(result)
         serial = device_serial or addr
+        logger.debug('adb wait for %s', serial)
         adb.wait_for(serial, timeout=timeout)
-        d = [d for d in adb.device_list() if d.serial == serial]
+        devices = adb.device_list()
+        logger.debug('adb device_list: %s', devices)
+        d = [d for d in devices if d.serial == serial]
         if len(d) == 0:
             raise ValueError(f"Device {addr} not found")
         d = d[0]

kotonebot/client/host/custom.py

@@ -14,9 +14,9 @@ P = ParamSpec('P')
 T = TypeVar('T')
 
 class CustomInstance(Instance):
-    def __init__(self, exe_path: str, emulator_args: str = "", *args, **kwargs):
+    def __init__(self, exe_path: str | None, emulator_args: str = "", *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.exe_path: str = exe_path
+        self.exe_path: str | None = exe_path
         self.exe_args: str = emulator_args
         self.process: subprocess.Popen | None = None
 
@@ -26,6 +26,8 @@ class CustomInstance(Instance):
             logger.warning('Process is already running.')
             return
 
+        if not self.exe_path:
+            raise ValueError('Executable path is not set.')
         if self.exe_args:
             logger.info('Starting process "%s" with args "%s"...', self.exe_path, self.exe_args)
             cmd = f'"{self.exe_path}" {self.exe_args}'
@@ -49,6 +51,9 @@ class CustomInstance(Instance):
         if self.process is not None:
             return True
         else:
+            if not self.exe_path:
+                logger.warning('Executable path is not set, cannot check if process is running.')
+                return False
             process_name = os.path.basename(self.exe_path)
             p = next((proc for proc in process_iter() if proc.name() == process_name), None)
             if p:
@@ -68,7 +73,7 @@ def _type_check(ins: Instance) -> CustomInstance:
         raise ValueError(f'Instance {ins} is not a CustomInstance')
     return ins
 
-def create(exe_path: str, adb_ip: str, adb_port: int, adb_name: str, emulator_args: str = "") -> CustomInstance:
+def create(exe_path: str | None, adb_ip: str, adb_port: int, adb_name: str | None, emulator_args: str = "") -> CustomInstance:
     return CustomInstance(exe_path, emulator_args=emulator_args, id='custom', name='Custom', adb_ip=adb_ip, adb_port=adb_port, adb_name=adb_name)
 
 

kotonebot/config/base_config.py

@@ -20,7 +20,7 @@ class BackendConfig(ConfigBaseModel):
     """adb 连接的 ip 地址。"""
     adb_port: int = 5555
     """adb 连接的端口。"""
-    adb_emulator_name: str = 'emulator-5554'
+    adb_emulator_name: str | None = None
     """
     adb 连接的模拟器名，用于 自动启动模拟器 功能。
     

kotonebot/kaa/main/gr.py

@@ -443,33 +443,34 @@ class KotoneBotUI:
             nonlocal current_tab
             current_tab = selected_index
 
-            if selected_index == 3:  # DMM
-                choices = ['windows', 'remote_windows']
-            else:  # Mumu, Leidian, Custom
-                choices = ['adb', 'adb_raw', 'uiautomator2']
-
-            if not impl_value in choices:
+            # if selected_index == 3:  # DMM
+            #     choices = ['windows', 'remote_windows']
+            # else:  # Mumu, Leidian, Custom
+            #     choices = ['adb', 'adb_raw', 'uiautomator2']
+            choices = ['adb', 'adb_raw', 'uiautomator2', 'windows', 'remote_windows']
+            if impl_value not in choices:
                 new_value = choices[0]
             else:
                 new_value = impl_value
 
             return gr.Dropdown(choices=choices, value=new_value)
 
-        with gr.Tabs(selected=self.current_config.backend.type) as emulator_tabs:
+        with gr.Tabs(selected=self.current_config.backend.type):
             with gr.Tab("MuMu 12", interactive=has_mumu12, id="mumu12") as tab_mumu12:
                 gr.Markdown("已选中 MuMu 12 模拟器")
                 if has_mumu12:
                     try:
                         instances = Mumu12Host.list()
+                        is_mumu12 = self.current_config.backend.type == 'mumu12'
                         mumu_instance = gr.Dropdown(
                             label="选择多开实例",
-                            value=self.current_config.backend.instance_id,
+                            value=self.current_config.backend.instance_id if is_mumu12 else None,
                             choices=[(i.name, i.id) for i in instances],
                             interactive=True
                         )
                     except:  # noqa: E722
                         logger.exception('Failed to list installed MuMu12')
-                        gr.Markdown('获取 MuMu12 模拟器列表失败，请前往 QQ 群、QQ 频道或 Github 反馈 bug。')
+                        gr.Markdown('获取 MuMu12 模拟器列表失败，请升级模拟器到最新版本。若问题依旧，前往 QQ 群、QQ 频道或 Github 反馈 bug。')
                         mumu_instance = gr.Dropdown(visible=False)
                 else:
                     # 为了让 return 收集组件时不报错
@@ -480,9 +481,10 @@ class KotoneBotUI:
                 if has_leidian:
                     try:
                         instances = LeidianHost.list()
+                        is_leidian = self.current_config.backend.type == 'leidian'
                         leidian_instance = gr.Dropdown(
                             label="选择多开实例",
-                            value=self.current_config.backend.instance_id,
+                            value=self.current_config.backend.instance_id if is_leidian else None,
                             choices=[(i.name, i.id) for i in instances],
                             interactive=True
                         )
@@ -544,13 +546,14 @@ class KotoneBotUI:
             with gr.Tab("DMM", id="dmm") as tab_dmm:
                 gr.Markdown("已选中 DMM")
 
-        type_in_config = self.current_config.backend.type
-        if type_in_config in ['dmm']:
-            choices = ['windows', 'remote_windows']
-        elif type_in_config in ['mumu12', 'leidian', 'custom']:
-            choices = ['adb', 'adb_raw', 'uiautomator2']
-        else:
-            raise ValueError(f'Unsupported backend type: {type_in_config}')
+        # type_in_config = self.current_config.backend.type
+        # if type_in_config in ['dmm']:
+        #     choices = ['windows', 'remote_windows']
+        # elif type_in_config in ['mumu12', 'leidian', 'custom']:
+        #     choices = ['adb', 'adb_raw', 'uiautomator2']
+        # else:
+        #     raise ValueError(f'Unsupported backend type: {type_in_config}')
+        choices = ['adb', 'adb_raw', 'uiautomator2', 'windows', 'remote_windows']
         screenshot_impl = gr.Dropdown(
             choices=choices,
             value=self.current_config.backend.screenshot_impl,
@@ -571,6 +574,30 @@ class KotoneBotUI:
         tab_custom.select(fn=partial(_update_emulator_tab_options, selected_index=2), inputs=[screenshot_impl], outputs=[screenshot_impl])
         tab_dmm.select(fn=partial(_update_emulator_tab_options, selected_index=3), inputs=[screenshot_impl], outputs=[screenshot_impl])
 
+        # 初值
+        if self.current_config.backend.type == 'mumu12':
+            _update_emulator_tab_options(
+                impl_value=self.current_config.backend.screenshot_impl,
+                selected_index=0
+            )
+        elif self.current_config.backend.type == 'leidian':
+            _update_emulator_tab_options(
+                impl_value=self.current_config.backend.screenshot_impl,
+                selected_index=1
+            )
+        elif self.current_config.backend.type == 'custom':
+            _update_emulator_tab_options(
+                impl_value=self.current_config.backend.screenshot_impl,
+                selected_index=2
+            )
+        elif self.current_config.backend.type == 'dmm':
+            _update_emulator_tab_options(
+                impl_value=self.current_config.backend.screenshot_impl,
+                selected_index=3
+            )
+        else:
+            gr.Warning(f"未知的模拟器类型：{self.current_config.backend.type}")
+
         def set_config(_: BaseConfig, data: dict[ConfigKey, Any]) -> None:
             # current_tab is updated by _update_emulator_tab_options
             if current_tab == 0:  # Mumu

kotonebot/kaa/main/kaa.py

@@ -95,7 +95,7 @@ class Kaa(KotoneBot):
                 zipf.writestr('logs.txt', logs)
             return path
         except Exception as e:
-            logger.exception(f'Failed to save error report:')
+            logger.exception('Failed to save error report:')
             return ''
 
     @override
@@ -114,12 +114,6 @@ class Kaa(KotoneBot):
         logger.info('Checking backend...')
         if config.backend.type == 'custom':
             exe = config.backend.emulator_path
-            if exe is None:
-                user.error('「检查并启动模拟器」已开启但未配置「模拟器 exe 文件路径」。')
-                raise ValueError('Emulator executable path is not set.')
-            if not os.path.exists(exe):
-                user.error('「模拟器 exe 文件路径」对应的文件不存在！请检查路径是否正确。')
-                raise FileNotFoundError(f'Emulator executable not found: {exe}')
             self.backend_instance = create_custom(
                 adb_ip=config.backend.adb_ip,
                 adb_port=config.backend.adb_port,
@@ -128,6 +122,12 @@ class Kaa(KotoneBot):
                 emulator_args=config.backend.emulator_args
             )
             if config.backend.check_emulator:
+                if exe is None:
+                    user.error('「检查并启动模拟器」已开启但未配置「模拟器 exe 文件路径」。')
+                    raise ValueError('Emulator executable path is not set.')
+                if not os.path.exists(exe):
+                    user.error('「模拟器 exe 文件路径」对应的文件不存在！请检查路径是否正确。')
+                    raise FileNotFoundError(f'Emulator executable not found: {exe}')
                 if not self.backend_instance.running():
                     logger.info('Starting custom backend...')
                     self.backend_instance.start()

kotonebot/kaa/metadata.py

@@ -1,6 +1,25 @@
 WHATS_NEW = """
 # 更新日志
 ## kaa
+### v2025.5.23.3
+脚本：
+* [修复] 尝试修复行动页有时进入行动失效的问题（#5901771）
+
+界面：
+* [修复] 修复 UI 中模拟器 Tab 初值不正确的问题（#5f5d99c）
+
+其他：
+* [其他] 更新上游 submodule（#cd6e128）
+
+### v2025.5.23.2
+脚本：
+* [修复] 将配置项 adb_emulator_name 默认值置为 None（#f3ef360）
+* [修复] 修复即使未勾选启动模拟器也会尝试启动的问题（#0641863）
+
+界面：
+* [修复] 修复截图方法 Dropdown 选项问题（#08a6b6f）
+* [新增] 修改 MuMu 模拟器检测失败提示（#3358eb6）
+
 ### v2025.5.23.1
 界面：
 * [新增] 当检测模拟器扫描失败时避免整个程序崩溃（#3d47d3a）