uiautodev 0.13.0__py3-none-any.whl → 0.13.1__py3-none-any.whl

uiautodev/__init__.py

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

uiautodev/app.py

@@ -15,20 +15,20 @@ import httpx
 import uvicorn
 from fastapi import FastAPI, File, Request, Response, UploadFile, WebSocket
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import (FileResponse, JSONResponse, RedirectResponse)
+from fastapi.responses import FileResponse, JSONResponse, RedirectResponse
 from pydantic import BaseModel
-from rich.logging import RichHandler
 from starlette.websockets import WebSocketDisconnect
 
 from uiautodev import __version__
 from uiautodev.common import convert_bytes_to_image, get_webpage_url, ocr_image
+from uiautodev.driver.android import ADBAndroidDriver, U2AndroidDriver
 from uiautodev.model import Node
 from uiautodev.provider import AndroidProvider, HarmonyProvider, IOSProvider, MockProvider
-from uiautodev.driver.android import ADBAndroidDriver, U2AndroidDriver
 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.proxy import make_reverse_proxy, router as proxy_router
+from uiautodev.router.proxy import make_reverse_proxy
+from uiautodev.router.proxy import router as proxy_router
 from uiautodev.router.xml import router as xml_router
 from uiautodev.utils.envutils import Environment
 
@@ -36,19 +36,6 @@ logger = logging.getLogger(__name__)
 
 app = FastAPI()
 
-
-def enable_logger_to_console(level):
-    _logger = logging.getLogger("uiautodev")
-    _logger.setLevel(level)
-    _logger.addHandler(RichHandler(enable_link_path=False))
-
-
-if os.getenv("UIAUTODEV_DEBUG"):
-    enable_logger_to_console(level=logging.DEBUG)
-    logger.debug("verbose logger enabled")
-else:
-    enable_logger_to_console(level=logging.ERROR)
-
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"],

uiautodev/cli.py

@@ -20,6 +20,7 @@ import httpx
 import pydantic
 import uvicorn
 from retry import retry
+from rich.logging import RichHandler
 
 from uiautodev import __version__, command_proxy
 from uiautodev.command_types import Command
@@ -38,12 +39,21 @@ HARMONY_PACKAGES = [
     "https://public.uiauto.devsleep.com/harmony/hypium-5.0.7.200.tar.gz",
 ]
 
+
+def enable_logger_to_console(level):
+    _logger = logging.getLogger("uiautodev")
+    _logger.setLevel(level)
+    _logger.addHandler(RichHandler(enable_link_path=False))
+
+
 @click.group(context_settings=CONTEXT_SETTINGS)
 @click.option("--verbose", "-v", is_flag=True, default=False, help="verbose mode")
 def cli(verbose: bool):
     if verbose:
-        os.environ['UIAUTODEV_DEBUG'] = '1'
+        enable_logger_to_console(level=logging.DEBUG)
         logger.debug("Verbose mode enabled")
+    else:
+        enable_logger_to_console(level=logging.INFO)
 
 
 def run_driver_command(provider: BaseProvider, command: Command, params: list[str] = None):
@@ -142,7 +152,8 @@ def pip_install(package: str):
 @click.option("--reload", is_flag=True, default=False, help="auto reload, dev only")
 @click.option("-f", "--force", is_flag=True, default=False, help="shutdown alrealy runningserver")
 @click.option("-s", "--no-browser", is_flag=True, default=False, help="silent mode, do not open browser")
-def server(port: int, host: str, reload: bool, force: bool, no_browser: bool):
+@click.option("--offline", is_flag=True, default=False, help="offline mode, do not use internet")
+def server(port: int, host: str, reload: bool, force: bool, no_browser: bool, offline: bool):
     click.echo(f"uiautodev version: {__version__}")
     if force:
         try:
@@ -154,8 +165,13 @@ def server(port: int, host: str, reload: bool, force: bool, no_browser: bool):
     if platform.system() == 'Windows':
         use_color = False
 
+    if offline:
+        from uiautodev.router.proxy import cache_dir
+        cache_dir.mkdir(parents=True, exist_ok=True)
+        logger.info("offline mode enabled, cache dir: %s", cache_dir)
+
     if not no_browser:
-        th = threading.Thread(target=open_browser_when_server_start, args=(f"http://{host}:{port}",))
+        th = threading.Thread(target=open_browser_when_server_start, args=(f"http://{host}:{port}", offline))
         th.daemon = True
         th.start()
     uvicorn.run("uiautodev.app:app", host=host, port=port, reload=reload, use_colors=use_color)
@@ -169,16 +185,16 @@ def shutdown(port: int):
         pass
 
 
-def open_browser_when_server_start(server_url: str):
+def open_browser_when_server_start(local_server_url: str, offline: bool = False):
     deadline = time.time() + 10
     while time.time() < deadline:
         try:
