camel-ai 0.2.65__py3-none-any.whl → 0.2.82__py3-none-any.whl

camel/models/qwen_model.py

@@ -1,4 +1,4 @@
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -10,22 +10,14 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 
 import os
-import time
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, Optional, Union
 
-from openai import AsyncStream, Stream
-
-from camel.configs import QWEN_API_PARAMS, QwenConfig
-from camel.messages import OpenAIMessage
+from camel.configs import QwenConfig
 from camel.models.openai_compatible_model import OpenAICompatibleModel
-from camel.types import (
-    ChatCompletion,
-    ChatCompletionChunk,
-    ModelType,
-)
+from camel.types import ModelType
 from camel.utils import (
     BaseTokenCounter,
     api_keys_required,
@@ -54,6 +46,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 +65,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,184 +83,6 @@ class QwenModel(OpenAICompatibleModel):
             url=url,
             token_counter=token_counter,
             timeout=timeout,
+            max_retries=max_retries,
+            **kwargs,
         )
-
-    def _post_handle_response(
-        self, response: Union[ChatCompletion, Stream[ChatCompletionChunk]]
-    ) -> ChatCompletion:
-        r"""Handle reasoning content with <think> tags at the beginning."""
-        if not isinstance(response, Stream):
-            # Handle non-streaming response (existing logic)
-            if self.model_config_dict.get("extra_body", {}).get(
-                "enable_thinking", False
-            ):
-                reasoning_content = response.choices[
-                    0
-                ].message.reasoning_content  # type: ignore[attr-defined]
-                combined_content = (
-                    f"<think>\n{reasoning_content}\n</think>\n"
-                    if reasoning_content
-                    else ""
-                )
-                response_content = response.choices[0].message.content or ""
-                combined_content += response_content
-
-                # Construct a new ChatCompletion with combined content
-                return ChatCompletion.construct(
-                    id=response.id,
-                    choices=[
-                        dict(
-                            finish_reason=response.choices[0].finish_reason,
-                            index=response.choices[0].index,
-                            logprobs=response.choices[0].logprobs,
-                            message=dict(
-                                role=response.choices[0].message.role,
-                                content=combined_content,
-                            ),
-                        )
-                    ],
-                    created=response.created,
-                    model=response.model,
-                    object="chat.completion",
-                    system_fingerprint=response.system_fingerprint,
-                    usage=response.usage,
-                )
-            else:
-                return response  # Return original if no thinking enabled
-
-        # Handle streaming response
-        accumulated_reasoning = ""
-        accumulated_content = ""
-        final_chunk = None
-        usage_data = None  # Initialize usage data
-        role = "assistant"  # Default role
-
-        for chunk in response:
-            final_chunk = chunk  # Keep track of the last chunk for metadata
-            if chunk.choices:
-                delta = chunk.choices[0].delta
-                if delta.role:
-                    role = delta.role  # Update role if provided
-                if (
-                    hasattr(delta, 'reasoning_content')
-                    and delta.reasoning_content
-                ):
-                    accumulated_reasoning += delta.reasoning_content
-                if delta.content:
-                    accumulated_content += delta.content
-
-            if hasattr(chunk, 'usage') and chunk.usage:
-                usage_data = chunk.usage
-
-        combined_content = (
-            f"<think>\n{accumulated_reasoning}\n</think>\n"
-            if accumulated_reasoning
-            else ""
-        ) + accumulated_content
-
-        # Construct the final ChatCompletion object from accumulated
-        # stream data
-        if final_chunk:
-            finish_reason = "stop"  # Default finish reason
-            logprobs = None
-            if final_chunk.choices:
-                finish_reason = (
-                    final_chunk.choices[0].finish_reason or finish_reason
-                )
-                if hasattr(final_chunk.choices[0], 'logprobs'):
-                    logprobs = final_chunk.choices[0].logprobs
-
-            return ChatCompletion.construct(
-                # Use data from the final chunk or defaults
-                id=final_chunk.id
-                if hasattr(final_chunk, 'id')
-                else "streamed-completion",
-                choices=[
-                    dict(
-                        finish_reason=finish_reason,
-                        index=0,
-                        logprobs=logprobs,
-                        message=dict(
-                            role=role,
-                            content=combined_content,
-                        ),
-                    )
-                ],
-                created=final_chunk.created
-                if hasattr(final_chunk, 'created')
-                else int(time.time()),
-                model=final_chunk.model
-                if hasattr(final_chunk, 'model')
-                else self.model_type,
-                object="chat.completion",
-                system_fingerprint=final_chunk.system_fingerprint
-                if hasattr(final_chunk, 'system_fingerprint')
-                else None,
-                usage=usage_data,
-            )
-        else:
-            # Handle cases where the stream was empty or invalid
-            return ChatCompletion.construct(
-                id="empty-stream",
-                choices=[
-                    dict(
-                        finish_reason="error",
-                        index=0,
-                        message=dict(role="assistant", content=""),
-                    )
-                ],
-                created=int(time.time()),
-                model=self.model_type,
-                object="chat.completion",
-                usage=usage_data,
-            )
-
-    def _request_chat_completion(
-        self,
-        messages: List[OpenAIMessage],
-        tools: Optional[List[Dict[str, Any]]] = None,
-    ) -> Union[ChatCompletion, Stream[ChatCompletionChunk]]:
-        request_config = self.model_config_dict.copy()
-
-        if tools:
-            request_config["tools"] = tools
-
-        return self._post_handle_response(
-            self._client.chat.completions.create(
-                messages=messages,
-                model=self.model_type,
-                **request_config,
-            )
-        )
-
-    async def _arequest_chat_completion(
-        self,
-        messages: List[OpenAIMessage],
-        tools: Optional[List[Dict[str, Any]]] = None,
-    ) -> Union[ChatCompletion, AsyncStream[ChatCompletionChunk]]:
-        request_config = self.model_config_dict.copy()
-
-        if tools:
-            request_config["tools"] = tools
-
-        response = await self._async_client.chat.completions.create(
-            messages=messages,
-            model=self.model_type,
-            **request_config,
-        )
-        return self._post_handle_response(response)
-
-    def check_model_config(self):
-        r"""Check whether the model configuration contains any
-        unexpected arguments to Qwen API.
-
-        Raises:
-            ValueError: If the model configuration dictionary contains any
-                unexpected arguments to Qwen API.
-        """
-        for param in self.model_config_dict:
-            if param not in QWEN_API_PARAMS:
-                raise ValueError(
-                    f"Unexpected argument `{param}` is "
-                    "input into Qwen model backend."
-                )

