uiautodev 0.7.1__py3-none-any.whl → 0.8.0__py3-none-any.whl

uiautodev/__init__.py

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

uiautodev/app.py

@@ -9,7 +9,7 @@ import os
 import platform
 import signal
 from pathlib import Path
-from typing import List
+from typing import Dict, List
 
 import adbutils
 import uvicorn
@@ -25,6 +25,7 @@ from uiautodev.common import convert_bytes_to_image, get_webpage_url, ocr_image
 from uiautodev.model import Node
 from uiautodev.provider import AndroidProvider, HarmonyProvider, IOSProvider, MockProvider
 from uiautodev.remote.scrcpy import ScrcpyServer
+from uiautodev.router.android import router as android_device_router
 from uiautodev.router.device import make_router
 from uiautodev.router.xml import router as xml_router
 from uiautodev.utils.envutils import Environment
@@ -68,7 +69,23 @@ else:
     app.include_router(harmony_router, prefix="/api/harmony", tags=["harmony"])
 
 app.include_router(xml_router, prefix="/api/xml", tags=["xml"])
-
+app.include_router(android_device_router, prefix="/api/android", tags=["android"])
+
+
+@app.get('/api/{platform}/features')
+def get_features(platform: str) -> Dict[str, bool]:
+    """Get features supported by the specified platform"""
+    features = {}
+    # 获取所有带有指定平台tag的路由
+    for route in app.routes:
+        if hasattr(route, 'tags') and platform in route.tags:
+            if route.path.startswith(f"/api/{platform}/{{serial}}/"):
+                # 提取特性名称
+                parts = route.path.split('/')
+                feature_name = parts[-1]
+                if not feature_name.startswith('{'):
+                    features[feature_name] = True
+    return features
 
 class InfoResponse(BaseModel):
     version: str

uiautodev/driver/android.py

@@ -31,6 +31,15 @@ class AndroidDriver(BaseDriver):
     @cached_property
     def ud(self) -> u2.Device:
         return u2.connect_usb(self.serial)
+
+    def get_current_activity(self) -> str:
+        ret = self.adb_device.shell2(["dumpsys", "activity", "activities"], rstrip=True, timeout=5)
+        # 使用正则查找包含前台 activity 的行
+        match = re.search(r"mResumedActivity:.*? ([\w\.]+\/[\w\.]+)", ret.output)
+        if match:
+            return match.group(1)  # 返回包名/类名，例如 com.example/.MainActivity
+        else:
+            return ""
     
     def screenshot(self, id: int) -> Image.Image:
         if id > 0:

uiautodev/router/android.py

@@ -0,0 +1,42 @@
+# prefix for /api/android/{serial}/shell
+
+import logging
+from typing import Dict, Optional
+
+from fastapi import APIRouter, Request, Response
+from pydantic import BaseModel
+
+from uiautodev.driver.android import AndroidDriver
+from uiautodev.model import ShellResponse
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter()
+
+
+class AndroidShellPayload(BaseModel):
+    command: str
+    
+@router.post("/{serial}/shell")
+def shell(serial: str, payload: AndroidShellPayload) -> ShellResponse:
+    """Run a shell command on an Android device"""
+    try:
+        driver = AndroidDriver(serial)
+        return driver.shell(payload.command)
+    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("/{serial}/current_activity")
+async def get_current_activity(serial: str) -> Response:
+    """Get the current activity of the Android device"""
+    try:
+        driver = AndroidDriver(serial)
+        activity = driver.get_current_activity()
+        return Response(content=activity, media_type="text/plain")
+    except Exception as e:
+        logger.exception("get_current_activity failed")
+        return Response(content="", media_type="text/plain")

uiautodev/router/device.py

@@ -6,9 +6,9 @@
 
 import io
 import logging
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
-from fastapi import APIRouter, Response
+from fastapi import APIRouter, Query, Request, Response
 from fastapi.responses import StreamingResponse
 from pydantic import BaseModel
 
@@ -19,9 +19,6 @@ from uiautodev.provider import BaseProvider
 
 logger = logging.getLogger(__name__)
 
-class AndroidShellPayload(BaseModel):
-    command: str
-
 
 def make_router(provider: BaseProvider) -> APIRouter:
     router = APIRouter()
@@ -37,18 +34,6 @@ def make_router(provider: BaseProvider) -> APIRouter:
             logger.exception("list_devices failed")
             return Response(content=str(e), media_type="text/plain", status_code=500)
 
