uiautodev 0.4.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

uiautodev/model.py

@@ -33,13 +33,21 @@ class Rect(BaseModel):
 
 class Node(BaseModel):
     key: str
-    name: str
+    name: str # can be seen as description
     bounds: Optional[Tuple[float, float, float, float]] = None
     rect: Optional[Rect] = None
-    properties: Dict[str, Union[str, bool]] = []
+    properties: Dict[str, Union[str, bool]] = {}
     children: List[Node] = []
 
 
+class OCRNode(Node):
+    confidence: float
+
+
 class WindowSize(typing.NamedTuple):
     width: int
-    height: int
+    height: int
+
+
+class AppInfo(BaseModel):
+    packageName: str

uiautodev/provider.py

@@ -12,6 +12,7 @@ import adbutils
 
 from uiautodev.driver.android import AndroidDriver
 from uiautodev.driver.base_driver import BaseDriver
+from uiautodev.driver.harmony import HarmonyDriver, HDC
 from uiautodev.driver.ios import IOSDriver
 from uiautodev.driver.mock import MockDriver
 from uiautodev.exceptions import UiautoException
@@ -27,7 +28,7 @@ class BaseProvider(abc.ABC):
     @abc.abstractmethod
     def get_device_driver(self, serial: str) -> BaseDriver:
         raise NotImplementedError()
-    
+
     def get_single_device_driver(self) -> BaseDriver:
         """ debug use """
         devs = self.list_devices()
@@ -66,11 +67,25 @@ class IOSProvider(BaseProvider):
     @lru_cache
     def get_device_driver(self, serial: str) -> BaseDriver:
         return IOSDriver(serial)
-    
+
+
+class HarmonyProvider(BaseProvider):
+    def __init__(self):
+        super().__init__()
+        self.hdc = HDC()
+
+    def list_devices(self) -> list[DeviceInfo]:
+        devices = self.hdc.list_device()
+        return [DeviceInfo(serial=d, model=self.hdc.get_model(d), name=self.hdc.get_model(d)) for d in devices]
+
+    @lru_cache
+    def get_device_driver(self, serial: str) -> HarmonyDriver:
+        return HarmonyDriver(self.hdc, serial)
+
 
 class MockProvider(BaseProvider):
     def list_devices(self) -> list[DeviceInfo]:
         return [DeviceInfo(serial="mock-serial", model="mock-model", name="mock-name")]
 
     def get_device_driver(self, serial: str) -> BaseDriver:
-        return MockDriver(serial)
+        return MockDriver(serial)

uiautodev/router/device.py

@@ -6,9 +6,10 @@
 
 import io
 import logging
-from typing import Any, List
+from typing import Any, Dict, List
 
 from fastapi import APIRouter, Response
+from fastapi.responses import StreamingResponse
 from pydantic import BaseModel
 
 from uiautodev import command_proxy
@@ -27,7 +28,7 @@ def make_router(provider: BaseProvider) -> APIRouter:
 
     @router.get("/list")
     def _list() -> List[DeviceInfo]:
-        """List of Android devices"""
+        """List devices"""
         try:
             return provider.list_devices()
         except NotImplementedError as e:
@@ -102,14 +103,25 @@ def make_router(provider: BaseProvider) -> APIRouter:
         return command_proxy.app_current(driver)
 
     @router.post('/{serial}/command/{command}')
-    def _command_proxy_other(serial: str, command: Command, params: Any = None):
+    def _command_proxy_other(serial: str, command: Command, params: Dict[str, Any] = None):
         """Run a command on the device"""
         driver = provider.get_device_driver(serial)
-        func = command_proxy.COMMANDS[command]
-        if params is None:
-            response = func(driver)
-        else:
-            response = func(driver, params)
+        response = command_proxy.send_command(driver, command, params)
         return response
+    
+    @router.get('/{serial}/backupApp')
+    def _backup_app(serial: str, packageName: str):
+        """Backup app
+        
+        Added in 0.5.0
+        """
+        driver = provider.get_device_driver(serial)
+        file_name = f"{packageName}.apk"
+        headers = {
+            'Content-Disposition': f'attachment; filename="{file_name}"'
+        }
+        return StreamingResponse(driver.open_app_file(packageName), headers=headers)
+        
+
 
     return router

uiautodev/utils/common.py

