camel-ai 0.2.4a0__py3-none-any.whl → 0.2.5__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.4a'
+__version__ = '0.2.5'
 
 __all__ = [
     '__version__',

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/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/{workforce → 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/{workforce → 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/{workforce → 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/{workforce → 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/{workforce → 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/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.dist-info → camel_ai-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: camel-ai
-Version: 0.2.4a0
+Version: 0.2.5
 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.5 https://github.com/camel-ai/camel.git
 
 # Change directory into project directory
 cd camel

{camel_ai-0.2.4a0.dist-info → camel_ai-0.2.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-camel/__init__.py,sha256=I4MEIgT9cQYnIJCfLDD7vczcL81hEfFuBK41Wz9bJDw,779
+camel/__init__.py,sha256=WNGrDQowtXEONUCbvjTH67glbRf_HlK9NGHZHgV7tW0,778
 camel/agents/__init__.py,sha256=SSU1wbhZXWwQnE0rRxkpyN57kEu72KklsZNcdLkXfTs,1551
 camel/agents/base.py,sha256=X39qWSiT1WnDqaJ9k3gQrTpOQSwUKzNEVpp5AY6fDH8,1130
 camel/agents/chat_agent.py,sha256=eA7kuzbfQkEdnvefxk6t_-MhB64ibSgSiQ54ztiqvJI,44764
@@ -104,14 +104,23 @@ camel/prompts/video_description_prompt.py,sha256=HRd3fHXftKwBm5QH7Tvm3FabgZPCoAv
 camel/responses/__init__.py,sha256=edtTQskOgq5obyITziRFL62HTJP9sAikAtP9vrFacEQ,795
 camel/responses/agent_responses.py,sha256=sGlGwXz2brWI-FpiU5EhVRpZvcfGWUmooAF0ukqAF3I,1771
 camel/retrievers/__init__.py,sha256=CuP3B77zl2PoF-W2y9xSkTGRzoK2J4TlUHdCtuJD8dg,1059
-camel/retrievers/auto_retriever.py,sha256=WJ1b-xOGu13nSqb1Sz5gs0xVRvVnbp71Lp9lXJ2Yq2Y,13010
+camel/retrievers/auto_retriever.py,sha256=EVbm0aTWcOZ8foZ-GY9-msuDoz0tBM5sOveWypy7A9M,9587
 camel/retrievers/base.py,sha256=sgqaJDwIkWluEgPBlukFN7RYZJnrp0imCAOEWm6bZ40,2646
 camel/retrievers/bm25_retriever.py,sha256=Dr7Yfkjw45sovI1EVNByGIMj7KERWrr8JHlh8csSF1s,5155
 camel/retrievers/cohere_rerank_retriever.py,sha256=HvnFqXpsX9EdBOab0kFLDyxxJnknPFMVxyQJQDlHbOA,4100
-camel/retrievers/vector_retriever.py,sha256=8ICL6lNiqv2fSk_Z4SYek3x_xYkYAsV9wAO0ibzex_E,9588
+camel/retrievers/vector_retriever.py,sha256=lThlfwCMQJr-PXFBwmgeRpVRBg-8_0kjJuO5r_-DJQo,9728
 camel/societies/__init__.py,sha256=JhGwUHjht4CewzC3shKuxmgB3oS7FIxIxmiKyhNsfIs,832
 camel/societies/babyagi_playing.py,sha256=z0nKqtq4374BLN-eGNTf07OcTPmJtRO4avTDkbeaOHg,11788
 camel/societies/role_playing.py,sha256=LSkYqNAFcKn9JNFLIEfoUTNP7cYeXaIzaIHcha9IM9Q,23469
+camel/societies/workforce/__init__.py,sha256=m2KbPItARjIyKiHc_Z34joWTJ-1XnIJfQqAZEeonz2U,926
+camel/societies/workforce/base.py,sha256=qPjZ31tQL6kBm2QdmaQf7ZmOrOSUsNbV0k06NUKdh70,1829
+camel/societies/workforce/prompts.py,sha256=0Wcu7HpiyaD_387urc2P1uY9-DN8JAdk00HSlhNWz34,6184
+camel/societies/workforce/role_playing_worker.py,sha256=Eoy3CNGUBWFVpvxIR7sQndn3hKkGl_zeu4xekfYwAyI,7139
+camel/societies/workforce/single_agent_worker.py,sha256=Ku5nLTxdVZ8LF6z5q56VHS_AYDVCFqW-ko7HErQ57UU,3593
+camel/societies/workforce/task_channel.py,sha256=WE3SHp5TKaXDzKnoul9KPfk-PkBMcGT6akVId0RtWpY,6724
+camel/societies/workforce/utils.py,sha256=kBrjA_k9BblJBT13kW0eQYcBDjetyjOUHMbRuh_IfPM,2270
+camel/societies/workforce/worker.py,sha256=zkobmWU2eCOoNNppesFkFCyHF4DvIbUZzRmmeD1ZN1k,3874
+camel/societies/workforce/workforce.py,sha256=7LEZm9csxYIiOBs2MyQk_T7DpNoPyrV9hDyQqeZ5yjI,18261
 camel/storages/__init__.py,sha256=erzsXX2rPVodgWxlV6hSjwmc4UCguzVb6m3ahBoyWu0,1623
 camel/storages/graph_storages/__init__.py,sha256=YFwNjNYaxpKT2j5dxWZur62T8J0ZPER3DHaWGEAXgo8,954
 camel/storages/graph_storages/base.py,sha256=-Ys1BIuz4H5FvYMZTBIjg8Cfv40CPQ-OsovwMzygEgU,2858
@@ -144,7 +153,7 @@ camel/toolkits/arxiv_toolkit.py,sha256=puM9SvpbitvAn0p6v9DexO307suAP_Fcq4b5V9t4M
 camel/toolkits/ask_news_toolkit.py,sha256=6imOAdQ2kur6U99xmCPFM7m_HcgQLqSeMWLb_u5t25A,23524
 camel/toolkits/base.py,sha256=seVhKQIkPWSADIn81CVAeYGJvrtFdnthPjRe6T7Xpxc,979
 camel/toolkits/code_execution.py,sha256=-jBubEBsVPCjGTOXIVTj0kXntajqB98J0NPLlB6Xu6M,2426
-camel/toolkits/dalle_toolkit.py,sha256=osyBhZy_HYPAJvLsQk4PIo6w2by1RRn3D-gUZMEdv3I,5247
+camel/toolkits/dalle_toolkit.py,sha256=uQ3LvQt7A0ILMLAMucE33CwP1A9RI-YpTHZ4NCyd15g,5184
 camel/toolkits/function_tool.py,sha256=OwAC6Eca_QaYf0DKS2BSBM7eA71-dWBpKi77TbL3_2E,15508
 camel/toolkits/github_toolkit.py,sha256=pWXf0z_SFZPfANwKycNmnENT6aEk4tADMjqAW_eUhgE,10972
 camel/toolkits/google_maps_toolkit.py,sha256=73CrBaL_DKEWiN3eP7CdFOxX2ZQ6NuPKR7oQeAOiKZw,11954
@@ -193,16 +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/workforce/__init__.py,sha256=m2KbPItARjIyKiHc_Z34joWTJ-1XnIJfQqAZEeonz2U,926
-camel/workforce/base.py,sha256=ScUPdtMLJgvvJkGEku6rrr4gBRw3GFt3V8HlYOY5Y8A,1809
-camel/workforce/prompts.py,sha256=0Wcu7HpiyaD_387urc2P1uY9-DN8JAdk00HSlhNWz34,6184
-camel/workforce/role_playing_worker.py,sha256=CIo_akfzeCvOovfDXR847DGR1FQ8jm28koiayuCsNzM,7109
-camel/workforce/single_agent_worker.py,sha256=k6QFoKwTfdzfn6_kYqaDhQA2gLytF6aKZf8Z_ZW_Gvw,3563
-camel/workforce/task_channel.py,sha256=WE3SHp5TKaXDzKnoul9KPfk-PkBMcGT6akVId0RtWpY,6724
-camel/workforce/utils.py,sha256=kBrjA_k9BblJBT13kW0eQYcBDjetyjOUHMbRuh_IfPM,2270
-camel/workforce/worker.py,sha256=oZtl3PhxgpizKy7W_wB94Qm4Z2Tw4k1SQsqAGAi_XoI,3844
-camel/workforce/workforce.py,sha256=IV911OlzSng_qR8KafFlDvkUEzEFa6A_upTgi8kZKxI,18191
-camel_ai-0.2.4a0.dist-info/LICENSE,sha256=id0nB2my5kG0xXeimIu5zZrbHLS6EQvxvkKkzIHaT2k,11343
-camel_ai-0.2.4a0.dist-info/METADATA,sha256=Zv3sAPnj-Q5zRNMUAMtZPkgNpVaYPfcG2cCWmOlQ2iM,23184
-camel_ai-0.2.4a0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-camel_ai-0.2.4a0.dist-info/RECORD,,
+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,,