MaaFw 4.1.1__py3-none-macosx_13_0_arm64.whl → 4.2.0__py3-none-macosx_13_0_arm64.whl

maa/agent_client.py

@@ -9,10 +9,17 @@ from .buffer import StringBuffer
 class AgentClient:
     _handle: MaaAgentClientHandle
 
-    def __init__(self):
+    def __init__(self, identifier: Optional[str] = None):
         self._set_api_properties()
 
-        self._handle = Library.agent_client().MaaAgentClientCreate()
+        if identifier:
+            id_buffer = StringBuffer()
+            id_buffer.set(identifier)
+            id_buffer_handle = id_buffer._handle
+        else:
+            id_buffer_handle = None
+
+        self._handle = Library.agent_client().MaaAgentClientCreateV2(id_buffer_handle)
         if not self._handle:
             raise RuntimeError("Failed to create agent client.")
 
@@ -20,6 +27,15 @@ class AgentClient:
         if self._handle:
             Library.agent_client().MaaAgentClientDestroy(self._handle)
 
+    def identifier(self) -> Optional[str]:
+        id_buffer = StringBuffer()
+        if not Library.agent_client().MaaAgentClientIdentifier(
+            self._handle, id_buffer._handle
+        ):
+            return None
+
+        return id_buffer.get()
+
     def bind(self, resource: Resource) -> bool:
         # avoid gc
         self._resource = resource
@@ -30,26 +46,15 @@ class AgentClient:
             )
         )
 
-    def create_socket(self, identifier: str = "") -> Optional[str]:
-        id_buffer = StringBuffer()
-        id_buffer.set(identifier)
-
-        ret = bool(
-            Library.agent_client().MaaAgentClientCreateSocket(
-                self._handle, id_buffer._handle
-            )
-        )
-        if not ret:
-            return None
-
-        return id_buffer.get()
-
     def connect(self) -> bool:
         return bool(Library.agent_client().MaaAgentClientConnect(self._handle))
 
     def disconnect(self) -> bool:
         return bool(Library.agent_client().MaaAgentClientDisconnect(self._handle))
 
+    def connected(self) -> bool:
+        return bool(Library.agent_client().MaaAgentClientConnected(self._handle))
+
     _api_properties_initialized: bool = False
 
     @staticmethod
@@ -62,8 +67,16 @@ class AgentClient:
 
         AgentClient._api_properties_initialized = True
 
-        Library.agent_client().MaaAgentClientCreate.restype = MaaAgentClientHandle
-        Library.agent_client().MaaAgentClientCreate.argtypes = []
+        Library.agent_client().MaaAgentClientCreateV2.restype = MaaAgentClientHandle
+        Library.agent_client().MaaAgentClientCreateV2.argtypes = [
+            MaaStringBufferHandle,
+        ]
+
+        Library.agent_client().MaaAgentClientIdentifier.restype = MaaBool
+        Library.agent_client().MaaAgentClientIdentifier.argtypes = [
+            MaaAgentClientHandle,
+            MaaStringBufferHandle,
+        ]
 
         Library.agent_client().MaaAgentClientDestroy.restype = None
         Library.agent_client().MaaAgentClientDestroy.argtypes = [MaaAgentClientHandle]
@@ -74,12 +87,6 @@ class AgentClient:
             MaaResourceHandle,
         ]
 
-        Library.agent_client().MaaAgentClientCreateSocket.restype = MaaBool
-        Library.agent_client().MaaAgentClientCreateSocket.argtypes = [
-            MaaAgentClientHandle,
-            MaaStringBufferHandle,
-        ]
-
         Library.agent_client().MaaAgentClientConnect.restype = MaaBool
         Library.agent_client().MaaAgentClientConnect.argtypes = [
             MaaAgentClientHandle,
@@ -89,3 +96,8 @@ class AgentClient:
         Library.agent_client().MaaAgentClientDisconnect.argtypes = [
             MaaAgentClientHandle,
         ]
+
+        Library.agent_client().MaaAgentClientConnected.restype = MaaBool
+        Library.agent_client().MaaAgentClientConnected.argtypes = [
+            MaaAgentClientHandle,
+        ]

maa/resource.py

@@ -1,5 +1,6 @@
 import ctypes
 import pathlib
+import json
 from typing import Any, Optional, Union
 
 from .notification_handler import NotificationHandler
@@ -49,6 +50,24 @@ class Resource:
         )
         return Job(resid, self._status, self._wait)
 
