droidrun 0.3.10.dev4__py3-none-any.whl → 0.3.10.dev6__py3-none-any.whl

droidrun/config_manager/__init__.py

@@ -1,4 +1,3 @@
-from droidrun.config_manager.app_card_loader import AppCardLoader
 from droidrun.config_manager.config_manager import (
     AgentConfig,
     AppCardConfig,
@@ -23,5 +22,4 @@ __all__ = [
     "TracingConfig",
     "LoggingConfig",
     "ToolsConfig",
-    "AppCardLoader",
 ]

droidrun/config_manager/config_manager.py

@@ -35,30 +35,38 @@ agent:
     # Enable vision capabilities (screenshots)
     vision: false
     # System prompt filename (located in prompts_dir/codeact/)
-    system_prompt: system.md
+    system_prompt: system.jinja2
     # User prompt filename (located in prompts_dir/codeact/)
-    user_prompt: user.md
+    user_prompt: user.jinja2
 
   # Manager Agent Configuration
   manager:
     # Enable vision capabilities (screenshots)
     vision: false
     # System prompt filename (located in prompts_dir/manager/)
-    system_prompt: system.md
+    system_prompt: system.jinja2
 
   # Executor Agent Configuration
   executor:
     # Enable vision capabilities (screenshots)
     vision: false
     # System prompt filename (located in prompts_dir/executor/)
-    system_prompt: system.md
+    system_prompt: system.jinja2
 
   # App Cards Configuration
   app_cards:
     # Enable app-specific instruction cards
     enabled: true
-    # Directory containing app card files
+    # Mode: local (file-based), server (HTTP API), or composite (server with local fallback)
+    mode: local
+    # Directory containing app card files (for local/composite modes)
     app_cards_dir: config/app_cards
+    # Server URL for remote app cards (for server/composite modes)
+    server_url: null
+    # Server request timeout in seconds
+    server_timeout: 2.0
+    # Number of server retry attempts
+    server_max_retries: 2
 
 # === LLM Profiles ===
 # Define LLM configurations for each agent type
@@ -170,29 +178,33 @@ class LLMProfile:
 class CodeActConfig:
     """CodeAct agent configuration."""
     vision: bool = False
-    system_prompt: str = "system.md"
-    user_prompt: str = "user.md"
+    system_prompt: str = "system.jinja2"
+    user_prompt: str = "user.jinja2"
 
 
 @dataclass
 class ManagerConfig:
     """Manager agent configuration."""
     vision: bool = False
-    system_prompt: str = "system.md"
+    system_prompt: str = "system.jinja2"
 
 
 @dataclass
 class ExecutorConfig:
     """Executor agent configuration."""
     vision: bool = False
-    system_prompt: str = "system.md"
+    system_prompt: str = "system.jinja2"
 
 
 @dataclass
 class AppCardConfig:
     """App card configuration."""
     enabled: bool = True
+    mode: str = "local"  # local | server | composite
     app_cards_dir: str = "config/app_cards"
+    server_url: Optional[str] = None
+    server_timeout: float = 2.0
+    server_max_retries: int = 2
 
 
 @dataclass
@@ -210,20 +222,24 @@ class AgentConfig:
     app_cards: AppCardConfig = field(default_factory=AppCardConfig)
 
     def get_codeact_system_prompt_path(self) -> str:
-        """Get full path to CodeAct system prompt."""
-        return f"{self.prompts_dir}/codeact/{self.codeact.system_prompt}"
+        """Get resolved absolute path to CodeAct system prompt."""
+        path = f"{self.prompts_dir}/codeact/{self.codeact.system_prompt}"
+        return str(PathResolver.resolve(path, must_exist=True))
 
     def get_codeact_user_prompt_path(self) -> str:
-        """Get full path to CodeAct user prompt."""
-        return f"{self.prompts_dir}/codeact/{self.codeact.user_prompt}"
+        """Get resolved absolute path to CodeAct user prompt."""
+        path = f"{self.prompts_dir}/codeact/{self.codeact.user_prompt}"
+        return str(PathResolver.resolve(path, must_exist=True))
 
     def get_manager_system_prompt_path(self) -> str:
-        """Get full path to Manager system prompt."""
-        return f"{self.prompts_dir}/manager/{self.manager.system_prompt}"
+        """Get resolved absolute path to Manager system prompt."""
+        path = f"{self.prompts_dir}/manager/{self.manager.system_prompt}"
+        return str(PathResolver.resolve(path, must_exist=True))
 
     def get_executor_system_prompt_path(self) -> str:
-        """Get full path to Executor system prompt."""
-        return f"{self.prompts_dir}/executor/{self.executor.system_prompt}"
+        """Get resolved absolute path to Executor system prompt."""
+        path = f"{self.prompts_dir}/executor/{self.executor.system_prompt}"
+        return str(PathResolver.resolve(path, must_exist=True))
 
 
 @dataclass
@@ -372,6 +388,7 @@ class ConfigManager:
 
     Usage:
         from droidrun.config_manager.config_manager import ConfigManager
+        from droidrun.agent.utils.llm_picker import load_llms_from_profiles
 
         # Create config instance (singleton pattern)
         config = ConfigManager()
@@ -379,12 +396,19 @@ class ConfigManager:
         # Access typed config objects
         print(config.agent.max_steps)
 
-        # Load all LLMs
-        llms = config.load_all_llms()
+        # Load all LLMs from profiles
+        llms = load_llms_from_profiles(config.llm_profiles)
         manager_llm = llms['manager']
         executor_llm = llms['executor']
         codeact_llm = llms['codeact']
 
+        # Load specific profiles with overrides
+        llms = load_llms_from_profiles(
+            config.llm_profiles,
+            profile_names=['manager', 'executor'],
+            manager={'temperature': 0.1}
+        )
+
         # Modify and save
         config.save()
     """
@@ -494,86 +518,6 @@ class ConfigManager:
 
             return self._config.llm_profiles[profile_name]
 
-    def load_llm_from_profile(self, profile_name: str, **override_kwargs):
-        """
-        Load an LLM using a profile configuration.
-
-        Args:
-            profile_name: Name of the profile to use (fast, mid, smart, custom)
-            **override_kwargs: Additional kwargs to override profile settings
-
-        Returns:
-            Initialized LLM instance
-
-        Example:
-            # Use specific profile
-            llm = config.load_llm_from_profile("smart")
-
-            # Override specific settings
-            llm = config.load_llm_from_profile("fast", temperature=0.5)
-        """
-        from droidrun.agent.utils.llm_picker import load_llm
-
-        profile = self.get_llm_profile(profile_name)
-
-        # Get kwargs from profile
-        kwargs = profile.to_load_llm_kwargs()
-
-        # Override with any provided kwargs
-        kwargs.update(override_kwargs)
-
-        # Load the LLM
-        return load_llm(provider_name=profile.provider, **kwargs)
-
-    def load_all_llms(self, profile_names: Optional[list[str]] = None, **override_kwargs_per_profile):
-        """
-        Load multiple LLMs from profiles for different use cases.
-
-        Args:
-            profile_names: List of profile names to load. If None, loads agent-specific profiles
-            **override_kwargs_per_profile: Dict of profile-specific overrides
-                Example: manager={'temperature': 0.1}, executor={'max_tokens': 8000}
-
-        Returns:
-            Dict mapping profile names to initialized LLM instances
-
-        Example:
-            # Load all agent-specific profiles
-            llms = config.load_all_llms()
-            manager_llm = llms['manager']
-            executor_llm = llms['executor']
-            codeact_llm = llms['codeact']
-
-            # Load specific profiles
-            llms = config.load_all_llms(['manager', 'executor'])
-
-            # Load with overrides
-            llms = config.load_all_llms(
-                manager={'temperature': 0.1},
-                executor={'max_tokens': 8000}
-            )
-        """
-        from droidrun.agent.utils.llm_picker import load_llm
-
-        if profile_names is None:
-            profile_names = ["manager", "executor", "codeact", "text_manipulator", "app_opener"]
-
-        llms = {}
-        for profile_name in profile_names:
-            profile = self.get_llm_profile(profile_name)
-
-            # Get kwargs from profile
-            kwargs = profile.to_load_llm_kwargs()
-
-            # Apply profile-specific overrides if provided
-            if profile_name in override_kwargs_per_profile:
-                kwargs.update(override_kwargs_per_profile[profile_name])
-
-            # Load the LLM
-            llms[profile_name] = load_llm(provider_name=profile.provider, **kwargs)
-
-        return llms
-
     # ---------------- I/O ----------------
     def _ensure_file_exists(self) -> None:
         parent = self.path.parent
@@ -653,7 +597,7 @@ class ConfigManager:
 
         Example:
             >>> config.list_available_prompts("manager")
-            ['system.md', 'experimental.md', 'minimal.md']
+            ['system.jinja2', 'experimental.jinja2', 'minimal.jinja2']
         """
         agent_type = agent_type.lower()
         if agent_type not in ["codeact", "manager", "executor"]:
@@ -667,7 +611,7 @@ class ConfigManager:
             return []
 
         # List all .md files in the directory
-        return sorted([f.name for f in prompts_dir.glob("*.md")])
+        return sorted([f.name for f in prompts_dir.glob("*.jinja2")])
 
     # useful for tests to reset singleton state
     @classmethod

droidrun/config_manager/path_resolver.py

@@ -64,7 +64,7 @@ class PathResolver:
             output_dir = PathResolver.resolve("trajectories", create_if_missing=True)
 
             # Loading prompts (must exist, checks both locations)
-            prompt = PathResolver.resolve("config/prompts/system.md", must_exist=True)
+            prompt = PathResolver.resolve("config/prompts/system.jinja2", must_exist=True)
 
             # Absolute path (used as-is)
             abs_path = PathResolver.resolve("/tmp/output")

droidrun/config_manager/prompt_loader.py

@@ -1,75 +1,72 @@
 """
-Prompt loading utility for markdown-based prompts.
-
-Supports variable substitution with escape sequences:
-- {variable} → replaced with value
-- {{variable}} → literal {variable}
-- Missing variables → left as {variable}
+Prompt loading utility using Jinja2 templates.
+
+Features:
+- Loads from absolute file paths (resolved by AgentConfig + PathResolver)
+- Conditional rendering: {% if variable %}...{% endif %}
+- Loops with slicing: {% for item in items[-5:] %}...{% endfor %}
+- Filters: {{ variable|default("fallback") }}
+- Missing variables: silently ignored (renders as empty string)
+- Extra variables: silently ignored
 """
 
-import re
 from pathlib import Path
 from typing import Any, Dict
 
-from droidrun.config_manager.path_resolver import PathResolver
+from jinja2 import Environment
 
 
 class PromptLoader:
-    """Load and format markdown prompts with variable substitution."""
+    """Simple Jinja2 template renderer - loads from absolute file paths."""
+
+    _env = None  # Cached Jinja2 environment
+
+    @classmethod
+    def _get_environment(cls) -> Environment:
+        """Get or create cached Jinja2 environment."""
+        if cls._env is None:
+            cls._env = Environment(
+                trim_blocks=True,           # Remove first newline after block
+                lstrip_blocks=True,         # Strip leading whitespace before blocks
+                keep_trailing_newline=False,
+            )
+
+        return cls._env
 
     @staticmethod
-    def load_prompt(path: str, variables: Dict[str, Any] = None) -> str:
+    def load_prompt(file_path: str, variables: Dict[str, Any] = None) -> str:
         """
-        Load prompt from .md file and substitute variables.
-
-        Path resolution:
-        - Checks working directory first (for user overrides)
-        - Falls back to project directory (for default prompts)
-        - Example: "config/prompts/codeact/system.md"
+        Load and render Jinja2 template from absolute file path.
 
-        Variable substitution:
-        - {variable} → replaced with value from variables dict
-        - {{variable}} → becomes literal {variable} in output
-        - Missing variables → left as {variable} (no error)
+        Path resolution is handled by AgentConfig + PathResolver.
+        This method just loads and renders.
 
         Args:
-            path: Path to prompt file (relative or absolute)
-            variables: Dict of variable names to values
+            file_path: ABSOLUTE path to template file (from AgentConfig methods)
+            variables: Dict of variables to pass to template
+                      - Missing variables: silently ignored (render as empty string)
+                      - Extra variables: silently ignored
 
         Returns:
-            Formatted prompt string
+            Rendered prompt string
 
         Raises:
-            FileNotFoundError: If prompt file doesn't exist
-        """
-        # Resolve path (checks working dir, then project dir)
-        prompt_path = PathResolver.resolve(path, must_exist=True)
-
-        prompt_text = prompt_path.read_text(encoding="utf-8")
-
-        if variables is None:
-            return prompt_text
+            FileNotFoundError: If template file doesn't exist
 
-        # Handle escaped braces: {{variable}} → {variable}
-        # Strategy: Replace {{...}} with placeholder, do substitution, restore
-        escaped_pattern = re.compile(r'\{\{([^}]+)\}\}')
-        placeholders = {}
-        counter = [0]
-
-        def escape_replacer(match):
-            placeholder = f"__ESCAPED_{counter[0]}__"
-            placeholders[placeholder] = "{" + match.group(1) + "}"
-            counter[0] += 1
-            return placeholder
+        """
+        path = Path(file_path)
 
-        prompt_text = escaped_pattern.sub(escape_replacer, prompt_text)
+        if not path.exists():
+            raise FileNotFoundError(f"Prompt file not found: {file_path}")
 
-        # Substitute variables
-        for key, value in variables.items():
-            prompt_text = prompt_text.replace(f"{{{key}}}", str(value))
+        # Read template content
+        template_content = path.read_text(encoding="utf-8")
 
-        # Restore escaped braces
-        for placeholder, original in placeholders.items():
-            prompt_text = prompt_text.replace(placeholder, original)
+        # Get cached environment and create template from string
+        env = PromptLoader._get_environment()
+        template = env.from_string(template_content)
 
-        return prompt_text
+        # Render with variables (empty dict if None)
+        # Missing variables render as empty string (default Undefined behavior)
+        # Extra variables are silently ignored
+        return template.render(**(variables or {}))

droidrun/portal.py

@@ -190,6 +190,23 @@ def setup_keyboard(device: AdbDevice):
     except Exception as e:
         raise Exception("Error setting up keyboard") from e
 
+def disable_keyboard(device: AdbDevice, target_ime: str = "com.droidrun.portal/.DroidrunKeyboardIME"):
+    """
+    Disable a specific IME (keyboard) and optionally switch to another.
+    By default, disables the DroidRun keyboard.
+
+    Args:
+        target_ime: The IME package/activity to disable (default: DroidRun keyboard)
+
+    Returns:
+        bool: True if disabled successfully, False otherwise
+    """
+    try:
+        device.shell(f"ime disable {target_ime}")
+        return True
+    except Exception as e:
+        raise Exception("Error disabling keyboard") from e
+
 def test():
     device = adb.device()
     ping_portal(device, debug=False)

droidrun/tools/adb.py

@@ -71,7 +71,9 @@ class AdbTools(Tools):
         self.app_opener_llm = app_opener_llm
         self.text_manipulator_llm = text_manipulator_llm
 
-        self.setup_keyboard()
+        # Set up keyboard
+        from droidrun.portal import setup_keyboard
+        setup_keyboard(self.device)
 
         # Set up TCP forwarding if requested
         if self.use_tcp:
@@ -150,24 +152,6 @@ class AdbTools(Tools):
             logger.error(f"Failed to remove TCP port forwarding: {e}")
             return False
 
-    def setup_keyboard(self) -> bool:
-        """
-        Set up the DroidRun keyboard as the default input method.
-        Simple setup that just switches to DroidRun keyboard without saving/restoring.
-
-        Returns:
-            bool: True if setup was successful, False otherwise
-        """
-        try:
-            self.device.shell("ime enable com.droidrun.portal/.DroidrunKeyboardIME")
-            self.device.shell("ime set com.droidrun.portal/.DroidrunKeyboardIME")
-            logger.debug("DroidRun keyboard setup completed")
-            return True
-
-        except Exception as e:
-            logger.error(f"Failed to setup DroidRun keyboard: {e}")
-            return False
-
     def __del__(self):
         """Cleanup when the object is destroyed."""
         if hasattr(self, "tcp_forwarded") and self.tcp_forwarded:
@@ -312,12 +296,9 @@ class AdbTools(Tools):
             # Extract coordinates using the helper function
             x, y = self._extract_element_coordinates_by_index(index)
 
-            logger.debug(
-                f"Tapping element with index {index} at coordinates ({x}, {y})"
-            )
             # Get the device and tap at the coordinates
             self.device.click(x, y)
-            logger.debug(f"Tapped element with index {index} at coordinates ({x}, {y})")
+            print(f"Tapped element with index {index} at coordinates ({x}, {y})")
 
             # Emit coordinate action event for trajectory recording
             if self._ctx:
@@ -350,8 +331,7 @@ class AdbTools(Tools):
                 )
                 self._ctx.write_event_to_stream(tap_event)
 
-            # Add a small delay to allow UI to update
-            time.sleep(0.5)
+
 
             # Create a descriptive response
             def find_element_by_index(elements, target_index):
@@ -463,7 +443,7 @@ class AdbTools(Tools):
 
             self.device.swipe(start_x, start_y, end_x, end_y, float(duration_ms / 1000))
             time.sleep(duration_ms / 1000)
-            logger.debug(
+            print(
                 f"Swiped from ({start_x}, {start_y}) to ({end_x}, {end_y}) in {duration_ms} milliseconds"
             )
             return True
@@ -546,7 +526,7 @@ class AdbTools(Tools):
                     timeout=10,
                 )
 
-                logger.debug(
+                print(
                     f"Keyboard input TCP response: {response.status_code}, {response.text}"
                 )
 
@@ -575,7 +555,7 @@ class AdbTools(Tools):
 
                 # Execute the command and capture output for better error handling
                 result = self.device.shell(cmd)
-                logger.debug(f"Content provider result: {result}")
+                print(f"Content provider result: {result}")
 
             if self._ctx:
                 input_event = InputTextActionEvent(
@@ -585,7 +565,7 @@ class AdbTools(Tools):
                 )
                 self._ctx.write_event_to_stream(input_event)
 
-            logger.debug(
+            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 ''}"
@@ -604,7 +584,7 @@ class AdbTools(Tools):
         This presses the Android back button.
         """
         try:
-            logger.debug("Pressing key BACK")
+            print("Pressing key BACK")
             self.device.keyevent(4)
 
             if self._ctx:
@@ -652,9 +632,8 @@ class AdbTools(Tools):
                 )
                 self._ctx.write_event_to_stream(key_event)
 
