Skip to content

Commit 5d33017

Browse files
feat: unify timeout format with TIMEOUT constant (#3407)
Co-authored-by: Waleed Alzarooni <[email protected]>
1 parent 6f85b86 commit 5d33017

File tree

11 files changed

+44
-14
lines changed

11 files changed

+44
-14
lines changed

camel/agents/chat_agent.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
)
9999
from camel.types.agents import ToolCallingRecord
100100
from camel.utils import (
101+
Constants,
101102
get_model_encoding,
102103
model_from_json_schema,
103104
)
@@ -482,14 +483,14 @@ def __init__(
482483
max_iteration: Optional[int] = None,
483484
agent_id: Optional[str] = None,
484485
stop_event: Optional[threading.Event] = None,
485-
tool_execution_timeout: Optional[float] = None,
486+
tool_execution_timeout: Optional[float] = Constants.TIMEOUT_THRESHOLD,
486487
mask_tool_output: bool = False,
487488
pause_event: Optional[Union[threading.Event, asyncio.Event]] = None,
488489
prune_tool_calls_from_memory: bool = False,
489490
enable_snapshot_clean: bool = False,
490491
retry_attempts: int = 3,
491492
retry_delay: float = 1.0,
492-
step_timeout: Optional[float] = None,
493+
step_timeout: Optional[float] = Constants.TIMEOUT_THRESHOLD,
493494
stream_accumulate: bool = True,
494495
summary_window_ratio: float = 0.6,
495496
) -> None:

camel/models/base_audio_model.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
from abc import ABC, abstractmethod
1717
from typing import Any, Optional
1818

19+
from camel.utils import Constants
20+
1921

2022
class BaseAudioModel(ABC):
2123
r"""Base class for audio models providing Text-to-Speech (TTS) and
@@ -26,7 +28,7 @@ def __init__(
2628
self,
2729
api_key: Optional[str] = None,
2830
url: Optional[str] = None,
29-
timeout: Optional[float] = None,
31+
timeout: Optional[float] = Constants.TIMEOUT_THRESHOLD,
3032
) -> None:
3133
r"""Initialize an instance of BaseAudioModel.
3234

camel/models/base_model.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
ParsedChatCompletion,
3434
UnifiedModelType,
3535
)
36-
from camel.utils import BaseTokenCounter
36+
from camel.utils import BaseTokenCounter, Constants
3737

3838
if os.environ.get("TRACEROOT_ENABLED", "False").lower() == "true":
3939
try:
@@ -103,7 +103,7 @@ def __init__(
103103
api_key: Optional[str] = None,
104104
url: Optional[str] = None,
105105
token_counter: Optional[BaseTokenCounter] = None,
106-
timeout: Optional[float] = None,
106+
timeout: Optional[float] = Constants.TIMEOUT_THRESHOLD,
107107
max_retries: int = 3,
108108
) -> None:
109109
self.model_type: UnifiedModelType = UnifiedModelType(model_type)

camel/toolkits/base.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
from camel.logger import get_logger
1818
from camel.toolkits import FunctionTool
19-
from camel.utils import AgentOpsMeta, with_timeout
19+
from camel.utils import AgentOpsMeta, Constants, with_timeout
2020

2121
if TYPE_CHECKING:
2222
from camel.agents import ChatAgent
@@ -35,9 +35,9 @@ class BaseToolkit(metaclass=AgentOpsMeta):
3535
from mcp.server import FastMCP
3636

3737
mcp: FastMCP
38-
timeout: Optional[float] = None
38+
timeout: Optional[float] = Constants.TIMEOUT_THRESHOLD
3939

40-
def __init__(self, timeout: Optional[float] = None):
40+
def __init__(self, timeout: Optional[float] = Constants.TIMEOUT_THRESHOLD):
4141
# check if timeout is a positive number
4242
if timeout is not None and timeout <= 0:
4343
raise ValueError("Timeout must be a positive number.")

camel/toolkits/dappier_toolkit.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@
1616

1717
from camel.toolkits.base import BaseToolkit
1818
from camel.toolkits.function_tool import FunctionTool
19-
from camel.utils import MCPServer, api_keys_required, dependencies_required
19+
from camel.utils import (
20+
MCPServer,
21+
api_keys_required,
22+
dependencies_required,
23+
)
2024

2125

2226
@MCPServer()

camel/toolkits/klavis_toolkit.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121
from camel.logger import get_logger
2222
from camel.toolkits.base import BaseToolkit
2323
from camel.toolkits.function_tool import FunctionTool
24-
from camel.utils import MCPServer, api_keys_required, dependencies_required
24+
from camel.utils import (
25+
MCPServer,
26+
api_keys_required,
27+
dependencies_required,
28+
)
2529

2630
logger = get_logger(__name__)
2731

camel/toolkits/memory_toolkit.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ class MemoryToolkit(BaseToolkit):
4343
(default: :obj:`None`)
4444
"""
4545

46-
def __init__(self, agent: 'ChatAgent', timeout: Optional[float] = None):
46+
def __init__(
47+
self,
48+
agent: 'ChatAgent',
49+
timeout: Optional[float] = None,
50+
):
4751
super().__init__(timeout=timeout)
4852
self.agent = agent
4953

camel/toolkits/openbb_toolkit.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717

1818
from camel.toolkits.base import BaseToolkit
1919
from camel.toolkits.function_tool import FunctionTool
20-
from camel.utils import MCPServer, api_keys_required, dependencies_required
20+
from camel.utils import (
21+
MCPServer,
22+
api_keys_required,
23+
dependencies_required,
24+
)
2125

2226

2327
@MCPServer()

camel/toolkits/search_toolkit.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020
from camel.logger import get_logger
2121
from camel.toolkits.base import BaseToolkit
2222
from camel.toolkits.function_tool import FunctionTool
23-
from camel.utils import MCPServer, api_keys_required, dependencies_required
23+
from camel.utils import (
24+
MCPServer,
25+
api_keys_required,
26+
dependencies_required,
27+
)
2428

2529
logger = get_logger(__name__)
2630

camel/toolkits/zapier_toolkit.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919

2020
from camel.toolkits.base import BaseToolkit
2121
from camel.toolkits.function_tool import FunctionTool
22-
from camel.utils import MCPServer, api_keys_required, dependencies_required
22+
from camel.utils import (
23+
MCPServer,
24+
api_keys_required,
25+
dependencies_required,
26+
)
2327

2428

2529
@MCPServer()

0 commit comments

Comments
 (0)