droidrun 0.3.6__py3-none-any.whl → 0.3.7__py3-none-any.whl

droidrun/portal.py

@@ -1,11 +1,13 @@
-import requests
-import tempfile
-import os
 import contextlib
-from adbutils import adb, AdbDevice
-from droidrun.tools import AdbTools
+import os
+import tempfile
+
+import requests
+from adbutils import AdbDevice, adb
 from rich.console import Console
 
+from droidrun.tools import AdbTools
+
 REPO = "droidrun/droidrun-portal"
 ASSET_NAME = "droidrun-portal"
 GITHUB_API_HOSTS = ["https://api.github.com", "https://ungh.cc"]
@@ -96,7 +98,7 @@ def check_portal_accessibility(
     device: AdbDevice, service_name: str = A11Y_SERVICE_NAME, debug: bool = False
 ) -> bool:
     a11y_services = device.shell("settings get secure enabled_accessibility_services")
-    if not service_name in a11y_services:
+    if service_name not in a11y_services:
         if debug:
             print(a11y_services)
         return False
@@ -117,9 +119,9 @@ def ping_portal(device: AdbDevice, debug: bool = False):
     try:
         packages = device.list_packages()
     except Exception as e:
-        raise Exception(f"Failed to list packages: {e}")
+        raise Exception("Failed to list packages") from e
 
-    if not PORTAL_PACKAGE_NAME in packages:
+    if PORTAL_PACKAGE_NAME not in packages:
         if debug:
             print(packages)
         raise Exception("Portal is not installed on the device")
@@ -134,17 +136,17 @@ def ping_portal(device: AdbDevice, debug: bool = False):
 def ping_portal_content(device: AdbDevice, debug: bool = False):
     try:
         state = device.shell("content query --uri content://com.droidrun.portal/state")
-        if not "Row: 0 result=" in state:
+        if "Row: 0 result=" not in state:
             raise Exception("Failed to get state from Droidrun Portal")
     except Exception as e:
-        raise Exception(f"Droidrun Portal is not reachable: {e}")
+        raise Exception("Droidrun Portal is not reachable") from e
 
 
 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}")
+        raise Exception("Failed to setup TCP forwarding") from e
 
 
 def set_overlay_offset(device: AdbDevice, offset: int):
@@ -155,8 +157,38 @@ def set_overlay_offset(device: AdbDevice, offset: int):
         cmd = f'content insert --uri "content://com.droidrun.portal/overlay_offset" --bind offset:i:{offset}'
         device.shell(cmd)
     except Exception as e:
-        raise Exception(f"Error setting overlay offset: {str(e)}")
+        raise Exception("Error setting overlay offset") from e
+
+def toggle_overlay(device: AdbDevice, visible: bool):
+    """toggle the overlay visibility.
+
+    Args:
+        device: Device to toggle the overlay on
+        visible: Whether to show the overlay
+
+    throws:
+        Exception: If the overlay toggle fails
+    """
+    try:
+        device.shell(
+            f"am broadcast -a com.droidrun.portal.TOGGLE_OVERLAY --ez overlay_visible {'true' if visible else 'false'}"
+        )
+    except Exception as e:
+        raise Exception("Failed to toggle overlay") from e
 
+def setup_keyboard(device: AdbDevice):
+    """
+    Set up the DroidRun keyboard as the default input method.
+    Simple setup that just switches to DroidRun keyboard without saving/restoring.
+
+    throws:
+        Exception: If the keyboard setup fails
+    """
+    try:
+        device.shell("ime enable com.droidrun.portal/.DroidrunKeyboardIME")
+        device.shell("ime set com.droidrun.portal/.DroidrunKeyboardIME")
+    except Exception as e:
+        raise Exception("Error setting up keyboard") from e
 
 def test():
     device = adb.device()

droidrun/tools/adb.py

@@ -831,8 +831,6 @@ class AdbTools(Tools):
                     data_str = None
                     if "data" in state_data:
                         data_str = state_data["data"]
-                    elif "message" in state_data:
-                        data_str = state_data["message"]
                     
                     if data_str:
                         try:

{droidrun-0.3.6.dist-info → droidrun-0.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: droidrun
-Version: 0.3.6
+Version: 0.3.7
 Summary: A framework for controlling Android devices through LLM agents
 Project-URL: Homepage, https://github.com/droidrun/droidrun
 Project-URL: Bug Tracker, https://github.com/droidrun/droidrun/issues
@@ -27,25 +27,30 @@ Classifier: Topic :: System :: Emulators
 Classifier: Topic :: Utilities
 Requires-Python: >=3.11
 Requires-Dist: adbutils>=2.10.2
-Requires-Dist: anthropic>=0.67.0
 Requires-Dist: apkutils==2.0.0
-Requires-Dist: llama-index-llms-anthropic>=0.8.6
-Requires-Dist: llama-index-llms-deepseek>=0.2.1
-Requires-Dist: llama-index-llms-google-genai>=0.3.1
-Requires-Dist: llama-index-llms-ollama>=0.7.2
-Requires-Dist: llama-index-llms-openai-like>=0.5.1
-Requires-Dist: llama-index-llms-openai>=0.5.6
-Requires-Dist: llama-index>=0.14.0
-Requires-Dist: openai>=1.107.1
+Requires-Dist: llama-index>=0.13.6
 Requires-Dist: posthog>=6.7.4
 Requires-Dist: pydantic>=2.11.7
 Requires-Dist: rich>=14.1.0
+Provides-Extra: anthropic
+Requires-Dist: anthropic>=0.67.0; extra == 'anthropic'
+Requires-Dist: llama-index-llms-anthropic>=0.8.6; extra == 'anthropic'
+Provides-Extra: deepseek
+Requires-Dist: llama-index-llms-deepseek>=0.2.1; extra == 'deepseek'
 Provides-Extra: dev
 Requires-Dist: bandit>=1.8.6; extra == 'dev'
 Requires-Dist: black>=23.0.0; extra == 'dev'
 Requires-Dist: mypy>=1.0.0; extra == 'dev'
 Requires-Dist: ruff>=0.13.0; extra == 'dev'
 Requires-Dist: safety>=3.2.11; extra == 'dev'
+Provides-Extra: google
+Requires-Dist: llama-index-llms-google-genai>=0.3.1; extra == 'google'
+Provides-Extra: ollama
+Requires-Dist: llama-index-llms-ollama>=0.7.2; extra == 'ollama'
+Provides-Extra: openai
+Requires-Dist: llama-index-llms-openai-like>=0.5.1; extra == 'openai'
+Requires-Dist: llama-index-llms-openai>=0.5.6; extra == 'openai'
+Requires-Dist: openai>=1.107.1; extra == 'openai'
 Description-Content-Type: text/markdown
 
 <picture>
@@ -83,7 +88,7 @@ DroidRun is a powerful framework for controlling Android and iOS devices through
 ## 📦 Installation
 
 ```bash
-pip install droidrun
+pip install droidrun[google,anthropic,openai,deepseek,ollama,dev]
 ```
 
 ## 🚀 Quickstart

{droidrun-0.3.6.dist-info → droidrun-0.3.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 droidrun/__init__.py,sha256=Cqt4NXZ-753220dlRZXglMkFT2ygcXSErMmqupGsi9A,622
 droidrun/__main__.py,sha256=78o1Wr_Z-NrZy9yLWmEfNfRRhAiJGBr4Xi3lmbgkx3w,105
-droidrun/portal.py,sha256=K9Yh2Lq6AC_7Qf5ySYuZr3CpYtN3hoD9cGy4D7I4zCc,5151
+droidrun/portal.py,sha256=4-1lNc28yxDSkg2qf_t36gXzTSflcJqfsxggYpUwmio,6169
 droidrun/agent/__init__.py,sha256=4SqTJeGDvr_wT8rtN9J8hnN6P-pae663mkYr-JmzH4w,208
 droidrun/agent/usage.py,sha256=ZTgqxRAgugJ9tk6ApZ2BJ5nB88pt9rhLyTFS5AnVUHo,7153
 droidrun/agent/codeact/__init__.py,sha256=ZLDGT_lTTzyNm7pcBzdyRIGHJ2ZgbInJdhXZRbJLhSQ,278
@@ -45,11 +45,11 @@ droidrun/telemetry/__init__.py,sha256=D4Mp02iGJH2Tjpv42Bzyo6_WC3NWj9Qy9hQPWFaCkh
 droidrun/telemetry/events.py,sha256=OIYIs5stZtKz0g82W8WFE_h6q3jh0vUhc9_CwNTJ3a4,529
 droidrun/telemetry/tracker.py,sha256=Ljue6zivX8KnadXI9DivrayuWxAnUwbJKvCvNtY1Y4Y,2717
 droidrun/tools/__init__.py,sha256=9ReauavtSKDQG9ya9_Fr9O0TQnDFixgOPaP5n82_iEk,271
-droidrun/tools/adb.py,sha256=O4bl23QTIOG_ng1ukdWg87n01FVhNoSi3dBdgL6oaqs,38409
+droidrun/tools/adb.py,sha256=91HmimUJtvGyMcE2HEDJLvTQt95ZYNCXWAJlOs4X9HQ,38302
 droidrun/tools/ios.py,sha256=imzojiS6gqz4IKexUEz1ga7-flSOaC5QRpHIJTwcgSQ,21807
 droidrun/tools/tools.py,sha256=Swlzo9A8B8YcgU6XNHRG1LNpo_-RljzhyVhnEYYm-G4,4772
-droidrun-0.3.6.dist-info/METADATA,sha256=3iRkXCLUc8DjEDB0a89zXuhriSIZh5bytsVm8yWQDI8,6535
-droidrun-0.3.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-droidrun-0.3.6.dist-info/entry_points.txt,sha256=o259U66js8TIybQ7zs814Oe_LQ_GpZsp6a9Cr-xm5zE,51
-droidrun-0.3.6.dist-info/licenses/LICENSE,sha256=s-uxn9qChu-kFdRXUp6v_0HhsaJ_5OANmfNOFVm2zdk,1069
-droidrun-0.3.6.dist-info/RECORD,,
+droidrun-0.3.7.dist-info/METADATA,sha256=0bBaBhRe06W_72e-eRtnnHDTTK2KXEQZx82gcaBhuYo,6860
+droidrun-0.3.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+droidrun-0.3.7.dist-info/entry_points.txt,sha256=o259U66js8TIybQ7zs814Oe_LQ_GpZsp6a9Cr-xm5zE,51
+droidrun-0.3.7.dist-info/licenses/LICENSE,sha256=s-uxn9qChu-kFdRXUp6v_0HhsaJ_5OANmfNOFVm2zdk,1069
+droidrun-0.3.7.dist-info/RECORD,,