🐫 CAMEL: The first and the best multi-agent framework. Finding the Scaling Law of Agents. https://www.camel-ai.org
Python agentai-societiesartificial-intelligencecommunicative-aicooperative-aideep-learninglarge-language-modelsmulti-agent-systemsnatural-language-processing
chore: remove parallel_tool_calls when no tools specified (#3706)
Puzhen Zhang12034f9a1749
diff --git a/camel/models/azure_openai_model.py b/camel/models/azure_openai_model.pyindex 8baf3e436..c07e097e8 100644--- a/camel/models/azure_openai_model.py+++ b/camel/models/azure_openai_model.py@@ -11,7 +11,6 @@# See the License for the specific language governing permissions and# limitations under the License.# ========= Copyright 2023-2026 @ CAMEL-AI.org. All Rights Reserved. =========-import copyimport osimport warningsfrom typing import Any, Callable, Dict, List, Optional, Type, Union@@ -345,10 +344,7 @@ class AzureOpenAIModel(BaseModelBackend):messages: List[OpenAIMessage],tools: Optional[List[Dict[str, Any]]] = None,) -> Union[ChatCompletion, Stream[ChatCompletionChunk]]:- request_config = self.model_config_dict.copy()-- if tools:- request_config["tools"] = tools+ request_config = self._prepare_request_config(tools)return self._client.chat.completions.create(messages=messages,@@ -361,10 +357,7 @@ class AzureOpenAIModel(BaseModelBackend):messages: List[OpenAIMessage],tools: Optional[List[Dict[str, Any]]] = None,) -> Union[ChatCompletion, AsyncStream[ChatCompletionChunk]]:- request_config = self.model_config_dict.copy()-- if tools:- request_config["tools"] = tools+ request_config = self._prepare_request_config(tools)return await self._async_client.chat.completions.create(messages=messages,@@ -378,14 +371,11 @@ class AzureOpenAIModel(BaseModelBackend):response_format: Type[BaseModel],tools: Optional[List[Dict[str, Any]]] = None,) -> ChatCompletion:- request_config = copy.deepcopy(self.model_config_dict)-+ request_config = self._prepare_request_config(tools)request_config["response_format"] = response_format# Remove stream from request config since OpenAI does not support it# with structured responserequest_config.pop("stream", None)- if tools is not None:- request_config["tools"] = toolsreturn self._client.beta.chat.completions.parse(messages=messages,@@ -399,14 +389,11 @@ class AzureOpenAIModel(BaseModelBackend):response_format: Type[BaseModel],tools: Optional[List[Dict[str, Any]]] = None,) -> ChatCompletion:- request_config = copy.deepcopy(self.model_config_dict)-+ request_config = self._prepare_request_config(tools)request_config["response_format"] = response_format# Remove stream from request config since OpenAI does not support it# with structured responserequest_config.pop("stream", None)- if tools is not None:- request_config["tools"] = toolsreturn await self._async_client.beta.chat.completions.parse(messages=messages,@@ -424,15 +411,10 @@ class AzureOpenAIModel(BaseModelBackend):Note: This uses OpenAI's beta streaming API for structured outputs."""-- request_config = copy.deepcopy(self.model_config_dict)-+ request_config = self._prepare_request_config(tools)# Remove stream from config as it's handled by the stream methodrequest_config.pop("stream", None)- if tools is not None:- request_config["tools"] = tools-# Use the beta streaming API for structured outputsreturn self._client.beta.chat.completions.stream(messages=messages,@@ -451,15 +433,10 @@ class AzureOpenAIModel(BaseModelBackend):Note: This uses OpenAI's beta streaming API for structured outputs."""-- request_config = copy.deepcopy(self.model_config_dict)-+ request_config = self._prepare_request_config(tools)# Remove stream from config as it's handled by the stream methodrequest_config.pop("stream", None)- if tools is not None:- request_config["tools"] = tools-# Use the beta streaming API for structured outputsreturn self._async_client.beta.chat.completions.stream(messages=messages,diff --git a/camel/models/base_model.py b/camel/models/base_model.pyindex 0b07762a7..2fde05805 100644--- a/camel/models/base_model.py+++ b/camel/models/base_model.py@@ -274,6 +274,36 @@ class BaseModelBackend(ABC, metaclass=ModelBackendMeta):"""pass+ def _prepare_request_config(+ self,+ tools: Optional[List[Dict[str, Any]]] = None,+ ) -> Dict[str, Any]:+ r"""Prepare the request configuration dictionary.++ Creates a deep copy of the model config and handles tool-related+ parameters. If no tools are specified, removes parallel_tool_calls+ as OpenAI API only allows it when tools are present.++ Args:+ tools (Optional[List[Dict[str, Any]]]): The tools to include+ in the request. (default: :obj:`None`)++ Returns:+ Dict[str, Any]: The prepared request configuration.+ """+ import copy++ request_config = copy.deepcopy(self.model_config_dict)++ if tools:+ request_config["tools"] = tools+ else:+ # Remove parallel_tool_calls if no tools are specified+ # as OpenAI API only allows it when tools are present+ request_config.pop("parallel_tool_calls", None)++ return request_config+def preprocess_messages(self, messages: List[OpenAIMessage]) -> List[OpenAIMessage]:diff --git a/camel/models/openai_compatible_model.py b/camel/models/openai_compatible_model.pyindex 552d9897b..7bc05f8d4 100644--- a/camel/models/openai_compatible_model.py+++ b/camel/models/openai_compatible_model.py@@ -279,10 +279,7 @@ class OpenAICompatibleModel(BaseModelBackend):messages: List[OpenAIMessage],tools: Optional[List[Dict[str, Any]]] = None,) -> Union[ChatCompletion, Stream[ChatCompletionChunk]]:- request_config = self.model_config_dict.copy()-- if tools:- request_config["tools"] = tools+ request_config = self._prepare_request_config(tools)return self._client.chat.completions.create(messages=messages,@@ -295,10 +292,7 @@ class OpenAICompatibleModel(BaseModelBackend):messages: List[OpenAIMessage],tools: Optional[List[Dict[str, Any]]] = None,) -> Union[ChatCompletion, AsyncStream[ChatCompletionChunk]]:- request_config = self.model_config_dict.copy()-- if tools:- request_config["tools"] = tools+ request_config = self._prepare_request_config(tools)return await self._async_client.chat.completions.create(messages=messages,@@ -312,15 +306,11 @@ class OpenAICompatibleModel(BaseModelBackend):response_format: Type[BaseModel],tools: Optional[List[Dict[str, Any]]] = None,) -> ChatCompletion:- import copy-- request_config = copy.deepcopy(self.model_config_dict)+ request_config = self._prepare_request_config(tools)# Remove stream from request_config since OpenAI does not support it# when structured response is usedrequest_config["response_format"] = response_formatrequest_config.pop("stream", None)- if tools is not None:- request_config["tools"] = toolstry:return self._client.beta.chat.completions.parse(@@ -351,15 +341,11 @@ class OpenAICompatibleModel(BaseModelBackend):response_format: Type[BaseModel],tools: Optional[List[Dict[str, Any]]] = None,) -> ChatCompletion:- import copy-- request_config = copy.deepcopy(self.model_config_dict)+ request_config = self._prepare_request_config(tools)# Remove stream from request_config since OpenAI does not support it# when structured response is usedrequest_config["response_format"] = response_formatrequest_config.pop("stream", None)- if tools is not None:- request_config["tools"] = toolstry:return await self._async_client.beta.chat.completions.parse(@@ -394,16 +380,10 @@ class OpenAICompatibleModel(BaseModelBackend):Note: This uses OpenAI's beta streaming API for structured outputs."""- import copy-- request_config = copy.deepcopy(self.model_config_dict)-+ request_config = self._prepare_request_config(tools)# Remove stream from config as it's handled by the stream methodrequest_config.pop("stream", None)- if tools is not None:- request_config["tools"] = tools-# Use the beta streaming API for structured outputsreturn self._client.beta.chat.completions.stream(messages=messages,@@ -422,16 +402,10 @@ class OpenAICompatibleModel(BaseModelBackend):Note: This uses OpenAI's beta streaming API for structured outputs."""- import copy-- request_config = copy.deepcopy(self.model_config_dict)-+ request_config = self._prepare_request_config(tools)# Remove stream from config as it's handled by the stream methodrequest_config.pop("stream", None)- if tools is not None:- request_config["tools"] = tools-# Use the beta streaming API for structured outputsreturn self._async_client.beta.chat.completions.stream(messages=messages,diff --git a/camel/models/openai_model.py b/camel/models/openai_model.pyindex 063e55bd0..5c24039a1 100644--- a/camel/models/openai_model.py+++ b/camel/models/openai_model.py@@ -381,13 +381,7 @@ class OpenAIModel(BaseModelBackend):messages: List[OpenAIMessage],tools: Optional[List[Dict[str, Any]]] = None,) -> Union[ChatCompletion, Stream[ChatCompletionChunk]]:- import copy-- request_config = copy.deepcopy(self.model_config_dict)-- if tools:- request_config["tools"] = tools-+ request_config = self._prepare_request_config(tools)request_config = self._sanitize_config(request_config)return self._client.chat.completions.create(@@ -401,13 +395,7 @@ class OpenAIModel(BaseModelBackend):messages: List[OpenAIMessage],tools: Optional[List[Dict[str, Any]]] = None,) -> Union[ChatCompletion, AsyncStream[ChatCompletionChunk]]:- import copy-- request_config = copy.deepcopy(self.model_config_dict)-- if tools:- request_config["tools"] = tools-+ request_config = self._prepare_request_config(tools)request_config = self._sanitize_config(request_config)return await self._async_client.chat.completions.create(@@ -422,17 +410,11 @@ class OpenAIModel(BaseModelBackend):response_format: Type[BaseModel],tools: Optional[List[Dict[str, Any]]] = None,) -> ChatCompletion:- import copy-- request_config = copy.deepcopy(self.model_config_dict)-+ request_config = self._prepare_request_config(tools)request_config["response_format"] = response_format# Remove stream from request config since OpenAI does not support it# with structured responserequest_config.pop("stream", None)- if tools is not None:- request_config["tools"] = tools-request_config = self._sanitize_config(request_config)return self._client.beta.chat.completions.parse(@@ -447,17 +429,11 @@ class OpenAIModel(BaseModelBackend):response_format: Type[BaseModel],tools: Optional[List[Dict[str, Any]]] = None,) -> ChatCompletion:- import copy-- request_config = copy.deepcopy(self.model_config_dict)-+ request_config = self._prepare_request_config(tools)request_config["response_format"] = response_format# Remove stream from request config since OpenAI does not support it# with structured responserequest_config.pop("stream", None)- if tools is not None:- request_config["tools"] = tools-request_config = self._sanitize_config(request_config)return await self._async_client.beta.chat.completions.parse(@@ -476,16 +452,9 @@ class OpenAIModel(BaseModelBackend):Note: This uses OpenAI's beta streaming API for structured outputs."""- import copy-- request_config = copy.deepcopy(self.model_config_dict)-+ request_config = self._prepare_request_config(tools)# Remove stream from config as it's handled by the stream methodrequest_config.pop("stream", None)-- if tools is not None:- request_config["tools"] = tools-request_config = self._sanitize_config(request_config)# Use the beta streaming API for structured outputs@@ -506,16 +475,10 @@ class OpenAIModel(BaseModelBackend):Note: This uses OpenAI's beta streaming API for structured outputs."""- import copy-- request_config = copy.deepcopy(self.model_config_dict)-+ request_config = self._prepare_request_config(tools)# Remove stream from config as it's handled by the stream methodrequest_config.pop("stream", None)- if tools is not None:- request_config["tools"] = tools-request_config = self._sanitize_config(request_config)# Use the beta streaming API for structured outputs