camel-ai 0.2.46__tar.gz → 0.2.47__tar.gz

{camel_ai-0.2.46 → camel_ai-0.2.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camel-ai
-Version: 0.2.46
+Version: 0.2.47
 Summary: Communicative Agents for AI Society Study
 Project-URL: Homepage, https://www.camel-ai.org/
 Project-URL: Repository, https://github.com/camel-ai/camel
@@ -89,6 +89,7 @@ Requires-Dist: pydub<0.26,>=0.25.1; extra == 'all'
 Requires-Dist: pygithub<3,>=2.6.0; extra == 'all'
 Requires-Dist: pymilvus<3,>=2.4.0; extra == 'all'
 Requires-Dist: pymupdf<2,>=1.22.5; extra == 'all'
+Requires-Dist: pyobvector>=0.1.18; extra == 'all'
 Requires-Dist: pyowm<4,>=3.3.0; extra == 'all'
 Requires-Dist: pytelegrambotapi<5,>=4.18.0; extra == 'all'
 Requires-Dist: pytest-asyncio<0.24,>=0.23.0; extra == 'all'
@@ -103,6 +104,7 @@ Requires-Dist: requests-oauthlib<2,>=1.3.1; extra == 'all'
 Requires-Dist: rouge<2,>=1.0.1; extra == 'all'
 Requires-Dist: scenedetect>=0.6.5.2; extra == 'all'
 Requires-Dist: scholarly[tor]==1.7.11; extra == 'all'
+Requires-Dist: scrapegraph-py<2,>=1.12.0; extra == 'all'
 Requires-Dist: sentence-transformers<4,>=3.0.1; extra == 'all'
 Requires-Dist: sentencepiece<0.3,>=0.2; extra == 'all'
 Requires-Dist: slack-bolt<2,>=1.20.1; extra == 'all'
@@ -253,6 +255,7 @@ Requires-Dist: python-dotenv<2,>=1.0.0; extra == 'owl'
 Requires-Dist: requests-oauthlib<2,>=1.3.1; extra == 'owl'
 Requires-Dist: rouge<2,>=1.0.1; extra == 'owl'
 Requires-Dist: scenedetect>=0.6.5.2; extra == 'owl'
+Requires-Dist: scrapegraph-py<2,>=1.12.0; extra == 'owl'
 Requires-Dist: sentencepiece<0.3,>=0.2; extra == 'owl'
 Requires-Dist: soundfile<0.14,>=0.13; extra == 'owl'
 Requires-Dist: tabulate>=0.9.0; extra == 'owl'
@@ -272,6 +275,7 @@ Requires-Dist: neo4j<6,>=5.18.0; extra == 'rag'
 Requires-Dist: numpy~=1.26; extra == 'rag'
 Requires-Dist: pandasai<3,>=2.3.0; extra == 'rag'
 Requires-Dist: pymilvus<3,>=2.4.0; extra == 'rag'
+Requires-Dist: pyobvector>=0.1.18; extra == 'rag'
 Requires-Dist: pytidb-experimental==0.0.1.dev4; extra == 'rag'
 Requires-Dist: qdrant-client<2,>=1.9.0; extra == 'rag'
 Requires-Dist: rank-bm25<0.3,>=0.2.2; extra == 'rag'
@@ -289,6 +293,7 @@ Requires-Dist: mem0ai>=0.1.73; extra == 'storage'
 Requires-Dist: nebula3-python==3.8.2; extra == 'storage'
 Requires-Dist: neo4j<6,>=5.18.0; extra == 'storage'
 Requires-Dist: pymilvus<3,>=2.4.0; extra == 'storage'
+Requires-Dist: pyobvector>=0.1.18; extra == 'storage'
 Requires-Dist: pytidb-experimental==0.0.1.dev4; extra == 'storage'
 Requires-Dist: qdrant-client<2,>=1.9.0; extra == 'storage'
 Requires-Dist: redis<6,>=5.0.6; extra == 'storage'
@@ -314,6 +319,7 @@ Requires-Dist: newspaper3k<0.3,>=0.2.8; extra == 'web-tools'
 Requires-Dist: playwright>=1.50.0; extra == 'web-tools'
 Requires-Dist: pyowm<4,>=3.3.0; extra == 'web-tools'
 Requires-Dist: requests-oauthlib<2,>=1.3.1; extra == 'web-tools'
+Requires-Dist: scrapegraph-py<2,>=1.12.0; extra == 'web-tools'
 Requires-Dist: sympy<2,>=1.13.3; extra == 'web-tools'
 Requires-Dist: tavily-python<0.6,>=0.5.0; extra == 'web-tools'
 Requires-Dist: wikipedia<2,>=1; extra == 'web-tools'
@@ -338,6 +344,9 @@ Description-Content-Type: text/markdown
 [![Hugging Face][huggingface-image]][huggingface-url]
 [![Star][star-image]][star-url]
 [![Package License][package-license-image]][package-license-url]
+[![PyPI Download][package-download-image]][package-download-url]
+
+<a href="https://trendshift.io/repositories/649" target="_blank"><img src="https://trendshift.io/api/badge/repositories/649" alt="camel-ai/camel | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
 </div>
 
@@ -782,6 +791,7 @@ The source code is licensed under Apache 2.0.
 [star-url]: https://github.com/camel-ai/camel/stargazers
 [package-license-image]: https://img.shields.io/badge/License-Apache_2.0-blue.svg
 [package-license-url]: https://github.com/camel-ai/camel/blob/master/licenses/LICENSE
+[package-download-image]: https://img.shields.io/pypi/dm/camel-ai
 
 [colab-url]: https://colab.research.google.com/drive/1AzP33O8rnMW__7ocWJhVBXjKziJXPtim?usp=sharing
 [colab-image]: https://colab.research.google.com/assets/colab-badge.svg
@@ -797,3 +807,4 @@ The source code is licensed under Apache 2.0.
 [reddit-url]: https://www.reddit.com/r/CamelAI/
 [reddit-image]: https://img.shields.io/reddit/subreddit-subscribers/CamelAI?style=plastic&logo=reddit&label=r%2FCAMEL&labelColor=white
 [ambassador-url]: https://www.camel-ai.org/community
+[package-download-url]: https://pypi.org/project/camel-ai

{camel_ai-0.2.46 → camel_ai-0.2.47}/README.md

@@ -16,6 +16,9 @@
 [![Hugging Face][huggingface-image]][huggingface-url]
 [![Star][star-image]][star-url]
 [![Package License][package-license-image]][package-license-url]
+[![PyPI Download][package-download-image]][package-download-url]
+
+<a href="https://trendshift.io/repositories/649" target="_blank"><img src="https://trendshift.io/api/badge/repositories/649" alt="camel-ai/camel | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
 </div>
 
@@ -460,6 +463,7 @@ The source code is licensed under Apache 2.0.
 [star-url]: https://github.com/camel-ai/camel/stargazers
 [package-license-image]: https://img.shields.io/badge/License-Apache_2.0-blue.svg
 [package-license-url]: https://github.com/camel-ai/camel/blob/master/licenses/LICENSE
+[package-download-image]: https://img.shields.io/pypi/dm/camel-ai
 
 [colab-url]: https://colab.research.google.com/drive/1AzP33O8rnMW__7ocWJhVBXjKziJXPtim?usp=sharing
 [colab-image]: https://colab.research.google.com/assets/colab-badge.svg
@@ -475,3 +479,4 @@ The source code is licensed under Apache 2.0.
 [reddit-url]: https://www.reddit.com/r/CamelAI/
 [reddit-image]: https://img.shields.io/reddit/subreddit-subscribers/CamelAI?style=plastic&logo=reddit&label=r%2FCAMEL&labelColor=white
 [ambassador-url]: https://www.camel-ai.org/community
+[package-download-url]: https://pypi.org/project/camel-ai

{camel_ai-0.2.46 → camel_ai-0.2.47}/camel/__init__.py

@@ -14,7 +14,7 @@
 
 from camel.logger import disable_logging, enable_logging, set_log_level
 
-__version__ = '0.2.46'
+__version__ = '0.2.47'
 
 __all__ = [
     '__version__',

{camel_ai-0.2.46 → camel_ai-0.2.47}/camel/datasets/few_shot_generator.py

@@ -16,7 +16,7 @@ import asyncio
 from datetime import datetime
 from typing import List
 
-from pydantic import ValidationError
+from pydantic import BaseModel, Field, ValidationError
 
 from camel.agents import ChatAgent
 from camel.logger import get_logger
@@ -176,14 +176,30 @@ class FewShotGenerator(BaseGenerator):
                 ]
                 prompt = self._construct_prompt(examples)
 
+                # Create a simplified version of DataPoint that omits metadata
+                # because agent.step's response_format parameter doesn't
+                # support type Dict[str, Any]
+                class DataPointSimplified(BaseModel):
+                    question: str = Field(
+                        description="The primary question or issue to "
+                        "be addressed."
+                    )
+                    final_answer: str = Field(description="The final answer.")
+                    rationale: str = Field(
+                        description="Logical reasoning or explanation "
+                        "behind the answer."
+                    )
+
                 try:
                     agent_output = (
-                        self.agent.step(prompt, response_format=DataPoint)
+                        self.agent.step(
+                            prompt, response_format=DataPointSimplified
+                        )
                         .msgs[0]
                         .parsed
                     )
 
-                    assert isinstance(agent_output, DataPoint)
+                    assert isinstance(agent_output, DataPointSimplified)
 
                     self.agent.reset()
 

{camel_ai-0.2.46 → camel_ai-0.2.47}/camel/datasets/models.py

@@ -24,7 +24,7 @@ class DataPoint(BaseModel):
         final_answer (str): The final answer.
         rationale (Optional[str]): Logical reasoning or explanation behind the
             answer. (default: :obj:`None`)
-        metadata Optional[Dict[str, Any]]: Additional metadata about the data
+        metadata (Optional[Dict[str, Any]]): Additional metadata about the data
             point. (default: :obj:`None`)
     """
 

{camel_ai-0.2.46 → camel_ai-0.2.47}/camel/loaders/__init__.py

@@ -20,6 +20,7 @@ from .firecrawl_reader import Firecrawl
 from .jina_url_reader import JinaURLReader
 from .mineru_extractor import MinerU
 from .pandas_reader import PandasReader
+from .scrapegraph_reader import ScrapeGraphAI
 from .unstructured_io import UnstructuredIO
 
 __all__ = [
@@ -34,4 +35,5 @@ __all__ = [
     'PandasReader',
     'MinerU',
     'Crawl4AI',
+    'ScrapeGraphAI',
 ]

camel_ai-0.2.47/camel/loaders/scrapegraph_reader.py

@@ -0,0 +1,96 @@
+# ========= Copyright 2023-2024 @ 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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. =========
+
+import os
+from typing import Any, Dict, Optional
+
+
+class ScrapeGraphAI:
+    r"""ScrapeGraphAI allows you to perform AI-powered web scraping and
+    searching.
+
+    Args:
+        api_key (Optional[str]): API key for authenticating with the
+            ScrapeGraphAI API.
+
+    References:
+        https://scrapegraph.ai/
+    """
+
+    def __init__(
+        self,
+        api_key: Optional[str] = None,
+    ) -> None:
+        from scrapegraph_py import Client
+        from scrapegraph_py.logger import sgai_logger
+
+        self._api_key = api_key or os.environ.get("SCRAPEGRAPH_API_KEY")
+        sgai_logger.set_logging(level="INFO")
+        self.client = Client(api_key=self._api_key)
+
+    def search(
+        self,
+        user_prompt: str,
+    ) -> Dict[str, Any]:
+        r"""Perform an AI-powered web search using ScrapeGraphAI.
+
+        Args:
+            user_prompt (str): The search query or instructions.
+
+        Returns:
+            Dict[str, Any]: The search results including answer and reference
+                URLs.
+
+        Raises:
+            RuntimeError: If the search process fails.
+        """
+        try:
+            response = self.client.searchscraper(user_prompt=user_prompt)
+            return response
+        except Exception as e:
+            raise RuntimeError(f"Failed to perform search: {e}")
+
+    def scrape(
+        self,
+        website_url: str,
+        user_prompt: str,
+        website_html: Optional[str] = None,
+    ) -> Dict[str, Any]:
+        r"""Perform AI-powered web scraping using ScrapeGraphAI.
+
+        Args:
+            website_url (str): The URL to scrape.
+            user_prompt (str): Instructions for what data to extract.
+            website_html (Optional[str]): Optional HTML content to use instead
+                of fetching from the URL.
+
+        Returns:
+            Dict[str, Any]: The scraped data including request ID and result.
+
+        Raises:
+            RuntimeError: If the scrape process fails.
+        """
+        try:
+            response = self.client.smartscraper(
+                website_url=website_url,
+                user_prompt=user_prompt,
+                website_html=website_html,
+            )
+            return response
+        except Exception as e:
+            raise RuntimeError(f"Failed to perform scrape: {e}")
+
+    def close(self) -> None:
+        r"""Close the ScrapeGraphAI client connection."""
+        self.client.close()

{camel_ai-0.2.46 → camel_ai-0.2.47}/camel/models/openai_model.py

@@ -111,9 +111,11 @@ class OpenAIModel(BaseModelBackend):
             ModelType.O1_MINI,
             ModelType.O1_PREVIEW,
             ModelType.O3_MINI,
+            ModelType.O3,
+            ModelType.O4_MINI,
         ]:
             warnings.warn(
-                "Warning: You are using an reasoning model (O1 or O3), "
+                "Warning: You are using an reasoning model (O series), "
                 "which has certain limitations, reference: "
                 "`https://platform.openai.com/docs/guides/reasoning`.",
                 UserWarning,

{camel_ai-0.2.46 → camel_ai-0.2.47}/camel/storages/__init__.py

@@ -27,6 +27,7 @@ from .vectordb_storages.base import (
     VectorRecord,
 )
 from .vectordb_storages.milvus import MilvusStorage
+from .vectordb_storages.oceanbase import OceanBaseStorage
 from .vectordb_storages.qdrant import QdrantStorage
 from .vectordb_storages.tidb import TiDBStorage
 
@@ -46,4 +47,5 @@ __all__ = [
     'Neo4jGraph',
     'NebulaGraph',
     'Mem0Storage',
+    'OceanBaseStorage',
 ]

{camel_ai-0.2.46 → camel_ai-0.2.47}/camel/storages/vectordb_storages/__init__.py

@@ -20,6 +20,7 @@ from .base import (
     VectorRecord,
 )
 from .milvus import MilvusStorage
+from .oceanbase import OceanBaseStorage
 from .qdrant import QdrantStorage
 from .tidb import TiDBStorage
 
@@ -30,6 +31,7 @@ __all__ = [
     'QdrantStorage',
     'MilvusStorage',
     "TiDBStorage",
+    'OceanBaseStorage',
     'VectorRecord',
     'VectorDBStatus',
 ]