droidrun 0.3.10.dev7__py3-none-any.whl → 0.3.10.dev9__py3-none-any.whl

droidrun/cli/main.py

@@ -555,18 +555,15 @@ def run(
         )
     finally:
         # Disable DroidRun keyboard after execution
+        # Note: Port forwards are managed automatically and persist until device disconnect
         try:
             if not (ios if ios is not None else False):
-                device_serial = adb.device().serial
-                if device_serial:
-                    tools = AdbTools(serial=device, use_tcp=use_tcp if use_tcp is not None else False)
-                    if hasattr(tools, 'device') and tools.device:
-                        tools.device.shell("ime disable com.droidrun.portal/.DroidrunKeyboardIME")
-                        click.echo("DroidRun keyboard disabled successfully")
-                    # Cleanup tools
-                    del tools
-        except Exception as disable_e:
-            click.echo(f"Warning: Failed to disable DroidRun keyboard: {disable_e}")
+                device_obj = adb.device(device)
+                if device_obj:
+                    device_obj.shell("ime disable com.droidrun.portal/.DroidrunKeyboardIME")
+        except Exception:
+            click.echo("Failed to disable DroidRun keyboard")
+            pass
 
 
 @cli.command()

droidrun/tools/adb.py

@@ -2,15 +2,11 @@
 UI Actions - Core UI interaction tools for Android device control.
 """
 
-import base64
-import io
-import json
 import logging
 import os
 import time
 from typing import Any, Dict, List, Optional, Tuple
 
-import requests
 from adbutils import adb
 from llama_index.core.workflow import Context
 
@@ -24,6 +20,7 @@ from droidrun.agent.common.events import (
 )
 from droidrun.tools.tools import Tools
 
+from droidrun.tools.portal_client import PortalClient
 logger = logging.getLogger("droidrun-tools")
 PORTAL_DEFAULT_TCP_PORT = 8080
 
@@ -49,9 +46,8 @@ class AdbTools(Tools):
             text_manipulator_llm: LLM instance for text manipulation (optional)
         """
         self.device = adb.device(serial=serial)
-        self.use_tcp = use_tcp
-        self.remote_tcp_port = remote_tcp_port
-        self.tcp_forwarded = False
+
+        self.portal = PortalClient(self.device, prefer_tcp=use_tcp)
 
         self._ctx = None
         # Instance‐level cache for clickable elements (index-based tapping)
@@ -75,10 +71,6 @@ class AdbTools(Tools):
         from droidrun.portal import setup_keyboard
         setup_keyboard(self.device)
 
-        # Set up TCP forwarding if requested
-        if self.use_tcp:
-            self.setup_tcp_forward()
-
 
     def get_date(self) -> str:
         """
@@ -86,127 +78,9 @@ class AdbTools(Tools):
         """
         return self.device.shell("date").strip()
 
-
-    def setup_tcp_forward(self) -> bool:
-        """
-        Set up ADB TCP port forwarding for communication with the portal app.
-
-        Returns:
-            bool: True if forwarding was set up successfully, False otherwise
-        """
-        try:
-            logger.debug(
-                f"Setting up TCP port forwarding for port tcp:{self.remote_tcp_port} on device {self.device.serial}"
-            )
-            # Use adb forward command to set up port forwarding
-            self.local_tcp_port = self.device.forward_port(self.remote_tcp_port)
-            self.tcp_base_url = f"http://localhost:{self.local_tcp_port}"
-            logger.debug(
-                f"TCP port forwarding set up successfully to {self.tcp_base_url}"
-            )
-
-            # Test the connection with a ping
-            try:
-                response = requests.get(f"{self.tcp_base_url}/ping", timeout=5)
-                if response.status_code == 200:
-                    logger.debug("TCP connection test successful")
-                    self.tcp_forwarded = True
-                    return True
-                else:
-                    logger.warning(
-                        f"TCP connection test failed with status: {response.status_code}"
-                    )
-                    return False
-            except requests.exceptions.RequestException as e:
-                logger.warning(f"TCP connection test failed: {e}")
-                return False
-
-        except Exception as e:
-            logger.error(f"Failed to set up TCP port forwarding: {e}")
-            self.tcp_forwarded = False
-            return False
-
-    def teardown_tcp_forward(self) -> bool:
-        """
-        Remove ADB TCP port forwarding.
-
-        Returns:
-            bool: True if forwarding was removed successfully, False otherwise
-        """
-        try:
-            if self.tcp_forwarded:
-                logger.debug(
-                    f"Removing TCP port forwarding for port {self.local_tcp_port}"
-                )
-                # remove forwarding
-                cmd = f"killforward:tcp:{self.local_tcp_port}"
-                logger.debug(f"Removing TCP port forwarding: {cmd}")
-                c = self.device.open_transport(cmd)
-                c.close()
-
-                self.tcp_forwarded = False
-                logger.debug("TCP port forwarding removed")
-                return True
-            return True
-        except Exception as e:
-            logger.error(f"Failed to remove TCP port forwarding: {e}")
-            return False
-
-    def __del__(self):
-        """Cleanup when the object is destroyed."""
-        if hasattr(self, "tcp_forwarded") and self.tcp_forwarded:
-            self.teardown_tcp_forward()
-
     def _set_context(self, ctx: Context):
         self._ctx = ctx
 