@@ -5,11 +5,12 @@ import json as sysjson
 import platform
 import re
 import socket
+import subprocess
 import sys
 import typing
 import uuid
 from http.client import HTTPConnection, HTTPResponse
-from typing import Optional, TypeVar, Union
+from typing import List, Optional, TypeVar, Union
 
 from pydantic import BaseModel
 from pygments import formatters, highlight, lexers
@@ -61,10 +62,11 @@ def print_json(buf, colored=None, default=default_json_encoder):
         print(colorful_json)
     else:
         print(formatted_json)
-    
+
 
 _T = TypeVar("_T")
 
+
 def convert_to_type(value: str, _type: _T) -> _T:
     """ usage example:
     convert_to_type("123", int)
@@ -78,9 +80,9 @@ def convert_to_type(value: str, _type: _T) -> _T:
     if _type == re.Pattern:
         return re.compile(value)
     raise NotImplementedError(f"convert {value} to {_type}")
-    
 
-def convert_params_to_model(params: list[str], model: BaseModel) -> BaseModel:
+
+def convert_params_to_model(params: List[str], model: BaseModel) -> BaseModel:
     """ used in cli.py """
     assert len(params) > 0
     if len(params) == 1:
@@ -114,7 +116,7 @@ class SocketHTTPConnection(HTTPConnection):
     def __init__(self, conn: socket.socket, timeout: float):
         super().__init__("localhost", timeout=timeout)
         self.__conn = conn
-        
+
     def connect(self):
         self.sock = self.__conn
 
@@ -131,7 +133,8 @@ class MySocketHTTPConnection(SocketHTTPConnection):
         self.sock.settimeout(self.timeout)
 
 
-def fetch_through_socket(sock: socket.socket, path: str, method: str = "GET", json: Optional[dict] = None, timeout: float = 60) -> bytearray:
+def fetch_through_socket(sock: socket.socket, path: str, method: str = "GET", json: Optional[dict] = None,
+                         timeout: float = 60) -> bytearray:
     """ usage example:
     with socket.create_connection((host, port)) as s:
         request_through_socket(s, "GET", "/")
@@ -163,4 +166,5 @@ def node_travel(node: Node, dfs: bool = True):
     for child in node.children:
         yield from node_travel(child, dfs)
     if dfs:
-        yield node
+        yield node
+

uiautodev/utils/envutils.py

@@ -0,0 +1,9 @@
+import os
+
+
+def is_enabled(name: str) -> bool:
+    return os.getenv(name, "false").lower() in ("true", "1", "on", "yes", "y")
+
+
+class Environment:
+    UIAUTODEV_MOCK = is_enabled("UIAUTODEV_MOCK")

{uiautodev-0.4.0.dist-info → uiautodev-0.6.0.dist-info}/METADATA

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: uiautodev
-Version: 0.4.0
+Version: 0.6.0
 Summary: Mobile UI Automation, include UI hierarchy inspector, script recorder
-Home-page: https://uiauto.dev
 License: MIT
 Author: codeskyblue
 Author-email: codeskyblue@gmail.com
@@ -14,13 +13,11 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Provides-Extra: appium
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: adbutils (>=2.7.0,<3.0.0)
-Requires-Dist: appium-python-client (>=4.0.0,<5.0.0) ; extra == "appium"
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: construct
 Requires-Dist: fastapi (>=0.111.0,<0.112.0)
-Requires-Dist: httpretty (>=1.1.4,<2.0.0)
 Requires-Dist: httpx
 Requires-Dist: lxml
 Requires-Dist: pillow
@@ -30,6 +27,7 @@ Requires-Dist: pygments (>=2)
 Requires-Dist: uiautomator2 (>=2)
 Requires-Dist: uvicorn[standard]
 Requires-Dist: wdapy (>=0.2.2,<0.3.0)
+Project-URL: Homepage, https://uiauto.dev
 Description-Content-Type: text/markdown
 
 # uiautodev
@@ -38,6 +36,8 @@ Description-Content-Type: text/markdown
 
 https://uiauto.dev
 
+> backup site: https://uiauto.devsleep.com
+
 UI Inspector for Android and iOS, help inspector element properties, and auto generate XPath, script.
 
 # Install

uiautodev-0.6.0.dist-info/RECORD

