uiautodev 0.10.0__py3-none-any.whl → 0.11.1__py3-none-any.whl

uiautodev/__init__.py

@@ -5,4 +5,4 @@
 """
 
 # version is auto managed by poetry
-__version__ = "0.10.0"
+__version__ = "0.11.1"

uiautodev/command_proxy.py

@@ -13,7 +13,7 @@ from typing import Callable, Dict, List, Optional, Union
 from pydantic import BaseModel
 
 from uiautodev.command_types import AppLaunchRequest, AppTerminateRequest, By, Command, CurrentAppResponse, \
-    DumpResponse, FindElementRequest, FindElementResponse, InstallAppRequest, InstallAppResponse, TapRequest, \
+    DumpResponse, FindElementRequest, FindElementResponse, InstallAppRequest, InstallAppResponse, SendKeysRequest, TapRequest, \
     WindowSizeResponse
 from uiautodev.driver.base_driver import BaseDriver
 from uiautodev.exceptions import ElementNotFoundError
@@ -39,7 +39,7 @@ def get_command_params_type(command: Command) -> Optional[BaseModel]:
     return type_hints.get("params")
 
 
-def send_command(driver: BaseDriver, command: Union[str, Command], params=None):
+def send_command(driver: BaseDriver, command: Command, params=None):
     if command not in COMMANDS:
         raise NotImplementedError(f"command {command} not implemented")
     func = COMMANDS[command]
@@ -142,6 +142,14 @@ def dump(driver: BaseDriver) -> DumpResponse:
 def wake_up(driver: BaseDriver):
     driver.wake_up()
 
+@register(Command.SEND_KEYS)
+def send_keys(driver: BaseDriver, params: SendKeysRequest):
+    driver.send_keys(params.text)
+
+@register(Command.CLEAR_TEXT)
+def clear_text(driver: BaseDriver):
+    driver.clear_text()
+
 
 def node_match(node: Node, by: By, value: str) -> bool:
     if by == By.ID:

uiautodev/command_types.py

@@ -39,6 +39,8 @@ class Command(str, enum.Enum):
     VOLUME_UP = "volumeUp"
     VOLUME_DOWN = "volumeDown"
     VOLUME_MUTE = "volumeMute"
+    SEND_KEYS = "sendKeys"
+    CLEAR_TEXT = "clearText"
 
 
 class TapRequest(BaseModel):
@@ -94,4 +96,8 @@ class FindElementRequest(BaseModel):
 
 class FindElementResponse(BaseModel):
     count: int
-    value: List[Node]
+    value: List[Node]
+
+
+class SendKeysRequest(BaseModel):
+    text: str

uiautodev/driver/android.py

@@ -127,7 +127,7 @@ class AndroidDriver(BaseDriver):
     def volume_mute(self):
         self.adb_device.keyevent("VOLUME_MUTE")
 
-    def get_app_version(self, package_name: str) -> Optional[dict]:
+    def get_app_version(self, package_name: str) -> dict:
         """
         Get the version information of an app, including mainVersion and subVersion.
 
@@ -172,11 +172,17 @@ class AndroidDriver(BaseDriver):
 
     def open_app_file(self, package: str) -> Iterator[bytes]:
         line = self.adb_device.shell(f"pm path {package}")
+        assert isinstance(line, str)
         if not line.startswith("package:"):
             raise AndroidDriverException(f"Failed to get package path: {line}")
         remote_path = line.split(':', 1)[1]
         yield from self.adb_device.sync.iter_content(remote_path)
-
+    
+    def send_keys(self, text: str):
+        self.ud.send_keys(text)
+    
+    def clear_text(self):
+        self.ud.clear_text()
 
 
 def parse_xml(xml_data: str, wsize: WindowSize, display_id: Optional[int] = None) -> Node:

uiautodev/driver/base_driver.py

@@ -102,4 +102,11 @@ class BaseDriver(abc.ABC):
     def open_app_file(self, package: str) -> Iterator[bytes]:
         """ open app file """
         raise NotImplementedError()
-        
+    
+    def send_keys(self, text: str):
+        """ send keys to device """
+        raise NotImplementedError()
+
+    def clear_text(self):
+        """ clear text input on device """
+        raise NotImplementedError()