-    def _parse_content_provider_output(
-        self, raw_output: str
-    ) -> Optional[Dict[str, Any]]:
-        """
-        Parse the raw ADB content provider output and extract JSON data.
-
-        Args:
-            raw_output (str): Raw output from ADB content query command
-
-        Returns:
-            dict: Parsed JSON data or None if parsing failed
-        """
-        # The ADB content query output format is: "Row: 0 result={json_data}"
-        # We need to extract the JSON part after "result="
-        lines = raw_output.strip().split("\n")
-
-        for line in lines:
-            line = line.strip()
-
-            # Look for lines that contain "result=" pattern
-            if "result=" in line:
-                # Extract everything after "result="
-                result_start = line.find("result=") + 7
-                json_str = line[result_start:]
-
-                try:
-                    # Parse the JSON string
-                    json_data = json.loads(json_str)
-                    return json_data
-                except json.JSONDecodeError:
-                    continue
-
-            # Fallback: try to parse lines that start with { or [
-            elif line.startswith("{") or line.startswith("["):
-                try:
-                    json_data = json.loads(line)
-                    return json_data
-                except json.JSONDecodeError:
-                    continue
-
-        # If no valid JSON found in individual lines, try the entire output
-        try:
-            json_data = json.loads(raw_output.strip())
-            return json_data
-        except json.JSONDecodeError:
-            return None
-
     @Tools.ui_action
     def _extract_element_coordinates_by_index(self, index: int) -> Tuple[int, int]:
         """
@@ -510,52 +384,9 @@ class AdbTools(Tools):
         try:
             if index != -1:
                 self.tap_by_index(index)
-            # Encode the text to Base64 (needed for both TCP and content provider)
-            encoded_text = base64.b64encode(text.encode()).decode()
-
-            if self.use_tcp and self.tcp_forwarded:
-                # Use TCP communication
-                payload = {
-                    "base64_text": encoded_text,
-                    "clear": clear  # Include clear parameter for TCP
-                }
-                response = requests.post(
-                    f"{self.tcp_base_url}/keyboard/input",
-                    json=payload,
-                    headers={"Content-Type": "application/json"},
-                    timeout=10,
-                )
-
-                print(
-                    f"Keyboard input TCP response: {response.status_code}, {response.text}"
-                )
 
-                if response.status_code != 200:
-                    return f"Error: HTTP request failed with status {response.status_code}: {response.text}"
-
-                # For TCP, you might want to parse the response for success/error details
-                try:
-                    result_data = response.json()
-                    if result_data.get("status") == "success":
-                        return f"Text input completed (clear={clear}): {text[:50]}{'...' if len(text) > 50 else ''}"
-                    else:
-                        return f"Error: {result_data.get('error', 'Unknown error')}"
-                except:  # noqa: E722
-                    return f"Text input completed (clear={clear}): {text[:50]}{'...' if len(text) > 50 else ''}"
-
-            else:
-                # Fallback to content provider method
-                # Build the content insert command with clear parameter
-                clear_str = "true" if clear else "false"
-                cmd = (
-                    f'content insert --uri "content://com.droidrun.portal/keyboard/input" '
-                    f'--bind base64_text:s:"{encoded_text}" '
-                    f'--bind clear:b:{clear_str}'
-                )
-
-                # Execute the command and capture output for better error handling
-                result = self.device.shell(cmd)
-                print(f"Content provider result: {result}")
+            # Use PortalClient for text input (automatic TCP/content provider selection)
+            success = self.portal.input_text(text, clear)
 
             if self._ctx:
                 input_event = InputTextActionEvent(
@@ -565,15 +396,12 @@ class AdbTools(Tools):
                 )
                 self._ctx.write_event_to_stream(input_event)
 
-            print(
-                f"Text input completed (clear={clear}): {text[:50]}{'...' if len(text) > 50 else ''}"
-            )
-            return f"Text input completed (clear={clear}): {text[:50]}{'...' if len(text) > 50 else ''}"
+            if success:
+                print(f"Text input completed (clear={clear}): {text[:50]}{'...' if len(text) > 50 else ''}")
+                return f"Text input completed (clear={clear}): {text[:50]}{'...' if len(text) > 50 else ''}"
+            else:
+                return "Error: Text input failed"
 
-        except requests.exceptions.RequestException as e:
-            return f"Error: TCP request failed: {str(e)}"
-        except ValueError as e:
-            return f"Error: {str(e)}"
         except Exception as e:
             return f"Error sending text input: {str(e)}"
 
@@ -714,56 +542,21 @@ class AdbTools(Tools):
         """
         try:
             logger.debug("Taking screenshot")
