PyPI - MaaFw - Versions diffs - 2.1.0__py3-none-manylinux2014_x86_64.whl → 5.4.0b1__py3-none-manylinux2014_x86_64.whl - Mend

MaaFw 2.1.0__py3-none-manylinux2014_x86_64.whl → 5.4.0b1__py3-none-manylinux2014_x86_64.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (41) hide show

maa/__init__.py +7 -5
maa/agent/__init__.py +12 -0
maa/agent/agent_server.py +350 -0
maa/agent_client.py +291 -0
maa/bin/libMaaAdbControlUnit.so +0 -0
maa/bin/libMaaAgentClient.so +0 -0
maa/bin/libMaaAgentServer.so +0 -0
maa/bin/libMaaCustomControlUnit.so +0 -0
maa/bin/libMaaFramework.so +0 -0
maa/bin/libMaaToolkit.so +0 -0
maa/bin/libMaaUtils.so +0 -0
maa/bin/libc++.so.1 +0 -0
maa/bin/libc++abi.so.1 +0 -0
maa/bin/libfastdeploy_ppocr.so +0 -0
maa/bin/{libopencv_world4.so.408 → libonnxruntime.so.1} +0 -0
maa/bin/{libonnxruntime.so.1.18.0 → libopencv_world4.so.411} +0 -0
maa/bin/libunwind.so.1 +0 -0
maa/bin/plugins/libMaaPluginDemo.so +0 -0
maa/buffer.py +297 -153
maa/context.py +449 -34
maa/controller.py +760 -113
maa/custom_action.py +46 -3
maa/custom_recognition.py +69 -11
maa/define.py +539 -42
maa/event_sink.py +103 -0
maa/job.py +95 -36
maa/library.py +182 -53
maa/pipeline.py +509 -0
maa/resource.py +598 -71
maa/tasker.py +696 -156
maa/toolkit.py +125 -165
maafw-5.4.0b1.dist-info/METADATA +297 -0
maafw-5.4.0b1.dist-info/RECORD +35 -0
maafw-5.4.0b1.dist-info/WHEEL +4 -0
MaaFw-2.1.0.dist-info/METADATA +0 -166
MaaFw-2.1.0.dist-info/RECORD +0 -26
MaaFw-2.1.0.dist-info/WHEEL +0 -4
MaaFw-2.1.0.dist-info/top_level.txt +0 -1
maa/bin/libMaaDbgControlUnit.so +0 -0
maa/notification_handler.py +0 -191
{MaaFw-2.1.0.dist-info → maafw-5.4.0b1.dist-info/licenses}/LICENSE.md +0 -0

maa/toolkit.py CHANGED Viewed

@@ -3,15 +3,27 @@ import json
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Dict, List, Union, Optional, Any
-from collections import defaultdict
 from .define import *
 from .library import Library
-from .notification_handler import NotificationHandler
 @dataclass
 class AdbDevice:
+    """ADB 设备信息 / ADB device information
+    通过 Toolkit.find_adb_devices 获取。
+    Obtained via Toolkit.find_adb_devices.
+    Attributes:
+        name: 设备名称 / Device name
+        adb_path: adb 可执行文件路径 / Path to adb executable
+        address: 设备地址 (如 127.0.0.1:5555) / Device address (e.g., 127.0.0.1:5555)
+        screencap_methods: 可用的截图方式位掩码 / Available screenshot methods bitmask
+        input_methods: 可用的输入方式位掩码 / Available input methods bitmask
+        config: 额外配置信息 / Extra configuration
+    """
     name: str
     adb_path: Path
     address: str
@@ -22,21 +34,46 @@ class AdbDevice:
 @dataclass
 class DesktopWindow:
+    """桌面窗口信息 / Desktop window information
+    通过 Toolkit.find_desktop_windows 获取。
+    Obtained via Toolkit.find_desktop_windows.
+    Attributes:
+        hwnd: 窗口句柄 / Window handle
+        class_name: 窗口类名 / Window class name
+        window_name: 窗口标题 / Window title
+    """
     hwnd: ctypes.c_void_p
     class_name: str
     window_name: str
 class Toolkit:
+    """工具包 / Toolkit
+    提供设备发现、配置初始化等辅助功能。
+    Provides auxiliary functions such as device discovery and configuration initialization.
+    """
     ### public ###
     @staticmethod
     def init_option(user_path: Union[str, Path], default_config: Dict = {}) -> bool:
+        """从 user_path 中加载全局配置 / Load global config from user_path
+        Args:
+            user_path: 配置存储路径 / Config storage path
+            default_config: 默认配置 / Default config
+        Returns:
+            bool: 是否成功 / Whether successful
+        """
         Toolkit._set_api_properties()
         return bool(
-            Library.toolkit.MaaToolkitConfigInitOption(
+            Library.toolkit().MaaToolkitConfigInitOption(
                 str(user_path).encode(),
                 json.dumps(default_config, ensure_ascii=False).encode(),
             )
@@ -46,38 +83,46 @@ class Toolkit:
     def find_adb_devices(
         specified_adb: Optional[Union[str, Path]] = None
     ) -> List[AdbDevice]:
+        """搜索所有已知安卓模拟器 / Search all known Android emulators
+        Args:
+            specified_adb: 可选，指定 adb 路径进行搜索 / Optional, search using specified adb path
+        Returns:
+            List[AdbDevice]: 设备列表 / Device list
+        """
         Toolkit._set_api_properties()
-        list_handle = Library.toolkit.MaaToolkitAdbDeviceListCreate()
+        list_handle = Library.toolkit().MaaToolkitAdbDeviceListCreate()
         if specified_adb:
-            Library.toolkit.MaaToolkitAdbDeviceFindSpecified(
+            Library.toolkit().MaaToolkitAdbDeviceFindSpecified(
                 str(specified_adb).encode(), list_handle
             )
         else:
-            Library.toolkit.MaaToolkitAdbDeviceFind(list_handle)
+            Library.toolkit().MaaToolkitAdbDeviceFind(list_handle)
-        count = Library.toolkit.MaaToolkitAdbDeviceListSize(list_handle)
+        count = Library.toolkit().MaaToolkitAdbDeviceListSize(list_handle)
         devices = []
         for i in range(count):
-            device_handle = Library.toolkit.MaaToolkitAdbDeviceListAt(list_handle, i)
+            device_handle = Library.toolkit().MaaToolkitAdbDeviceListAt(list_handle, i)
-            name = Library.toolkit.MaaToolkitAdbDeviceGetName(device_handle).decode()
+            name = Library.toolkit().MaaToolkitAdbDeviceGetName(device_handle).decode()
             adb_path = Path(
-                Library.toolkit.MaaToolkitAdbDeviceGetAdbPath(device_handle).decode()
+                Library.toolkit().MaaToolkitAdbDeviceGetAdbPath(device_handle).decode()
+            )
+            address = (
+                Library.toolkit().MaaToolkitAdbDeviceGetAddress(device_handle).decode()
             )
-            address = Library.toolkit.MaaToolkitAdbDeviceGetAddress(
-                device_handle
-            ).decode()
             screencap_methods = int(
-                Library.toolkit.MaaToolkitAdbDeviceGetScreencapMethods(device_handle)
+                Library.toolkit().MaaToolkitAdbDeviceGetScreencapMethods(device_handle)
             )
             input_methods = int(
-                Library.toolkit.MaaToolkitAdbDeviceGetInputMethods(device_handle)
+                Library.toolkit().MaaToolkitAdbDeviceGetInputMethods(device_handle)
             )
             config = json.loads(
-                Library.toolkit.MaaToolkitAdbDeviceGetConfig(device_handle).decode()
+                Library.toolkit().MaaToolkitAdbDeviceGetConfig(device_handle).decode()
             )
             devices.append(
@@ -86,102 +131,50 @@ class Toolkit:
                 )
             )
-        Library.toolkit.MaaToolkitAdbDeviceListDestroy(list_handle)
+        Library.toolkit().MaaToolkitAdbDeviceListDestroy(list_handle)
         return devices
     @staticmethod
     def find_desktop_windows() -> List[DesktopWindow]:
+        """查询所有窗口信息 / Query all window info
+        Returns:
+            List[DesktopWindow]: 窗口列表 / Window list
+        """
         Toolkit._set_api_properties()
-        list_handle = Library.toolkit.MaaToolkitDesktopWindowListCreate()
+        list_handle = Library.toolkit().MaaToolkitDesktopWindowListCreate()
-        Library.toolkit.MaaToolkitDesktopWindowFindAll(list_handle)
+        Library.toolkit().MaaToolkitDesktopWindowFindAll(list_handle)
-        count = Library.toolkit.MaaToolkitDesktopWindowListSize(list_handle)
+        count = Library.toolkit().MaaToolkitDesktopWindowListSize(list_handle)
         windows = []
         for i in range(count):
-            window_handle = Library.toolkit.MaaToolkitDesktopWindowListAt(
+            window_handle = Library.toolkit().MaaToolkitDesktopWindowListAt(
                 list_handle, i
             )
-            hwnd = Library.toolkit.MaaToolkitDesktopWindowGetHandle(window_handle)
-            class_name = Library.toolkit.MaaToolkitDesktopWindowGetClassName(
-                window_handle
-            ).decode()
-            window_name = Library.toolkit.MaaToolkitDesktopWindowGetWindowName(
-                window_handle
-            ).decode()
+            hwnd = Library.toolkit().MaaToolkitDesktopWindowGetHandle(window_handle)
+            class_name = (
+                Library.toolkit()
+                .MaaToolkitDesktopWindowGetClassName(window_handle)
+                .decode()
+            )
+            window_name = (
+                Library.toolkit()
+                .MaaToolkitDesktopWindowGetWindowName(window_handle)
+                .decode()
+            )
             windows.append(DesktopWindow(hwnd, class_name, window_name))
-        Library.toolkit.MaaToolkitDesktopWindowListDestroy(list_handle)
+        Library.toolkit().MaaToolkitDesktopWindowListDestroy(list_handle)
         return windows
-    @staticmethod
-    def pi_register_custom_recognition(
-        name: str, recognition: "CustomRecognition", inst_id: int = 0  # type: ignore
-    ) -> bool:
-        Toolkit._set_api_properties()
-        # avoid gc
-        Toolkit._pi_custom_recognition_holder[inst_id][name] = recognition
-        return bool(
-            Library.toolkit.MaaToolkitProjectInterfaceRegisterCustomRecognition(
-                ctypes.c_uint64(inst_id),
-                name.encode(),
-                recognition.c_handle,
-                recognition.c_arg,
-            )
-        )
-    @staticmethod
-    def pi_register_custom_action(
-        name: str, action: "CustomAction", inst_id: int = 0  # type: ignore
-    ) -> bool:
-        Toolkit._set_api_properties()
-        # avoid gc
-        Toolkit._pi_custom_recognition_holder[inst_id][name] = action
-        return bool(
-            Library.toolkit.MaaToolkitProjectInterfaceRegisterCustomAction(
-                ctypes.c_uint64(inst_id),
-                name.encode(),
-                action.c_handle,
-                action.c_arg,
-            ),
-        )
-    @staticmethod
-    def pi_run_cli(
-        resource_path: Union[str, Path],
-        user_path: Union[str, Path],
-        directly: bool = False,
-        notification_handler: Optional[NotificationHandler] = None,
-        inst_id: int = 0,
-    ) -> bool:
-        Toolkit._set_api_properties()
-        Toolkit._pi_notification_handler = notification_handler
-        return bool(
-            Library.toolkit.MaaToolkitProjectInterfaceRunCli(
-                ctypes.c_uint64(inst_id),
-                str(resource_path).encode(),
-                str(user_path).encode(),
-                directly,
-                *NotificationHandler._gen_c_param(Toolkit._pi_notification_handler),
-            )
-        )
     ### private ###
     _api_properties_initialized: bool = False
-    _pi_custom_recognition_holder = defaultdict(dict)
-    _pi_custom_action_holder = defaultdict(dict)
-    _pi_notification_handler: Optional[NotificationHandler] = None
     @staticmethod
     def _set_api_properties():
@@ -189,148 +182,115 @@ class Toolkit:
             return
         Toolkit._api_properties_initialized = True
-        if not Library.initialized:
-            raise RuntimeError(
-                "Library not initialized, please call `library.open()` first."
-            )
-        Library.toolkit.MaaToolkitConfigInitOption.restype = MaaBool
-        Library.toolkit.MaaToolkitConfigInitOption.argtypes = [
+        Library.toolkit().MaaToolkitConfigInitOption.restype = MaaBool
+        Library.toolkit().MaaToolkitConfigInitOption.argtypes = [
             ctypes.c_char_p,
             ctypes.c_char_p,
         ]
-        Library.toolkit.MaaToolkitAdbDeviceListCreate.restype = (
+        Library.toolkit().MaaToolkitAdbDeviceListCreate.restype = (
             MaaToolkitAdbDeviceListHandle
         )
-        Library.toolkit.MaaToolkitAdbDeviceListCreate.argtypes = []
+        Library.toolkit().MaaToolkitAdbDeviceListCreate.argtypes = []
-        Library.toolkit.MaaToolkitAdbDeviceListDestroy.restype = None
-        Library.toolkit.MaaToolkitAdbDeviceListDestroy.argtypes = [
+        Library.toolkit().MaaToolkitAdbDeviceListDestroy.restype = None
+        Library.toolkit().MaaToolkitAdbDeviceListDestroy.argtypes = [
             MaaToolkitAdbDeviceListHandle
         ]
-        Library.toolkit.MaaToolkitAdbDeviceFind.restype = MaaBool
-        Library.toolkit.MaaToolkitAdbDeviceFind.argtypes = [
+        Library.toolkit().MaaToolkitAdbDeviceFind.restype = MaaBool
+        Library.toolkit().MaaToolkitAdbDeviceFind.argtypes = [
             MaaToolkitAdbDeviceListHandle
         ]
-        Library.toolkit.MaaToolkitAdbDeviceFindSpecified.restype = MaaBool
-        Library.toolkit.MaaToolkitAdbDeviceFindSpecified.argtypes = [
+        Library.toolkit().MaaToolkitAdbDeviceFindSpecified.restype = MaaBool
+        Library.toolkit().MaaToolkitAdbDeviceFindSpecified.argtypes = [
             ctypes.c_char_p,
             MaaToolkitAdbDeviceListHandle,
         ]
-        Library.toolkit.MaaToolkitAdbDeviceListSize.restype = MaaSize
-        Library.toolkit.MaaToolkitAdbDeviceListSize.argtypes = [
+        Library.toolkit().MaaToolkitAdbDeviceListSize.restype = MaaSize
+        Library.toolkit().MaaToolkitAdbDeviceListSize.argtypes = [
             MaaToolkitAdbDeviceListHandle
         ]
-        Library.toolkit.MaaToolkitAdbDeviceListAt.restype = MaaToolkitAdbDeviceHandle
-        Library.toolkit.MaaToolkitAdbDeviceListAt.argtypes = [
+        Library.toolkit().MaaToolkitAdbDeviceListAt.restype = MaaToolkitAdbDeviceHandle
+        Library.toolkit().MaaToolkitAdbDeviceListAt.argtypes = [
             MaaToolkitAdbDeviceListHandle,
             MaaSize,
         ]
-        Library.toolkit.MaaToolkitAdbDeviceGetName.restype = ctypes.c_char_p
-        Library.toolkit.MaaToolkitAdbDeviceGetName.argtypes = [
+        Library.toolkit().MaaToolkitAdbDeviceGetName.restype = ctypes.c_char_p
+        Library.toolkit().MaaToolkitAdbDeviceGetName.argtypes = [
             MaaToolkitAdbDeviceHandle
         ]
-        Library.toolkit.MaaToolkitAdbDeviceGetAdbPath.restype = ctypes.c_char_p
-        Library.toolkit.MaaToolkitAdbDeviceGetAdbPath.argtypes = [
+        Library.toolkit().MaaToolkitAdbDeviceGetAdbPath.restype = ctypes.c_char_p
+        Library.toolkit().MaaToolkitAdbDeviceGetAdbPath.argtypes = [
             MaaToolkitAdbDeviceHandle
         ]
-        Library.toolkit.MaaToolkitAdbDeviceGetAddress.restype = ctypes.c_char_p
-        Library.toolkit.MaaToolkitAdbDeviceGetAddress.argtypes = [
+        Library.toolkit().MaaToolkitAdbDeviceGetAddress.restype = ctypes.c_char_p
+        Library.toolkit().MaaToolkitAdbDeviceGetAddress.argtypes = [
             MaaToolkitAdbDeviceHandle
         ]
-        Library.toolkit.MaaToolkitAdbDeviceGetScreencapMethods.restype = (
+        Library.toolkit().MaaToolkitAdbDeviceGetScreencapMethods.restype = (
             MaaAdbScreencapMethod
         )
-        Library.toolkit.MaaToolkitAdbDeviceGetScreencapMethods.argtypes = [
+        Library.toolkit().MaaToolkitAdbDeviceGetScreencapMethods.argtypes = [
             MaaToolkitAdbDeviceHandle
         ]
-        Library.toolkit.MaaToolkitAdbDeviceGetInputMethods.restype = MaaAdbInputMethod
-        Library.toolkit.MaaToolkitAdbDeviceGetInputMethods.argtypes = [
+        Library.toolkit().MaaToolkitAdbDeviceGetInputMethods.restype = MaaAdbInputMethod
+        Library.toolkit().MaaToolkitAdbDeviceGetInputMethods.argtypes = [
             MaaToolkitAdbDeviceHandle
         ]
-        Library.toolkit.MaaToolkitAdbDeviceGetConfig.restype = ctypes.c_char_p
-        Library.toolkit.MaaToolkitAdbDeviceGetConfig.argtypes = [
+        Library.toolkit().MaaToolkitAdbDeviceGetConfig.restype = ctypes.c_char_p
+        Library.toolkit().MaaToolkitAdbDeviceGetConfig.argtypes = [
             MaaToolkitAdbDeviceHandle
         ]
-        Library.toolkit.MaaToolkitDesktopWindowListCreate.restype = (
+        Library.toolkit().MaaToolkitDesktopWindowListCreate.restype = (
             MaaToolkitDesktopWindowListHandle
         )
-        Library.toolkit.MaaToolkitDesktopWindowListCreate.argtypes = []
+        Library.toolkit().MaaToolkitDesktopWindowListCreate.argtypes = []
-        Library.toolkit.MaaToolkitDesktopWindowListDestroy.restype = None
-        Library.toolkit.MaaToolkitDesktopWindowListDestroy.argtypes = [
+        Library.toolkit().MaaToolkitDesktopWindowListDestroy.restype = None
+        Library.toolkit().MaaToolkitDesktopWindowListDestroy.argtypes = [
             MaaToolkitDesktopWindowListHandle
         ]
-        Library.toolkit.MaaToolkitDesktopWindowFindAll.restype = MaaBool
-        Library.toolkit.MaaToolkitDesktopWindowFindAll.argtypes = [
+        Library.toolkit().MaaToolkitDesktopWindowFindAll.restype = MaaBool
+        Library.toolkit().MaaToolkitDesktopWindowFindAll.argtypes = [
             MaaToolkitDesktopWindowListHandle
         ]
-        Library.toolkit.MaaToolkitDesktopWindowListSize.restype = MaaSize
-        Library.toolkit.MaaToolkitDesktopWindowListSize.argtypes = [
+        Library.toolkit().MaaToolkitDesktopWindowListSize.restype = MaaSize
+        Library.toolkit().MaaToolkitDesktopWindowListSize.argtypes = [
             MaaToolkitDesktopWindowListHandle
         ]
-        Library.toolkit.MaaToolkitDesktopWindowListAt.restype = (
+        Library.toolkit().MaaToolkitDesktopWindowListAt.restype = (
             MaaToolkitDesktopWindowHandle
         )
-        Library.toolkit.MaaToolkitDesktopWindowListAt.argtypes = [
+        Library.toolkit().MaaToolkitDesktopWindowListAt.argtypes = [
             MaaToolkitDesktopWindowListHandle,
             MaaSize,
         ]
-        Library.toolkit.MaaToolkitDesktopWindowGetHandle.restype = ctypes.c_void_p
-        Library.toolkit.MaaToolkitDesktopWindowGetHandle.argtypes = [
+        Library.toolkit().MaaToolkitDesktopWindowGetHandle.restype = ctypes.c_void_p
+        Library.toolkit().MaaToolkitDesktopWindowGetHandle.argtypes = [
             MaaToolkitDesktopWindowHandle
         ]
-        Library.toolkit.MaaToolkitDesktopWindowGetClassName.restype = ctypes.c_char_p
-        Library.toolkit.MaaToolkitDesktopWindowGetClassName.argtypes = [
+        Library.toolkit().MaaToolkitDesktopWindowGetClassName.restype = ctypes.c_char_p
+        Library.toolkit().MaaToolkitDesktopWindowGetClassName.argtypes = [
             MaaToolkitDesktopWindowHandle
         ]
-        Library.toolkit.MaaToolkitDesktopWindowGetWindowName.restype = ctypes.c_char_p
-        Library.toolkit.MaaToolkitDesktopWindowGetWindowName.argtypes = [
+        Library.toolkit().MaaToolkitDesktopWindowGetWindowName.restype = ctypes.c_char_p
+        Library.toolkit().MaaToolkitDesktopWindowGetWindowName.argtypes = [
             MaaToolkitDesktopWindowHandle
         ]
-        Library.toolkit.MaaToolkitProjectInterfaceRegisterCustomRecognition.restype = (
-            None
-        )
-        Library.toolkit.MaaToolkitProjectInterfaceRegisterCustomRecognition.argtypes = [
-            ctypes.c_uint64,
-            ctypes.c_char_p,
-            MaaCustomRecognitionCallback,
-            ctypes.c_void_p,
-        ]
-        Library.toolkit.MaaToolkitProjectInterfaceRegisterCustomAction.restype = None
-        Library.toolkit.MaaToolkitProjectInterfaceRegisterCustomAction.argtypes = [
-            ctypes.c_uint64,
-            ctypes.c_char_p,
-            MaaCustomActionCallback,
-            ctypes.c_void_p,
-        ]
-        Library.toolkit.MaaToolkitProjectInterfaceRunCli.restype = MaaBool
-        Library.toolkit.MaaToolkitProjectInterfaceRunCli.argtypes = [
-            ctypes.c_uint64,
-            ctypes.c_char_p,
-            ctypes.c_char_p,
-            MaaBool,
-            MaaNotificationCallback,
-            ctypes.c_void_p,
-        ]