-    @router.post("/{serial}/shell")
-    def android_shell(serial: str, payload: AndroidShellPayload) -> ShellResponse:
-        """Run a shell command on an Android device"""
-        try:
-            driver = provider.get_device_driver(serial)
-            return driver.shell(payload.command)
-        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(
         "/{serial}/screenshot/{id}",
         responses={200: {"content": {"image/jpeg": {}}}},

{uiautodev-0.7.1.dist-info → uiautodev-0.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: uiautodev
-Version: 0.7.1
+Version: 0.8.0
 Summary: Mobile UI Automation, include UI hierarchy inspector, script recorder
 License: MIT
 Author: codeskyblue
@@ -14,19 +14,20 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: Pillow
 Requires-Dist: adbutils (>=2.8.10,<3)
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: construct
-Requires-Dist: fastapi (>=0.111.0,<0.112.0)
+Requires-Dist: fastapi (==0.115.12)
 Requires-Dist: httpx
 Requires-Dist: lxml
-Requires-Dist: pillow
-Requires-Dist: poetry (>=1.8.2,<2.0.0)
 Requires-Dist: pydantic (>=2.6,<3.0)
 Requires-Dist: pygments (>=2)
-Requires-Dist: uiautomator2 (>=2)
-Requires-Dist: uvicorn
-Requires-Dist: wdapy (>=0.2.2,<0.3.0)
+Requires-Dist: python-multipart (>=0.0.18)
+Requires-Dist: rich
+Requires-Dist: uiautomator2 (>=3.2.0,<4)
+Requires-Dist: uvicorn (>=0.33.0)
+Requires-Dist: wdapy (>0.2.2,<1)
 Requires-Dist: websockets (>=10.4)
 Project-URL: Homepage, https://uiauto.dev
 Description-Content-Type: text/markdown

{uiautodev-0.7.1.dist-info → uiautodev-0.8.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-uiautodev/__init__.py,sha256=C3uyY7lWpX_Ggw9MkWZQfP13oV4gM2QgBttrO1NQzO0,164
+uiautodev/__init__.py,sha256=SAp6OsnyWMoLbq7D6yK6OfsgN5sa4y9ftxiyyiEr2M8,164
 uiautodev/__main__.py,sha256=0WZHyHW-M7FG5RexANNoIB5pkCX8xwQbTnmaOA9Y1kg,176
-uiautodev/app.py,sha256=dzylhfAId-GqjsyQuJznCNzn2NIK9WZ7PsiHhUrazvY,4615
+uiautodev/app.py,sha256=7ucK725_44Ns61RF_oGWqtVDumtU4exT6KlYE66AUNE,5397
 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
@@ -8,7 +8,7 @@ uiautodev/cli.py,sha256=nqxVTaNkItIN5REGEgVPFr0JWxPmeIPz_tZvFQNU7Jc,5442
 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=ZdgMkcoyqleibHbPeg-9bDnpFx3KHBnQxhLZlnKOmbE,6344
+uiautodev/driver/android.py,sha256=WCCplvjjcS8FQerv8OZe5MSgHXm03EfqdnZpVyuXApc,6773
 uiautodev/driver/appium.py,sha256=U3TGpOXmu3tEa3E1ttTFoXehOfFyjavJQ3XA4CtqeBE,5308
 uiautodev/driver/base_driver.py,sha256=neoVS9T8MN5RXvW6vvqXSc6pcBW_fqujJurjUrlt0OA,2816
 uiautodev/driver/harmony.py,sha256=93pwlg04wazey8MQM6DEvcBkr52REYVw4bwz321fK38,8031
@@ -24,15 +24,16 @@ uiautodev/remote/android_input.py,sha256=r9y2SxnDw0GhN44emL-2Nz0UasaVaVtzh53hd-L
 uiautodev/remote/keycode.py,sha256=RHSJVfcNY2pelQd7_tcE6T0j3n8CKBkiku7A2AJZUpk,8097
 uiautodev/remote/scrcpy.py,sha256=Iagm9RrdB67KC2fkyyzpCeHYT0VMSQhoBEks1R_bXpo,7380
 uiautodev/remote/touch_controller.py,sha256=dYl5XTLaYEyZiNJmKwHQpw9QhPSkN3iUetJSaiQJBHg,4255
-uiautodev/router/device.py,sha256=zYrxjVGjrz7Jw8G9KNO0su22OIiQDuuSHBDBDpC1PG8,4899
+uiautodev/router/android.py,sha256=xwzaZduMRJsyml-7eZjNtQMg_c22ZpFAq6TErc_-tlA,1358
+uiautodev/router/device.py,sha256=iNJUexRLUmgGT_n1UgWybX8PvRSDinpoUpvKX-NZi10,4298
 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.7.1.dist-info/LICENSE,sha256=RyeW676gBYO7AVVP2zQgfEx5rPSt46vR47xXZe7TlX4,1068
-uiautodev-0.7.1.dist-info/METADATA,sha256=r50rNe8RnSTSsyAECW_HFmH_FwScV1CKwpucBJ9yuds,2776
-uiautodev-0.7.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-uiautodev-0.7.1.dist-info/entry_points.txt,sha256=zBY8GgseYAAzPFA5Cf4rCCS9ivdyWsNxMVVYIaGAHJU,88
-uiautodev-0.7.1.dist-info/RECORD,,
+uiautodev-0.8.0.dist-info/LICENSE,sha256=RyeW676gBYO7AVVP2zQgfEx5rPSt46vR47xXZe7TlX4,1068
+uiautodev-0.8.0.dist-info/METADATA,sha256=8BZJQyX_F7kZK8-S9vTSD2M2OD-M9piuH9uZRZi23g8,2805
+uiautodev-0.8.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+uiautodev-0.8.0.dist-info/entry_points.txt,sha256=zBY8GgseYAAzPFA5Cf4rCCS9ivdyWsNxMVVYIaGAHJU,88
+uiautodev-0.8.0.dist-info/RECORD,,