kotonebot 0.5.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

kotonebot/client/implements/__init__.py

@@ -1,71 +1,66 @@
-from typing import TYPE_CHECKING
-from kotonebot.util import is_windows, require_windows
-
-if TYPE_CHECKING:
-    from .adb import AdbImpl, AdbImplConfig
-    from .adb_raw import AdbRawImpl
-    from .uiautomator2 import UiAutomator2Impl
-    from .windows import WindowsImpl, WindowsImplConfig
-    from .remote_windows import RemoteWindowsImpl, RemoteWindowsImplConfig, RemoteWindowsServer
-    from .nemu_ipc import NemuIpcImpl, NemuIpcImplConfig, ExternalRendererIpc
-
-
-def _require_windows():
-    global WindowsImpl, WindowsImplConfig
-    global RemoteWindowsImpl, RemoteWindowsImplConfig, RemoteWindowsServer
-    global NemuIpcImpl, NemuIpcImplConfig, ExternalRendererIpc
-    
-    if not is_windows():
-        require_windows('"windows", "remote_windows" and "nemu_ipc" implementations')
-    from .windows import WindowsImpl, WindowsImplConfig
-    from .remote_windows import RemoteWindowsImpl, RemoteWindowsImplConfig, RemoteWindowsServer
-    from .nemu_ipc import NemuIpcImpl, NemuIpcImplConfig, ExternalRendererIpc
-
-def _require_adb():
-    global AdbImpl, AdbImplConfig
-    global AdbRawImpl
-    
-    from .adb import AdbImpl, AdbImplConfig
-    from .adb_raw import AdbRawImpl
-
-def _require_uiautomator2():
-    global UiAutomator2Impl
-    
-    from .uiautomator2 import UiAutomator2Impl
-
-_IMPORT_NAMES = [
-    (_require_windows, [
-        'WindowsImpl', 'WindowsImplConfig',
-        'RemoteWindowsImpl', 'RemoteWindowsImplConfig', 'RemoteWindowsServer',
-        'NemuIpcImpl', 'NemuIpcImplConfig', 'ExternalRendererIpc'
-    ]),
-    (_require_adb, [
-        'AdbImpl', 'AdbImplConfig',
-        'AdbRawImpl'
-    ]),
-    (_require_uiautomator2, [
-        'UiAutomator2Impl'
-    ]),
-]
-
-
-def __getattr__(name: str):
-    for item in _IMPORT_NAMES:
-        if name in item[1]:
-            item[0]()
-            break
-    try:
-        return globals()[name]
-    except KeyError:
-        raise AttributeError(name=name)
-
-__all__ = [
-    # windows
-    'WindowsImpl', 'WindowsImplConfig',
-    'RemoteWindowsImpl', 'RemoteWindowsImplConfig', 'RemoteWindowsServer',
-    'NemuIpcImpl', 'NemuIpcImplConfig', 'ExternalRendererIpc',
-    # android
-    'AdbImpl', 'AdbImplConfig',
-    'AdbRawImpl',
-    'UiAutomator2Impl'
+from typing import TYPE_CHECKING
+from kotonebot.util import is_windows, require_windows
+
+if TYPE_CHECKING:
+    from .adb import AdbImpl, AdbImplConfig
+    from .uiautomator2 import UiAutomator2Impl
+    from .windows import WindowsImpl, WindowsImplConfig
+    from .remote_windows import RemoteWindowsImpl, RemoteWindowsImplConfig, RemoteWindowsServer
+    from .nemu_ipc import NemuIpcImpl, NemuIpcImplConfig, ExternalRendererIpc
+
+
+def _require_windows():
+    global WindowsImpl, WindowsImplConfig
+    global RemoteWindowsImpl, RemoteWindowsImplConfig, RemoteWindowsServer
+    global NemuIpcImpl, NemuIpcImplConfig, ExternalRendererIpc
+    
+    if not is_windows():
+        require_windows('"windows", "remote_windows" and "nemu_ipc" implementations')
+    from .windows import WindowsImpl, WindowsImplConfig
+    from .remote_windows import RemoteWindowsImpl, RemoteWindowsImplConfig, RemoteWindowsServer
+    from .nemu_ipc import NemuIpcImpl, NemuIpcImplConfig, ExternalRendererIpc
+
+def _require_adb():
+    global AdbImpl, AdbImplConfig
+    
+    from .adb import AdbImpl, AdbImplConfig
+
+def _require_uiautomator2():
+    global UiAutomator2Impl
+    
+    from .uiautomator2 import UiAutomator2Impl
+
+_IMPORT_NAMES = [
+    (_require_windows, [
+        'WindowsImpl', 'WindowsImplConfig',
+        'RemoteWindowsImpl', 'RemoteWindowsImplConfig', 'RemoteWindowsServer',
+        'NemuIpcImpl', 'NemuIpcImplConfig', 'ExternalRendererIpc'
+    ]),
+    (_require_adb, [
+        'AdbImpl', 'AdbImplConfig',
+    ]),
+    (_require_uiautomator2, [
+        'UiAutomator2Impl'
+    ]),
+]
+
+
+def __getattr__(name: str):
+    for item in _IMPORT_NAMES:
+        if name in item[1]:
+            item[0]()
+            break
+    try:
+        return globals()[name]
+    except KeyError:
+        raise AttributeError(name=name)
+
+__all__ = [
+    # windows
+    'WindowsImpl', 'WindowsImplConfig',
+    'RemoteWindowsImpl', 'RemoteWindowsImplConfig', 'RemoteWindowsServer',
+    'NemuIpcImpl', 'NemuIpcImplConfig', 'ExternalRendererIpc',
+    # android
+    'AdbImpl', 'AdbImplConfig',
+    'UiAutomator2Impl'
 ]

kotonebot/client/implements/adb.py

@@ -1,89 +1,89 @@
-import logging
-from typing import cast
-from typing_extensions import override
-
-import cv2
-import numpy as np
-from cv2.typing import MatLike
-try:
-    from adbutils._device import AdbDevice as AdbUtilsDevice
-except ImportError as _e:
-    from kotonebot.errors import MissingDependencyError
-    raise MissingDependencyError(_e, 'android')
-
-from ..device import AndroidDevice
-from ..protocol import AndroidCommandable, Touchable, Screenshotable
-from ..registration import ImplConfig
-from dataclasses import dataclass
-
-logger = logging.getLogger(__name__)
-
-# 定义配置模型
-@dataclass
-class AdbImplConfig(ImplConfig):
-    addr: str
-    connect: bool = True
-    disconnect: bool = True
-    device_serial: str | None = None
-    timeout: float = 180
-
-class AdbImpl(AndroidCommandable, Touchable, Screenshotable):
-    def __init__(self, adb_connection: AdbUtilsDevice):
-        self.adb = adb_connection
-
-    @override
-    def launch_app(self, package_name: str) -> None:
-        self.adb.shell(f"monkey -p {package_name} 1")
-
-    @override
-    def current_package(self) -> str | None:
-        # https://blog.csdn.net/guangdeshishe/article/details/117154406
-        result_text = self.adb.shell('dumpsys activity top | grep ACTIVITY | tail -n 1')
-        logger.debug(f"adb returned: {result_text}")
-        if not isinstance(result_text, str):
-            logger.error(f"Invalid result_text: {result_text}")
-            return None
-        result_text = result_text.strip()
-        if result_text == '':
-            logger.error("No current package found")
-            return None
-        _, activity, *_ = result_text.split(' ')
-        package = activity.split('/')[0]
-        return package
-
-    def adb_shell(self, cmd: str) -> str:
-        """执行 ADB shell 命令"""
-        return cast(str, self.adb.shell(cmd))
-
-    @override
-    def detect_orientation(self):
-        # 判断方向：https://stackoverflow.com/questions/10040624/check-if-device-is-landscape-via-adb
-        # 但是上面这种方法不准确
-        # 因此这里直接通过截图判断方向
-        img = self.screenshot()
-        if img.shape[0] > img.shape[1]:
-            return 'portrait'
-        return 'landscape'
-    
-    @property
-    def screen_size(self) -> tuple[int, int]:
-        ret = cast(str, self.adb.shell("wm size")).strip('Physical size: ')
-        spiltted = tuple(map(int, ret.split("x")))
-        # 检测当前方向
-        orientation = self.detect_orientation()
-        landscape = orientation == 'landscape'
-        spiltted = tuple(sorted(spiltted, reverse=landscape))
-        if len(spiltted) != 2:
-            raise ValueError(f"Invalid screen size: {ret}")
-        return spiltted
-
-    def screenshot(self) -> MatLike:
-        return cv2.cvtColor(np.array(self.adb.screenshot()), cv2.COLOR_RGB2BGR)
-
-    def click(self, x: int, y: int) -> None:
-        self.adb.shell(f"input tap {x} {y}")
-
-    def swipe(self, x1: int, y1: int, x2: int, y2: int, duration: float | None = None) -> None:
-        if duration is not None:
-            logger.warning("Swipe duration is not supported with AdbDevice. Ignoring duration.")
-        self.adb.shell(f"input touchscreen swipe {x1} {y1} {x2} {y2}")
+import logging
+from typing import cast
+from typing_extensions import override
+
+import cv2
+import numpy as np
+from cv2.typing import MatLike
+try:
+    from adbutils._device import AdbDevice as AdbUtilsDevice
+except ImportError as _e:
+    from kotonebot.errors import MissingDependencyError
+    raise MissingDependencyError(_e, 'android')
+
+from ..device import AndroidDevice
+from ..protocol import AndroidCommandable, Touchable, Screenshotable
+from ..registration import ImplConfig
+from dataclasses import dataclass
+
+logger = logging.getLogger(__name__)
+
+# 定义配置模型
+@dataclass
+class AdbImplConfig(ImplConfig):
+    addr: str
+    connect: bool = True
+    disconnect: bool = True
+    device_serial: str | None = None
+    timeout: float = 180
+
+class AdbImpl(AndroidCommandable, Touchable, Screenshotable):
+    def __init__(self, adb_connection: AdbUtilsDevice):
+        self.adb = adb_connection
+
+    @override
+    def launch_app(self, package_name: str) -> None:
+        self.adb.shell(f"monkey -p {package_name} 1")
+
+    @override
+    def current_package(self) -> str | None:
+        # https://blog.csdn.net/guangdeshishe/article/details/117154406
+        result_text = self.adb.shell('dumpsys activity top | grep ACTIVITY | tail -n 1')
+        logger.debug(f"adb returned: {result_text}")
+        if not isinstance(result_text, str):
+            logger.error(f"Invalid result_text: {result_text}")
+            return None
+        result_text = result_text.strip()
+        if result_text == '':
+            logger.error("No current package found")
+            return None
+        _, activity, *_ = result_text.split(' ')
+        package = activity.split('/')[0]
+        return package
+
+    def adb_shell(self, cmd: str) -> str:
+        """执行 ADB shell 命令"""
+        return cast(str, self.adb.shell(cmd))
+
+    @override
+    def detect_orientation(self):
+        # 判断方向：https://stackoverflow.com/questions/10040624/check-if-device-is-landscape-via-adb
+        # 但是上面这种方法不准确
+        # 因此这里直接通过截图判断方向
+        img = self.screenshot()
+        if img.shape[0] > img.shape[1]:
+            return 'portrait'
+        return 'landscape'
+    
+    @property
+    def screen_size(self) -> tuple[int, int]:
+        ret = cast(str, self.adb.shell("wm size")).strip('Physical size: ')
+        spiltted = tuple(map(int, ret.split("x")))
+        # 检测当前方向
+        orientation = self.detect_orientation()
+        landscape = orientation == 'landscape'
+        spiltted = tuple(sorted(spiltted, reverse=landscape))
+        if len(spiltted) != 2:
+            raise ValueError(f"Invalid screen size: {ret}")
+        return spiltted
+
+    def screenshot(self) -> MatLike:
+        return cv2.cvtColor(np.array(self.adb.screenshot()), cv2.COLOR_RGB2BGR)
+
+    def click(self, x: int, y: int) -> None:
+        self.adb.shell(f"input tap {x} {y}")
+
+    def swipe(self, x1: int, y1: int, x2: int, y2: int, duration: float | None = None) -> None:
+        if duration is not None:
+            logger.warning("Swipe duration is not supported with AdbDevice. Ignoring duration.")
+        self.adb.shell(f"input touchscreen swipe {x1} {y1} {x2} {y2}")

kotonebot/client/implements/nemu_ipc/__init__.py

@@ -1,12 +1,12 @@
-# ruff: noqa: E402
-from kotonebot.util import require_windows
-require_windows('"RemoteWindowsImpl" implementation')
-
-from .external_renderer_ipc import ExternalRendererIpc
-from .nemu_ipc import NemuIpcImpl, NemuIpcImplConfig
-
-__all__ = [
-    "ExternalRendererIpc",
-    "NemuIpcImpl",
-    "NemuIpcImplConfig",
+# ruff: noqa: E402
+from kotonebot.util import require_windows
+require_windows('"RemoteWindowsImpl" implementation')
+
+from .external_renderer_ipc import ExternalRendererIpc
+from .nemu_ipc import NemuIpcImpl, NemuIpcImplConfig
+
+__all__ = [
+    "ExternalRendererIpc",
+    "NemuIpcImpl",
+    "NemuIpcImplConfig",
 ]