camel-ai 0.2.67__py3-none-any.whl → 0.2.80a2__py3-none-any.whl

camel/types/openai_types.py

@@ -33,7 +33,7 @@ from openai.types.chat.chat_completion_user_message_param import (
 from openai.types.completion_usage import CompletionUsage
 from openai.types.chat import ParsedChatCompletion
 from openai._types import NOT_GIVEN, NotGiven
-from openai.types.chat import ChatCompletionMessageToolCall
+from openai.types.chat import ChatCompletionMessageFunctionToolCall
 
 __all__ = [
     "Choice",
@@ -45,7 +45,7 @@ __all__ = [
     "ChatCompletionUserMessageParam",
     "ChatCompletionAssistantMessageParam",
     "ChatCompletionToolMessageParam",
-    "ChatCompletionMessageToolCall",
+    "ChatCompletionMessageFunctionToolCall",
     "CompletionUsage",
     "ParsedChatCompletion",
     "NOT_GIVEN",

camel/types/unified_model_type.py

@@ -12,6 +12,7 @@
 # limitations under the License.
 # ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
 import logging
+from enum import Enum
 from threading import Lock
 from typing import TYPE_CHECKING, ClassVar, Dict, Union, cast
 
@@ -32,17 +33,28 @@ class UnifiedModelType(str):
     _lock: ClassVar[Lock] = Lock()
 
     def __new__(cls, value: Union["ModelType", str]) -> "UnifiedModelType":
+        if isinstance(value, Enum):
+            str_value = value.value
+        else:
+            str_value = str(value)
+
         with cls._lock:
-            if value not in cls._cache:
-                instance = super().__new__(cls, value)
-                cls._cache[value] = cast(UnifiedModelType, instance)
+            if str_value not in cls._cache:
+                instance = super().__new__(cls, str_value)
+                cls._cache[str_value] = cast(UnifiedModelType, instance)
             else:
-                instance = cls._cache[value]
+                instance = cls._cache[str_value]
         return instance
 
     def __init__(self, value: Union["ModelType", str]) -> None:
         pass
 
+    def __repr__(self) -> str:
+        return super().__str__()
+
+    def __str__(self) -> str:
+        return super().__str__()
+
     @property
     def value_for_tiktoken(self) -> str:
         r"""Returns the model name for TikToken."""
@@ -83,6 +95,11 @@ class UnifiedModelType(str):
         r"""Returns whether the model is a Groq served model."""
         return True
 
+    @property
+    def is_nebius(self) -> bool:
+        r"""Returns whether the model is a Nebius AI Studio served model."""
+        return True
+
     @property
     def is_openrouter(self) -> bool:
         r"""Returns whether the model is a OpenRouter served model."""
@@ -128,6 +145,11 @@ class UnifiedModelType(str):
         r"""Returns whether the model is a Cohere model."""
         return True
 
+    @property
+    def is_cometapi(self) -> bool:
+        r"""Returns whether the model is a CometAPI served model."""
+        return True
+
     @property
     def is_yi(self) -> bool:
         r"""Returns whether the model is a Yi model."""
@@ -173,6 +195,11 @@ class UnifiedModelType(str):
         r"""Returns whether the model is a Crynux served model."""
         return True
 
+    @property
+    def is_minimax(self) -> bool:
+        r"""Returns whether the model is a Minimax served model."""
+        return True
+
     @property
     def support_native_structured_output(self) -> bool:
         r"""Returns whether the model supports native structured output."""

camel/utils/commons.py

@@ -318,6 +318,8 @@ def api_keys_required(
                 key_way = "https://aimlapi.com/"
             elif env_var_name == 'COHERE_API_KEY':
                 key_way = "https://cohere.com/"
+            elif env_var_name == 'COMETAPI_KEY':
+                key_way = "https://api.cometapi.com/console/token"
             elif env_var_name == 'DEEPSEEK_API_KEY':
                 key_way = "https://www.deepseek.com/"
             elif env_var_name == 'AZURE_OPENAI_API_KEY':
@@ -354,6 +356,8 @@ def api_keys_required(
                 key_way = "https://www.zhipuai.cn/"
             elif env_var_name == 'KLAVIS_API_KEY':
                 key_way = "https://www.klavis.ai/docs"
+            elif env_var_name == 'XAI_API_KEY':
+                key_way = "https://api.x.ai/v1"
 
             if missing_keys:
                 raise ValueError(
@@ -1011,14 +1015,32 @@ def with_timeout(timeout=None):
                 if effective_timeout is None:
                     return func(*args, **kwargs)
 
-                # Container to hold the result of the function call
+                # If current thread has a running asyncio event loop, avoid
+                # switching threads to preserve asyncio context (e.g., for
+                # asyncio.create_task). Execute inline without enforcing a
+                # sync timeout to keep event loop semantics intact.
+                try:
+                    asyncio.get_running_loop()
+                    loop_running = True
+                except RuntimeError:
+                    loop_running = False
+
+                if loop_running:
+                    return func(*args, **kwargs)
+
+                # Container to hold the result or exception from the function
+                # call
                 result_container = []
+                exception_container = []
 
                 def target():
-                    result_container.append(func(*args, **kwargs))
+                    try:
+                        result_container.append(func(*args, **kwargs))
+                    except Exception as e:
+                        exception_container.append(e)
 
-                # Start the function in a new thread
-                thread = threading.Thread(target=target)
+                # Start the function in a new daemon thread
+                thread = threading.Thread(target=target, daemon=True)
                 thread.start()
                 thread.join(effective_timeout)
 
@@ -1029,7 +1051,16 @@ def with_timeout(timeout=None):
                         f"exceeded {effective_timeout} seconds."
                     )
                 else:
-                    return result_container[0]
+                    # If an exception occurred, re-raise it
+                    if exception_container:
+                        raise exception_container[0]
+                    # Return result if available
+                    if result_container:
+                        return result_container[0]
+                    raise RuntimeError(
+                        f"Function `{func.__name__}` completed but produced "
+                        "no result or exception."
+                    )
 
         return wrapper
 

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