MaaFw 2.1.2__py3-none-macosx_13_0_x86_64.whl → 2.2.0b1__py3-none-macosx_13_0_x86_64.whl

{MaaFw-2.1.2.dist-info → MaaFw-2.2.0b1.dist-info}/METADATA

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

MaaFw-2.2.0b1.dist-info/RECORD

@@ -0,0 +1,35 @@
+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=bb7zr-VTftpAafBU2Qn1_VlS3pHno73iyHhYPO5VjMw,12196
+maa/job.py,sha256=MUI5T2X9ON9c7Dl6yo_0pp8Ulpn25XOD_uEdGm2k-TA,1231
+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/libMaaAdbControlUnit.dylib,sha256=Jq2vvGVF_8Rwc1RpvFvBEKQtUGme9PHUlI8O70pnJuc,760432
+maa/bin/libMaaDbgControlUnit.dylib,sha256=vrPr2mivvdEWHlx01v6eurjqQ0uBPXGrqvxvy8HJEkc,362512
+maa/bin/libMaaFramework.dylib,sha256=iNyv3nGQPIVx1TB3w3HnUtAxxfho8uUDn3FHBC2VULs,2219360
+maa/bin/libMaaToolkit.dylib,sha256=KRr9ui4nlv1EWecdgwkQJhT8qllbXnAZx_do-6qsnNY,819928
+maa/bin/libMaaUtils.dylib,sha256=gzD7SE6HVFUVTaG_Da_AotKmJGyPl8vAkKRFhUt7OOo,591784
+maa/bin/libc++.1.0.dylib,sha256=l98e0KKW4OB2I4Hr7AGYPE0br-P-7WwXLS26IGGBt30,1092536
+maa/bin/libc++.1.dylib,sha256=l98e0KKW4OB2I4Hr7AGYPE0br-P-7WwXLS26IGGBt30,1092536
+maa/bin/libc++.dylib,sha256=l98e0KKW4OB2I4Hr7AGYPE0br-P-7WwXLS26IGGBt30,1092536
+maa/bin/libc++abi.1.0.dylib,sha256=csTlP4-DSzMwCAIQ2RU9DWyLh4v3WWpLSxg-yzy_bco,328968
+maa/bin/libc++abi.1.dylib,sha256=csTlP4-DSzMwCAIQ2RU9DWyLh4v3WWpLSxg-yzy_bco,328968
+maa/bin/libc++abi.dylib,sha256=csTlP4-DSzMwCAIQ2RU9DWyLh4v3WWpLSxg-yzy_bco,328968
+maa/bin/libfastdeploy_ppocr.dylib,sha256=I6AJRUNHnczynfUDr3RZwAEDAjX2-LJCZKjaoVJxG5Y,5262536
+maa/bin/libonnxruntime.1.18.0.dylib,sha256=gOmuJ7Ru3Ysy88P7G1aYlhvSWKKLk7VJ8PZgWmltieM,16078040
+maa/bin/libopencv_world4.4.8.0.dylib,sha256=PR7UujfhV7yuIILGYJjNiWe2pzLOYmP8plU2w3acRoQ,16904240
+maa/bin/libunwind.1.0.dylib,sha256=AJnk5ehO2leJk44_SHi8yo7hmSgPP2ziTMP-HZwTN4s,91688
+maa/bin/libunwind.1.dylib,sha256=AJnk5ehO2leJk44_SHi8yo7hmSgPP2ziTMP-HZwTN4s,91688
+maa/bin/libunwind.dylib,sha256=AJnk5ehO2leJk44_SHi8yo7hmSgPP2ziTMP-HZwTN4s,91688
+MaaFw-2.2.0b1.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+MaaFw-2.2.0b1.dist-info/METADATA,sha256=mRGoIDqTfmh50a4eg-aLQyVWQhPCP0bhTy_h4J1IYXs,10392
+MaaFw-2.2.0b1.dist-info/WHEEL,sha256=nql--zZFCI2EjsO5pmepYFFqazVharyysKgq4Ka16sg,104
+MaaFw-2.2.0b1.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
+MaaFw-2.2.0b1.dist-info/RECORD,,

MaaFw-2.2.0b1.dist-info/WHEEL

@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.2.0)
+Root-Is-Purelib: true
+Tag: py3-none-macosx_13_0_x86_64

maa/controller.py

@@ -152,6 +152,17 @@ class Controller:
                 ctypes.sizeof(ctypes.c_int32),
             )
         )
