mangoautomation 1.0.59__py3-none-any.whl → 1.1.2__py3-none-any.whl

mangoautomation/enums/_ui_enum.py

@@ -73,10 +73,12 @@ class ElementOperationEnum(BaseEnum):
     ASS = 1
     SQL = 2
     CUSTOM = 3
+    CONDITION = 4
+    PYTHON_CODE = 5
 
     @classmethod
     def obj(cls):
-        return {0: "操作", 1: "断言", 2: "SQL", 3: "参数"}
+        return {0: "元素操作", 1: "断言操作", 2: "SQL变量", 3: "自定义变量", 4: "条件判断", 5: "python代码"}
 
 
 class DeviceEnum(BaseEnum):

mangoautomation/exceptions/error_msg.py

@@ -38,8 +38,8 @@ ERROR_MSG_0029 = (4029, '页面无元素【{}】，表达式：{}')
 ERROR_MSG_0030 = (4030, '断言时没有找到元素')
 ERROR_MSG_0031 = (4031, '元素未找到准备进行断言获取元素文本类容异常')
 ERROR_MSG_0032 = (4032, '元素【{}】的元素表达式定位有多个，或其他元素异常，请检查元素是否可用')
-ERROR_MSG_0036 = (4036, '公共参数sql在数据库中查询不到结果，sql：{}')
-ERROR_MSG_0038 = (4038, '公共参数的sql_key不是列表')
+ERROR_MSG_0036 = (4036, 'sql参数在数据库中查询不到结果，sql：{}')
+ERROR_MSG_0038 = (4038, 'sql参数的sql_key不是列表')
 ERROR_MSG_0040 = (
     340, '设备启动超时！请检查设备是否开启了：文件传输模式、开发者模式、usb调试，开启后请重新连接电脑，设备号：{}')
 ERROR_MSG_0041 = (4041, '查找页面元素【{}】时直接失败，报错信息：{}')

mangoautomation/models/_ui_model.py

@@ -6,6 +6,7 @@
 
 from pydantic import BaseModel
 
+from mangoautomation.enums import ElementOperationEnum
 from mangotools.models import MysqlConingModel, MethodModel
 
 
@@ -18,24 +19,24 @@ class EnvironmentConfigModel(BaseModel):
 
 
 class ElementListModel(BaseModel):
-    exp: int | None
-    loc: str | None
+    exp: int
+    loc: str
+    sub: int | None = None
+    is_iframe: int | None
 
 
 class ElementModel(BaseModel):
     id: int
-    type: int
+    type: ElementOperationEnum
     name: str | None
     elements: list[ElementListModel] = []
     sleep: int | None
-    sub: int | None
-    is_iframe: int | None
     ope_key: str | None
-    ope_value: list[MethodModel] | None
-    key_list: list | None = None
-    sql: str | None = None
-    key: str | None = None
-    value: str | None = None
+    ope_value: list[MethodModel] | None = None
+    sql_execute: list[dict] | None = None
+    custom: list[dict] | None = None
+    condition_value: dict | None = None
+    func: str | None = None
 
 
 class ElementListResultModel(BaseModel):
@@ -43,25 +44,27 @@ class ElementListResultModel(BaseModel):
     exp: int | None = None
     ele_quantity: int = 0
     element_text: str | None = None
+    sub: int | None = None
+    is_iframe: int | None
 
 
 class ElementResultModel(BaseModel):
     id: int
     name: str | None = None
     sleep: int | None = None
-    sub: int | None = None
 
     type: int
     ope_key: str | None = None
-    ope_value: dict = {}
+    ope_value: list[MethodModel] | None = None
+    sql_execute: list[dict] | None = None
+    custom: list[dict] | None = None
+    condition_value: dict | None = None
     ass_msg: str | None = None
-    sql: str | None = None
-    key_list: str | None = None
-    key: str | None = None
-    value: str | None = None
 
     elements: list[ElementListResultModel] = []
     status: int = 0
     error_message: str | None = None
     picture_path: str | None = None
     picture_name: str | None = None
+
+    next_node_id: int | None = None

mangoautomation/uidrive/_async_element.py

@@ -28,8 +28,9 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         super().__init__(base_data)
         self.drive_type = drive_type
         self.element_model: Optional[ElementModel | None] = None
-        self.element_data: dict | None = None
         self.element_result_model: Optional[ElementResultModel | None] = None