uiautodev/driver/harmony.py

@@ -10,7 +10,7 @@ import tempfile
 import time
 import uuid
 from pathlib import Path
-from typing import List, Optional, Tuple, Union, final
+from typing import List, Optional, Tuple, Union, final, Dict
 
 from PIL import Image
 
@@ -31,6 +31,7 @@ def run_command(command: str, timeout: int = 60) -> str:
             capture_output=True,
             timeout=timeout,
             text=True,
+            errors='ignore',
             input='' # this avoid stdout: "FreeChannelContinue handle->data is nullptr"
         )
         # the hdc shell stderr is (不仅没啥用，还没办法去掉)
@@ -50,10 +51,10 @@ class HDC:
     def __init__(self):
         self.hdc = 'hdc'
         self.tmpdir = tempfile.TemporaryDirectory()
-    
+
     def __del__(self):
         self.tmpdir.cleanup()
-    
+
     def list_device(self) -> List[str]:
         command = f"{self.hdc} list targets"
         result = run_command(command)
@@ -65,15 +66,48 @@ class HDC:
             return devices
         else:
             return []
-    
+
     def shell(self, serial: str, command: str) -> str:
         command = f"{self.hdc} -t {serial} shell \"{command}\""
         result = run_command(command)
         return result.strip()
-    
+
+    def __split_text(self, text: str) -> str:
+        return text.split("\n")[0].strip() if text else ""
+
     def get_model(self, serial: str) -> str:
         return self.shell(serial, "param get const.product.model")
-    
+
+    def get_name(self, serial: str) -> str:
+        data = self.shell(serial, "param get const.product.name")
+        return self.__split_text(data)
+
+    def wlan_ip(self, serial: str) -> str:
+        data = self.shell(serial, "ifconfig")
+        if not data or "not found" in data.lower() or "error" in data.lower():
+            logger.warning(f"ifconfig command failed or returned error for serial {serial}: {data!r}")
+            return ""
+        # Try multiple patterns for IP address
+        matches = re.findall(r'inet addr:(?!127)(\d+\.\d+\.\d+\.\d+)', data)
+        if not matches:
+            matches = re.findall(r'inet (?!127)(\d+\.\d+\.\d+\.\d+)', data)
+        if matches:
+            return matches[0]
+        logger.warning(f"No valid IP address found in ifconfig output for serial {serial}: {data!r}")
+        return ""
+
+    def sdk_version(self, serial: str) -> str:
+        data = self.shell(serial, "param get const.ohos.apiversion")
+        return self.__split_text(data)
+
+    def sys_version(self, serial: str) -> str:
+        data = self.shell(serial, "param get const.product.software.version")
+        return self.__split_text(data)
+
+    def brand(self, serial: str) -> str:
+        data = self.shell(serial, "param get const.product.brand")
+        return self.__split_text(data)
+
     def pull(self, serial: str, remote: StrOrPath, local: StrOrPath):
         if isinstance(remote, Path):
             remote = remote.as_posix()
@@ -81,13 +115,13 @@ class HDC:
         output = run_command(command)
         if not os.path.exists(local):
             raise HDCError(f"device file: {remote} not found", output)
-    
+
     def push(self, serial: str, local: StrOrPath, remote: StrOrPath) -> str:
         if isinstance(remote, Path):
             remote = remote.as_posix()
         command = f"{self.hdc} -t {serial} file send {local} {remote}"
         return run_command(command)
-    
+
     def screenshot(self, serial: str) -> Image.Image:
         device_path = f'/data/local/tmp/screenshot-{int(time.time()*1000)}.png'
         self.shell(serial, f"uitest screenCap -p {device_path}")
@@ -116,7 +150,7 @@ class HDC:
             raise HDCError(f"failed to dump layout: {output}")
         finally:
             self.shell(serial, f"rm {remote_path}")
-    
+
 
 class HarmonyDriver(BaseDriver):
     def __init__(self, hdc: HDC, serial: str):
@@ -164,6 +198,112 @@ class HarmonyDriver(BaseDriver):
         else:
             return None
 
