droidrun 0.3.10.dev6__tar.gz → 0.3.10.dev8__tar.gz

{droidrun-0.3.10.dev6 → droidrun-0.3.10.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: droidrun
-Version: 0.3.10.dev6
+Version: 0.3.10.dev8
 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.dev6 → droidrun-0.3.10.dev8}/droidrun/agent/codeact/codeact_agent.py

@@ -3,7 +3,7 @@ import json
 import logging
 import re
 import time
-from typing import List, Union, Optional, TYPE_CHECKING
+from typing import TYPE_CHECKING, List, Optional, Union
 
 from llama_index.core.base.llms.types import ChatMessage, ChatResponse
 from llama_index.core.llms.llm import LLM
@@ -23,9 +23,8 @@ from droidrun.agent.common.events import RecordUIStateEvent, ScreenshotEvent
 from droidrun.agent.context.episodic_memory import EpisodicMemory, EpisodicMemoryStep
 from droidrun.agent.usage import get_usage_from_response
 from droidrun.agent.utils import chat_utils
-from droidrun.agent.utils.executer import SimpleCodeExecutor, ExecuterState
 from droidrun.agent.utils.device_state_formatter import format_device_state
-
+from droidrun.agent.utils.executer import ExecuterState, SimpleCodeExecutor
 from droidrun.agent.utils.tools import (
     ATOMIC_ACTION_SIGNATURES,
     build_custom_tool_descriptions,
@@ -489,7 +488,7 @@ Now, describe the next step you will take to address the original goal: {goal}""
             try:
                 state = self.tools.get_state()
                 a11y_tree = state.get("a11y_tree", "")
-                phone_state = state.get("phone_state", "")
+                phone_state = state.get("phone_state", "")  # noqa: F841
             except Exception as e:
                 raise Exception(f"Failed to capture final UI state: {e}") from e
 

{droidrun-0.3.10.dev6 → droidrun-0.3.10.dev8}/droidrun/agent/context/task_manager.py

@@ -1,5 +1,4 @@
 import copy
-import os
 from dataclasses import dataclass
 from typing import Dict, List, Optional
 

{droidrun-0.3.10.dev6 → droidrun-0.3.10.dev8}/droidrun/agent/droid/droid_agent.py

@@ -32,7 +32,7 @@ from droidrun.agent.droid.events import (
 )
 from droidrun.agent.executor import ExecutorAgent
 from droidrun.agent.manager import ManagerAgent
-from droidrun.agent.utils.tools import ATOMIC_ACTION_SIGNATURES
+from droidrun.agent.utils.tools import ATOMIC_ACTION_SIGNATURES, open_app
 from droidrun.agent.utils.trajectory import Trajectory
 from droidrun.config_manager.config_manager import (
     AgentConfig,
@@ -43,8 +43,6 @@ from droidrun.config_manager.config_manager import (
     ToolsConfig,
     TracingConfig,
 )
-
-from droidrun.agent.utils.tools import open_app
 from droidrun.telemetry import (
     DroidAgentFinalizeEvent,
     DroidAgentInitEvent,

{droidrun-0.3.10.dev6 → droidrun-0.3.10.dev8}/droidrun/agent/droid/events.py

@@ -14,7 +14,7 @@ import asyncio
 from typing import Dict, List
 
 from llama_index.core.workflow import Event
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 from droidrun.agent.context import Task
 
@@ -47,7 +47,7 @@ class DroidAgentState(BaseModel):
     """
     State model for DroidAgent workflow - shared across parent and child workflows.
     """
-
+    model_config = ConfigDict(arbitrary_types_allowed=True)
     # Task context
     instruction: str = ""
     # App Cards

{droidrun-0.3.10.dev6 → droidrun-0.3.10.dev8}/droidrun/agent/manager/__init__.py

@@ -3,7 +3,7 @@ Manager Agent - Planning and reasoning workflow.
 """
 
 from droidrun.agent.droid.events import ManagerInputEvent, ManagerPlanEvent
-from droidrun.agent.manager.events import ManagerThinkingEvent, ManagerInternalPlanEvent
+from droidrun.agent.manager.events import ManagerInternalPlanEvent, ManagerThinkingEvent
 from droidrun.agent.manager.manager_agent import ManagerAgent
 from droidrun.agent.manager.prompts import parse_manager_response
 

{droidrun-0.3.10.dev6 → droidrun-0.3.10.dev8}/droidrun/agent/utils/executer.py

@@ -1,9 +1,10 @@
-import io
 import contextlib
-import traceback
+import io
 import logging
-from typing import Any, Dict, Optional
+import traceback
 from asyncio import AbstractEventLoop
+from typing import Any, Dict, Optional
+
 from pydantic import BaseModel
 
 logger = logging.getLogger("droidrun")
@@ -11,7 +12,7 @@ logger = logging.getLogger("droidrun")
 class ExecuterState(BaseModel):
     """State object for the code executor."""
     ui_state: Optional[Any] = None
-    
+
     class Config:
         arbitrary_types_allowed = True
 
@@ -70,7 +71,7 @@ class SimpleCodeExecutor:
         self.locals = locals
         self.loop = loop
         self.use_same_scope = use_same_scope
-        
+
         if self.use_same_scope:
             # If using the same scope, merge globals and locals
             self.globals = self.locals = {
@@ -85,7 +86,7 @@ class SimpleCodeExecutor:
         """
         # Update UI state
         self.globals['ui_state'] = ui_state
-        
+
         # Capture stdout and stderr
         stdout = io.StringIO()
         stderr = io.StringIO()
@@ -111,7 +112,7 @@ class SimpleCodeExecutor:
     async def execute(self, state: ExecuterState, code: str) -> str:
         """
         Execute Python code and capture output and return values.
-        
+
         Runs the code in a separate thread to prevent blocking.
 
         Args:
@@ -123,7 +124,7 @@ class SimpleCodeExecutor:
         """
         # Get UI state from the state object
         ui_state = state.ui_state
-        
+
         # Run the execution in a thread pool executor
         output = await self.loop.run_in_executor(
             None,
@@ -131,5 +132,5 @@ class SimpleCodeExecutor:
             code,
             ui_state
         )
-        
-        return output
+
+        return output

{droidrun-0.3.10.dev6 → droidrun-0.3.10.dev8}/droidrun/agent/utils/llm_picker.py

@@ -1,6 +1,6 @@
 import importlib
 import logging
-from typing import Any, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 from llama_index.core.llms.llm import LLM
 

{droidrun-0.3.10.dev6 → droidrun-0.3.10.dev8}/droidrun/app_cards/app_card_provider.py

@@ -8,7 +8,6 @@ Supports multiple backends: local files, remote servers, or composite strategies
 from abc import ABC, abstractmethod
 
 
-
 class AppCardProvider(ABC):
     """Abstract interface for loading app-specific instruction cards."""
 

{droidrun-0.3.10.dev6 → droidrun-0.3.10.dev8}/droidrun/app_cards/providers/composite_provider.py

@@ -7,9 +7,9 @@ Tries server first, falls back to local if server fails or returns empty.
 import logging
 from typing import Dict
 
-from droidrun.config_manager.app_card_provider import AppCardProvider
-from droidrun.config_manager.providers.local_provider import LocalAppCardProvider
-from droidrun.config_manager.providers.server_provider import ServerAppCardProvider
+from droidrun.app_cards.app_card_provider import AppCardProvider
+from droidrun.app_cards.providers.local_provider import LocalAppCardProvider
+from droidrun.app_cards.providers.server_provider import ServerAppCardProvider
 
 logger = logging.getLogger("droidrun")
 
@@ -65,7 +65,7 @@ class CompositeAppCardProvider(AppCardProvider):
         server_result = await self.server_provider.load_app_card(package_name, instruction)
 
         if server_result:
-            return server_result   
+            return server_result
 
         # Server failed or returned empty, try local
         logger.debug(f"Composite provider: falling back to local for {package_name}")

{droidrun-0.3.10.dev6 → droidrun-0.3.10.dev8}/droidrun/app_cards/providers/local_provider.py

@@ -6,10 +6,9 @@ Loads app cards from local filesystem using app_cards.json mapping.
 
 import json
 import logging
-from pathlib import Path
 from typing import Dict
 
-from droidrun.config_manager.app_card_provider import AppCardProvider
+from droidrun.app_cards.app_card_provider import AppCardProvider
 from droidrun.config_manager.path_resolver import PathResolver
 
 logger = logging.getLogger("droidrun")

{droidrun-0.3.10.dev6 → droidrun-0.3.10.dev8}/droidrun/app_cards/providers/server_provider.py

@@ -9,7 +9,7 @@ from typing import Dict
 
 import httpx
 
-from droidrun.config_manager.app_card_provider import AppCardProvider
+from droidrun.app_cards.app_card_provider import AppCardProvider
 
 logger = logging.getLogger("droidrun")
 

{droidrun-0.3.10.dev6 → droidrun-0.3.10.dev8}/droidrun/cli/main.py

@@ -16,13 +16,14 @@ from rich.console import Console
 from droidrun.agent.droid import DroidAgent
 from droidrun.agent.utils.llm_picker import load_llm, load_llms_from_profiles
 from droidrun.cli.logs import LogHandler
+from droidrun.config_manager import ConfigManager
 from droidrun.config_manager.config_manager import (
     AgentConfig,
     CodeActConfig,
-    ManagerConfig,
-    ExecutorConfig,
     DeviceConfig,
+    ExecutorConfig,
     LoggingConfig,
+    ManagerConfig,
     ToolsConfig,
     TracingConfig,
 )
@@ -37,8 +38,6 @@ from droidrun.portal import (
 )
 from droidrun.telemetry import print_telemetry_message
 from droidrun.tools import AdbTools, IOSTools
-from droidrun.config_manager import ConfigManager
-
 
 # Suppress all warnings
 warnings.filterwarnings("ignore")
@@ -556,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-0.3.10.dev6 → droidrun-0.3.10.dev8}/droidrun/config_manager/config_manager.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import os
 import threading
 from dataclasses import asdict, dataclass, field
-from pathlib import Path
 from typing import Any, Callable, Dict, List, Optional
 
 import yaml

{droidrun-0.3.10.dev6 → droidrun-0.3.10.dev8}/droidrun/macro/cli.py

@@ -4,7 +4,6 @@ Command-line interface for DroidRun macro replay.
 
 import asyncio
 import logging
-import os
 from typing import Optional
 
 import click