uiautodev 0.13.0__tar.gz → 0.13.1__tar.gz

{uiautodev-0.13.0 → uiautodev-0.13.1}/PKG-INFO

@@ -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 → uiautodev-0.13.1}/README.md

@@ -47,24 +47,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)
@@ -74,4 +70,4 @@ see [DEVELOP.md](DEVELOP.md)
 - https://docs.tangoapp.dev/scrcpy/video/web-codecs/ H264解码器
 
 # LICENSE
-[MIT](LICENSE)
+[MIT](LICENSE)

{uiautodev-0.13.0 → uiautodev-0.13.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiautodev"
-version = "0.13.0"
+version = "0.13.1"
 description = "Mobile UI Automation, include UI hierarchy inspector, script recorder"
 homepage = "https://uiauto.dev"
 authors = ["codeskyblue <codeskyblue@gmail.com>"]

{uiautodev-0.13.0 → uiautodev-0.13.1}/uiautodev/__init__.py

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

{uiautodev-0.13.0 → uiautodev-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-0.13.0 → uiautodev-0.13.1}/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-0.13.0 → uiautodev-0.13.1}/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-0.13.0 → uiautodev-0.13.1}/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-0.13.0 → uiautodev-0.13.1}/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-0.13.0 → uiautodev-0.13.1}/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__)