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

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

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

MaaFw-2.1.0.dist-info/RECORD

@@ -0,0 +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=BpAotY8qlxLSKU0ZO249YDhJWU35B5avnwCTE5PxItQ,22160
+maa/custom_action.py,sha256=pqPjDK7nVkGL8fceJadwb7IkeGjYc2X8RaXZOnVZXQs,2527
+maa/custom_recognition.py,sha256=Y3Asdgb19YZioOVZZVs_hLSW6uBg7WDZDQPR2XfZpFU,3087
+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=KjQlu66fNVwGGli8kuhNdSZPj2vO_oXjaNt_B1i_5wA,5251
+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=DGgL9A26wypsKl2wsd0-2erBk9rHyTQtmfSNYPV6h6k,777728
+maa/bin/MaaDbgControlUnit.dll,sha256=R_jg535tOYR0gWbSfzwXIm3aeoFR93eT8wSNio5101c,424448
+maa/bin/MaaFramework.dll,sha256=bizCU6a8iqYSdKz4cTg-i21IsgdEGOmdP4NR9EfPIFw,1377792
+maa/bin/MaaToolkit.dll,sha256=PU6EwGs3ca3sPy1MrNMwLWy__mLiHvES-lejR6PU9s4,693760
+maa/bin/MaaUtils.dll,sha256=RmclX4zqZ20_-sr0FFhWGcWiYKOtTblm8Z0E8hw1Jzg,536064
+maa/bin/MaaWin32ControlUnit.dll,sha256=T9ZcNcBs7KSUafPuNplMX0KQOxpO_fnF5qKOxDmBgJA,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.0.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+MaaFw-2.1.0.dist-info/METADATA,sha256=LETsrB0lTcx-0T05Zj0FnWC51QbSIRJm-_VWQ4kTTL8,9428
+MaaFw-2.1.0.dist-info/WHEEL,sha256=1lcNv5ya_rmBEsTRObX12WYzMCEm6jtegLvKau9-dKM,96
+MaaFw-2.1.0.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
+MaaFw-2.1.0.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

@@ -49,6 +49,7 @@ MaaOptionValue = ctypes.c_void_p
 MaaOption = ctypes.c_int32
 MaaGlobalOption = MaaOption
 MaaCtrlOption = MaaOption
+MaaResOption = MaaOption
 
 
 class MaaGlobalOptionEnum:
@@ -104,6 +105,27 @@ 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.
+    # Please set this option before loading the model.
+    #
+    # value: MaaInferenceDevice, eg: 0; val_size: sizeof(MaaInferenceDevice)
+    # default value is MaaInferenceDevice_Auto
+    InferenceDevice = 1
+
+
 MaaAdbScreencapMethod = ctypes.c_uint64
 
 
@@ -124,7 +146,7 @@ class MaaAdbScreencapMethodEnum:
     EmulatorExtras = 1 << 6
 
     All = ~Null
-    Default = All & (~MinicapDirect) & (~MinicapDirect)
+    Default = All & (~RawByNetcat) & (~MinicapDirect) & (~MinicapDirect)
 
 
 MaaAdbInputMethod = ctypes.c_uint64

maa/notification_handler.py

@@ -33,7 +33,7 @@ class NotificationHandler(ABC):
         path: str
 
     def on_resource_loading(
-        self, type: NotificationType, detail: ResourceLoadingDetail
+        self, noti_type: NotificationType, detail: ResourceLoadingDetail
     ):
         pass
 
@@ -44,7 +44,7 @@ class NotificationHandler(ABC):
         action: str
 
     def on_controller_action(
-        self, type: NotificationType, detail: ControllerActionDetail
+        self, noti_type: NotificationType, detail: ControllerActionDetail
     ):
         pass
 
@@ -55,7 +55,7 @@ class NotificationHandler(ABC):
         uuid: str
         hash: str
 
