Merge branch 'master' into change-workflow-folder-structure

Author: fengju0213

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -26,7 +26,7 @@ body:
     attributes:
       label: What version of camel are you using?
       description: Run command `python3 -c 'print(__import__("camel").__version__)'` in your shell and paste the output here.
-      placeholder: E.g., 0.2.79
+      placeholder: E.g., 0.2.80a3
     validations:
       required: true
 

camel/__init__.py

@@ -14,7 +14,7 @@
 
 from camel.logger import disable_logging, enable_logging, set_log_level
 
-__version__ = '0.2.79'
+__version__ = '0.2.80a3'
 
 __all__ = [
     '__version__',

camel/agents/_types.py

@@ -27,6 +27,7 @@ class ToolCallRequest(BaseModel):
     tool_name: str
     args: Dict[str, Any]
     tool_call_id: str
+    extra_content: Optional[Dict[str, Any]] = None
 
 
 class ModelResponse(BaseModel):

camel/agents/chat_agent.py

@@ -96,13 +96,12 @@ class DeepSeekConfig(BaseConfig):
     tool_choice: Optional[Union[dict[str, str], str]] = None
     logprobs: Optional[bool] = None
     top_logprobs: Optional[int] = None
+    stream_options: Optional[dict[str, bool]] = None
 
     def __init__(self, include_usage: bool = True, **kwargs):
+        if kwargs.get("stream") and "stream_options" not in kwargs:
+            kwargs["stream_options"] = {"include_usage": include_usage}
         super().__init__(**kwargs)
-        # Only set stream_options when stream is True
-        # Otherwise, it will raise error when calling the API
-        if self.stream:
-            self.stream_options = {"include_usage": include_usage}
 
 
 DEEPSEEK_API_PARAMS = {param for param in DeepSeekConfig.model_fields.keys()}

camel/configs/deepseek_config.py

@@ -71,8 +71,10 @@ class BaseMessage:
             images associated with the message. (default: :obj:`auto`)
         video_detail (Literal["auto", "low", "high"]): Detail level of the
             videos associated with the message. (default: :obj:`auto`)
-        parsed: Optional[Union[Type[BaseModel], dict]]: Optional object which
+        parsed (Optional[Union[Type[BaseModel], dict]]): Optional object which
             is parsed from the content. (default: :obj:`None`)
+        reasoning_content (Optional[str]): Optional reasoning trace associated
+            with the message. (default: :obj:`None`)
     """
 
     role_name: str
@@ -85,6 +87,7 @@ class BaseMessage:
     image_detail: Literal["auto", "low", "high"] = "auto"
     video_detail: Literal["auto", "low", "high"] = "auto"
     parsed: Optional[Union[BaseModel, dict]] = None
+    reasoning_content: Optional[str] = None
 
     @classmethod
     def make_user_message(
@@ -219,6 +222,12 @@ def create_new_instance(self, content: str) -> "BaseMessage":
             role_type=self.role_type,
             meta_dict=self.meta_dict,
             content=content,
+            video_bytes=self.video_bytes,
+            image_list=self.image_list,
+            image_detail=self.image_detail,
+            video_detail=self.video_detail,
+            parsed=self.parsed,
+            reasoning_content=self.reasoning_content,
         )
 
     def __add__(self, other: Any) -> Union["BaseMessage", Any]:

camel/messages/base.py

@@ -50,13 +50,17 @@ class FunctionCallingMessage(BaseMessage):
         mask_output (Optional[bool]): Whether to return a sanitized placeholder
             instead of the raw tool output.
             (default: :obj:`False`)
+        extra_content (Optional[Dict[str, Any]]): Additional content
+            associated with the tool call.
+            (default: :obj:`None`)
     """
 
     func_name: Optional[str] = None
     args: Optional[Dict] = None
     result: Optional[Any] = None
     tool_call_id: Optional[str] = None
     mask_output: Optional[bool] = False
+    extra_content: Optional[Dict[str, Any]] = None
 
     def to_openai_message(
         self,
@@ -131,19 +135,23 @@ def to_openai_assistant_message(self) -> OpenAIAssistantMessage:
                 " due to missing function name or arguments."
             )
 
+        tool_call = {
+            "id": self.tool_call_id or "null",
+            "type": "function",
+            "function": {
+                "name": self.func_name,
+                "arguments": json.dumps(self.args, ensure_ascii=False),
+            },
+        }
+
+        # Include extra_content if available
+        if self.extra_content is not None:
+            tool_call["extra_content"] = self.extra_content
+
         return {
             "role": "assistant",
             "content": self.content or "",
-            "tool_calls": [
-                {
-                    "id": self.tool_call_id or "null",
-                    "type": "function",
-                    "function": {
-                        "name": self.func_name,
-                        "arguments": json.dumps(self.args, ensure_ascii=False),
-                    },
-                }
-            ],
+            "tool_calls": [tool_call],  # type: ignore[list-item]
         }
 
     def to_openai_tool_message(self) -> OpenAIToolMessageParam:
@@ -187,4 +195,6 @@ def to_dict(self) -> Dict:
         if self.tool_call_id is not None:
             base["tool_call_id"] = self.tool_call_id
         base["mask_output"] = self.mask_output
+        if self.extra_content is not None:
+            base["extra_content"] = self.extra_content
         return base

camel/messages/func_message.py

@@ -16,6 +16,8 @@
 from abc import ABC, abstractmethod
 from typing import Any, Optional
 
+from camel.utils import Constants
+
 
 class BaseAudioModel(ABC):
     r"""Base class for audio models providing Text-to-Speech (TTS) and
@@ -26,7 +28,7 @@ def __init__(
         self,
         api_key: Optional[str] = None,
         url: Optional[str] = None,
-        timeout: Optional[float] = None,
+        timeout: Optional[float] = Constants.TIMEOUT_THRESHOLD,
     ) -> None:
         r"""Initialize an instance of BaseAudioModel.
 

camel/models/base_audio_model.py

@@ -33,7 +33,7 @@
     ParsedChatCompletion,
     UnifiedModelType,
 )
