MaaFw 4.0.0b4__py3-none-manylinux2014_x86_64.whl → 4.1.0a2__py3-none-manylinux2014_x86_64.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of MaaFw might be problematic. Click here for more details.

Files changed (14) hide show
  1. maa/bin/libMaaAdbControlUnit.so +0 -0
  2. maa/bin/libMaaAgentClient.so +0 -0
  3. maa/bin/libMaaAgentServer.so +0 -0
  4. maa/bin/libMaaDbgControlUnit.so +0 -0
  5. maa/bin/libMaaFramework.so +0 -0
  6. maa/bin/libMaaToolkit.so +0 -0
  7. maa/bin/libMaaUtils.so +0 -0
  8. maa/custom_recognition.py +7 -1
  9. maa/notification_handler.py +7 -1
  10. maa/tasker.py +7 -0
  11. {maafw-4.0.0b4.dist-info → maafw-4.1.0a2.dist-info}/METADATA +19 -28
  12. {maafw-4.0.0b4.dist-info → maafw-4.1.0a2.dist-info}/RECORD +14 -14
  13. {maafw-4.0.0b4.dist-info → maafw-4.1.0a2.dist-info}/WHEEL +0 -0
  14. {maafw-4.0.0b4.dist-info → maafw-4.1.0a2.dist-info}/licenses/LICENSE.md +0 -0
maa/bin/libMaaAdbControlUnit.so CHANGED
Binary file
maa/bin/libMaaAgentClient.so CHANGED
Binary file
maa/bin/libMaaAgentServer.so CHANGED
Binary file
maa/bin/libMaaDbgControlUnit.so CHANGED
Binary file
maa/bin/libMaaFramework.so CHANGED
Binary file
maa/bin/libMaaToolkit.so CHANGED
Binary file
maa/bin/libMaaUtils.so CHANGED
Binary file
maa/custom_recognition.py CHANGED
@@ -98,7 +98,13 @@ class CustomRecognition(ABC):
98
98
  elif result is None:
99
99
  return int(False)
100
100
 
101
- elif isinstance(result, RectType.__args__):
101
+ # RectType
102
+ elif (
103
+ isinstance(result, Rect)
104
+ or (isinstance(result, list) and len(result) == 4 and all(isinstance(x, int) for x in result))
105
+ or (isinstance(result, numpy.ndarray) and result.size == 4)
106
+ or (isinstance(result, tuple) and len(result) == 4 and all(isinstance(x, int) for x in result))
107
+ ):
102
108
  rect_buffer.set(result)
103
109
  return int(True)
104
110
 
maa/notification_handler.py CHANGED
@@ -1,7 +1,7 @@
1
1
  import ctypes
2
2
  import json
3
3
  from abc import ABC
4
- from typing import Optional, Tuple
4
+ from typing import Optional, Tuple, Any
5
5
  from enum import IntEnum
6
6
  from dataclasses import dataclass
7
7
 
@@ -63,6 +63,7 @@ class NotificationHandler(ABC):
63
63
  task_id: int
64
64
  name: str
65
65
  next_list: list[str]
66
+ focus: Any
66
67
 
67
68
  def on_node_next_list(
68
69
  self, noti_type: NotificationType, detail: NodeNextListDetail
@@ -74,6 +75,7 @@ class NotificationHandler(ABC):
74
75
  task_id: int
75
76
  reco_id: int
76
77
  name: str
78
+ focus: Any
77
79
 
78
80
  def on_node_recognition(
79
81
  self, noti_type: NotificationType, detail: NodeRecognitionDetail
@@ -85,6 +87,7 @@ class NotificationHandler(ABC):
85
87
  task_id: int
86
88
  node_id: int
87
89
  name: str
90
+ focus: Any
88
91
 
89
92
  def on_node_action(self, noti_type: NotificationType, detail: NodeActionDetail):
90
93
  pass
@@ -126,6 +129,7 @@ class NotificationHandler(ABC):
126
129
  task_id=details["task_id"],
127
130
  name=details["name"],
128
131
  next_list=details["list"],
132
+ focus=details["focus"],
129
133
  )
130
134
  self.on_node_next_list(noti_type, detail)
131
135
 
@@ -134,6 +138,7 @@ class NotificationHandler(ABC):
134
138
  task_id=details["task_id"],
135
139
  reco_id=details["reco_id"],
136
140
  name=details["name"],
141
+ focus=details["focus"],
137
142
  )