-    def on_tasker_task(self, type: NotificationType, detail: TaskerTaskDetail):
+    def on_tasker_task(self, noti_type: NotificationType, detail: TaskerTaskDetail):
         pass
 
     @dataclass
@@ -64,7 +64,9 @@ class NotificationHandler(ABC):
         name: str
         next_list: list[str]
 
-    def on_task_next_list(self, type: NotificationType, detail: TaskNextListDetail):
+    def on_task_next_list(
+        self, noti_type: NotificationType, detail: TaskNextListDetail
+    ):
         pass
 
     @dataclass
@@ -74,7 +76,7 @@ class NotificationHandler(ABC):
         name: str
 
     def on_task_recognition(
-        self, type: NotificationType, detail: TaskRecognitionDetail
+        self, noti_type: NotificationType, detail: TaskRecognitionDetail
     ):
         pass
 
@@ -84,7 +86,7 @@ class NotificationHandler(ABC):
         node_id: int
         name: str
 
-    def on_task_action(self, type: NotificationType, detail: TaskActionDetail):
+    def on_task_action(self, noti_type: NotificationType, detail: TaskActionDetail):
         pass
 
     def on_unknown_notification(self, msg: str, details: dict):
@@ -92,7 +94,7 @@ class NotificationHandler(ABC):
 
     def on_raw_notification(self, msg: str, details: dict):
 
-        type = NotificationHandler._notification_type(msg)
+        noti_type = NotificationHandler._notification_type(msg)
 
         if msg.startswith("Resource.Loading"):
             detail = self.ResourceLoadingDetail(
@@ -100,7 +102,7 @@ class NotificationHandler(ABC):
                 hash=details["hash"],
                 path=details["path"],
             )
-            self.on_resource_loading(type, detail)
+            self.on_resource_loading(noti_type, detail)
 
         elif msg.startswith("Controller.Action"):
             detail = self.ControllerActionDetail(
@@ -108,7 +110,7 @@ class NotificationHandler(ABC):
                 uuid=details["uuid"],
                 action=details["action"],
             )
-            self.on_controller_action(type, detail)
+            self.on_controller_action(noti_type, detail)
 
         elif msg.startswith("Tasker.Task"):
             detail = self.TaskerTaskDetail(
@@ -117,7 +119,7 @@ class NotificationHandler(ABC):
                 uuid=details["uuid"],
                 hash=details["hash"],
             )
-            self.on_tasker_task(type, detail)
+            self.on_tasker_task(noti_type, detail)
 
         elif msg.startswith("Task.NextList"):
             detail = self.TaskNextListDetail(
@@ -125,7 +127,7 @@ class NotificationHandler(ABC):
                 name=details["name"],
                 next_list=details["list"],
             )
-            self.on_task_next_list(type, detail)
+            self.on_task_next_list(noti_type, detail)
 
         elif msg.startswith("Task.Recognition"):
             detail = self.TaskRecognitionDetail(
@@ -133,7 +135,7 @@ class NotificationHandler(ABC):
                 reco_id=details["reco_id"],
                 name=details["name"],
             )
-            self.on_task_recognition(type, detail)
+            self.on_task_recognition(noti_type, detail)
 
         elif msg.startswith("Task.Action"):
             detail = self.TaskActionDetail(
@@ -141,7 +143,7 @@ class NotificationHandler(ABC):
                 node_id=details["node_id"],
                 name=details["name"],
             )
-            self.on_task_action(type, detail)
+            self.on_task_action(noti_type, detail)
 
         else:
             self.on_unknown_notification(msg, details)

maa/resource.py

@@ -60,6 +60,19 @@ class Resource:
     def clear(self) -> bool:
         return bool(Library.framework.MaaResourceClear(self._handle))
 
+    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:
+        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
     ) -> bool:
@@ -136,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)
 
@@ -189,6 +213,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,

MaaFw-2.0.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=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/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/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/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,,