camel-ai 0.2.73a4__py3-none-any.whl → 0.2.80a2__py3-none-any.whl

camel/toolkits/google_calendar_toolkit.py

@@ -45,8 +45,21 @@ class GoogleCalendarToolkit(BaseToolkit):
             timeout (Optional[float]): The timeout value for API requests
                 in seconds. If None, no timeout is applied.
                 (default: :obj:`None`)
+
+        Note:
+            Before using this toolkit, make sure to:
+            1. Set the required environment variables: GOOGLE_CLIENT_ID and
+               GOOGLE_CLIENT_SECRET
+            2. Configure the redirect URI in Google Cloud Console to
+               http://localhost/
         """
         super().__init__(timeout=timeout)
+        logger.info(
+            "Initializing GoogleCalendarToolkit. Make sure to set "
+            "GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET environment variables, "
+            "and configure the redirect URI in Google Cloud Console to "
+            "http://localhost/"
+        )
         self.service = self._get_calendar_service()
 
     def create_event(
@@ -197,15 +210,36 @@ class GoogleCalendarToolkit(BaseToolkit):
 
             result = []
             for event in events:
-                start = event['start'].get(
-                    'dateTime', event['start'].get('date')
+                start_info = event.get('start', {})
+                end_info = event.get('end', {})
+                start_time = start_info.get(
+                    'dateTime', start_info.get('date', 'Unknown')
+                )
+                end_time = end_info.get(
+                    'dateTime', end_info.get('date', 'Unknown')
+                )
+                timezone = (
+                    start_info.get('timeZone')
+                    or end_info.get('timeZone')
+                    or event.get('timeZone')
                 )
+                attendees = [
+                    attendee.get('email')
+                    for attendee in event.get('attendees', [])
+                    if attendee.get('email')
+                ]
+                organizer = event.get('organizer', {}).get('email')
+
                 result.append(
                     {
-                        'Event ID': event['id'],
+                        'Event ID': event.get('id'),
                         'Summary': event.get('summary', 'No Title'),
-                        'Start Time': start,
+                        'Start Time': start_time,
+                        'End Time': end_time,
+                        'Timezone': timezone,
                         'Link': event.get('htmlLink'),
+                        'Attendees': attendees,
+                        'Organizer': organizer,
                     }
                 )
 

camel/toolkits/google_drive_mcp_toolkit.py

@@ -12,14 +12,12 @@
 # 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 typing import Optional
 
 from .mcp_toolkit import MCPToolkit
 
 
-class GoogleDriveMCPToolkit(BaseToolkit):
+class GoogleDriveMCPToolkit(MCPToolkit):
     r"""GoogleDriveMCPToolkit provides an interface for interacting with
     Google Drive using the Google Drive MCP server.
 
