mangoautomation 1.1.21__py3-none-any.whl → 1.1.23__py3-none-any.whl

mangoautomation/{uidrive → uidrives}/web/sync_web/__init__.py

@@ -14,13 +14,13 @@ from mangotools.mangos import Mango
 from ....enums import ElementExpEnum
 from ....exceptions import MangoAutomationError
 from ....exceptions.error_msg import *
-from ....uidrive._base_data import BaseData
-from ....uidrive.web.sync_web._assertion import SyncWebAssertion
-from ....uidrive.web.sync_web._browser import SyncWebBrowser
-from ....uidrive.web.sync_web._customization import SyncWebCustomization
-from ....uidrive.web.sync_web._element import SyncWebElement
-from ....uidrive.web.sync_web._input_device import SyncWebDeviceInput
-from ....uidrive.web.sync_web._page import SyncWebPage
+from ....uidrives._base_data import BaseData
+from ....uidrives.web.sync_web._assertion import SyncWebAssertion
+from ....uidrives.web.sync_web._browser import SyncWebBrowser
+from ....uidrives.web.sync_web._customization import SyncWebCustomization
+from ....uidrives.web.sync_web._element import SyncWebElement
+from ....uidrives.web.sync_web._input_device import SyncWebDeviceInput
+from ....uidrives.web.sync_web._page import SyncWebPage
 
 re = re
 __all__ = [
@@ -54,7 +54,7 @@ class SyncWebDevice(SyncWebBrowser,
         try:
             Mango.s_e(self, ope_key, ope_value)
         except TimeoutError as error:
-            self.base_data.log.error(f'WEB自动化操作失败-1，类型：{type(error)}，失败详情：{error}')
+            self.base_data.log.debug(f'WEB自动化操作失败-1，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0011, value=(name,))
         except Error as error:
             self.base_data.log.error(f'WEB自动化操作失败-2，类型：{type(error)}，失败详情：{error}')

mangoautomation/{uidrive → uidrives}/web/sync_web/_assertion.py

@@ -10,7 +10,7 @@ from mangotools.exceptions.error_msg import ERROR_MSG_0021
 from mangotools.models import MethodModel
 from ....exceptions import MangoAutomationError
 from ....tools import Meta
-from ....uidrive._base_data import BaseData
+from ....uidrives._base_data import BaseData
 
 
 class SyncWebAssertion(metaclass=Meta):

mangoautomation/{uidrive → uidrives}/web/sync_web/_browser.py

@@ -15,7 +15,7 @@ from mangotools.models import MethodModel
 from ....exceptions import MangoAutomationError
 from ....exceptions.error_msg import ERROR_MSG_0049, ERROR_MSG_0013, ERROR_MSG_0058, ERROR_MSG_0059, ERROR_MSG_0010
 from ....tools import Meta
-from ....uidrive._base_data import BaseData
+from ....uidrives._base_data import BaseData
 
 
 class SyncWebBrowser(metaclass=Meta):
@@ -53,11 +53,11 @@ class SyncWebBrowser(metaclass=Meta):
             raise MangoAutomationError(*ERROR_MSG_0058, value=(url,))
 
     @sync_method_callback('web', '浏览器操作', 2, [
-        MethodModel(n='保存路径', f='path', p='请输入截图保存路径', d=True)])
+        MethodModel(n='保存路径', f='path', p='请输入截图名称', d=True)])
     def w_screenshot(self, path: str):
         """整个页面截图"""
         try:
-            self.base_data.page.screenshot(path=path, full_page=True, timeout=10000)
+            self.base_data.page.screenshot(path=os.path.join(self.base_data.screenshot_path, path), full_page=True, timeout=10000)
         except (TargetClosedError, TimeoutError) as error:
             self.base_data.log.debug(
                 f'截图出现异常失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')

mangoautomation/{uidrive → uidrives}/web/sync_web/_customization.py

@@ -4,7 +4,7 @@
 # @Author : 毛鹏
 
 from ....tools import Meta
-from ....uidrive._base_data import BaseData
+from ....uidrives._base_data import BaseData
 
 
 class SyncWebCustomization(metaclass=Meta):

mangoautomation/{uidrive → uidrives}/web/sync_web/_element.py

@@ -12,7 +12,7 @@ from mangotools.models import MethodModel
 from ....exceptions import MangoAutomationError
 from ....exceptions.error_msg import ERROR_MSG_0024, ERROR_MSG_0056
 from ....tools import Meta
-from ....uidrive._base_data import BaseData
+from ....uidrives._base_data import BaseData
 
 
 class SyncWebElement(metaclass=Meta):
@@ -24,15 +24,11 @@ class SyncWebElement(metaclass=Meta):
     @sync_method_callback('web', '元素操作', 0, [MethodModel(f='locating')])
     def w_click(self, locating: Locator):
         """元素单击"""
-        if locating.count() < 1:
-            raise TimeoutError('元素个数小于1，直接操作超时！')
         locating.click()
 
     @sync_method_callback('web', '元素操作', 1, [MethodModel(f='locating')])
     def w_dblclick(self, locating: Locator):
         """元素双击"""
-        if locating.count() < 1:
-            raise TimeoutError('元素个数小于1，直接操作超时！')
         locating.dblclick()
 
     @sync_method_callback('web', '元素操作', 2, [MethodModel(f='locating')])
@@ -45,8 +41,6 @@ class SyncWebElement(metaclass=Meta):
         MethodModel(n='输入文本', f='input_value', p='请输入输入内容', d=True)])
     def w_input(self, locating: Locator, input_value: str):
         """元素输入"""