+    
+    def set_screenshot_use_raw_size(self, enable: bool) -> bool:
+        cbool = MaaBool(enable)
+        return bool(
+            Library.framework.MaaControllerSetOption(
+                self._handle,
+                MaaOption(MaaCtrlOptionEnum.ScreenshotUseRawSize),
+                ctypes.pointer(cbool),
+                ctypes.sizeof(MaaBool),
+            )
+        )
 
     ### private ###
 
@@ -343,7 +354,7 @@ class Win32Controller(Controller):
 
     def __init__(
         self,
-        hWnd: ctypes.c_void_p,
+        hWnd: Optional[ctypes.c_void_p],
         screencap_method: int = MaaWin32ScreencapMethodEnum.DXGI_DesktopDup,
         input_method: int = MaaWin32InputMethodEnum.Seize,
         notification_handler: Optional[NotificationHandler] = None,

maa/define.py

@@ -99,6 +99,11 @@ class MaaCtrlOptionEnum:
     # value: int, eg: 1080; val_size: sizeof(int)
     ScreenshotTargetShortSide = 2
 
+    # Screenshot use raw size without scaling.
+    # Please note that this option may cause incorrect coordinates on user devices with different resolutions if scaling is not performed.
+    # value: bool, eg: true; val_size: sizeof(bool)
+    ScreenshotUseRawSize = 3
+
     # Dump all screenshots and actions
     # this option will || with MaaGlobalOptionEnum.Recording
     # value: bool, eg: true; val_size: sizeof(bool)
@@ -115,6 +120,7 @@ class MaaCtrlOptionEnum:
 # };
 MaaInferenceDevice = ctypes.c_int32
 
+
 class MaaResOptionEnum:
     Invalid = 0
 
@@ -330,6 +336,38 @@ class MaaCustomControllerCallbacks(ctypes.Structure):
     ]
 
 
+class Status:
+    _status: MaaStatusEnum
+
+    def __init__(self, status: Union[MaaStatus, MaaStatusEnum, int]):
+        if isinstance(status, MaaStatus):
+            self._status = MaaStatusEnum(status.value)
+        elif isinstance(status, MaaStatusEnum):
+            self._status = status
+        else:
+            self._status = MaaStatusEnum(status)
+
+    @property
+    def done(self) -> bool:
+        return self._status in [MaaStatusEnum.succeeded, MaaStatusEnum.failed]
+
+    @property
+    def succeeded(self) -> bool:
+        return self._status == MaaStatusEnum.succeeded
+
+    @property
+    def failed(self) -> bool:
+        return self._status == MaaStatusEnum.failed
+
+    @property
+    def pending(self) -> bool:
+        return self._status == MaaStatusEnum.pending
+
+    @property
+    def running(self) -> bool:
+        return self._status == MaaStatusEnum.running
+
+
 @dataclass
 class Rect:
     x: int = 0
@@ -487,6 +525,7 @@ class TaskDetail:
     task_id: int
     entry: str
     nodes: List[NodeDetail]
+    status: Status
 
 
 class LoggingLevelEnum(IntEnum):

maa/job.py

@@ -1,62 +1,45 @@
-from typing import Union
-
 from .define import *
 
 
-class Status:
-    _status: MaaStatusEnum
-
-    def __init__(self, status: Union[MaaStatus, MaaStatusEnum]):
-        self._status = MaaStatusEnum(status)
-
-    def done(self) -> bool:
-        return self._status in [MaaStatusEnum.succeeded, MaaStatusEnum.failed]
-
-    def succeeded(self) -> bool:
-        return self._status == MaaStatusEnum.succeeded
-
-    def failed(self) -> bool:
-        return self._status == MaaStatusEnum.failed
-
-    def pending(self) -> bool:
-        return self._status == MaaStatusEnum.pending
-
-    def running(self) -> bool:
-        return self._status == MaaStatusEnum.running
-
-
 class Job:
-    job_id: MaaId
+    _job_id: MaaId
 
     def __init__(self, job_id: MaaId, status_func, wait_func):
-        self.job_id = job_id
+        self._job_id = job_id
         self._status_func = status_func
         self._wait_func = wait_func
 
-    def get_id(self) -> int:
-        return int(self.job_id)
+    @property
+    def job_id(self) -> int:
+        return int(self._job_id)
 
     def wait(self) -> "Job":
-        self._wait_func(self.job_id)
+        self._wait_func(self._job_id)
         return self
 
+    @property
     def status(self) -> Status:
-        return Status(self._status_func(self.job_id))
+        return Status(self._status_func(self._job_id))
 
