camel-ai 0.2.59__py3-none-any.whl → 0.2.82__py3-none-any.whl

camel/toolkits/page_script.js

@@ -1,6 +1,6 @@
 var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
     let nextLabel = 10;
-  
+
     let roleMapping = {
         "a": "link",
         "area": "link",
@@ -22,23 +22,23 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
         "option": "option",
         "textarea": "textbox"
     };
-  
+
     let getCursor = function(elm) {
         return window.getComputedStyle(elm)["cursor"];
     };
-  
+
     let getInteractiveElements = function() {
-  
+
         let results = []
         let roles = ["scrollbar", "searchbox", "slider", "spinbutton", "switch", "tab", "treeitem", "button", "checkbox", "gridcell", "link", "menuitem", "menuitemcheckbox", "menuitemradio", "option", "progressbar", "radio", "textbox", "combobox", "menu", "tree", "treegrid", "grid", "listbox", "radiogroup", "widget"];
         let inertCursors = ["auto", "default", "none", "text", "vertical-text", "not-allowed", "no-drop"];
-  
+
         // Get the main interactive elements
         let nodeList = document.querySelectorAll("input, select, textarea, button, [href], [onclick], [contenteditable], [tabindex]:not([tabindex='-1'])");
         for (let i=0; i<nodeList.length; i++) { // Copy to something mutable
             results.push(nodeList[i]);
         }
-  
+
         // Anything not already included that has a suitable role
         nodeList = document.querySelectorAll("[role]");
         for (let i=0; i<nodeList.length; i++) { // Copy to something mutable
@@ -49,34 +49,34 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
             }
         }
         }
-  
+
         // Any element that changes the cursor to something implying interactivity
         nodeList = document.querySelectorAll("*");
         for (let i=0; i<nodeList.length; i++) {
            let node = nodeList[i];
-  
+
            // Cursor is default, or does not suggest interactivity
            let cursor = getCursor(node);
            if (inertCursors.indexOf(cursor) >= 0) {
                continue;
            }
-  
+
            // Move up to the first instance of this cursor change
            parent = node.parentNode;
            while (parent && getCursor(parent) == cursor) {
                node = parent;
            parent = node.parentNode;
            }
-  
+
            // Add the node if it is new
            if (results.indexOf(node) == -1) {
                results.push(node);
            }
         }
-  
+
         return results;
     };
-  
+
     let labelElements = function(elements) {
         for (let i=0; i<elements.length; i++) {
             if (!elements[i].hasAttribute("__elementId")) {
@@ -84,22 +84,22 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
             }
         }
     };
-  
+
     let isTopmost = function(element, x, y) {
        let hit = document.elementFromPoint(x, y);
-  
+
        // Hack to handle elements outside the viewport
        if (hit === null) {
-           return true; 
+           return true;
        }
-  
+
        while (hit) {
            if (hit == element) return true;
            hit = hit.parentNode;
        }
        return false;
     };
-  
+
     let getFocusedElementId = function() {
        let elm = document.activeElement;
        while (elm) {
@@ -110,7 +110,7 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
        }
        return null;
     };
-  
+
     let trimmedInnerText = function(element) {
         if (!element) {
             return "";
@@ -121,7 +121,7 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
         }
         return text.trim();
     };
-  
+
     let getApproximateAriaName = function(element) {
         // Check for aria labels
         if (element.hasAttribute("aria-labelledby")) {
@@ -135,11 +135,11 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
             }
         return buffer.trim();
         }
-  
+
         if (element.hasAttribute("aria-label")) {
         return element.getAttribute("aria-label");
         }
-  
+
         // Check for labels
         if (element.hasAttribute("id")) {
             let label_id = element.getAttribute("id");
@@ -153,29 +153,29 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
                 return label;
             }
         }
-  
+
         if (element.parentElement && element.parentElement.tagName == "LABEL") {
             return element.parentElement.innerText;
         }
-  
+
         // Check for alt text or titles
         if (element.hasAttribute("alt")) {
         return element.getAttribute("alt")
         }
-  
+
         if (element.hasAttribute("title")) {
         return element.getAttribute("title")
         }
-  
+
         return trimmedInnerText(element);
     };
