camel-ai 0.2.16__py3-none-any.whl → 0.2.18__py3-none-any.whl

camel/types/enums.py

@@ -54,6 +54,19 @@ class ModelType(UnifiedModelType, Enum):
     GROQ_GEMMA_7B_IT = "gemma-7b-it"
     GROQ_GEMMA_2_9B_IT = "gemma2-9b-it"
 
+    # TogetherAI platform models support tool calling
+    TOGETHER_LLAMA_3_1_8B = "meta-llama/Meta-Llama-3.1-8B-Instruct-Turbo"
+    TOGETHER_LLAMA_3_1_70B = "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo"
+    TOGETHER_LLAMA_3_1_405B = "meta-llama/Meta-Llama-3.1-405B-Instruct-Turbo"
+    TOGETHER_LLAMA_3_3_70B = "meta-llama/Llama-3.3-70B-Instruct-Turbo"
+    TOGETHER_MIXTRAL_8_7B = "mistralai/Mixtral-8x7B-Instruct-v0.1"
+    TOGETHER_MISTRAL_7B = "mistralai/Mistral-7B-Instruct-v0.1"
+
+    # SambaNova Cloud platform models support tool calling
+    SAMBA_LLAMA_3_1_8B = "Meta-Llama-3.1-8B-Instruct"
+    SAMBA_LLAMA_3_1_70B = "Meta-Llama-3.1-70B-Instruct"
+    SAMBA_LLAMA_3_1_405B = "Meta-Llama-3.1-405B-Instruct"
+
     STUB = "stub"
 
     # Legacy anthropic models
@@ -141,6 +154,12 @@ class ModelType(UnifiedModelType, Enum):
 
     # DeepSeek models
     DEEPSEEK_CHAT = "deepseek-chat"
+    DEEPSEEK_REASONER = "deepseek-reasoner"
+    # InternLM models
+    INTERNLM3_LATEST = "internlm3-latest"
+    INTERNLM3_8B_INSTRUCT = "internlm3-8b-instruct"
+    INTERNLM2_5_LATEST = "internlm2.5-latest"
+    INTERNLM2_PRO_CHAT = "internlm2-pro-chat"
 
     def __str__(self):
         return self.value
@@ -161,7 +180,17 @@ class ModelType(UnifiedModelType, Enum):
     @property
     def support_native_tool_calling(self) -> bool:
         return any(
-            [self.is_openai, self.is_gemini, self.is_mistral, self.is_qwen]
+            [
+                self.is_openai,
+                self.is_gemini,
+                self.is_mistral,
+                self.is_qwen,
+                self.is_deepseek,
+                self.is_cohere,
+                self.is_internlm,
+                self.is_together,
+                self.is_sambanova,
+            ]
         )
 
     @property
@@ -234,6 +263,27 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.GROQ_GEMMA_2_9B_IT,
         }
 
+    @property
+    def is_together(self) -> bool:
+        r"""Returns whether this type of models is served by Together AI."""
+        return self in {
+            ModelType.TOGETHER_LLAMA_3_1_405B,
+            ModelType.TOGETHER_LLAMA_3_1_70B,
+            ModelType.TOGETHER_LLAMA_3_3_70B,
+            ModelType.TOGETHER_LLAMA_3_3_70B,
+            ModelType.TOGETHER_MISTRAL_7B,
+            ModelType.TOGETHER_MIXTRAL_8_7B,
+        }
+
+    @property
+    def is_sambanova(self) -> bool:
+        r"""Returns whether this type of models is served by SambaNova AI."""
+        return self in {
+            ModelType.SAMBA_LLAMA_3_1_8B,
+            ModelType.SAMBA_LLAMA_3_1_70B,
+            ModelType.SAMBA_LLAMA_3_1_405B,
+        }
+
     @property
     def is_mistral(self) -> bool:
         r"""Returns whether this type of models is served by Mistral."""
@@ -351,6 +401,16 @@ class ModelType(UnifiedModelType, Enum):
     def is_deepseek(self) -> bool:
         return self in {
             ModelType.DEEPSEEK_CHAT,
+            ModelType.DEEPSEEK_REASONER,
+        }
+
+    @property
+    def is_internlm(self) -> bool:
+        return self in {
+            ModelType.INTERNLM3_LATEST,
+            ModelType.INTERNLM3_8B_INSTRUCT,
+            ModelType.INTERNLM2_5_LATEST,
+            ModelType.INTERNLM2_PRO_CHAT,
         }
 
     @property
@@ -386,6 +446,7 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.GLM_4,
             ModelType.QWEN_VL_PLUS,
             ModelType.NVIDIA_LLAMA3_70B,
