droidrun 0.3.4__py3-none-any.whl → 0.3.5__py3-none-any.whl

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/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/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.dist-info → droidrun-0.3.5.dist-info}/METADATA

@@ -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.dist-info → droidrun-0.3.5.dist-info}/RECORD

@@ -13,7 +13,7 @@ droidrun/agent/context/agent_persona.py,sha256=Mxd4HTyirWD-aqNlka1hQBdS-0I-lXJr2
 droidrun/agent/context/context_injection_manager.py,sha256=sA33q2KPtX_4Yap8wM11T6ewlZC_0FIbKPEc400SHrE,2188
 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=RqIBBLcw_hLotaO0JFsm8HOdJ_UdNttSGRGl_3GqRY4,4648
+droidrun/agent/context/task_manager.py,sha256=9CDax1G48DRcqPm1JYy9UiLI7wPsF34eqAM0dRDCC1k,4992
 droidrun/agent/context/personas/__init__.py,sha256=oSRa8g_xngX7JPIRPu7fLO33m3r7fdEQzIuORuqcw5M,232
 droidrun/agent/context/personas/app_starter.py,sha256=dHeknznxGEPJ7S6VPyEG_MB-HvAvQwUOnRWaShaV8Xo,1585
 droidrun/agent/context/personas/big_agent.py,sha256=Gl_y4ykz3apGc203-KG2UbSOwf7gDUiWh7GOVyiLn-Y,5091
@@ -25,11 +25,11 @@ droidrun/agent/droid/events.py,sha256=hjYpWcSffqP83rNv_GyOEc3CNSrdvlVPdUkaRU6QDJ
 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=gqXMj1PcTdmKpSGM1b6T_q7ojFptPgx39wAXuW3ZQDQ,10854
+droidrun/agent/planner/planner_agent.py,sha256=KELaoNOcoyB0He0B_A4iCi-hFyOTVO-s4-UclbQ7YjM,10910
 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=SNn-wJSyxiirDWDqAeLehHw4ByNX_6dD5Bx3Inc6Sj0,13008
+droidrun/agent/utils/chat_utils.py,sha256=KzmiNasXb9d0qH12ylRsWooKV4_9LXy_QifaD_xf_O0,12726
 droidrun/agent/utils/executer.py,sha256=-iwdZpmpF0w116D7A_eDgeV0ZNXSuotVgBkM5lc0BNI,5202
 droidrun/agent/utils/llm_picker.py,sha256=16tNkNhEM9gD_uivzxLvuaa6s0Tz7Igu-3fxMP2lAtY,5968
 droidrun/agent/utils/trajectory.py,sha256=PU3nI3Zru580_bK0TvqUaf-5kiWvj6hFoedXkDgTqdc,17047
@@ -47,8 +47,8 @@ droidrun/tools/__init__.py,sha256=9ReauavtSKDQG9ya9_Fr9O0TQnDFixgOPaP5n82_iEk,27
 droidrun/tools/adb.py,sha256=zFnVydQi42GZ1vh-4HT79dCQVBeCS6VObywyaIUUCmw,40832
 droidrun/tools/ios.py,sha256=imzojiS6gqz4IKexUEz1ga7-flSOaC5QRpHIJTwcgSQ,21807
 droidrun/tools/tools.py,sha256=rqDe2gRyR45HVM15SwsW1aCTVZo5eleTxlh2hGqCHys,4785
-droidrun-0.3.4.dist-info/METADATA,sha256=C7rh3674hF4xvKES0DfXTQaErn1RckdUBmrNcrito_o,6685
-droidrun-0.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-droidrun-0.3.4.dist-info/entry_points.txt,sha256=o259U66js8TIybQ7zs814Oe_LQ_GpZsp6a9Cr-xm5zE,51
-droidrun-0.3.4.dist-info/licenses/LICENSE,sha256=s-uxn9qChu-kFdRXUp6v_0HhsaJ_5OANmfNOFVm2zdk,1069
-droidrun-0.3.4.dist-info/RECORD,,
+droidrun-0.3.5.dist-info/METADATA,sha256=k4-cv0Vud2ol8yqc1qkKWWxp2OrGxL12yeS-YUpc4K4,6685
+droidrun-0.3.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+droidrun-0.3.5.dist-info/entry_points.txt,sha256=o259U66js8TIybQ7zs814Oe_LQ_GpZsp6a9Cr-xm5zE,51
+droidrun-0.3.5.dist-info/licenses/LICENSE,sha256=s-uxn9qChu-kFdRXUp6v_0HhsaJ_5OANmfNOFVm2zdk,1069
+droidrun-0.3.5.dist-info/RECORD,,