-from camel.utils import BaseTokenCounter
+from camel.utils import BaseTokenCounter, Constants
 
 if os.environ.get("TRACEROOT_ENABLED", "False").lower() == "true":
     try:
@@ -103,7 +103,7 @@ def __init__(
         api_key: Optional[str] = None,
         url: Optional[str] = None,
         token_counter: Optional[BaseTokenCounter] = None,
-        timeout: Optional[float] = None,
+        timeout: Optional[float] = Constants.TIMEOUT_THRESHOLD,
         max_retries: int = 3,
     ) -> None:
         self.model_type: UnifiedModelType = UnifiedModelType(model_type)

camel/models/base_model.py

@@ -165,44 +165,6 @@ def _prepare_request(
 
         return request_config
 
-    def _post_handle_response(
-        self, response: ChatCompletion
-    ) -> ChatCompletion:
-        r"""Handle reasoning content with <think> tags at the beginning."""
-        if (
-            self.model_type in [ModelType.DEEPSEEK_REASONER]
-            and os.environ.get("GET_REASONING_CONTENT", "false").lower()
-            == "true"
-        ):
-            reasoning_content = response.choices[0].message.reasoning_content  # type: ignore[attr-defined]
-            combined_content = (  # type: ignore[operator]
-                f"<think>\n{reasoning_content}\n</think>\n"
-                if reasoning_content
-                else ""
-            ) + response.choices[0].message.content
-
-            response = ChatCompletion.construct(
-                id=response.id,
-                choices=[
-                    dict(
-                        index=response.choices[0].index,
-                        message={
-                            "role": response.choices[0].message.role,
-                            "content": combined_content,
-                            "tool_calls": None,
-                        },
-                        finish_reason=response.choices[0].finish_reason
-                        if response.choices[0].finish_reason
-                        else None,
-                    )
-                ],
-                created=response.created,
-                model=response.model,
-                object="chat.completion",
-                usage=response.usage,
-            )
-        return response
-
     @observe()
     def _run(
         self,
@@ -244,7 +206,7 @@ def _run(
             **request_config,
         )
 
-        return self._post_handle_response(response)
+        return response
 
     @observe()
     async def _arun(
@@ -286,4 +248,4 @@ async def _arun(
             **request_config,
         )
 
-        return self._post_handle_response(response)
+        return response