camel-ai 0.2.75a6__py3-none-any.whl → 0.2.76__py3-none-any.whl

camel/agents/mcp_agent.py

@@ -15,16 +15,25 @@
 import asyncio
 import json
 import platform
-import re
-from typing import Any, Callable, Dict, List, Optional, Union, cast
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Dict,
+    List,
+    Optional,
+    Union,
+    cast,
+)
 
-from camel.agents import ChatAgent
+from camel.agents.chat_agent import ChatAgent
 from camel.logger import get_logger
 from camel.messages import BaseMessage
-from camel.models import BaseModelBackend, ModelFactory
+from camel.models.base_model import BaseModelBackend
+from camel.models.model_factory import ModelFactory
 from camel.prompts import TextPrompt
 from camel.responses import ChatAgentResponse
-from camel.toolkits import FunctionTool, MCPToolkit
+from camel.toolkits.function_tool import FunctionTool
 from camel.types import (
     BaseMCPRegistryConfig,
     MCPRegistryType,
@@ -33,6 +42,9 @@ from camel.types import (
     RoleType,
 )
 
+if TYPE_CHECKING:
+    from camel.toolkits.mcp_toolkit import MCPToolkit
+
 # AgentOps decorator setting
 try:
     import os
@@ -44,6 +56,8 @@ try:
 except (ImportError, AttributeError):
     from camel.utils import track_agent
 
+from camel.parsers.mcp_tool_call_parser import extract_tool_calls_from_text
+
 logger = get_logger(__name__)
 
 
@@ -168,8 +182,10 @@ class MCPAgent(ChatAgent):
             **kwargs,
         )
 
-    def _initialize_mcp_toolkit(self) -> MCPToolkit:
+    def _initialize_mcp_toolkit(self) -> "MCPToolkit":
         r"""Initialize the MCP toolkit from the provided configuration."""
+        from camel.toolkits.mcp_toolkit import MCPToolkit
+
         config_dict = {}
         for registry_config in self.registry_configs:
             config_dict.update(registry_config.get_config())
@@ -334,27 +350,14 @@ class MCPAgent(ChatAgent):
             task = f"## Task:\n  {input_message}"
             input_message = str(self._text_tools) + task
             response = await super().astep(input_message, *args, **kwargs)
-            content = response.msgs[0].content.lower()
-
-            tool_calls = []
-            while "```json" in content:
-                json_match = re.search(r'```json', content)
-                if not json_match:
-                    break
-                json_start = json_match.span()[1]
-
-                end_match = re.search(r'```', content[json_start:])
-                if not end_match:
-                    break
-                json_end = end_match.span()[0] + json_start
-
-                tool_json = content[json_start:json_end].strip('\n')
-                try:
-                    tool_calls.append(json.loads(tool_json))
-                except json.JSONDecodeError:
-                    logger.warning(f"Failed to parse JSON: {tool_json}")
-                    continue
-                content = content[json_end:]
+            raw_content = response.msgs[0].content if response.msgs else ""
+            content = (
+                raw_content
+                if isinstance(raw_content, str)
+                else str(raw_content)
+            )
+
+            tool_calls = extract_tool_calls_from_text(content)
 
             if not tool_calls:
                 return response

camel/configs/__init__.py

@@ -12,10 +12,12 @@
 # limitations under the License.
 # ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
 from .aiml_config import AIML_API_PARAMS, AIMLConfig
+from .amd_config import AMD_API_PARAMS, AMDConfig
 from .anthropic_config import ANTHROPIC_API_PARAMS, AnthropicConfig
 from .base_config import BaseConfig
 from .bedrock_config import BEDROCK_API_PARAMS, BedrockConfig
 from .cohere_config import COHERE_API_PARAMS, CohereConfig
+from .cometapi_config import COMETAPI_API_PARAMS, CometAPIConfig
 from .crynux_config import CRYNUX_API_PARAMS, CrynuxConfig
 from .deepseek_config import DEEPSEEK_API_PARAMS, DeepSeekConfig
 from .gemini_config import Gemini_API_PARAMS, GeminiConfig