138
143
  self.on_node_recognition(noti_type, detail)
139
144
 
@@ -142,6 +147,7 @@ class NotificationHandler(ABC):
142
147
  task_id=details["task_id"],
143
148
  node_id=details["node_id"],
144
149
  name=details["name"],
150
+ focus=details["focus"],
145
151
  )
146
152
  self.on_node_action(noti_type, detail)
147
153
 
maa/tasker.py CHANGED
@@ -91,6 +91,10 @@ class Tasker:
91
91
  taskid = Library.framework().MaaTaskerPostStop(self._handle)
92
92
  return self._gen_task_job(taskid)
93
93
 
94
+ @property
95
+ def stopping(self) -> bool:
96
+ return bool(Library.framework().MaaTaskerStopping(self._handle))
97
+
94
98
  def get_latest_node(self, name: str) -> Optional[NodeDetail]:
95
99
  c_node_id = MaaNodeId()
96
100
  ret = bool(
@@ -390,6 +394,9 @@ class Tasker:
390
394
  Library.framework().MaaTaskerPostStop.restype = MaaTaskId
391
395
  Library.framework().MaaTaskerPostStop.argtypes = [MaaTaskerHandle]
392
396
 
397
+ Library.framework().MaaTaskerStopping.restype = MaaBool
398
+ Library.framework().MaaTaskerStopping.argtypes = [MaaTaskerHandle]
399
+
393
400
  Library.framework().MaaTaskerGetResource.restype = MaaResourceHandle
394
401
  Library.framework().MaaTaskerGetResource.argtypes = [MaaTaskerHandle]
395
402
 
{maafw-4.0.0b4.dist-info → maafw-4.1.0a2.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: MaaFw
3
- Version: 4.0.0b4
3
+ Version: 4.1.0a2
4
4
  Summary: An automation black-box testing framework based on image recognition
5
5
  Project-URL: Homepage, https://github.com/MaaXYZ/MaaFramework
6
6
  Author: MaaXYZ
@@ -55,39 +55,37 @@ _✨ 基于图像识别的自动化黑盒测试框架 ✨_
55
55
 
56
56
  ## 最佳实践
57
57
 
58
- - [M9A](https://github.com/MaaXYZ/M9A) 1999 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)
58
+ ### 通用 UI
59
+
60
+ - [MFAWPF](https://github.com/SweetSmellFox/MFAWPF) MFA 任务管理器 ![csharp](https://img.shields.io/badge/C%23-239120?logo=csharp&logoColor=white)
61
+ 基于 MAA 全新架构的 通用 GUI。由 MaaFramework 强力驱动！
62
+
63
+ - [MFW-ELE-GUI](https://github.com/Night-stars-1/maa-gui) MFW-ELE-GUI ![Typescript](https://img.shields.io/badge/Typescript-8A2BE2?logo=typescript) ![Electron](https://img.shields.io/badge/Electron-3776AB?logo=electron&logoColor=black)
64
+ 基于全新架构的 MFW-ELE-GUI。由 MaaFramework 强力驱动！
65
+
66
+ - [MFW-PyQt6](https://github.com/overflow65537/MFW-PyQt6) MFW-PyQt6 ![python](https://img.shields.io/badge/Python-3776AB?logo=python&logoColor=white)
67
+ 基于PyQt6的通用GUI。由 MaaFramework 强力驱动！
68
+
69
+ - [MFAAvalonia](https://github.com/SweetSmellFox/MFAAvalonia) MFAAvalonia ![csharp](https://img.shields.io/badge/C%23-239120?logo=csharp&logoColor=white)
70
+ 基于 Avalonia 的 通用 GUI。由 MaaFramework 强力驱动！
71
+
72
+ ### 应用程序
73
+
74
+ - [M9A](https://github.com/MaaXYZ/M9A) 1999 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF) ![python](https://img.shields.io/badge/Python-3776AB?logo=python&logoColor=white)
59
75
  基于全新架构的 亿韭韭韭 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
60
76
 
61
77
  - [MAABH3](https://github.com/MaaXYZ/MAABH3) 《崩坏3》小助手 | A one-click tool for the daily tasks of Honkai Impact. ![cpp](https://img.shields.io/badge/C%2B%2B-00599C?logo=c%2B%2B&logoColor=white)
62
78
  基于全新架构的 蹦蹦蹦 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
63
79
 
64
- - [MAALimbusCompany](https://github.com/hxdnshx/MAALimbusCompany) 边狱公司 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)
65
- 基于全新架构的 边狱公司 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
66
-
67
80
  - [MAS](https://github.com/MaaXYZ/MaaAssistantSkland) 森空岛 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)
68
81
  基于全新架构的 森空岛 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
69
82
 
70
- - [MaaHatsuboshiTA](https://github.com/Carpenter-MK1/MaaHatsuboshiTA) 学院偶像大师 初星助教 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)
71
- 基于全新架构的制作人代肝工具，养肝护眼 + 节省时间，~~出轨美铃！~~ 由 MaaFramework 强力驱动！
72
-
73
- - [MCCA](https://github.com/MaaXYZ/MCCA) 交错战线 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)
74
- 基于全新架构的 交错战线 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
75
-
76
83
  - [MSBA](https://github.com/overflow65537/MAA_SnowBreak) 尘白禁区 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)
77
84
  基于全新架构的 尘白禁区 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
78
85
 
79
- - [MaaAeonFantasy](https://github.com/Andl-Liu/MaaAeonFantasy) 星神少女 预言之子 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)
80
- 基于全新架构的 星神少女 小助手。图像技术 + 模拟控制，让手去做它该做的事！由 MaaFramework 强力驱动！
81
-
82
- - [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)
83
- 基于全新架构的 物华弥新 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
84
-
85
86
  - [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)
86
87
  基于全新架构的 千年之旅 小助手。图像技术 + 模拟控制，解放侍主的大手！由 MaaFramework 强力驱动！
87
88
 
88
- - [MFAWPF](https://github.com/SweetSmellFox/MFAWPF) MFA 任务管理器 ![csharp](https://img.shields.io/badge/C%23-239120?logo=csharp&logoColor=white)
89
- 基于 MAA 全新架构的 通用 GUI。由 MaaFramework 强力驱动！
90
-
91
89
  - [MET](https://github.com/shanchuan001/MET) 悠久之树 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)
92
90
  基于全新架构的 悠久之树 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
93
91
 
@@ -103,15 +101,9 @@ _✨ 基于图像识别的自动化黑盒测试框架 ✨_
103
101
  - [MaaYuan](https://github.com/syoius/MaaYuan) 代号鸢/如鸢 一键长草小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)
104
102
  基于全新架构的 代号鸢/如鸢 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
105
103
 
106
- - [MFW-ELE-GUI](https://github.com/Night-stars-1/maa-gui) MFW-ELE-GUI ![Typescript](https://img.shields.io/badge/Typescript-8A2BE2?logo=typescript) ![Electron](https://img.shields.io/badge/Electron-3776AB?logo=electron&logoColor=black)
107
- 基于全新架构的 MFW-ELE-GUI。由 MaaFramework 强力驱动！
108
-
109
104
  - [Maa-HBR](https://github.com/KarylDAZE/Maa-HBR) 炽焰天穹/HBR 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)
110
105
  基于全新架构的 炽焰天穹/HBR 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
111
106
 
112
- - [MFW-PyQt6](https://github.com/overflow65537/MFW-PyQt6) MFW-PyQt6 ![python](https://img.shields.io/badge/Python-3776AB?logo=python&logoColor=white)
113
- 基于PyQt6的通用GUI。由 MaaFramework 强力驱动！
114
-
115
107
  - [MaaGF2Exilium](https://github.com/DarkLingYun/MaaGF2Exilium) 少女前线2: 追放自动化助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)
116
108
  基于全新架构的 少女前线2: 追放自动化助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
117
109
 
@@ -127,7 +119,6 @@ _✨ 基于图像识别的自动化黑盒测试框架 ✨_
127
119
  - [MAA_MHXY_MG](https://github.com/gitlihang/Maa_MHXY_MG) 梦幻西游手游 小助手 ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)
128
120
  基于全新架构的 梦幻西游手游 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
129
121
 
130
-
131
122
  ## 生态共建
132
123
 
133
124
  MAA 正计划建设为一类项目，而非舟的单一软件。
@@ -160,7 +151,7 @@ _请留意，仅当您准备开发 MaaFramework 本身时，才需要阅读本
160
151
  - [opencv](https://github.com/opencv/opencv)
161
152
  Open Source Computer Vision Library
162
153
  - [fastdeploy](https://github.com/PaddlePaddle/FastDeploy)
163
- ⚡️An Easy-to-use and Fast Deep Learning Model Deployment Toolkit for ☁️Cloud 📱Mobile and 📹Edge. Including Image, Video, Text and Audio 20+ main stream scenarios and 150+ SOTA models with end-to-end optimization, multi-platform and multi-framework support.
154
+ ⚡️An Easy-to-use and Fast Deep Learning Model Deployment Toolkit for ☁️Cloud 📱Mobile and 📹Edge.
164
155
  - [onnxruntime](https://github.com/microsoft/onnxruntime)
165
156
  ONNX Runtime: cross-platform, high performance ML inferencing and training accelerator
166
157
  - [boost](https://www.boost.org/)
{maafw-4.0.0b4.dist-info → maafw-4.1.0a2.dist-info}/RECORD RENAMED
@@ -4,27 +4,27 @@ maa/buffer.py,sha256=XFr1MnWt-xmZkhQ_2ZzGfiqSJJwmphY4U07EEzMNYQc,16544
4
4
  maa/context.py,sha256=hOxo7GArAmdBwMGHPqM1I2rtNE5N6WR1QwPOLxZgSvU,5754
5
5
  maa/controller.py,sha256=V9ALn24vQX-mWngZbuapBcv-_HNHCtUwHXa3Em2X13s,22517
6
6
  maa/custom_action.py,sha256=V-kJ-5ahcImnzrZBbAH_RJqoiQ7RjBT39ffdSOi9_c4,2495
7
- maa/custom_recognition.py,sha256=o2k2tM-NstcDpivXPdoritI3laUN1NQl3Yq1M6RkNcE,3055
7
+ maa/custom_recognition.py,sha256=P8Kfh4PWoQXyw7loE-9zv_VCD2HUcE6qkIXCK_Ye9a4,3372
8
8
  maa/define.py,sha256=qec4GQkYi6AtorJ1ix880Fz67bpZULJOV3VpZEDd2Es,13341
9
9
  maa/job.py,sha256=MUI5T2X9ON9c7Dl6yo_0pp8Ulpn25XOD_uEdGm2k-TA,1231
10
10
  maa/library.py,sha256=9af7ncHUk33N5JcacaAk87JLKkP3atu-J8wf-CvfYhw,3891
11
- maa/notification_handler.py,sha256=563C8mcdmx3f3Q5cqs_lY219CMD_QX1euajc6-ec8sg,5260
11
+ maa/notification_handler.py,sha256=LFJY6YqF9fJSkRsvpmj6ZL5DexMN_cEOj-HmpWpB9o0,5442
12
12
  maa/resource.py,sha256=RgHP-SAxwQRGvDOcC0oTYfEE8bOxs-llscgtBKNHRhk,9909
13
- maa/tasker.py,sha256=Hgi1Pbq20rKnTM3fU5yZP_QjetYNOpov7YulatPWAPI,14551
13
+ maa/tasker.py,sha256=cAkYW8Mu5rAgsPlSGacTjJ830sF2yFtvlmXRvIJt-A4,14811
14
14
  maa/toolkit.py,sha256=H7P58dPLKzEm_aZMsDJ98IaMZnTE-hcFgK8MKnN0F6g,11381
15
15
  maa/agent/__init__.py,sha256=K4vyyD6YgLR6PEQl86t4oKP4eViCdNr3Br94dNk8YjM,257
16
16
  maa/agent/agent_server.py,sha256=e0yE_ffWJlTPydJbYLK9OhCM5fVVlZQIcvEQMjB5V68,3636
17
- maa/bin/libMaaAdbControlUnit.so,sha256=khUDSbfavx30JS9KOcOgJ_Wk-GPNE1XmYwKoSm-AxtE,36479232
18
- maa/bin/libMaaAgentClient.so,sha256=_tWmkJ7oBnJcz8AksmtDQ8xHm5akUh9Ekb0iXmFcMYk,11828680
19
- maa/bin/libMaaAgentServer.so,sha256=4x_QvecUFOi0QldvwPDTpMoCBnZW0hNNs_UWiCalzhA,27111256
20
- maa/bin/libMaaDbgControlUnit.so,sha256=3AeXXXYAgb1PVoku2JD5EcLaeL8Le1QgMj9YvLl2MO8,9689296
21
- maa/bin/libMaaFramework.so,sha256=Wgubq7Atrkt9xZnH14UC2ldlKCnoHV_8VSmFxlcCV-U,88389280
22
- maa/bin/libMaaToolkit.so,sha256=kK6rbrn5Ds8QSbv9YRNZf8uauezrRJioBcT_Cr20FYI,26278672
23
- maa/bin/libMaaUtils.so,sha256=buGLmlTNCP4Ts6vNws3ZW3O4kwI1kTrmnr_uoLE_orI,12181256
17
+ maa/bin/libMaaAdbControlUnit.so,sha256=Azw_xWf1HcHAGQTaV043Y1I9lQOIb1yzAQOgLmlNAjo,15340928
18
+ maa/bin/libMaaAgentClient.so,sha256=ZLk3IxCoZrGrows-hsFSuoUzG3DtOv89cceLQnbG7TY,7737816
19
+ maa/bin/libMaaAgentServer.so,sha256=RwhI38ipR8OpoHPIYPd7zU1GBl7rbWaauopTpMoppaQ,13927400
20
+ maa/bin/libMaaDbgControlUnit.so,sha256=dekUblrzB-OQNsQLjjfsUKid5HGfKErmY1VwPCJpvWg,4273768
21
+ maa/bin/libMaaFramework.so,sha256=DzMUcC3TTjv_TVKK_Zxcl923O-C9OZ9q32ba31ppNpg,40695432
22
+ maa/bin/libMaaToolkit.so,sha256=pJkxCd5ZYCJZl0chOCo6QF4xb3NDmiPhSUMK7XX4Qog,14078520
23
+ maa/bin/libMaaUtils.so,sha256=dPMFlBu6nVCmont6vU5C52Ow8cPBLv4uQIJ11XGoNME,6123768
24
24
  maa/bin/libfastdeploy_ppocr.so,sha256=ZC3P75Pme8zo6jZ69CTXF3CbD93oVQdVl_awgjYsJqo,6722040
25
25
  maa/bin/libonnxruntime.so.1,sha256=fNYTPb_6EfFcO9F0BFAPzbRoVn5LXNnwIZ02uToi4ns,22362896
26
26
  maa/bin/libopencv_world4.so.408,sha256=wxNzqg0Pk6cJdVHNWzYhsLNs7h3hORzaAQ-YTOVVwM4,21684224
27
- maafw-4.0.0b4.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
28
- maafw-4.0.0b4.dist-info/METADATA,sha256=KR7a3rpcyh4bjU-FyZQmIX0Og9hoPl1vHHGArTH2jXE,13257
29
- maafw-4.0.0b4.dist-info/WHEEL,sha256=ElIck4UKS1gfqi_USxboIISULsrnySUDnW4muwHK3us,104
30
- maafw-4.0.0b4.dist-info/RECORD,,
27
+ maafw-4.1.0a2.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
28
+ maafw-4.1.0a2.dist-info/METADATA,sha256=npmR-gKjLPZwaKe7RO5QbJ9FGh7DWEHVOlGJiNdSV6I,11798
29
+ maafw-4.1.0a2.dist-info/WHEEL,sha256=ElIck4UKS1gfqi_USxboIISULsrnySUDnW4muwHK3us,104
30
+ maafw-4.1.0a2.dist-info/RECORD,,