camel-ai 0.1.6.4__tar.gz → 0.1.6.5__tar.gz

{camel_ai-0.1.6.4 → camel_ai-0.1.6.5}/PKG-INFO

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

{camel_ai-0.1.6.4 → camel_ai-0.1.6.5}/README.md

@@ -110,7 +110,7 @@ conda create --name camel python=3.9
 conda activate camel
 
 # Clone github repo
-git clone -b v0.1.6.4 https://github.com/camel-ai/camel.git
+git clone -b v0.1.6.5 https://github.com/camel-ai/camel.git
 
 # Change directory into project directory
 cd camel

{camel_ai-0.1.6.4 → camel_ai-0.1.6.5}/camel/__init__.py

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

{camel_ai-0.1.6.4 → camel_ai-0.1.6.5}/camel/configs/gemini_config.py

@@ -81,7 +81,6 @@ class GeminiConfig(BaseConfig):
     response_mime_type: Optional[str] = None
     response_schema: Optional[Any] = None
     safety_settings: Optional[Any] = None
-    tools: Optional[Any] = None
     tool_config: Optional[Any] = None
     request_options: Optional[Any] = None
 

{camel_ai-0.1.6.4 → camel_ai-0.1.6.5}/camel/configs/groq_config.py

@@ -99,7 +99,7 @@ class GroqConfig(BaseConfig):
     response_format: Union[dict, NotGiven] = NOT_GIVEN
     frequency_penalty: float = 0.0
     user: str = ""
-    tool_choice: Optional[Union[dict[str, str], str]] = "none"
+    tool_choice: Optional[Union[dict[str, str], str]] = "auto"
 
 
 GROQ_API_PARAMS = {param for param in GroqConfig.model_fields.keys()}

{camel_ai-0.1.6.4 → camel_ai-0.1.6.5}/camel/configs/mistral_config.py

@@ -74,7 +74,7 @@ class MistralConfig(BaseConfig):
             if not isinstance(response_format, ResponseFormat):
                 raise ValueError(
                     f"The tool {response_format} should be an instance "
-                    "of `mistralai.models.chat_completion.ResponseFormat`."
+                    "of `mistralai.models.ResponseFormat`."
                 )
         return response_format
 

{camel_ai-0.1.6.4 → camel_ai-0.1.6.5}/camel/loaders/unstructured_io.py

@@ -12,6 +12,7 @@
 # limitations under the License.
 # =========== Copyright 2023 @ CAMEL-AI.org. All Rights Reserved. ===========
 import uuid
+import warnings
 from typing import (
     Any,
     Dict,
@@ -91,7 +92,7 @@ class UnstructuredIO:
     def parse_file_or_url(
         input_path: str,
         **kwargs: Any,
-    ) -> List[Element]:
+    ) -> Union[List[Element], None]:
         r"""Loads a file or a URL and parses its contents into elements.
 
         Args:
@@ -99,12 +100,12 @@ class UnstructuredIO:
             **kwargs: Extra kwargs passed to the partition function.
 
         Returns:
-            List[Element]: List of elements after parsing the file or URL.
+            Union[List[Element],None]: List of elements after parsing the file
+                or URL if success.
 
         Raises:
             FileNotFoundError: If the file does not exist at the path
                 specified.
-            Exception: For any other issues during file or URL parsing.
 
         Notes:
             Available document types:
@@ -128,8 +129,9 @@ class UnstructuredIO:
             try:
                 elements = partition_html(url=input_path, **kwargs)
                 return elements
-            except Exception as e:
-                raise Exception("Failed to parse the URL.") from e
+            except Exception:
+                warnings.warn(f"Failed to parse the URL: {input_path}")
+                return None
 
         else:
             # Handling file
@@ -146,10 +148,9 @@ class UnstructuredIO:
                 with open(input_path, "rb") as f:
                     elements = partition(file=f, **kwargs)
                     return elements
-            except Exception as e:
-                raise Exception(
-                    "Failed to parse the unstructured file."
-                ) from e
+            except Exception:
+                warnings.warn(f"Failed to partition the file: {input_path}")
+                return None
 
     @staticmethod
     def clean_text_data(

{camel_ai-0.1.6.4 → camel_ai-0.1.6.5}/camel/retrievers/auto_retriever.py

@@ -15,7 +15,7 @@ import datetime
 import os
 import re
 from pathlib import Path
-from typing import List, Optional, Tuple, Union
+from typing import Collection, List, Optional, Sequence, Tuple, Union
 from urllib.parse import urlparse
 
 from camel.embeddings import BaseEmbedding, OpenAIEmbedding
@@ -197,7 +197,7 @@ class AutoRetriever:
         top_k: int = DEFAULT_TOP_K_RESULTS,
         similarity_threshold: float = DEFAULT_SIMILARITY_THRESHOLD,
         return_detailed_info: bool = False,
-    ) -> str:
+    ) -> dict[str, Sequence[Collection[str]]]:
         r"""Executes the automatic vector retriever process using vector
         storage.
 
