droidrun 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

droidrun/tools/ios.py

@@ -53,7 +53,7 @@ class IOSTools(Tools):
         self.bundle_identifiers = bundle_identifiers
         logger.info(f"iOS device URL: {url}")
 
-    async def get_clickables(
+    async def get_state(
         self, serial: Optional[str] = None
     ) -> List[Dict[str, Any]]:
         """
@@ -80,7 +80,9 @@ class IOSTools(Tools):
                         # Cache the elements for tap_by_index usage
                         self.clickable_elements_cache = elements
 
-                        return self.clickable_elements_cache
+                        return {
+                            "a11y_tree":self.clickable_elements_cache
+                        }
                     else:
                         logger.error(
                             f"Failed to get accessibility data: HTTP {response.status}"

droidrun/tools/tools.py

@@ -9,7 +9,7 @@ logger = logging.getLogger(__name__)
 
 class Tools(ABC):
     @abstractmethod
-    async def get_clickables(self) -> str:
+    async def get_state(self) -> Dict[str, Any]:
         pass
 
     @abstractmethod
@@ -46,10 +46,6 @@ class Tools(ABC):
     async def take_screenshot(self) -> Tuple[str, bytes]:
         pass
 
-    @abstractmethod
-    async def get_phone_state(self) -> Dict[str, Any]:
-        pass
-
     @abstractmethod
     async def list_packages(self, include_system_apps: bool = False) -> List[str]:
         pass

{droidrun-0.3.0.dist-info → droidrun-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: droidrun
-Version: 0.3.0
+Version: 0.3.1
 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
@@ -34,9 +34,10 @@ Requires-Dist: llama-index
 Requires-Dist: llama-index-callbacks-arize-phoenix
 Requires-Dist: llama-index-llms-anthropic
 Requires-Dist: llama-index-llms-deepseek
-Requires-Dist: llama-index-llms-gemini
+Requires-Dist: llama-index-llms-google-genai
 Requires-Dist: llama-index-llms-ollama
 Requires-Dist: llama-index-llms-openai
+Requires-Dist: llama-index-llms-openai-like
 Requires-Dist: openai>=1.0.0
 Requires-Dist: pillow>=10.0.0
 Requires-Dist: pydantic>=2.0.0

{droidrun-0.3.0.dist-info → droidrun-0.3.1.dist-info}/RECORD

@@ -1,13 +1,12 @@
 droidrun/__init__.py,sha256=ERliGcmgGJpyTs7SukYD28tgRccxn6hPG8JPsH0ezZA,840
 droidrun/__main__.py,sha256=78o1Wr_Z-NrZy9yLWmEfNfRRhAiJGBr4Xi3lmbgkx3w,105
-droidrun/run.py,sha256=79xRUb5OgAezXBiI1a4PLvdimfRiowcrhMF1eC9vcC0,3341
 droidrun/adb/__init__.py,sha256=kh-iT9Sv6RZ2dFSDu1beK_GgtAq8wlMvZQ7puR8JWsI,257
 droidrun/adb/device.py,sha256=fAKXR5Qmqzz7q3KD2VCcW6dG3NsDLfG9zd56B5kswL4,11004
 droidrun/adb/manager.py,sha256=g7TuEOCnMTavHzCMtr3u6TPBhmZwE98CW9vBwdhdyyg,2728
 droidrun/adb/wrapper.py,sha256=Yz3_JSIidq-5bf-t0UfawTutMaLrINS_1Y15m_Uss4g,7093
 droidrun/agent/__init__.py,sha256=4SqTJeGDvr_wT8rtN9J8hnN6P-pae663mkYr-JmzH4w,208
 droidrun/agent/codeact/__init__.py,sha256=ZLDGT_lTTzyNm7pcBzdyRIGHJ2ZgbInJdhXZRbJLhSQ,278
-droidrun/agent/codeact/codeact_agent.py,sha256=NOOmyRaMn_AOeMSMNK6p86dStslTX5s9rn-bQWJ0Fh0,15647
+droidrun/agent/codeact/codeact_agent.py,sha256=z0c10d1vk2PBciYbHLwnYlEopvwZzJhXkXqjJuUI0v4,16045
 droidrun/agent/codeact/events.py,sha256=skCfZ-5SR0YhhzZVxx8_VkUjfILk8rCv47k9pHNYhdc,634
 droidrun/agent/codeact/prompts.py,sha256=28HflWMNkC1ky0hGCzAxhJftjU2IIU1ZRUfya3S7M6I,1006
 droidrun/agent/common/default.py,sha256=P07el-PrHsoqQMYsYxSSln6mFl-QY75vzwp1Dll_XmY,259
@@ -18,35 +17,34 @@ droidrun/agent/context/context_injection_manager.py,sha256=sA33q2KPtX_4Yap8wM11T
 droidrun/agent/context/episodic_memory.py,sha256=1ImeR3jAWOpKwkQt3bMlXVOBiQbIli5fBIlBq2waREQ,394
 droidrun/agent/context/reflection.py,sha256=0hJluOz0hTlHHhReKpIJ9HU5aJbaJsvrjMfraQ84D-M,652
 droidrun/agent/context/task_manager.py,sha256=ESLs4kR6VNYiYQsc4V7WAeoSLwbaZPSWBXpveOfOv8c,4343
-droidrun/agent/context/todo.txt,sha256=pwcH0z4Ofic3fhZ2fekRMfjrxPIB8IybO4eqvSWWjgA,163
 droidrun/agent/context/personas/__init__.py,sha256=tUDIM_9Kim3ki6ZXpwcvPHPSa2cCHNMLdNW4lyJr4gM,231
 droidrun/agent/context/personas/app_starter.py,sha256=dHeknznxGEPJ7S6VPyEG_MB-HvAvQwUOnRWaShaV8Xo,1585
-droidrun/agent/context/personas/default.py,sha256=8pWC34gdbySyTaRFVE3dFdwpOMW63G1EOjjcYP0BLGo,5023
+droidrun/agent/context/personas/default.py,sha256=Xm07YCWoKjvlHAbQRtzE3vn7BVcz6wYcSVeg4FiojJQ,5060
 droidrun/agent/context/personas/extractor.py,sha256=S7Qgh3-Kz_OowQJFJGQUlr8OUVktX5UHVdf5qkAj3GQ,1907
 droidrun/agent/context/personas/ui_expert.py,sha256=P2dAnkKiR3O4bN4ZUuWHmuu4Qo8WRiH1mU6EEOr3yJA,4710
 droidrun/agent/droid/__init__.py,sha256=3BfUVZiUQ8ATAJ_JmqQZQx53WoERRpQ4AyHW5WOgbRI,297
-droidrun/agent/droid/droid_agent.py,sha256=M08l7WOu1NdTOPNErs0lNVUZC4UDNdS-FK0W5vJ1RqU,13222
+droidrun/agent/droid/droid_agent.py,sha256=ELPQOpRYQcnB64rLOoVPk12GHuQ_EFs7fMH-7t0LeQM,13365
 droidrun/agent/droid/events.py,sha256=bpUhJnbaIH86r8hfUsbHub465v-xYOsIyHWNN8g4TCs,576
 droidrun/agent/oneflows/reflector.py,sha256=I_tE0PBjvwWbS6SA8Qd41etxJglFgn8oScuKUxc9LEE,11621
 droidrun/agent/planner/__init__.py,sha256=Fu0Ewtd-dIRLgHIL1DB_9EEKvQS_f1vjB8jgO5TbJXg,364
 droidrun/agent/planner/events.py,sha256=oyt2FNrA2uVyUeVT65-N0AC6sWBFxSnwNEqWtnRYoFM,390
-droidrun/agent/planner/planner_agent.py,sha256=MuCDer3ZfEXTpid-sCd5L4i1C3yHrWsSa8sRLwqq7IA,10050
+droidrun/agent/planner/planner_agent.py,sha256=vcZx8tawMss0F2nt-4QEtdF7kSaikUq3rdWPdTNicjk,10494
 droidrun/agent/planner/prompts.py,sha256=Ci7Oeu3J4TAhx-tKGPZ9l6Wb3a81FSqC8cWW4jW73HI,6046
 droidrun/agent/utils/__init__.py,sha256=JK6ygRjw7gzcQSG0HBEYLoVGH54QQAxJJ7HpIS5mgyc,44
 droidrun/agent/utils/async_utils.py,sha256=IQBcWPwevm89B7R_UdMXk0unWeNCBA232b5kQGqoxNI,336
-droidrun/agent/utils/chat_utils.py,sha256=aZihuOE_sdkzniRHBF9QNZ1RF9IFOj06uyd6sglPumY,13241
+droidrun/agent/utils/chat_utils.py,sha256=5oqP2nmKs8sHWP1H_TK82yaxrxWf7FdEbFKASKpR60g,13000
 droidrun/agent/utils/executer.py,sha256=lQbk2TbPyl_F0k2FqEVimq8cQRcWM_KCO_I7fnkkxqA,4587
 droidrun/agent/utils/llm_picker.py,sha256=adktsU2-GhYzZ0djOhO_TyFhUE8aGirzJy36A_EvnXU,5919
 droidrun/agent/utils/trajectory.py,sha256=OmO8TvNO0LVtPXg2qTCv8o9ePaMeDyf-MRWN_YObXho,6845
 droidrun/cli/__init__.py,sha256=DuwSRtZ8WILPd-nf-fZ7BaBsRgtofoInOF3JtJ9wag0,167
 droidrun/cli/logs.py,sha256=PsT_VbnOa_sOLXK4KkEJk4AsYCpscqrVoryMmLVwPG0,9714
-droidrun/cli/main.py,sha256=bNwlhTdZcsqM-Q-SnFTqY4BzNTp_fGhGel67r_fbMHM,14344
+droidrun/cli/main.py,sha256=3VP5cZ0a7bKcNnqwMQ8mBvaprPcjgM7394WBRdkKDKU,15059
 droidrun/tools/__init__.py,sha256=9ReauavtSKDQG9ya9_Fr9O0TQnDFixgOPaP5n82_iEk,271
-droidrun/tools/adb.py,sha256=YSStSGYa7SFCzmrZAb_hn5pOtpXzErnrP5HJyOCm5Ss,33984
-droidrun/tools/ios.py,sha256=JMsBLAykeXsSvwHXvHmGinM9luPW63SpsI_u1IDPCx8,22822
-droidrun/tools/tools.py,sha256=L9EKBk2_QxPZmmDVXfjmHwqkauwCawNnQuz9X29N8UE,2468
-droidrun-0.3.0.dist-info/METADATA,sha256=QIbmadNT3BUyfINHZmtlOUZvtOPLthl-q9CfqkVgBJ4,6294
-droidrun-0.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-droidrun-0.3.0.dist-info/entry_points.txt,sha256=o259U66js8TIybQ7zs814Oe_LQ_GpZsp6a9Cr-xm5zE,51
-droidrun-0.3.0.dist-info/licenses/LICENSE,sha256=s-uxn9qChu-kFdRXUp6v_0HhsaJ_5OANmfNOFVm2zdk,1069
-droidrun-0.3.0.dist-info/RECORD,,
+droidrun/tools/adb.py,sha256=1Nv8tkmgqGlOZJYe39W5SGwdqnEjrxN7szsLQ_BkWqo,30137
+droidrun/tools/ios.py,sha256=-fq4VNJFVTkR4xtUW9IVyUXwqnhsJWda_fik3II2EGg,22885
+droidrun/tools/tools.py,sha256=EH3hzrVUHEkTUT-PF2s9NHyNntV9xoNXskmNBcZwLm4,2385
+droidrun-0.3.1.dist-info/METADATA,sha256=8lZqTnD2aoQOcpRKn6TL7rC0IdshMhAUAnyY9QWCKmQ,6344
+droidrun-0.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+droidrun-0.3.1.dist-info/entry_points.txt,sha256=o259U66js8TIybQ7zs814Oe_LQ_GpZsp6a9Cr-xm5zE,51
+droidrun-0.3.1.dist-info/licenses/LICENSE,sha256=s-uxn9qChu-kFdRXUp6v_0HhsaJ_5OANmfNOFVm2zdk,1069
+droidrun-0.3.1.dist-info/RECORD,,

droidrun/agent/context/todo.txt

@@ -1,4 +0,0 @@
-Task 1: Precondition: None. Goal: Open the notification shade to find the settings button.
-Status: pending
-Agent: Default
-----------------------------------------

droidrun/run.py

@@ -1,105 +0,0 @@
-#!/usr/bin/env python3
-"""
-Minimal script to create and run a DroidAgent
-"""
-
-import asyncio
-import os
-import sys
-
-# Add the current directory to Python path so we can import droidrun
-sys.path.insert(0, '/home/sleyn/projects/droidrun')
-
-async def main():
-    try:
-        # Import required modules
-        from droidrun.agent.droid import DroidAgent
-        from droidrun.agent.utils.llm_picker import load_llm
-        from droidrun.tools.adb import DeviceManager, AdbTools
-        from droidrun.agent.context.personas import DEFAULT, APP_STARTER_EXPERT
-        
-        # Configuration
-        goal = """Open the notes app and create a new note"""
-        provider = "Gemini"  # Change this to your preferred provider
-        model = "models/gemini-2.5-flash-preview-05-20"
-        
-        # Check for API key
-        api_key = os.getenv("GEMINI_API_KEY") #os.getenv("GEMINI_API_KEY")
-        if not api_key:
-            print("❌ Please set GEMINI_API_KEY environment variable")
-            print("   Example: export GEMINI_API_KEY='your-api-key-here'")
-            return
-        
-        print(f"🎯 Goal: {goal}")
-        print(f"🤖 Using {provider} with model {model}")
-        
-        # Find a connected device
-        device_manager = DeviceManager()
-        devices = await device_manager.list_devices()
-        
-        #if not devices:
-        #    print("❌ No Android devices found. Please connect a device via ADB.")
-        #    print("   Try: adb devices")
-        #    return
-        
-        device_serial = devices[0].serial
-        #"http://localhost:6643"using the CLI and 
-        #device_serial = "http://192.168.100.91:6643"
-        print(f"📱 Using device: {device_serial}")
-        
-        # Initialize LLM
-        print("🧠 Initializing LLM...")
-        llm = load_llm(
-            provider_name=provider,
-            model=model,
-            api_key=api_key,
-            temperature=0.2
-        )
-
-        tools = AdbTools(serial=device_serial)
-
-
-        
-        # Create DroidAgent
-        print("🤖 Creating DroidAgent...")
-        agent = DroidAgent(
-            goal=goal,
-            llm=llm,
-            tools=tools,
-            max_steps=100,
-            timeout=3000,
-            reasoning=False,
-            debug=True,
-            save_trajectories=True,
-            enable_tracing=False
-        )
-        
-        # Run the agent
-        print("🚀 Running agent...")
-        handler = agent.run()
-        async for nested_ev in handler.stream_events():
-            print(f"EXTERNAL EVENT: {nested_ev.__class__.__name__}")
-
-        result = await handler
-
-        # Print results
-        if result.get("success"):
-            print(f"✅ Success: {result.get('reason', 'Goal completed')}")
-        else:
-            print(f"❌ Failed: {result.get('reason', 'Unknown error')}")
-        
-        print(f"📊 Steps taken: {result.get('steps', 0)}")
-        
-        if result.get("trajectory"):
-            print(f"📝 Trajectory has {len(result['trajectory'])} steps")
-        
-    except ImportError as e:
-        print(f"❌ Import error: {e}")
-        print("   Make sure you're in the droidrun project directory")
-    except Exception as e:
-        print(f"❌ Error: {e}")
-        import traceback
-        traceback.print_exc()
-
-if __name__ == "__main__":
-    asyncio.run(main())