+        self.element_list_model: Optional[list[ElementModel] | None] = None
+        self.test_data = self.base_data.test_data
 
     async def open_device(self, is_open: bool = False):
         if self.drive_type == DriveTypeEnum.WEB.value:
@@ -42,21 +43,20 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
             self.base_data.log.debug(f'不存在这个类型，如果是非管理员看到这种提示，请联系管理员')
             raise Exception('不存在的设备类型')
 
-    async def element_main(self, element_model: ElementModel, element_data: dict | None = None) -> ElementResultModel:
+    async def element_main(self,
+                           element_model: ElementModel,
+                           element_list_model: list[ElementModel] | None = None) -> ElementResultModel:
         self.element_model = element_model
-        self.element_data = element_data
+        self.element_list_model = element_list_model
         self.element_result_model = ElementResultModel(
             id=self.element_model.id,
             name=self.element_model.name,
-            sub=self.element_model.sub,
             sleep=self.element_model.sleep,
 
-            type=self.element_model.type,
+            type=self.element_model.type.value,
             ope_key=self.element_model.ope_key,
-            sql=self.element_model.sql,
-            key_list=self.element_model.key_list,
-            key=self.element_model.key,
-            value=self.element_model.value,
+            sql_execute=self.element_model.sql_execute,
+            custom=self.element_model.custom,
 
             status=StatusEnum.FAIL.value,
         )
@@ -91,14 +91,18 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
     @async_retry()
     async def __main(self):
         self.base_data.verify_equipment(self.drive_type)
-        if self.element_model.type == ElementOperationEnum.OPE.value:
+        if self.element_model.type == ElementOperationEnum.OPE:
             await self.__ope()
-        elif self.element_model.type == ElementOperationEnum.ASS.value:
+        elif self.element_model.type == ElementOperationEnum.ASS:
             await self.__ass()
-        elif self.element_model.type == ElementOperationEnum.SQL.value:
+        elif self.element_model.type == ElementOperationEnum.SQL:
             await self.__sql()
-        elif self.element_model.type == ElementOperationEnum.CUSTOM.value:
+        elif self.element_model.type == ElementOperationEnum.CUSTOM:
             await self.__custom()
+        elif self.element_model.type == ElementOperationEnum.CONDITION:
+            await self.__condition()
+        elif self.element_model.type == ElementOperationEnum.PYTHON_CODE:
+            await self.__python_code()
         else:
             raise MangoAutomationError(*ERROR_MSG_0015)
 
@@ -106,11 +110,9 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         try:
             for i in self.element_model.elements:
                 i.loc = self.base_data.test_data.replace(i.loc)
-                self.element_result_model.elements.append(ElementListResultModel(exp=i.exp, loc=i.loc))
+                i.sub = self.base_data.test_data.replace(i.sub)
             self.element_model.sleep = self.base_data.test_data.replace(self.element_model.sleep)
             self.element_result_model.sleep = self.element_model.sleep
-            self.element_model.sub = self.base_data.test_data.replace(self.element_model.sub)
-            self.element_result_model.sub = self.element_model.sub
 
         except MangoAutomationError as error:
             self.base_data.log.error(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
@@ -144,62 +146,76 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
             )
         else:
             pass
-        self.element_result_model.ope_value = {i.f: i.v for i in self.element_model.ope_value if i.d}
+        self.element_result_model.ope_value = self.element_model.ope_value
+        for i in self.element_result_model.ope_value:
+            if not isinstance(i.v, str):
+                i.v = str(i.v)
 
-    async def __ass(self):
+    async def __ass(self, _ope_value: dict | None = None):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         await self.__ope_value(True)
+        ope_value = {i.f: i.v for i in self.element_model.ope_value}
+        if _ope_value is not None:
+            ope_value.update(_ope_value)
         try:
             if self.drive_type == DriveTypeEnum.WEB.value:
                 self.element_result_model.ass_msg = await self.web_assertion_element(
                     self.element_model.name,
                     self.element_model.ope_key,
-                    {i.f: i.v for i in self.element_model.ope_value}
+                    ope_value
                 )
             elif self.drive_type == DriveTypeEnum.ANDROID.value:
                 self.element_result_model.ass_msg = self.a_assertion_element(
                     self.element_model.name,
                     self.element_model.ope_key,
-                    {i.f: i.v for i in self.element_model.ope_value}
+                    ope_value
                 )
             else:
                 pass
         except MangoAutomationError as error:
             self.element_result_model.ass_msg = error.msg
             raise error
