droidrun 0.3.4__tar.gz → 0.3.5__tar.gz

{droidrun-0.3.4 → droidrun-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: droidrun
-Version: 0.3.4
+Version: 0.3.5
 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.4 → droidrun-0.3.5}/droidrun/agent/context/task_manager.py

@@ -43,6 +43,13 @@ class TaskManager:
     def get_task_history(self):
         return self.task_history
 
+    def get_current_task(self) -> Optional[Task]:
+        """Return the first task with status "pending" from the task list."""
+        for task in self.tasks:
+            if task.status == self.STATUS_PENDING:
+                return task
+        return None
+
     def complete_task(self, task: Task, message: Optional[str] = None):
         task = copy.deepcopy(task)
         task.status = self.STATUS_COMPLETED
@@ -60,6 +67,9 @@ class TaskManager:
 
     def get_failed_tasks(self) -> list[dict]:
         return [task for task in self.task_history if task.status == self.STATUS_FAILED]
+    
+    def get_task_history(self) -> list[dict]:
+        return self.task_history
 
 
     def save_to_file(self):

{droidrun-0.3.4 → droidrun-0.3.5}/droidrun/agent/planner/planner_agent.py

@@ -259,8 +259,9 @@ wrap your code inside this:
 
 
             chat_history = await chat_utils.add_task_history_block(
-                self.task_manager.get_completed_tasks(),
-                self.task_manager.get_failed_tasks(),
+                #self.task_manager.get_completed_tasks(),
+                #self.task_manager.get_failed_tasks(),
+                self.task_manager.get_task_history(),
                 chat_history,
             )
 

{droidrun-0.3.4 → droidrun-0.3.5}/droidrun/agent/utils/chat_utils.py

@@ -120,7 +120,7 @@ async def add_ui_text_block(ui_state: str, chat_history: List[ChatMessage], copy
 
 async def add_screenshot_image_block(screenshot, chat_history: List[ChatMessage], copy = True) -> None:
     if screenshot:
-        image_block = ImageBlock(image=base64.b64encode(screenshot))
+        image_block = ImageBlock(image=screenshot)
         if copy:
             chat_history = chat_history.copy()  # Create a copy of chat history to avoid modifying the original
             chat_history[-1] = message_copy(chat_history[-1])
@@ -201,29 +201,31 @@ async def get_reflection_block(reflections: List[Reflection]) -> ChatMessage:
     
     return ChatMessage(role="user", content=reflection_block)
         
-async def add_task_history_block(completed_tasks: list[dict], failed_tasks: list[dict], chat_history: List[ChatMessage]) -> List[ChatMessage]: 
-    task_history = ""
+async def add_task_history_block(all_tasks: list[dict], chat_history: List[ChatMessage]) -> List[ChatMessage]:
+    """Experimental task history with all previous tasks."""
+    if not all_tasks:
+        return chat_history
+
+    lines = ["### Task Execution History (chronological):"]
+    for index, task in enumerate(all_tasks, 1):
+        description: str
+        status_value: str
+
+        if hasattr(task, "description") and hasattr(task, "status"):
+            description = getattr(task, "description")
+            status_value = getattr(task, "status") or "unknown"
+        elif isinstance(task, dict):
+            description = str(task.get("description", task))
+            status_value = str(task.get("status", "unknown"))
+        else:
+            description = str(task)
+            status_value = "unknown"
 
-    # Combine all tasks and show in chronological order
-    all_tasks = completed_tasks + failed_tasks
-    
-    if all_tasks:
-        task_history += "### Task Execution History (chronological):\n"
-        for i, task in enumerate(all_tasks, 1):
-            if hasattr(task, 'description'):
-                status_indicator = "[success]" if hasattr(task, 'status') and task.status == "completed" else "[failed]"
-                task_history += f"{i}. {status_indicator} {task.description}\n"
-            elif isinstance(task, dict):
-                # For backward compatibility with dict format
-                task_description = task.get('description', str(task))
-                status_indicator = "[success]" if task in completed_tasks else "[failed]"
-                task_history += f"{i}. {status_indicator} {task_description}\n"
-            else:
-                status_indicator = "[success]" if task in completed_tasks else "[failed]"
-                task_history += f"{i}. {status_indicator} {task}\n"
+        indicator = f"[{status_value}]"
 
-    
-    task_block = TextBlock(text=f"{task_history}")
+        lines.append(f"{index}. {indicator} {description}")
+
+    task_block = TextBlock(text="\n".join(lines))
 
     chat_history = chat_history.copy()
     chat_history[-1] = message_copy(chat_history[-1])

{droidrun-0.3.4 → droidrun-0.3.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "droidrun"
-version = "0.3.4"
+version = "0.3.5"
 description = "A framework for controlling Android devices through LLM agents"
 authors = [{ name = "Niels Schmidt", email = "niels.schmidt@droidrun.ai" }]
 dependencies = [