uiautodev 0.3.4__py3-none-any.whl → 0.3.6__py3-none-any.whl

uiautodev/app.py

@@ -68,7 +68,7 @@ def info() -> InfoResponse:
         platform=platform.system(),  # Linux | Darwin | Windows
         code_language="Python",
         cwd=os.getcwd(),
-        drivers=["android"],
+        drivers=["android", "ios"],
     )
 
 

uiautodev/common.py

@@ -12,7 +12,7 @@ def is_chinese_language() -> bool:
     language_code, _ = locale.getdefaultlocale()
     
     # Check if the language code starts with 'zh' (Chinese)
-    if language_code.startswith('zh'):
+    if language_code and language_code.startswith('zh'):
         return True
     else:
         return False

uiautodev/driver/android.py

@@ -13,7 +13,6 @@ from typing import List, Tuple
 from xml.etree import ElementTree
 
 import adbutils
-import requests
 import uiautomator2 as u2
 from PIL import Image
 
@@ -29,7 +28,7 @@ logger = logging.getLogger(__name__)
 class AndroidDriver(BaseDriver):
     def __init__(self, serial: str):
         super().__init__(serial)
-        self.device = adbutils.device(serial)
+        self.adb_device = adbutils.device(serial)
         self._try_dump_list = [
             self._get_u2_hierarchy,
             self._get_appium_hierarchy,
@@ -38,7 +37,7 @@ class AndroidDriver(BaseDriver):
     
     @cached_property
     def udt(self) -> UDT:    
-        return UDT(self.device)
+        return UDT(self.adb_device)
 
     @cached_property
     def ud(self) -> u2.Device:
@@ -46,8 +45,7 @@ class AndroidDriver(BaseDriver):
     
     def screenshot(self, id: int) -> Image.Image:
         try:
-            img = self.device.screenshot(display_id=id)
-            return img.convert("RGB")
+            return self.adb_device.screenshot() # display_id is not OK now
         except adbutils.AdbError as e:
             logger.warning("screenshot error: %s", str(e))
             if id > 0:
@@ -56,7 +54,7 @@ class AndroidDriver(BaseDriver):
 
     def shell(self, command: str) -> ShellResponse:
         try:
-            ret = self.device.shell2(command, rstrip=True, timeout=20)
+            ret = self.adb_device.shell2(command, rstrip=True, timeout=20)
             if ret.returncode == 0:
                 return ShellResponse(output=ret.output, error=None)
             else:
@@ -68,7 +66,7 @@ class AndroidDriver(BaseDriver):
 
     def dump_hierarchy(self) -> Tuple[str, Node]:
         """returns xml string and hierarchy object"""
-        wsize = self.device.window_size()
+        wsize = self.adb_device.window_size()
         logger.debug("window size: %s", wsize)
         start = time.time()
         xml_data = self._dump_hierarchy_raw()
@@ -125,7 +123,7 @@ class AndroidDriver(BaseDriver):
         #     c.close()
 
     def _get_appium_hierarchy(self) -> str:
-        c = self.device.create_connection(adbutils.Network.TCP, 6790)
+        c = self.adb_device.create_connection(adbutils.Network.TCP, 6790)
         try:
             content = fetch_through_socket(c, "/wd/hub/session/0/source", timeout=10)
             return json.loads(content)["value"]
@@ -140,34 +138,34 @@ class AndroidDriver(BaseDriver):
         return self.udt.dump_hierarchy()
     
     def tap(self, x: int, y: int):
-        self.device.click(x, y)
+        self.adb_device.click(x, y)
 
     def window_size(self) -> Tuple[int, int]:
-        w, h = self.device.window_size()
+        w, h = self.adb_device.window_size()
         return (w, h)
 
     def app_install(self, app_path: str):
-        self.device.install(app_path)
+        self.adb_device.install(app_path)
 
     def app_current(self) -> CurrentAppResponse:
-        info = self.device.app_current()
+        info = self.adb_device.app_current()
         return CurrentAppResponse(
             package=info.package, activity=info.activity, pid=info.pid
         )
 
     def app_launch(self, package: str):
-        if self.device.package_info(package) is None:
+        if self.adb_device.package_info(package) is None:
             raise AndroidDriverException(f"App not installed: {package}")
-        self.device.app_start(package)
+        self.adb_device.app_start(package)
     
     def app_terminate(self, package: str):
-        self.device.app_stop(package)
+        self.adb_device.app_stop(package)
 
     def home(self):
-        self.device.keyevent("HOME")
+        self.adb_device.keyevent("HOME")
     
     def wake_up(self):
-        self.device.keyevent("WAKEUP")
+        self.adb_device.keyevent("WAKEUP")
 
 
 def parse_xml(xml_data: str, wsize: WindowSize) -> Node:

uiautodev/router/device.py

@@ -5,6 +5,7 @@
 """
 
 import io
+import logging
 from typing import Any, List
 
 from fastapi import APIRouter, Response
@@ -16,6 +17,8 @@ from uiautodev.model import DeviceInfo, Node, ShellResponse
 from uiautodev.provider import BaseProvider
 
 
+logger = logging.getLogger(__name__)
+
 class AndroidShellPayload(BaseModel):
     command: str
 
@@ -31,6 +34,7 @@ def make_router(provider: BaseProvider) -> APIRouter:
         except NotImplementedError as e:
             return Response(content="list_devices not implemented", media_type="text/plain", status_code=501)
         except Exception as e:
+            logger.exception("list_devices failed")
             return Response(content=str(e), media_type="text/plain", status_code=500)
 
     @router.post("/{serial}/shell")
@@ -42,6 +46,7 @@ def make_router(provider: BaseProvider) -> APIRouter:
         except NotImplementedError as e:
             return Response(content="shell not implemented", media_type="text/plain", status_code=501)
         except Exception as e:
+            logger.exception("shell failed")
             return ShellResponse(output="", error=str(e))
 
     @router.get(
@@ -59,6 +64,7 @@ def make_router(provider: BaseProvider) -> APIRouter:
             image_bytes = buf.getvalue()
             return Response(content=image_bytes, media_type="image/jpeg")
         except Exception as e:
+            logger.exception("screenshot failed")
             return Response(content=str(e), media_type="text/plain", status_code=500)
 
     @router.get("/{serial}/hierarchy")
@@ -69,6 +75,7 @@ def make_router(provider: BaseProvider) -> APIRouter:
             xml_data, hierarchy = driver.dump_hierarchy()
             return hierarchy
         except Exception as e:
+            logger.exception("dump_hierarchy failed")
             return Response(content=str(e), media_type="text/plain", status_code=500)
     
     @router.post('/{serial}/command/tap')

{uiautodev-0.3.4.dist-info → uiautodev-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiautodev
-Version: 0.3.4
+Version: 0.3.6
 Summary: Mobile UI Automation, include UI hierarchy inspector, script recorder
 Home-page: https://uiauto.dev
 License: MIT
@@ -27,7 +27,7 @@ Requires-Dist: pillow
 Requires-Dist: poetry (>=1.8.2,<2.0.0)
 Requires-Dist: pygments (>=2)
 Requires-Dist: uiautomator2 (>=2)
-Requires-Dist: uvicorn
+Requires-Dist: uvicorn[standard]
 Description-Content-Type: text/markdown
 
 # uiautodev

{uiautodev-0.3.4.dist-info → uiautodev-0.3.6.dist-info}/RECORD

@@ -1,13 +1,13 @@
 uiautodev/__init__.py,sha256=UBIzJoRjsFADqlrH5juQL4DSd0i3-rLhUtydeEluVEU,267
 uiautodev/__main__.py,sha256=0WZHyHW-M7FG5RexANNoIB5pkCX8xwQbTnmaOA9Y1kg,176
-uiautodev/app.py,sha256=arc4dNclhUTw9x4QI0ZBE4_6FEI2RNOFF41pvHXLql8,2491
+uiautodev/app.py,sha256=R7AV5uuh4VLkrF9Kl_JJWUiPQnuIeJ02CN1W7tNGPKE,2498
 uiautodev/appium_proxy.py,sha256=yMzPnIDo50hYSaq0g5bXUpgRrFa_849wNa2o7ZpxGNY,1773
 uiautodev/case.py,sha256=Jk2_5X2F-XIPnGuYTCqOVQiwwchwOhF7uKK5oKv5shg,3919
 uiautodev/cli.py,sha256=VBs5wDfmdBIyQQ8Nda0ACe84RRIAd8KRttrjAxm9YJc,6234
 uiautodev/command_proxy.py,sha256=eexXUwd4kt1gE3ab8QbSyUXd6zlghv6ize3NfvzeboE,4562
 uiautodev/command_types.py,sha256=d2s0GPLHCwr8QRMsPS8yrbr5irLUZLYBxLP4IifjSr8,1587
-uiautodev/common.py,sha256=xfaihAXapr4pvXN8yGfMWZ703JTScZ_ZAnaasH7shrw,534
-uiautodev/driver/android.py,sha256=dks1AumgypQCoxkv62B0dlArNS0dGM69xbx-6C30jVc,7043
+uiautodev/common.py,sha256=t1jmG7S0LVXAigtg86J3vM2XXf1xYPfDV_HwSwyl3OI,552
+uiautodev/driver/android.py,sha256=TIAF2-ytP-eT6_lqd9gHW-XAXiT5J2OTFSFPqC4SY-U,7064
 uiautodev/driver/appium.py,sha256=U3TGpOXmu3tEa3E1ttTFoXehOfFyjavJQ3XA4CtqeBE,5308
 uiautodev/driver/base_driver.py,sha256=8CJrvulNzSZWrfBs8OBv2lTymsw-b3OyxOT8RxtkIyU,2048
 uiautodev/driver/ios.py,sha256=ymZKk2pKHPhKXX0Y-WLHwATHDLiXjnP0KeiByxU4Rpc,4353
@@ -17,14 +17,14 @@ uiautodev/driver/udt/udt.py,sha256=p6opbUtYxEGTINIX83F6m2CtzB42iSSBYRv1SjXCEFg,8
 uiautodev/exceptions.py,sha256=TuRD5SWQk5N2_KjrcDuXG_p84LBhLa2QEEXyFNFm0yQ,465
 uiautodev/model.py,sha256=0dD0PY8vBfgA9_GsEnNqM3TcNvNL_PUpTrHUc_BADKs,717
 uiautodev/provider.py,sha256=HDD_Jj-cJVfBceunzCYU9zJvGVya7Jd35GG9h85BY-0,2370
-uiautodev/router/device.py,sha256=etRUWm6XUfvyPDZlqdrr3395emzWQxNjkdnUq6P9JQs,3862
+uiautodev/router/device.py,sha256=ZeXaYqeGcyH-_ehXfLsGAjGmW9gcL8KCoOs78c3ePNI,4116
 uiautodev/router/xml.py,sha256=MKVLhjMBqE4qbEraQxvdrVp_OBnylEL9Wti5lnmBDk4,891
 uiautodev/static/demo.html,sha256=qC7qUZP5Af9T3V5EuFGbovzv8mArwiGMWsX_vcs_Bt0,1240
 uiautodev/utils/common.py,sha256=HuXJvipkg1QQg6vCD7OxH6JQtqbSVbXNzI1X2OVcEcU,4785
 uiautodev/utils/exceptions.py,sha256=lL_G_E41KWvfXnl32-E4Vgr3_HyTboxq_EwzdQMuvK4,637
 uiautodev/utils/usbmux.py,sha256=LYupLDn7U4KFKhYQJrmIroS-3040gqZQVDRDB_FNDJM,17386
-uiautodev-0.3.4.dist-info/LICENSE,sha256=RyeW676gBYO7AVVP2zQgfEx5rPSt46vR47xXZe7TlX4,1068
-uiautodev-0.3.4.dist-info/METADATA,sha256=Zp5NF_675mcnNIj3w8R21CzT6OE-cyEKG-uVy1Yg3XI,2319
-uiautodev-0.3.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiautodev-0.3.4.dist-info/entry_points.txt,sha256=zBY8GgseYAAzPFA5Cf4rCCS9ivdyWsNxMVVYIaGAHJU,88
-uiautodev-0.3.4.dist-info/RECORD,,
+uiautodev-0.3.6.dist-info/LICENSE,sha256=RyeW676gBYO7AVVP2zQgfEx5rPSt46vR47xXZe7TlX4,1068
+uiautodev-0.3.6.dist-info/METADATA,sha256=cAOeWNUJDHfstTu6a3jUhCNN1cKpkWzA6CaDbk7PO9Y,2329
+uiautodev-0.3.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiautodev-0.3.6.dist-info/entry_points.txt,sha256=zBY8GgseYAAzPFA5Cf4rCCS9ivdyWsNxMVVYIaGAHJU,88
+uiautodev-0.3.6.dist-info/RECORD,,