MaaFw 2.2.2__py3-none-win_arm64.whl → 2.3.0a2__py3-none-win_arm64.whl

{MaaFw-2.2.2.dist-info → MaaFw-2.3.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MaaFw
-Version: 2.2.2
+Version: 2.3.0a2
 Summary: An automation black-box testing framework based on image recognition
 Author: MaaXYZ
 Project-URL: Homepage, https://github.com/MaaXYZ/MaaFramework
@@ -87,7 +87,7 @@ _✨ 基于图像识别的自动化黑盒测试框架 ✨_
 - [maa-whmx](https://github.com/MAWHA/maa-whmx) 物华弥新 小助手 ![cpp](https://img.shields.io/badge/C%2B%2B-00599C?logo=c%2B%2B&logoColor=white) ![qt](https://img.shields.io/badge/Qt6-41CD52?logo=Qt&logoColor=white)  
   基于全新架构的 物华弥新 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
 
-- [MAA-for-Millennium-Tour](https://github.com/Ostwind23/MAA-for-Millennium-Tour) 千年之旅 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=codecademy&logoColor=%23FFFFFF&color=%23454545) ![python](https://img.shields.io/badge/Python-3776AB?logo=python&logoColor=white)   
+- [MAA-for-Millennium-Tour](https://github.com/Ostwind23/MAA-for-Millennium-Tour) 千年之旅 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=codecademy&logoColor=%23FFFFFF&color=%23454545) ![python](https://img.shields.io/badge/Python-3776AB?logo=python&logoColor=white)  
   基于全新架构的 千年之旅 小助手。图像技术 + 模拟控制，解放侍主的大手！由 MaaFramework 强力驱动！
 
 - [MFAWPF](https://github.com/SweetSmellFox/MFAWPF) MFA 任务管理器 ![csharp](https://img.shields.io/badge/C%23-239120?logo=csharp&logoColor=white)  
@@ -104,7 +104,13 @@ _✨ 基于图像识别的自动化黑盒测试框架 ✨_
 
 - [MPA](https://github.com/overflow65537/MAA_Punish) 战双 小助手  ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)  
   基于全新架构的 战双帕弥什 小助手。图像技术 + 模拟控制，解放双手！由 玛丽的黑咖啡 2.0 强力驱动！
-   
+
+- [MaaYuan](https://github.com/syoius/MaaYuan) 代号鸢/如鸢 一键长草小助手  ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)  
+  基于全新架构的 代号鸢/如鸢 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
+
+- [MFW-ELE-GUI](https://github.com/Night-stars-1/maa-gui) MFW-ELE-GUI ![Typescript](https://img.shields.io/badge/Typescript-8A2BE2?logo=typescript)  ![Electron](https://img.shields.io/badge/Electron-3776AB?logo=electron&logoColor=black)  
+  基于全新架构的 MFW-ELE-GUI。由 MaaFramework 强力驱动！
+
 ## 生态共建
 
 MAA 正计划建设为一类项目，而非舟的单一软件。  
@@ -159,9 +165,7 @@ _请留意，仅当您准备开发 MaaFramework 本身时，才需要阅读本
 
 感谢以下开发者对 MaaFramework 作出的贡献：
 
-<a href="https://github.com/MaaXYZ/MaaFramework/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=MaaXYZ/MaaFramework&max=1000" />
-</a>
+[![Contributors](https://contrib.rocks/image?repo=MaaXYZ/MaaFramework&max=1000)](https://github.com/MaaXYZ/MaaFramework/graphs/contributors)
 
 ## 讨论
 
@@ -169,6 +173,7 @@ _请留意，仅当您准备开发 MaaFramework 本身时，才需要阅读本
 
 ## 赞助
 
+<!-- markdownlint-disable MD045 -->
 <a href="https://afdian.com/a/misteo">
   <img width="200" src="https://pic1.afdiancdn.com/static/img/welcome/button-sponsorme.png">
 </a>

MaaFw-2.3.0a2.dist-info/RECORD

@@ -0,0 +1,29 @@
+maa/__init__.py,sha256=rBIC5X_VsfFXOMJRdKjgDyO428XHgeWAT3t6ZYmqO1M,207
+maa/buffer.py,sha256=E0tuasXPm6A_4r22PGSwObgGXb2qCMJrT5yrAvcgk6I,17424
+maa/context.py,sha256=Y71T92tIAGq6x8bJfYX8emUPEmPUA7nhnWgqOHh390E,5722
+maa/controller.py,sha256=VOz4Und15toq6oehHR0BHC10LMhFVqKAcImQNXCqHxQ,22547
+maa/custom_action.py,sha256=pqPjDK7nVkGL8fceJadwb7IkeGjYc2X8RaXZOnVZXQs,2527
+maa/custom_recognition.py,sha256=Y3Asdgb19YZioOVZZVs_hLSW6uBg7WDZDQPR2XfZpFU,3087
+maa/define.py,sha256=uvqM04p6NLfju1Zz-EMR-8Af8MZGpEImMAt3QdcYvIA,13114
+maa/job.py,sha256=jXGQ4YV_G8sAi-B7OmUrbPCEIf4xZjWqCSr36LT6Qt0,1153
+maa/library.py,sha256=nDTBUFC6_91gmyy8SfkTTccMZET9XGU8IxvuVUEwQ6E,2099
+maa/notification_handler.py,sha256=KjQlu66fNVwGGli8kuhNdSZPj2vO_oXjaNt_B1i_5wA,5251
+maa/resource.py,sha256=74mQvWr4ZYkE2Y3g7ranbai5XEYhQdUAP7SW_U8GrgI,9512
+maa/tasker.py,sha256=NZQOdJ9BKHQp4sfc0pKbXtF_m8ddnMPYng0KsGK9mbg,14599
+maa/toolkit.py,sha256=TlF8MoaGcWLklpISIlQNvc_rpTFBFrpDbLgctfQ_zqo,11325
+maa/bin/DirectML.dll,sha256=d7Dbg_-QPyMj9cr1OEmdda9gOLvqI7eVn30jLZpKudQ,18444832
+maa/bin/MaaAdbControlUnit.dll,sha256=GgniamWtUSJW6LI150njSHZIXi9N4NUvWld6EXj97jI,892928
+maa/bin/MaaDbgControlUnit.dll,sha256=PjSX6bXpITwOhbhL_pBv-Zmaw7LheMizu2870vqca8s,450048
+maa/bin/MaaFramework.dll,sha256=1VWJqaDPCaQAvRRdvhwQyMofnmJBBPHKG_PK8fTDZRU,1760256
+maa/bin/MaaNode.node,sha256=DDLhKqt4EppSHFJML-dPBeJlQrVwL3aaRFUnchz_b9E,628736
+maa/bin/MaaToolkit.dll,sha256=uPpS0UBA8v8FR1zfrqpo0bk-mOCJzDbuBizXijZTe4Y,748032
+maa/bin/MaaUtils.dll,sha256=EIAIObc2rylXU3jtVIwhsCzzhf9v3yGqPumOG36Cohs,624128
+maa/bin/MaaWin32ControlUnit.dll,sha256=BsELfUnef9S0rmFoMbKxGULrI7Yr8Re-5mF1mfIff3k,409088
+maa/bin/fastdeploy_ppocr_maa.dll,sha256=lidtCQOzeYsOBcEJzcuhynypH1fkibZa-uBlcO0hx6g,1097728
+maa/bin/onnxruntime_maa.dll,sha256=76uDwY3lectM4kzFxzK8qKL9cOsUrV5QsuNgh8Q74jo,19155456
+maa/bin/opencv_world4_maa.dll,sha256=zmZOpjQHQ4y24pbPJvQjQcfMM5paGKzkYf1GB3TWTj0,15078400
+MaaFw-2.3.0a2.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+MaaFw-2.3.0a2.dist-info/METADATA,sha256=RRj8xi_rBmUBOJfbIuyomaUaM1IBxTLDjlzvoqOg6As,11041
+MaaFw-2.3.0a2.dist-info/WHEEL,sha256=PhpqtLE2cPvexGD-EPObNI73ls8xo2gX9HjYnFs2vUQ,95
+MaaFw-2.3.0a2.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
+MaaFw-2.3.0a2.dist-info/RECORD,,

MaaFw-2.3.0a2.dist-info/WHEEL

@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.6.0)
+Root-Is-Purelib: true
+Tag: py3-none-win_arm64

maa/define.py

@@ -110,15 +110,33 @@ class MaaCtrlOptionEnum:
     Recording = 5
 
 
-# enum MaaInferenceDeviceEnum
-# {
-#     MaaInferenceDevice_CPU = -2,
-#     MaaInferenceDevice_Auto = -1,
-#     MaaInferenceDevice_GPU0 = 0,
-#     MaaInferenceDevice_GPU1 = 1,
-#     // and more gpu id...
-# };
-MaaInferenceDevice = ctypes.c_int32
+class MaaInferenceDeviceEnum:
+    CPU = -2
+    Auto = -1
+    # and more gpu id or flag...
+
+
+class MaaInferenceExecutionProviderEnum:
+    # I don't recommend setting up MaaResOption_InferenceDevice in this case,
+    # because you don't know which EP will be used on different user devices.
+    Auto = 0
+
+    # MaaResOption_InferenceDevice will not work.
+    CPU = 1
+
+    # MaaResOption_InferenceDevice will be used to set adapter id,
+    # It's from Win32 API `EnumAdapters1`.
+    DirectML = 2
+
+    # MaaResOption_InferenceDevice will be used to set coreml_flag,
+    # Reference to
+    # https://github.com/microsoft/onnxruntime/blob/main/include/onnxruntime/core/providers/coreml/coreml_provider_factory.h
+    # But you need to pay attention to the onnxruntime version we use, the latest flag may not be supported.
+    CoreML = 3
+
+    # MaaResOption_InferenceDevice will be used to set NVIDIA GPU ID
+    # TODO!
+    CUDA = 4
 
 
 class MaaResOptionEnum:
@@ -131,6 +149,13 @@ class MaaResOptionEnum:
     # default value is MaaInferenceDevice_Auto
     InferenceDevice = 1
 
+    # Use the specified inference execution provider
+    # Please set this option before loading the model.
+    #
+    # value: MaaInferenceExecutionProvider, eg: 0; val_size: sizeof(MaaInferenceExecutionProvider)
+    # default value is MaaInferenceExecutionProvider_Auto
+    InferenceExecutionProvider = 2
+
 
 MaaAdbScreencapMethod = ctypes.c_uint64
 

maa/resource.py

@@ -60,18 +60,45 @@ class Resource:
     def clear(self) -> bool:
         return bool(Library.framework.MaaResourceClear(self._handle))
 
+    def use_cpu(self) -> bool:
+        return self.set_inference(
+            MaaInferenceExecutionProviderEnum.CPU, MaaInferenceDeviceEnum.CPU
+        )
+
+    def use_directml(self, device_id: int = MaaInferenceDeviceEnum.Auto) -> bool:
+        return self.set_inference(MaaInferenceExecutionProviderEnum.DirectML, device_id)
+
+    def use_coreml(self, coreml_flag: int = MaaInferenceDeviceEnum.Auto) -> bool:
+        return self.set_inference(MaaInferenceExecutionProviderEnum.CoreML, coreml_flag)
+
+    def use_auto_ep(self) -> bool:
+        return self.set_inference(
+            MaaInferenceExecutionProviderEnum.Auto, MaaInferenceDeviceEnum.Auto
+        )
+
+    # not implemented
+    # def use_cuda(self, nvidia_gpu_id: int) -> bool:
+    #     return self.set_inference(MaaInferenceExecutionProviderEnum.CUDA, nvidia_gpu_id)
+
     def set_gpu(self, gpu_id: int) -> bool:
+        """
+        Deprecated, please use `use_directml`, `use_coreml` or `use_cuda` instead.
+        """
         if gpu_id < 0:
             return False
-        return self.set_inference_device(gpu_id)
+        return self.use_directml(gpu_id)
 
     def set_cpu(self) -> bool:
-        MaaInferenceDevice_CPU = -2
-        return self.set_inference_device(MaaInferenceDevice_CPU)
-    
+        """
+        Deprecated, please use `use_cpu` instead.
+        """
+        return self.use_cpu()
+
     def set_auto_device(self) -> bool:
-        MaaInferenceDevice_Auto = -1
-        return self.set_inference_device(MaaInferenceDevice_Auto)
+        """
+        Deprecated, please use `use_auto_ep` instead.
+        """
+        return self.use_auto_ep()
 
     def register_custom_recognition(
         self, name: str, recognition: "CustomRecognition"  # type: ignore
@@ -149,13 +176,21 @@ class Resource:
 
     ### private ###
 
-    def set_inference_device(self, device_id: int) -> bool:
-        cint = ctypes.c_int32(device_id)
+    def set_inference(self, execution_provider: int, device_id: int) -> bool:
+        cep = ctypes.c_int32(execution_provider)
+        cdevice = ctypes.c_int32(device_id)
         return bool(
+            Library.framework.MaaResourceSetOption(
+                self._handle,
+                MaaResOptionEnum.InferenceExecutionProvider,
+                ctypes.pointer(cep),
+                ctypes.sizeof(ctypes.c_int32),
+            )
+        ) and bool(
             Library.framework.MaaResourceSetOption(
                 self._handle,
                 MaaResOptionEnum.InferenceDevice,
-                ctypes.pointer(cint),
+                ctypes.pointer(cdevice),
                 ctypes.sizeof(ctypes.c_int32),
             )
         )

maa/tasker.py

@@ -92,8 +92,8 @@ class Tasker:
         return bool(Library.framework.MaaTaskerRunning(self._handle))
 
     def post_stop(self) -> Job:
-        Library.framework.MaaTaskerPostStop(self._handle)
-        return Job(MaaId(0), self._stop_status, self._stop_wait)
+        taskid = Library.framework.MaaTaskerPostStop(self._handle)
+        return self._gen_task_job(taskid)
 
     def get_latest_node(self, name: str) -> Optional[NodeDetail]:
         c_node_id = MaaNodeId()
@@ -201,15 +201,6 @@ class Tasker:
     def _task_wait(self, id: int) -> ctypes.c_int32:
         return Library.framework.MaaTaskerWait(self._handle, id)
 
-    def _stop_status(self, id: int) -> MaaStatusEnum:
-        return MaaStatusEnum.succeeded if not self.running else MaaStatusEnum.running
-
-    def _stop_wait(self, id: int) -> MaaStatusEnum:
-        # TODO: 这个应该由 callback 来处理
-        while self.running:
-            time.sleep(0.1)
-        return MaaStatusEnum.succeeded
-
     def get_recognition_detail(self, reco_id: int) -> Optional[RecognitionDetail]:
         name = StringBuffer()
         algorithm = StringBuffer()
@@ -316,7 +307,9 @@ class Tasker:
             detail = self.get_node_detail(int(c_node_id_list[i]))
             nodes.append(detail)
 
-        return TaskDetail(task_id=task_id, entry=entry.get(), nodes=nodes, status=Status(status))
+        return TaskDetail(
+            task_id=task_id, entry=entry.get(), nodes=nodes, status=Status(status)
+        )
 
     _api_properties_initialized: bool = False
 
@@ -398,7 +391,7 @@ class Tasker:
         Library.framework.MaaTaskerRunning.restype = MaaBool
         Library.framework.MaaTaskerRunning.argtypes = [MaaTaskerHandle]
 
-        Library.framework.MaaTaskerPostStop.restype = MaaBool
+        Library.framework.MaaTaskerPostStop.restype = MaaTaskId
         Library.framework.MaaTaskerPostStop.argtypes = [MaaTaskerHandle]
 
         Library.framework.MaaTaskerGetResource.restype = MaaResourceHandle

MaaFw-2.2.2.dist-info/RECORD

@@ -1,28 +0,0 @@
-maa/__init__.py,sha256=rBIC5X_VsfFXOMJRdKjgDyO428XHgeWAT3t6ZYmqO1M,207
-maa/buffer.py,sha256=E0tuasXPm6A_4r22PGSwObgGXb2qCMJrT5yrAvcgk6I,17424
-maa/context.py,sha256=Y71T92tIAGq6x8bJfYX8emUPEmPUA7nhnWgqOHh390E,5722
-maa/controller.py,sha256=VOz4Und15toq6oehHR0BHC10LMhFVqKAcImQNXCqHxQ,22547
-maa/custom_action.py,sha256=pqPjDK7nVkGL8fceJadwb7IkeGjYc2X8RaXZOnVZXQs,2527
-maa/custom_recognition.py,sha256=Y3Asdgb19YZioOVZZVs_hLSW6uBg7WDZDQPR2XfZpFU,3087
-maa/define.py,sha256=klaIWvNS5DDgKo6EC330EqqWlKQ4JLCOHZ8d7Ifaoqo,12126
-maa/job.py,sha256=jXGQ4YV_G8sAi-B7OmUrbPCEIf4xZjWqCSr36LT6Qt0,1153
-maa/library.py,sha256=nDTBUFC6_91gmyy8SfkTTccMZET9XGU8IxvuVUEwQ6E,2099
-maa/notification_handler.py,sha256=KjQlu66fNVwGGli8kuhNdSZPj2vO_oXjaNt_B1i_5wA,5251
-maa/resource.py,sha256=bvS02sCCS9DRw_zJZeyCk8_DrZry6KBlUIvcfpKoUIg,8243
-maa/tasker.py,sha256=0hALFCHKHuOBQMSqyG4BYi1idJLy64UZMpqL4GQVZKs,14929
-maa/toolkit.py,sha256=TlF8MoaGcWLklpISIlQNvc_rpTFBFrpDbLgctfQ_zqo,11325
-maa/bin/DirectML.dll,sha256=kKkjnHnpdU1DaqjDsmzb0kvkcQapZyWbPOlVnUesdm0,18444832
-maa/bin/MaaAdbControlUnit.dll,sha256=Xj6dr5CXq1wCSOUCaSgbDX3xk94yDnZq8LalZ7jmSA4,873984
-maa/bin/MaaDbgControlUnit.dll,sha256=3UpE9bwiagC8WWE5H8rW_kTKLCAkilAY3FyzSWwX5Fc,444416
-maa/bin/MaaFramework.dll,sha256=UlJSWmoyFa2DZxMDxCBxgUUd5zdEFZitIOJAzYVMuNY,1631744
-maa/bin/MaaToolkit.dll,sha256=WB71L0UmpDAJzr-cr_wT-08iHhDm4VLTlew60l97DIM,737792
-maa/bin/MaaUtils.dll,sha256=NZhGA01sVLBK0YIGgnrm0racpMBW6RgQNEw-quBDCOI,615936
-maa/bin/MaaWin32ControlUnit.dll,sha256=c9jprCAEpgyVIvfpD3tvfdmCVy8GvdJ89W-Nrcutw2w,405504
-maa/bin/fastdeploy_ppocr_maa.dll,sha256=jvgWCaYUa3WuQrgv1hdwXDw1RzUDqoBgeHOrhQqREUY,554496
-maa/bin/onnxruntime_maa.dll,sha256=vPdKG3NKeQqiEiMlPT1ySp2Bc0xwtL8EBriPkTaQEbs,14471680
-maa/bin/opencv_world4_maa.dll,sha256=FudjT3gIzkZNBAMFd-YxtM3D8PgHPqXnHRvgH5iRImw,14958592
-MaaFw-2.2.2.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-MaaFw-2.2.2.dist-info/METADATA,sha256=-Jr7OovF3t1PTdM7qWd5yvWkG7pGBXz5xfJEQjW7K88,10390
-MaaFw-2.2.2.dist-info/WHEEL,sha256=56dCSEt9kxiG1BpXg6NxqPFNanuqDWBpqzKbo9FEums,95
-MaaFw-2.2.2.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
-MaaFw-2.2.2.dist-info/RECORD,,

MaaFw-2.2.2.dist-info/WHEEL

@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: true
-Tag: py3-none-win_arm64