camel-ai 0.2.4a0__tar.gz → 0.2.6__tar.gz

{camel_ai-0.2.4a0 → camel_ai-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: camel-ai
-Version: 0.2.4a0
+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.4a 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.4a0 → camel_ai-0.2.6}/README.md

@@ -116,7 +116,7 @@ conda create --name camel python=3.10
 conda activate camel
 
 # Clone github repo
-git clone -b v0.2.4a 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.4a0 → camel_ai-0.2.6}/camel/__init__.py

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

{camel_ai-0.2.4a0 → camel_ai-0.2.6}/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_ai-0.2.4a0 → camel_ai-0.2.6}/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_ai-0.2.4a0 → camel_ai-0.2.6}/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_ai-0.2.4a0 → camel_ai-0.2.6}/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.4a0 → camel_ai-0.2.6}/camel/retrievers/auto_retriever.py

@@ -11,8 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # =========== Copyright 2023 @ CAMEL-AI.org. All Rights Reserved. ===========
-import datetime
-import os
 import re
 import uuid
 from typing import (
@@ -31,7 +29,6 @@ from camel.storages import (
     BaseVectorStorage,
     MilvusStorage,
     QdrantStorage,
-    VectorDBQuery,
 )
 from camel.types import StorageType
 from camel.utils import Constants
@@ -126,62 +123,6 @@ class AutoRetriever:
 
         return collection_name
 
-    def _get_file_modified_date_from_file(
-        self, content_input_path: str
-    ) -> str:
-        r"""Retrieves the last modified date and time of a given file. This
-        function takes a file path as input and returns the last modified date
-        and time of that file.
-
-        Args:
-            content_input_path (str): The file path of the content whose
-                modified date is to be retrieved.
-
-        Returns:
-            str: The last modified time from file.
-        """
-        mod_time = os.path.getmtime(content_input_path)
-        readable_mod_time = datetime.datetime.fromtimestamp(
-            mod_time
-        ).isoformat(timespec='seconds')
-        return readable_mod_time
-
-    def _get_file_modified_date_from_storage(
-        self, vector_storage_instance: BaseVectorStorage
-    ) -> str:
-        r"""Retrieves the last modified date and time of a given file. This
-        function takes vector storage instance as input and returns the last
-        modified date from the metadata.
-
-        Args:
-            vector_storage_instance (BaseVectorStorage): The vector storage
-                where modified date is to be retrieved from metadata.
-
-        Returns:
-            str: The last modified date from vector storage.
-        """
-
-        # Insert any query to get modified date from vector db
-        # NOTE: Can be optimized when CAMEL vector storage support
-        # direct chunk payload extraction
-        query_vector_any = self.embedding_model.embed(obj="any_query")
-        query_any = VectorDBQuery(query_vector_any, top_k=1)
-        result_any = vector_storage_instance.query(query_any)
-
-        # Extract the file's last modified date from the metadata
-        # in the query result
-        if result_any[0].record.payload is not None:
-            file_modified_date_from_meta = result_any[0].record.payload[
-                "metadata"
-            ]['last_modified']
-        else:
-            raise ValueError(
-                "The vector storage exits but the payload is None,"
-                "please check the collection"
-            )
-
-        return file_modified_date_from_meta
-
     def run_vector_retriever(
         self,
         query: str,
@@ -246,34 +187,7 @@ class AutoRetriever:
                     collection_name
                 )
 
-                # Check the modified time of the input file path, only works
-                # for local path since no standard way for remote url
-                file_is_modified = False  # initialize with a default value
-                if (
-                    vector_storage_instance.status().vector_count != 0
-                    and isinstance(content, str)
-                    and os.path.exists(content)
-                ):
-                    # Get original modified date from file
-                    modified_date_from_file = (
-                        self._get_file_modified_date_from_file(content)
-                    )
-                    # Get modified date from vector storage
-                    modified_date_from_storage = (
-                        self._get_file_modified_date_from_storage(
-                            vector_storage_instance
-                        )
-                    )
-                    # Determine if the file has been modified since the last
-                    # check
-                    file_is_modified = (
-                        modified_date_from_file != modified_date_from_storage
-                    )
-
-                if (
-                    vector_storage_instance.status().vector_count == 0
-                    or file_is_modified
-                ):
+                if vector_storage_instance.status().vector_count == 0:
                     # Clear the vector storage
                     vector_storage_instance.clear()
                     # Process and store the content to the vector storage

{camel_ai-0.2.4a0 → camel_ai-0.2.6}/camel/retrievers/vector_retriever.py

@@ -149,7 +149,11 @@ class VectorRetriever(BaseRetriever):
                             "content path": content.metadata.file_directory
                             or ""
                         }
+
                     chunk_metadata = {"metadata": chunk.metadata.to_dict()}
