droidrun 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

droidrun/portal.py

@@ -2,8 +2,9 @@ import requests
 import tempfile
 import os
 import contextlib
-from droidrun.adb import Device, DeviceManager
-import asyncio
+from adbutils import adb, AdbDevice
+from droidrun.tools import AdbTools
+from rich.console import Console
 
 REPO = "droidrun/droidrun-portal"
 ASSET_NAME = "droidrun-portal"
@@ -37,8 +38,10 @@ def get_latest_release_assets(debug: bool = False):
 
 @contextlib.contextmanager
 def download_portal_apk(debug: bool = False):
+    console = Console()
     assets = get_latest_release_assets(debug)
 
+    asset_version = None
     asset_url = None
     for asset in assets:
         if (
@@ -47,11 +50,15 @@ def download_portal_apk(debug: bool = False):
             and asset["name"].startswith(ASSET_NAME)
         ):
             asset_url = asset["browser_download_url"]
+            asset_version = asset["name"].split("-")[-1]
+            asset_version = asset_version.removesuffix(".apk")
             break
         elif "downloadUrl" in asset and os.path.basename(
             asset["downloadUrl"]
         ).startswith(ASSET_NAME):
             asset_url = asset["downloadUrl"]
+            asset_version: str = asset["name"].split("-")[-1]
+            asset_version = asset_version.removesuffix(".apk")
             break
         else:
             if debug:
@@ -60,6 +67,10 @@ def download_portal_apk(debug: bool = False):
     if not asset_url:
         raise Exception(f"Asset named '{ASSET_NAME}' not found in the latest release.")
 
+    console.print(f"Found Portal APK [bold]{asset_version}[/bold]")
+    if debug:
+        console.print(f"Asset URL: {asset_url}")
+
     tmp = tempfile.NamedTemporaryFile(delete=False, suffix=".apk")
     try:
         r = requests.get(asset_url, stream=True)
@@ -74,23 +85,21 @@ def download_portal_apk(debug: bool = False):
             os.unlink(tmp.name)
 
 
-async def enable_portal_accessibility(device: Device):
-    await device.shell(
+def enable_portal_accessibility(device: AdbDevice):
+    device.shell(
         f"settings put secure enabled_accessibility_services {A11Y_SERVICE_NAME}"
     )
-    await device.shell("settings put secure accessibility_enabled 1")
+    device.shell("settings put secure accessibility_enabled 1")
 
 
-async def check_portal_accessibility(device: Device, debug: bool = False) -> bool:
-    a11y_services = await device.shell(
-        "settings get secure enabled_accessibility_services"
-    )
+def check_portal_accessibility(device: AdbDevice, debug: bool = False) -> bool:
+    a11y_services = device.shell("settings get secure enabled_accessibility_services")
     if not A11Y_SERVICE_NAME in a11y_services:
         if debug:
             print(a11y_services)
         return False
 
-    a11y_enabled = await device.shell("settings get secure accessibility_enabled")
+    a11y_enabled = device.shell("settings get secure accessibility_enabled")
     if a11y_enabled != "1":
         if debug:
             print(a11y_enabled)
@@ -99,12 +108,12 @@ async def check_portal_accessibility(device: Device, debug: bool = False) -> boo
     return True
 
 
-async def ping_portal(device: Device, debug: bool = False):
+def ping_portal(device: AdbDevice, debug: bool = False):
     """
     Ping the Droidrun Portal to check if it is installed and accessible.
     """
     try:
-        packages = await device.list_packages()
+        packages = device.list_packages()
     except Exception as e:
         raise Exception(f"Failed to list packages: {e}")
 
@@ -113,27 +122,33 @@ async def ping_portal(device: Device, debug: bool = False):
             print(packages)
         raise Exception("Portal is not installed on the device")
 
-    if not await check_portal_accessibility(device, debug):
-        await device.shell("am start -a android.settings.ACCESSIBILITY_SETTINGS")
+    if not check_portal_accessibility(device, debug):
+        device.shell("am start -a android.settings.ACCESSIBILITY_SETTINGS")
         raise Exception(
             "Droidrun Portal is not enabled as an accessibility service on the device"
         )
 
+
+def ping_portal_content(device: AdbDevice, debug: bool = False):
     try:
-        state = await device.shell(
-            "content query --uri content://com.droidrun.portal/state"
-        )
+        state = device.shell("content query --uri content://com.droidrun.portal/state")
         if not "Row: 0 result=" in state:
             raise Exception("Failed to get state from Droidrun Portal")
-
     except Exception as e:
         raise Exception(f"Droidrun Portal is not reachable: {e}")
 
 
-async def test():
-    device = await DeviceManager().get_device()
-    await ping_portal(device, debug=False)
+def ping_portal_tcp(device: AdbDevice, debug: bool = False):
+    try:
+        tools = AdbTools(serial=device.serial, use_tcp=True)
+    except Exception as e:
+        raise Exception(f"Failed to setup TCP forwarding: {e}")
+
+
+def test():
+    device = adb.device()
+    ping_portal(device, debug=False)
 
 
 if __name__ == "__main__":
-    asyncio.run(test())
+    test()

droidrun/telemetry/events.py

@@ -17,7 +17,7 @@ class DroidAgentInitEvent(TelemetryEvent):
     reflection: bool
     enable_tracing: bool
     debug: bool
-    save_trajectories: bool
+    save_trajectories: str
 
 
 class DroidAgentFinalizeEvent(TelemetryEvent):

droidrun/telemetry/tracker.py

@@ -45,6 +45,7 @@ print_telemetry_message()
 def get_user_id() -> str:
     try:
         if not USER_ID_PATH.exists():
+            USER_ID_PATH.parent.mkdir(parents=True, exist_ok=True)
             USER_ID_PATH.touch()
             USER_ID_PATH.write_text(str(uuid4()))
         logger.debug(f"User ID: {USER_ID_PATH.read_text()}")
@@ -54,7 +55,7 @@ def get_user_id() -> str:
         return "unknown"
 
 
-def capture(event: TelemetryEvent):
+def capture(event: TelemetryEvent, user_id: str | None = None):
     try:
         if not is_telemetry_enabled():
             logger.debug(f"Telemetry disabled, skipping capture of {event}")
@@ -66,7 +67,7 @@ def capture(event: TelemetryEvent):
             **event_data,
         }
 
-        posthog.capture(event_name, distinct_id=get_user_id(), properties=properties)
+        posthog.capture(event_name, distinct_id=user_id or get_user_id(), properties=properties)
         logger.debug(f"Captured event: {event_name} with properties: {event}")
     except Exception as e:
         logger.error(f"Error capturing event: {e}")