+            ModelType.TOGETHER_MISTRAL_7B,
         }:
             return 8_192
         elif self in {
@@ -396,6 +457,8 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.YI_VISION,
             ModelType.YI_SPARK,
             ModelType.YI_LARGE_RAG,
+            ModelType.SAMBA_LLAMA_3_1_8B,
+            ModelType.SAMBA_LLAMA_3_1_405B,
         }:
             return 16_384
         elif self in {
@@ -411,11 +474,17 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.NVIDIA_MISTRAL_LARGE,
             ModelType.NVIDIA_MIXTRAL_8X7B,
             ModelType.QWEN_QWQ_32B,
+            ModelType.INTERNLM3_8B_INSTRUCT,
+            ModelType.INTERNLM3_LATEST,
+            ModelType.INTERNLM2_5_LATEST,
+            ModelType.INTERNLM2_PRO_CHAT,
+            ModelType.TOGETHER_MIXTRAL_8_7B,
         }:
             return 32_768
         elif self in {
             ModelType.MISTRAL_MIXTRAL_8x22B,
             ModelType.DEEPSEEK_CHAT,
+            ModelType.DEEPSEEK_REASONER,
         }:
             return 64_000
         elif self in {
@@ -448,6 +517,7 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.NVIDIA_LLAMA3_2_3B_INSTRUCT,
             ModelType.NVIDIA_LLAMA3_3_70B_INSTRUCT,
             ModelType.GROQ_LLAMA_3_3_70B,
+            ModelType.SAMBA_LLAMA_3_1_70B,
         }:
             return 128_000
         elif self in {
@@ -457,6 +527,10 @@ class ModelType(UnifiedModelType, Enum):
             ModelType.QWEN_PLUS,
             ModelType.QWEN_TURBO,
             ModelType.QWEN_CODER_TURBO,
+            ModelType.TOGETHER_LLAMA_3_1_8B,
+            ModelType.TOGETHER_LLAMA_3_1_70B,
+            ModelType.TOGETHER_LLAMA_3_1_405B,
+            ModelType.TOGETHER_LLAMA_3_3_70B,
         }:
             return 131_072
         elif self in {
@@ -634,6 +708,7 @@ class ModelPlatformType(Enum):
     NVIDIA = "nvidia"
     DEEPSEEK = "deepseek"
     SGLANG = "sglang"
+    INTERNLM = "internlm"
 
     @property
     def is_openai(self) -> bool:
@@ -736,6 +811,11 @@ class ModelPlatformType(Enum):
         r"""Returns whether this platform is DeepSeek."""
         return self is ModelPlatformType.DEEPSEEK
 
+    @property
+    def is_internlm(self) -> bool:
+        r"""Returns whether this platform is InternLM."""
+        return self is ModelPlatformType.INTERNLM
+
 
 class AudioModelType(Enum):
     TTS_1 = "tts-1"

camel/types/openai_types.py

@@ -16,10 +16,10 @@ from openai.types.chat.chat_completion import ChatCompletion, Choice
 from openai.types.chat.chat_completion_assistant_message_param import (
     ChatCompletionAssistantMessageParam,
 )
-from openai.types.chat.chat_completion_chunk import ChatCompletionChunk
-from openai.types.chat.chat_completion_function_message_param import (
-    ChatCompletionFunctionMessageParam,
+from openai.types.chat.chat_completion_tool_message_param import (
+    ChatCompletionToolMessageParam,
 )
+from openai.types.chat.chat_completion_chunk import ChatCompletionChunk
 from openai.types.chat.chat_completion_message import ChatCompletionMessage
 from openai.types.chat.chat_completion_message_param import (
     ChatCompletionMessageParam,
@@ -33,6 +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
 
 Choice = Choice
 ChatCompletion = ChatCompletion
@@ -42,7 +43,8 @@ ChatCompletionMessageParam = ChatCompletionMessageParam
 ChatCompletionSystemMessageParam = ChatCompletionSystemMessageParam
 ChatCompletionUserMessageParam = ChatCompletionUserMessageParam
 ChatCompletionAssistantMessageParam = ChatCompletionAssistantMessageParam
-ChatCompletionFunctionMessageParam = ChatCompletionFunctionMessageParam
+ChatCompletionToolMessageParam = ChatCompletionToolMessageParam
+ChatCompletionMessageToolCall = ChatCompletionMessageToolCall
 CompletionUsage = CompletionUsage
 NOT_GIVEN = NOT_GIVEN
 NotGiven = NotGiven

camel/types/unified_model_type.py

@@ -113,6 +113,11 @@ class UnifiedModelType(str):
         r"""Returns whether the model is a Qwen model."""
         return True
 
+    @property
+    def is_internlm(self) -> bool:
+        r"""Returns whether the model is a InternLM model."""
+        return True
+
     @property
     def support_native_structured_output(self) -> bool:
         r"""Returns whether the model supports native structured output."""

camel/utils/token_counting.py

@@ -253,11 +253,11 @@ class AnthropicTokenCounter(BaseTokenCounter):
         Returns:
             int: Number of tokens in the messages.
         """
-        from anthropic.types.beta import BetaMessageParam
+        from anthropic.types import MessageParam
 
-        return self.client.beta.messages.count_tokens(
+        return self.client.messages.count_tokens(
             messages=[
-                BetaMessageParam(
+                MessageParam(
                     content=str(msg["content"]),
                     role="user" if msg["role"] == "user" else "assistant",
                 )