camel-ai 0.2.5__py3-none-any.whl → 0.2.6__py3-none-any.whl

camel/__init__.py

@@ -12,7 +12,7 @@
 # limitations under the License.
 # =========== Copyright 2023 @ CAMEL-AI.org. All Rights Reserved. ===========
 
-__version__ = '0.2.5'
+__version__ = '0.2.6'
 
 __all__ = [
     '__version__',

camel/agents/chat_agent.py

@@ -217,6 +217,8 @@ class ChatAgent(BaseAgent):
         self.response_terminators = response_terminators or []
         self.init_messages()
 
+        self.tool_prompt_added = False
+
     # ruff: noqa: E501
     def _generate_tool_prompt(self, tool_schema_list: List[Dict]) -> str:
         tool_prompts = []
@@ -448,7 +450,10 @@ class ChatAgent(BaseAgent):
             )
 
         if "llama" in self.model_type.lower():
-            if self.model_backend.model_config_dict.get("tools", None):
+            if (
+                self.model_backend.model_config_dict.get("tools", None)
+                and not self.tool_prompt_added
+            ):
                 tool_prompt = self._generate_tool_prompt(self.tool_schema_list)
 
                 tool_sys_msg = BaseMessage.make_assistant_message(
@@ -457,6 +462,7 @@ class ChatAgent(BaseAgent):
                 )
 
                 self.update_memory(tool_sys_msg, OpenAIBackendRole.SYSTEM)
+                self.tool_prompt_added = True
 
             self.update_memory(input_message, OpenAIBackendRole.USER)
 

camel/configs/__init__.py

@@ -22,10 +22,8 @@ from .openai_config import OPENAI_API_PARAMS, ChatGPTConfig
 from .reka_config import REKA_API_PARAMS, RekaConfig
 from .samba_config import (
     SAMBA_CLOUD_API_PARAMS,
-    SAMBA_FAST_API_PARAMS,
     SAMBA_VERSE_API_PARAMS,
     SambaCloudAPIConfig,
-    SambaFastAPIConfig,
     SambaVerseAPIConfig,
 )
 from .togetherai_config import TOGETHERAI_API_PARAMS, TogetherAIConfig