+    def get_app_info(self, package_name: str) -> Dict:
+        """
+        Get detailed information about a specific application.
+
+        Args:
+            package_name (str): The package name of the application to retrieve information for.
+
+        Returns:
+            Dict: A dictionary containing the application information. If an error occurs during parsing,
+                  an empty dictionary is returned.
+        """
+        app_info = {}
+        data = self.hdc.shell(self.serial, f"bm dump -n {package_name}")
+        output = data
+        try:
+            json_start = output.find("{")
+            json_end = output.rfind("}") + 1
+            json_output = output[json_start:json_end]
+
+            app_info = json.loads(json_output)
+        except Exception as e:
+            logger.error(f"An error occurred: {e}")
+        return app_info
+
+    def get_app_abilities(self, package_name: str) -> List[Dict]:
+        """
+        Get the abilities of an application.
+
+        Args:
+            package_name (str): The package name of the application.
+
+        Returns:
+            List[Dict]: A list of dictionaries containing the abilities of the application.
+        """
+        result = []
+        app_info = self.get_app_info(package_name)
+        hap_module_infos = app_info.get("hapModuleInfos")
+        main_entry = app_info.get("mainEntry")
+        for hap_module_info in hap_module_infos:
+            # 尝试读取moduleInfo
+            try:
+                ability_infos = hap_module_info.get("abilityInfos")
+                module_main = hap_module_info["mainAbility"]
+            except Exception as e:
+                logger.warning(f"Fail to parse moduleInfo item, {repr(e)}")
+                continue
+            # 尝试读取abilityInfo
+            for ability_info in ability_infos:
+                try:
+                    is_launcher_ability = False
+                    skills = ability_info['skills']
+                    if len(skills) > 0 and "action.system.home" in skills[0]["actions"]:
+                        is_launcher_ability = True
+                    icon_ability_info = {
+                        "name": ability_info["name"],
+                        "moduleName": ability_info["moduleName"],
+                        "moduleMainAbility": module_main,
+                        "mainModule": main_entry,
+                        "isLauncherAbility": is_launcher_ability
+                    }
+                    result.append(icon_ability_info)
+                except Exception as e:
+                    logger.warning(f"Fail to parse ability_info item, {repr(e)}")
+                    continue
+        logger.debug(f"all abilities: {result}")
+        return result
+
+    def get_app_main_ability(self, package_name: str) -> Dict:
+        """
+        Get the main ability of an application.
+
+        Args:
+            package_name (str): The package name of the application to retrieve information for.
+
+        Returns:
+            Dict: A dictionary containing the main ability of the application.
+
+        """
+        if not (abilities := self.get_app_abilities(package_name)):
+            return {}
+        for item in abilities:
+            score = 0
+            if (name := item["name"]) and name == item["moduleMainAbility"]:
+                score += 1
+            if (module_name := item["moduleName"]) and module_name == item["mainModule"]:
+                score += 1
+            item["score"] = score
+        abilities.sort(key=lambda x: (not x["isLauncherAbility"], -x["score"]))
+        logger.debug(f"main ability: {abilities[0]}")
+        return abilities[0]
+
+    def app_launch(self, package: str, page_name: Optional[str] = None):
+        """
+        Start an application on the device.
+        If the `page_name` is empty, it will retrieve the main ability using `get_app_main_ability`.
+        Args:
+            package (str): The package name of the application.
+            page_name (Optional[str]): Ability Name within the application to start. If not provided, the main ability will be used.
+        """
+        if not page_name:
+            page_name = self.get_app_main_ability(package).get('name', 'MainAbility')
+        self.shell(f"aa start -a {page_name} -b {package}")
+
+    def app_terminate(self, package: str):
+        self.shell(f"aa force-stop {package}")
+
     def shell(self, command: str) -> ShellResponse:
         result = self.hdc.shell(self.serial, command)
         return ShellResponse(output=result)

uiautodev/model.py

@@ -14,6 +14,7 @@ from pydantic import BaseModel
 class DeviceInfo(BaseModel):
     serial: str
     model: str = ""
+    product: str = ""
     name: str = ""
     status: str = ""
     enabled: bool = True

uiautodev/provider.py

@@ -46,12 +46,18 @@ class AndroidProvider(BaseProvider):
     def list_devices(self) -> list[DeviceInfo]:
         adb = adbutils.AdbClient()
         ret: list[DeviceInfo] = []