-  
+
     let getApproximateAriaRole = function(element) {
         let tag = element.tagName.toLowerCase();
         if (tag == "input" && element.hasAttribute("type")) {
             tag = tag + ", type=" + element.getAttribute("type");
         }
-  
+
         if (element.hasAttribute("role")) {
             return [element.getAttribute("role"), tag];
         }
@@ -186,41 +186,53 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
         return ["", tag];
         }
     };
-  
+
     let getInteractiveRects = function() {
         labelElements(getInteractiveElements());
         let elements = document.querySelectorAll("[__elementId]");
         let results = {};
-        for (let i=0; i<elements.length; i++) {
-           let key = elements[i].getAttribute("__elementId");
-           let rects = elements[i].getClientRects();
-       let ariaRole = getApproximateAriaRole(elements[i]);
-       let ariaName = getApproximateAriaName(elements[i]);
-       let vScrollable = elements[i].scrollHeight - elements[i].clientHeight >= 1;
-  
-       let record = {
-               "tag_name": ariaRole[1],
-           "role": ariaRole[0],
-           "aria-name": ariaName,
-           "v-scrollable": vScrollable,
-           "rects": []
-       };
-  
-           for (const rect of rects) {
-           let x = rect.left + rect.width/2;
-               let y = rect.top + rect.height/2;
-               if (isTopmost(elements[i], x, y)) {
-           record["rects"].push(JSON.parse(JSON.stringify(rect)));
-               }
-           }
-  
-       if (record["rects"].length > 0) {
-               results[key] = record;
-           }
+        let scale = window.devicePixelRatio || 1;
+
+        for (let i = 0; i < elements.length; i++) {
+            let key = elements[i].getAttribute("__elementId");
+            let rects = elements[i].getClientRects();
+            let ariaRole = getApproximateAriaRole(elements[i]);
+            let ariaName = getApproximateAriaName(elements[i]);
+            let vScrollable = elements[i].scrollHeight - elements[i].clientHeight >= 1;
+
+            let record = {
+                "tag_name": ariaRole[1],
+                "role": ariaRole[0],
+                "aria-name": ariaName,
+                "v-scrollable": vScrollable,
+                "rects": []
+            };
+
+            for (const rect of rects) {
+                let x = rect.left + rect.width / 2;
+                let y = rect.top + rect.height / 2;
+                if (isTopmost(elements[i], x, y)) {
+                    record["rects"].push({
+                        x: rect.x * scale,
+                        y: rect.y * scale,
+                        width: rect.width * scale,
+                        height: rect.height * scale,
+                        top: rect.top * scale,
+                        left: rect.left * scale,
+                        right: rect.right * scale,
+                        bottom: rect.bottom * scale
+                    });
+                }
+            }
+
+            if (record["rects"].length > 0) {
+                results[key] = record;
+            }
         }
+
         return results;
     };
-  
+
     let getVisualViewport = function() {
         let vv = window.visualViewport;
         let de = document.documentElement;
@@ -238,7 +250,7 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
         "scrollHeight": de ? de.scrollHeight : 0
         };
     };
-  
+
     let _getMetaTags = function() {
         let meta = document.querySelectorAll("meta");
         let results = {};
@@ -259,7 +271,7 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
         }
         return results;
     };
-  
+
     let _getJsonLd = function() {
         let jsonld = [];
         let scripts = document.querySelectorAll('script[type="application/ld+json"]');
@@ -268,13 +280,13 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
         }
         return jsonld;
      };