@@ -54,8 +52,6 @@ __all__ = [
     'MISTRAL_API_PARAMS',
     'RekaConfig',
     'REKA_API_PARAMS',
-    'SambaFastAPIConfig',
-    'SAMBA_FAST_API_PARAMS',
     'SambaVerseAPIConfig',
     'SAMBA_VERSE_API_PARAMS',
     'SambaCloudAPIConfig',

camel/configs/samba_config.py

@@ -13,7 +13,7 @@
 # =========== Copyright 2023 @ CAMEL-AI.org. All Rights Reserved. ===========
 from __future__ import annotations
 
-from typing import Any, Dict, Optional, Sequence, Union
+from typing import Any, Optional, Sequence, Union
 
 from pydantic import Field
 
@@ -21,43 +21,6 @@ from camel.configs.base_config import BaseConfig
 from camel.types import NOT_GIVEN, NotGiven
 
 
-class SambaFastAPIConfig(BaseConfig):
-    r"""Defines the parameters for generating chat completions using the
-    SambaNova Fast API.
-
-    Args:
-        max_tokens (Optional[int], optional): the maximum number of tokens to
-            generate, e.g. 100.
-            (default: :obj:`2048`)
-        stop (Optional[Union[str,list[str]]]): Stop generation if this token
-            is detected. Or if one of these tokens is detected when providing
-            a string list.
-            (default: :obj:`None`)
-        stream (Optional[bool]): If True, partial message deltas will be sent
-            as data-only server-sent events as they become available.
-            Currently SambaNova Fast API only support stream mode.
-            (default: :obj:`True`)
-        stream_options (Optional[Dict]): Additional options for streaming.
-            (default: :obj:`{"include_usage": True}`)
-    """
-
-    max_tokens: Optional[int] = 2048
-    stop: Optional[Union[str, list[str]]] = None
-    stream: Optional[bool] = True
-    stream_options: Optional[Dict] = {"include_usage": True}  # noqa: RUF012
-
-    def as_dict(self) -> dict[str, Any]:
-        config_dict = super().as_dict()
-        if "tools" in config_dict:
-            del config_dict["tools"]  # SambaNova does not support tool calling
-        return config_dict
-
-
-SAMBA_FAST_API_PARAMS = {
-    param for param in SambaFastAPIConfig().model_fields.keys()
-}
-
-
 class SambaVerseAPIConfig(BaseConfig):
     r"""Defines the parameters for generating chat completions using the
     SambaVerse API.

camel/models/samba_model.py

@@ -147,7 +147,7 @@ class SambaModel(BaseModelBackend):
     def run(  # type: ignore[misc]
         self, messages: List[OpenAIMessage]
     ) -> Union[ChatCompletion, Stream[ChatCompletionChunk]]:
-        r"""Runs SambaNova's FastAPI service.
+        r"""Runs SambaNova's service.
 
         Args:
             messages (List[OpenAIMessage]): Message list with the chat history

{camel_ai-0.2.5.dist-info → camel_ai-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: camel-ai
-Version: 0.2.5
+Version: 0.2.6
 Summary: Communicative Agents for AI Society Study
 Home-page: https://www.camel-ai.org/
 License: Apache-2.0
@@ -221,7 +221,7 @@ conda create --name camel python=3.10
 conda activate camel
 
 # Clone github repo
-git clone -b v0.2.5 https://github.com/camel-ai/camel.git
+git clone -b v0.2.6 https://github.com/camel-ai/camel.git
 
 # Change directory into project directory
 cd camel

{camel_ai-0.2.5.dist-info → camel_ai-0.2.6.dist-info}/RECORD

@@ -1,7 +1,7 @@
-camel/__init__.py,sha256=WNGrDQowtXEONUCbvjTH67glbRf_HlK9NGHZHgV7tW0,778
+camel/__init__.py,sha256=kQJbo-CyZTi3aBL5-8hXGherAGh6ZlE1O_BxJfCayco,778
 camel/agents/__init__.py,sha256=SSU1wbhZXWwQnE0rRxkpyN57kEu72KklsZNcdLkXfTs,1551
 camel/agents/base.py,sha256=X39qWSiT1WnDqaJ9k3gQrTpOQSwUKzNEVpp5AY6fDH8,1130
-camel/agents/chat_agent.py,sha256=eA7kuzbfQkEdnvefxk6t_-MhB64ibSgSiQ54ztiqvJI,44764
+camel/agents/chat_agent.py,sha256=-Ug-nS40SmhVyzQuNU6xkzwd4s5cc2BAR6a8a5VPMkM,44929
 camel/agents/critic_agent.py,sha256=To-istnO-9Eb0iabdeIDrgfvkxYYfsdX9xIZiSrc3oM,7493
 camel/agents/deductive_reasoner_agent.py,sha256=49vwglWYHgXf-VRftdMN9OFGOwqdsXyTt45PP6z-pbg,13473
 camel/agents/embodied_agent.py,sha256=3ABuiRQXBpplKbuhPY5KNLJyKc6Z8SgXgzIges3ZwVs,7542
@@ -18,7 +18,7 @@ camel/bots/slack/__init__.py,sha256=6DvvD5-9phNWdF8fDEYWU6ZaQo6fuOkRbFp2Y-jzKpw,
 camel/bots/slack/models.py,sha256=cb3rD6vWPMTremG5wiqylJL1-I6AghrdlmaihE-xFok,5149
 camel/bots/slack/slack_app.py,sha256=umTiWpMYv65i6rV3MR2jjdwswUfWLzX1C2s1--NCRtI,9950
 camel/bots/telegram_bot.py,sha256=MM91afWKUtEZLOoybFY7LGisQJFypc_p_P8kQOUlXwg,2747
-camel/configs/__init__.py,sha256=uWDugt92v48tg3g78fI_6J2G5wdCA7Ds5IV6HXvuXF0,2299
+camel/configs/__init__.py,sha256=uAuaQHWfy499kd2ESY_wA5FPxtXjUq2mmVXf3lwIW0k,2193
 camel/configs/anthropic_config.py,sha256=ie4un-NMWARs_ALaq-0LTqcZOkft5bAS4Ybv_mfigjQ,3284
 camel/configs/base_config.py,sha256=JBrIAGoPHjTJwsWTuyfdtMFa0TpVRsddNpSr8KgggcQ,2473
 camel/configs/gemini_config.py,sha256=qhGdWMRP87E99ApQdRrf9UyFpp2R0k6Y2n9ZV27qpzs,6879
@@ -28,7 +28,7 @@ camel/configs/mistral_config.py,sha256=G9LuY0-3S6az-8j8kpqB-4asgoaxTOsZVYeZBYJl6
 camel/configs/ollama_config.py,sha256=4Qw5V89wljCj7ie3zI6wXL7XqdCFmRH2TzVM6uqSV1k,4354
 camel/configs/openai_config.py,sha256=Q-V3GmU08wiXxEIqsaPSWLN1GonRVXUFt-VWUAhD0KU,6477
 camel/configs/reka_config.py,sha256=ECYg3BT7onwZX-iKLq-5TBhCFdm70rV-9hZ_G6Ye8-k,3504
-camel/configs/samba_config.py,sha256=a9Y-dYkktXgIGGeEVW9NY7cCaLsBUoWsvkRlHratAZ8,10250
+camel/configs/samba_config.py,sha256=JhCWdJZpaOFr3N6MK3ocqM37T4d39GgyYnWG7chO3Gg,8831
 camel/configs/togetherai_config.py,sha256=-yUZWvD138PX2uvTzAv1WaFBwz5ViFeGl-S0xn7en-0,5661
 camel/configs/vllm_config.py,sha256=zz0NlIE3Xd_2YT5iJk2OwnFvvTIVz5vMb79QUnhDf6o,5514
 camel/configs/zhipuai_config.py,sha256=VW1s4cgT375ALk-W4SRvnJmGCNsZEtDpDb8MSi5tkqs,3595
@@ -80,7 +80,7 @@ camel/models/openai_audio_models.py,sha256=_ddOxqzFZCVZaK6h33Z0THU6HXk2XlJTxVWqu
 camel/models/openai_compatible_model.py,sha256=ToABSdpKaqmLsQeGlGUCwZoT2UvLIyVEYfMzxOumumY,4064
 camel/models/openai_model.py,sha256=3RC-8GsI0dTY3zu9JZQCdgNTQq5UFPrVCUYfxTcYeug,6089
 camel/models/reka_model.py,sha256=KZYNQFN2Wey0qe7i25yo7YIW5ciTH03fnxXZk-UaYWk,8283
-camel/models/samba_model.py,sha256=4C9XrhLD6VQbTFkO1nYkED_J2lbwE7sS4K2r23dec2I,14400
+camel/models/samba_model.py,sha256=9smEGflYNpM9wIcfW3GYpGlqhAhiCYc2m22HAEF0gkM,14392
 camel/models/stub_model.py,sha256=ewwO7AMQ3BbbO7Yk8wkVVXWy27yv9aNgxu4QU_e-ZWE,3709
 camel/models/togetherai_model.py,sha256=gEf8r2d5z4hPqvW8TKiyMOja9iWrNTwdSk9ljiYzFsQ,5251
 camel/models/vllm_model.py,sha256=eUUZOeyuBIrGKhbJg0slpwPCGHcr30EJWhL8kF3Zu3w,5655
@@ -202,7 +202,7 @@ camel/utils/async_func.py,sha256=_N3HIrQ9QagXjHzgTd_OKHDlmi059yPw2_lf8Pb6NHQ,156
 camel/utils/commons.py,sha256=Bj_QzhNddDRqKqgLBOBL9lMl0jvmbaE-YU3a72IzSjs,17533
 camel/utils/constants.py,sha256=8n4F8Y-DZy4z2F0hRvAq6f-d9SbS59kK5FyLrnJ3mkY,1360
 camel/utils/token_counting.py,sha256=6mc5PmyN5sOP02u02r7Jjxki75hjk9z1KPaIx_0wFmY,14624
-camel_ai-0.2.5.dist-info/LICENSE,sha256=id0nB2my5kG0xXeimIu5zZrbHLS6EQvxvkKkzIHaT2k,11343
-camel_ai-0.2.5.dist-info/METADATA,sha256=u61_xc3VFEchg9EiyDlINFfXwD9lCewAkpRpwAUl49E,23181
-camel_ai-0.2.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-camel_ai-0.2.5.dist-info/RECORD,,
+camel_ai-0.2.6.dist-info/LICENSE,sha256=id0nB2my5kG0xXeimIu5zZrbHLS6EQvxvkKkzIHaT2k,11343
+camel_ai-0.2.6.dist-info/METADATA,sha256=v5s7R1MITxOaDYtxjIdjmcElIUj0VQ1CxXwiNqatYMw,23181
+camel_ai-0.2.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+camel_ai-0.2.6.dist-info/RECORD,,