MaaFw 2.0.2__py3-none-win_amd64.whl → 2.1.0a1__py3-none-win_amd64.whl

{MaaFw-2.0.2.dist-info → MaaFw-2.1.0a1.dist-info}/METADATA

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

{MaaFw-2.0.2.dist-info → MaaFw-2.1.0a1.dist-info}/RECORD

@@ -4,25 +4,25 @@ maa/context.py,sha256=Y71T92tIAGq6x8bJfYX8emUPEmPUA7nhnWgqOHh390E,5722
 maa/controller.py,sha256=F7BV221e0lPCElRD89mBJGJvXhNFe_QhvhV3yWSnKoY,22167
 maa/custom_action.py,sha256=pqPjDK7nVkGL8fceJadwb7IkeGjYc2X8RaXZOnVZXQs,2527
 maa/custom_recognition.py,sha256=Y3Asdgb19YZioOVZZVs_hLSW6uBg7WDZDQPR2XfZpFU,3087
-maa/define.py,sha256=Q1_C8-jyRYlZPytZB2Ur0Uyyr0SovxuOOEBg2XvXnjk,10451
+maa/define.py,sha256=pYgO5_djp0TBP2sq9SUYb_I-sNjJ2Uv6dfdgVxq2hy0,10745
 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=SL0P0A4mmV8IbTMH36tP_AwjzGlCG8-SwLI4NOe30Ao,7204
+maa/resource.py,sha256=9BHZ6XCLTomfvQAO6xv272DH364r3sl8zMGDXJOQ_HU,7913
 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=cqgTKSUXV9nwb7_ajasU740tRmDjrR7EjPqaZsoYWuc,768512
-maa/bin/MaaDbgControlUnit.dll,sha256=I8N8hLuNZewv9DEV31TBDNkIZZ39gFLTKMaTSNZW9R4,424448
-maa/bin/MaaFramework.dll,sha256=Wh_aPhb5OHcMD2RGujDQvy_Uz7sHEcsMGNR8woqgIrQ,1352704
-maa/bin/MaaToolkit.dll,sha256=o5z65huvVdJOQuGAy9wSBv8gXtr9wJaueIpeIzIAlAo,689664
-maa/bin/MaaUtils.dll,sha256=WdxRb9AC1Xl2vBxcsABHTMt4U2p4lBNaqleJUnJFxo8,536064
-maa/bin/MaaWin32ControlUnit.dll,sha256=Vi-azT8niYBq1ndS4dMIwVNaxZMToxRA220ONiia8Do,367104
+maa/bin/MaaAdbControlUnit.dll,sha256=cC2hHg1G0Dly81aCxHOaXeHUTs490_4YeMZxFntOJ0E,768512
+maa/bin/MaaDbgControlUnit.dll,sha256=BguPj5VZla2WIh1RucFgLWrNNzJyHiMoKW4nZu-U-tU,424448
+maa/bin/MaaFramework.dll,sha256=dv0ORLQMGTxIJlhrufaFOp5CnQzRU8_KhG7hhzf4g1U,1371136
+maa/bin/MaaToolkit.dll,sha256=pIdi6PPi2iQsiG9jsvziE9hpcVkjpuBoalTMYI_2Mt0,691712
+maa/bin/MaaUtils.dll,sha256=GMIsOE_emRWx622f23iCesRKwNP-BcbQspNGvOAmJfI,536064
+maa/bin/MaaWin32ControlUnit.dll,sha256=bhK0XAWjT21vZ3bW0PQzGjI-bOWhAb7NrLvS3ZEk62E,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.0.2.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-MaaFw-2.0.2.dist-info/METADATA,sha256=geSYqDHDfTd_V9z73fHzvxL8uCupX-HXQDHcYXBdk6w,9428
-MaaFw-2.0.2.dist-info/WHEEL,sha256=1lcNv5ya_rmBEsTRObX12WYzMCEm6jtegLvKau9-dKM,96
-MaaFw-2.0.2.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
-MaaFw-2.0.2.dist-info/RECORD,,
+MaaFw-2.1.0a1.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+MaaFw-2.1.0a1.dist-info/METADATA,sha256=Q6B5oFjQjZ28El9MPhOoLrWnycfOihUHcWUfXz4RXLk,9430
+MaaFw-2.1.0a1.dist-info/WHEEL,sha256=1lcNv5ya_rmBEsTRObX12WYzMCEm6jtegLvKau9-dKM,96
+MaaFw-2.1.0a1.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
+MaaFw-2.1.0a1.dist-info/RECORD,,

maa/define.py

@@ -49,6 +49,7 @@ MaaOptionValue = ctypes.c_void_p
 MaaOption = ctypes.c_int32
 MaaGlobalOption = MaaOption
 MaaCtrlOption = MaaOption
+MaaResOption = MaaOption
 
 
 class MaaGlobalOptionEnum:
@@ -104,6 +105,15 @@ class MaaCtrlOptionEnum:
     Recording = 5
 
 
+class MaaResOptionEnum:
+    Invalid = 0
+
+    # Use the specified inference device, the default is INT32_MAX, which means CPU.
+    # Please set this option before loading the model.
+    # value: int32_t, eg: 0; val_size: sizeof(int32_t)
+    GpuId = 1
+
+
 MaaAdbScreencapMethod = ctypes.c_uint64
 
 
@@ -124,7 +134,7 @@ class MaaAdbScreencapMethodEnum:
     EmulatorExtras = 1 << 6
 
     All = ~Null
-    Default = All & (~MinicapDirect) & (~MinicapDirect)
+    Default = All & (~RawByNetcat) & (~MinicapDirect) & (~MinicapDirect)
 
 
 MaaAdbInputMethod = ctypes.c_uint64

maa/resource.py

@@ -60,6 +60,21 @@ 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_cpu(self) -> bool:
+        INT32_MAX = 2147483647  # means CPU
+        return self.set_gpu(INT32_MAX)
+
     def register_custom_recognition(
         self, name: str, recognition: "CustomRecognition"  # type: ignore
     ) -> bool:
@@ -189,6 +204,14 @@ class Resource:
             MaaStringBufferHandle,
         ]
 
+        Library.framework.MaaResourceSetOption.restype = MaaBool
+        Library.framework.MaaResourceSetOption.argtypes = [
+            MaaResourceHandle,
+            MaaResOption,
+            MaaOptionValue,
+            MaaOptionValueSize,
+        ]
+
         Library.framework.MaaResourceRegisterCustomRecognition.restype = MaaBool
         Library.framework.MaaResourceRegisterCustomRecognition.argtypes = [
             MaaResourceHandle,