camel/models/reka_model.py

@@ -1,4 +1,4 @@
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -10,13 +10,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 import os
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Type, Union
 
 from pydantic import BaseModel
 
-from camel.configs import REKA_API_PARAMS, RekaConfig
+from camel.configs import RekaConfig
 from camel.messages import OpenAIMessage
 from camel.models import BaseModelBackend
 from camel.types import ChatCompletion, ModelType
@@ -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(
@@ -339,21 +354,6 @@ class RekaModel(BaseModelBackend):
 
         return openai_response
 
-    def check_model_config(self):
-        r"""Check whether the model configuration contains any
-        unexpected arguments to Reka API.
-
-        Raises:
-            ValueError: If the model configuration dictionary contains any
-                unexpected arguments to Reka API.
-        """
-        for param in self.model_config_dict:
-            if param not in REKA_API_PARAMS:
-                raise ValueError(
-                    f"Unexpected argument `{param}` is "
-                    "input into Reka model backend."
-                )
-
     @property
     def stream(self) -> bool:
         r"""Returns whether the model is in stream mode, which sends partial

camel/models/reward/__init__.py

@@ -1,4 +1,4 @@
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -10,7 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 from .base_reward_model import BaseRewardModel
 from .evaluator import Evaluator
 from .nemotron_model import NemotronRewardModel

camel/models/reward/base_reward_model.py

@@ -1,4 +1,4 @@
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -10,7 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 from abc import ABC, abstractmethod
 from typing import Dict, List, Optional, Union
 

camel/models/reward/evaluator.py

@@ -1,4 +1,4 @@
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -10,7 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 from typing import Dict, List
 
 from camel.models.reward import BaseRewardModel

camel/models/reward/nemotron_model.py

@@ -1,4 +1,4 @@
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -10,7 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 import os
 from typing import Dict, List, Optional, Union
 

camel/models/reward/skywork_model.py

@@ -1,4 +1,4 @@
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -10,7 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 from typing import Dict, List, Optional, Union
 
 import torch

camel/models/samba_model.py

@@ -1,4 +1,4 @@
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -10,7 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 import json
 import os
 import time
@@ -22,8 +22,6 @@ from openai import AsyncOpenAI, AsyncStream, OpenAI, Stream
 from pydantic import BaseModel
 
 from camel.configs import (
-    SAMBA_CLOUD_API_PARAMS,
-    SAMBA_VERSE_API_PARAMS,
     SambaCloudAPIConfig,
 )
 from camel.messages import OpenAIMessage
@@ -88,6 +86,18 @@ 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`)
+        client (Optional[Any], optional): A custom synchronous
+            OpenAI-compatible client instance. If provided, this client will
+            be used instead of creating a new one. Only applicable when using
+            SambaNova Cloud API. (default: :obj:`None`)
+        async_client (Optional[Any], optional): A custom asynchronous
+            OpenAI-compatible client instance. If provided, this client will
+            be used instead of creating a new one. Only applicable when using
+            SambaNova Cloud API. (default: :obj:`None`)
+        **kwargs (Any): Additional arguments to pass to the client
+            initialization. Ignored if custom clients are provided.
     """
 
     @api_keys_required(
@@ -103,6 +113,10 @@ class SambaModel(BaseModelBackend):
         url: Optional[str] = None,
         token_counter: Optional[BaseTokenCounter] = None,
         timeout: Optional[float] = None,
+        max_retries: int = 3,
+        client: Optional[Any] = None,
+        async_client: Optional[Any] = None,
+        **kwargs: Any,
     ) -> None:
         if model_config_dict is None:
             model_config_dict = SambaCloudAPIConfig().as_dict()
@@ -113,22 +127,39 @@ 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,
         )
 