-            img_format = "PNG"
-            image_bytes = None
-
-            if self.use_tcp and self.tcp_forwarded:
-                # Add hideOverlay parameter to URL
-                url = f"{self.tcp_base_url}/screenshot"
-                if not hide_overlay:
-                    url += "?hideOverlay=false"
-
-                response = requests.get(url, timeout=10)
-                if response.status_code == 200:
-                    tcp_response = response.json()
-
-                    # Check if response has the expected format with data field
-                    if tcp_response.get("status") == "success" and "data" in tcp_response:
-                        # Decode base64 string to bytes
-                        base64_data = tcp_response["data"]
-                        image_bytes = base64.b64decode(base64_data)
-                        logger.debug("Screenshot taken via TCP")
-                    else:
-                        # Handle error response from server
-                        error_msg = tcp_response.get("error", "Unknown error")
-                        raise ValueError(f"Error taking screenshot via TCP: {error_msg}")
-                else:
-                    raise ValueError(f"Error taking screenshot via TCP: {response.status_code}")
 
-            else:
-                # Fallback to ADB screenshot method
-                img = self.device.screenshot()
-                img_buf = io.BytesIO()
-                img.save(img_buf, format=img_format)
-                image_bytes = img_buf.getvalue()
-                logger.debug("Screenshot taken via ADB")
+            image_bytes = self.portal.take_screenshot(hide_overlay)
 
             # Store screenshot with timestamp
             self.screenshots.append(
                 {
                     "timestamp": time.time(),
                     "image_data": image_bytes,
-                    "format": img_format,
+                    "format": "PNG",
                 }
             )
-            return img_format, image_bytes
+            return "PNG", image_bytes
 
-        except requests.exceptions.RequestException as e:
-            raise ValueError(f"Error taking screenshot via TCP: {str(e)}") from e
-        except ValueError as e:
-            raise ValueError(f"Error taking screenshot: {str(e)}") from e
         except Exception as e:
-            raise ValueError(f"Unexpected error taking screenshot: {str(e)}") from e
+            raise ValueError(f"Error taking screenshot: {str(e)}") from e
 
 
     def list_packages(self, include_system_apps: bool = False) -> List[str]:
@@ -792,38 +585,7 @@ class AdbTools(Tools):
         Returns:
             List of dictionaries containing 'package' and 'label' keys
         """
-        try:
-            logger.debug("Getting apps via content provider")
-
-            # Query the content provider for packages
-            adb_output = self.device.shell(
-                "content query --uri content://com.droidrun.portal/packages"
-            )
-
-            # Parse the content provider output
-            packages_data = self._parse_content_provider_output(adb_output)
-
-            if not packages_data or "packages" not in packages_data:
-                logger.warning("No packages data found in content provider response")
-                return []
-
-            apps = []
-            for package_info in packages_data["packages"]:
-                # Filter system apps if requested
-                if not include_system and package_info.get("isSystemApp", False):
-                    continue
-
-                apps.append({
-                    "package": package_info.get("packageName", ""),
-                    "label": package_info.get("label", "")
-                })
-
-            logger.debug(f"Found {len(apps)} apps")
-            return apps
-
-        except Exception as e:
-            logger.error(f"Error getting apps: {str(e)}")
-            raise ValueError(f"Error getting apps: {str(e)}") from e
+        return self.portal.get_apps(include_system)
 
     @Tools.ui_action
     def complete(self, success: bool, reason: str = ""):
@@ -881,82 +643,22 @@ class AdbTools(Tools):
         """
         return self.memory.copy()
 
-    def get_state(self, serial: Optional[str] = None) -> Dict[str, Any]:
+    def get_state(self) -> Dict[str, Any]:
         """
         Get both the a11y tree and phone state in a single call using the combined /state endpoint.
 
-        Args:
-            serial: Optional device serial number
-
         Returns:
             Dictionary containing both 'a11y_tree' and 'phone_state' data
         """
-
         try:
             logger.debug("Getting state")
 
-            if self.use_tcp and self.tcp_forwarded:
-                # Use TCP communication
-                response = requests.get(f"{self.tcp_base_url}/state", timeout=10)
-
-                if response.status_code == 200:
-                    tcp_response = response.json()
-
-                    # Check if response has the expected format
-                    if isinstance(tcp_response, dict) and "data" in tcp_response:
-                        data_str = tcp_response["data"]
-                        try:
-                            combined_data = json.loads(data_str)
-                        except json.JSONDecodeError:
-                            return {
-                                "error": "Parse Error",
-                                "message": "Failed to parse JSON data from TCP response data field",
-                            }
-                    else:
-                        # Fallback: assume direct JSON format
-                        combined_data = tcp_response
-                else:
-                    return {
-                        "error": "HTTP Error",
-                        "message": f"HTTP request failed with status {response.status_code}",
-                    }
-            else:
-                # Fallback to content provider method
-                adb_output = self.device.shell(
-                    "content query --uri content://com.droidrun.portal/state",
-                )
+            # Use PortalClient for state (automatic TCP/content provider selection)
+            combined_data = self.portal.get_state()
 