-            logger.debug(f"Pressing key {key_name}")
             self.device.keyevent(keycode)
-            logger.debug(f"Pressed key {key_name}")
+            print(f"Pressed key {key_name}")
             return f"Pressed key {key_name}"
         except ValueError as e:
             return f"Error: {str(e)}"
@@ -670,7 +649,7 @@ class AdbTools(Tools):
         """
         try:
 
-            logger.debug(f"Starting app {package} with activity {activity}")
+            print(f"Starting app {package} with activity {activity}")
             if not activity:
                 dumpsys_output = self.device.shell(
                     f"cmd package resolve-activity --brief {package}"
@@ -689,7 +668,7 @@ class AdbTools(Tools):
             print(f"Activity: {activity}")
 
             self.device.app_start(package, activity)
-            logger.debug(f"App started: {package} with activity {activity}")
+            print(f"App started: {package} with activity {activity}")
             return f"App started: {package} with activity {activity}"
         except Exception as e:
             return f"Error: {str(e)}"

{droidrun-0.3.10.dev4.dist-info → droidrun-0.3.10.dev6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: droidrun
-Version: 0.3.10.dev4
+Version: 0.3.10.dev6
 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
@@ -13,8 +13,6 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -27,10 +25,11 @@ Classifier: Topic :: Software Development :: Testing
 Classifier: Topic :: Software Development :: Testing :: Acceptance
 Classifier: Topic :: System :: Emulators
 Classifier: Topic :: Utilities
-Requires-Python: >=3.13
+Requires-Python: >=3.11
 Requires-Dist: adbutils>=2.10.2
 Requires-Dist: apkutils==2.0.0
 Requires-Dist: arize-phoenix>=12.3.0
+Requires-Dist: httpx>=0.27.0
 Requires-Dist: llama-index==0.14.4
 Requires-Dist: posthog>=6.7.6
 Requires-Dist: pydantic>=2.11.10
@@ -38,14 +37,6 @@ Requires-Dist: rich>=14.1.0
 Provides-Extra: anthropic
 Requires-Dist: anthropic>=0.67.0; extra == 'anthropic'
 Requires-Dist: llama-index-llms-anthropic<0.9.0,>=0.8.6; extra == 'anthropic'
-Provides-Extra: backend
-Requires-Dist: aiohttp>=3.9.0; extra == 'backend'
-Requires-Dist: fastapi>=0.104.0; extra == 'backend'
-Requires-Dist: pydantic-settings>=2.0.0; extra == 'backend'
-Requires-Dist: python-dotenv>=1.0.0; extra == 'backend'
-Requires-Dist: python-multipart>=0.0.6; extra == 'backend'
-Requires-Dist: uvicorn[standard]>=0.24.0; extra == 'backend'
-Requires-Dist: websockets>=12.0; extra == 'backend'
 Provides-Extra: deepseek
 Requires-Dist: llama-index-llms-deepseek>=0.2.1; extra == 'deepseek'
 Provides-Extra: dev