+        # Only create clients for Cloud API mode
         if self._url == "https://api.sambanova.ai/v1":
-            self._client = OpenAI(
-                timeout=self._timeout,
-                max_retries=3,
-                base_url=self._url,
-                api_key=self._api_key,
-            )
-            self._async_client = AsyncOpenAI(
-                timeout=self._timeout,
-                max_retries=3,
-                base_url=self._url,
-                api_key=self._api_key,
-            )
+            # Use custom clients if provided, otherwise create new ones
+            if client is not None:
+                self._client = client
+            else:
+                self._client = OpenAI(
+                    timeout=self._timeout,
+                    max_retries=self._max_retries,
+                    base_url=self._url,
+                    api_key=self._api_key,
+                    **kwargs,
+                )
+
+            if async_client is not None:
+                self._async_client = async_client
+            else:
+                self._async_client = AsyncOpenAI(
+                    timeout=self._timeout,
+                    max_retries=self._max_retries,
+                    base_url=self._url,
+                    api_key=self._api_key,
+                    **kwargs,
+                )
 
     @property
     def token_counter(self) -> BaseTokenCounter:
@@ -142,36 +173,6 @@ class SambaModel(BaseModelBackend):
             self._token_counter = OpenAITokenCounter(ModelType.GPT_4O_MINI)
         return self._token_counter
 
-    def check_model_config(self):
-        r"""Check whether the model configuration contains any
-        unexpected arguments to SambaNova API.
-
-        Raises:
-            ValueError: If the model configuration dictionary contains any
-                unexpected arguments to SambaNova API.
-        """
-        if self._url == "https://sambaverse.sambanova.ai/api/predict":
-            for param in self.model_config_dict:
-                if param not in SAMBA_VERSE_API_PARAMS:
-                    raise ValueError(
-                        f"Unexpected argument `{param}` is "
-                        "input into SambaVerse API."
-                    )
-
-        elif self._url == "https://api.sambanova.ai/v1":
-            for param in self.model_config_dict:
-                if param not in SAMBA_CLOUD_API_PARAMS:
-                    raise ValueError(
-                        f"Unexpected argument `{param}` is "
-                        "input into SambaCloud API."
-                    )
-
-        else:
-            raise ValueError(
-                f"{self._url} is not supported, please check the url to the"
-                " SambaNova service"
-            )
-
     @observe(as_type="generation")
     async def _arun(  # type: ignore[misc]
         self,