@@ -41,33 +39,16 @@ class GoogleDriveMCPToolkit(BaseToolkit):
             credentials_path (Optional[str]): Path to the Google Drive
                 credentials file. (default: :obj:`None`)
         """
-        super().__init__(timeout=timeout)
 
-        self._mcp_toolkit = MCPToolkit(
-            config_dict={
-                "mcpServers": {
-                    "gdrive": {
-                        "command": "npx",
-                        "args": ["-y", "@modelcontextprotocol/server-gdrive"],
-                        "env": {"GDRIVE_CREDENTIALS_PATH": credentials_path},
-                    }
+        config_dict = {
+            "mcpServers": {
+                "gdrive": {
+                    "command": "npx",
+                    "args": ["-y", "@modelcontextprotocol/server-gdrive"],
+                    "env": {"GDRIVE_CREDENTIALS_PATH": credentials_path},
                 }
-            },
-            timeout=timeout,
-        )
-
-    async def connect(self):
-        r"""Explicitly connect to the Google Drive MCP server."""
-        await self._mcp_toolkit.connect()
-
-    async def disconnect(self):
-        r"""Explicitly disconnect from the Google Drive MCP server."""
-        await self._mcp_toolkit.disconnect()
+            }
+        }
 
-    def get_tools(self) -> List[FunctionTool]:
-        r"""Returns a list of tools provided by the GoogleDriveMCPToolkit.
-
-        Returns:
-            List[FunctionTool]: List of available tools.
-        """
-        return self._mcp_toolkit.get_tools()
+        # Initialize parent MCPToolkit with Playwright configuration
+        super().__init__(config_dict=config_dict, timeout=timeout)

camel/toolkits/hybrid_browser_toolkit/config_loader.py

@@ -23,6 +23,7 @@ class BrowserConfig:
     headless: bool = True
     user_data_dir: Optional[str] = None
     stealth: bool = False
+    console_log_limit: int = 1000
 
     # Default settings
     default_start_url: str = "https://google.com/"
@@ -42,6 +43,10 @@ class BrowserConfig:
     # CDP connection configuration
     connect_over_cdp: bool = False
     cdp_url: Optional[str] = None
+    cdp_keep_current_page: bool = False
+
+    # Full visual mode configuration
+    full_visual_mode: bool = False
 
 
 @dataclass
@@ -50,6 +55,7 @@ class ToolkitConfig:
 
     cache_dir: str = "tmp/"
     browser_log_to_file: bool = False
+    log_dir: Optional[str] = None
     session_id: Optional[str] = None
     enabled_tools: Optional[list] = None
 
@@ -105,6 +111,10 @@ class ConfigLoader:
                 browser_kwargs["connect_over_cdp"] = value
             elif key == "cdpUrl":
                 browser_kwargs["cdp_url"] = value
+            elif key == "cdpKeepCurrentPage":
+                browser_kwargs["cdp_keep_current_page"] = value
+            elif key == "consoleLogLimit":
+                browser_kwargs["console_log_limit"] = value
             elif key == "cacheDir":
                 toolkit_kwargs["cache_dir"] = value
             elif key == "browserLogToFile":
@@ -113,6 +123,8 @@ class ConfigLoader:
                 toolkit_kwargs["session_id"] = value
             elif key == "enabledTools":
                 toolkit_kwargs["enabled_tools"] = value
+            elif key == "fullVisualMode":
+                browser_kwargs["full_visual_mode"] = value
 
         browser_config = BrowserConfig(**browser_kwargs)
         toolkit_config = ToolkitConfig(**toolkit_kwargs)
@@ -139,10 +151,13 @@ class ConfigLoader:
             "screenshotTimeout": self.browser_config.screenshot_timeout,
             "pageStabilityTimeout": self.browser_config.page_stability_timeout,
             "browser_log_to_file": self.toolkit_config.browser_log_to_file,
+            "log_dir": self.toolkit_config.log_dir,
             "session_id": self.toolkit_config.session_id,
             "viewport_limit": self.browser_config.viewport_limit,
             "connectOverCdp": self.browser_config.connect_over_cdp,
             "cdpUrl": self.browser_config.cdp_url,
+            "cdpKeepCurrentPage": self.browser_config.cdp_keep_current_page,
+            "fullVisualMode": self.browser_config.full_visual_mode,
         }
 
     def get_timeout_config(self) -> Dict[str, Optional[int]]:

camel/toolkits/hybrid_browser_toolkit/hybrid_browser_toolkit.py

@@ -14,7 +14,6 @@
 
 from typing import Any, List, Literal, Optional
 
-from camel.models import BaseModelBackend
 from camel.toolkits.base import BaseToolkit
 
 
@@ -25,6 +24,64 @@ class HybridBrowserToolkit(BaseToolkit):
     This wrapper allows users to choose between:
     - 'typescript': WebSocket-based implementation using TypeScript/Node.js
     - 'python': Pure Python implementation using Playwright directly
+
+    Args:
+        mode (Literal["typescript", "python"]): Implementation mode. -
+            'typescript': Uses WebSocket-based TypeScript implementation -
+            'python': Uses pure Python Playwright implementation. Defaults to
+            "typescript".
+        headless (bool): Whether to run browser in headless mode.
+            Defaults to True.
+        user_data_dir (Optional[str]): Directory for user data
+            persistence. Defaults to None.
+        stealth (bool): Whether to enable stealth mode. Defaults to
+            False.
+        cache_dir (str): Directory for caching. Defaults to "tmp/".
+        enabled_tools (Optional[List[str]]): List of enabled tools.
+            Defaults to None.
+        browser_log_to_file (bool): Whether to log browser actions to
+            file. Defaults to False.
+        log_dir (Optional[str]): Custom directory path for log files.
+            If None, defaults to "browser_log". Defaults to None.
+        session_id (Optional[str]): Session identifier. Defaults to None.
+        default_start_url (str): Default URL to start with. Defaults
+            to "https://google.com/".
+        default_timeout (Optional[int]): Default timeout in
+            milliseconds. Defaults to None.
+        short_timeout (Optional[int]): Short timeout in milliseconds.
+            Defaults to None.
+        navigation_timeout (Optional[int]): Navigation timeout in
+            milliseconds. Defaults to None.
+        network_idle_timeout (Optional[int]): Network idle timeout in
+            milliseconds. Defaults to None.
+        screenshot_timeout (Optional[int]): Screenshot timeout in
+            milliseconds. Defaults to None.
+        page_stability_timeout (Optional[int]): Page stability timeout
+            in milliseconds. Defaults to None.
+        dom_content_loaded_timeout (Optional[int]): DOM content loaded
+            timeout in milliseconds. Defaults to None.
+        viewport_limit (bool): Whether to filter page snapshot
+            elements to only those visible in the current viewport.
+            Defaults to False.
+        connect_over_cdp (bool): Whether to connect to an existing
+            browser via Chrome DevTools Protocol. Defaults to False.
+            (Only supported in TypeScript mode)
+        cdp_url (Optional[str]): WebSocket endpoint URL for CDP
+            connection. Required when connect_over_cdp is True.
+            Defaults to None. (Only supported in TypeScript mode)
+        cdp_keep_current_page (bool): When True and using CDP mode,
+        won't create new pages but use the existing one. Defaults to False.
+            (Only supported in TypeScript mode)
+        full_visual_mode (bool): When True, browser actions like click,
+            browser_open, visit_page, etc. will return 'full visual mode'
+            as snapshot instead of actual page content. The
+            browser_get_page_snapshot method will still return the actual
+            snapshot. Defaults to False.
+        **kwargs: Additional keyword arguments passed to the
+            implementation.
+
+    Returns:
+        HybridBrowserToolkit instance of the specified implementation.
     """
 
     def __new__(
@@ -34,12 +91,12 @@ class HybridBrowserToolkit(BaseToolkit):
         headless: bool = True,
         user_data_dir: Optional[str] = None,
         stealth: bool = False,
-        web_agent_model: Optional[BaseModelBackend] = None,
-        cache_dir: str = "tmp/",
+        cache_dir: Optional[str] = None,
         enabled_tools: Optional[List[str]] = None,
         browser_log_to_file: bool = False,
+        log_dir: Optional[str] = None,
         session_id: Optional[str] = None,
-        default_start_url: str = "https://google.com/",
+        default_start_url: Optional[str] = None,
         default_timeout: Optional[int] = None,
         short_timeout: Optional[int] = None,
         navigation_timeout: Optional[int] = None,
@@ -50,6 +107,8 @@ class HybridBrowserToolkit(BaseToolkit):
         viewport_limit: bool = False,
         connect_over_cdp: bool = False,
         cdp_url: Optional[str] = None,
+        cdp_keep_current_page: bool = False,
+        full_visual_mode: bool = False,
         **kwargs: Any,
     ) -> Any:
         r"""Create a HybridBrowserToolkit instance with the specified mode.
@@ -65,13 +124,13 @@ class HybridBrowserToolkit(BaseToolkit):
                 persistence. Defaults to None.
             stealth (bool): Whether to enable stealth mode. Defaults to
                 False.
-            web_agent_model (Optional[BaseModelBackend]): Model for web
-                agent operations. Defaults to None.
             cache_dir (str): Directory for caching. Defaults to "tmp/".
             enabled_tools (Optional[List[str]]): List of enabled tools.
                 Defaults to None.
             browser_log_to_file (bool): Whether to log browser actions to
                 file. Defaults to False.
+            log_dir (Optional[str]): Custom directory path for log files.
+                If None, defaults to "browser_log". Defaults to None.
             session_id (Optional[str]): Session identifier. Defaults to None.
             default_start_url (str): Default URL to start with. Defaults
                 to "https://google.com/".
@@ -98,6 +157,14 @@ class HybridBrowserToolkit(BaseToolkit):
             cdp_url (Optional[str]): WebSocket endpoint URL for CDP
                 connection. Required when connect_over_cdp is True.
                 Defaults to None. (Only supported in TypeScript mode)
+            cdp_keep_current_page (bool): When True and using CDP mode,
+            won't create new pages but use the existing one. Defaults to False.
+                (Only supported in TypeScript mode)
+            full_visual_mode (bool): When True, browser actions like click,
+                browser_open, visit_page, etc. will return 'full visual mode'
+                as snapshot instead of actual page content. The
+                browser_get_page_snapshot method will still return the actual
+                snapshot. Defaults to False.
             **kwargs: Additional keyword arguments passed to the
                 implementation.
 
@@ -113,10 +180,10 @@ class HybridBrowserToolkit(BaseToolkit):
                 headless=headless,
                 user_data_dir=user_data_dir,
                 stealth=stealth,
-                web_agent_model=web_agent_model,
                 cache_dir=cache_dir,
                 enabled_tools=enabled_tools,
                 browser_log_to_file=browser_log_to_file,
+                log_dir=log_dir,
                 session_id=session_id,
                 default_start_url=default_start_url,
                 default_timeout=default_timeout,
@@ -129,6 +196,8 @@ class HybridBrowserToolkit(BaseToolkit):
                 viewport_limit=viewport_limit,
                 connect_over_cdp=connect_over_cdp,
                 cdp_url=cdp_url,
+                cdp_keep_current_page=cdp_keep_current_page,
+                full_visual_mode=full_visual_mode,
                 **kwargs,
             )
         elif mode == "python":
@@ -156,10 +225,10 @@ class HybridBrowserToolkit(BaseToolkit):
                 headless=headless,
                 user_data_dir=user_data_dir,
                 stealth=stealth,
-                web_agent_model=web_agent_model,
                 cache_dir=cache_dir,
                 enabled_tools=enabled_tools,
                 browser_log_to_file=browser_log_to_file,
+                log_dir=log_dir,
                 session_id=session_id,
                 default_start_url=default_start_url,
                 default_timeout=default_timeout,