MaaFw 2.2.2__py3-none-win_amd64.whl → 2.3.0a1__py3-none-win_amd64.whl

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MaaFw
-Version: 2.2.2
+Version: 2.3.0a1
 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 强力驱动！
+
+- [MAAGUI](https://github.com/Night-stars-1/maa-gui) MAAGUI ![Typescript](https://img.shields.io/badge/Typescript-8A2BE2?logo=typescript)  ![Electron](https://img.shields.io/badge/Electron-3776AB?logo=electron&logoColor=black)  
+  基于全新架构的 MAA 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.0a1.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=0hALFCHKHuOBQMSqyG4BYi1idJLy64UZMpqL4GQVZKs,14929
+maa/toolkit.py,sha256=TlF8MoaGcWLklpISIlQNvc_rpTFBFrpDbLgctfQ_zqo,11325
+maa/bin/DirectML.dll,sha256=nJ5tgiVhxsQbkOaZSz6IV88dZtv7HgxMeZx8ibTpLaE,18527776
+maa/bin/MaaAdbControlUnit.dll,sha256=WOci_v5mk-plwP2oWGbNObkWnsIl8WEcClYPtMuYwRA,776704
+maa/bin/MaaDbgControlUnit.dll,sha256=G2zoKp3IgvQBydIwR9tKYrwKR3qQBjLiqPeEv9z-CHY,424960
+maa/bin/MaaFramework.dll,sha256=oF3TaGN3KZKJljBYBfn0SkyADw1pVeKqpYUwPxpK6jg,1482240
+maa/bin/MaaNode.node,sha256=BiW1pU9Hnb-PiTzceF-RVG92FaxNNf25e9VXvl1EEZc,597504
+maa/bin/MaaToolkit.dll,sha256=2sD1xBaca82gDhTr2-5_scnFDy0OPNQvqWfQWqVvLo4,698880
+maa/bin/MaaUtils.dll,sha256=ney9s--2gpAPYqqiOKwvkec8poDwJmf-ctQ6ArdHRFI,590336
+maa/bin/MaaWin32ControlUnit.dll,sha256=CiCeNsr-OXh1cRa9EbPvYt4yYukZdSQeDgkeuyPEnc8,371200
+maa/bin/fastdeploy_ppocr_maa.dll,sha256=CUlHQM5FswM5sA8w0cznIn9FeWUqJrcz5amhFjc4FII,1222656
+maa/bin/onnxruntime_maa.dll,sha256=M8x3OILDxCqf4eA4vGsqCogYiHbTSdznrmaIclO9ekQ,19207680
+maa/bin/opencv_world4_maa.dll,sha256=hOYbTOL__zUlQXasinPjt1cgtMR1OfCGe8vWVSp3LFs,18272768
+MaaFw-2.3.0a1.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+MaaFw-2.3.0a1.dist-info/METADATA,sha256=RM5hjE8VzPetY3U4qceijcumdE0HmoXVNpV7uZ4H-K4,11027
+MaaFw-2.3.0a1.dist-info/WHEEL,sha256=7fwWHnUhFh8w_0TvE3v3Cyq6xlqIbZ7a_Y5-lVCtqvs,96
+MaaFw-2.3.0a1.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
+MaaFw-2.3.0a1.dist-info/RECORD,,

{MaaFw-2.2.2.dist-info → MaaFw-2.3.0a1.dist-info}/WHEEL

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

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),
             )
         )

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=GMgqnAYUH36WJBra0aNb6_R4CnLY7usQfsEvdIORs_U,18527264
-maa/bin/MaaAdbControlUnit.dll,sha256=w9PCe0V_RMqvlnfpz75qtHp3aLLScV-WpN6XrkaotEw,776192
-maa/bin/MaaDbgControlUnit.dll,sha256=yXR3MnqA4EpIoWvhthaHYc0BEzs1ZvCqM2u4Fmkt37I,424448
-maa/bin/MaaFramework.dll,sha256=9sHJ1k4UG6f1_6HZvTckGBTkdWL1olKGCu_gDe5cKxE,1381888
-maa/bin/MaaToolkit.dll,sha256=x2Jz7Ob6LykAQRk_RXwkfPPzpCFBpsyicW4PhBTx0-g,697344
-maa/bin/MaaUtils.dll,sha256=yYTJiZbwCWOlgHFUGSWaqCDYiYGsNjJjk6kbUvRt27k,590848
-maa/bin/MaaWin32ControlUnit.dll,sha256=05JWz6Q_8W596aO29SKDZ2X4YBTd1YjEBntZgd4xEDA,371200
-maa/bin/fastdeploy_ppocr_maa.dll,sha256=BwN6dniAuGCrJgcqM1wV9z_o2QFhKCbFsIECyJShxh8,564736
-maa/bin/onnxruntime_maa.dll,sha256=F87oMy7MdU0YTcpilcuNaZkKq-WhoMqiywU9ovV4Cr0,14664704
-maa/bin/opencv_world4_maa.dll,sha256=GSSdBf95My8o08OIplsawk14ne8aNc9Q4D6egs7Go5E,18230272
-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=59IXTypJ6Z4EzlGBm_p8ImrwEBbQjT8pmKOvaVlWwJI,96
-MaaFw-2.2.2.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
-MaaFw-2.2.2.dist-info/RECORD,,