mangoautomation 1.0.53__py3-none-any.whl → 1.0.56__py3-none-any.whl

mangoautomation/enums/__init__.py

@@ -7,9 +7,7 @@ import sys
 
 from ..enums._ui_enum import ElementExpEnum, ElementOperationEnum, DeviceEnum, BrowserTypeEnum, DriveTypeEnum
 
-python_version = sys.version_info
-if f"{python_version.major}.{python_version.minor}" != "3.10":
-    raise Exception("必须使用>Python3.10.4")
+
 __all__ = [
     'ElementOperationEnum',
     'DeviceEnum',

mangoautomation/exceptions/__init__.py

@@ -7,8 +7,6 @@ import sys
 
 from ._exceptions import MangoAutomationError
 
-python_version = sys.version_info
-if f"{python_version.major}.{python_version.minor}" != "3.10":
-    raise Exception("必须使用>Python3.10.4")
+
 
 __all__ = ['MangoAutomationError']

mangoautomation/models/__init__.py

@@ -6,9 +6,7 @@ import sys
 
 from ..models._ui_model import ElementModel, ElementResultModel
 
-python_version = sys.version_info
-if f"{python_version.major}.{python_version.minor}" != "3.10":
-    raise Exception("必须使用>Python3.10.4")
+
 __all__ = [
     'ElementModel',
     'ElementResultModel',

mangoautomation/tools/__init__.py

@@ -8,7 +8,5 @@ import sys
 from ..tools._mate import Meta
 from ..tools._uiautodev import start_uiautodev, stop_uiautodev
 
-python_version = sys.version_info
-if f"{python_version.major}.{python_version.minor}" != "3.10":
-    raise Exception("必须使用>Python3.10.4")
+
 __all__ = ['Meta', 'start_uiautodev', 'stop_uiautodev']

mangoautomation/uidrive/__init__.py

@@ -9,9 +9,7 @@ from ..uidrive._base_data import BaseData
 from ..uidrive._driver_object import DriverObject
 from ..uidrive._sync_element import SyncElement
 
-python_version = sys.version_info
-if f"{python_version.major}.{python_version.minor}" != "3.10":
-    raise Exception("必须使用>Python3.10.4")
+
 __all__ = [
     'AsyncElement',
     'BaseData',

mangoautomation/uidrive/_async_element.py

@@ -126,7 +126,6 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         await self.__ope_value()
-        self.element_model.ope_value = self.base_data.test_data.replace(self.element_model.ope_value)
         if self.drive_type == DriveTypeEnum.WEB.value:
             await self.web_action_element(
                 self.element_model.name,
@@ -147,7 +146,6 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         await self.__ope_value(True)
-        self.element_model.ope_value = self.base_data.test_data.replace(self.element_model.ope_value)
         try:
             if self.drive_type == DriveTypeEnum.WEB.value:
                 self.element_result_model.ass_msg = await self.web_assertion_element(
@@ -235,6 +233,7 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
                     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:
             self.base_data.log.debug(

mangoautomation/uidrive/_driver_object.py

@@ -14,7 +14,8 @@ from ..uidrive.web.sync_web._new_browser import SyncWebNewBrowser
 
 class DriverObject:
 
-    def __init__(self, is_async=False):
+    def __init__(self, log, is_async=False):
+        self.log = log
         self.is_async = is_async
         self.web: Optional[AsyncWebNewBrowser | SyncWebNewBrowser] = None
         self.android: Optional[NewAndroid] = None
@@ -41,7 +42,8 @@ class DriverObject:
                 web_h5,
                 is_header_intercept,
                 web_is_default,
-                videos_path
+                videos_path,
+                log=self.log,
             )
         else:
             self.web = SyncWebNewBrowser(
@@ -53,7 +55,8 @@ class DriverObject:
                 web_h5,
                 is_header_intercept,
                 web_is_default,
-                videos_path
+                videos_path,
+                log=self.log,
             )
 
     def set_android(self, and_equipment: str):

mangoautomation/uidrive/_sync_element.py

@@ -126,7 +126,6 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         self.__ope_value()
-        self.element_model.ope_value = self.base_data.test_data.replace(self.element_model.ope_value)
         if self.drive_type == DriveTypeEnum.WEB.value:
             self.web_action_element(
                 self.element_model.name,
@@ -147,7 +146,6 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         self.__ope_value(True)
-        self.element_model.ope_value = self.base_data.test_data.replace(self.element_model.ope_value)
         try:
             if self.drive_type == DriveTypeEnum.WEB.value:
                 self.element_result_model.ass_msg = self.web_assertion_element(
@@ -235,6 +233,7 @@ class SyncElement(SyncWebDevice, AndroidDriver):
                     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:
             self.base_data.log.debug(

mangoautomation/uidrive/web/async_web/_new_browser.py

@@ -35,7 +35,8 @@ class AsyncWebNewBrowser:
                  web_h5=None,
                  is_header_intercept=False,
                  web_is_default=False,
-                 videos_path=None
+                 videos_path=None,
+                 log=None,
                  ):
         self.lock = asyncio.Lock()
         self.web_type = web_type
@@ -47,6 +48,7 @@ class AsyncWebNewBrowser:
         self.web_is_default = web_is_default
         self.is_header_intercept = is_header_intercept
         self.videos_path = videos_path
+        self.log = log
         self.browser_path = ['chrome.exe', 'msedge.exe', 'firefox.exe', '苹果', '360se.exe']
         self.browser: Optional[None | Browser] = None
         self.playwright: Optional[None | Playwright] = None
@@ -61,9 +63,9 @@ class AsyncWebNewBrowser:
             context = await self.new_context()
             page = await self.new_page(context)
             return context, page
-        except Exception as error:
+        except Exception:
+            self.log.error(f'初始化page失败，错误信息：{traceback.format_exc()}')
             self.browser = None
-            print(traceback.format_exc())
             if count >= 3:
                 raise MangoAutomationError(*ERROR_MSG_0057)
             else:
@@ -82,7 +84,8 @@ class AsyncWebNewBrowser:
         if self.web_is_default:
             try:
                 return await browser.launch()
-            except Error:
+            except Error as error:
+                self.log.error(f'初始化浏览器失败-1，类型：{error}，详情：{traceback.format_exc()}')
                 raise MangoAutomationError(*ERROR_MSG_0062)
         else:
             try:
@@ -97,7 +100,8 @@ class AsyncWebNewBrowser:
                         headless=self.web_headers,
                         executable_path=self.web_path if self.web_path else self.__search_path()
                     )
-            except Error:
+            except Error as error:
+                self.log.error(f'初始化浏览器失败-2，类型：{error}，详情：{traceback.format_exc()}')
                 raise MangoAutomationError(*ERROR_MSG_0009, value=(self.web_path,))
 
     async def new_context(self) -> BrowserContext:
@@ -118,7 +122,8 @@ class AsyncWebNewBrowser:
             if self.is_header_intercept:
                 await page.route("**/*", self.wen_intercept_request)  # 应用拦截函数到页面的所有请求
             return page
-        except Error:
+        except Error as error:
+            self.log.error(f'初始化page失败，类型：{error}，详情：{traceback.format_exc()}')
             raise MangoAutomationError(*ERROR_MSG_0009, value=(self.web_path,))
 
     async def close(self):

mangoautomation/uidrive/web/sync_web/_new_browser.py

@@ -24,7 +24,6 @@ from ....exceptions import MangoAutomationError
 from ....exceptions._error_msg import ERROR_MSG_0057, ERROR_MSG_0008, ERROR_MSG_0062, ERROR_MSG_0009, ERROR_MSG_0055
 
 
-
 class SyncWebNewBrowser:
 
     def __init__(self,
@@ -36,7 +35,8 @@ class SyncWebNewBrowser:
                  web_h5=None,
                  is_header_intercept=False,
                  web_is_default=False,
-                 videos_path=None
+                 videos_path=None,
+                 log=None,
                  ):
         self.lock = threading.Lock()
         self.web_type = web_type
@@ -48,6 +48,7 @@ class SyncWebNewBrowser:
         self.web_is_default = web_is_default
         self.videos_path = videos_path
         self.is_header_intercept = is_header_intercept
+        self.log = log
         self.browser_path = ['chrome.exe', 'msedge.exe', 'firefox.exe', '苹果', '360se.exe']
         self.browser: Optional[None | Browser] = None
         self.playwright: Optional[None | Playwright] = None
@@ -55,15 +56,16 @@ class SyncWebNewBrowser:
     def new_web_page(self, count=0) -> tuple[BrowserContext, Page]:
         if self.browser is None:
             with self.lock:
-                self.browser = self.new_browser()
-                time.sleep(1)
+                if self.browser is None:
+                    self.browser = self.new_browser()
+                    time.sleep(1)
         try:
             context = self.new_context()
             page = self.new_page(context)
             return context, page
-        except Exception as error:
+        except Exception:
+            self.log.error(f'初始化page失败，错误信息：{traceback.format_exc()}')
             self.browser = None
-            traceback.format_exc()
             if count >= 3:
                 raise MangoAutomationError(*ERROR_MSG_0057)
             else:
@@ -82,7 +84,8 @@ class SyncWebNewBrowser:
         if self.web_is_default:
             try:
                 return browser.launch()
-            except Error:
+            except Error as error:
+                self.log.error(f'初始化浏览器失败-1，类型：{error}，详情：{traceback.format_exc()}')
                 raise MangoAutomationError(*ERROR_MSG_0062)
         else:
             try:
@@ -97,7 +100,8 @@ class SyncWebNewBrowser:
                         headless=self.web_headers,
                         executable_path=self.web_path if self.web_path else self.__search_path()
                     )
-            except Error:
+            except Error as error:
+                self.log.error(f'初始化浏览器失败-2，类型：{error}，详情：{traceback.format_exc()}')
                 raise MangoAutomationError(*ERROR_MSG_0009, value=(self.web_path,))
 
     def new_context(self) -> BrowserContext:
@@ -118,7 +122,8 @@ class SyncWebNewBrowser:
             if self.is_header_intercept:
                 page.route("**/*", self.wen_intercept_request)  # 应用拦截函数到页面的所有请求
             return page
-        except Error:
+        except Error as error:
+            self.log.error(f'初始化page失败，类型：{error}，详情：{traceback.format_exc()}')
             raise MangoAutomationError(*ERROR_MSG_0009, value=(self.web_path,))
 
     def close(self):

mangoautomation-1.0.56.dist-info/METADATA

@@ -0,0 +1,42 @@
+Metadata-Version: 2.4
+Name: mangoautomation
+Version: 1.0.56
+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: pydantic>=2.9.2
+Requires-Dist: playwright==1.43.0
+Requires-Dist: uiautomation>=2.0.20
+Requires-Dist: uiautomator2>=3.2.5
+Requires-Dist: mangotools>=1.1.28
+Requires-Dist: adbutils~=2.8.9
+Requires-Dist: uiautodev>=0.9.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
+
+# testkit
+
+#### 介绍
+
+测试工具
+
+#### 安装教程
+
+1. pip install mangokit
+
+#### 使用说明
+
+1.  

{mangoautomation-1.0.53.dist-info → mangoautomation-1.0.56.dist-info}/RECORD

@@ -1,20 +1,20 @@
 mangoautomation/__init__.py,sha256=6nV7fyiPU5G-kWbrpCQUlkJdhJyPQh27qQaSvNvQkzQ,125
-mangoautomation/enums/__init__.py,sha256=xPv6158_Tup3U9rbYtUGgWR8W479-7czLvcRk4DUbLs,534
+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/exceptions/__init__.py,sha256=dXtRZSuYg3e_lwYUKYvYjtxTKHITdbi2l9XkHk9DpfY,374
+mangoautomation/exceptions/__init__.py,sha256=4CmTPcSFypENe3zXzsBUjA5MxXLugnP14dlakmItVjs,227
 mangoautomation/exceptions/_error_msg.py,sha256=wnyHrBPE4ZGcWhvz8bD2K-8rMRRwcUIVVYIHWdhYM2U,5335
 mangoautomation/exceptions/_exceptions.py,sha256=BiyST1QPivpfIOuKn1gKhpXOyBv6gfip_KvlQuu8ctw,385
-mangoautomation/models/__init__.py,sha256=59J8VjshTxZK4xX_-_NBqdLZ1OuvuZPSpljY1Jc-4eQ,416
+mangoautomation/models/__init__.py,sha256=VaL1_5Dvm2g70NGgWCKzbje4VQzJhcnAAdg4JP1WJ_U,269
 mangoautomation/models/_ui_model.py,sha256=wKiBNpGDhSVCAYf798I0bMzdhCGXfSOptMCQrBLTUCM,1416
-mangoautomation/tools/__init__.py,sha256=cc6zpsEdp3JiIx7HfOz-Vob7oTIIFzsuxDLgl20har4,443
+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=Tk_gh4Qg2qnewEGxa-7Id4fkQLY3fvQE4X7JB0BEscY,577
-mangoautomation/uidrive/_async_element.py,sha256=tQd7D8xTU77TVGaAn4L7VXA0PPb0q0wy0mEXjT1dJL4,13902
+mangoautomation/uidrive/__init__.py,sha256=3xD94fw5QQvBPMPDq2o-SiJI_zt0AdJuB_X0eAFth8g,430
+mangoautomation/uidrive/_async_element.py,sha256=-nkYBazbYlitsTIfN8XhKIM8GitQifoZ0aTqaOH05Nk,13757
 mangoautomation/uidrive/_base_data.py,sha256=ur2Ts40MAhOYXb0vGVXZdSwEVCI3Csri9I9f1pw1r4Y,3766
-mangoautomation/uidrive/_driver_object.py,sha256=Re8j6VLHKfwW2VFdi-1XFRuix8tRBLcHYRBLVF6CApE,1962
-mangoautomation/uidrive/_sync_element.py,sha256=7d83EKZ-iUuKDn5et4qLrMEPTQgl6CS-efpVkMTvjVc,13721
+mangoautomation/uidrive/_driver_object.py,sha256=7RGiAIPHU_bQtwVPEprnXt-HOzoKuKn_Bu2RZxjSAVs,2055
+mangoautomation/uidrive/_sync_element.py,sha256=Zdg5LwNeZBjctpojPmjQfMgrsAAne_w_KWFwhucSlxA,13576
 mangoautomation/uidrive/android/__init__.py,sha256=SWn7PwRZOf34LCE9KigClDaV8R0n70rqLsG6hCeAok0,5499
 mangoautomation/uidrive/android/_application.py,sha256=EeEM0MPtOPeYeKx92mtMFWqGpCRmri-D_CzXvPt13RA,2800
 mangoautomation/uidrive/android/_assertion.py,sha256=Gzic7cH3_Vr6NLiMBPRJr7q1F8YFF2dEopINMR4XQFc,4289
@@ -37,7 +37,7 @@ mangoautomation/uidrive/web/async_web/_browser.py,sha256=39YroURzagpq0HoEn1RZnNf
 mangoautomation/uidrive/web/async_web/_customization.py,sha256=uw6p9uLHLXglgSkH4qjDl1v0iGlaNjvf8LljRH5cAHU,347
 mangoautomation/uidrive/web/async_web/_element.py,sha256=Si0ql_vGtgzacEaSEbglGTw96qdYHcsYEbYqgtIgYCo,10150
 mangoautomation/uidrive/web/async_web/_input_device.py,sha256=sMAMHb_8QyPx3pKci0gRDQc2O7h1OYMGyA7fCWl81iM,3288
-mangoautomation/uidrive/web/async_web/_new_browser.py,sha256=WsQ-s2QCjXiePN_u4bLwpds_QpuDd9V2w6hLuLCB-zg,5624
+mangoautomation/uidrive/web/async_web/_new_browser.py,sha256=iQMQhNHKsz-4yPvXUiir-OwFZQLZbaRtDEwIydimUMs,6089
 mangoautomation/uidrive/web/async_web/_page.py,sha256=TCYf79qQdVBBTTNq2COZFJVcLCgg5Ksu9lMgmQPVInU,2147
 mangoautomation/uidrive/web/sync_web/__init__.py,sha256=31U15FJftsv6yyDlKT-2zN0CNPyolZPRuPh7mdeKKas,7961
 mangoautomation/uidrive/web/sync_web/_assertion.py,sha256=hVA7-Z3CfPgkmtnK_3M5UGo6sct88W6AJfQTnrqu9jU,12534
@@ -45,13 +45,13 @@ mangoautomation/uidrive/web/sync_web/_browser.py,sha256=c7xHkIIFPawlzcVkGjwqeKfW
 mangoautomation/uidrive/web/sync_web/_customization.py,sha256=E_pfI8gKd0O6r4huJIvA6hoW-X9fSDVL4zEUqhHgxwE,355
 mangoautomation/uidrive/web/sync_web/_element.py,sha256=KkgLxGVwdl4JhRkIbGrUA12BmHohggdalEGlnztyrSE,9783
 mangoautomation/uidrive/web/sync_web/_input_device.py,sha256=8t6tJgMb4zgb4Sv02XP3gUU0ZVbApCs3WaILv8Fe1iY,3169
-mangoautomation/uidrive/web/sync_web/_new_browser.py,sha256=LNwhzjf0SbsBAaIXD_bEq623MsX2RvSdLc6tIt1ygjA,5516
+mangoautomation/uidrive/web/sync_web/_new_browser.py,sha256=IYRrv6KXk-VxS5v5dRgqRdhTYQ1CVm4VlO4ioacEjcs,6036
 mangoautomation/uidrive/web/sync_web/_page.py,sha256=MNekcL7o5YXEloeuvi3YrpOZxGhEWfrq-5i4PbtTLFg,2027
+mangoautomation-1.0.56.dist-info/licenses/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
 tests/__init__.py,sha256=UhCNFqiVjxdh4CXESNo4oE7qfjpYYVkeHbSE5-7LGDY,125
 tests/test_ui_and.py,sha256=4k0_3bx_k2KbZifeRWGK65sxtdiPUOjkNzZ5oxjrc18,672
 tests/test_ui_web.py,sha256=MFaUN8O5qKOMMgyk2eelhKZsYcSJm0Do6pCgsdBZEH4,2765
-mangoautomation-1.0.53.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
-mangoautomation-1.0.53.dist-info/METADATA,sha256=b9f1z-GU8_2m4EIkYJf7VNG0ydy8QtpZEOPmSAZLCpo,660
-mangoautomation-1.0.53.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-mangoautomation-1.0.53.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
-mangoautomation-1.0.53.dist-info/RECORD,,
+mangoautomation-1.0.56.dist-info/METADATA,sha256=Gu8_FKCwI0t_IxG0PUz3M6EPWOMpzCmocndAv4i7Fk8,976
+mangoautomation-1.0.56.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mangoautomation-1.0.56.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
+mangoautomation-1.0.56.dist-info/RECORD,,

{mangoautomation-1.0.53.dist-info → mangoautomation-1.0.56.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

mangoautomation-1.0.53.dist-info/METADATA

@@ -1,31 +0,0 @@
-Metadata-Version: 2.1
-Name: mangoautomation
-Version: 1.0.53
-Summary: 测试工具
-Home-page: https://gitee.com/mao-peng/testkit
-Author: 毛鹏
-Author-email: 729164035@qq.com
-Classifier: Programming Language :: Python :: 3.10
-License-File: LICENSE
-Requires-Dist: setuptools ==68.2.0
-Requires-Dist: pydantic ==2.9.2
-Requires-Dist: playwright ==1.43.0
-Requires-Dist: uiautomation ==2.0.20
-Requires-Dist: uiautomator2 ==3.2.5
-Requires-Dist: mangotools >=1.1.17
-Requires-Dist: adbutils ~=2.8.9
-Requires-Dist: uiautodev ==0.9.0
-
-# testkit
-
-#### 介绍
-
-测试工具
-
-#### 安装教程
-
-1. pip install mangokit
-
-#### 使用说明
-
-1.