+    def override_pipeline(self, pipeline_override: Dict) -> bool:
+        return bool(
+            Library.framework().MaaResourceOverridePipeline(
+                self._handle,
+                json.dumps(pipeline_override, ensure_ascii=False).encode(),
+            )
+        )
+
+    def override_next(self, name: str, next_list: List[str]) -> bool:
+        list_buffer = StringListBuffer()
+        list_buffer.set(next_list)
+
+        return bool(
+            Library.framework().MaaResourceOverrideNext(
+                self._handle, name.encode(), list_buffer._handle
+            )
+        )
+
     @property
     def loaded(self) -> bool:
         return bool(Library.framework().MaaResourceLoaded(self._handle))
@@ -264,6 +283,19 @@ class Resource:
         Library.framework().MaaResourceClear.restype = MaaBool
         Library.framework().MaaResourceClear.argtypes = [MaaResourceHandle]
 
+        Library.framework().MaaResourceOverridePipeline.restype = MaaBool
+        Library.framework().MaaResourceOverridePipeline.argtypes = [
+            MaaResourceHandle,
+            ctypes.c_char_p,
+        ]
+
+        Library.framework().MaaResourceOverrideNext.restype = MaaBool
+        Library.framework().MaaResourceOverrideNext.argtypes = [
+            MaaResourceHandle,
+            ctypes.c_char_p,
+            MaaStringBufferHandle,
+        ]
+
         Library.framework().MaaResourceGetHash.restype = MaaBool
         Library.framework().MaaResourceGetHash.argtypes = [
             MaaResourceHandle,

{maafw-4.1.1.dist-info → maafw-4.2.0.dist-info}/METADATA

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

maafw-4.2.0.dist-info/RECORD

@@ -0,0 +1,30 @@
+maa/__init__.py,sha256=t2Z9yJWrSZfH16xYN67bKpiPEHDf7iaiw4wi0PjmU8U,250
+maa/agent_client.py,sha256=_3FDk9YBhqhSL8WzkyPbs5W5y2uLJ5iaosW48N1xWkw,3337
+maa/buffer.py,sha256=XFr1MnWt-xmZkhQ_2ZzGfiqSJJwmphY4U07EEzMNYQc,16544
+maa/context.py,sha256=hOxo7GArAmdBwMGHPqM1I2rtNE5N6WR1QwPOLxZgSvU,5754
+maa/controller.py,sha256=V9ALn24vQX-mWngZbuapBcv-_HNHCtUwHXa3Em2X13s,22517
+maa/custom_action.py,sha256=V-kJ-5ahcImnzrZBbAH_RJqoiQ7RjBT39ffdSOi9_c4,2495
+maa/custom_recognition.py,sha256=P8Kfh4PWoQXyw7loE-9zv_VCD2HUcE6qkIXCK_Ye9a4,3372
+maa/define.py,sha256=qec4GQkYi6AtorJ1ix880Fz67bpZULJOV3VpZEDd2Es,13341
+maa/job.py,sha256=MUI5T2X9ON9c7Dl6yo_0pp8Ulpn25XOD_uEdGm2k-TA,1231
+maa/library.py,sha256=9af7ncHUk33N5JcacaAk87JLKkP3atu-J8wf-CvfYhw,3891
+maa/notification_handler.py,sha256=LFJY6YqF9fJSkRsvpmj6ZL5DexMN_cEOj-HmpWpB9o0,5442
+maa/resource.py,sha256=gjcYnhaLzR11jM9nd-QfUeVEsBDgJkubOQ3YiMZN5ic,11529
+maa/tasker.py,sha256=cAkYW8Mu5rAgsPlSGacTjJ830sF2yFtvlmXRvIJt-A4,14811
+maa/toolkit.py,sha256=H7P58dPLKzEm_aZMsDJ98IaMZnTE-hcFgK8MKnN0F6g,11381
+maa/agent/__init__.py,sha256=K4vyyD6YgLR6PEQl86t4oKP4eViCdNr3Br94dNk8YjM,257
+maa/agent/agent_server.py,sha256=e0yE_ffWJlTPydJbYLK9OhCM5fVVlZQIcvEQMjB5V68,3636
+maa/bin/libMaaAdbControlUnit.dylib,sha256=1JXBNSsQja-BM3xwQ3nh8gTlpVaUf8FsdTM6bzhswbs,722712
+maa/bin/libMaaAgentClient.dylib,sha256=u1wF_cZsEW7Ma_mdiziy7i92LpFxXjYawLiOh3RZ96E,1402792
+maa/bin/libMaaAgentServer.dylib,sha256=S1TxhgzEfhW8lp5dkw4lXv0qnnw5mbPDPmr90uLQXYE,1665624
+maa/bin/libMaaDbgControlUnit.dylib,sha256=JkaZYtCbApcdXvjab9DugQ78KTnGF0ajsJRnkI0dr_8,353560
+maa/bin/libMaaFramework.dylib,sha256=xfK01wS0m-pMz2qyGyQQy6BWSKhJ653iMORLmCtO8ow,2338344
+maa/bin/libMaaToolkit.dylib,sha256=_7xmva73TjzDjKnMBGO8kj5hKr1LLPaUPRqVyp0K4BA,918800
+maa/bin/libMaaUtils.dylib,sha256=-T1mzUBx0hqm8NILgRsub7i-guGhOhpmqpTKwOPvXrQ,540480
+maa/bin/libfastdeploy_ppocr.dylib,sha256=HAneULevDZ_uuI-rAYJ18hiV9ERkojA05u2M1jIXt_c,4588632
+maa/bin/libonnxruntime.1.19.2.dylib,sha256=12pPNEJbyCk7FN7wR2-ijm_yH5IbD7h81z3NUiK32OU,17341832
+maa/bin/libopencv_world4.4.8.0.dylib,sha256=a258ojx3MPVIJEUopsaDnLVInfUHh12qjsIM_8j5P_s,13193344
+maafw-4.2.0.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+maafw-4.2.0.dist-info/METADATA,sha256=bCdtl_eUewt7RMm48Exp1jtt07LJnjSfmI-HUg2QsOU,21231
+maafw-4.2.0.dist-info/WHEEL,sha256=SqRtGdpuogbgKRVwFY1Ga4NP7T5_9qclWQUlsSHr8Hw,101
+maafw-4.2.0.dist-info/RECORD,,

maafw-4.1.1.dist-info/RECORD

@@ -1,33 +0,0 @@
-maa/__init__.py,sha256=t2Z9yJWrSZfH16xYN67bKpiPEHDf7iaiw4wi0PjmU8U,250
-maa/agent_client.py,sha256=MGjwVCM_Y60O2pJJn5iCxh0ymg-ebOWlDw2euSaZSu0,2855
-maa/buffer.py,sha256=XFr1MnWt-xmZkhQ_2ZzGfiqSJJwmphY4U07EEzMNYQc,16544
-maa/context.py,sha256=hOxo7GArAmdBwMGHPqM1I2rtNE5N6WR1QwPOLxZgSvU,5754
-maa/controller.py,sha256=V9ALn24vQX-mWngZbuapBcv-_HNHCtUwHXa3Em2X13s,22517
-maa/custom_action.py,sha256=V-kJ-5ahcImnzrZBbAH_RJqoiQ7RjBT39ffdSOi9_c4,2495
-maa/custom_recognition.py,sha256=P8Kfh4PWoQXyw7loE-9zv_VCD2HUcE6qkIXCK_Ye9a4,3372
-maa/define.py,sha256=qec4GQkYi6AtorJ1ix880Fz67bpZULJOV3VpZEDd2Es,13341
-maa/job.py,sha256=MUI5T2X9ON9c7Dl6yo_0pp8Ulpn25XOD_uEdGm2k-TA,1231
-maa/library.py,sha256=9af7ncHUk33N5JcacaAk87JLKkP3atu-J8wf-CvfYhw,3891
-maa/notification_handler.py,sha256=LFJY6YqF9fJSkRsvpmj6ZL5DexMN_cEOj-HmpWpB9o0,5442
-maa/resource.py,sha256=1dRadrja3qgyU8-tIL5C8P-YaZyH-uHKEbysxKIAj_U,10468
-maa/tasker.py,sha256=cAkYW8Mu5rAgsPlSGacTjJ830sF2yFtvlmXRvIJt-A4,14811
-maa/toolkit.py,sha256=H7P58dPLKzEm_aZMsDJ98IaMZnTE-hcFgK8MKnN0F6g,11381
-maa/agent/__init__.py,sha256=K4vyyD6YgLR6PEQl86t4oKP4eViCdNr3Br94dNk8YjM,257
-maa/agent/agent_server.py,sha256=e0yE_ffWJlTPydJbYLK9OhCM5fVVlZQIcvEQMjB5V68,3636
-maa/bin/libMaaAdbControlUnit.dylib,sha256=3omrXZ3LPz5fzMTrE0FsFaD4BT2Q0naYkOS2ZUKrEtc,756192
-maa/bin/libMaaAgentClient.dylib,sha256=BEMDM1gdZt0kbM9V65Wi530KSxmQ9ciNHqzBQKAWl4I,1531104
-maa/bin/libMaaAgentServer.dylib,sha256=GH4pB8WopVh6ZA-KKiqHa0P6IZJprU9_97-RHJifcsI,1704496
-maa/bin/libMaaDbgControlUnit.dylib,sha256=e1cojOYhPAkomSs0abXvytDLrh80Yp-GO6vR5CXyfk8,390320
-maa/bin/libMaaFramework.dylib,sha256=q9iPbcuaapNrh9pxm5naHfMjMqVrP2uOin1QTb3XUF8,2355200
-maa/bin/libMaaToolkit.dylib,sha256=TMly3K0UCbuxB0S7mTw3P0EHNiDs0b2vsg381H7THbk,992016
-maa/bin/libMaaUtils.dylib,sha256=6rKDNwd84f59ROU6iod8WrtCkvfXczWIb_7WWSbCm0U,577424
-maa/bin/libc++.1.dylib,sha256=87iDZynWoWGqCH1zUXVtOHcbDfzxELR0g4gEJelCww0,1152800
-maa/bin/libc++abi.1.dylib,sha256=kyitJ_Wxcww03gLCt9GCQem3gu09294Svh_-VMPLs0U,368288
-maa/bin/libfastdeploy_ppocr.dylib,sha256=Y7j-9roLd1CrfESEYbsO48MLRVOHiQZ0RHtkmwuTWeQ,4606768
-maa/bin/libonnxruntime.1.19.2.dylib,sha256=BGXAmUNxe9WOxZNUl-GHge3begS9EVYS3L5wnOyUMkc,17359936
-maa/bin/libopencv_world4.4.8.0.dylib,sha256=SxL2FZyQCyFqwE3cubrGcdBN9M3uZQFD9DQ4x0Tr5HU,13211472
-maa/bin/libunwind.1.dylib,sha256=h7_pW5cVGaH0tIk3o69oCc7MffvySuya21iqeovqXwk,110528
-maafw-4.1.1.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-maafw-4.1.1.dist-info/METADATA,sha256=nA2mFCnuy8tTbYRvltba0k3nUrD8T2fQumG_oyH1QnE,21231
-maafw-4.1.1.dist-info/WHEEL,sha256=SqRtGdpuogbgKRVwFY1Ga4NP7T5_9qclWQUlsSHr8Hw,101
-maafw-4.1.1.dist-info/RECORD,,