-        self.element_result_model.ope_value = {i.f: i.v for i in self.element_model.ope_value if i.d}
+        self.element_result_model.ope_value = self.element_model.ope_value
+        for i in self.element_result_model.ope_value:
+            if not isinstance(i.v, str):
+                i.v = str(i.v)
 
     async def __sql(self):
-        if not self.element_data:
-            sql = self.base_data.test_data.replace(self.element_model.sql)
-            key_list = self.element_model.key_list
-        else:
-            sql = self.base_data.test_data.replace(self.element_data.get('sql'))
-            key_list = self.element_data.get('key_list')
-        if self.base_data.mysql_connect:
+        async def run(sql, key_list):
             result_list: list[dict] = self.base_data.mysql_connect.condition_execute(sql)
-            if isinstance(result_list, list):
-                for result in result_list:
-                    try:
-                        for value, key in zip(result, key_list):
-                            self.base_data.test_data.set_cache(key, result.get(value))
-                    except SyntaxError as error:
-                        self.base_data.log.debug(
-                            f'SQL执行失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
-                        raise MangoAutomationError(*ERROR_MSG_0038)
+            self.base_data.log.debug(f'sql参数->key:{sql}，value:{result_list}')
+            if not isinstance(result_list, list) and not len(result_list) > 0:
+                raise MangoAutomationError(*ERROR_MSG_0036, value=(self.element_model.sql_execute,))
+            self.base_data.test_data.set_sql_cache(key_list, result_list[0])
 
-                if not result_list:
-                    raise MangoAutomationError(*ERROR_MSG_0036, value=(self.element_model.sql,))
+        if self.base_data.mysql_connect:
+            for i in self.element_model.sql_execute:
+                await run(i.get('sql'), i.get('key_list'))
 
     async def __custom(self):
-        if not self.element_data:
-            key = self.element_model.key
-            value = self.element_model.value
-        else:
-            key = self.element_data.get('key')
-            value = self.element_data.get('value')
-        self.base_data.test_data.set_cache(key, self.base_data.test_data.replace(value))
+        for i in self.element_model.custom:
+            self.base_data.test_data.set_cache(i.get('key'), self.base_data.test_data.replace(i.get('value')))
+
+    async def __condition(self):
+        error_list = []
+        for i in self.element_list_model:
+            try:
+                condition_value = self.base_data.test_data.replace(i.condition_value)
+                self.base_data.log.debug(f'执行条件判断数据：{self.element_model.id}，{condition_value}')
+                await self.__ass(condition_value)
+                self.element_result_model.next_node_id = i.id
+                return
+            except Exception as error:
+                self.base_data.log.debug(f'节点判断中-错误：{error}，明细：{traceback.print_exc()}')
+                error_list.append(error)
+        raise error_list[0]
+
+    async def __python_code(self):
+        self.base_data.log.debug(f'执行python函数：{self.element_model.func}')
+        global_namespace = {}
+        exec(self.element_model.func, global_namespace)
+        global_namespace['func'](self)
 
     async def __ope_value(self, is_ass: bool = False):
         try:
@@ -212,28 +228,41 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
                         '_type': self.element_model.type,
                         'exp': self.element_model.elements[random_element].exp,
                         'loc': self.element_model.elements[random_element].loc,
-                        'sub': self.element_model.sub
+                        'sub': self.element_model.elements[random_element].sub
                     }
                     if self.drive_type == DriveTypeEnum.WEB.value:
                         loc, ele_quantity, element_text = await self.web_find_ele(
-                            **find_params, is_iframe=self.element_model.is_iframe)
+                            **find_params, is_iframe=self.element_model.elements[random_element].is_iframe)
                     elif self.drive_type == DriveTypeEnum.ANDROID.value:
                         loc, ele_quantity, element_text = self.a_find_ele(**find_params)
                     else:
                         loc, ele_quantity, element_text = None, 0, None
-                    self.element_result_model.elements[random_element].ele_quantity = ele_quantity
-                    self.element_result_model.elements[random_element].element_text = element_text
+                    new_element = ElementListResultModel(
+                        exp=self.element_model.elements[random_element].exp,
+                        loc=self.element_model.elements[random_element].loc,
+                        sub=self.element_model.elements[random_element].sub,
+                        ele_quantity=ele_quantity,
+                        element_text=element_text,
+                        is_iframe=self.element_model.elements[random_element].is_iframe
+                    )
+
+                    element_exists = any(
+                        existing.exp == new_element.exp and
+                        existing.loc == new_element.loc and
+                        existing.sub == new_element.sub and
+                        existing.is_iframe == new_element.is_iframe
+                        for existing in self.element_result_model.elements
+                    )
+
+                    if not element_exists:
+                        self.element_result_model.elements.append(new_element)
                     if is_ass:
                         if callable(getattr(AsyncWebAssertion, self.element_model.ope_key, None)):
                             i.v = loc
                         elif callable(getattr(MangoAssertion(), self.element_model.ope_key, None)):