-        if locating.count() < 1:
-            raise TimeoutError('元素个数小于1，直接操作超时！')
         locating.fill(str(input_value))
 
     @sync_method_callback('web', '元素操作', 4, [MethodModel(f='locating')])
@@ -60,8 +54,6 @@ class SyncWebElement(metaclass=Meta):
         MethodModel(n='缓存的key', f='set_cache_key', p='请输入获取元素文本后存储的key', d=True)])
     def w_get_text(self, locating: Locator, set_cache_key=None):
         """获取元素文本"""
-        if locating.count() < 1:
-            raise TimeoutError('元素个数小于1，直接操作超时！')
         methods = [
             ("inner_text", lambda: locating.inner_text()),
             ("text_content", lambda: locating.text_content()),
@@ -86,8 +78,6 @@ class SyncWebElement(metaclass=Meta):
         MethodModel(n='输入文本', f='input_value', p='请输入输入内容', d=True)])
     def w_clear_input(self, locating: Locator, input_value: str):
         """元素清空再输入"""
-        if locating.count() < 1:
-            raise TimeoutError('元素个数小于1，直接操作超时！')
         locating.clear()
         locating.fill(str(input_value))
 
@@ -237,10 +227,10 @@ class SyncWebElement(metaclass=Meta):
 
     @sync_method_callback('web', '元素操作', 15, [
         MethodModel(f='locating'),
-        MethodModel(n='截图路径', f='path', p='请输入截图保存路径', d=True)])
+        MethodModel(n='截图路径', f='path', p='请输入截图名称', d=True)])
     def w_ele_screenshot(self, locating: Locator, path: str):
         """元素截图"""