-            httpx.get(f"{server_url}/api/info", timeout=1)
+            httpx.get(f"{local_server_url}/api/info", timeout=1)
             break
         except Exception as e:
             time.sleep(0.5)
     import webbrowser
-    web_url = get_webpage_url()
+    web_url = get_webpage_url(local_server_url if offline else None)
     logger.info("open browser: %s", web_url)
     webbrowser.open(web_url)
 

uiautodev/command_proxy.py

@@ -13,8 +13,8 @@ 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, SendKeysRequest, TapRequest, \
-    WindowSizeResponse
+    DumpResponse, FindElementRequest, FindElementResponse, InstallAppRequest, InstallAppResponse, SendKeysRequest, \
+    TapRequest, WindowSizeResponse
 from uiautodev.driver.base_driver import BaseDriver
 from uiautodev.exceptions import ElementNotFoundError
 from uiautodev.model import AppInfo, Node

uiautodev/common.py

@@ -8,7 +8,7 @@
 import io
 import locale
 import logging
-from typing import List
+from typing import List, Optional
 
 from PIL import Image
 
@@ -26,8 +26,9 @@ def is_chinese_language() -> bool:
         return False
     
     
-def get_webpage_url() -> str:
-    web_url = "https://uiauto.dev"
+def get_webpage_url(web_url: Optional[str] = None) -> str:
+    if not web_url:
+        web_url = "https://uiauto.dev"
     # code will be enabled until uiauto.devsleep.com is ready
     # if is_chinese_language():
     #     web_url = "https://uiauto.devsleep.com"

uiautodev/provider.py

@@ -11,7 +11,7 @@ from typing import Type
 
 import adbutils
 
-from uiautodev.driver.android import U2AndroidDriver, ADBAndroidDriver
+from uiautodev.driver.android import ADBAndroidDriver, U2AndroidDriver
 from uiautodev.driver.base_driver import BaseDriver
 from uiautodev.driver.harmony import HDC, HarmonyDriver
 from uiautodev.driver.ios import IOSDriver

uiautodev/router/android.py

@@ -6,7 +6,7 @@ from typing import Dict, Optional
 from fastapi import APIRouter, Request, Response
 from pydantic import BaseModel
 
-from uiautodev.driver.android import U2AndroidDriver, ADBAndroidDriver
+from uiautodev.driver.android import ADBAndroidDriver, U2AndroidDriver
 from uiautodev.model import ShellResponse
 
 logger = logging.getLogger(__name__)