-        for d in adb.list():
+        for d in adb.list(extended=True):
             if d.state != "device":
                 ret.append(DeviceInfo(serial=d.serial, status=d.state, enabled=False))
             else:
-                dev = adb.device(d.serial)
-                ret.append(DeviceInfo(serial=d.serial, model=dev.prop.model, name=dev.prop.name))
+                ret.append(DeviceInfo(
+                    serial=d.serial,
+                    status=d.state,
+                    name=d.tags.get('device', ''),
+                    model=d.tags.get('model', ''),
+                    product=d.tags.get('product', ''),
+                    enabled=True
+                ))
         return ret
 
     @lru_cache
@@ -76,7 +82,7 @@ class HarmonyProvider(BaseProvider):
 
     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]
+        return [DeviceInfo(serial=d, model=self.hdc.get_model(d), name=self.hdc.get_name(d)) for d in devices]
 
     @lru_cache
     def get_device_driver(self, serial: str) -> HarmonyDriver:

uiautodev/router/proxy.py

@@ -1,11 +1,10 @@
 import asyncio
+import logging
 
 import httpx
 import websockets
 from fastapi import APIRouter, HTTPException, Request, WebSocket, WebSocketDisconnect
 from fastapi.responses import Response
-import logging
-
 
 logger = logging.getLogger(__name__)
 router = APIRouter()

{uiautodev-0.10.0.dist-info → uiautodev-0.11.1.dist-info}/METADATA

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: uiautodev
-Version: 0.10.0
+Version: 0.11.1
 Summary: Mobile UI Automation, include UI hierarchy inspector, script recorder
 License: MIT
+License-File: LICENSE
 Author: codeskyblue
 Author-email: codeskyblue@gmail.com
 Requires-Python: >=3.8,<4.0
@@ -14,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: Pillow
 Requires-Dist: adbutils (>=2.8.10,<3)
 Requires-Dist: click (>=8.1.7,<9.0.0)

{uiautodev-0.10.0.dist-info → uiautodev-0.11.1.dist-info}/RECORD

@@ -1,25 +1,25 @@
-uiautodev/__init__.py,sha256=TXoecsIhto8S54V7jn6x4PdNIlhxaTPTQgtpSKQWcq0,165
+uiautodev/__init__.py,sha256=Ya4pFQpAHk2du5GJjKUOuuJd0dK2UYSmEaajmyAkLDU,165
 uiautodev/__main__.py,sha256=0WZHyHW-M7FG5RexANNoIB5pkCX8xwQbTnmaOA9Y1kg,176
 uiautodev/app.py,sha256=K3u6WCobH3Q5HmXvrZff0Cq44L0j1J4eBVhSxnSNKiE,6600
 uiautodev/appium_proxy.py,sha256=yMzPnIDo50hYSaq0g5bXUpgRrFa_849wNa2o7ZpxGNY,1773
 uiautodev/binaries/scrcpy_server.jar,sha256=ojxWWfNsJg8QXAItJ7yz6v_6JgcOe6qe2mbQE3ehrbo,71200
 uiautodev/case.py,sha256=Jk2_5X2F-XIPnGuYTCqOVQiwwchwOhF7uKK5oKv5shg,3919
 uiautodev/cli.py,sha256=FL9PBGo0UTttRhGW7THrWqNn2ujsA-728y0O46h2Qjk,6240
-uiautodev/command_proxy.py,sha256=C9z-dITMED4k5na45NMdEWAXlLh3Ll921mKuefFyk78,5226
-uiautodev/command_types.py,sha256=pWdnCS4FRnEIiR1ynd4cjXX8zeFndjPztacBlukt61E,1761
+uiautodev/command_proxy.py,sha256=Od8jSVDOUJWWcni-Jq8_IHd34VbfWECi0mL1wl86lIo,5446
+uiautodev/command_types.py,sha256=wZa-yQpxzQO79iFMHShJELuZgYJm-yweG-TeSBvzBvs,1867
 uiautodev/common.py,sha256=1A0kXfxVrp_i5mc_aRjuqSDWFFZ7DwZR9qpRLu2GMMg,1488