+    @property
     def done(self) -> bool:
-        return self.status().done()
+        return self.status.done
 
+    @property
     def succeeded(self) -> bool:
-        return self.status().succeeded()
+        return self.status.succeeded
 
+    @property
     def failed(self) -> bool:
-        return self.status().failed()
+        return self.status.failed
 
+    @property
     def pending(self) -> bool:
-        return self.status().pending()
+        return self.status.pending
 
+    @property
     def running(self) -> bool:
-        return self.status().running()
+        return self.status.running
 
 
 class JobWithResult(Job):
@@ -69,4 +52,4 @@ class JobWithResult(Job):
         return self
 
     def get(self):
-        return self._get_func(self.job_id)
+        return self._get_func(self._job_id)

maa/tasker.py

@@ -283,6 +283,7 @@ class Tasker:
     def get_task_detail(self, task_id: int) -> Optional[TaskDetail]:
         size = MaaSize()
         entry = StringBuffer()
+        status = MaaStatus()
         ret = bool(
             Library.framework.MaaTaskerGetTaskDetail(
                 self._handle,
@@ -290,6 +291,7 @@ class Tasker:
                 entry._handle,
                 None,
                 ctypes.pointer(size),
+                ctypes.pointer(status),
             )
         )
         if not ret:
@@ -303,6 +305,7 @@ class Tasker:
                 entry._handle,
                 c_node_id_list,
                 ctypes.pointer(size),
+                ctypes.pointer(status),
             )
         )
         if not ret:
@@ -313,7 +316,7 @@ class Tasker:
             detail = self.get_node_detail(int(c_node_id_list[i]))
             nodes.append(detail)
 
-        return TaskDetail(task_id=task_id, entry=entry.get(), nodes=nodes)
+        return TaskDetail(task_id=task_id, entry=entry.get(), nodes=nodes, status=Status(status))
 
     _api_properties_initialized: bool = False
 
@@ -433,6 +436,7 @@ class Tasker:
             MaaStringBufferHandle,
             ctypes.POINTER(MaaRecoId),
             ctypes.POINTER(MaaSize),
+            ctypes.POINTER(MaaStatus),
         ]
 
         Library.framework.MaaTaskerGetLatestNode.restype = MaaBool

MaaFw-2.1.2.dist-info/RECORD

@@ -1,26 +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=X0srxfg6eUohfxC3s0pkICTv8B_dB3tbrPAJMmWTX20,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/libMaaAdbControlUnit.dylib,sha256=mYWWQ47h5i9aEZecSVJTJtur0C-RJfSVc152m23wNPs,760432
-maa/bin/libMaaDbgControlUnit.dylib,sha256=Xa4Efs_hj2v4wKECY1fsX88YCm_fGOGBAHN8DrQQU2Q,362512
-maa/bin/libMaaFramework.dylib,sha256=ewWeRFiKBKA5hoztHvD2gA3WarWLBJGog6A1xB9UJXo,2219264
-maa/bin/libMaaToolkit.dylib,sha256=FR3EBwEgMebSzerTXcH8BloIUozxD0bC3GJpE-_mYc0,819928
-maa/bin/libMaaUtils.dylib,sha256=9GrJUmThrEHRIYWY-lMZboe-lPEIvyMBJF-16DpiW_c,591776
-maa/bin/libfastdeploy_ppocr.dylib,sha256=fRkqCzkskSUkHfOaJhGt2jP5WJzdOBZTbIf57fa7TOk,5262536
-maa/bin/libonnxruntime.1.18.0.dylib,sha256=-Xr8cnC3YfFQKbSXC11JUSAfhPUBExPnegQt0tVpHoI,16078040
-maa/bin/libopencv_world4.4.8.0.dylib,sha256=toLneOhEux2dzXxsO2OoglY7eUHaZJtwiUW6gaGYyDg,16904240
-MaaFw-2.1.2.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-MaaFw-2.1.2.dist-info/METADATA,sha256=qql_PehhQW-B8iTJ6PCykMUQ2duKbvDmpAdF1jVZfBQ,10390
-MaaFw-2.1.2.dist-info/WHEEL,sha256=iJyBMnneRh2Zbie1Eq-NB2684c7GLrpNgjecont1ql4,104
-MaaFw-2.1.2.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
-MaaFw-2.1.2.dist-info/RECORD,,

MaaFw-2.1.2.dist-info/WHEEL

@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
-Root-Is-Purelib: true
-Tag: py3-none-macosx_13_0_x86_64