MaaFw 2.1.0a2__py3-none-win_amd64.whl → 2.1.0b2__py3-none-win_amd64.whl

{MaaFw-2.1.0a2.dist-info → MaaFw-2.1.0b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MaaFw
-Version: 2.1.0a2
+Version: 2.1.0b2
 Summary: An automation black-box testing framework based on image recognition
 Author: MaaXYZ
 Project-URL: Homepage, https://github.com/MaaXYZ/MaaFramework

{MaaFw-2.1.0a2.dist-info → MaaFw-2.1.0b2.dist-info}/RECORD

@@ -1,28 +1,28 @@
 maa/__init__.py,sha256=rBIC5X_VsfFXOMJRdKjgDyO428XHgeWAT3t6ZYmqO1M,207
 maa/buffer.py,sha256=E0tuasXPm6A_4r22PGSwObgGXb2qCMJrT5yrAvcgk6I,17424
 maa/context.py,sha256=Y71T92tIAGq6x8bJfYX8emUPEmPUA7nhnWgqOHh390E,5722
-maa/controller.py,sha256=F7BV221e0lPCElRD89mBJGJvXhNFe_QhvhV3yWSnKoY,22167
+maa/controller.py,sha256=BpAotY8qlxLSKU0ZO249YDhJWU35B5avnwCTE5PxItQ,22160
 maa/custom_action.py,sha256=pqPjDK7nVkGL8fceJadwb7IkeGjYc2X8RaXZOnVZXQs,2527
 maa/custom_recognition.py,sha256=Y3Asdgb19YZioOVZZVs_hLSW6uBg7WDZDQPR2XfZpFU,3087
-maa/define.py,sha256=pYgO5_djp0TBP2sq9SUYb_I-sNjJ2Uv6dfdgVxq2hy0,10745
+maa/define.py,sha256=nFPEOa7asyf4UG9kkeQrQaarXWbN0w-tSHoQWdZi_4s,11032
 maa/job.py,sha256=Vj6q3sFPlmo260mxJWBnPuO2oT2LdZ-92vdDvrqBZYU,1777
 maa/library.py,sha256=nDTBUFC6_91gmyy8SfkTTccMZET9XGU8IxvuVUEwQ6E,2099
 maa/notification_handler.py,sha256=HtGmTFgTj7ibTdAIVNr5-LBn38trv_j6beHvYXUVFeg,5172
-maa/resource.py,sha256=9BHZ6XCLTomfvQAO6xv272DH364r3sl8zMGDXJOQ_HU,7913
+maa/resource.py,sha256=bvS02sCCS9DRw_zJZeyCk8_DrZry6KBlUIvcfpKoUIg,8243
 maa/tasker.py,sha256=6FOzU-PxWSA0dK8vEmiPVaJThvUMwNDi6EC6V-TcQmM,14758
 maa/toolkit.py,sha256=TlF8MoaGcWLklpISIlQNvc_rpTFBFrpDbLgctfQ_zqo,11325
 maa/bin/DirectML.dll,sha256=it3PSVO_NoJUHvoqZSbiQOjiMd-RqChTBrK5cl9CKWE,27383832
-maa/bin/MaaAdbControlUnit.dll,sha256=9JWVJBSWwzK2ya5h0fJxJjuiq6ZLEY4F7ig6gpVBomQ,768512
-maa/bin/MaaDbgControlUnit.dll,sha256=fEjoKtN-IfG8FNXnJsORuvGqN6s549lO8tWbTL_HmMU,424448
-maa/bin/MaaFramework.dll,sha256=SPkqpN4JlbToeMO54-RhHd0_w6DNqqGrk83n8aG9jUM,1370112
-maa/bin/MaaToolkit.dll,sha256=U0mNHNRszSk5PT-iRK9gCfjDjHrW_fE5ji5NgMopzUM,691712
-maa/bin/MaaUtils.dll,sha256=7TdVo110Ls6FNf9c1sDH8E0-eVSjA5c4Bh4-Q3NBKsk,536064
-maa/bin/MaaWin32ControlUnit.dll,sha256=3fkr5ykwH9m7xSWnNuNdHxUvI64sy2MvFKHJ0jKus6c,367104
+maa/bin/MaaAdbControlUnit.dll,sha256=p5czZtwLpLNMaUzoUBIXqPCY-64GDpgcB7sWeFzAlwU,777728
+maa/bin/MaaDbgControlUnit.dll,sha256=h65UnafWEmROHrRepoaoRVJiDFx03AqK0SROussOlhY,424448
+maa/bin/MaaFramework.dll,sha256=2UZE7Kn7LLlJ1vJaVlMSJEeWnxYOFhdDGWHkiA5pR1A,1377280
+maa/bin/MaaToolkit.dll,sha256=3kH-OS_pbKeoVu9CElr8Z1T9l5DSP-HGWOXJN81S4aY,691712
+maa/bin/MaaUtils.dll,sha256=R9ohEWPuBlfiupFGFzyg6fB3TVI_-v13Y9UtVAXh2rI,536064
+maa/bin/MaaWin32ControlUnit.dll,sha256=2QSzWbhEWkoIk_6Hs4Yxe5CFR8lA2But2-olJloTkPU,367104
 maa/bin/fastdeploy_ppocr_maa.dll,sha256=4ri3FE9bJemUgZu3bsvDSPbqsioIFki1J-Ifk3qkKvg,564736
 maa/bin/onnxruntime_maa.dll,sha256=cu4Z-EwQuqMuphxCt4Pho7XPlUcIEenPK9Tk90alBhc,14653440
 maa/bin/opencv_world4_maa.dll,sha256=NtWJEx6Dg29Qqk493eAAU8O8zZ7Ym5UV6RQ0N0RG9RU,18230272
-MaaFw-2.1.0a2.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-MaaFw-2.1.0a2.dist-info/METADATA,sha256=Z6g1mUwESLQ5vSOtdHnGraBTlgMV7nr8LzdvhjaCL_s,9430
-MaaFw-2.1.0a2.dist-info/WHEEL,sha256=1lcNv5ya_rmBEsTRObX12WYzMCEm6jtegLvKau9-dKM,96
-MaaFw-2.1.0a2.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
-MaaFw-2.1.0a2.dist-info/RECORD,,
+MaaFw-2.1.0b2.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+MaaFw-2.1.0b2.dist-info/METADATA,sha256=Mjl4tQaNLNTD7mh1GiJaYHE_MgUcejnuzuutaN8tUNs,9430
+MaaFw-2.1.0b2.dist-info/WHEEL,sha256=1lcNv5ya_rmBEsTRObX12WYzMCEm6jtegLvKau9-dKM,96
+MaaFw-2.1.0b2.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
+MaaFw-2.1.0b2.dist-info/RECORD,,

maa/controller.py

@@ -76,9 +76,9 @@ class Controller:
         )
         return self._gen_ctrl_job(ctrl_id)
 