-        locating.screenshot(path=path)
+        locating.screenshot(path=os.path.join(self.base_data.download_path, path))
 
     @sync_method_callback('web', '元素操作', 20, [
         MethodModel(f='locating1'),

mangoautomation/{uidrive → uidrives}/web/sync_web/_input_device.py

@@ -5,7 +5,7 @@
 from mangotools.decorator import sync_method_callback
 from mangotools.models import MethodModel
 from ....tools import Meta
-from ....uidrive._base_data import BaseData
+from ....uidrives._base_data import BaseData
 
 
 class SyncWebDeviceInput(metaclass=Meta):

mangoautomation/{uidrive → uidrives}/web/sync_web/_page.py

@@ -5,10 +5,10 @@
 import time
 from playwright.sync_api import Locator
 
-from ....tools import Meta
-from ....uidrive._base_data import BaseData
 from mangotools.decorator import sync_method_callback
 from mangotools.models import MethodModel
+from ....tools import Meta
+from ....uidrives._base_data import BaseData
 
 
 class SyncWebPage(metaclass=Meta):

{mangoautomation-1.1.21.dist-info → mangoautomation-1.1.23.dist-info}/METADATA

@@ -1,16 +1,14 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.1.21
+Version: 1.1.23
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏
 Author-email: 729164035@qq.com
 Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 License-File: LICENSE
-Requires-Dist: setuptools >=68.2.0
+Requires-Dist: setuptools ==78.1.1
 Requires-Dist: pydantic >=2.9.2
 Requires-Dist: playwright ==1.43.0
 Requires-Dist: uiautomation >=2.0.20
@@ -18,6 +16,8 @@ Requires-Dist: uiautomator2 >=3.2.5
 Requires-Dist: mangotools >=1.1.42
 Requires-Dist: adbutils ~=2.8.9
 Requires-Dist: uiautodev >=0.9.0
+Requires-Dist: beautifulsoup4 ==4.14.2
+Requires-Dist: openai ==2.6.1
 
 # testkit
 

mangoautomation-1.1.23.dist-info/RECORD

@@ -0,0 +1,71 @@
+mangoautomation/__init__.py,sha256=JxPNVexFQvkBfh0awPNeHxQGU_gtVgYPwD5rYeuHWEk,125
+mangoautomation/enums/__init__.py,sha256=PnOgNttAXT64elr_Fd1ZthuAddCkm7sh4xwm9Eutm_I,373
+mangoautomation/enums/_base_enum.py,sha256=dpaXsdhWY08BhIzi1B1ksh_p18ZTmhWvTYhbd3n_ONQ,1176
+mangoautomation/enums/_ui_enum.py,sha256=mT_MfQ7TEw-BgHIqH0wXTA_yVWsaWnd3iHSHi9E0pgA,4599
+mangoautomation/exceptions/__init__.py,sha256=2j3ravPuzljR2Mbq8J2JLdXUzII7hzrjdVjmEc_NHJU,211
+mangoautomation/exceptions/_exceptions.py,sha256=BiyST1QPivpfIOuKn1gKhpXOyBv6gfip_KvlQuu8ctw,385
+mangoautomation/exceptions/error_msg.py,sha256=0unQ_tgrRJtVMAOXTzhQJkwO4_7lhMKAMMCfwmzQD58,5517
+mangoautomation/mangos/__init__.py,sha256=gEu8lVHGXm8PDTBZ1XXWNUOAbCtHb37uKQLBRYQR4rs,644
+mangoautomation/mangos/mangos.cp310-win_amd64.pyd,sha256=XkKi2OyGgDxX7lJQnNuJMGiL4b-vntDLwo4wAmOUdrg,1751552
+mangoautomation/mangos/mangos.cp312-win_amd64.pyd,sha256=5ajaOne3Kb1yNEb3Eci1bvjzKIuiJaTPfwBY3f_MK0o,1879040
+mangoautomation/mangos/mangos.cpython-310-darwin.so,sha256=HwZCN0lpGKdAzvygPA4O4Q_xyAd7aDcrZFUzWSqZcWI,3555568
+mangoautomation/mangos/mangos.cpython-310-x86_64-linux-gnu.so,sha256=EaTWB-R4yHJYfkwF0P_YMjlBKY35KTTKrDsAaKCqAZo,10465816
+mangoautomation/mangos/mangos.cpython-312-darwin.so,sha256=iG43WcChIPozrKK98MqBTqDlZFNxKjQSyB0CKu0mIaE,3456880
+mangoautomation/mangos/mangos.cpython-312-x86_64-linux-gnu.so,sha256=P1Hax5huyMm-7eeuWby9mWmTI2HW3JEA8mSvIl65aAk,10670984
+mangoautomation/mangos/__pycache__/__init__.cpython-310.pyc,sha256=kQcwQCOca8l62vfKIC6YKi0lEIUV3Vjnel0ox2bDbOc,608
+mangoautomation/models/__init__.py,sha256=wHACwBCrd9HCvmrAkTFUV3qmK9GnOa-FJFiL0kOQjME,309
+mangoautomation/models/_ui_model.py,sha256=nfxh_4TpOLzKKWC7c-IgMLVZY5wkTPfyS_Oh-SvsYsk,1825
+mangoautomation/tools/__init__.py,sha256=c3IXhoodknOukOyM6db2tXIdDRodgmUZorEAkkruQf0,282
+mangoautomation/tools/_mate.py,sha256=9lk_EJnAX_OyXbe5WacyHkkcEr2ScBgasl6eUnlklWA,405
+mangoautomation/tools/_uiautodev.py,sha256=KYYWOQ_sp91LN_zeKAuIvCqjabb2_1-VhgOg1K7cQrw,1372
+mangoautomation/uidrive/__init__.py,sha256=9N2DTDyLcmgxAHctBjZOb8LwdDeKQnwEOWZ9kNcM4Uw,350
+mangoautomation/uidrives/__init__.py,sha256=JEoWqpoDIch8JiQ7WcnuDh3Bjg0Yqo_xfkbqY5iHSa8,617
+mangoautomation/uidrives/_async_element.py,sha256=87BhadK9BJtcv_VzJUM3kX5sdp8b8Kk-abkU9oE3T7M,16206
+mangoautomation/uidrives/_base_data.py,sha256=gp9730Hd8uarRv8xARIddgMWGhaJ_RKDd_gjewwWr04,4436
+mangoautomation/uidrives/_driver_object.py,sha256=VnnmXO-BODhqEDmqwb2U0G5FwLRdrBKvkrLE2mwC6gs,1951
+mangoautomation/uidrives/_sync_element.py,sha256=TU2E7AKz0Ku4qXLEtxx-whJPJ4KLYLK_EuKgChpcedM,15906
+mangoautomation/uidrives/android/__init__.py,sha256=i6WjXlNq6oUZ4y79Gih_XzI9tV7du-Jrm9IAuROgSzo,5180
+mangoautomation/uidrives/android/_application.py,sha256=G94m53cUzzGuXxPIsvoMuFwJ5RWL_xW5HHFE0TIkrBI,2855
+mangoautomation/uidrives/android/_assertion.py,sha256=FH8sxJC4ZXCbVA9KFBp49Tu8LPWyO26EZYAK7cYaoYE,4350
+mangoautomation/uidrives/android/_customization.py,sha256=7C8j2rv2wDkNu425ooxLSDrGHr_CxJ82sXz1-64id_8,382
+mangoautomation/uidrives/android/_element.py,sha256=ggWEFUbrAGWPQXNvD9JpudwowwvYJrgHdrNXyytAEVw,7213
+mangoautomation/uidrives/android/_equipment.py,sha256=Ul61jpoVr162FIu_2QcJtqWil82ZBC-Kn7_VFQWCUsQ,5216
+mangoautomation/uidrives/android/_new_android.py,sha256=WldFsGm5QnJ9QVPtWxRgwCiWSX3jYObFxAPCQ5xSKyg,1636
+mangoautomation/uidrives/android/_page.py,sha256=IaWiN3kniv2GKfudMLRdvyaqbFLuIfGh7H0HeQrDyVA,4621
+mangoautomation/uidrives/ios/__init__.py,sha256=SdxI8e5AOoAb8JTaDoMkObezIluJ50nm2b6zeDHv1PI,125
+mangoautomation/uidrives/pc/__init__.py,sha256=Jphhspu-3AHCyDX5ZM_-DWeC9ZerWy2Omb3MOck6CI4,2210
+mangoautomation/uidrives/pc/assertion.py,sha256=mH25hZ2i4T8kA1F2loW_nuPJ-Hb0z1pwILTJqkwwpLA,125
+mangoautomation/uidrives/pc/customization.py,sha256=UkpHWFSYsu_t-GmMRDmii1Bs_Y1eKD34oZfJBFHV2Ng,240
+mangoautomation/uidrives/pc/element.py,sha256=OGbJHbgJPBjRjXqM-NIWUnScn7lIHoBxnrakog_s4l8,465
+mangoautomation/uidrives/pc/input_device.py,sha256=k-v7tRW8NkJxzcezqSIfICGRBqEdsssBeRTmtupVTU8,299
+mangoautomation/uidrives/pc/new_windows.py,sha256=lETHZa7cW8Z0iUShzgVTRxqivkYaOo8WIE58q_8KYfQ,2338
+mangoautomation/uidrives/web/__init__.py,sha256=TJyYt6EUoRfWYrV193RHpopKfixipVUp4TrhB5DoEKA,434
+mangoautomation/uidrives/web/_async_web.py,sha256=Uwta7cIYo-0Qe5RbaIvRSQ-IvOxCNtbH_RcIm1JNxEQ,8204
+mangoautomation/uidrives/web/_sync_web.py,sha256=NCF97mYWQBLsOkcEXHKbAGLYGt4rK7NSjks6PubLe_k,8049
+mangoautomation/uidrives/web/async_web/__init__.py,sha256=_jG4DvEbNe4EZTFEBKQhgwRxxIzrdK7APmIicFb0zMk,8379
+mangoautomation/uidrives/web/async_web/_assertion.py,sha256=cG8g_iFMlWcAMDyIfPTJ5lx73BpbGZV5PoAbe1uAy4Q,12821
+mangoautomation/uidrives/web/async_web/_browser.py,sha256=xAaawPbY-rj-HZtcy5LcWUQ_jmdN9Dj4yNUxWxXGCbQ,5421
+mangoautomation/uidrives/web/async_web/_customization.py,sha256=LakibDXpSc-MMxMiwDiktoFccgyiUmWxAVpMOobY9_A,347
+mangoautomation/uidrives/web/async_web/_element.py,sha256=fVJWBUI0C2eFYP8XhLkW2Cez2gdYP1j0PcIBVDzUEk4,10507
+mangoautomation/uidrives/web/async_web/_input_device.py,sha256=wd36vTwsWdq7f52HmEnAF2sNiFVwNxJ2J5bq-lcuuVk,3441
+mangoautomation/uidrives/web/async_web/_new_browser.py,sha256=v-OXD-uYD7XagupxSlG4g_ZBsRq_Jpo88iwE_A_Ilfs,6202
+mangoautomation/uidrives/web/async_web/_page.py,sha256=B1RbnPWaQWa3Sp57ue2sTgcgEr4kTgSEz0DcpA5lOug,2176
+mangoautomation/uidrives/web/sync_web/__init__.py,sha256=gThDpZPtCFdKrxnVYgAsj_6oha9lMed7xoU4XTsLOys,7945
+mangoautomation/uidrives/web/sync_web/_assertion.py,sha256=GEUGvYd3LgisMTgiinFF-Z6nWqxA4EUbvHenw7rPaW0,12595
+mangoautomation/uidrives/web/sync_web/_browser.py,sha256=_Z6NhhP_6N-cxak3X8yUnPzUet7b1tBpI85iAbzwoyQ,5286
+mangoautomation/uidrives/web/sync_web/_customization.py,sha256=Wir5CIGN6YiyVj1-D_zvSWcFuUvQMP8rJ-8boUaU1Bs,356
+mangoautomation/uidrives/web/sync_web/_element.py,sha256=T8Za5wTzSlPleJMz0XkRCbnqSk8OpLHMs3_TalF7xrE,10157
+mangoautomation/uidrives/web/sync_web/_input_device.py,sha256=SwsFi4PiS3sg45MPl_NV88nDrg4SmJ14fV8sODByQ58,3288
+mangoautomation/uidrives/web/sync_web/_new_browser.py,sha256=APGUFhOVAW68x-6y9tQLZJkn2utfR-PrpjgP8WE38SE,6149
+mangoautomation/uidrives/web/sync_web/_page.py,sha256=GbVsK7ZBcoMBnKw2VMPWy3Yt9Jqa84qxrB2Ar2d8aR8,2046
+tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/demo1.py,sha256=5iK5kqaMkebTk-Z4HoMnfi88CRUIBKwT8PVQXFaqgD4,736
+tests/get_ope.py,sha256=SVhSowMNa87hjzGhFlS0vp-t0RB9yKHOC52FsO93UG4,236
+tests/test_ai_element.py,sha256=k__iifxebvPPfGdRS-yzkEH80fBIlKJcZ-m3N6Xkz6Q,1437
+tests/test_ui_and.py,sha256=A_0pqG6s5Ts02He7P3NwuDSK3g9Q3VP1Sb_P8wq6g0Q,125
+tests/test_ui_web.py,sha256=RBACNYc7XdvENHzg4YElsSQlEmPVa_AyOKWTYTPXM14,2578
+mangoautomation-1.1.23.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
+mangoautomation-1.1.23.dist-info/METADATA,sha256=wbPR7Rb4WurD4bh8nDEoKhLSumkIIMM2008pk-Skvso,783
+mangoautomation-1.1.23.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+mangoautomation-1.1.23.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
+mangoautomation-1.1.23.dist-info/RECORD,,

tests/__init__.py

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# @Project: 芒果测试平台
-# @Description: 
-# @Time   : 2024-09-07 23:25
-# @Author : 毛鹏
-import random
-
-data_list = [{'exp': 2, 'loc': 'get_by_role("textbox", name="请输入1密码")'},
-             {'exp': 0, 'loc': '//input[@type="password"]'}]
-print(random.randint(0, len(data_list) - 1), len(data_list))

tests/demo1.py

@@ -0,0 +1,21 @@
+from openai import OpenAI
+
+client = OpenAI(api_key="sk-rruuhjnqawsvduyxlcqckbtgwkprctgkvwcelenooixbhthy",
+                base_url="https://api.siliconflow.cn/v1")
+response = client.chat.completions.create(
+    # model='Pro/deepseek-ai/DeepSeek-R1',
+    model="THUDM/GLM-Z1-9B-0414",
+    messages=[
+        {'role': 'user',
+        'content': "推理模型会给市场带来哪些新的机会"}
+    ],
+    stream=True
+)
+
+for chunk in response:
+    if not chunk.choices:
+        continue
+    if chunk.choices[0].delta.content:
+        print(chunk.choices[0].delta.content, end="", flush=True)
+    if chunk.choices[0].delta.reasoning_content:
+        print(chunk.choices[0].delta.reasoning_content, end="", flush=True)

tests/test_ai_element.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# @Project: 芒果测试平台
+# @Description: 
+# @Time   : 2025-10-28 10:32
+# @Author : 毛鹏
+import unittest
+
+import time
+
+from .demo1 import WebAIFinder
+from mangoautomation.uidrive import BaseData, DriverObject, SyncElement
+from mangoautomation.uidrives import AsyncElement
+from mangotools.data_processor import DataProcessor
+from mangotools.log_collector import set_log
+# api_key = 'sk-'
+# b = 'https://api.siliconflow.cn/v1'
+# model = 'THUDM/GLM-Z1-9B-0414'
+log = set_log('D:\code\mango_automation\logs')
+log.set_debug(True)
+test_data = DataProcessor()
+
+
+class TestUi(unittest.IsolatedAsyncioTestCase):
+    async def test_a(self):
+        driver_object = DriverObject(log, is_async=True)
+        driver_object.set_web(0, r"C:\Program Files\Google\Chrome\Application\chrome.exe")
+        base_data = BaseData(test_data, log)
+        base_data.url = 'https://www.baidu.com/'
+        base_data.context, base_data.page = await driver_object.web.new_web_page()
+        element = AsyncElement(base_data, 0)
+        await element.open_url()
+        loc = await WebAIFinder(log, api_key, b, model).ai_find_element_async(base_data.page, '设置', '设置在右上角', ['//*[text()="设置"]'])
+        await element.w_hover(loc)
+        print('获取元素名称：', await element.w_get_text(loc))
+        time.sleep(5)
+        assert await element.w_get_text(loc) == '设置'

tests/test_ui_web.py

@@ -11,67 +11,67 @@ from mangoautomation.uidrive import AsyncElement, BaseData, DriverObject, SyncEl
 from mangotools.data_processor import DataProcessor
 from mangotools.log_collector import set_log
 
-log = set_log('D:\GitCode\mango_automation\logs')
+log = set_log('D:\code\mango_automation\logs')
+log.set_debug(True)
 test_data = DataProcessor()
-element_model_1 = ElementModel(**{
-    "id": 9,
+element_model = ElementModel(**{
+    "id": 3,
     "type": 0,
-    "name": "搜索结果",
-    "loc": "get_by_role(\"link\", name=\"芒果自动化测试平台: 芒果测试平台是UI和API的自动化测试\")",
-    "exp": 2,
+    "name": "设置",
+    "elements": [
+        {
+            "exp": 0,
+            "loc": "//span[@name=\"tj_settingicons\"]",
+            "sub": None,
+            "is_iframe": 0,
+            "prompt": "设置"
+        }
+    ],
     "sleep": None,
-    "sub": None,
-    "is_iframe": 0,
-    "ope_key": "w_open_new_tab_and_switch",
+    "ope_key": "w_hover",
     "ope_value": [
         {
             "f": "locating",
+            "n": None,
             "p": None,
             "d": False,
             "v": ""
         }
     ],
-    "key_list": None,
-    "sql": None,
-    "key": None,
-    "value": None
-})
-element_model_2 = ElementModel(**{
-    "id": 10, "type": 2, "name": "结果内容", "loc": "get_by_role(\"heading\", name=\"芒果测试平台是集UI，API\")",
-    "exp": 0,
-    "sleep": None, "sub": None, "is_iframe": 0, "ope_key": "w_get_text",
-    "ope_value": [{"f": "locating", "p": None, "d": False, "v": ""},
-                  {"f": "set_cache_key", "p": None, "d": True, "v": "结果内容"}]
+    "sql_execute": None,
+    "custom": None,
+    "condition_value": None,
+    "func": None
 })
 
 
 class TestUi(unittest.IsolatedAsyncioTestCase):
     async def test_a(self):
-        driver_object = DriverObject(True)
+        driver_object = DriverObject(log, True)
         driver_object.set_web(0, r"C:\Program Files\Google\Chrome\Application\chrome.exe")
-        base_data = BaseData(test_data, log)
+        base_data = BaseData(test_data, log).set_agent(True, 'sk-rruuhjnqawsvduyxlcqckbtgwkprctgkvwcelenooixbhthy')
+        base_data.screenshot_path = r'D:\code\mango_automation\logs'
         base_data.log = log
         base_data.url = 'https://www.baidu.com/'
 
         base_data.context, base_data.page = await driver_object.web.new_web_page()
-        element = AsyncElement(base_data, element_model_1, 0)
+        element = AsyncElement(base_data, 0)
         await element.open_url()
         await asyncio.sleep(5)
-        await element.element_main()
-        print(element.element_result_model.model_dump())
-        element = AsyncElement(base_data, element_model_2, 0)
-        await element.element_main()
-        print(element.element_result_model.model_dump())
+        await element.element_main(element_model, )
+        print(element.element_result_model.model_dump_json())
+        assert element.element_result_model.elements[0].element_text == '设置'
 
 
 class TestUi2(unittest.TestCase):
 
     def test_s(self):
-        driver_object = DriverObject()
+        driver_object = DriverObject(log)
         driver_object.set_web(0, r"C:\Program Files\Google\Chrome\Application\chrome.exe")
         base_data = BaseData(test_data, log)
         base_data.url = 'https://www.baidu.com/'
         base_data.context, base_data.page = driver_object.web.new_web_page()
-        element = SyncElement(base_data, element_model_1, 0)
+        element = SyncElement(base_data, 0)
         element.open_url()
-        element.element_main()
+        element.element_main(element_model, )
+        assert element.element_result_model.elements[0].element_text == '设置'

mangoautomation/uidrive/web/__init__.py

@@ -1,5 +0,0 @@
-# -*- coding: utf-8 -*-
-# @Project: 芒果测试平台
-# @Description:
-# @Time   : 2023/5/16 14:50
-# @Author : 毛鹏

mangoautomation-1.1.21.dist-info/RECORD

@@ -1,58 +0,0 @@
-mangoautomation/__init__.py,sha256=6nV7fyiPU5G-kWbrpCQUlkJdhJyPQh27qQaSvNvQkzQ,125
-mangoautomation/enums/__init__.py,sha256=TZnjNeYQRysRolki82U0_s8BQamQ2EjlWFJ-RDDPel8,387
-mangoautomation/enums/_base_enum.py,sha256=dpaXsdhWY08BhIzi1B1ksh_p18ZTmhWvTYhbd3n_ONQ,1176
-mangoautomation/enums/_ui_enum.py,sha256=mT_MfQ7TEw-BgHIqH0wXTA_yVWsaWnd3iHSHi9E0pgA,4599
-mangoautomation/exceptions/__init__.py,sha256=4CmTPcSFypENe3zXzsBUjA5MxXLugnP14dlakmItVjs,227
-mangoautomation/exceptions/_exceptions.py,sha256=BiyST1QPivpfIOuKn1gKhpXOyBv6gfip_KvlQuu8ctw,385
-mangoautomation/exceptions/error_msg.py,sha256=0jSdviYbhJS0-xB-IvgRnxteM1ArIcFCIsDdbbVZ-RA,5332
-mangoautomation/models/__init__.py,sha256=25zmLzbB4gObJ6nqN7jPYP9LcdlixDKBGVoc7JrwggI,323
-mangoautomation/models/_ui_model.py,sha256=6v2nUL41ZJnHX_UEx_C7aAT-QYnDmtKtXyo7V4yvEKg,1787
-mangoautomation/tools/__init__.py,sha256=J-uPfaTZMMo7CL2PY6_5qCO24iIBTtUJTuFXDJz_AZg,296
-mangoautomation/tools/_mate.py,sha256=9lk_EJnAX_OyXbe5WacyHkkcEr2ScBgasl6eUnlklWA,405
-mangoautomation/tools/_uiautodev.py,sha256=RMOQMXse744xwUDb1_l7qDv9mUiqZt1Gm5sbB-nlgDk,1388
-mangoautomation/uidrive/__init__.py,sha256=3xD94fw5QQvBPMPDq2o-SiJI_zt0AdJuB_X0eAFth8g,430
-mangoautomation/uidrive/_async_element.py,sha256=rx5CBqXDgZoY7l_oNdbPE8GnBzF_EOE0_jeDkb8RQJ0,15092
-mangoautomation/uidrive/_base_data.py,sha256=xDjgBJ6CDFajUy18ft-NKe-7vKe7WtgMC9zV6gRrmPY,3946
-mangoautomation/uidrive/_driver_object.py,sha256=7RGiAIPHU_bQtwVPEprnXt-HOzoKuKn_Bu2RZxjSAVs,2055
-mangoautomation/uidrive/_sync_element.py,sha256=9YVegi_mCqgb_JwoagsDqhQTmnAem4zrNzVphrqM24s,14861
-mangoautomation/uidrive/android/__init__.py,sha256=HBYY1L-g7OASchquaUXH7NcpxXpuJVx6Zuw0JbNgq-Y,5524
-mangoautomation/uidrive/android/_application.py,sha256=ic9RbiOAft3wWi6QH6PgcRVN8kiahe3wMyErxsHp3FU,2854
-mangoautomation/uidrive/android/_assertion.py,sha256=ps6uBP4KxcBGJkrlG7m-Caq1rz4UfJhKUNU2YBetu-c,4349
-mangoautomation/uidrive/android/_customization.py,sha256=pCLMmruozOyCJQZWAYupxxKqpWmZyCYsfSBw3XW7vf0,381
-mangoautomation/uidrive/android/_element.py,sha256=3IEUCh9nzgB0hFG0nMcoPC28wMAoDxMS2Tf3gcmm80g,7212
-mangoautomation/uidrive/android/_equipment.py,sha256=TeVFB5QzKTNIAfcV7DMYkQZVzgIGx4_hWQ3Z1RsIKXc,5215
-mangoautomation/uidrive/android/_new_android.py,sha256=WldFsGm5QnJ9QVPtWxRgwCiWSX3jYObFxAPCQ5xSKyg,1636
-mangoautomation/uidrive/android/_page.py,sha256=Ep9btx-2dgaEmjHAVExjB35HQx29PGZ0DHNndIYNpJc,4620
-mangoautomation/uidrive/ios/__init__.py,sha256=SdxI8e5AOoAb8JTaDoMkObezIluJ50nm2b6zeDHv1PI,125
-mangoautomation/uidrive/pc/__init__.py,sha256=gp3T9C5bSA78dv1AgWXeB9yQQi6q5Tkd0NedCencGWo,2275
-mangoautomation/uidrive/pc/assertion.py,sha256=mH25hZ2i4T8kA1F2loW_nuPJ-Hb0z1pwILTJqkwwpLA,125
-mangoautomation/uidrive/pc/customization.py,sha256=hHf66ImrVxFlGtONrWSHUDrYjmWFc4ANJ883TIrJFG8,239
-mangoautomation/uidrive/pc/element.py,sha256=LdlWHhvXsaHH6jTp6nNrF81OWPtx81dct4yDBHikQBg,519
-mangoautomation/uidrive/pc/input_device.py,sha256=F6ZqKja3XkJww66x3l9Idha3R19D832J-5TfiKWmUso,353
-mangoautomation/uidrive/pc/new_windows.py,sha256=lETHZa7cW8Z0iUShzgVTRxqivkYaOo8WIE58q_8KYfQ,2338
-mangoautomation/uidrive/web/__init__.py,sha256=MgTklzty_SvX4UemCnqJuViq3cIjUgAjFoEtP-mcDWw,123
-mangoautomation/uidrive/web/async_web/__init__.py,sha256=1HoxtHLxVOSwrsquoUTwU29DJcYCcQg89p_DOyZ9tJU,8372
-mangoautomation/uidrive/web/async_web/_assertion.py,sha256=2tPSGiJSKmrkiM0bvOd6nfTKTAjDAlosgXcn-oiN0zM,12820
-mangoautomation/uidrive/web/async_web/_browser.py,sha256=mx1m4bPZSdvNOD_8V3gcFUjGMfU3oXj6IJJdlT4ukD0,5381
-mangoautomation/uidrive/web/async_web/_customization.py,sha256=uw6p9uLHLXglgSkH4qjDl1v0iGlaNjvf8LljRH5cAHU,347
-mangoautomation/uidrive/web/async_web/_element.py,sha256=qEwvGZGzDBNhvYiKB3rlgtTS9D07ln-5iPOUIwKzIdI,11064
-mangoautomation/uidrive/web/async_web/_input_device.py,sha256=0EjGkCQWjKY69bTIILNoX7p_6VVfYAVgjNaj4t2r6nk,3440
-mangoautomation/uidrive/web/async_web/_new_browser.py,sha256=v-OXD-uYD7XagupxSlG4g_ZBsRq_Jpo88iwE_A_Ilfs,6202
-mangoautomation/uidrive/web/async_web/_page.py,sha256=DIdyu-TmAUmgkwXDeNzB0p9bqc0Csomj_7ahWcO8ZH0,2175
-mangoautomation/uidrive/web/sync_web/__init__.py,sha256=wV1_y-lsX5qW30ERIvP-X0eRdnwVV3L7uTRCMiowqfo,7938
-mangoautomation/uidrive/web/sync_web/_assertion.py,sha256=2GOhwD7CKtUbsdWmo0aT9pxfBFUQ_bYrjdvRoIBwDNs,12594
-mangoautomation/uidrive/web/sync_web/_browser.py,sha256=b-nBdskqKTFX4Y7xRs8NqEXYulJj9CP2hgLJ9qWnWlQ,5245
-mangoautomation/uidrive/web/sync_web/_customization.py,sha256=E_pfI8gKd0O6r4huJIvA6hoW-X9fSDVL4zEUqhHgxwE,355
-mangoautomation/uidrive/web/sync_web/_element.py,sha256=QIwgQ0cdMc9-oa5TwRTKxxwndUgvVCTogTohSNKhzRs,10683
-mangoautomation/uidrive/web/sync_web/_input_device.py,sha256=zPFd8xFuLeem9Io0ZBkiaJlFoPSHea-A87_vnYHEg80,3287
-mangoautomation/uidrive/web/sync_web/_new_browser.py,sha256=APGUFhOVAW68x-6y9tQLZJkn2utfR-PrpjgP8WE38SE,6149
-mangoautomation/uidrive/web/sync_web/_page.py,sha256=LC7FWr6Exv-KSiSU0y2Zxjd39_QLohe_UD5nvA8htUM,2045
-tests/__init__.py,sha256=fdlqghHH7eXneovXweQjn6gVb8jwm6wprtPw5ksV_IA,350
-tests/get_ope.py,sha256=SVhSowMNa87hjzGhFlS0vp-t0RB9yKHOC52FsO93UG4,236
-tests/test_ui_and.py,sha256=A_0pqG6s5Ts02He7P3NwuDSK3g9Q3VP1Sb_P8wq6g0Q,125
-tests/test_ui_web.py,sha256=MFaUN8O5qKOMMgyk2eelhKZsYcSJm0Do6pCgsdBZEH4,2765
-mangoautomation-1.1.21.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
-mangoautomation-1.1.21.dist-info/METADATA,sha256=4HkJR-sB5b2mJfzCJ2Qzv6y3KiJSOlVKFPKUtPKhPqE,816
-mangoautomation-1.1.21.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-mangoautomation-1.1.21.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
-mangoautomation-1.1.21.dist-info/RECORD,,