-                state_data = self._parse_content_provider_output(adb_output)
-
-                if state_data is None:
-                    return {
-                        "error": "Parse Error",
-                        "message": "Failed to parse state data from ContentProvider response",
-                    }
-
-                if isinstance(state_data, dict):
-                    data_str = None
-                    if "data" in state_data:
-                        data_str = state_data["data"]
-
-                    if data_str:
-                        try:
-                            combined_data = json.loads(data_str)
-                        except json.JSONDecodeError:
-                            return {
-                                "error": "Parse Error",
-                                "message": "Failed to parse JSON data from ContentProvider response",
-                            }
-                    else:
-                        return {
-                            "error": "Format Error",
-                            "message": "Neither 'data' nor 'message' field found in ContentProvider response",
-                        }
-                else:
-                    return {
-                        "error": "Format Error",
-                        "message": f"Unexpected state data format: {type(state_data)}",
-                    }
+            # Handle error responses
+            if "error" in combined_data:
+                return combined_data
 
             # Validate that both a11y_tree and phone_state are present
             if "a11y_tree" not in combined_data:
@@ -994,11 +696,6 @@ class AdbTools(Tools):
                 "phone_state": combined_data["phone_state"],
             }
 
-        except requests.exceptions.RequestException as e:
-            return {
-                "error": "TCP Error",
-                "message": f"TCP request failed: {str(e)}",
-            }
         except Exception as e:
             return {
                 "error": str(e),
@@ -1007,51 +704,12 @@ class AdbTools(Tools):
 
     def ping(self) -> Dict[str, Any]:
         """
-        Test the TCP connection using the /ping endpoint.
+        Test the Portal connection.
 
         Returns:
             Dictionary with ping result
         """
-        try:
-            if self.use_tcp and self.tcp_forwarded:
-                response = requests.get(f"{self.tcp_base_url}/ping", timeout=5)
-
-                if response.status_code == 200:
-                    try:
-                        tcp_response = response.json() if response.content else {}
-                        logger.debug(f"Ping TCP response: {tcp_response}")
-                        return {
-                            "status": "success",
-                            "message": "Ping successful",
-                            "response": tcp_response,
-                        }
-                    except json.JSONDecodeError:
-                        return {
-                            "status": "success",
-                            "message": "Ping successful (non-JSON response)",
-                            "response": response.text,
-                        }
-                else:
-                    return {
-                        "status": "error",
-                        "message": f"Ping failed with status {response.status_code}: {response.text}",
-                    }
-            else:
-                return {
-                    "status": "error",
-                    "message": "TCP communication is not enabled",
-                }
-
-        except requests.exceptions.RequestException as e:
-            return {
-                "status": "error",
-                "message": f"Ping failed: {str(e)}",
-            }
-        except Exception as e:
-            return {
-                "status": "error",
-                "message": f"Error during ping: {str(e)}",
-            }
+        return self.portal.ping()
 
 
 def _shell_test_cli(serial: str, command: str) -> tuple[str, float]:

droidrun/tools/portal_client.py

@@ -0,0 +1,434 @@
+"""
+Portal Client - Unified communication layer for DroidRun Portal app.
+
+This module provides automatic TCP/Content Provider fallback for Portal communication.
+"""
+
+import base64
+import io
+import json
+import logging
+import re
+from typing import Any, Dict, List, Optional
+
+import requests
+from adbutils import AdbDevice
+
+logger = logging.getLogger("droidrun-tools")
+
+PORTAL_REMOTE_PORT = 8080  # Port on device where Portal HTTP server runs
+
+
+class PortalClient:
+    """
+    Unified client for DroidRun Portal communication.
+
+    Automatically handles TCP vs Content Provider fallback with the following strategy:
+    - On init, checks for existing port forward and reuses it
+    - If no forward exists, creates new one
+    - Tests connection and sets tcp_available flag
+    - All methods auto-select TCP or content provider based on availability
+    - No cleanup needed - forwards persist until device disconnect
+
+    Key features:
+    - Reuses existing port forwards (no cleanup needed)
+    - Automatic fallback to content provider if TCP fails
+    - Zero explicit resource management
+    - Graceful degradation
+    """
+
+    def __init__(self, device: AdbDevice, prefer_tcp: bool = False):
+        """
+        Initialize Portal client.
+
+        Args:
+            device: ADB device instance
+            prefer_tcp: Whether to prefer TCP communication (will fallback to content provider if unavailable)
+        """
+        self.device = device
+        self.tcp_available = False
+        self.tcp_base_url = None
+        self.local_tcp_port = None
+
+        if prefer_tcp:
+            self._try_enable_tcp()
+
+    def _try_enable_tcp(self) -> None:
+        """
+        Try to enable TCP communication. Fails silently and falls back to content provider.
+
+        Strategy:
+        1. Check if forward already exists → reuse
+        2. If not, create new forward
+        3. Test connection with ping
+        4. Set tcp_available flag
+        """
+        try:
+            # Step 1: Check for existing forward
+            local_port = self._find_existing_forward()
+
+            # Step 2: If no forward exists, create one
+            if local_port is None:
+                logger.debug(f"No existing forward found, creating new forward for port {PORTAL_REMOTE_PORT}")
+                local_port = self.device.forward_port(PORTAL_REMOTE_PORT)
+                logger.debug(f"Created forward: localhost:{local_port} -> device:{PORTAL_REMOTE_PORT}")
+            else:
+                logger.debug(f"Reusing existing forward: localhost:{local_port} -> device:{PORTAL_REMOTE_PORT}")
+
+            # Store local port
+            self.local_tcp_port = local_port
+
+            # Step 3: Test connection
+            self.tcp_base_url = f"http://localhost:{local_port}"
+            if self._test_connection():
+                self.tcp_available = True
+                logger.info(f"✓ TCP mode enabled: {self.tcp_base_url}")
+            else:
+                logger.warning("TCP connection test failed, falling back to content provider")
+                self.tcp_available = False
+
+        except Exception as e:
+            logger.warning(f"Failed to setup TCP forwarding: {e}. Using content provider fallback.")
+            self.tcp_available = False
+
+    def _find_existing_forward(self) -> Optional[int]:
+        """
+        Check if a forward already exists for the Portal remote port.
+
+        Returns:
+            Local port number if forward exists, None otherwise
+        """
+        try:
+            forwards = self.device.forward_list()
+            # Format: ['serial tcp:local_port tcp:remote_port', ...]
+            for forward in forwards:
+                if self.device.serial in forward and f"tcp:{PORTAL_REMOTE_PORT}" in forward:
+                    # Extract local port: "serial tcp:12345 tcp:8080"
+                    match = re.search(r'tcp:(\d+)\s+tcp:' + str(PORTAL_REMOTE_PORT), forward)
+                    if match:
+                        local_port = int(match.group(1))
+                        logger.debug(f"Found existing forward: localhost:{local_port} -> {PORTAL_REMOTE_PORT}")
+                        return local_port
+        except Exception as e:
+            logger.debug(f"Failed to check existing forwards: {e}")
+
+        return None
+
+    def _test_connection(self) -> bool:
+        """Test if TCP connection to Portal is working."""
+        try:
+            response = requests.get(f"{self.tcp_base_url}/ping", timeout=3)
+            return response.status_code == 200
+        except Exception as e:
+            logger.debug(f"TCP connection test failed: {e}")
+            return False
+
+    def _parse_content_provider_output(self, raw_output: str) -> Optional[Dict[str, Any]]:
+        """
+        Parse the raw ADB content provider output and extract JSON data.
+
+        Args:
+            raw_output: Raw output from ADB content query command
+
+        Returns:
+            Parsed JSON data or None if parsing failed
+        """
+        lines = raw_output.strip().split("\n")
+
+        # Try line-by-line parsing
+        for line in lines:
+            line = line.strip()
+
+            # Look for "result=" pattern (common content provider format)
+            if "result=" in line:
+                result_start = line.find("result=") + 7
+                json_str = line[result_start:]
+                try:
+                    json_data = json.loads(json_str)
+                    # Handle nested "data" field with JSON string
+                    if isinstance(json_data, dict) and "data" in json_data:
+                        if isinstance(json_data["data"], str):
+                            return json.loads(json_data["data"])
+                    return json_data
+                except json.JSONDecodeError:
+                    continue
+
+            # Fallback: try lines starting with JSON
+            elif line.startswith("{") or line.startswith("["):
+                try:
+                    return json.loads(line)
+                except json.JSONDecodeError:
+                    continue
+
+        # Last resort: try parsing entire output
+        try:
+            return json.loads(raw_output.strip())
+        except json.JSONDecodeError:
+            return None
+
+
+    def get_state(self) -> Dict[str, Any]:
+        """
+        Get device state (accessibility tree + phone state).
+        Auto-selects TCP or content provider.
+
+        Returns:
+            Dictionary containing 'a11y_tree' and 'phone_state' keys
+        """
+        if self.tcp_available:
+            return self._get_state_tcp()
+        return self._get_state_content_provider()
+
+    def _get_state_tcp(self) -> Dict[str, Any]:
+        """Get state via TCP."""
+        try:
+            response = requests.get(f"{self.tcp_base_url}/state", timeout=10)
+            if response.status_code == 200:
+                data = response.json()
+
+                # Handle nested "data" field
+                if isinstance(data, dict) and "data" in data:
+                    if isinstance(data["data"], str):
+                        return json.loads(data["data"])
+                return data
+            else:
+                logger.warning(f"TCP get_state failed ({response.status_code}), falling back")
+                return self._get_state_content_provider()
+        except Exception as e:
+            logger.warning(f"TCP get_state error: {e}, falling back")
+            return self._get_state_content_provider()
+
+    def _get_state_content_provider(self) -> Dict[str, Any]:
+        """Get state via content provider (fallback)."""
+        try:
+            output = self.device.shell("content query --uri content://com.droidrun.portal/state")
+            state_data = self._parse_content_provider_output(output)
+
+            if state_data is None:
+                return {
+                    "error": "Parse Error",
+                    "message": "Failed to parse state data from ContentProvider"
+                }
+
+            # Handle nested "data" field if present
+            if isinstance(state_data, dict) and "data" in state_data:
+                if isinstance(state_data["data"], str):
+                    try:
+                        return json.loads(state_data["data"])
+                    except json.JSONDecodeError:
+                        return {
+                            "error": "Parse Error",
+                            "message": "Failed to parse nested JSON data"
+                        }
+
+            return state_data
+
+        except Exception as e:
+            return {
+                "error": "ContentProvider Error",
+                "message": str(e)
+            }
+
+
+    def input_text(self, text: str, clear: bool = False) -> bool:
+        """
+        Input text via keyboard.
+        Auto-selects TCP or content provider.
+
+        Args:
+            text: Text to input
+            clear: Whether to clear existing text first
+
+        Returns:
+            True if successful, False otherwise
+        """
+        if self.tcp_available:
+            return self._input_text_tcp(text, clear)
+        return self._input_text_content_provider(text, clear)
+
+    def _input_text_tcp(self, text: str, clear: bool) -> bool:
+        """Input text via TCP."""
+        try:
+            encoded = base64.b64encode(text.encode()).decode()
+            payload = {"base64_text": encoded, "clear": clear}
+            response = requests.post(
+                f"{self.tcp_base_url}/keyboard/input",
+                json=payload,
+                headers={"Content-Type": "application/json"},
+                timeout=10
+            )
+            if response.status_code == 200:
+                logger.debug(f"TCP input_text successful")
+                return True
+            else:
+                logger.warning(f"TCP input_text failed ({response.status_code}), falling back")
+                return self._input_text_content_provider(text, clear)
+        except Exception as e:
+            logger.warning(f"TCP input_text error: {e}, falling back")
+            return self._input_text_content_provider(text, clear)
+
+    def _input_text_content_provider(self, text: str, clear: bool) -> bool:
+        """Input text via content provider (fallback)."""
+        try:
+            encoded = base64.b64encode(text.encode()).decode()
+            clear_str = "true" if clear else "false"
+            cmd = (
+                f'content insert --uri "content://com.droidrun.portal/keyboard/input" '
+                f'--bind base64_text:s:"{encoded}" '
+                f'--bind clear:b:{clear_str}'
+            )
+            self.device.shell(cmd)
+            logger.debug("Content provider input_text successful")
+            return True
+        except Exception as e:
+            logger.error(f"Content provider input_text error: {e}")
+            return False
+
+
+    def take_screenshot(self, hide_overlay: bool = True) -> bytes:
+        """
+        Take screenshot of device.
+        Auto-selects TCP or ADB screencap.
+
+        Args:
+            hide_overlay: Whether to hide Portal overlay during screenshot
+
+        Returns:
+            Screenshot image bytes (PNG format)
+        """
+        if self.tcp_available:
+            return self._take_screenshot_tcp(hide_overlay)
+        return self._take_screenshot_adb()
+
+    def _take_screenshot_tcp(self, hide_overlay: bool) -> bytes:
+        """Take screenshot via TCP."""
+        try:
+            url = f"{self.tcp_base_url}/screenshot"
+            if not hide_overlay:
+                url += "?hideOverlay=false"
+
+            response = requests.get(url, timeout=10)
+            if response.status_code == 200:
+                data = response.json()
+                if data.get("status") == "success" and "data" in data:
+                    logger.debug("Screenshot taken via TCP")
+                    return base64.b64decode(data["data"])
+                else:
+                    logger.warning("TCP screenshot failed (invalid response), falling back")
+                    return self._take_screenshot_adb()
+            else:
+                logger.warning(f"TCP screenshot failed ({response.status_code}), falling back")
+                return self._take_screenshot_adb()
+        except Exception as e:
+            logger.warning(f"TCP screenshot error: {e}, falling back")
+            return self._take_screenshot_adb()
+
+    def _take_screenshot_adb(self) -> bytes:
+        """Take screenshot via ADB screencap (fallback)."""
+        img = self.device.screenshot()
+        buf = io.BytesIO()
+        img.save(buf, format="PNG")
+        logger.debug("Screenshot taken via ADB")
+        return buf.getvalue()
+
+    def get_apps(self, include_system: bool = True) -> List[Dict[str, str]]:
+        """
+        Get installed apps with package name and label.
+
+        Note: Currently only supports content provider (no TCP endpoint exists yet)
+
+        Args:
+            include_system: Whether to include system apps
+
+        Returns:
+            List of dicts with 'package' and 'label' keys
+        """
+        try:
+            logger.debug("Getting apps via content provider")
+
+            # Query content provider
+            output = self.device.shell("content query --uri content://com.droidrun.portal/packages")
+            packages_data = self._parse_content_provider_output(output)
+
+            if not packages_data or "packages" not in packages_data:
+                logger.warning("No packages data found in content provider response")
+                return []
+
+            # Filter and format apps
+            apps = []
+            for package_info in packages_data["packages"]:
+                if not include_system and package_info.get("isSystemApp", False):
+                    continue
+
+                apps.append({
+                    "package": package_info.get("packageName", ""),
+                    "label": package_info.get("label", "")
+                })
+
+            logger.debug(f"Found {len(apps)} apps")
+            return apps
+
+        except Exception as e:
+            logger.error(f"Error getting apps: {e}")
+            raise ValueError(f"Error getting apps: {e}") from e
+
+
+    def ping(self) -> Dict[str, Any]:
+        """
+        Test Portal connection.
+
+        Returns:
+            Dictionary with status and connection details
+        """
+        if self.tcp_available:
+            try:
+                response = requests.get(f"{self.tcp_base_url}/ping", timeout=5)
+                if response.status_code == 200:
+                    try:
+                        tcp_response = response.json() if response.content else {}
+                        return {
+                            "status": "success",
+                            "method": "tcp",
+                            "url": self.tcp_base_url,
+                            "response": tcp_response
+                        }
+                    except json.JSONDecodeError:
+                        return {
+                            "status": "success",
+                            "method": "tcp",
+                            "url": self.tcp_base_url,
+                            "response": response.text
+                        }
+                else:
+                    return {
+                        "status": "error",
+                        "method": "tcp",
+                        "message": f"HTTP {response.status_code}: {response.text}"
+                    }
+            except Exception as e:
+                return {
+                    "status": "error",
+                    "method": "tcp",
+                    "message": str(e)
+                }
+        else:
+            # Test content provider
+            try:
+                output = self.device.shell("content query --uri content://com.droidrun.portal/state")
+                if "Row: 0 result=" in output:
+                    return {
+                        "status": "success",
+                        "method": "content_provider"
+                    }
+                else:
+                    return {
+                        "status": "error",
+                        "method": "content_provider",
+                        "message": "Invalid response"
+                    }
+            except Exception as e:
+                return {
+                    "status": "error",
+                    "method": "content_provider",
+                    "message": str(e)
+                }

{droidrun-0.3.10.dev7.dist-info → droidrun-0.3.10.dev9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: droidrun
-Version: 0.3.10.dev7
+Version: 0.3.10.dev9
 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

{droidrun-0.3.10.dev7.dist-info → droidrun-0.3.10.dev9.dist-info}/RECORD

@@ -6,6 +6,7 @@ droidrun/agent/usage.py,sha256=6PVeHctNa0EmHmNPTdOUv5e3-EK6AMu6D2Pz5OMqs5c,7145
 droidrun/agent/codeact/__init__.py,sha256=lagBdrury33kbHN1XEZ-xzJ-RywmpkUUoUidOno9ym8,96
 droidrun/agent/codeact/codeact_agent.py,sha256=7EkuazNIpTOX-W1oSG0XmtOwcmNOyaiPddgNxnK10No,20292
 droidrun/agent/codeact/events.py,sha256=kRKTQPzogPiQwmOCc_fGcg1g1zDXXVeBpDl45GTdpYU,734
+droidrun/agent/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 droidrun/agent/common/constants.py,sha256=q7ywmOXCsJZg8m9ctpzQ-nxvuj5GMn28Pr8z3dMj1Rg,94
 droidrun/agent/common/events.py,sha256=rbPWdlqNNMdnVjYhJOL2mJcNNORHhjXOkY8XiLPzp7c,1182
 droidrun/agent/context/__init__.py,sha256=-CiAv66qym_WgFy5vCRfNLxmiprmEbssu6S_2jj0LZw,452
@@ -22,6 +23,7 @@ droidrun/agent/manager/__init__.py,sha256=A8esHVpxzHd3Epzkl0j5seNkRQqwNEn1a97eeL
 droidrun/agent/manager/events.py,sha256=X0tUwCX2mU8I4bGR4JW2NmUqiOrX-Hrb017vGVPVyHw,855
 droidrun/agent/manager/manager_agent.py,sha256=nXftmLlSLDs9LLB3rHE3EzpaCnUKa6v1dNfjFTMV9ys,22256
 droidrun/agent/manager/prompts.py,sha256=qfDYcSbpWpnUaavAuPE6qY6Df6w25LmtY1mEiBUMti0,2060
+droidrun/agent/oneflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 droidrun/agent/oneflows/app_starter_workflow.py,sha256=MSJ6_jfbiCfSIjnw-qfSDFDuqsUS6rUGLsdKVj43wvY,3525
 droidrun/agent/oneflows/text_manipulator.py,sha256=mO59DF1uif9poUWy90UehrBmHbNxL9ph4Evtgt1ODbQ,8751
 droidrun/agent/utils/__init__.py,sha256=Oro0oyiz1xzRpchWLDA1TZJELJNSwBOb2WdGgknthKo,244
@@ -34,6 +36,7 @@ droidrun/agent/utils/llm_picker.py,sha256=KQzrRcHE38NwujDbNth5F9v5so9HVvHjfkQznM
 droidrun/agent/utils/message_utils.py,sha256=_wngf082gg232y_3pC_yn4fnPhHiyYAxhU4ewT78roo,2309
 droidrun/agent/utils/tools.py,sha256=anc10NAKmZx91JslHFpo6wfnUOZ2pnPXJS-5nMVHC_A,9930
 droidrun/agent/utils/trajectory.py,sha256=Z6C19Y9hsRxjLZWywqYWTApKU7PelvWM-5Tsl3h7KEw,19718
+droidrun/app_cards/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 droidrun/app_cards/app_card_provider.py,sha256=wy7CGFnBd_EPU58xNdv4ZWUA9F4Plon71N4-5RT5vNg,827
 droidrun/app_cards/providers/__init__.py,sha256=vN4TvBtsvfdvzgqbIJegIfHhct0aTFZjvJazWFDvdhg,372
 droidrun/app_cards/providers/composite_provider.py,sha256=oi7dlkv_Hv2rEZMxQlO1jP9fQcTBydr40zCyunCNxQA,3156
@@ -41,7 +44,7 @@ droidrun/app_cards/providers/local_provider.py,sha256=RRGQ7VR7qHT9uKSOlSvqCTRq_p
 droidrun/app_cards/providers/server_provider.py,sha256=rOJyiCE_zTCCK9SAJeee3vLWISytoZrBUiXB6LaJEv8,4148
 droidrun/cli/__init__.py,sha256=5cO-QBcUl5w35zO18OENj4OShdglQjn8Ne9aqgSh-PM,167
 droidrun/cli/logs.py,sha256=V8rn6oXgYObExX4dG8MUnQXxUdKOk1QlTkOQtI5e6wo,12686
-droidrun/cli/main.py,sha256=0-63OyiNlT944eOBqjw3fG8Edove88tqNEFkCKVHb8w,35372
+droidrun/cli/main.py,sha256=lzGwWk8SbbxmVeyz2mqkPBT6Xs5SMxnQSxecuK-7L5s,35119
 droidrun/config_manager/__init__.py,sha256=SeLoEYVU5jMEtXLjx76VE_3rxzZXjCMlVPW7hodU128,460
 droidrun/config_manager/config_manager.py,sha256=hPETII_5wYvfb11e7sJlfCVk9p3WbA7nHPAV3bQQdmE,19930
 droidrun/config_manager/path_resolver.py,sha256=vQKT5XmnENtSK3B1D-iItL8CpOQTKzfKZ1wTO4khlTs,3421
@@ -55,11 +58,12 @@ droidrun/telemetry/events.py,sha256=y-i2d5KiPkikVXrzMQu87osy1LAZTBIx8DlPIWGAXG0,
 droidrun/telemetry/phoenix.py,sha256=JHdFdRHXu7cleAb4X4_Y5yn5zPSIApwyKCOxoaj_gf4,7117
 droidrun/telemetry/tracker.py,sha256=YWOkyLE8XiHainVSB77JE37y-rloOYVYs6j53Aw1J8A,2735
 droidrun/tools/__init__.py,sha256=BbQFKuPn-5MwGzr-3urMDK8S1ZsP96D96y7WTJYB3AA,271
-droidrun/tools/adb.py,sha256=ziMbQ02TDBvm04ffG1wlYUstsYABNopZaq0aOBh0xtA,42985
+droidrun/tools/adb.py,sha256=PRbQS1qhy_HFUVx78LYPwTa4GT4TgMrRTwc7NM4Tf4A,28950
 droidrun/tools/ios.py,sha256=GMYbiNNBeHLwVQAo4_fEZ7snr4JCHE6sG11rcuPvSpk,21831
+droidrun/tools/portal_client.py,sha256=BthC-ryHtCxh3czmkTge5aaurinPZfFkV4DgbkD_wbw,16307
 droidrun/tools/tools.py,sha256=0eAZFTaY10eiiUcJM4AkURmTGX-O1RRXjpQ5MHj2Ydo,5241
-droidrun-0.3.10.dev7.dist-info/METADATA,sha256=gac2d1ul1MhI-nSmx1ttR3XtWJoIhq6lIyZE4mufMRE,7044
-droidrun-0.3.10.dev7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-droidrun-0.3.10.dev7.dist-info/entry_points.txt,sha256=o259U66js8TIybQ7zs814Oe_LQ_GpZsp6a9Cr-xm5zE,51
-droidrun-0.3.10.dev7.dist-info/licenses/LICENSE,sha256=s-uxn9qChu-kFdRXUp6v_0HhsaJ_5OANmfNOFVm2zdk,1069
-droidrun-0.3.10.dev7.dist-info/RECORD,,
+droidrun-0.3.10.dev9.dist-info/METADATA,sha256=YJPn9618Zy-2d_jo_46H45eSOi517Br1bxZ-7513_ms,7044
+droidrun-0.3.10.dev9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+droidrun-0.3.10.dev9.dist-info/entry_points.txt,sha256=o259U66js8TIybQ7zs814Oe_LQ_GpZsp6a9Cr-xm5zE,51
+droidrun-0.3.10.dev9.dist-info/licenses/LICENSE,sha256=s-uxn9qChu-kFdRXUp6v_0HhsaJ_5OANmfNOFVm2zdk,1069
+droidrun-0.3.10.dev9.dist-info/RECORD,,