MaaFw 2.4.2__py3-none-win_amd64.whl → 3.0.0b1__py3-none-win_amd64.whl

{MaaFw-2.4.2.dist-info → MaaFw-3.0.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: MaaFw
-Version: 2.4.2
+Version: 3.0.0b1
 Summary: An automation black-box testing framework based on image recognition
 Author: MaaXYZ
 Project-URL: Homepage, https://github.com/MaaXYZ/MaaFramework
@@ -81,7 +81,7 @@ _✨ 基于图像识别的自动化黑盒测试框架 ✨_
 - [maa-whmx](https://github.com/MAWHA/maa-whmx) 物华弥新 小助手 ![cpp](https://img.shields.io/badge/C%2B%2B-00599C?logo=c%2B%2B&logoColor=white) ![qt](https://img.shields.io/badge/Qt6-41CD52?logo=Qt&logoColor=white)  
   基于全新架构的 物华弥新 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
 
-- [MAA-for-Millennium-Tour](https://github.com/Ostwind23/MAA-for-Millennium-Tour) 千年之旅 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=codecademy&logoColor=%23FFFFFF&color=%23454545) ![python](https://img.shields.io/badge/Python-3776AB?logo=python&logoColor=white)  
+- [MAA-for-Millennium-Tour](https://github.com/Ostwind23/MAA-for-Millennium-Tour) 千年之旅 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF) ![python](https://img.shields.io/badge/Python-3776AB?logo=python&logoColor=white)  
   基于全新架构的 千年之旅 小助手。图像技术 + 模拟控制，解放侍主的大手！由 MaaFramework 强力驱动！
 
 - [MFAWPF](https://github.com/SweetSmellFox/MFAWPF) MFA 任务管理器 ![csharp](https://img.shields.io/badge/C%23-239120?logo=csharp&logoColor=white)  
@@ -113,6 +113,9 @@ _✨ 基于图像识别的自动化黑盒测试框架 ✨_
 
 - [MaaGF2Exilium](https://github.com/DarkLingYun/MaaGF2Exilium) 少女前线2: 追放自动化助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)  
   基于全新架构的 少女前线2: 追放自动化助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
+
+- [MaaAshEchoes](https://github.com/moulai/MaaAshEchoes) 白荆回廊 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)  
+  基于全新架构的 白荆回廊 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
   
 ## 生态共建
 

MaaFw-3.0.0b1.dist-info/RECORD

@@ -0,0 +1,28 @@
+maa/__init__.py,sha256=JkhLdjqr1X69SYY2O3qoPhdYImQC_91XS5_eY1vbtEo,230
+maa/buffer.py,sha256=JLxAF8esnAN4SlkZf2OMMlpv0SV3WK7OyMF8w7sTaC8,16617
+maa/context.py,sha256=oKlPInvBKOPKT16qwWcIZKf4hEfFBL6cc_RYfqY5o90,5706
+maa/controller.py,sha256=61R4asxDLChiZBSD1hEdGdbpoyOxHttOeflNuJ7DmqM,22381
+maa/custom_action.py,sha256=V-kJ-5ahcImnzrZBbAH_RJqoiQ7RjBT39ffdSOi9_c4,2495
+maa/custom_recognition.py,sha256=o2k2tM-NstcDpivXPdoritI3laUN1NQl3Yq1M6RkNcE,3055
+maa/define.py,sha256=d86Bu4_M4EAW-O19WLvjN6AC4Y-xpP1Kv-xf45g99Zc,13168
+maa/job.py,sha256=MUI5T2X9ON9c7Dl6yo_0pp8Ulpn25XOD_uEdGm2k-TA,1231
+maa/library.py,sha256=AwdFx_zWHEah81NwOmD-SDzysSuVbsreDLIaxpWsXvY,1267
+maa/notification_handler.py,sha256=1sFukH3R5l9Fp73CP7DV8fv6gTYge_kb6foSDNcNERY,5251
+maa/resource.py,sha256=AdlQHc58bU2AjSx-9k9V_657pIMgaVMXqtURsJEN6Mw,9379
+maa/tasker.py,sha256=whGIavf89NoiPffEoRJk3xtzeW8NUyzMoi6ZIo2d5b8,14409
+maa/toolkit.py,sha256=BE_o8XgznuW1d_7YairYHOrqOp5Ha9GYMcinsYYBgVM,11163
+maa/bin/DirectML.dll,sha256=nJ5tgiVhxsQbkOaZSz6IV88dZtv7HgxMeZx8ibTpLaE,18527776
+maa/bin/MaaAdbControlUnit.dll,sha256=p-z7exZCkk2sGAshQO9zavxc9xEgTsFPtx8bJS48tos,1285632
+maa/bin/MaaDbgControlUnit.dll,sha256=mk2cdlK-7Qb16DIEvGV_DjM3yB7VTt2fZjq-_P1TDWQ,726528
+maa/bin/MaaFramework.dll,sha256=cQEInzD6OW89dob9c_T2tQTiDXLSqhB-whCfTYmjJb0,2511872
+maa/bin/MaaToolkit.dll,sha256=SLVMERke-tSF7tLrn7k76TMnHoNLkWVrvDK-hemZ1Oo,1181184
+maa/bin/MaaUtils.dll,sha256=GwgUIjl39xp13jTgWV2God4Woy7VDBuISrxX1kdgdkY,961024
+maa/bin/MaaWin32ControlUnit.dll,sha256=kypHmGp_K8xaUiIt2wBHuHcuOwsLU3wTSrao504kGWI,1507840
+maa/bin/fastdeploy_ppocr_maa.dll,sha256=CUlHQM5FswM5sA8w0cznIn9FeWUqJrcz5amhFjc4FII,1222656
+maa/bin/onnxruntime_maa.dll,sha256=M8x3OILDxCqf4eA4vGsqCogYiHbTSdznrmaIclO9ekQ,19207680
+maa/bin/opencv_world4_maa.dll,sha256=hOYbTOL__zUlQXasinPjt1cgtMR1OfCGe8vWVSp3LFs,18272768
+MaaFw-3.0.0b1.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+MaaFw-3.0.0b1.dist-info/METADATA,sha256=nVkZZ-coblqh9bvW0PwagSDqH01EY6MoiHW_cJpiA2g,11560
+MaaFw-3.0.0b1.dist-info/WHEEL,sha256=dcBJPHW8irYxudHk63nht8liN9Fc1vE-fGOV_TZdeAU,96
+MaaFw-3.0.0b1.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
+MaaFw-3.0.0b1.dist-info/RECORD,,

{MaaFw-2.4.2.dist-info → MaaFw-3.0.0b1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-win_amd64

maa/context.py

@@ -29,11 +29,11 @@ class Context:
     def __del__(self):
         pass
 
-    def run_pipeline(
+    def run_task(
         self, entry: str, pipeline_override: Dict = {}
     ) -> Optional[TaskDetail]:
         task_id = int(
-            Library.framework.MaaContextRunPipeline(
+            Library.framework.MaaContextRunTask(
                 self._handle, *Context._gen_post_param(entry, pipeline_override)
             )
         )
@@ -143,8 +143,8 @@ class Context:
 
         Context._api_properties_initialized = True
 
-        Library.framework.MaaContextRunPipeline.restype = MaaTaskId
-        Library.framework.MaaContextRunPipeline.argtypes = [
+        Library.framework.MaaContextRunTask.restype = MaaTaskId
+        Library.framework.MaaContextRunTask.argtypes = [
             MaaContextHandle,
             ctypes.c_char_p,
             ctypes.c_char_p,

maa/custom_action.py

@@ -16,7 +16,7 @@ class CustomAction(ABC):
     @dataclass
     class RunArg:
         task_detail: TaskDetail
-        current_task_name: str
+        node_name: str
         custom_action_name: str
         custom_action_param: str
         reco_detail: RecognitionDetail
@@ -47,7 +47,7 @@ class CustomAction(ABC):
     def _c_run_agent(
         c_context: MaaContextHandle,
         c_task_id: MaaTaskId,
-        c_current_task_name: ctypes.c_char_p,
+        c_node_name: ctypes.c_char_p,
         c_custom_action_name: ctypes.c_char_p,
         c_custom_action_param: ctypes.c_char_p,
         c_reco_id: MaaRecoId,
@@ -74,7 +74,7 @@ class CustomAction(ABC):
             context,
             CustomAction.RunArg(
                 task_detail=task_detail,
-                current_task_name=c_current_task_name.decode(),
+                node_name=c_node_name.decode(),
                 custom_action_name=c_custom_action_name.decode(),
                 custom_action_param=c_custom_action_param.decode(),
                 reco_detail=reco_detail,

maa/custom_recognition.py

@@ -19,7 +19,7 @@ class CustomRecognition(ABC):
     @dataclass
     class AnalyzeArg:
         task_detail: TaskDetail
-        current_task_name: str
+        node_name: str
         custom_recognition_name: str
         custom_recognition_param: str
         image: numpy.ndarray
@@ -51,7 +51,7 @@ class CustomRecognition(ABC):
     def _c_analyze_agent(
         c_context: MaaContextHandle,
         c_task_id: MaaTaskId,
-        c_current_task_name: ctypes.c_char_p,
+        c_node_name: ctypes.c_char_p,
         c_custom_reco_name: ctypes.c_char_p,
         c_custom_reco_param: ctypes.c_char_p,
         c_image: MaaImageBufferHandle,
@@ -77,7 +77,7 @@ class CustomRecognition(ABC):
                 context,
                 CustomRecognition.AnalyzeArg(
                     task_detail=task_detail,
-                    current_task_name=c_current_task_name.decode(),
+                    node_name=c_node_name.decode(),
                     custom_recognition_name=c_custom_reco_name.decode(),
                     custom_recognition_param=c_custom_reco_param.decode(),
                     image=image,

maa/define.py

@@ -245,7 +245,7 @@ MaaCustomRecognitionCallback = FUNCTYPE(
     MaaBool,  # return value
     MaaContextHandle,  # context
     MaaTaskId,  # task_id
-    ctypes.c_char_p,  # current_task_name
+    ctypes.c_char_p,  # node_name
     ctypes.c_char_p,  # custom_recognition_name
     ctypes.c_char_p,  # custom_recognition_param
     MaaImageBufferHandle,  # image
@@ -259,7 +259,7 @@ MaaCustomActionCallback = FUNCTYPE(
     MaaBool,  # return value
     MaaContextHandle,  # context
     MaaTaskId,  # task_id
-    ctypes.c_char_p,  # current_task_name
+    ctypes.c_char_p,  # node_name
     ctypes.c_char_p,  # custom_action_name
     ctypes.c_char_p,  #
     MaaRecoId,  # reco_id
@@ -372,18 +372,23 @@ class 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
 

maa/job.py

@@ -9,6 +9,7 @@ class Job:
         self._status_func = status_func
         self._wait_func = wait_func
 
+    @property
     def job_id(self) -> int:
         return int(self._job_id)
 
@@ -16,23 +17,29 @@ class Job:
         self._wait_func(self._job_id)
         return self
 
+    @property
     def status(self) -> Status:
         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):

maa/notification_handler.py

@@ -59,34 +59,34 @@ class NotificationHandler(ABC):
         pass
 
     @dataclass
-    class TaskNextListDetail:
+    class NodeNextListDetail:
         task_id: int
         name: str
         next_list: list[str]
 
-    def on_task_next_list(
-        self, noti_type: NotificationType, detail: TaskNextListDetail
+    def on_node_next_list(
+        self, noti_type: NotificationType, detail: NodeNextListDetail
     ):
         pass
 
     @dataclass
-    class TaskRecognitionDetail:
+    class NodeRecognitionDetail:
         task_id: int
         reco_id: int
         name: str
 
-    def on_task_recognition(
-        self, noti_type: NotificationType, detail: TaskRecognitionDetail
+    def on_node_recognition(
+        self, noti_type: NotificationType, detail: NodeRecognitionDetail
     ):
         pass
 
     @dataclass
-    class TaskActionDetail:
+    class NodeActionDetail:
         task_id: int
         node_id: int
         name: str
 
-    def on_task_action(self, noti_type: NotificationType, detail: TaskActionDetail):
+    def on_node_action(self, noti_type: NotificationType, detail: NodeActionDetail):
         pass
 
     def on_unknown_notification(self, msg: str, details: dict):
@@ -121,29 +121,29 @@ class NotificationHandler(ABC):
             )
             self.on_tasker_task(noti_type, detail)
 
-        elif msg.startswith("Task.NextList"):
-            detail = self.TaskNextListDetail(
+        elif msg.startswith("Node.NextList"):
+            detail = self.NodeNextListDetail(
                 task_id=details["task_id"],
                 name=details["name"],
                 next_list=details["list"],
             )
-            self.on_task_next_list(noti_type, detail)
+            self.on_node_next_list(noti_type, detail)
 
-        elif msg.startswith("Task.Recognition"):
-            detail = self.TaskRecognitionDetail(
+        elif msg.startswith("Node.Recognition"):
+            detail = self.NodeRecognitionDetail(
                 task_id=details["task_id"],
                 reco_id=details["reco_id"],
                 name=details["name"],
             )
-            self.on_task_recognition(noti_type, detail)
+            self.on_node_recognition(noti_type, detail)
 
-        elif msg.startswith("Task.Action"):
-            detail = self.TaskActionDetail(
+        elif msg.startswith("Node.Action"):
+            detail = self.NodeActionDetail(
                 task_id=details["task_id"],
                 node_id=details["node_id"],
                 name=details["name"],
             )
-            self.on_task_action(noti_type, detail)
+            self.on_node_action(noti_type, detail)
 
         else:
             self.on_unknown_notification(msg, details)

maa/resource.py

@@ -43,8 +43,10 @@ class Resource:
         if self._handle and self._own:
             Library.framework.MaaResourceDestroy(self._handle)
 
-    def post_path(self, path: Union[pathlib.Path, str]) -> Job:
-        resid = Library.framework.MaaResourcePostPath(self._handle, str(path).encode())
+    def post_bundle(self, path: Union[pathlib.Path, str]) -> Job:
+        resid = Library.framework.MaaResourcePostBundle(
+            self._handle, str(path).encode()
+        )
         return Job(resid, self._status, self._wait)
 
     @property
@@ -212,8 +214,8 @@ class Resource:
         Library.framework.MaaResourceDestroy.restype = None
         Library.framework.MaaResourceDestroy.argtypes = [MaaResourceHandle]
 
-        Library.framework.MaaResourcePostPath.restype = MaaResId
-        Library.framework.MaaResourcePostPath.argtypes = [
+        Library.framework.MaaResourcePostBundle.restype = MaaResId
+        Library.framework.MaaResourcePostBundle.argtypes = [
             MaaResourceHandle,
             ctypes.c_char_p,
         ]

maa/tasker.py

@@ -74,8 +74,8 @@ class Tasker:
     def inited(self) -> bool:
         return bool(Library.framework.MaaTaskerInited(self._handle))
 
-    def post_pipeline(self, entry: str, pipeline_override: Dict = {}) -> JobWithResult:
-        taskid = Library.framework.MaaTaskerPostPipeline(
+    def post_task(self, entry: str, pipeline_override: Dict = {}) -> JobWithResult:
+        taskid = Library.framework.MaaTaskerPostTask(
             self._handle,
             *Tasker._gen_post_param(entry, pipeline_override),
         )
@@ -363,8 +363,8 @@ class Tasker:
         Library.framework.MaaTaskerInited.restype = MaaBool
         Library.framework.MaaTaskerInited.argtypes = [MaaTaskerHandle]
 
-        Library.framework.MaaTaskerPostPipeline.restype = MaaId
-        Library.framework.MaaTaskerPostPipeline.argtypes = [
+        Library.framework.MaaTaskerPostTask.restype = MaaId
+        Library.framework.MaaTaskerPostTask.argtypes = [
             MaaTaskerHandle,
             ctypes.c_char_p,
             ctypes.c_char_p,

MaaFw-2.4.2.dist-info/RECORD

@@ -1,28 +0,0 @@
-maa/__init__.py,sha256=JkhLdjqr1X69SYY2O3qoPhdYImQC_91XS5_eY1vbtEo,230
-maa/buffer.py,sha256=JLxAF8esnAN4SlkZf2OMMlpv0SV3WK7OyMF8w7sTaC8,16617
-maa/context.py,sha256=Y71T92tIAGq6x8bJfYX8emUPEmPUA7nhnWgqOHh390E,5722
-maa/controller.py,sha256=61R4asxDLChiZBSD1hEdGdbpoyOxHttOeflNuJ7DmqM,22381
-maa/custom_action.py,sha256=pqPjDK7nVkGL8fceJadwb7IkeGjYc2X8RaXZOnVZXQs,2527
-maa/custom_recognition.py,sha256=Y3Asdgb19YZioOVZZVs_hLSW6uBg7WDZDQPR2XfZpFU,3087
-maa/define.py,sha256=uvqM04p6NLfju1Zz-EMR-8Af8MZGpEImMAt3QdcYvIA,13114
-maa/job.py,sha256=jXGQ4YV_G8sAi-B7OmUrbPCEIf4xZjWqCSr36LT6Qt0,1153
-maa/library.py,sha256=AwdFx_zWHEah81NwOmD-SDzysSuVbsreDLIaxpWsXvY,1267
-maa/notification_handler.py,sha256=KjQlu66fNVwGGli8kuhNdSZPj2vO_oXjaNt_B1i_5wA,5251
-maa/resource.py,sha256=TAULVwajpPThbLreB0JbhMWTv82r8Y3fFLM2b2VC91Y,9349
-maa/tasker.py,sha256=tYD-YvqRPwMzt-h8UToJ01CsN4mO2mJHEnjsj5tTkSU,14425
-maa/toolkit.py,sha256=BE_o8XgznuW1d_7YairYHOrqOp5Ha9GYMcinsYYBgVM,11163
-maa/bin/DirectML.dll,sha256=nJ5tgiVhxsQbkOaZSz6IV88dZtv7HgxMeZx8ibTpLaE,18527776
-maa/bin/MaaAdbControlUnit.dll,sha256=IvkBu7Ibh0Py1H8I8LVUFNIU3NC3EYc9cIG_0RcgRYE,739840
-maa/bin/MaaDbgControlUnit.dll,sha256=-h0NvpQMkPet-k_1sylPadEKmRZdTkvzYcJVRLlxbFY,390144
-maa/bin/MaaFramework.dll,sha256=Sb1Fo0Y2-cKKq8c-hv6pcaAghlua7MJ1GzrV_4nz2wU,1527808
-maa/bin/MaaToolkit.dll,sha256=afO4V-Agzbp4awEIf36ymCnnulukkLFS6_2m36qQjmo,668160
-maa/bin/MaaUtils.dll,sha256=1zHBiiz3P9xAg0Pw5l-nhev6I42qvzMwNtVReyB91bE,538624
-maa/bin/MaaWin32ControlUnit.dll,sha256=hsrm9t2q5jOY9JEWUsgbzlyzICVNq0HF20v0abdgz-M,325632
-maa/bin/fastdeploy_ppocr_maa.dll,sha256=CUlHQM5FswM5sA8w0cznIn9FeWUqJrcz5amhFjc4FII,1222656
-maa/bin/onnxruntime_maa.dll,sha256=M8x3OILDxCqf4eA4vGsqCogYiHbTSdznrmaIclO9ekQ,19207680
-maa/bin/opencv_world4_maa.dll,sha256=hOYbTOL__zUlQXasinPjt1cgtMR1OfCGe8vWVSp3LFs,18272768
-MaaFw-2.4.2.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-MaaFw-2.4.2.dist-info/METADATA,sha256=_aM1beYh6fwWD0ZYfAiCaoVa81mo6GWPSbUYaTeiKFg,11267
-MaaFw-2.4.2.dist-info/WHEEL,sha256=7fwWHnUhFh8w_0TvE3v3Cyq6xlqIbZ7a_Y5-lVCtqvs,96
-MaaFw-2.4.2.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
-MaaFw-2.4.2.dist-info/RECORD,,