@@ -216,9 +216,10 @@ class AutoRetriever:
                 metadata. Defaults to `False`.
 
         Returns:
-            string: By default, returns only the text information. If
-                `return_detailed_info` is `True`, return detailed information
-                including similarity score, content path and metadata.
+            dict[str, Sequence[Collection[str]]]: By default, returns
+                only the text information. If `return_detailed_info` is
+                `True`, return detailed information including similarity
+                score, content path and metadata.
 
         Raises:
             ValueError: If there's an vector storage existing with content
@@ -308,20 +309,17 @@ class AutoRetriever:
         # Select the 'top_k' results
         all_retrieved_info = all_retrieved_info_sorted[:top_k]
 
-        retrieved_infos = "\n".join(str(info) for info in all_retrieved_info)
-        retrieved_infos_text = "\n".join(
-            info['text'] for info in all_retrieved_info if 'text' in info
-        )
+        text_retrieved_info = [item['text'] for item in all_retrieved_info]
 
-        detailed_info = (
-            f"Original Query:\n{{ {query} }}\n"
-            f"Retrieved Context:\n{retrieved_infos}"
-        )
+        detailed_info = {
+            "Original Query": query,
+            "Retrieved Context": all_retrieved_info,
+        }
 
-        text_info = (
-            f"Original Query:\n{{ {query} }}\n"
-            f"Retrieved Context:\n{retrieved_infos_text}"
-        )
+        text_info = {
+            "Original Query": query,
+            "Retrieved Context": text_retrieved_info,
+        }
 
         if return_detailed_info:
             return detailed_info

{camel_ai-0.1.6.4 → camel_ai-0.1.6.5}/camel/retrievers/bm25_retriever.py

@@ -74,13 +74,16 @@ class BM25Retriever(BaseRetriever):
         elements = self.unstructured_modules.parse_file_or_url(
             content_input_path, **kwargs
         )
-        self.chunks = self.unstructured_modules.chunk_elements(
-            chunk_type=chunk_type, elements=elements
-        )
+        if elements:
+            self.chunks = self.unstructured_modules.chunk_elements(
+                chunk_type=chunk_type, elements=elements
+            )
 
-        # Convert chunks to a list of strings for tokenization
-        tokenized_corpus = [str(chunk).split(" ") for chunk in self.chunks]
-        self.bm25 = BM25Okapi(tokenized_corpus)
+            # Convert chunks to a list of strings for tokenization
+            tokenized_corpus = [str(chunk).split(" ") for chunk in self.chunks]
+            self.bm25 = BM25Okapi(tokenized_corpus)
+        else:
+            self.bm25 = None
 
     def query(
         self,

{camel_ai-0.1.6.4 → camel_ai-0.1.6.5}/camel/retrievers/vector_retriever.py

@@ -12,6 +12,7 @@
 # limitations under the License.
 # =========== Copyright 2023 @ CAMEL-AI.org. All Rights Reserved. ===========
 import os
+import warnings
 from typing import Any, Dict, List, Optional
 from urllib.parse import urlparse
 
@@ -89,9 +90,15 @@ class VectorRetriever(BaseRetriever):
             elements = self.uio.parse_file_or_url(content, **kwargs)
         else:
             elements = [self.uio.create_element_from_text(text=content)]
-        chunks = self.uio.chunk_elements(
-            chunk_type=chunk_type, elements=elements
-        )
+        if elements:
+            chunks = self.uio.chunk_elements(
+                chunk_type=chunk_type, elements=elements
+            )
+        if not elements:
+            warnings.warn(
+                f"No elements were extracted from the content: {content}"
+            )
+            return
         # Iterate to process and store embeddings, set batch of 50
         for i in range(0, len(chunks), 50):
             batch_chunks = chunks[i : i + 50]

{camel_ai-0.1.6.4 → camel_ai-0.1.6.5}/camel/toolkits/retrieval_toolkit.py

@@ -57,7 +57,7 @@ class RetrievalToolkit(BaseToolkit):
         retrieved_info = auto_retriever.run_vector_retriever(
             query=query, contents=contents, top_k=3
         )
-        return retrieved_info
+        return str(retrieved_info)
 
     def get_tools(self) -> List[OpenAIFunction]:
         r"""Returns a list of OpenAIFunction objects representing the

{camel_ai-0.1.6.4 → camel_ai-0.1.6.5}/pyproject.toml

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