-                            i.v = self.element_result_model.element_text
+                            i.v = element_text
                     else:
                         i.v = loc
-                elif self.element_data:
-                    for f, v in self.element_data.items():
-                        if f == i.f:
-                            i.v = self.base_data.test_data.replace(v)
                 i.v = self.base_data.test_data.replace(i.v)
 
         except AttributeError as error:

mangoautomation/uidrive/_sync_element.py

@@ -28,8 +28,9 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         super().__init__(base_data)
         self.drive_type = drive_type
         self.element_model: Optional[ElementModel | None] = None
-        self.element_data: dict | None = None
         self.element_result_model: Optional[ElementResultModel | None] = None
+        self.element_list_model: Optional[list[ElementModel] | None] = None
+        self.test_data = self.base_data.test_data
 
     def open_device(self, is_open: bool = False):
         if self.drive_type == DriveTypeEnum.WEB.value:
@@ -42,21 +43,20 @@ class SyncElement(SyncWebDevice, AndroidDriver):
             self.base_data.log.error(f'不存在这个类型，如果是非管理员看到这种提示，请联系管理员')
             raise Exception('不存在的设备类型')
 
-    def element_main(self, element_model: ElementModel, element_data: dict | None = None) -> ElementResultModel:
+    def element_main(self,
+                     element_model: ElementModel,
+                     element_list_model: list[ElementModel] | None = None) -> ElementResultModel:
         self.element_model = element_model
-        self.element_data = element_data
+        self.element_list_model = element_list_model
         self.element_result_model = ElementResultModel(
             id=self.element_model.id,
             name=self.element_model.name,
-            sub=self.element_model.sub,
             sleep=self.element_model.sleep,
 
-            type=self.element_model.type,
+            type=self.element_model.type.value,
             ope_key=self.element_model.ope_key,
-            sql=self.element_model.sql,
-            key_list=self.element_model.key_list,
-            key=self.element_model.key,
-            value=self.element_model.value,
+            sql_execute=self.element_model.sql_execute,
+            custom=self.element_model.custom,
 
             status=StatusEnum.FAIL.value,
         )
@@ -91,14 +91,18 @@ class SyncElement(SyncWebDevice, AndroidDriver):
     @sync_retry()
     def __main(self):
         self.base_data.verify_equipment(self.drive_type)
-        if self.element_model.type == ElementOperationEnum.OPE.value:
+        if self.element_model.type == ElementOperationEnum.OPE:
             self.__ope()
-        elif self.element_model.type == ElementOperationEnum.ASS.value:
+        elif self.element_model.type == ElementOperationEnum.ASS:
             self.__ass()
-        elif self.element_model.type == ElementOperationEnum.SQL.value:
+        elif self.element_model.type == ElementOperationEnum.SQL:
             self.__sql()
-        elif self.element_model.type == ElementOperationEnum.CUSTOM.value:
+        elif self.element_model.type == ElementOperationEnum.CUSTOM:
             self.__custom()
+        elif self.element_model.type == ElementOperationEnum.CONDITION:
+            self.__condition()
+        elif self.element_model.type == ElementOperationEnum.PYTHON_CODE:
+            self.__python_code()
         else:
             raise MangoAutomationError(*ERROR_MSG_0015)
 
@@ -106,11 +110,9 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         try:
             for i in self.element_model.elements:
                 i.loc = self.base_data.test_data.replace(i.loc)
-                self.element_result_model.elements.append(ElementListResultModel(exp=i.exp, loc=i.loc))
+                i.sub = self.base_data.test_data.replace(i.sub)
             self.element_model.sleep = self.base_data.test_data.replace(self.element_model.sleep)
             self.element_result_model.sleep = self.element_model.sleep
-            self.element_model.sub = self.base_data.test_data.replace(self.element_model.sub)
-            self.element_result_model.sub = self.element_model.sub
 
         except MangoAutomationError as error:
             self.base_data.log.error(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
@@ -144,62 +146,76 @@ class SyncElement(SyncWebDevice, AndroidDriver):
             )
         else:
             pass