-    def post_stop_app(self, package: str) -> Job:
+    def post_stop_app(self, intent: str) -> Job:
         ctrl_id = Library.framework.MaaControllerPostStopApp(
-            self._handle, package.encode()
+            self._handle, intent.encode()
         )
         return self._gen_ctrl_job(ctrl_id)
 
@@ -98,7 +98,7 @@ class Controller:
         )
         return self._gen_ctrl_job(ctrl_id)
 
-    def post_touch_up(self, int, contact: int = 0) -> Job:
+    def post_touch_up(self, contact: int = 0) -> Job:
         ctrl_id = Library.framework.MaaControllerPostTouchUp(self._handle, contact)
         return self._gen_ctrl_job(ctrl_id)
 

maa/define.py

@@ -105,13 +105,25 @@ 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 MaaResOptionEnum:
     Invalid = 0
 
-    # Use the specified inference device, the default is INT32_MAX, which means CPU.
+    # Use the specified inference device.
     # Please set this option before loading the model.
-    # value: int32_t, eg: 0; val_size: sizeof(int32_t)
-    GpuId = 1
+    #
+    # value: MaaInferenceDevice, eg: 0; val_size: sizeof(MaaInferenceDevice)
+    # default value is MaaInferenceDevice_Auto
+    InferenceDevice = 1
 
 
 MaaAdbScreencapMethod = ctypes.c_uint64

maa/resource.py

@@ -60,20 +60,18 @@ class Resource:
     def clear(self) -> bool:
         return bool(Library.framework.MaaResourceClear(self._handle))
 
-    def set_gpu(self, device_id: int) -> bool:
-        cint = ctypes.c_int32(device_id)
-        return bool(
-            Library.framework.MaaResourceSetOption(
-                self._handle,
-                MaaResOptionEnum.GpuId,
-                ctypes.pointer(cint),
-                ctypes.sizeof(ctypes.c_int32),
-            )
-        )
+    def set_gpu(self, gpu_id: int) -> bool:
+        if gpu_id < 0:
+            return False
+        return self.set_inference_device(gpu_id)
 
     def set_cpu(self) -> bool:
-        INT32_MAX = 2147483647  # means CPU
-        return self.set_gpu(INT32_MAX)
+        MaaInferenceDevice_CPU = -2
+        return self.set_inference_device(MaaInferenceDevice_CPU)
+    
+    def set_auto_device(self) -> bool:
+        MaaInferenceDevice_Auto = -1
+        return self.set_inference_device(MaaInferenceDevice_Auto)
 
     def register_custom_recognition(
         self, name: str, recognition: "CustomRecognition"  # type: ignore
@@ -151,6 +149,17 @@ class Resource:
 
     ### private ###
 
+    def set_inference_device(self, device_id: int) -> bool:
+        cint = ctypes.c_int32(device_id)
+        return bool(
+            Library.framework.MaaResourceSetOption(
+                self._handle,
+                MaaResOptionEnum.InferenceDevice,
+                ctypes.pointer(cint),
+                ctypes.sizeof(ctypes.c_int32),
+            )
+        )
+
     def _status(self, id: int) -> ctypes.c_int32:
         return Library.framework.MaaResourceStatus(self._handle, id)