MaaFw 2.1.0b1__py3-none-win_amd64.whl → 2.1.1__py3-none-win_amd64.whl

{MaaFw-2.1.0b1.dist-info → MaaFw-2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MaaFw
-Version: 2.1.0b1
+Version: 2.1.1
 Summary: An automation black-box testing framework based on image recognition
 Author: MaaXYZ
 Project-URL: Homepage, https://github.com/MaaXYZ/MaaFramework
@@ -96,7 +96,10 @@ _✨ 基于图像识别的自动化黑盒测试框架 ✨_
 
 - [MET](https://github.com/shanchuan001/MET) 悠久之树 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)  
 基于全新架构的 悠久之树 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
-  
+
+- [MaaYYs](https://github.com/TanyaShue/MaaYYs) 阴阳师小助手 ![python](https://img.shields.io/badge/Python-3776AB?logo=python&logoColor=white) ![qt](https://img.shields.io/badge/Qt6-41CD52?logo=Qt&logoColor=white)  
+  基于全新架构的 阴阳师小助手。图像技术 + 模拟控制，当赛博屯屯鼠，自动日常，解放你的双手！由 MaaFramework 强力驱动！
+   
 ## 生态共建
 
 MAA 正计划建设为一类项目，而非舟的单一软件。  

MaaFw-2.1.1.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=sO2mxnHgCy0sKIl2ByxHk4kDtaJCNhjRDWwDvFiJarY,776192
+maa/bin/MaaDbgControlUnit.dll,sha256=d3kOPkaEF69ihYRbiz34KocdJ5nAMRLZB__pF0s8rSg,424448
+maa/bin/MaaFramework.dll,sha256=kdP-ZtfZGBQc6viL8T0AXmurhFBhExGqTiMMjQrFYx8,1377792
+maa/bin/MaaToolkit.dll,sha256=REyHnio8ON1c9vPio5J2e5gE9gNHt9DH5rUZHymmugs,695808
+maa/bin/MaaUtils.dll,sha256=vnzdAWue35eqLf1ri9M159MOkNoKw45tNcuByj1drLo,541696
+maa/bin/MaaWin32ControlUnit.dll,sha256=bgvNZ3a3hfkI1CcjIDLmlhbOF1Vzu3HivQi8ovUt2EY,368128
+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.1.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+MaaFw-2.1.1.dist-info/METADATA,sha256=U_0LGG0Bd78RVEThDEk2FOUVom-uQXenO9a9lTJ5MdU,9817
+MaaFw-2.1.1.dist-info/WHEEL,sha256=1lcNv5ya_rmBEsTRObX12WYzMCEm6jtegLvKau9-dKM,96
+MaaFw-2.1.1.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
+MaaFw-2.1.1.dist-info/RECORD,,

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

MaaFw-2.1.0b1.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=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/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/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=3IgE33l7ekOFv-BvuBWkfLjvTy-7lO22YPYKQolHDMg,768512
-maa/bin/MaaDbgControlUnit.dll,sha256=-w_bTx4DrjPc2ofOZZhOtoKPR2GsSuDX2pycC9vi8Sg,424448
-maa/bin/MaaFramework.dll,sha256=J3cH8tC9oWJ35ErHG-gIPw5IkVQAxIr6mN39Ky67t9U,1376768
-maa/bin/MaaToolkit.dll,sha256=_3Ur93nMh0p1DCVhhUcffEDjvzvcUdrWkZqoWzpF268,691712
-maa/bin/MaaUtils.dll,sha256=siweB3fuxj_uIc--1fmVtMrcS-C3FJ5cSivw6I3tLik,536064
-maa/bin/MaaWin32ControlUnit.dll,sha256=D2NpATClXH5XVcTmDvjrlAXTHDhYA2MzLMdg_r1kHIQ,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.0b1.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-MaaFw-2.1.0b1.dist-info/METADATA,sha256=7zB3Lo59K4fjZDHekp7Oe9PBijw7RcnUD3QY2YqqGqE,9430
-MaaFw-2.1.0b1.dist-info/WHEEL,sha256=1lcNv5ya_rmBEsTRObX12WYzMCEm6jtegLvKau9-dKM,96
-MaaFw-2.1.0b1.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
-MaaFw-2.1.0b1.dist-info/RECORD,,