Merge branch 'master' into chore/parallel_tool_call

Author: Wendong-Fan

camel/environments/tic_tac_toe.py

@@ -413,6 +413,9 @@ def evaluate_position_for_x(
         Args:
             board (List[str]): The current game board as a list of strings.
             is_x_turn (bool): True if it's X's turn to move, False otherwise.
+            depth (int): Current recursion depth. (default: :obj:`0`)
+            max_depth (int): Maximum recursion depth to prevent stack overflow.
+                (default: :obj:`10`)
 
         Returns:
             float: A float value representing the position evaluation:
@@ -435,14 +438,17 @@ def evaluate_position_for_x(
             return 0.5  # Return draw evaluation at max depth
 
         moves = TicTacToeEnv.available_moves(board)
+        if not moves:
+            return 0.5
+        symbol = "X" if is_x_turn else "O"
         values = []
-        # Create a copy of the board to avoid side effects
+
         for move in moves:
-            board_copy = board.copy()
-            board_copy[move] = "X" if is_x_turn else "O"
+            board[move] = symbol
             value = TicTacToeEnv.evaluate_position_for_x(
-                board_copy, not is_x_turn, depth + 1, max_depth
+                board, not is_x_turn, depth + 1, max_depth
             )
+            board[move] = " "  # undo the move
             values.append(value)
 
         return max(values) if is_x_turn else min(values)

camel/societies/workforce/events.py

@@ -27,6 +27,7 @@ class WorkforceEventBase(BaseModel):
         "task_created",
         "task_assigned",
         "task_started",
+        "task_updated",
         "task_completed",
         "task_failed",
         "worker_created",
@@ -100,6 +101,17 @@ class TaskStartedEvent(WorkforceEventBase):
     worker_id: str
 
 
+class TaskUpdatedEvent(WorkforceEventBase):
+    event_type: Literal["task_updated"] = "task_updated"
+    task_id: str
+    worker_id: Optional[str] = None
+    update_type: Literal["replan", "reassign", "manual"]
+    old_value: Optional[str] = None
+    new_value: Optional[str] = None
+    parent_task_id: Optional[str] = None
+    metadata: Optional[Dict[str, Any]] = None
+
+
 class TaskCompletedEvent(WorkforceEventBase):
     event_type: Literal["task_completed"] = "task_completed"
     task_id: str
@@ -136,6 +148,7 @@ class QueueStatusEvent(WorkforceEventBase):
     TaskCreatedEvent,
     TaskAssignedEvent,
     TaskStartedEvent,
+    TaskUpdatedEvent,
     TaskCompletedEvent,
     TaskFailedEvent,
     WorkerCreatedEvent,

camel/societies/workforce/workforce.py

@@ -102,6 +102,7 @@
     TaskDecomposedEvent,
     TaskFailedEvent,
     TaskStartedEvent,
+    TaskUpdatedEvent,
     WorkerCreatedEvent,
 )
 
@@ -1673,8 +1674,30 @@ async def _apply_recovery_strategy(
             elif strategy == RecoveryStrategy.REPLAN:
                 # Modify the task content and retry
                 if recovery_decision.modified_task_content:
-                    task.content = recovery_decision.modified_task_content
-                    logger.info(f"Task {task.id} content modified for replan")
+                    old_content = task.content
+                    new_content = recovery_decision.modified_task_content
+
+                    task.content = new_content
+                    logger.info(
+                        f"Task {task.id} content modified for replan, "
+                        f"new_content: {new_content}"
+                    )
+
+                    task_updated_event = TaskUpdatedEvent(
+                        task_id=task.id,
+                        parent_task_id=task.parent.id if task.parent else None,
+                        worker_id=task.assigned_worker_id,
+                        update_type="replan",
+                        old_value=old_content,
+                        new_value=new_content,
+                        metadata={
+                            "quality_score": recovery_decision.quality_score,
+                            "reasoning": recovery_decision.reasoning,
+                            "issues": recovery_decision.issues,
+                        },
+                    )
+                    for cb in self._callbacks:
+                        cb.log_task_updated(task_updated_event)
 
                 # Repost the modified task to the same worker
                 await self._post_task(task, original_assignee)
@@ -1717,6 +1740,22 @@ async def _apply_recovery_strategy(
                     f"{new_worker}"
                 )
 
+                task_updated_event = TaskUpdatedEvent(
+                    task_id=task.id,
+                    parent_task_id=task.parent.id if task.parent else None,
+                    worker_id=task.assigned_worker_id,
+                    update_type="reassign",
+                    old_value=old_worker,
+                    new_value=new_worker,
+                    metadata={
+                        "quality_score": recovery_decision.quality_score,
+                        "reasoning": recovery_decision.reasoning,
+                        "issues": recovery_decision.issues,
+                    },
+                )
+                for cb in self._callbacks:
+                    cb.log_task_updated(task_updated_event)
+
             elif strategy == RecoveryStrategy.DECOMPOSE:
                 # Decompose the task into subtasks
                 reason = (
@@ -2056,8 +2095,21 @@ def modify_task_content(self, task_id: str, new_content: str) -> bool:
 
         for task in self._pending_tasks:
             if task.id == task_id:
+                old_content = task.content
                 task.content = new_content
                 logger.info(f"Task {task_id} content modified.")
+
+                task_updated_event = TaskUpdatedEvent(
+                    task_id=task.id,
+                    parent_task_id=task.parent.id if task.parent else None,
+                    worker_id=task.assigned_worker_id,
+                    update_type="manual",
+                    old_value=old_content,
+                    new_value=new_content,
+                )
+                for cb in self._callbacks:
+                    cb.log_task_updated(task_updated_event)
+
                 return True
         logger.warning(f"Task {task_id} not found in pending tasks.")
         return False

camel/societies/workforce/workforce_callback.py

@@ -27,6 +27,7 @@
     TaskDecomposedEvent,
     TaskFailedEvent,
     TaskStartedEvent,
+    TaskUpdatedEvent,
     WorkerCreatedEvent,
     WorkerDeletedEvent,
 )
@@ -82,6 +83,10 @@ def log_task_assigned(self, event: TaskAssignedEvent) -> None:
     def log_task_started(self, event: TaskStartedEvent) -> None:
         pass
 
+    @abstractmethod
+    def log_task_updated(self, event: TaskUpdatedEvent) -> None:
+        pass
+
     @abstractmethod
     def log_task_completed(self, event: TaskCompletedEvent) -> None:
         pass

camel/societies/workforce/workforce_logger.py

@@ -26,6 +26,7 @@
     TaskDecomposedEvent,
     TaskFailedEvent,
     TaskStartedEvent,
+    TaskUpdatedEvent,
     WorkerCreatedEvent,
     WorkerDeletedEvent,
 )
@@ -157,6 +158,21 @@ def log_task_started(
         if event.task_id in self._task_hierarchy:
             self._task_hierarchy[event.task_id]['status'] = 'processing'
 
+    def log_task_updated(self, event: TaskUpdatedEvent) -> None:
+        r"""Logs updates made to a task."""
+        self._log_event(
+            event_type=event.event_type,
+            task_id=event.task_id,
+            worker_id=event.worker_id,
+            update_type=event.update_type,
+            old_value=event.old_value,
+            new_value=event.new_value,
+            parent_task_id=event.parent_task_id,
+            metadata=event.metadata or {},
+        )
+        if event.task_id in self._task_hierarchy:
+            self._task_hierarchy[event.task_id]['status'] = 'updated'
+
     def log_task_completed(self, event: TaskCompletedEvent) -> None:
         r"""Logs the successful completion of a task."""
         self._log_event(

camel/toolkits/terminal_toolkit/utils.py

@@ -297,6 +297,17 @@ def setup_initial_env_with_uv(
 ) -> bool:
     r"""Set up initial environment using uv."""
     try:
+        if platform.system() == 'Windows':
+            python_path = os.path.join(env_path, "Scripts", "python.exe")
+        else:
+            python_path = os.path.join(env_path, "bin", "python")
+
+        if os.path.exists(python_path):
+            if update_callback:
+                update_callback(
+                    "[UV] Environment already exists, skipping creation\n"
+                )
+            return True
         # Create virtual environment with Python 3.10 using uv
         subprocess.run(
             [uv_path, "venv", "--python", "3.10", env_path],
@@ -306,12 +317,6 @@ def setup_initial_env_with_uv(
             timeout=300,
         )
 
-        # Get the python path from the new environment
-        if platform.system() == 'Windows':
-            python_path = os.path.join(env_path, "Scripts", "python.exe")
-        else:
-            python_path = os.path.join(env_path, "bin", "python")
-
         # Install essential packages using uv
         essential_packages = [
             "pip",
@@ -356,6 +361,20 @@ def setup_initial_env_with_venv(
 ) -> bool:
     r"""Set up initial environment using standard venv."""
     try:
+        # Get pip path
+        if platform.system() == 'Windows':
+            pip_path = os.path.join(env_path, "Scripts", "pip.exe")
+        else:
+            pip_path = os.path.join(env_path, "bin", "pip")
+
+        # Check if environment already exists
+        if os.path.exists(pip_path):
+            if update_callback:
+                update_callback(
+                    "Environment already exists, skipping creation\n"
+                )
+            return True
+
         # Create virtual environment with system Python
         try:
             venv.create(
@@ -374,12 +393,6 @@ def setup_initial_env_with_venv(
                 symlinks=False,
             )
 
-        # Get pip path
-        if platform.system() == 'Windows':
-            pip_path = os.path.join(env_path, "Scripts", "pip.exe")
-        else:
-            pip_path = os.path.join(env_path, "bin", "pip")
-
         # Upgrade pip and install essential packages
         essential_packages = [
             "pip",

docs/mintlify/reference/camel.societies.workforce.workforce_callback.mdx

@@ -62,6 +62,14 @@ def log_task_assigned(self, event: TaskAssignedEvent):
 def log_task_started(self, event: TaskStartedEvent):
 ```
 
+<a id="camel.societies.workforce.workforce_callback.WorkforceCallback.log_task_updated"></a>
+
+### log_task_updated
+
+```python
+def log_task_updated(self, event: TaskUpdatedEvent):
+```
+
 <a id="camel.societies.workforce.workforce_callback.WorkforceCallback.log_task_completed"></a>
 
 ### log_task_completed

docs/mintlify/reference/camel.societies.workforce.workforce_logger.mdx

@@ -88,6 +88,16 @@ def log_task_started(self, event: TaskStartedEvent):
 
 Logs when a worker starts processing a task.
 
+<a id="camel.societies.workforce.workforce_logger.WorkforceLogger.log_task_updated"></a>
+
+### log_task_updated
+
+```python
+def log_task_updated(self, event: TaskUpdatedEvent):
+```
+
+Logs updates made to a task.
+
 <a id="camel.societies.workforce.workforce_logger.WorkforceLogger.log_task_completed"></a>
 
 ### log_task_completed

examples/workforce/workforce_callbacks_example.py

@@ -34,6 +34,7 @@
     TaskDecomposedEvent,
     TaskFailedEvent,
     TaskStartedEvent,
+    TaskUpdatedEvent,
     WorkerCreatedEvent,
     WorkerDeletedEvent,
 )
@@ -78,6 +79,12 @@ def log_task_started(self, event: TaskStartedEvent) -> None:
             f"worker={event.worker_id}"
         )
 
+    def log_task_updated(self, event: TaskUpdatedEvent) -> None:
+        print(
+            f"[PrintCallback] task_updated: task={event.task_id}, "
+            f"worker={event.worker_id}"
+        )
+
     def log_task_completed(self, event: TaskCompletedEvent) -> None:
         print(
             f"[PrintCallback] task_completed: task={event.task_id}, "