-        self.element_result_model.ope_value = {i.f: i.v for i in self.element_model.ope_value if i.d}
+        self.element_result_model.ope_value = self.element_model.ope_value
+        for i in self.element_result_model.ope_value:
+            if not isinstance(i.v, str):
+                i.v = str(i.v)
 
-    def __ass(self):
+    async def __ass(self, _ope_value: dict | None = None):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         self.__ope_value(True)
+        ope_value = {i.f: i.v for i in self.element_model.ope_value}
+        if _ope_value is not None:
+            ope_value.update(_ope_value)
         try:
             if self.drive_type == DriveTypeEnum.WEB.value:
                 self.element_result_model.ass_msg = self.web_assertion_element(
                     self.element_model.name,
                     self.element_model.ope_key,
-                    {i.f: i.v for i in self.element_model.ope_value}
+                    ope_value
                 )
             elif self.drive_type == DriveTypeEnum.ANDROID.value:
                 self.element_result_model.ass_msg = self.a_assertion_element(
                     self.element_model.name,
                     self.element_model.ope_key,
-                    {i.f: i.v for i in self.element_model.ope_value}
+                    ope_value
                 )
             else:
                 pass
         except MangoAutomationError as error:
             self.element_result_model.ass_msg = error.msg
             raise error
-        self.element_result_model.ope_value = {i.f: i.v for i in self.element_model.ope_value if i.d}
+        self.element_result_model.ope_value = self.element_model.ope_value
+        for i in self.element_result_model.ope_value:
+            if not isinstance(i.v, str):
+                i.v = str(i.v)
 
     def __sql(self):
-        if not self.element_data:
-            sql = self.base_data.test_data.replace(self.element_model.sql)
-            key_list = self.element_model.key_list
-        else:
-            sql = self.base_data.test_data.replace(self.element_data.get('sql'))
-            key_list = self.element_data.get('key_list')
-        if self.base_data.mysql_connect:
+        def run(sql, key_list):
             result_list: list[dict] = self.base_data.mysql_connect.condition_execute(sql)
-            if isinstance(result_list, list):
-                for result in result_list:
-                    try:
-                        for value, key in zip(result, key_list):
-                            self.base_data.test_data.set_cache(key, result.get(value))
-                    except SyntaxError as error:
-                        self.base_data.log.debug(
-                            f'SQL执行失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
-                        raise MangoAutomationError(*ERROR_MSG_0038)
+            self.base_data.log.debug(f'sql参数->key:{sql}，value:{result_list}')
+            if not isinstance(result_list, list) and not len(result_list) > 0:
+                raise MangoAutomationError(*ERROR_MSG_0036, value=(self.element_model.sql_execute,))
+            self.base_data.test_data.set_sql_cache(key_list, result_list[0])
 
-                if not result_list:
-                    raise MangoAutomationError(*ERROR_MSG_0036, value=(self.element_model.sql,))
+        if self.base_data.mysql_connect:
+            for i in self.element_model.sql_execute:
+                run(i.get('sql'), i.get('key_list'))
 
     def __custom(self):
-        if not self.element_data:
-            key = self.element_model.key
-            value = self.element_model.value
-        else:
-            key = self.element_data.get('key')
-            value = self.element_data.get('value')
-        self.base_data.test_data.set_cache(key, self.base_data.test_data.replace(value))
+        for i in self.element_model.custom:
+            self.base_data.test_data.set_cache(i.get('key'), self.base_data.test_data.replace(i.get('value')))
+
+    def __condition(self):
+        error_list = []
+        for i in self.element_list_model:
+            try:
+                condition_value = self.base_data.test_data.replace(i.condition_value)
+                self.base_data.log.debug(f'执行条件判断数据：{self.element_model.id}，{condition_value}')
+                self.__ass(condition_value)
+                self.element_result_model.next_node_id = i.id
+                return
+            except Exception as error:
+                self.base_data.log.debug(f'节点判断中-错误：{error}，明细：{traceback.print_exc()}')
+                error_list.append(error)
+        raise error_list[0]
+
+    def __python_code(self):
+        self.base_data.log.debug(f'执行python函数：{self.element_model.func}')
+        global_namespace = {}
+        exec(self.element_model.func, global_namespace)
+        global_namespace['func'](self)
 
     def __ope_value(self, is_ass: bool = False):
         try:
@@ -212,29 +228,42 @@ class SyncElement(SyncWebDevice, AndroidDriver):
                         '_type': self.element_model.type,
                         'exp': self.element_model.elements[random_element].exp,
                         'loc': self.element_model.elements[random_element].loc,
-                        'sub': self.element_model.sub
+                        'sub': self.element_model.elements[random_element].sub
                     }
                     if self.drive_type == DriveTypeEnum.WEB.value:
-                        loc, ele_quantity, element_text = self.web_find_ele(**find_params,
-                                                                            is_iframe=self.element_model.is_iframe)
+                        loc, ele_quantity, element_text = self.web_find_ele(
+                            **find_params,is_iframe=self.element_model.is_iframe)
                     elif self.drive_type == DriveTypeEnum.ANDROID.value:
                         loc, ele_quantity, element_text = self.a_find_ele(**find_params)
                     else:
                         loc, ele_quantity, element_text = None, 0, None
-                    self.element_result_model.elements[random_element].ele_quantity = ele_quantity
-                    self.element_result_model.elements[random_element].element_text = element_text
+                    new_element = ElementListResultModel(
+                        exp=self.element_model.elements[random_element].exp,
+                        loc=self.element_model.elements[random_element].loc,
+                        sub=self.element_model.elements[random_element].sub,
+                        ele_quantity=ele_quantity,
+                        element_text=element_text,
+                        is_iframe=self.element_model.elements[random_element].is_iframe
+                    )
+
+                    element_exists = any(
+                        existing.exp == new_element.exp and
+                        existing.loc == new_element.loc and
+                        existing.sub == new_element.sub and
+                        existing.is_iframe == new_element.is_iframe
+                        for existing in self.element_result_model.elements
+                    )
+
+                    if not element_exists:
+                        self.element_result_model.elements.append(new_element)
                     if is_ass:
                         if callable(getattr(SyncWebAssertion, self.element_model.ope_key, None)):
                             i.v = loc
                         elif callable(getattr(MangoAssertion(), self.element_model.ope_key, None)):
-                            i.v = self.element_result_model.element_text
+                            i.v = element_text
                     else:
                         i.v = loc