{uiautodev-0.13.0.dist-info → uiautodev-0.13.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uiautodev
-Version: 0.13.0
+Version: 0.13.1
 Summary: Mobile UI Automation, include UI hierarchy inspector, script recorder
 License: MIT
 License-File: LICENSE
@@ -83,24 +83,20 @@ uiauto.dev
 # Default driver is uiautomator2
 # Set the environment variable below to switch to adb driver
 export UIAUTODEV_USE_ADB_DRIVER=1
-
-# Set the env to enable DEBUG log
-export UIAUTODEV_DEBUG=1
 ```
 
 # Offline mode
 
-Currently, the frontend is deployed on a separate server, so internet connection is required.
-However, some users have limited network environments or restricted internet access. Therefore, an offline cache mode has been added.
-Create a `cache` directory in the directory where uiautodev starts to activate frontend caching.
+Start with
 
 ```sh
-mkdir cache
-uiautodev
+uiautodev server --offline
 ```
 
 Visit <http://localhost:20242> once, and then disconnecting from the internet will not affect usage.
 
+> All frontend resources will be saved to cache/ dir.
+
 # DEVELOP
 
 see [DEVELOP.md](DEVELOP.md)
@@ -111,3 +107,4 @@ see [DEVELOP.md](DEVELOP.md)
 
 # LICENSE
 [MIT](LICENSE)
+

{uiautodev-0.13.0.dist-info → uiautodev-0.13.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
-uiautodev/__init__.py,sha256=l2yjmQuQvbWbnZV6bq7R6oHOWawSooP2mP4oApxlhx4,165
+uiautodev/__init__.py,sha256=C6Noxhnrb3twftV9aYC0k6qYkF2dsG1Q75iaQhkACIQ,165
 uiautodev/__main__.py,sha256=0WZHyHW-M7FG5RexANNoIB5pkCX8xwQbTnmaOA9Y1kg,176
-uiautodev/app.py,sha256=QSAq1p3Jp5a8d9tB6A-29ZktoU3SzOSeHnq6t1SD-KY,7485
+uiautodev/app.py,sha256=-uWfrcW4RhZbo8I8yIclD79cs8UqcpKY79LLYIGEa0c,7124
 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=GIwB9zS88t8HO3gY9rV2-u9IJSu9ebXm1tcWlKfxPxI,6402
-uiautodev/command_proxy.py,sha256=Od8jSVDOUJWWcni-Jq8_IHd34VbfWECi0mL1wl86lIo,5446
+uiautodev/cli.py,sha256=ACH8GrA6JXjj1xEXikHGwkHYtfdv2kxiv2QDj0bK8gE,7071
+uiautodev/command_proxy.py,sha256=zNzX6UkKb8AKdeXV9Nj7i07yKcvObREJGtvO8ID83a4,5446
 uiautodev/command_types.py,sha256=wZa-yQpxzQO79iFMHShJELuZgYJm-yweG-TeSBvzBvs,1867
-uiautodev/common.py,sha256=Ea-49YAlS9gOUsPk6ytc5qlG96jsMPhm9ZlWXZhJ97c,1554
+uiautodev/common.py,sha256=1-LhSAx-stmIL1UJLkmdu-jC5Sc8vaq77XJf02zfAWc,1617
 uiautodev/driver/android/__init__.py,sha256=KqAi5RYNDbfeH2I6UMxi7Ye7uKWYLjtDqB6N1yCVyF8,139
 uiautodev/driver/android/adb_driver.py,sha256=Pe-Hf7WRcZ3P4_KTcsAz3Y_5DDcyyQ-MvLBpaj3AhJ8,6910
 uiautodev/driver/android/common.py,sha256=0RbWggmj0lbG46ioGR3NVPKiMCGxNWNDr3Ol6gKmNmY,2079
@@ -22,13 +22,13 @@ uiautodev/driver/udt/appium-uiautomator2-v5.12.4-light.apk,sha256=cKUVKpqEiGRXOD
 uiautodev/driver/udt/udt.py,sha256=p6opbUtYxEGTINIX83F6m2CtzB42iSSBYRv1SjXCEFg,8351
 uiautodev/exceptions.py,sha256=lQI14vshN5qExVE23g2aw5i2fkdQFfLCJj2dO6kVLZw,591
 uiautodev/model.py,sha256=hrqezVn1XFXHyajFxxmoiuGDZoYAodfitWMBzrYgziA,1071
-uiautodev/provider.py,sha256=SEtFrT0mDD6U2L_pHQoxR8rr0_k8nFU1QyjZp0nc7MA,3186
+uiautodev/provider.py,sha256=bgBxxRyhF3IEpl06BFaFx4PqYOvIlJ7b5vOoav9dXvw,3186
 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
 uiautodev/remote/scrcpy.py,sha256=JNSwC35f4os-IQW4ixx7ky9clpqRWvA8X_obUkwuOh8,7415
 uiautodev/remote/touch_controller.py,sha256=dYl5XTLaYEyZiNJmKwHQpw9QhPSkN3iUetJSaiQJBHg,4255
-uiautodev/router/android.py,sha256=1HwYprhnMKpho6tO2cGAdB9I1vIpKTxZzUUdSN1GJiY,1384
+uiautodev/router/android.py,sha256=XPG7UdKfW4A6dLW6MQxOrwUOAOdjaaImtXxs62C_xIg,1384
 uiautodev/router/device.py,sha256=59uSGvOmJKoaf0oC1eQQWhQ4Yvz3-8Cp5bD6_N6e9iI,4290
 uiautodev/router/proxy.py,sha256=zQyZDeSM46fcqkYx8uFzUoY3udi7GUQaJhP3Ybspcco,6990
 uiautodev/router/xml.py,sha256=MKVLhjMBqE4qbEraQxvdrVp_OBnylEL9Wti5lnmBDk4,891
@@ -37,8 +37,8 @@ uiautodev/utils/common.py,sha256=L1qBBBS6jRgkXlGy5o6Xafo49auLXKRWyX9x8U_IKjc,482
 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.13.0.dist-info/METADATA,sha256=NyNuI4drO2hYGa07mab3185NMiYoNrPF8C_DCYsqvCc,3286
-uiautodev-0.13.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-uiautodev-0.13.0.dist-info/entry_points.txt,sha256=zBY8GgseYAAzPFA5Cf4rCCS9ivdyWsNxMVVYIaGAHJU,88
-uiautodev-0.13.0.dist-info/licenses/LICENSE,sha256=RyeW676gBYO7AVVP2zQgfEx5rPSt46vR47xXZe7TlX4,1068
-uiautodev-0.13.0.dist-info/RECORD,,
+uiautodev-0.13.1.dist-info/METADATA,sha256=pYogWWN2aGL3YmZjetrFVNnJ5YAe3zZNZusB4hFY8Bk,2973
+uiautodev-0.13.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+uiautodev-0.13.1.dist-info/entry_points.txt,sha256=zBY8GgseYAAzPFA5Cf4rCCS9ivdyWsNxMVVYIaGAHJU,88
+uiautodev-0.13.1.dist-info/licenses/LICENSE,sha256=RyeW676gBYO7AVVP2zQgfEx5rPSt46vR47xXZe7TlX4,1068
+uiautodev-0.13.1.dist-info/RECORD,,