@@ -89,6 +91,8 @@ __all__ = [
     'TOGETHERAI_API_PARAMS',
     'CohereConfig',
     'COHERE_API_PARAMS',
+    'CometAPIConfig',
+    'COMETAPI_API_PARAMS',
     'YiConfig',
     'YI_API_PARAMS',
     'QwenConfig',
@@ -111,6 +115,8 @@ __all__ = [
     'SILICONFLOW_API_PARAMS',
     'AIMLConfig',
     'AIML_API_PARAMS',
+    'AMDConfig',
+    'AMD_API_PARAMS',
     'OpenRouterConfig',
     'OPENROUTER_API_PARAMS',
     'LMSTUDIO_API_PARAMS',

camel/configs/amd_config.py

@@ -0,0 +1,70 @@
+# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+from __future__ import annotations
+
+from typing import List, Optional, Union
+
+from pydantic import Field
+
+from camel.configs.base_config import BaseConfig
+from camel.types import NotGiven
+
+
+class AMDConfig(BaseConfig):
+    r"""Configuration class for AMD API models.
+
+    This class defines the configuration parameters for AMD's language
+    models, including temperature, sampling parameters, and response format
+    settings.
+
+    Args:
+        stream (bool, optional): Whether to stream the response.
+            (default: :obj:`None`)
+        temperature (float, optional): Controls randomness in the response.
+            Higher values make output more random, lower values make it more
+            deterministic. Range: [0.0, 2.0]. (default: :obj:`None`)
+        top_p (float, optional): Controls diversity via nucleus sampling.
+            Range: [0.0, 1.0]. (default: :obj:`None`)
+        presence_penalty (float, optional): Penalizes new tokens based on
+            whether they appear in the text so far. Range: [-2.0, 2.0].
+            (default: :obj:`None`)
+        frequency_penalty (float, optional): Penalizes new tokens based on
+            their frequency in the text so far. Range: [-2.0, 2.0].
+            (default: :obj:`None`)
+        max_tokens (Union[int, NotGiven], optional): Maximum number of tokens
+            to generate. If not provided, model will use its default maximum.
+            (default: :obj:`None`)
+        seed (Optional[int], optional): Random seed for deterministic sampling.
+            (default: :obj:`None`)
+        tools (Optional[List[Dict]], optional): List of tools available to the
+            model. This includes tools such as a text editor, a calculator, or
+            a search engine. (default: :obj:`None`)
+        tool_choice (Optional[str], optional): Tool choice configuration.
+            (default: :obj:`None`)
+        stop (Optional[List[str]], optional): List of stop sequences.
+            (default: :obj:`None`)
+    """
+
+    stream: Optional[bool] = Field(default=None)
+    temperature: Optional[float] = Field(default=None)
+    top_p: Optional[float] = Field(default=None)
+    presence_penalty: Optional[float] = Field(default=None)
+    frequency_penalty: Optional[float] = Field(default=None)
+    max_tokens: Optional[Union[int, NotGiven]] = Field(default=None)
+    seed: Optional[int] = Field(default=None)
+    tool_choice: Optional[str] = Field(default=None)
+    stop: Optional[List[str]] = Field(default=None)
+
+
+AMD_API_PARAMS = {param for param in AMDConfig.model_fields.keys()}

camel/configs/cometapi_config.py

@@ -0,0 +1,104 @@
+# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+from __future__ import annotations
+
+from typing import Optional, Sequence, Union
+
+from camel.configs.base_config import BaseConfig
+
+
+class CometAPIConfig(BaseConfig):
+    r"""Defines the parameters for generating chat completions using CometAPI's
+    OpenAI-compatible interface.
+
+    Reference: https://api.cometapi.com/v1/
+
+    Args:
+        temperature (float, optional): Sampling temperature to use, between
+            :obj:`0` and :obj:`2`. Higher values make the output more random,
+            while lower values make it more focused and deterministic.
+            (default: :obj:`None`)
+        top_p (float, optional): An alternative to sampling with temperature,
+            called nucleus sampling, where the model considers the results of
+            the tokens with top_p probability mass. So :obj:`0.1` means only
+            the tokens comprising the top 10% probability mass are considered.
+            (default: :obj:`None`)
+        n (int, optional): How many chat completion choices to generate for
+            each input message. (default: :obj:`None`)
+        response_format (object, optional): An object specifying the format
+            that the model must output. Compatible with GPT-4 Turbo and all
+            GPT-3.5 Turbo models newer than gpt-3.5-turbo-1106. Setting to
+            {"type": "json_object"} enables JSON mode, which guarantees the
+            message the model generates is valid JSON. Important: when using
+            JSON mode, you must also instruct the model to produce JSON
+            yourself via a system or user message. Without this, the model
+            may generate an unending stream of whitespace until the generation
+            reaches the token limit, resulting in a long-running and seemingly
+            "stuck" request. Also note that the message content may be
+            partially cut off if finish_reason="length", which indicates the
+            generation exceeded max_tokens or the conversation exceeded the
+            max context length.
+        stream (bool, optional): If True, partial message deltas will be sent
+            as data-only server-sent events as they become available.
+            (default: :obj:`None`)
+        stop (str or list, optional): Up to :obj:`4` sequences where the API
+            will stop generating further tokens. (default: :obj:`None`)
+        max_tokens (int, optional): The maximum number of tokens to generate
+            in the chat completion. The total length of input tokens and
+            generated tokens is limited by the model's context length.
+            (default: :obj:`None`)
+        presence_penalty (float, optional): Number between :obj:`-2.0` and
+            :obj:`2.0`. Positive values penalize new tokens based on whether
+            they appear in the text so far, increasing the model's likelihood
+            to talk about new topics. See more information about frequency and
+            presence penalties. (default: :obj:`None`)
+        frequency_penalty (float, optional): Number between :obj:`-2.0` and
+            :obj:`2.0`. Positive values penalize new tokens based on their
+            existing frequency in the text so far, decreasing the model's
+            likelihood to repeat the same line verbatim. See more information
+            about frequency and presence penalties. (default: :obj:`None`)
+        user (str, optional): A unique identifier representing your end-user,
+            which can help CometAPI to monitor and detect abuse.
+            (default: :obj:`None`)
+        tools (list[FunctionTool], optional): A list of tools the model may
+            call. Currently, only functions are supported as a tool. Use this
+            to provide a list of functions the model may generate JSON inputs
+            for. A max of 128 functions are supported.
+        tool_choice (Union[dict[str, str], str], optional): Controls which (if
+            any) tool is called by the model. :obj:`"none"` means the model
+            will not call any tool and instead generates a message.
+            :obj:`"auto"` means the model can pick between generating a
+            message or calling one or more tools.  :obj:`"required"` means the
+            model must call one or more tools. Specifying a particular tool
+            via {"type": "function", "function": {"name": "my_function"}}
+            forces the model to call that tool. :obj:`"none"` is the default
+            when no tools are present. :obj:`"auto"` is the default if tools
+            are present.
+    """
+
+    temperature: Optional[float] = None
+    top_p: Optional[float] = None
+    n: Optional[int] = None
+    stream: Optional[bool] = None
+    stop: Optional[Union[str, Sequence[str]]] = None
+    max_tokens: Optional[int] = None
+    presence_penalty: Optional[float] = None
+    response_format: Optional[dict] = None
+    frequency_penalty: Optional[float] = None
+    user: Optional[str] = None
+    tools: Optional[list] = None
+    tool_choice: Optional[Union[dict[str, str], str]] = None
+
+
+COMETAPI_API_PARAMS = {param for param in CometAPIConfig.model_fields.keys()}

camel/data_collectors/alpaca_collector.py

@@ -70,16 +70,25 @@ class AlpacaDataCollector(BaseDataCollector):
         if not history:
             raise ValueError("No data collected.")
 
-        # Validate and process history
-        if len(history) == 3 and history[0].role == "system":
-            history = history[1:]  # Ignore the system message.
-        elif len(history) != 2:
+        # Filter out system and tool-related messages
+        # Keep only user and final assistant messages
+        filtered_history = []
+        for msg in history:
+            if msg.role == "user":
+                filtered_history.append(msg)
+            elif msg.role == "assistant" and msg.message:
+                # Keep assistant messages with actual content
+                # (skip empty ones that only contain tool calls)
+                filtered_history.append(msg)
+
+        # Validate filtered history
+        if len(filtered_history) != 2:
             raise ValueError(
                 f"AlpacaDataCollector only supports one message pair, but "
-                f"got {len(history)}"
+                f"got {len(filtered_history)} after filtering tool messages"
             )
 
-        input_message, output_message = history
+        input_message, output_message = filtered_history
         instruction = (
             self.system_message.content if self.system_message else ""
         ) + str(input_message.message)

camel/environments/tic_tac_toe.py

@@ -483,7 +483,7 @@ class TicTacToeEnv(MultiStepEnv):
         # Check all win combinations.
         for a, b, c in TicTacToeEnv.WIN_COMBINATIONS:
             if board[a] != " " and board[a] == board[b] == board[c]:
-                return board[a]
+                return board[a]  # type: ignore[return-value]
         # Check for draw.
         if all(cell != " " for cell in board):
             return "draw"

camel/interpreters/__init__.py

@@ -18,6 +18,7 @@ from .e2b_interpreter import E2BInterpreter
 from .internal_python_interpreter import InternalPythonInterpreter
 from .interpreter_error import InterpreterError
 from .ipython_interpreter import JupyterKernelInterpreter
+from .microsandbox_interpreter import MicrosandboxInterpreter
 from .subprocess_interpreter import SubprocessInterpreter
 
 __all__ = [
@@ -28,4 +29,5 @@ __all__ = [
     'DockerInterpreter',
     'JupyterKernelInterpreter',
     'E2BInterpreter',
+    'MicrosandboxInterpreter',
 ]

camel/interpreters/docker/Dockerfile

@@ -1,11 +1,8 @@
 # syntax=docker/dockerfile:1
-
 FROM ubuntu:22.04
 
-# Set environment variable to avoid interactive prompts
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Update and install base utilities
 RUN apt-get update && apt-get install -y \
     build-essential \
     software-properties-common \
@@ -20,7 +17,6 @@ RUN apt-get update && apt-get install -y \
     && apt-get clean \
     && apt-get autoremove -y
 
-# Install Python 3.10 and its dependencies
 RUN add-apt-repository ppa:deadsnakes/ppa && \
     apt-get update && \
     apt-get install -y \
@@ -34,32 +30,27 @@ RUN add-apt-repository ppa:deadsnakes/ppa && \
     && apt-get clean \
     && apt-get autoremove -y
 
-# Install R
 RUN apt-get update && \
     apt-get install -y r-base && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get clean && \
     apt-get autoremove -y
 
-# Install NodeJS 22.x
 RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
     apt-get install -y nodejs && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get clean && \
     apt-get autoremove -y
 
-# Install Poetry
 RUN curl -fsSL https://install.python-poetry.org | python3.10 - && \
     ln -s ~/.local/bin/poetry /usr/local/bin/poetry
 
-# Upgrade pip and install base Python packages
 RUN python3.10 -m pip install --upgrade pip setuptools wheel
-
-# Install uv using pip instead of the shell script
 RUN pip install uv
 
-# Setup working directory
+RUN groupadd -r devuser && useradd -r -m -g devuser devuser
 WORKDIR /workspace
+RUN chown -R devuser:devuser /workspace
+USER devuser
 
-# Set default shell
 CMD ["/bin/bash"]