-                elif self.element_data:
-                    for f, v in self.element_data.items():
-                        if f == i.f:
-                            i.v = self.base_data.test_data.replace(v)
-                i.v = self.base_data.test_data.replace(i.v)
+                    i.v = self.base_data.test_data.replace(i.v)
 
         except AttributeError as error:
             self.base_data.log.debug(

mangoautomation/uidrive/web/async_web/__init__.py

@@ -126,7 +126,7 @@ class AsyncWebDevice(AsyncWebBrowser,
                     raise MangoAutomationError(*ERROR_MSG_0023)
             if not ele_list:
                 raise MangoAutomationError(*ERROR_MSG_0023)
-            if not ele_list and _type == ElementOperationEnum.OPE.value:
+            if not ele_list and _type == ElementOperationEnum.OPE:
                 raise MangoAutomationError(*ERROR_MSG_0029, value=(name, loc))
             try:
                 count = len(ele_list)

{mangoautomation-1.0.59.dist-info → mangoautomation-1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.59
+Version: 1.1.2
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏

{mangoautomation-1.0.59.dist-info → mangoautomation-1.1.2.dist-info}/RECORD

@@ -1,21 +1,20 @@
 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=rdkejsyc4ogZbyNfZcp1q0V0bDPo14vg0A6or6ShaXA,4494
+mangoautomation/enums/_ui_enum.py,sha256=mT_MfQ7TEw-BgHIqH0wXTA_yVWsaWnd3iHSHi9E0pgA,4599
 mangoautomation/exceptions/__init__.py,sha256=4CmTPcSFypENe3zXzsBUjA5MxXLugnP14dlakmItVjs,227
-mangoautomation/exceptions/_error_msg.py,sha256=S51nDyUr0Jr4hE3i6D24JoGij_d_eeVNsUe2MTuRdJo,5341
 mangoautomation/exceptions/_exceptions.py,sha256=BiyST1QPivpfIOuKn1gKhpXOyBv6gfip_KvlQuu8ctw,385
-mangoautomation/exceptions/error_msg.py,sha256=S51nDyUr0Jr4hE3i6D24JoGij_d_eeVNsUe2MTuRdJo,5341
+mangoautomation/exceptions/error_msg.py,sha256=0jSdviYbhJS0-xB-IvgRnxteM1ArIcFCIsDdbbVZ-RA,5332
 mangoautomation/models/__init__.py,sha256=25zmLzbB4gObJ6nqN7jPYP9LcdlixDKBGVoc7JrwggI,323
-mangoautomation/models/_ui_model.py,sha256=5Fus-YwIn-Pz4KxtAJMwSkYFLTCAhXpNGts6j7d5XUw,1592
+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=n7WtGCseUPYqLkJD10mGJpcVH2HT6EbP8WVrmhipyAA,13885
+mangoautomation/uidrive/_async_element.py,sha256=-sLpkdiVeVfW1YkhJtgiO4_zRgS8XQ6bjkAKX3JywWA,15125
 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=RO-6NWhjqGo2Q5zF14wlmuv2Z2ASgQg7X9Es0eRhaws,13738
+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
@@ -32,7 +31,7 @@ mangoautomation/uidrive/pc/element.py,sha256=LdlWHhvXsaHH6jTp6nNrF81OWPtx81dct4y
 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=Xa5WwPyH_xKHJ6E3j87wYIDIA52fO9DZqkNe981vmJc,8378
+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
@@ -49,11 +48,11 @@ mangoautomation/uidrive/web/sync_web/_input_device.py,sha256=zPFd8xFuLeem9Io0ZBk
 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=LhATAdHROfUKTmndNitFth4b845P7jDN9DugEwq8vAU,383
+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.0.59.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
-mangoautomation-1.0.59.dist-info/METADATA,sha256=EzQOW-l_WBm7rXM8cy2nxm1-mm9GFcVb8KTTiTs26vQ,816
-mangoautomation-1.0.59.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-mangoautomation-1.0.59.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
-mangoautomation-1.0.59.dist-info/RECORD,,
+mangoautomation-1.1.2.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
+mangoautomation-1.1.2.dist-info/METADATA,sha256=ZOiefw7Mzs6YIXY3XRHzGpHsVYRP250vfrKQsFOKIF8,815
+mangoautomation-1.1.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+mangoautomation-1.1.2.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
+mangoautomation-1.1.2.dist-info/RECORD,,

tests/get_ope.py

@@ -3,10 +3,6 @@
 # @Description: 
 # @Time   : 2025-08-31 17:41
 # @Author : 毛鹏
-import json
-from mangoautomation.uidrive import *
-from mangotools.decorator import func_info
-
-print(json.dumps(func_info, ensure_ascii=False, indent=4))
-with open('ope.json', 'w') as f:
-    f.write(json.dumps(func_info, ensure_ascii=False, indent=4))
+loc = 'await page.cdeadapage.'
+cleaned_loc = loc.replace('page.', '').replace('await', '')
+print(cleaned_loc)

mangoautomation/exceptions/_error_msg.py

@@ -1,68 +0,0 @@
-# -*- coding: utf-8 -*-
-# @Project: 芒果测试平台
-# @Description: 错误消息统一管理
-# @Time   : 2024-02-01 10:00
-# @Author : 毛鹏
-
-ERROR_MSG_0001 = (4001, '')
-ERROR_MSG_0002 = (4002, '')
-ERROR_MSG_0003 = (4003, '')
-ERROR_MSG_0004 = (4004, '')
-ERROR_MSG_0005 = (4018, '断言失败，断言输入值是：空字符串、null或不满足函数接受类型')
-ERROR_MSG_0006 = (4006, '')
-ERROR_MSG_0007 = (4007, '安卓设备被关闭，请检查设备')
-ERROR_MSG_0008 = (4008, '浏览器类型不正确，请联系管理员检查')
-ERROR_MSG_0009 = (4009, '浏览器路径不正确，请手动设置一个正确的浏览器路径，现在的路径：{}')
-ERROR_MSG_0010 = (4010, '浏览器被关闭，请不要手动关闭浏览器')
-ERROR_MSG_0011 = (4011, '操作元素【{}】超时，请检查元素可见但是是否可操作或调整定位方式')
-ERROR_MSG_0012 = (4012, '操作失败，请检查输入的值是否有空字符串，null或不满足传参的值')
-ERROR_MSG_0013 = (
-    313, '打开url时超时，分为2个问题：1.启用的浏览器过多，应当减少浏览器并发个数；2.自行查看为啥60秒还未打开：{}')
-ERROR_MSG_0014 = (4014, '')
-ERROR_MSG_0015 = (4015, '没有操作的类型，请联系管理员进行排查问题')
-ERROR_MSG_0016 = (4016, '')
-ERROR_MSG_0017 = (4017, '断言失败： {}')
-ERROR_MSG_0018 = (4018, '')
-ERROR_MSG_0019 = (4019, '配置了sql断言，但是并没有配置mysql的数据库配置，请检查！')
-ERROR_MSG_0020 = (4020, '没有更多的断言方式，请检查是否选择了非该设备类型的元素定位方式')
-ERROR_MSG_0021 = (4021, '元素未找到，请检查断言前操作是否正常完成')
-ERROR_MSG_0022 = (4022, '页面无此元素，请检查传入的元素是否正确')
-ERROR_MSG_0023 = (4023, 'iframe中未找到此元素，请检查元素表达式是否是正确的')
-ERROR_MSG_0024 = (4024, '上传文件的元素必须要是input标签中的')
-ERROR_MSG_0025 = (4025, '无法元素对应的下标，请检查通过下标获取元素的数是否正确，当前元素个数：{}')
-ERROR_MSG_0026 = (4026, '')
-ERROR_MSG_0027 = (4027,
-                  '您元素的操作内容中没有任何的数据，请检查：1.页面步骤详情中字段->元素操作值是否是空，是空可能是你删除了，也可能是执行器的操作选项没有同步需要点击执行器的同步发送缓存数据；2.元素表达式错误导致查询不到元素；')
-ERROR_MSG_0028 = (4028, '')
-ERROR_MSG_0029 = (4029, '页面无元素【{}】，表达式：{}')
-ERROR_MSG_0030 = (4030, '断言时没有找到元素')
-ERROR_MSG_0031 = (4031, '元素未找到准备进行断言获取元素文本类容异常')
-ERROR_MSG_0032 = (4032, '元素【{}】的元素表达式定位有多个，或其他元素异常，请检查元素是否可用')
-ERROR_MSG_0036 = (4036, '公共参数sql在数据库中查询不到结果，sql：{}')
-ERROR_MSG_0038 = (4038, '公共参数的sql_key不是列表')
-ERROR_MSG_0040 = (
-    340, '设备启动超时！请检查设备是否开启了：文件传输模式、开发者模式、usb调试，开启后请重新连接电脑，设备号：{}')
-ERROR_MSG_0041 = (4041, '查找页面元素【{}】时直接失败，报错信息：{}')
-ERROR_MSG_0042 = (4042, '实例化对象错误，设备信息是空无法实例化，请联系管理员检查')
-ERROR_MSG_0043 = (4043, '元素【{}】可能不存在，报错信息：{}')
-ERROR_MSG_0044 = (4044, '元素【{}】可能无法消失，报错信息：{}')
-ERROR_MSG_0045 = (4045, '设备启动超时！请检查设备是否已成功连接电脑，设备号：{}')
-ERROR_MSG_0046 = (4046, '您要测试的设备中，没有您输入的包名，请检查包名是否正确，或者设备是否安装了这个软件包')
-ERROR_MSG_0047 = (4047, '')
-ERROR_MSG_0048 = (4048, '选项发生错误，请在执行器点击发送缓存数据，然后重新修改步骤的操作！或联系管理员处理！')
-ERROR_MSG_0049 = (4049, 'url格式错误，请检查url或者是选择的测试环境不正确')
-ERROR_MSG_0050 = (4050, 'xpath定位未找到元素')
-ERROR_MSG_0051 = (4051, '')
-ERROR_MSG_0052 = (4052, '元素【{}】 进行断言时发生异常，请检查元素是否可以正常使用')
-ERROR_MSG_0053 = (4053, '')
-ERROR_MSG_0054 = (4054, '步骤是操作类型，但是你没有输入操作内容，请查看文档中对元素操作的介绍')
-ERROR_MSG_0055 = (4055, '您的电脑未安装指定浏览器！')
-ERROR_MSG_0056 = (4056, '输入的参数类型不正确，请检查操作输入框的类型是否正确')
-ERROR_MSG_0057 = (
-    357,
-    '创建浏览器的时候失败,如果你开启了视频录制，则需要执行帮助文档中，windows部署的模块最后的安装playwright依赖。如果不是视频录制原因，则请发给管理员！')
-ERROR_MSG_0058 = (4058, '电脑可能无网络，或者设置了代理，浏览器无法进行请求！')
-ERROR_MSG_0059 = (4059, '输入内容的类型不正确')
-ERROR_MSG_0060 = (4060, '请把元素等信息都发给管理员来解决这个报错，报错：{}')
-ERROR_MSG_0061 = (4061, '')
-ERROR_MSG_0062 = (4062, '请执行：playwright install 命令，安装符合要求的浏览器再运行命令行模式的执行器')