MaaFw 4.0.0a2__py3-none-macosx_13_0_x86_64.whl → 4.0.0b2__py3-none-macosx_13_0_x86_64.whl

maa/agent_client.py

@@ -47,6 +47,9 @@ class AgentClient:
     def connect(self) -> bool:
         return bool(Library.agent_client().MaaAgentClientConnect(self._handle))
 
+    def disconnect(self) -> bool:
+        return bool(Library.agent_client().MaaAgentClientDisconnect(self._handle))
+
     _api_properties_initialized: bool = False
 
     @staticmethod
@@ -81,3 +84,8 @@ class AgentClient:
         Library.agent_client().MaaAgentClientConnect.argtypes = [
             MaaAgentClientHandle,
         ]
+
+        Library.agent_client().MaaAgentClientDisconnect.restype = MaaBool
+        Library.agent_client().MaaAgentClientDisconnect.argtypes = [
+            MaaAgentClientHandle,
+        ]

maa/define.py

@@ -53,7 +53,7 @@ MaaCtrlOption = MaaOption
 MaaResOption = MaaOption
 
 
-class MaaGlobalOptionEnum:
+class MaaGlobalOptionEnum(IntEnum):
     Invalid = 0
 
     # Log dir
@@ -89,7 +89,7 @@ class MaaGlobalOptionEnum:
     DebugMode = 6
 
 
-class MaaCtrlOptionEnum:
+class MaaCtrlOptionEnum(IntEnum):
     Invalid = 0
 
     # Only one of long and short side can be set, and the other is automatically scaled according to the aspect ratio.
@@ -111,13 +111,13 @@ class MaaCtrlOptionEnum:
     Recording = 5
 
 
-class MaaInferenceDeviceEnum:
+class MaaInferenceDeviceEnum(IntEnum):
     CPU = -2
     Auto = -1
     # and more gpu id or flag...
 
 
-class MaaInferenceExecutionProviderEnum:
+class MaaInferenceExecutionProviderEnum(IntEnum):
     # I don't recommend setting up MaaResOption_InferenceDevice in this case,
     # because you don't know which EP will be used on different user devices.
     Auto = 0
@@ -140,7 +140,7 @@ class MaaInferenceExecutionProviderEnum:
     CUDA = 4
 
 
-class MaaResOptionEnum:
+class MaaResOptionEnum(IntEnum):
     Invalid = 0
 
     # Use the specified inference device.
@@ -161,7 +161,7 @@ class MaaResOptionEnum:
 MaaAdbScreencapMethod = ctypes.c_uint64
 
 
-class MaaAdbScreencapMethodEnum:
+class MaaAdbScreencapMethodEnum(IntEnum):
     """
     Use bitwise OR to set the method you need
     MaaFramework will test their speed and use the fastest one.
@@ -184,7 +184,7 @@ class MaaAdbScreencapMethodEnum:
 MaaAdbInputMethod = ctypes.c_uint64
 
 
-class MaaAdbInputMethodEnum:
+class MaaAdbInputMethodEnum(IntEnum):
     """
     Use bitwise OR to set the method you need
     MaaFramework will select the available ones according to priority.
@@ -206,7 +206,7 @@ MaaWin32ScreencapMethod = ctypes.c_uint64
 
 
 # No bitwise OR, just set it
-class MaaWin32ScreencapMethodEnum:
+class MaaWin32ScreencapMethodEnum(IntEnum):
     Null = 0
 
     GDI = 1
@@ -218,7 +218,7 @@ MaaWin32InputMethod = ctypes.c_uint64
 
 
 # No bitwise OR, just set it
-class MaaWin32InputMethodEnum:
+class MaaWin32InputMethodEnum(IntEnum):
     Null = 0
 
     Seize = 1
@@ -229,7 +229,7 @@ class MaaWin32InputMethodEnum:
 MaaDbgControllerType = ctypes.c_uint64
 
 
-class MaaDbgControllerTypeEnum:
+class MaaDbgControllerTypeEnum(IntEnum):
     Null = 0
 
     CarouselImage = 1

maa/library.py

@@ -72,7 +72,6 @@ class Library:
     def framework() -> ctypes.CDLL:
         if not Library.is_agent_server():
             if not Library._framework:
