camel-ai 0.2.71a11__tar.gz → 0.2.72a0__tar.gz

{camel_ai-0.2.71a11 → camel_ai-0.2.72a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camel-ai
-Version: 0.2.71a11
+Version: 0.2.72a0
 Summary: Communicative Agents for AI Society Study
 Project-URL: Homepage, https://www.camel-ai.org/
 Project-URL: Repository, https://github.com/camel-ai/camel

{camel_ai-0.2.71a11 → camel_ai-0.2.72a0}/camel/__init__.py

@@ -14,7 +14,7 @@
 
 from camel.logger import disable_logging, enable_logging, set_log_level
 
-__version__ = '0.2.71a11'
+__version__ = '0.2.72a0'
 
 __all__ = [
     '__version__',

{camel_ai-0.2.71a11 → camel_ai-0.2.72a0}/camel/agents/chat_agent.py

@@ -1236,7 +1236,7 @@ class ChatAgent(BaseAgent):
                     if not message.parsed:
                         logger.warning(
                             f"Failed to parse JSON from response: "
-                            f"{content[:100]}..."
+                            f"{content}"
                         )
 
                 except Exception as e:

{camel_ai-0.2.71a11 → camel_ai-0.2.72a0}/camel/models/moonshot_model.py

@@ -20,6 +20,7 @@ from pydantic import BaseModel
 
 from camel.configs import MOONSHOT_API_PARAMS, MoonshotConfig
 from camel.messages import OpenAIMessage
+from camel.models._utils import try_modify_message_with_format
 from camel.models.openai_compatible_model import OpenAICompatibleModel
 from camel.types import (
     ChatCompletion,
@@ -106,6 +107,38 @@ class MoonshotModel(OpenAICompatibleModel):
             **kwargs,
         )
 
+    def _prepare_request(
+        self,
+        messages: List[OpenAIMessage],
+        response_format: Optional[Type[BaseModel]] = None,
+        tools: Optional[List[Dict[str, Any]]] = None,
+    ) -> Dict[str, Any]:
+        r"""Prepare the request configuration for Moonshot API.
+
+        Args:
+            messages (List[OpenAIMessage]): Message list with the chat history
+                in OpenAI API format.
+            response_format (Optional[Type[BaseModel]]): The format of the
+                response.
+            tools (Optional[List[Dict[str, Any]]]): The schema of the tools to
+                use for the request.
+
+        Returns:
+            Dict[str, Any]: The prepared request configuration.
+        """
+        import copy
+
+        request_config = copy.deepcopy(self.model_config_dict)
+
+        if tools:
+            request_config["tools"] = tools
+        elif response_format:
+            # Use the same approach as DeepSeek for structured output
+            try_modify_message_with_format(messages[-1], response_format)
+            request_config["response_format"] = {"type": "json_object"}
+
+        return request_config
+
     @observe()
     async def _arun(
         self,
@@ -141,10 +174,9 @@ class MoonshotModel(OpenAICompatibleModel):
                 tags=["CAMEL-AI", str(self.model_type)],
             )
 
-        request_config = self.model_config_dict.copy()
-
-        if tools:
-            request_config["tools"] = tools
+        request_config = self._prepare_request(
+            messages, response_format, tools
+        )
 
         return await self._async_client.chat.completions.create(
             messages=messages,

{camel_ai-0.2.71a11 → camel_ai-0.2.72a0}/camel/societies/workforce/prompts.py

@@ -147,7 +147,7 @@ Here is the content of the parent task for you to refer to:
 Here are results of some prerequisite tasks that you can refer to:
 
 ==============================
-{dependency_task_info}
+{dependency_tasks_info}
 ==============================
 
 Here are some additional information about the task:

{camel_ai-0.2.71a11 → camel_ai-0.2.72a0}/camel/societies/workforce/role_playing_worker.py

@@ -122,7 +122,7 @@ class RolePlayingWorker(Worker):
         prompt = ROLEPLAY_PROCESS_TASK_PROMPT.format(
             content=task.content,
             parent_task_content=task.parent.content if task.parent else "",
-            dependency_task_info=dependency_tasks_info,
+            dependency_tasks_info=dependency_tasks_info,
             additional_info=task.additional_info,
         )
         role_play_session = RolePlaying(

{camel_ai-0.2.71a11 → camel_ai-0.2.72a0}/camel/societies/workforce/worker.py

@@ -89,7 +89,7 @@ class Worker(BaseNode, ABC):
             )
 
             # Process the task
-            task_state = await self._process_task(task, [])
+            task_state = await self._process_task(task, task.dependencies)
 
             # Update the result and status of the task
             task.set_state(task_state)

{camel_ai-0.2.71a11 → camel_ai-0.2.72a0}/camel/societies/workforce/workforce.py

@@ -1008,7 +1008,7 @@ class Workforce(BaseNode):
         if not validate_task_content(new_content, task_id):
             logger.warning(
                 f"Task {task_id} content modification rejected: "
-                f"Invalid content. Content preview: '{new_content[:50]}...'"
+                f"Invalid content. Content preview: '{new_content}'"
             )
             return False
 
@@ -1194,7 +1194,7 @@ class Workforce(BaseNode):
             task.result = "Task failed: Invalid or empty content provided"
             logger.warning(
                 f"Task {task.id} rejected: Invalid or empty content. "
-                f"Content preview: '{task.content[:50]}...'"
+                f"Content preview: '{task.content}'"
             )
             return task
 
@@ -1327,7 +1327,7 @@ class Workforce(BaseNode):
             task.result = "Task failed: Invalid or empty content provided"
             logger.warning(
                 f"Task {task.id} rejected: Invalid or empty content. "
-                f"Content preview: '{task.content[:50]}...'"
+                f"Content preview: '{task.content}'"
             )
             return task
 
@@ -1721,23 +1721,51 @@ class Workforce(BaseNode):
 
     def _get_child_nodes_info(self) -> str:
         r"""Get the information of all the child nodes under this node."""
-        info = ""
-        for child in self._children:
-            if isinstance(child, Workforce):
-                additional_info = "A Workforce node"
-            elif isinstance(child, SingleAgentWorker):
-                additional_info = "tools: " + (
-                    ", ".join(child.worker.tool_dict.keys())
-                )
-            elif isinstance(child, RolePlayingWorker):
-                additional_info = "A Role playing node"
+        return "".join(
+            f"<{child.node_id}>:<{child.description}>:<{self._get_node_info(child)}>\n"
+            for child in self._children
+        )
+
+    def _get_node_info(self, node) -> str:
+        r"""Get descriptive information for a specific node type."""
+        if isinstance(node, Workforce):
+            return "A Workforce node"
+        elif isinstance(node, SingleAgentWorker):
+            return self._get_single_agent_info(node)
+        elif isinstance(node, RolePlayingWorker):
+            return "A Role playing node"
+        else:
+            return "Unknown node"
+
+    def _get_single_agent_info(self, worker: 'SingleAgentWorker') -> str:
+        r"""Get formatted information for a SingleAgentWorker node."""
+        toolkit_tools = self._group_tools_by_toolkit(worker.worker.tool_dict)
+
+        if not toolkit_tools:
+            return "no tools available"
+
+        toolkit_info = []
+        for toolkit_name, tools in sorted(toolkit_tools.items()):
+            tools_str = ', '.join(sorted(tools))
+            toolkit_info.append(f"{toolkit_name}({tools_str})")
+
+        return " | ".join(toolkit_info)
+
+    def _group_tools_by_toolkit(self, tool_dict: dict) -> dict[str, list[str]]:
+        r"""Group tools by their parent toolkit class names."""
+        toolkit_tools: dict[str, list[str]] = {}
+
+        for tool_name, tool in tool_dict.items():
+            if hasattr(tool.func, '__self__'):
+                toolkit_name = tool.func.__self__.__class__.__name__
             else:
-                additional_info = "Unknown node"
-            info += (
-                f"<{child.node_id}>:<{child.description}>:<"
-                f"{additional_info}>\n"
-            )
-        return info
+                toolkit_name = "Standalone"
+
+            if toolkit_name not in toolkit_tools:
+                toolkit_tools[toolkit_name] = []
+            toolkit_tools[toolkit_name].append(tool_name)
+
+        return toolkit_tools
 
     def _get_valid_worker_ids(self) -> set:
         r"""Get all valid worker IDs from child nodes.
@@ -1853,7 +1881,7 @@ class Workforce(BaseNode):
                 logger.error(
                     f"JSON parsing error in task assignment: Invalid response "
                     f"format - {e}. Response content: "
-                    f"{response.msg.content[:50]}..."
+                    f"{response.msg.content}"
                 )
                 return TaskAssignResult(assignments=[])
 
@@ -1985,6 +2013,37 @@ class Workforce(BaseNode):
 
         return final_assignments
 
+    def _update_task_dependencies_from_assignments(
+        self, assignments: List[TaskAssignment], tasks: List[Task]
+    ) -> None:
+        r"""Update Task.dependencies with actual Task objects based on
+        assignments.
+
+        Args:
+            assignments (List[TaskAssignment]): The task assignments
+                containing dependency IDs.
+            tasks (List[Task]): The tasks that were assigned.
+        """
+        # Create a lookup map for all available tasks
+        all_tasks = {}
+        for task_list in [self._completed_tasks, self._pending_tasks, tasks]:
+            for task in task_list:
+                all_tasks[task.id] = task
+
+        # Update dependencies for each assigned task
+        for assignment in assignments:
+            if not assignment.dependencies:
+                continue
+
+            matching_tasks = [t for t in tasks if t.id == assignment.task_id]
+            if matching_tasks:
+                task = matching_tasks[0]
+                task.dependencies = [
+                    all_tasks[dep_id]
+                    for dep_id in assignment.dependencies
+                    if dep_id in all_tasks
+                ]
+
     async def _find_assignee(
         self,
         tasks: List[Task],
@@ -2021,19 +2080,24 @@ class Workforce(BaseNode):
 
         # if all assignments are valid and all tasks are assigned, return early
         if not invalid_assignments and not unassigned_tasks:
+            self._update_task_dependencies_from_assignments(
+                valid_assignments, tasks
+            )
             return TaskAssignResult(assignments=valid_assignments)
 
-        # handle retry and fallback for
-        # invalid assignments and unassigned tasks
-        all_problem_assignments = invalid_assignments
+        # handle retry and fallback for invalid assignments and unassigned
+        # tasks
         retry_and_fallback_assignments = (
             await self._handle_assignment_retry_and_fallback(
-                all_problem_assignments, tasks, valid_worker_ids
+                invalid_assignments, tasks, valid_worker_ids
             )
         )
-        valid_assignments.extend(retry_and_fallback_assignments)
+        all_assignments = valid_assignments + retry_and_fallback_assignments
+
+        # Update Task.dependencies for all final assignments
+        self._update_task_dependencies_from_assignments(all_assignments, tasks)
 
-        return TaskAssignResult(assignments=valid_assignments)
+        return TaskAssignResult(assignments=all_assignments)
 
     async def _post_task(self, task: Task, assignee_id: str) -> None:
         # Record the start time when a task is posted
@@ -2107,7 +2171,7 @@ class Workforce(BaseNode):
                 )
                 new_node_conf = WorkerConf(
                     description=f"Fallback worker for task: "
-                    f"{task.content[:50]}...",
+                    f"{task.content}",
                     role="General Assistant",
                     sys_msg="You are a general assistant that can help "
                     "with various tasks.",
@@ -2117,8 +2181,7 @@ class Workforce(BaseNode):
                     response.msg.content,
                     schema=WorkerConf,
                     fallback_values={
-                        "description": f"Worker for task: "
-                        f"{task.content[:50]}...",
+                        "description": f"Worker for task: " f"{task.content}",
                         "role": "Task Specialist",
                         "sys_msg": f"You are a specialist for: {task.content}",
                     },
@@ -2130,7 +2193,7 @@ class Workforce(BaseNode):
                     new_node_conf = WorkerConf(**result)
                 else:
                     new_node_conf = WorkerConf(
-                        description=f"Worker for task: {task.content[:50]}...",
+                        description=f"Worker for task: {task.content}",
                         role="Task Specialist",
                         sys_msg=f"You are a specialist for: {task.content}",
                     )
@@ -2147,7 +2210,7 @@ class Workforce(BaseNode):
                 # Create a fallback worker configuration
                 new_node_conf = WorkerConf(
                     description=f"Fallback worker for "
-                    f"task: {task.content[:50]}...",
+                    f"task: {task.content}",
                     role="General Assistant",
                     sys_msg="You are a general assistant that can help "
                     "with various tasks.",
@@ -2160,7 +2223,7 @@ class Workforce(BaseNode):
                     logger.error(
                         f"JSON parsing error in worker creation: Invalid "
                         f"response format - {e}. Response content: "
-                        f"{response.msg.content[:100]}..."
+                        f"{response.msg.content}"
                     )
                     raise RuntimeError(
                         f"Failed to create worker for task {task.id}: "
@@ -2364,7 +2427,7 @@ class Workforce(BaseNode):
                 f"Task {task.id} has exceeded maximum retry attempts "
                 f"({MAX_TASK_RETRIES}). Final failure "
                 f"reason: {detailed_error}. "
-                f"Task content: '{task.content[:100]}...'"
+                f"Task content: '{task.content}'"
             )
             self._cleanup_task_tracking(task.id)
             # Mark task as completed for dependency tracking before halting
@@ -2793,7 +2856,7 @@ class Workforce(BaseNode):
                     # useful results
                     if is_task_result_insufficient(returned_task):
                         result_preview = (
-                            returned_task.result[:100] + "..."
+                            returned_task.result
                             if returned_task.result
                             else "No result"
                         )

{camel_ai-0.2.71a11 → camel_ai-0.2.72a0}/camel/tasks/task.py

@@ -99,7 +99,7 @@ def validate_task_content(
         logger.warning(
             f"Task {task_id}: Content too short ({len(stripped_content)} "
             f"chars < {min_length} minimum). Content preview: "
-            f"'{stripped_content[:50]}...'"
+            f"'{stripped_content}'"
         )
         return False
 
@@ -124,7 +124,7 @@ def validate_task_content(
         if any(indicator in content_lower for indicator in failure_indicators):
             logger.warning(
                 f"Task {task_id}: Failure indicator detected in result. "
-                f"Content preview: '{stripped_content[:100]}...'"
+                f"Content preview: '{stripped_content}'"
             )
             return False
 
@@ -132,7 +132,7 @@ def validate_task_content(
         if content_lower.startswith(("error", "failed", "cannot", "unable")):
             logger.warning(
                 f"Task {task_id}: Error/refusal pattern detected at start. "
-                f"Content preview: '{stripped_content[:100]}...'"
+                f"Content preview: '{stripped_content}'"
             )
             return False
 
@@ -195,7 +195,7 @@ def parse_response(
             logger.warning(
                 f"Skipping invalid subtask {task_id}.{i} "
                 f"during decomposition: "
-                f"Content '{stripped_content[:50]}...' failed validation"
+                f"Content '{stripped_content}' failed validation"
             )
     return tasks
 
@@ -233,6 +233,8 @@ class Task(BaseModel):
             (default: :obj:`0`)
         assigned_worker_id (Optional[str]): The ID of the worker assigned to
             this task. (default: :obj:`None`)
+        dependencies (List[Task]): The dependencies for the task.
+            (default: :obj:`[]`)
         additional_info (Optional[Dict[str, Any]]): Additional information for
             the task. (default: :obj:`None`)
         image_list (Optional[List[Image.Image]]): Optional list of PIL Image
@@ -265,6 +267,8 @@ class Task(BaseModel):
 
     assigned_worker_id: Optional[str] = None
 
+    dependencies: List["Task"] = []
+
     additional_info: Optional[Dict[str, Any]] = None
 
     image_list: Optional[List[Image.Image]] = None
@@ -530,7 +534,7 @@ class Task(BaseModel):
                 logger.warning(
                     f"Skipping invalid subtask {task_id}.{i} "
                     f"during streaming decomposition: "
-                    f"Content '{stripped_content[:50]}...' failed validation"
+                    f"Content '{stripped_content}' failed validation"
                 )
         return tasks