+                    # Remove the 'orig_elements' key if it exists
+                    chunk_metadata["metadata"].pop("orig_elements", "")
+
                     chunk_text = {"text": str(chunk)}
                     combined_dict = {
                         **content_path_info,

{camel_ai-0.2.4a0/camel → camel_ai-0.2.6/camel/societies}/workforce/base.py

@@ -14,8 +14,8 @@
 from abc import ABC, abstractmethod
 from typing import Any
 
-from camel.workforce.task_channel import TaskChannel
-from camel.workforce.utils import check_if_running
+from camel.societies.workforce.task_channel import TaskChannel
+from camel.societies.workforce.utils import check_if_running
 
 
 class BaseNode(ABC):

{camel_ai-0.2.4a0/camel → camel_ai-0.2.6/camel/societies}/workforce/role_playing_worker.py

@@ -21,14 +21,14 @@ from colorama import Fore
 from camel.agents.chat_agent import ChatAgent
 from camel.messages.base import BaseMessage
 from camel.societies import RolePlaying
-from camel.tasks.task import Task, TaskState
-from camel.utils import print_text_animated
-from camel.workforce.prompts import (
+from camel.societies.workforce.prompts import (
     ROLEPLAY_PROCESS_TASK_PROMPT,
     ROLEPLAY_SUMMARIZE_PROMPT,
 )
-from camel.workforce.utils import TaskResult
-from camel.workforce.worker import Worker
+from camel.societies.workforce.utils import TaskResult
+from camel.societies.workforce.worker import Worker
+from camel.tasks.task import Task, TaskState
+from camel.utils import print_text_animated
 
 
 class RolePlayingWorker(Worker):

{camel_ai-0.2.4a0/camel → camel_ai-0.2.6/camel/societies}/workforce/single_agent_worker.py

@@ -20,11 +20,11 @@ from colorama import Fore
 
 from camel.agents import ChatAgent
 from camel.messages.base import BaseMessage
+from camel.societies.workforce.prompts import PROCESS_TASK_PROMPT
+from camel.societies.workforce.utils import TaskResult
+from camel.societies.workforce.worker import Worker
 from camel.tasks.task import Task, TaskState
 from camel.utils import print_text_animated
-from camel.workforce.prompts import PROCESS_TASK_PROMPT
-from camel.workforce.utils import TaskResult
-from camel.workforce.worker import Worker
 
 
 class SingleAgentWorker(Worker):

{camel_ai-0.2.4a0/camel → camel_ai-0.2.6/camel/societies}/workforce/worker.py

@@ -19,10 +19,10 @@ from typing import List
 
 from colorama import Fore
 
+from camel.societies.workforce.base import BaseNode
+from camel.societies.workforce.task_channel import TaskChannel
+from camel.societies.workforce.utils import check_if_running
 from camel.tasks.task import Task, TaskState
-from camel.workforce.base import BaseNode
-from camel.workforce.task_channel import TaskChannel
-from camel.workforce.utils import check_if_running
 
 logger = logging.getLogger(__name__)
 

{camel_ai-0.2.4a0/camel → camel_ai-0.2.6/camel/societies}/workforce/workforce.py

@@ -25,24 +25,24 @@ from camel.agents import ChatAgent
 from camel.configs import ChatGPTConfig
 from camel.messages.base import BaseMessage
 from camel.models import ModelFactory
-from camel.tasks.task import Task, TaskState
-from camel.toolkits import SEARCH_FUNCS, WEATHER_FUNCS, GoogleMapsToolkit
-from camel.types import ModelPlatformType, ModelType
-from camel.workforce.base import BaseNode
-from camel.workforce.prompts import (
+from camel.societies.workforce.base import BaseNode
+from camel.societies.workforce.prompts import (
     ASSIGN_TASK_PROMPT,
     CREATE_NODE_PROMPT,
     WF_TASK_DECOMPOSE_PROMPT,
 )
-from camel.workforce.role_playing_worker import RolePlayingWorker
-from camel.workforce.single_agent_worker import SingleAgentWorker
-from camel.workforce.task_channel import TaskChannel
-from camel.workforce.utils import (
+from camel.societies.workforce.role_playing_worker import RolePlayingWorker
+from camel.societies.workforce.single_agent_worker import SingleAgentWorker
+from camel.societies.workforce.task_channel import TaskChannel
+from camel.societies.workforce.utils import (
     TaskAssignResult,
     WorkerConf,
     check_if_running,
 )
-from camel.workforce.worker import Worker
+from camel.societies.workforce.worker import Worker
+from camel.tasks.task import Task, TaskState
+from camel.toolkits import SEARCH_FUNCS, WEATHER_FUNCS, GoogleMapsToolkit
+from camel.types import ModelPlatformType, ModelType
 
 logger = logging.getLogger(__name__)
 

{camel_ai-0.2.4a0 → camel_ai-0.2.6}/camel/toolkits/dalle_toolkit.py

@@ -25,9 +25,8 @@ from camel.toolkits.base import BaseToolkit
 
 
 class DalleToolkit(BaseToolkit):
-    r"""A class representing a toolkit for image generation using OpenAI's.
-
-    This class provides methods handle image generation using OpenAI's DALL-E.
+    r"""A class representing a toolkit for image generation using OpenAI's
+    DALL-E model.
     """
 
     def base64_to_image(self, base64_string: str) -> Optional[Image.Image]:

{camel_ai-0.2.4a0 → camel_ai-0.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "camel-ai"
-version = "0.2.4a"
+version = "0.2.6"
 authors = ["CAMEL-AI.org"]
 description = "Communicative Agents for AI Society Study"
 readme = "README.md"