-                print(f"Opening framework library: {Library.framework_libpath}")
                 Library._framework = Library._lib_type(str(Library.framework_libpath))
 
             return Library._framework
@@ -82,7 +81,6 @@ class Library:
     @staticmethod
     def toolkit() -> ctypes.CDLL:
         if not Library._toolkit:
-            print(f"Opening toolkit library: {Library.toolkit_libpath}")
             Library._toolkit = Library._lib_type(str(Library.toolkit_libpath))
 
         return Library._toolkit
@@ -93,7 +91,6 @@ class Library:
             raise ValueError("Agent server is not available in the current context.")
 
         if not Library._agent_client:
-            print(f"Opening agent client library: {Library.agent_client_libpath}")
             Library._agent_client = Library._lib_type(
                 str(Library.agent_client_libpath)
             )
@@ -106,7 +103,6 @@ class Library:
             raise ValueError("Agent client is not available in the current context.")
 
         if not Library._agent_server:
-            print(f"Opening agent server library: {Library.agent_server_libpath}")
             Library._agent_server = Library._lib_type(
                 str(Library.agent_server_libpath)
             )

maa/notification_handler.py

@@ -2,13 +2,13 @@ import ctypes
 import json
 from abc import ABC
 from typing import Optional, Tuple
-from enum import Enum
+from enum import IntEnum
 from dataclasses import dataclass
 
 from .define import MaaNotificationCallback
 
 
-# class NotificationEvent(Enum):
+# class NotificationEvent(IntEnum):
 #     ResourceLoading = 1
 #     ControllerAction = 2
 #     TaskerTask = 3
@@ -17,7 +17,7 @@ from .define import MaaNotificationCallback
 #     TaskAction = 6
 
 
-class NotificationType(Enum):
+class NotificationType(IntEnum):
     Unknown = 0
     Starting = 1
     Succeeded = 2

