Skip to content

armgit / camel

Public Imported from GitHub
0

🐫 CAMEL: The first and the best multi-agent framework. Finding the Scaling Law of Agents. https://www.camel-ai.org

feat: Model support flexible argument passing (#2650)

Wendong-Fan9e94782190a8
diff --git a/camel/models/aiml_model.py b/camel/models/aiml_model.py
index 91b48ce16..ff2a1b91e 100644
--- a/camel/models/aiml_model.py
+++ b/camel/models/aiml_model.py
@@ -46,6 +46,10 @@ class AIMLModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required([("api_key", "AIML_API_KEY")])
@@ -57,6 +61,8 @@ class AIMLModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = AIMLConfig().as_dict()
@@ -73,6 +79,8 @@ class AIMLModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def check_model_config(self):
diff --git a/camel/models/anthropic_model.py b/camel/models/anthropic_model.py
index c658284e1..1d6896f21 100644
--- a/camel/models/anthropic_model.py
+++ b/camel/models/anthropic_model.py
@@ -46,6 +46,10 @@ class AnthropicModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -62,6 +66,8 @@ class AnthropicModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = AnthropicConfig().as_dict()
@@ -79,6 +85,8 @@ class AnthropicModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
@property
diff --git a/camel/models/aws_bedrock_model.py b/camel/models/aws_bedrock_model.py
index 983a888b1..40f978418 100644
--- a/camel/models/aws_bedrock_model.py
+++ b/camel/models/aws_bedrock_model.py
@@ -50,6 +50,10 @@ class AWSBedrockModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
References:
https://docs.aws.amazon.com/bedrock/latest/APIReference/welcome.html
@@ -69,6 +73,8 @@ class AWSBedrockModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = BedrockConfig().as_dict()
@@ -84,6 +90,8 @@ class AWSBedrockModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
async def _arun(
diff --git a/camel/models/azure_openai_model.py b/camel/models/azure_openai_model.py
index c597f8a78..34dc9b447 100644
--- a/camel/models/azure_openai_model.py
+++ b/camel/models/azure_openai_model.py
@@ -76,7 +76,10 @@ class AzureOpenAIModel(BaseModelBackend):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
-
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
References:
https://learn.microsoft.com/en-us/azure/ai-services/openai/
@@ -94,6 +97,8 @@ class AzureOpenAIModel(BaseModelBackend):
azure_deployment_name: Optional[str] = None,
azure_ad_token_provider: Optional["AzureADTokenProvider"] = None,
azure_ad_token: Optional[str] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = ChatGPTConfig().as_dict()
@@ -135,7 +140,8 @@ class AzureOpenAIModel(BaseModelBackend):
azure_ad_token=self._azure_ad_token,
azure_ad_token_provider=self.azure_ad_token_provider,
timeout=self._timeout,
- max_retries=3,
+ max_retries=max_retries,
+ **kwargs,
)
self._async_client = LangfuseAsyncOpenAI(
azure_endpoint=str(self._url),
@@ -145,7 +151,8 @@ class AzureOpenAIModel(BaseModelBackend):
azure_ad_token=self._azure_ad_token,
azure_ad_token_provider=self.azure_ad_token_provider,
timeout=self._timeout,
- max_retries=3,
+ max_retries=max_retries,
+ **kwargs,
)
else:
self._client = AzureOpenAI(
@@ -156,7 +163,8 @@ class AzureOpenAIModel(BaseModelBackend):
azure_ad_token=self._azure_ad_token,
azure_ad_token_provider=self.azure_ad_token_provider,
timeout=self._timeout,
- max_retries=3,
+ max_retries=max_retries,
+ **kwargs,
)
self._async_client = AsyncAzureOpenAI(
@@ -167,7 +175,8 @@ class AzureOpenAIModel(BaseModelBackend):
azure_ad_token=self._azure_ad_token,
azure_ad_token_provider=self.azure_ad_token_provider,
timeout=self._timeout,
- max_retries=3,
+ max_retries=max_retries,
+ **kwargs,
)
@property
diff --git a/camel/models/base_model.py b/camel/models/base_model.py
index 55d1c7c79..d8615a8d0 100644
--- a/camel/models/base_model.py
+++ b/camel/models/base_model.py
@@ -71,6 +71,8 @@ class BaseModelBackend(ABC, metaclass=ModelBackendMeta):
:obj:`OpenAITokenCounter` will be used. (default: :obj:`None`)
timeout (Optional[float], optional): The timeout value in seconds for
API calls. (default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries
+ for API calls. (default: :obj:`3`)
"""
def __init__(
@@ -81,6 +83,7 @@ class BaseModelBackend(ABC, metaclass=ModelBackendMeta):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
) -> None:
self.model_type: UnifiedModelType = UnifiedModelType(model_type)
if model_config_dict is None:
@@ -90,6 +93,7 @@ class BaseModelBackend(ABC, metaclass=ModelBackendMeta):
self._url = url
self._token_counter = token_counter
self._timeout = timeout
+ self._max_retries = max_retries
self.check_model_config()
@property
diff --git a/camel/models/cohere_model.py b/camel/models/cohere_model.py
index 498a1219d..10cd4b397 100644
--- a/camel/models/cohere_model.py
+++ b/camel/models/cohere_model.py
@@ -76,6 +76,8 @@ class CohereModel(BaseModelBackend):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -91,6 +93,7 @@ class CohereModel(BaseModelBackend):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ **kwargs: Any,
):
import cohere
@@ -105,10 +108,14 @@ class CohereModel(BaseModelBackend):
model_type, model_config_dict, api_key, url, token_counter, timeout
)
self._client = cohere.ClientV2(
- timeout=self._timeout, api_key=self._api_key
+ timeout=self._timeout,
+ api_key=self._api_key,
+ **kwargs,
)
self._async_client = cohere.AsyncClientV2(
- timeout=self._timeout, api_key=self._api_key
+ timeout=self._timeout,
+ api_key=self._api_key,
+ **kwargs,
)
def _to_openai_response(self, response: 'ChatResponse') -> ChatCompletion:
diff --git a/camel/models/crynux_model.py b/camel/models/crynux_model.py
index 8dc52741c..f7d73bbd2 100644
--- a/camel/models/crynux_model.py
+++ b/camel/models/crynux_model.py
@@ -46,6 +46,10 @@ class CrynuxModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -61,6 +65,8 @@ class CrynuxModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = CrynuxConfig().as_dict()
@@ -76,6 +82,8 @@ class CrynuxModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def check_model_config(self):
diff --git a/camel/models/deepseek_model.py b/camel/models/deepseek_model.py
index 627db2f8f..c10b1d4d1 100644
--- a/camel/models/deepseek_model.py
+++ b/camel/models/deepseek_model.py
@@ -78,6 +78,10 @@ class DeepSeekModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
References:
https://api-docs.deepseek.com/
@@ -96,6 +100,8 @@ class DeepSeekModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = DeepSeekConfig().as_dict()
@@ -112,6 +118,8 @@ class DeepSeekModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def _prepare_request(
diff --git a/camel/models/gemini_model.py b/camel/models/gemini_model.py
index 500fb84cb..765824047 100644
--- a/camel/models/gemini_model.py
+++ b/camel/models/gemini_model.py
@@ -64,6 +64,10 @@ class GeminiModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -79,6 +83,8 @@ class GeminiModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = GeminiConfig().as_dict()
@@ -95,6 +101,8 @@ class GeminiModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def _process_messages(self, messages) -> List[OpenAIMessage]:
diff --git a/camel/models/groq_model.py b/camel/models/groq_model.py
index dca8fb482..74c561330 100644
--- a/camel/models/groq_model.py
+++ b/camel/models/groq_model.py
@@ -45,6 +45,10 @@ class GroqModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required([("api_key", "GROQ_API_KEY")])
@@ -56,6 +60,8 @@ class GroqModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = GroqConfig().as_dict()
@@ -71,6 +77,8 @@ class GroqModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def check_model_config(self):
diff --git a/camel/models/internlm_model.py b/camel/models/internlm_model.py
index 6ee2fd42a..033ae71f5 100644
--- a/camel/models/internlm_model.py
+++ b/camel/models/internlm_model.py
@@ -54,6 +54,10 @@ class InternLMModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -69,6 +73,8 @@ class InternLMModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
self.model_config = model_config_dict or InternLMConfig().as_dict()
api_key = api_key or os.environ.get("INTERNLM_API_KEY")
@@ -84,6 +90,8 @@ class InternLMModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
async def _arun(
diff --git a/camel/models/litellm_model.py b/camel/models/litellm_model.py
index 88588a640..03266c63a 100644
--- a/camel/models/litellm_model.py
+++ b/camel/models/litellm_model.py
@@ -59,6 +59,8 @@ class LiteLLMModel(BaseModelBackend):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
# NOTE: Currently stream mode is not supported.
@@ -72,6 +74,7 @@ class LiteLLMModel(BaseModelBackend):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ **kwargs: Any,
) -> None:
from litellm import completion
@@ -82,6 +85,7 @@ class LiteLLMModel(BaseModelBackend):
model_type, model_config_dict, api_key, url, token_counter, timeout
)
self.client = completion
+ self.kwargs = kwargs
def _convert_response_from_litellm_to_openai(
self, response
@@ -173,6 +177,7 @@ class LiteLLMModel(BaseModelBackend):
model=self.model_type,
messages=messages,
**self.model_config_dict,
+ **self.kwargs,
)
response = self._convert_response_from_litellm_to_openai(response)
diff --git a/camel/models/lmstudio_model.py b/camel/models/lmstudio_model.py
index edc9a1eb2..d336e88d2 100644
--- a/camel/models/lmstudio_model.py
+++ b/camel/models/lmstudio_model.py
@@ -43,6 +43,10 @@ class LMStudioModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
def __init__(
@@ -53,6 +57,8 @@ class LMStudioModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = LMStudioConfig().as_dict()
@@ -62,7 +68,14 @@ class LMStudioModel(OpenAICompatibleModel):
)
timeout = timeout or float(os.environ.get("MODEL_TIMEOUT", 180))
super().__init__(
- model_type, model_config_dict, api_key, url, token_counter, timeout
+ model_type,
+ model_config_dict,
+ api_key,
+ url,
+ token_counter,
+ timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def check_model_config(self):
diff --git a/camel/models/mistral_model.py b/camel/models/mistral_model.py
index d91b862cd..658eb633a 100644
--- a/camel/models/mistral_model.py
+++ b/camel/models/mistral_model.py
@@ -80,6 +80,10 @@ class MistralModel(BaseModelBackend):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries
+ for API calls. (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -96,6 +100,8 @@ class MistralModel(BaseModelBackend):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
from mistralai import Mistral
@@ -106,7 +112,14 @@ class MistralModel(BaseModelBackend):
url = url or os.environ.get("MISTRAL_API_BASE_URL")
timeout = timeout or float(os.environ.get("MODEL_TIMEOUT", 180))
super().__init__(
- model_type, model_config_dict, api_key, url, token_counter, timeout
+ model_type,
+ model_config_dict,
+ api_key,
+ url,
+ token_counter,
+ timeout,
+ max_retries,
+ **kwargs,
)
self._client = Mistral(
timeout_ms=int(self._timeout * 1000)
@@ -114,6 +127,7 @@ class MistralModel(BaseModelBackend):
else None,
api_key=self._api_key,
server_url=self._url,
+ **kwargs,
)
def _to_openai_response(
diff --git a/camel/models/model_factory.py b/camel/models/model_factory.py
index 2213a9b32..5c8a7be64 100644
--- a/camel/models/model_factory.py
+++ b/camel/models/model_factory.py
@@ -112,6 +112,7 @@ class ModelFactory:
api_key: Optional[str] = None,
url: Optional[str] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
**kwargs,
) -> BaseModelBackend:
r"""Creates an instance of `BaseModelBackend` of the specified type.
@@ -136,6 +137,8 @@ class ModelFactory:
(default: :obj:`None`)
timeout (Optional[float], optional): The timeout value in seconds
for API calls. (default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries
+ for API calls. (default: :obj:`3`)
**kwargs: Additional model-specific parameters that will be passed
to the model constructor. For example, Azure OpenAI models may
require `api_version`, `azure_deployment_name`,
@@ -188,6 +191,7 @@ class ModelFactory:
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
**kwargs,
)
diff --git a/camel/models/modelscope_model.py b/camel/models/modelscope_model.py
index bc7b3af4c..ba0a7fd13 100644
--- a/camel/models/modelscope_model.py
+++ b/camel/models/modelscope_model.py
@@ -56,6 +56,10 @@ class ModelScopeModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -71,6 +75,8 @@ class ModelScopeModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = ModelScopeConfig().as_dict()
@@ -87,6 +93,8 @@ class ModelScopeModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def _post_handle_response(
diff --git a/camel/models/moonshot_model.py b/camel/models/moonshot_model.py
index d41dd500e..7e41f0e2e 100644
--- a/camel/models/moonshot_model.py
+++ b/camel/models/moonshot_model.py
@@ -54,6 +54,10 @@ class MoonshotModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required([("api_key", "MOONSHOT_API_KEY")])
@@ -65,6 +69,8 @@ class MoonshotModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = MoonshotConfig().as_dict()
@@ -81,6 +87,8 @@ class MoonshotModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
async def _arun(
diff --git a/camel/models/nemotron_model.py b/camel/models/nemotron_model.py
index 1c66cec33..b3a761e4f 100644
--- a/camel/models/nemotron_model.py
+++ b/camel/models/nemotron_model.py
@@ -12,7 +12,7 @@
# limitations under the License.
# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
import os
-from typing import Optional, Union
+from typing import Any, Optional, Union
from camel.models.openai_compatible_model import OpenAICompatibleModel
from camel.types import ModelType
@@ -36,6 +36,10 @@ class NemotronModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
Notes:
Nemotron model doesn't support additional model config like OpenAI.
@@ -52,13 +56,24 @@ class NemotronModel(OpenAICompatibleModel):
api_key: Optional[str] = None,
url: Optional[str] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
url = url or os.environ.get(
"NVIDIA_API_BASE_URL", "https://integrate.api.nvidia.com/v1"
)
api_key = api_key or os.environ.get("NVIDIA_API_KEY")
timeout = timeout or float(os.environ.get("MODEL_TIMEOUT", 180))
- super().__init__(model_type, {}, api_key, url, None, timeout)
+ super().__init__(
+ model_type,
+ {},
+ api_key,
+ url,
+ None,
+ timeout,
+ max_retries=max_retries,
+ **kwargs,
+ )
@property
def token_counter(self) -> BaseTokenCounter:
diff --git a/camel/models/netmind_model.py b/camel/models/netmind_model.py
index 36b33c291..f211ba6b0 100644
--- a/camel/models/netmind_model.py
+++ b/camel/models/netmind_model.py
@@ -47,6 +47,10 @@ class NetmindModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -62,6 +66,8 @@ class NetmindModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = NetmindConfig().as_dict()
@@ -78,6 +84,8 @@ class NetmindModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def check_model_config(self):
diff --git a/camel/models/novita_model.py b/camel/models/novita_model.py
index 17099373b..714181051 100644
--- a/camel/models/novita_model.py
+++ b/camel/models/novita_model.py
@@ -47,6 +47,10 @@ class NovitaModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -62,6 +66,8 @@ class NovitaModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = NovitaConfig().as_dict()
@@ -77,6 +83,8 @@ class NovitaModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def check_model_config(self):
diff --git a/camel/models/nvidia_model.py b/camel/models/nvidia_model.py
index 3d162d40e..f4f43f792 100644
--- a/camel/models/nvidia_model.py
+++ b/camel/models/nvidia_model.py
@@ -43,6 +43,10 @@ class NvidiaModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -58,6 +62,8 @@ class NvidiaModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = NvidiaConfig().as_dict()
@@ -73,6 +79,8 @@ class NvidiaModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def check_model_config(self):
diff --git a/camel/models/ollama_model.py b/camel/models/ollama_model.py
index 531155bee..5a1ebd591 100644
--- a/camel/models/ollama_model.py
+++ b/camel/models/ollama_model.py
@@ -47,6 +47,10 @@ class OllamaModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
References:
https://github.com/ollama/ollama/blob/main/docs/openai.md
@@ -60,6 +64,8 @@ class OllamaModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = OllamaConfig().as_dict()
@@ -77,6 +83,8 @@ class OllamaModel(OpenAICompatibleModel):
url=self._url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def _start_server(self) -> None:
diff --git a/camel/models/openai_compatible_model.py b/camel/models/openai_compatible_model.py
index a49a29791..f89d4ff73 100644
--- a/camel/models/openai_compatible_model.py
+++ b/camel/models/openai_compatible_model.py
@@ -67,6 +67,11 @@ class OpenAICompatibleModel(BaseModelBackend):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the
+ OpenAI client initialization. These can include parameters like
+ 'organization', 'default_headers', 'http_client', etc.
"""
def __init__(
@@ -77,12 +82,21 @@ class OpenAICompatibleModel(BaseModelBackend):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
api_key = api_key or os.environ.get("OPENAI_COMPATIBILITY_API_KEY")
url = url or os.environ.get("OPENAI_COMPATIBILITY_API_BASE_URL")
timeout = timeout or float(os.environ.get("MODEL_TIMEOUT", 180))
+
super().__init__(
- model_type, model_config_dict, api_key, url, token_counter, timeout
+ model_type,
+ model_config_dict,
+ api_key,
+ url,
+ token_counter,
+ timeout,
+ max_retries,
)
if is_langfuse_available():
from langfuse.openai import AsyncOpenAI as LangfuseAsyncOpenAI
@@ -90,28 +104,32 @@ class OpenAICompatibleModel(BaseModelBackend):
self._client = LangfuseOpenAI(
timeout=self._timeout,
- max_retries=3,
+ max_retries=max_retries,
base_url=self._url,
api_key=self._api_key,
+ **kwargs,
)
self._async_client = LangfuseAsyncOpenAI(
timeout=self._timeout,
- max_retries=3,
+ max_retries=max_retries,
base_url=self._url,
api_key=self._api_key,
+ **kwargs,
)
else:
self._client = OpenAI(
timeout=self._timeout,
- max_retries=3,
+ max_retries=max_retries,
base_url=self._url,
api_key=self._api_key,
+ **kwargs,
)
self._async_client = AsyncOpenAI(
timeout=self._timeout,
- max_retries=3,
+ max_retries=max_retries,
base_url=self._url,
api_key=self._api_key,
+ **kwargs,
)
@observe()
diff --git a/camel/models/openai_model.py b/camel/models/openai_model.py
index a93b402e1..bd9dfd72d 100644
--- a/camel/models/openai_model.py
+++ b/camel/models/openai_model.py
@@ -76,6 +76,11 @@ class OpenAIModel(BaseModelBackend):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the
+ OpenAI client initialization. These can include parameters like
+ 'organization', 'default_headers', 'http_client', etc.
"""
@api_keys_required(
@@ -91,6 +96,8 @@ class OpenAIModel(BaseModelBackend):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = ChatGPTConfig().as_dict()
@@ -98,6 +105,9 @@ class OpenAIModel(BaseModelBackend):
url = url or os.environ.get("OPENAI_API_BASE_URL")
timeout = timeout or float(os.environ.get("MODEL_TIMEOUT", 180))
+ # Store additional client args for later use
+ self._max_retries = max_retries
+
super().__init__(
model_type, model_config_dict, api_key, url, token_counter, timeout
)
@@ -106,30 +116,37 @@ class OpenAIModel(BaseModelBackend):
from langfuse.openai import AsyncOpenAI as LangfuseAsyncOpenAI
from langfuse.openai import OpenAI as LangfuseOpenAI
+ # Create Langfuse client with base parameters and additional
+ # arguments
self._client = LangfuseOpenAI(
timeout=self._timeout,
- max_retries=3,
+ max_retries=self._max_retries,
base_url=self._url,
api_key=self._api_key,
+ **kwargs,
)
self._async_client = LangfuseAsyncOpenAI(
timeout=self._timeout,
- max_retries=3,
+ max_retries=self._max_retries,
base_url=self._url,
api_key=self._api_key,
+ **kwargs,
)
else:
+ # Create client with base parameters and additional arguments
self._client = OpenAI(
timeout=self._timeout,
- max_retries=3,
+ max_retries=self._max_retries,
base_url=self._url,
api_key=self._api_key,
+ **kwargs,
)
self._async_client = AsyncOpenAI(
timeout=self._timeout,
- max_retries=3,
+ max_retries=self._max_retries,
base_url=self._url,
api_key=self._api_key,
+ **kwargs,
)
def _sanitize_config(self, config_dict: Dict[str, Any]) -> Dict[str, Any]:
diff --git a/camel/models/openrouter_model.py b/camel/models/openrouter_model.py
index 7b5a1cce8..f3c9576c9 100644
--- a/camel/models/openrouter_model.py
+++ b/camel/models/openrouter_model.py
@@ -46,6 +46,10 @@ class OpenRouterModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required([("api_key", "OPENROUTER_API_KEY")])
@@ -57,6 +61,8 @@ class OpenRouterModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = OpenRouterConfig().as_dict()
@@ -72,6 +78,8 @@ class OpenRouterModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def check_model_config(self):
diff --git a/camel/models/ppio_model.py b/camel/models/ppio_model.py
index ab67382b5..5cfb4b780 100644
--- a/camel/models/ppio_model.py
+++ b/camel/models/ppio_model.py
@@ -47,6 +47,10 @@ class PPIOModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -62,6 +66,8 @@ class PPIOModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = PPIOConfig().as_dict()
@@ -77,6 +83,8 @@ class PPIOModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def check_model_config(self):
diff --git a/camel/models/qianfan_model.py b/camel/models/qianfan_model.py
index f3d479ba8..5d799e3f0 100644
--- a/camel/models/qianfan_model.py
+++ b/camel/models/qianfan_model.py
@@ -47,6 +47,10 @@ class QianfanModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (Optional[int], optional): Maximum number of retries
+ for API calls. (default: :obj:`None`)
+ **kwargs: Additional model-specific parameters that will be passed
+ to the model constructor.
"""
@api_keys_required(
@@ -62,6 +66,8 @@ class QianfanModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs,
) -> None:
if model_config_dict is None:
model_config_dict = QianfanConfig().as_dict()
@@ -78,6 +84,8 @@ class QianfanModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def check_model_config(self):
diff --git a/camel/models/qwen_model.py b/camel/models/qwen_model.py
index 4d8a39d4f..0fd3abd53 100644
--- a/camel/models/qwen_model.py
+++ b/camel/models/qwen_model.py
@@ -54,6 +54,10 @@ class QwenModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -69,6 +73,8 @@ class QwenModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = QwenConfig().as_dict()
@@ -85,6 +91,8 @@ class QwenModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def _post_handle_response(
diff --git a/camel/models/reka_model.py b/camel/models/reka_model.py
index fc7508369..61faf5cb7 100644
--- a/camel/models/reka_model.py
+++ b/camel/models/reka_model.py
@@ -72,6 +72,8 @@ class RekaModel(BaseModelBackend):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -88,6 +90,7 @@ class RekaModel(BaseModelBackend):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ **kwargs: Any,
) -> None:
from reka.client import AsyncReka, Reka
@@ -97,13 +100,25 @@ class RekaModel(BaseModelBackend):
url = url or os.environ.get("REKA_API_BASE_URL")
timeout = timeout or float(os.environ.get("MODEL_TIMEOUT", 180))
super().__init__(
- model_type, model_config_dict, api_key, url, token_counter, timeout
+ model_type,
+ model_config_dict,
+ api_key,
+ url,
+ token_counter,
+ timeout,
+ **kwargs,
)
self._client = Reka(
- api_key=self._api_key, base_url=self._url, timeout=self._timeout
+ api_key=self._api_key,
+ base_url=self._url,
+ timeout=self._timeout,
+ **kwargs,
)
self._async_client = AsyncReka(
- api_key=self._api_key, base_url=self._url, timeout=self._timeout
+ api_key=self._api_key,
+ base_url=self._url,
+ timeout=self._timeout,
+ **kwargs,
)
def _convert_reka_to_openai_response(
diff --git a/camel/models/samba_model.py b/camel/models/samba_model.py
index 43e5af469..8e684c6f3 100644
--- a/camel/models/samba_model.py
+++ b/camel/models/samba_model.py
@@ -88,6 +88,10 @@ class SambaModel(BaseModelBackend):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -103,6 +107,8 @@ class SambaModel(BaseModelBackend):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = SambaCloudAPIConfig().as_dict()
@@ -113,21 +119,29 @@ class SambaModel(BaseModelBackend):
)
timeout = timeout or float(os.environ.get("MODEL_TIMEOUT", 180))
super().__init__(
- model_type, model_config_dict, api_key, url, token_counter, timeout
+ model_type,
+ model_config_dict,
+ api_key,
+ url,
+ token_counter,
+ timeout,
+ max_retries,
)
if self._url == "https://api.sambanova.ai/v1":
self._client = OpenAI(
timeout=self._timeout,
- max_retries=3,
+ max_retries=self._max_retries,
base_url=self._url,
api_key=self._api_key,
+ **kwargs,
)
self._async_client = AsyncOpenAI(
timeout=self._timeout,
- max_retries=3,
+ max_retries=self._max_retries,
base_url=self._url,
api_key=self._api_key,
+ **kwargs,
)
@property
diff --git a/camel/models/sglang_model.py b/camel/models/sglang_model.py
index 5056b741c..c367868bf 100644
--- a/camel/models/sglang_model.py
+++ b/camel/models/sglang_model.py
@@ -70,8 +70,13 @@ class SGLangModel(BaseModelBackend):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
- Reference: https://sgl-project.github.io/backend/openai_api_completions.html
+ Reference: https://sgl-project.github.io/backend/openai_api_completions.
+ html
"""
def __init__(
@@ -82,6 +87,8 @@ class SGLangModel(BaseModelBackend):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = SGLangConfig().as_dict()
@@ -95,7 +102,13 @@ class SGLangModel(BaseModelBackend):
timeout = timeout or float(os.environ.get("MODEL_TIMEOUT", 180))
super().__init__(
- model_type, model_config_dict, api_key, url, token_counter, timeout
+ model_type,
+ model_config_dict,
+ api_key,
+ url,
+ token_counter,
+ timeout,
+ max_retries,
)
self._client = None
@@ -104,15 +117,17 @@ class SGLangModel(BaseModelBackend):
# Initialize the client if an existing URL is provided
self._client = OpenAI(
timeout=self._timeout,
- max_retries=3,
+ max_retries=self._max_retries,
api_key="Set-but-ignored", # required but ignored
base_url=self._url,
+ **kwargs,
)
self._async_client = AsyncOpenAI(
timeout=self._timeout,
- max_retries=3,
+ max_retries=self._max_retries,
api_key="Set-but-ignored", # required but ignored
base_url=self._url,
+ **kwargs,
)
def _start_server(self) -> None:
@@ -147,7 +162,7 @@ class SGLangModel(BaseModelBackend):
# Initialize the client after the server starts
self._client = OpenAI(
timeout=self._timeout,
- max_retries=3,
+ max_retries=self._max_retries,
api_key="Set-but-ignored", # required but ignored
base_url=self._url,
)
diff --git a/camel/models/siliconflow_model.py b/camel/models/siliconflow_model.py
index b6eb02d49..306808f9d 100644
--- a/camel/models/siliconflow_model.py
+++ b/camel/models/siliconflow_model.py
@@ -54,6 +54,10 @@ class SiliconFlowModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -69,6 +73,8 @@ class SiliconFlowModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = SiliconFlowConfig().as_dict()
@@ -85,6 +91,8 @@ class SiliconFlowModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
async def _arun(
diff --git a/camel/models/stub_model.py b/camel/models/stub_model.py
index 3e7c45f80..ba5812ea6 100644
--- a/camel/models/stub_model.py
+++ b/camel/models/stub_model.py
@@ -83,10 +83,17 @@ class StubModel(BaseModelBackend):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
) -> None:
r"""All arguments are unused for the dummy model."""
super().__init__(
- model_type, model_config_dict, api_key, url, token_counter, timeout
+ model_type,
+ model_config_dict,
+ api_key,
+ url,
+ token_counter,
+ timeout,
+ max_retries,
)
@property
diff --git a/camel/models/togetherai_model.py b/camel/models/togetherai_model.py
index 546386dc0..7a7cf3e7d 100644
--- a/camel/models/togetherai_model.py
+++ b/camel/models/togetherai_model.py
@@ -47,6 +47,10 @@ class TogetherAIModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -62,6 +66,8 @@ class TogetherAIModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = TogetherAIConfig().as_dict()
@@ -77,6 +83,8 @@ class TogetherAIModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def check_model_config(self):
diff --git a/camel/models/vllm_model.py b/camel/models/vllm_model.py
index 34bfdf030..7edf9b044 100644
--- a/camel/models/vllm_model.py
+++ b/camel/models/vllm_model.py
@@ -49,6 +49,9 @@ class VLLMModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client initialization.
References:
https://docs.vllm.ai/en/latest/serving/openai_compatible_server.html
@@ -62,6 +65,8 @@ class VLLMModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = VLLMConfig().as_dict()
@@ -79,6 +84,8 @@ class VLLMModel(OpenAICompatibleModel):
url=self._url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def _start_server(self) -> None:
diff --git a/camel/models/volcano_model.py b/camel/models/volcano_model.py
index 6ee1d3d84..9e2868ccf 100644
--- a/camel/models/volcano_model.py
+++ b/camel/models/volcano_model.py
@@ -44,6 +44,10 @@ class VolcanoModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -59,6 +63,8 @@ class VolcanoModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = {}
@@ -71,7 +77,14 @@ class VolcanoModel(OpenAICompatibleModel):
)
timeout = timeout or float(os.environ.get("MODEL_TIMEOUT", 180))
super().__init__(
- model_type, model_config_dict, api_key, url, token_counter, timeout
+ model_type,
+ model_config_dict,
+ api_key,
+ url,
+ token_counter,
+ timeout,
+ max_retries,
+ **kwargs,
)
def check_model_config(self):
diff --git a/camel/models/watsonx_model.py b/camel/models/watsonx_model.py
index 4c4d360b5..42c4eeda0 100644
--- a/camel/models/watsonx_model.py
+++ b/camel/models/watsonx_model.py
@@ -66,6 +66,8 @@ class WatsonXModel(BaseModelBackend):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -83,6 +85,7 @@ class WatsonXModel(BaseModelBackend):
project_id: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ **kwargs: Any,
):
from ibm_watsonx_ai import APIClient, Credentials
from ibm_watsonx_ai.foundation_models import ModelInference
@@ -103,7 +106,7 @@ class WatsonXModel(BaseModelBackend):
self._project_id = project_id
credentials = Credentials(api_key=self._api_key, url=self._url)
- client = APIClient(credentials, project_id=self._project_id)
+ client = APIClient(credentials, project_id=self._project_id, **kwargs)
self._model = ModelInference(
model_id=self.model_type,
diff --git a/camel/models/yi_model.py b/camel/models/yi_model.py
index a89c70080..1a6596ece 100644
--- a/camel/models/yi_model.py
+++ b/camel/models/yi_model.py
@@ -46,6 +46,10 @@ class YiModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -61,6 +65,8 @@ class YiModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = YiConfig().as_dict()
@@ -76,6 +82,8 @@ class YiModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def check_model_config(self):
diff --git a/camel/models/zhipuai_model.py b/camel/models/zhipuai_model.py
index 965328187..68e790a5d 100644
--- a/camel/models/zhipuai_model.py
+++ b/camel/models/zhipuai_model.py
@@ -46,6 +46,10 @@ class ZhipuAIModel(OpenAICompatibleModel):
API calls. If not provided, will fall back to the MODEL_TIMEOUT
environment variable or default to 180 seconds.
(default: :obj:`None`)
+ max_retries (int, optional): Maximum number of retries for API calls.
+ (default: :obj:`3`)
+ **kwargs (Any): Additional arguments to pass to the client
+ initialization.
"""
@api_keys_required(
@@ -61,6 +65,8 @@ class ZhipuAIModel(OpenAICompatibleModel):
url: Optional[str] = None,
token_counter: Optional[BaseTokenCounter] = None,
timeout: Optional[float] = None,
+ max_retries: int = 3,
+ **kwargs: Any,
) -> None:
if model_config_dict is None:
model_config_dict = ZhipuAIConfig().as_dict()
@@ -76,6 +82,8 @@ class ZhipuAIModel(OpenAICompatibleModel):
url=url,
token_counter=token_counter,
timeout=timeout,
+ max_retries=max_retries,
+ **kwargs,
)
def check_model_config(self):