@@ -0,0 +1,33 @@
+uiautodev/__init__.py,sha256=nCGwaTL1ifIZD9hnH2Gl14g3cUbMyEWFZmTebRCLGrs,164
+uiautodev/__main__.py,sha256=0WZHyHW-M7FG5RexANNoIB5pkCX8xwQbTnmaOA9Y1kg,176
+uiautodev/app.py,sha256=U0aDW2dwNEVy5kSBAbTCo2CAVyzaEZrJFBzQsCSoV3c,3215
+uiautodev/appium_proxy.py,sha256=yMzPnIDo50hYSaq0g5bXUpgRrFa_849wNa2o7ZpxGNY,1773
+uiautodev/case.py,sha256=Jk2_5X2F-XIPnGuYTCqOVQiwwchwOhF7uKK5oKv5shg,3919
+uiautodev/cli.py,sha256=K4CEvGJSDWLAFR5tvls2Qp4evQ2lApLoUxA-4DI2-Sc,6235
+uiautodev/command_proxy.py,sha256=C9z-dITMED4k5na45NMdEWAXlLh3Ll921mKuefFyk78,5226
+uiautodev/command_types.py,sha256=pWdnCS4FRnEIiR1ynd4cjXX8zeFndjPztacBlukt61E,1761
+uiautodev/common.py,sha256=1A0kXfxVrp_i5mc_aRjuqSDWFFZ7DwZR9qpRLu2GMMg,1488
+uiautodev/driver/android.py,sha256=LOOF2d7Fg8crzA7G0rjBMQ63PQlCtLNCWfR20YEhrSE,6394
+uiautodev/driver/appium.py,sha256=U3TGpOXmu3tEa3E1ttTFoXehOfFyjavJQ3XA4CtqeBE,5308
+uiautodev/driver/base_driver.py,sha256=neoVS9T8MN5RXvW6vvqXSc6pcBW_fqujJurjUrlt0OA,2816
+uiautodev/driver/harmony.py,sha256=93pwlg04wazey8MQM6DEvcBkr52REYVw4bwz321fK38,8031
+uiautodev/driver/ios.py,sha256=EOi9k-Y4qQS6Htdz_ycBf5jYCnOkruB-mR0Sc8J-coo,4204
+uiautodev/driver/mock.py,sha256=0VtxBkZRMbHiQGHjqm8Ih2Ld6baXiVxX8yUTwWJQlnE,2422
+uiautodev/driver/testdata/layout.json,sha256=0z9jGJteXuGwkOhO_iINYPoDp1kCq-EaQds_iZkmiPQ,276538
+uiautodev/driver/udt/appium-uiautomator2-v5.12.4-light.apk,sha256=cKUVKpqEiGRXODeqpwzVWllyjdSLyowFm94a6jDTvhI,3675062
+uiautodev/driver/udt/udt.py,sha256=p6opbUtYxEGTINIX83F6m2CtzB42iSSBYRv1SjXCEFg,8351
+uiautodev/exceptions.py,sha256=TuRD5SWQk5N2_KjrcDuXG_p84LBhLa2QEEXyFNFm0yQ,465
+uiautodev/model.py,sha256=hziSYyh7ufaKbQrMmRMcIVeZ0x-pwkLMHljrI-qu184,950
+uiautodev/provider.py,sha256=oElv04fsxrBBBm1FZ6VyNqquSQbhJXD25ApC7UgDsVI,2862
+uiautodev/router/device.py,sha256=GHW83L63MxnjAEmTwhpetGatiu8iO0AOYr74UyFuF24,4835
+uiautodev/router/xml.py,sha256=MKVLhjMBqE4qbEraQxvdrVp_OBnylEL9Wti5lnmBDk4,891
+uiautodev/static/demo.html,sha256=qC7qUZP5Af9T3V5EuFGbovzv8mArwiGMWsX_vcs_Bt0,1240
+uiautodev/utils/common.py,sha256=L1qBBBS6jRgkXlGy5o6Xafo49auLXKRWyX9x8U_IKjc,4821
+uiautodev/utils/envutils.py,sha256=Clyt2Hz9PXpK_fT0yWbMmixXyGvCaJO3LAgamM7aUVc,197
+uiautodev/utils/exceptions.py,sha256=lL_G_E41KWvfXnl32-E4Vgr3_HyTboxq_EwzdQMuvK4,637
+uiautodev/utils/usbmux.py,sha256=LYupLDn7U4KFKhYQJrmIroS-3040gqZQVDRDB_FNDJM,17386
+uiautodev-0.6.0.dist-info/LICENSE,sha256=RyeW676gBYO7AVVP2zQgfEx5rPSt46vR47xXZe7TlX4,1068
+uiautodev-0.6.0.dist-info/METADATA,sha256=BmJOpByP-LzY61Q5-DUfH7eq3VnIXSHZ1viCbbCK4Qs,2373
+uiautodev-0.6.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+uiautodev-0.6.0.dist-info/entry_points.txt,sha256=zBY8GgseYAAzPFA5Cf4rCCS9ivdyWsNxMVVYIaGAHJU,88
+uiautodev-0.6.0.dist-info/RECORD,,

