camel-ai 0.2.72a8__py3-none-any.whl → 0.2.73a0__py3-none-any.whl

camel/societies/workforce/prompts.py

@@ -206,8 +206,9 @@ TASK_DECOMPOSE_PROMPT = r"""You need to decompose the given task into subtasks a
     *   **DO NOT** use vague verbs like "analyze," "look into," or "research" without defining the output.
     *   **DO** specify the format and content of the output. For example, instead of "Analyze the attached report," write "Summarize the key findings of the attached report in a 3-bullet-point list." Instead of "Find contacts," write "Extract all names and email addresses from the document and return them as a JSON list of objects, where each object has a 'name' and 'email' key."
 
-3.  **Strategic Grouping for Sequential Work**:
-    *   If a series of steps must be done in order *and* can be handled by the same worker type, group them into a single subtask to maintain flow and minimize handoffs.
+3.  **Full Workflow Completion & Strategic Grouping**:
+    *   **Preserve the Entire Goal**: Ensure the decomposed subtasks collectively achieve the *entire* original task. Do not drop or ignore final steps like sending a message, submitting a form, or creating a file.
+    *   **Group Sequential Actions**: If a series of steps must be done in order *and* can be handled by the same worker type (e.g., read, think, reply), group them into a single, comprehensive subtask. This maintains workflow and ensures the final goal is met.
 
 4.  **Aggressive Parallelization**:
     *   **Across Different Worker Specializations**: If distinct phases of the overall task require different types of workers (e.g., research by a 'SearchAgent', then content creation by a 'DocumentAgent'), define these as separate subtasks.
@@ -316,6 +317,8 @@ Additional Info: {additional_info}
 2. **REPLAN**: Modify the task content to address the underlying issue
    - Use for: Unclear requirements, insufficient context, correctable errors
    - Provide: Modified task content that addresses the failure cause
+   - **CRITICAL**: The replanned task MUST be a clear, actionable
+     instruction for an AI agent, not a question or request for a human.
 
 3. **DECOMPOSE**: Break the task into smaller, more manageable subtasks
    - Use for: Complex tasks, capability mismatches, persistent failures
@@ -328,10 +331,13 @@ Additional Info: {additional_info}
 
 - **Connection/Network Errors**: Almost always choose RETRY
 - **Model Processing Errors**: Consider REPLAN if the task can be clarified, otherwise DECOMPOSE
-- **Capability Gaps**: Choose DECOMPOSE to break into simpler parts
+- **Capability Gaps**: Choose DECOMPOSE to break into simpler parts. If a
+  replan can work, ensure the new task is a command for an agent, not a
+  request to a user.
 - **Ambiguous Requirements**: Choose REPLAN with clearer instructions
 - **High Failure Count**: Lean towards DECOMPOSE rather than repeated retries
-- **Deep Tasks (depth > 2)**: Prefer RETRY or REPLAN over further decomposition
+- **Deep Tasks (depth > 2)**: Prefer RETRY or REPLAN over further
+  decomposition
 
 **RESPONSE FORMAT:**
 You must return a valid JSON object with these fields:

camel/societies/workforce/single_agent_worker.py

@@ -410,11 +410,13 @@ class SingleAgentWorker(Worker):
             f"{getattr(worker_agent, 'agent_id', worker_agent.role_name)} "
             f"(from pool/clone of "
             f"{getattr(self.worker, 'agent_id', self.worker.role_name)}) "
-            f"to process task {task.content}",
-            "response_content": response_content,
-            "tool_calls": final_response.info.get("tool_calls")
-            if isinstance(response, AsyncStreamingChatAgentResponse)
-            else response.info.get("tool_calls"),
+            f"to process task: {task.content}",
+            "response_content": response_content[:50],
+            "tool_calls": str(
+                final_response.info.get("tool_calls")
+                if isinstance(response, AsyncStreamingChatAgentResponse)
+                else response.info.get("tool_calls")
+            )[:50],
             "total_tokens": total_tokens,
         }
 

camel/toolkits/__init__.py

@@ -31,7 +31,7 @@ from .meshy_toolkit import MeshyToolkit
 from .openbb_toolkit import OpenBBToolkit
 from .bohrium_toolkit import BohriumToolkit
 
-from .base import BaseToolkit
+from .base import BaseToolkit, RegisteredAgentToolkit
 from .google_maps_toolkit import GoogleMapsToolkit
 from .code_execution import CodeExecutionToolkit
 from .github_toolkit import GithubToolkit
@@ -87,6 +87,7 @@ from .note_taking_toolkit import NoteTakingToolkit
 from .message_agent_toolkit import AgentCommunicationToolkit
 from .web_deploy_toolkit import WebDeployToolkit
 from .screenshot_toolkit import ScreenshotToolkit
+from .message_integration import ToolkitMessageIntegration
 
 __all__ = [
     'BaseToolkit',
@@ -162,4 +163,6 @@ __all__ = [
     'AgentCommunicationToolkit',
     'WebDeployToolkit',
     'ScreenshotToolkit',
+    'RegisteredAgentToolkit',
+    'ToolkitMessageIntegration',
 ]

camel/toolkits/base.py

@@ -12,11 +12,18 @@
 # limitations under the License.
 # ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
 
-from typing import List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional
 
+from camel.logger import get_logger
 from camel.toolkits import FunctionTool
 from camel.utils import AgentOpsMeta, with_timeout
 
+if TYPE_CHECKING:
+    from camel.agents import ChatAgent
+
+
+logger = get_logger(__name__)
+
 
 class BaseToolkit(metaclass=AgentOpsMeta):
     r"""Base class for toolkits.
@@ -63,3 +70,52 @@ class BaseToolkit(metaclass=AgentOpsMeta):
                 the MCP server in.
         """
         self.mcp.run(mode)
+
+
+class RegisteredAgentToolkit:
+    r"""Mixin class for toolkits that need to register a ChatAgent.
+
+    This mixin provides a standard interface for toolkits that require
+    a reference to a ChatAgent instance. The ChatAgent will check if a
+    toolkit has this mixin and automatically register itself.
+    """
+
+    def __init__(self):
+        self._agent: Optional["ChatAgent"] = None
+
+    @property
+    def agent(self) -> Optional["ChatAgent"]:
+        r"""Get the registered ChatAgent instance.
+
+        Returns:
+            Optional[ChatAgent]: The registered agent, or None if not
+                registered.
+
+        Note:
+            If None is returned, it means the toolkit has not been registered
+            with a ChatAgent yet. Make sure to pass this toolkit to a ChatAgent
+            via the toolkits parameter during initialization.
+        """
+        if self._agent is None:
+            logger.warning(
+                f"{self.__class__.__name__} does not have a "
+                f"registered ChatAgent. "
+                f"Please ensure this toolkit is passed to a ChatAgent via the "
+                f"'toolkits_to_register_agent' parameter during ChatAgent "
+                f"initialization if you want to use the tools that require a "
+                f"registered agent."
+            )
+        return self._agent
+
+    def register_agent(self, agent: "ChatAgent") -> None:
+        r"""Register a ChatAgent with this toolkit.
+
+        This method allows registering an agent after initialization. The
+        ChatAgent will automatically call this method if the toolkit to
+        register inherits from RegisteredAgentToolkit.
+
+        Args:
+            agent (ChatAgent): The ChatAgent instance to register.
+        """
+        self._agent = agent
+        logger.info(f"Agent registered with {self.__class__.__name__}")