{maafw-4.0.0a2.dist-info → maafw-4.0.0b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: MaaFw
-Version: 4.0.0a2
+Version: 4.0.0b2
 Summary: An automation black-box testing framework based on image recognition
 Author: MaaXYZ
 Project-URL: Homepage, https://github.com/MaaXYZ/MaaFramework
@@ -8,6 +8,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: numpy
+Requires-Dist: strenum
 Requires-Dist: MaaAgentBinary
 
 <!-- markdownlint-disable MD033 MD041 -->

{maafw-4.0.0a2.dist-info → maafw-4.0.0b2.dist-info}/RECORD

@@ -1,34 +1,34 @@
 maa/__init__.py,sha256=t2Z9yJWrSZfH16xYN67bKpiPEHDf7iaiw4wi0PjmU8U,250
-maa/agent_client.py,sha256=M7h0bZ6KQdCIeTMNtVKRnSDP2-NWBlA8WON41ByHDI4,2549
+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=o2k2tM-NstcDpivXPdoritI3laUN1NQl3Yq1M6RkNcE,3055
-maa/define.py,sha256=32xhHQ2gYXQ4pVamLfW6lO5wCA2-9J8KVmr47ZYKde8,13251
+maa/define.py,sha256=qec4GQkYi6AtorJ1ix880Fz67bpZULJOV3VpZEDd2Es,13341
 maa/job.py,sha256=MUI5T2X9ON9c7Dl6yo_0pp8Ulpn25XOD_uEdGm2k-TA,1231
-maa/library.py,sha256=i-YpxpmU-G_AwKdnRMnSSSRXiKDSwbwYdn9IQf1OLJc,4211
-maa/notification_handler.py,sha256=1sFukH3R5l9Fp73CP7DV8fv6gTYge_kb6foSDNcNERY,5251
+maa/library.py,sha256=9af7ncHUk33N5JcacaAk87JLKkP3atu-J8wf-CvfYhw,3891
+maa/notification_handler.py,sha256=563C8mcdmx3f3Q5cqs_lY219CMD_QX1euajc6-ec8sg,5260
 maa/resource.py,sha256=RgHP-SAxwQRGvDOcC0oTYfEE8bOxs-llscgtBKNHRhk,9909
 maa/tasker.py,sha256=Hgi1Pbq20rKnTM3fU5yZP_QjetYNOpov7YulatPWAPI,14551
 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=QXLpSeMY0WF7EJy217ZAj69yz006BlujOEZgLL_t18s,836064
-maa/bin/libMaaAgentClient.dylib,sha256=XcPApO-6OAiDPBC6vvKDq5GAPeFPVlgAP7G9TPWUJuo,1559552
-maa/bin/libMaaAgentServer.dylib,sha256=kp8mG7z2q-AiHMMJ70xJTeg2A7wdhxWCv36HZgUR3rc,1742624
-maa/bin/libMaaDbgControlUnit.dylib,sha256=5gqf7g8LT-1onqfVlMs6e_Fvq4G09Mu8G89DtbDJLXE,408352
-maa/bin/libMaaFramework.dylib,sha256=4c7aP10aI20ZUEvv-ei1ltjyUmR_sz0gqbmW886AZGs,2612592
-maa/bin/libMaaToolkit.dylib,sha256=68deGBHxBGwM25KDK1OXdtaNk-ECaq1dkGlVm2JjLuY,1041440
-maa/bin/libMaaUtils.dylib,sha256=t4FSHlJRlC0nAYAY44tn5I6XwCaMXW1jdcP5Zf1qcjI,666192
+maa/bin/libMaaAdbControlUnit.dylib,sha256=aGQOeec8bYZlxEpg8J6Tg51WaC8vqScYKFt0vzbKd_k,836064
+maa/bin/libMaaAgentClient.dylib,sha256=cBXY78Hj9MtLYODngK9-EGDjCN854tV8WB1SN_ISlNM,1560672
+maa/bin/libMaaAgentServer.dylib,sha256=XnxRPi8k8cen67uHf2v3murU8qmPgom9fAW7VwzZw68,1742912
+maa/bin/libMaaDbgControlUnit.dylib,sha256=hCTrT3QA2nmxpdWuWriO325OifmFubB6vED9wqB2ukI,408352
+maa/bin/libMaaFramework.dylib,sha256=31s3rUeLyQL5RN_W_p-vZxwmQ6TbqhbXFeQDyfpL0pE,2612592
+maa/bin/libMaaToolkit.dylib,sha256=ApB0jEIdOaReymbEw2nLfeyv0sLFSGPEu9rVVY-ocpU,1041776
+maa/bin/libMaaUtils.dylib,sha256=BO6aB2Hk4MlrPzHJ_yerbUf49I66GwcCTN5z9EEtb5A,666608
 maa/bin/libc++.1.dylib,sha256=JgkIYa1p2V7iuU82soZKtsjGiQMbrY7PIZFTXvGTTiU,1119312
 maa/bin/libc++abi.1.dylib,sha256=pZ-bCGTv8rVWFb4mXEGZo72NazBPQBRoFebx61kC3nM,349792
 maa/bin/libfastdeploy_ppocr.dylib,sha256=tSvJPzuSveJXfcZKouwhQvU99Mp1WNFJKVvG1Llobqs,5892048
 maa/bin/libonnxruntime.1.19.2.dylib,sha256=f8EBJ8zYzL1YyofthTy0ochZgofp3yrSZxAbFWZXoXk,20095056
 maa/bin/libopencv_world4.4.8.0.dylib,sha256=4p4JxFEzDj3aIjEmwJ5xU6swYWwC-T2hMpwCIosxV7M,17058736
 maa/bin/libunwind.1.dylib,sha256=J7xL-Nmf8RnImMEUVQhrqJBiAJg5pTFQMW9wlhQrudc,110656
-maafw-4.0.0a2.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-maafw-4.0.0a2.dist-info/METADATA,sha256=vAek11gehEac-cFzrKsRBDnzfs7d66zS2U5gOTqzMOY,13054
-maafw-4.0.0a2.dist-info/WHEEL,sha256=1CApOnkFuWZEkhR9WmDDOaS63zUq6l6hzbJnHzzTYno,104
-maafw-4.0.0a2.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
-maafw-4.0.0a2.dist-info/RECORD,,
+maafw-4.0.0b2.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+maafw-4.0.0b2.dist-info/METADATA,sha256=V8vNGvij2MDh5lQk0NXbeIMf3IxXt5YK04_iLEzQInE,13077
+maafw-4.0.0b2.dist-info/WHEEL,sha256=1CApOnkFuWZEkhR9WmDDOaS63zUq6l6hzbJnHzzTYno,104
+maafw-4.0.0b2.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
+maafw-4.0.0b2.dist-info/RECORD,,