-  
+
      // From: https://www.stevefenton.co.uk/blog/2022/12/parse-microdata-with-javascript/
      let _getMicrodata = function() {
         function sanitize(input) {
             return input.replace(/\s/gi, ' ').trim();
         }
-  
+
         function addValue(information, name, value) {
             if (information[name]) {
                 if (typeof information[name] === 'array') {
@@ -289,29 +301,29 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
                 information[name] = value;
             }
         }
-  
+
         function traverseItem(item, information) {
            const children = item.children;
-          
+
            for (let i = 0; i < children.length; i++) {
                const child = children[i];
-  
+
                if (child.hasAttribute('itemscope')) {
                    if (child.hasAttribute('itemprop')) {
                        const itemProp = child.getAttribute('itemprop');
                        const itemType = child.getAttribute('itemtype');
-  
+
                        const childInfo = {
                            itemType: itemType
                        };
-  
+
                        traverseItem(child, childInfo);
-  
+
                        itemProp.split(' ').forEach(propName => {
                            addValue(information, propName, childInfo);
                        });
                    }
-  
+
                } else if (child.hasAttribute('itemprop')) {
                    const itemProp = child.getAttribute('itemprop');
                    itemProp.split(' ').forEach(propName => {
@@ -327,9 +339,9 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
                }
            }
         }
-  
+
         const microdata = [];
-  
+
         document.querySelectorAll("[itemscope]").forEach(function(elem, i) {
            const itemType = elem.getAttribute('itemtype');
            const information = {
@@ -338,10 +350,10 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
            traverseItem(elem, information);
            microdata.push(information);
         });
-      
+
         return microdata;
      };
-  
+
      let getPageMetadata = function() {
          let jsonld = _getJsonLd();
          let metaTags = _getMetaTags();
@@ -350,7 +362,7 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
          if (jsonld.length > 0) {
              try {
                  results["jsonld"] = JSON.parse(jsonld);
-             } 
+             }
          catch (e) {
                  results["jsonld"] = jsonld;
          }
@@ -365,12 +377,12 @@ var MultimodalWebSurfer = MultimodalWebSurfer || (function() {
              }
          }
          return results;
-     };	
-  
+     };
+
      return {
          getInteractiveRects: getInteractiveRects,
          getVisualViewport: getVisualViewport,
          getFocusedElementId: getFocusedElementId,
          getPageMetadata: getPageMetadata,
      };
-  })();
+  })();

camel/toolkits/playwright_mcp_toolkit.py

@@ -1,4 +1,4 @@
-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
+# ========= Copyright 2023-2025 @ 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
@@ -10,16 +10,14 @@
 # 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. =========
+# ========= Copyright 2023-2025 @ CAMEL-AI.org. All Rights Reserved. =========
 
 from typing import List, Optional
 
-from camel.toolkits import BaseToolkit, FunctionTool
-
 from .mcp_toolkit import MCPToolkit
 
 
-class PlaywrightMCPToolkit(BaseToolkit):
+class PlaywrightMCPToolkit(MCPToolkit):
     r"""PlaywrightMCPToolkit provides an interface for interacting with web
     browsers using the Playwright automation library through the Model Context
     Protocol (MCP).
@@ -27,43 +25,40 @@ class PlaywrightMCPToolkit(BaseToolkit):
     Attributes:
         timeout (Optional[float]): Connection timeout in seconds.
             (default: :obj:`None`)
+        additional_args (Optional[List[str]]): Additional command-line
+            arguments to pass to the Playwright MCP server. For example,
+            `["--cdp-endpoint=http://localhost:9222"]`.
+            (default: :obj:`None`)
 
     Note:
         Currently only supports asynchronous operation mode.
     """
 
-    def __init__(self, timeout: Optional[float] = None) -> None:
-        r"""Initializes the PlaywrightMCPToolkit with the specified timeout.
+    def __init__(
+        self,
+        timeout: Optional[float] = None,
+        additional_args: Optional[List[str]] = None,
+    ) -> None:
+        r"""Initializes the PlaywrightMCPToolkit.
 
         Args:
             timeout (Optional[float]): Connection timeout in seconds.
                 (default: :obj:`None`)
+            additional_args (Optional[List[str]]): Additional command-line
+                arguments to pass to the Playwright MCP server. For example,
+                `["--cdp-endpoint=http://localhost:9222"]`.
+                (default: :obj:`None`)
         """
-        super().__init__(timeout=timeout)
-
-        self._mcp_toolkit = MCPToolkit(
-            config_dict={
-                "mcpServers": {
-                    "playwright": {
-                        "command": "npx",
-                        "args": ["@playwright/mcp@latest"],
-                    }
+        # Create config for Playwright MCP server
+        config_dict = {
+            "mcpServers": {
+                "playwright": {
+                    "command": "npx",
+                    "args": ["@playwright/mcp@latest"]
+                    + (additional_args or []),
                 }
             }
-        )
+        }
 
-    async def connect(self):
-        r"""Explicitly connect to the Playwright MCP server."""
-        await self._mcp_toolkit.connect()
-
-    async def disconnect(self):
-        r"""Explicitly disconnect from the Playwright MCP server."""
-        await self._mcp_toolkit.disconnect()
-
-    def get_tools(self) -> List[FunctionTool]:
-        r"""Returns a list of tools provided by the PlaywrightMCPToolkit.
-
-        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)