{uiautodev-0.4.0.dist-info → uiautodev-0.6.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 2.1.2
 Root-Is-Purelib: true
 Tag: py3-none-any

uiautodev-0.4.0.dist-info/RECORD

@@ -1,30 +0,0 @@
-uiautodev/__init__.py,sha256=qyg24JoYZ2bIaFcBNFyeZA8faOTV87Gk978H-l29GWE,164
-uiautodev/__main__.py,sha256=0WZHyHW-M7FG5RexANNoIB5pkCX8xwQbTnmaOA9Y1kg,176
-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=87n1s27xoslKKJ0jkfGWHuUhsJsCANAYx6v_plgKDW0,5007
-uiautodev/command_types.py,sha256=Kf_55jrUr2nxrrZorg4urlruKx0cnsuXQBEzKeUXpJA,1736
-uiautodev/common.py,sha256=t1jmG7S0LVXAigtg86J3vM2XXf1xYPfDV_HwSwyl3OI,552
-uiautodev/driver/android.py,sha256=xtMAPWHrc53MbZyRj1d9mqaqaL1eyVI6ORv3BEd0Epg,7207
-uiautodev/driver/appium.py,sha256=U3TGpOXmu3tEa3E1ttTFoXehOfFyjavJQ3XA4CtqeBE,5308
-uiautodev/driver/base_driver.py,sha256=f-C8vfE1F6EgDTUeBsv7UBTynmqhYq5BNMi4wawUIvM,2517
-uiautodev/driver/ios.py,sha256=U0zozuYs-hCqKCb9O5-Vyuku08gkgQuoUF4-xVWkg1U,4238
-uiautodev/driver/mock.py,sha256=0VtxBkZRMbHiQGHjqm8Ih2Ld6baXiVxX8yUTwWJQlnE,2422
-uiautodev/driver/udt/appium-uiautomator2-v5.12.4-light.apk,sha256=cKUVKpqEiGRXODeqpwzVWllyjdSLyowFm94a6jDTvhI,3675062
-uiautodev/driver/udt/udt.py,sha256=p6opbUtYxEGTINIX83F6m2CtzB42iSSBYRv1SjXCEFg,8351
-uiautodev/exceptions.py,sha256=TuRD5SWQk5N2_KjrcDuXG_p84LBhLa2QEEXyFNFm0yQ,465
-uiautodev/model.py,sha256=qDKJyssJYIv_7IJwYHUtFbk-qF7ZquTaNAnhm6J8WcE,827
-uiautodev/provider.py,sha256=HDD_Jj-cJVfBceunzCYU9zJvGVya7Jd35GG9h85BY-0,2370
-uiautodev/router/device.py,sha256=lbHmoV--qBDP-lV9UVDYKF669WwxMZCDp-OCpoQJKQU,4425
-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.4.0.dist-info/LICENSE,sha256=RyeW676gBYO7AVVP2zQgfEx5rPSt46vR47xXZe7TlX4,1068
-uiautodev-0.4.0.dist-info/METADATA,sha256=tY-frsy05wnBaJfTOmISViH1v20e7xq8xPnw6LmtzYE,2404
-uiautodev-0.4.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiautodev-0.4.0.dist-info/entry_points.txt,sha256=zBY8GgseYAAzPFA5Cf4rCCS9ivdyWsNxMVVYIaGAHJU,88
-uiautodev-0.4.0.dist-info/RECORD,,