camel-ai 0.2.69a4__py3-none-any.whl → 0.2.69a7__py3-none-any.whl

camel/tasks/task.py

@@ -25,7 +25,8 @@ from typing import (
     Union,
 )
 
-from pydantic import BaseModel, Field
+from PIL import Image
+from pydantic import BaseModel, ConfigDict, Field
 
 if TYPE_CHECKING:
     from camel.agents import ChatAgent
@@ -158,6 +159,14 @@ class Task(BaseModel):
             (default: :obj:`0`)
         additional_info (Optional[Dict[str, Any]]): Additional information for
             the task. (default: :obj:`None`)
+        image_list (Optional[List[Image.Image]]): Optional list of PIL Image
+            objects associated with the task. (default: :obj:`None`)
+        image_detail (Literal["auto", "low", "high"]): Detail level of the
+            images associated with the task. (default: :obj:`auto`)
+        video_bytes (Optional[bytes]): Optional bytes of a video associated
+            with the task. (default: :obj:`None`)
+        video_detail (Literal["auto", "low", "high"]): Detail level of the
+            videos associated with the task. (default: :obj:`auto`)
     """
 
     content: str
@@ -180,6 +189,16 @@ class Task(BaseModel):
 
     additional_info: Optional[Dict[str, Any]] = None
 
+    image_list: Optional[List[Image.Image]] = None
+
+    image_detail: Literal["auto", "low", "high"] = "auto"
+
+    video_bytes: Optional[bytes] = None
+
+    video_detail: Literal["auto", "low", "high"] = "auto"
+
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     def __repr__(self) -> str:
         r"""Return a string representation of the task."""
         content_preview = self.content
@@ -363,6 +382,10 @@ class Task(BaseModel):
             role_name=role_name,
             content=self.content,
             additional_info=self.additional_info,
+            image_list=self.image_list,
+            image_detail=self.image_detail,
+            video_bytes=self.video_bytes,
+            video_detail=self.video_detail,
             other_results=sub_tasks_result,
         )
         msg = BaseMessage.make_user_message(
@@ -513,7 +536,12 @@ class TaskManager:
         role_name = agent.role_name
         content = template.format(role_name=role_name, content=task.content)
         msg = BaseMessage.make_user_message(
-            role_name=role_name, content=content
+            role_name=role_name,
+            content=content,
+            image_list=task.image_list,
+            image_detail=task.image_detail,
+            video_bytes=task.video_bytes,
+            video_detail=task.video_detail,
         )
         response = agent.step(msg)
         if task_parser is None:

camel/toolkits/__init__.py

@@ -78,7 +78,10 @@ from .playwright_mcp_toolkit import PlaywrightMCPToolkit
 from .wolfram_alpha_toolkit import WolframAlphaToolkit
 from .task_planning_toolkit import TaskPlanningToolkit
 from .non_visual_browser_toolkit import BrowserNonVisualToolkit
-
+from .edgeone_pages_mcp_toolkit import EdgeOnePagesMCPToolkit
+from .google_drive_mcp_toolkit import GoogleDriveMCPToolkit
+from .craw4ai_toolkit import Crawl4AIToolkit
+from .markitdown_toolkit import MarkItDownToolkit
 
 __all__ = [
     'BaseToolkit',
@@ -144,4 +147,8 @@ __all__ = [
     'BohriumToolkit',
     'TaskPlanningToolkit',
     'BrowserNonVisualToolkit',
+    'EdgeOnePagesMCPToolkit',
+    'GoogleDriveMCPToolkit',
+    'Crawl4AIToolkit',
+    'MarkItDownToolkit',
 ]

camel/toolkits/craw4ai_toolkit.py

@@ -0,0 +1,73 @@
+# ========= 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. =========
+
+from typing import List, Optional
+
+from camel.logger import get_logger
+from camel.toolkits.base import BaseToolkit
+from camel.toolkits.function_tool import FunctionTool
+from camel.utils import MCPServer
+
+logger = get_logger(__name__)
+
+
+@MCPServer()
+class Crawl4AIToolkit(BaseToolkit):
+    r"""A class representing a toolkit for Crawl4AI."""
+
+    def __init__(
+        self,
+        timeout: Optional[float] = None,
+    ):
+        super().__init__(timeout=timeout)
+
+    async def scrape(self, url: str) -> str:
+        r"""Scrapes a webpage and returns its content.
+
+        This function is designed to fetch the content of a given URL and
+        return it as a single string. It's particularly useful for extracting
+        text from web pages for further processing. The function
+        will try to get the most meaningful content from the page.
+
+        Args:
+            url (str): The URL of the webpage to scrape.
+
+        Returns:
+            str: The scraped content of the webpage as a string. If the
+                scraping fails, it will return an error message.
+        """
+        from crawl4ai import AsyncWebCrawler, CrawlerRunConfig
+
+        try:
+            async with AsyncWebCrawler() as client:
+                config = CrawlerRunConfig(
+                    only_text=True,
+                )
+                content = await client.arun(url, crawler_config=config)
+                return str(content.markdown) if content.markdown else ""
+        except Exception as e:
+            logger.error(f"Error scraping {url}: {e}")
+            return f"Error scraping {url}: {e}"
+
+    def get_tools(self) -> List[FunctionTool]:
+        r"""Returns a list of FunctionTool objects representing the
+        functions in the toolkit.
+
+        Returns:
+            List[FunctionTool]: A list of FunctionTool objects
+                representing the functions in the toolkit.
+        """
+        return [
+            FunctionTool(self.scrape),
+        ]

camel/toolkits/edgeone_pages_mcp_toolkit.py

@@ -0,0 +1,69 @@
+# ========= 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. =========
+
+from typing import List, Optional
+
+from camel.toolkits import BaseToolkit, FunctionTool
+
+from .mcp_toolkit import MCPToolkit
+
+
+class EdgeOnePagesMCPToolkit(BaseToolkit):
+    r"""EdgeOnePagesMCPToolkit provides an interface for interacting with
+    EdgeOne pages using the EdgeOne Pages MCP server.
+
+    Attributes:
+        timeout (Optional[float]): Connection timeout in seconds.
+            (default: :obj:`None`)
+    """
+
+    def __init__(
+        self,
+        timeout: Optional[float] = None,
+    ) -> None:
+        r"""Initializes the EdgeOnePagesMCPToolkit.
+
+        Args:
+            timeout (Optional[float]): Connection timeout in seconds.
+                (default: :obj:`None`)
+        """
+        super().__init__(timeout=timeout)
+
+        self._mcp_toolkit = MCPToolkit(
+            config_dict={
+                "mcpServers": {
+                    "edgeone-pages-mcp-server": {
+                        "command": "npx",
+                        "args": ["edgeone-pages-mcp"],
+                    }
+                }
+            },
+            timeout=timeout,
+        )
+
+    async def connect(self):
+        r"""Explicitly connect to the EdgeOne Pages MCP server."""
+        await self._mcp_toolkit.connect()
+
+    async def disconnect(self):
+        r"""Explicitly disconnect from the EdgeOne Pages MCP server."""
+        await self._mcp_toolkit.disconnect()
+
+    def get_tools(self) -> List[FunctionTool]:
+        r"""Returns a list of tools provided by the EdgeOnePagesMCPToolkit.
+
+        Returns:
+            List[FunctionTool]: List of available tools.
+        """
+        return self._mcp_toolkit.get_tools()