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: unify timeout format with TIMEOUT constant (#3407)

JINO ROHIT5d33017cf3b6
diff --git a/camel/agents/chat_agent.py b/camel/agents/chat_agent.py
index 3e8e89af0..928ec92e5 100644
--- a/camel/agents/chat_agent.py
+++ b/camel/agents/chat_agent.py
@@ -98,6 +98,7 @@ from camel.types import (
)
from camel.types.agents import ToolCallingRecord
from camel.utils import (
+ Constants,
get_model_encoding,
model_from_json_schema,
)
@@ -482,14 +483,14 @@ class ChatAgent(BaseAgent):
max_iteration: Optional[int] = None,
agent_id: Optional[str] = None,
stop_event: Optional[threading.Event] = None,
- tool_execution_timeout: Optional[float] = None,
+ tool_execution_timeout: Optional[float] = Constants.TIMEOUT_THRESHOLD,
mask_tool_output: bool = False,
pause_event: Optional[Union[threading.Event, asyncio.Event]] = None,
prune_tool_calls_from_memory: bool = False,
enable_snapshot_clean: bool = False,
retry_attempts: int = 3,
retry_delay: float = 1.0,
- step_timeout: Optional[float] = None,
+ step_timeout: Optional[float] = Constants.TIMEOUT_THRESHOLD,
stream_accumulate: bool = True,
summary_window_ratio: float = 0.6,
) -> None:
diff --git a/camel/models/base_audio_model.py b/camel/models/base_audio_model.py
index 522e7f7ff..4ca035f76 100644
--- a/camel/models/base_audio_model.py
+++ b/camel/models/base_audio_model.py
@@ -16,6 +16,8 @@ import os
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 @@ class BaseAudioModel(ABC):
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.
diff --git a/camel/models/base_model.py b/camel/models/base_model.py
index 023f543a1..13cd51b8c 100644
--- a/camel/models/base_model.py
+++ b/camel/models/base_model.py
@@ -33,7 +33,7 @@ from camel.types import (
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 @@ class BaseModelBackend(ABC, metaclass=ModelBackendMeta):
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)
diff --git a/camel/toolkits/base.py b/camel/toolkits/base.py
index ba702c1d2..b8982d4bf 100644
--- a/camel/toolkits/base.py
+++ b/camel/toolkits/base.py
@@ -16,7 +16,7 @@ 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
+from camel.utils import AgentOpsMeta, Constants, with_timeout
if TYPE_CHECKING:
from camel.agents import ChatAgent
@@ -35,9 +35,9 @@ class BaseToolkit(metaclass=AgentOpsMeta):
from mcp.server import FastMCP
mcp: FastMCP
- timeout: Optional[float] = None
+ timeout: Optional[float] = Constants.TIMEOUT_THRESHOLD
- def __init__(self, timeout: Optional[float] = None):
+ def __init__(self, timeout: Optional[float] = Constants.TIMEOUT_THRESHOLD):
# check if timeout is a positive number
if timeout is not None and timeout <= 0:
raise ValueError("Timeout must be a positive number.")
diff --git a/camel/toolkits/dappier_toolkit.py b/camel/toolkits/dappier_toolkit.py
index 788760c8b..8509f2e9b 100644
--- a/camel/toolkits/dappier_toolkit.py
+++ b/camel/toolkits/dappier_toolkit.py
@@ -16,7 +16,11 @@ from typing import Dict, List, Literal, Optional, Union
from camel.toolkits.base import BaseToolkit
from camel.toolkits.function_tool import FunctionTool
-from camel.utils import MCPServer, api_keys_required, dependencies_required
+from camel.utils import (
+ MCPServer,
+ api_keys_required,
+ dependencies_required,
+)
@MCPServer()
diff --git a/camel/toolkits/klavis_toolkit.py b/camel/toolkits/klavis_toolkit.py
index e9a6b269a..04c5e97c6 100644
--- a/camel/toolkits/klavis_toolkit.py
+++ b/camel/toolkits/klavis_toolkit.py
@@ -21,7 +21,11 @@ import requests
from camel.logger import get_logger
from camel.toolkits.base import BaseToolkit
from camel.toolkits.function_tool import FunctionTool
-from camel.utils import MCPServer, api_keys_required, dependencies_required
+from camel.utils import (
+ MCPServer,
+ api_keys_required,
+ dependencies_required,
+)
logger = get_logger(__name__)
diff --git a/camel/toolkits/memory_toolkit.py b/camel/toolkits/memory_toolkit.py
index 1df224b7c..e041aaae2 100644
--- a/camel/toolkits/memory_toolkit.py
+++ b/camel/toolkits/memory_toolkit.py
@@ -43,7 +43,11 @@ class MemoryToolkit(BaseToolkit):
(default: :obj:`None`)
"""
- def __init__(self, agent: 'ChatAgent', timeout: Optional[float] = None):
+ def __init__(
+ self,
+ agent: 'ChatAgent',
+ timeout: Optional[float] = None,
+ ):
super().__init__(timeout=timeout)
self.agent = agent
diff --git a/camel/toolkits/openbb_toolkit.py b/camel/toolkits/openbb_toolkit.py
index f88d7989f..79ee06830 100644
--- a/camel/toolkits/openbb_toolkit.py
+++ b/camel/toolkits/openbb_toolkit.py
@@ -17,7 +17,11 @@ from typing import List, Literal, Optional
from camel.toolkits.base import BaseToolkit
from camel.toolkits.function_tool import FunctionTool
-from camel.utils import MCPServer, api_keys_required, dependencies_required
+from camel.utils import (
+ MCPServer,
+ api_keys_required,
+ dependencies_required,
+)
@MCPServer()
diff --git a/camel/toolkits/search_toolkit.py b/camel/toolkits/search_toolkit.py
index baec68b6d..4e08e1e4b 100644
--- a/camel/toolkits/search_toolkit.py
+++ b/camel/toolkits/search_toolkit.py
@@ -20,7 +20,11 @@ import requests
from camel.logger import get_logger
from camel.toolkits.base import BaseToolkit
from camel.toolkits.function_tool import FunctionTool
-from camel.utils import MCPServer, api_keys_required, dependencies_required
+from camel.utils import (
+ MCPServer,
+ api_keys_required,
+ dependencies_required,
+)
logger = get_logger(__name__)
diff --git a/camel/toolkits/zapier_toolkit.py b/camel/toolkits/zapier_toolkit.py
index 668b9b537..37a7253f6 100644
--- a/camel/toolkits/zapier_toolkit.py
+++ b/camel/toolkits/zapier_toolkit.py
@@ -19,7 +19,11 @@ import requests
from camel.toolkits.base import BaseToolkit
from camel.toolkits.function_tool import FunctionTool
-from camel.utils import MCPServer, api_keys_required, dependencies_required
+from camel.utils import (
+ MCPServer,
+ api_keys_required,
+ dependencies_required,
+)
@MCPServer()
diff --git a/camel/utils/constants.py b/camel/utils/constants.py
index de8ea1c4c..79c91288a 100644
--- a/camel/utils/constants.py
+++ b/camel/utils/constants.py
@@ -35,3 +35,6 @@ class Constants:
# Default similarity threshold value for RAG
DEFAULT_SIMILARITY_THRESHOLD = 0.7
+
+ # Default timeout threshold value
+ TIMEOUT_THRESHOLD = 180.0