-uiautodev/driver/android.py,sha256=j7M2yqelWnfErGNF0JGTrth9unwBlRI6-gi71v1suu4,8022
+uiautodev/driver/android.py,sha256=k4Mjq2gmsokwCUN68VGCuhbl7HHEEyeowuTzQFXjg30,8181
 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/base_driver.py,sha256=6MBNfEg_CtS4ed90SaSGbdqmf-JNaypqiBNaZBRKeAo,3027
+uiautodev/driver/harmony.py,sha256=L3Ggd1PNlv6cPDbaaf8BA7OqtUp-G5g4Tk9cvhpnakw,13777
 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=lQI14vshN5qExVE23g2aw5i2fkdQFfLCJj2dO6kVLZw,591
-uiautodev/model.py,sha256=lCe1bAoY6-mx67dLYVR-xR-trGT81sCw93Aih0Yfi-M,1049
-uiautodev/provider.py,sha256=EnBI8PD2eoBjqugGS5cmy8GZ1Z7EaEF6YEQSfpOMN6s,2862
+uiautodev/model.py,sha256=hrqezVn1XFXHyajFxxmoiuGDZoYAodfitWMBzrYgziA,1071
+uiautodev/provider.py,sha256=f3fh9IbgTRlJmxZXXTNNZbHgHBIqfQCIBKIPz_BOOng,3054
 uiautodev/remote/android_input.py,sha256=r9y2SxnDw0GhN44emL-2Nz0UasaVaVtzh53hd-LJ710,2445
 uiautodev/remote/harmony_mjpeg.py,sha256=-J2sVfPSTuqN80BelisvwaZAimWxIk9SIzD010q3h7c,8287
 uiautodev/remote/keycode.py,sha256=RHSJVfcNY2pelQd7_tcE6T0j3n8CKBkiku7A2AJZUpk,8097
@@ -27,15 +27,15 @@ uiautodev/remote/scrcpy.py,sha256=JNSwC35f4os-IQW4ixx7ky9clpqRWvA8X_obUkwuOh8,74
 uiautodev/remote/touch_controller.py,sha256=dYl5XTLaYEyZiNJmKwHQpw9QhPSkN3iUetJSaiQJBHg,4255
 uiautodev/router/android.py,sha256=xwzaZduMRJsyml-7eZjNtQMg_c22ZpFAq6TErc_-tlA,1358
 uiautodev/router/device.py,sha256=iNJUexRLUmgGT_n1UgWybX8PvRSDinpoUpvKX-NZi10,4298
-uiautodev/router/proxy.py,sha256=Jn9emYCWJCl5nxI6f4lwXNaaZy4kAmfWL-nj9hSKGnA,2007
+uiautodev/router/proxy.py,sha256=Kp_w1KfbKMp9RTERtLAQjn1_U3tUSC4ZWAliHeaJuug,2006
 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.10.0.dist-info/LICENSE,sha256=RyeW676gBYO7AVVP2zQgfEx5rPSt46vR47xXZe7TlX4,1068
-uiautodev-0.10.0.dist-info/METADATA,sha256=w48FCoinwhnidWaoG5UPjAA8IplnMFGcCjFb1uIM384,2555
-uiautodev-0.10.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-uiautodev-0.10.0.dist-info/entry_points.txt,sha256=zBY8GgseYAAzPFA5Cf4rCCS9ivdyWsNxMVVYIaGAHJU,88
-uiautodev-0.10.0.dist-info/RECORD,,
+uiautodev-0.11.1.dist-info/METADATA,sha256=omxcGuHP5rjLAtT0JbnhdkCq58majJ3m726u4p25t9U,2628
+uiautodev-0.11.1.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
+uiautodev-0.11.1.dist-info/entry_points.txt,sha256=zBY8GgseYAAzPFA5Cf4rCCS9ivdyWsNxMVVYIaGAHJU,88
+uiautodev-0.11.1.dist-info/licenses/LICENSE,sha256=RyeW676gBYO7AVVP2zQgfEx5rPSt46vR47xXZe7TlX4,1068
+uiautodev-0.11.1.dist-info/RECORD,,

{uiautodev-0.10.0.dist-info → uiautodev-0.11.1.dist-info}/WHEEL

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