droidrun 0.3.6__tar.gz → 0.3.7__tar.gz

{droidrun-0.3.6 → droidrun-0.3.7}/PKG-INFO

@@ -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 → droidrun-0.3.7}/README.md

@@ -33,7 +33,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 → droidrun-0.3.7}/docs/v3/guides/cli.mdx

@@ -11,9 +11,9 @@ DroidRun lets you control Android devices using natural language and LLM agents.
 ## Prerequisites
 
 <Steps>
-    <Step title="Install DroidRun and its dependencies.">
+    <Step title="Install DroidRun and its dependencies. Choose which ever provider you'd like to use.">
        ```sh 
-       pip install droidrun
+       pip install droidrun[google,anthropic,openai,deepseek,ollama,dev]
        ```
     </Step>
     <Step title="Ensure your Android device is connected and the DroidRun Portal is installed">
@@ -27,11 +27,11 @@ DroidRun lets you control Android devices using natural language and LLM agents.
        droidrun ping
        ```
     </Step>
-    <Step title="Install the required LlamaIndex LLM integrations for your provider">
-    ```sh
-    pip install llama-index-llms-openai llama-index-llms-ollama llama-index-llms-gemini
-    ```
-  </Step>
+    <Step title="If you want to use a provider thats not included with our extras, install the required LlamaIndex LLM integrations">
+      ```sh
+      pip install llama-index-llms-openrouter
+      ```
+    </Step>
 </Steps>
 ---
 

{droidrun-0.3.6 → droidrun-0.3.7}/docs/v3/guides/gemini.mdx

@@ -32,7 +32,7 @@ Make sure you've set up and enabled the Droidrun Portal.
 ## 2. Install Required Python Packages
 
 ```sh
-pip install droidrun llama-index-llms-google-genai
+pip install droidrun[google]
 ```
 
 ## 3. Example: Using Droidrun with Gemini LLM

{droidrun-0.3.6 → droidrun-0.3.7}/docs/v3/guides/ollama.mdx

@@ -47,7 +47,7 @@ ollama pull llama4
 Make sure you have the required Python packages:
 
 ```sh
-pip install droidrun llama-index-llms-ollama
+pip install droidrun[ollama]
 ```
 
 ## 3. Example: Using Droidrun with Ollama LLM

{droidrun-0.3.6 → droidrun-0.3.7}/docs/v3/guides/openailike.mdx

@@ -36,7 +36,7 @@ Get your API key for the provider you've choosen
 ## 2. Install the required Python packages:
 
 ```sh
-pip install droidrun llama-index-llms-openai-like
+pip install droidrun[openai]
 ```
 
 ## 3. Example: Using Droidrun with OpenAI-like LLM

{droidrun-0.3.6 → droidrun-0.3.7}/docs/v3/quickstart.mdx

@@ -26,9 +26,9 @@ Before installing DroidRun, ensure you have:
    - Connected via USB or on the same network (for wireless debugging)
 
 ### Install from PyPI
-Use [`uv`](https://docs.astral.sh/uv/getting-started/installation/)
+Choose which ever provider you'd like to use. If you encounter dependency resolution issues use [`uv`](https://docs.astral.sh/uv/getting-started/installation/).
 ```bash
-uv pip install droidrun
+pip install droidrun[google,anthropic,openai,deepseek,ollama,dev]
 ```
 
 ### Setup the Portal APK
@@ -91,5 +91,5 @@ Now that you've got DroidRun running, you can:
 
 - Learn about the [Agent](/v3/concepts/agent)
 - See supported [LLM providers](/v3/concepts/models)
-- Discover [Android interactions](/v3/concepts/android-control)
+- Discover [Android interactions](/v3/concepts/android-tools)
 - Learn about the [Portal App](/v3/concepts/portal-app) 

{droidrun-0.3.6 → droidrun-0.3.7}/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-0.3.6 → droidrun-0.3.7}/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 → droidrun-0.3.7}/pyproject.toml

@@ -1,21 +1,13 @@
 [project]
 name = "droidrun"
-version = "0.3.6"
+version = "0.3.7"
 description = "A framework for controlling Android devices through LLM agents"
 authors = [{ name = "Niels Schmidt", email = "niels.schmidt@droidrun.ai" }]
 dependencies = [
     "adbutils>=2.10.2",
     # dependency of adbutils[apk]
-    "anthropic>=0.67.0",
     "apkutils==2.0.0",
-    "llama-index>=0.14.0",
-    "llama-index-llms-anthropic>=0.8.6",
-    "llama-index-llms-deepseek>=0.2.1",
-    "llama-index-llms-google-genai>=0.3.1",
-    "llama-index-llms-ollama>=0.7.2",
-    "llama-index-llms-openai>=0.5.6",
-    "llama-index-llms-openai-like>=0.5.1",
-    "openai>=1.107.1",
+    "llama-index>=0.13.6",
     "posthog>=6.7.4",
     "pydantic>=2.11.7",
     "rich>=14.1.0",
@@ -49,6 +41,24 @@ Homepage = "https://github.com/droidrun/droidrun"
 Documentation = "https://docs.droidrun.ai/"
 
 [project.optional-dependencies]
+anthropic = [
+    "anthropic>=0.67.0",
+    "llama-index-llms-anthropic>=0.8.6",
+]
+openai = [
+    "openai>=1.107.1",
+    "llama-index-llms-openai>=0.5.6",
+    "llama-index-llms-openai-like>=0.5.1",
+]
+google = [
+    "llama-index-llms-google-genai>=0.3.1",
+]
+deepseek = [
+    "llama-index-llms-deepseek>=0.2.1",
+]
+ollama = [
+    "llama-index-llms-ollama>=0.7.2",
+]
 dev = [
     "black>=23.0.0",
     "ruff>=0.13.0",