camel-ai 0.2.76a12__tar.gz → 0.2.76a13__tar.gz

{camel_ai-0.2.76a12 → camel_ai-0.2.76a13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camel-ai
-Version: 0.2.76a12
+Version: 0.2.76a13
 Summary: Communicative Agents for AI Society Study
 Project-URL: Homepage, https://www.camel-ai.org/
 Project-URL: Repository, https://github.com/camel-ai/camel
@@ -87,8 +87,7 @@ Requires-Dist: numpy<=2.2,>=1.2; extra == 'all'
 Requires-Dist: onnxruntime<=1.19.2; extra == 'all'
 Requires-Dist: openapi-spec-validator<0.8,>=0.7.1; extra == 'all'
 Requires-Dist: openpyxl>=3.1.5; extra == 'all'
-Requires-Dist: pandas<2,>=1.5.3; extra == 'all'
-Requires-Dist: pandasai<3,>=2.3.0; extra == 'all'
+Requires-Dist: pandas>=2; extra == 'all'
 Requires-Dist: pgvector<0.3,>=0.2.4; extra == 'all'
 Requires-Dist: playwright>=1.50.0; extra == 'all'
 Requires-Dist: prance<24,>=23.6.21.0; extra == 'all'
@@ -166,7 +165,7 @@ Requires-Dist: datacommons<2,>=1.4.3; extra == 'data-tools'
 Requires-Dist: math-verify<0.8,>=0.7.0; extra == 'data-tools'
 Requires-Dist: networkx<4,>=3.4.2; extra == 'data-tools'
 Requires-Dist: numpy<=2.2,>=1.2; extra == 'data-tools'
-Requires-Dist: pandas<2,>=1.5.3; extra == 'data-tools'
+Requires-Dist: pandas>=2; extra == 'data-tools'
 Requires-Dist: rouge<2,>=1.0.1; extra == 'data-tools'
 Requires-Dist: stripe<12,>=11.3.0; extra == 'data-tools'
 Requires-Dist: textblob<0.18,>=0.17.1; extra == 'data-tools'
@@ -220,7 +219,6 @@ Requires-Dist: numpy<=2.2,>=1.2; extra == 'document-tools'
 Requires-Dist: onnxruntime<=1.19.2; extra == 'document-tools'
 Requires-Dist: openapi-spec-validator<0.8,>=0.7.1; extra == 'document-tools'
 Requires-Dist: openpyxl>=3.1.5; extra == 'document-tools'
-Requires-Dist: pandasai<3,>=2.3.0; extra == 'document-tools'
 Requires-Dist: prance<24,>=23.6.21.0; extra == 'document-tools'
 Requires-Dist: pylatex>=1.4.2; extra == 'document-tools'
 Requires-Dist: pymupdf<2,>=1.22.5; extra == 'document-tools'
@@ -245,7 +243,7 @@ Requires-Dist: mcp-simple-arxiv==0.2.2; extra == 'eigent'
 Requires-Dist: numpy<=2.2,>=1.2; extra == 'eigent'
 Requires-Dist: onnxruntime<=1.19.2; extra == 'eigent'
 Requires-Dist: openpyxl>=3.1.5; extra == 'eigent'
-Requires-Dist: pandas<2,>=1.5.3; extra == 'eigent'
+Requires-Dist: pandas>=2; extra == 'eigent'
 Requires-Dist: pydub<0.26,>=0.25.1; extra == 'eigent'
 Requires-Dist: pylatex>=1.4.2; extra == 'eigent'
 Requires-Dist: pytesseract>=0.3.13; extra == 'eigent'
@@ -305,8 +303,7 @@ Requires-Dist: numpy<=2.2,>=1.2; extra == 'owl'
 Requires-Dist: onnxruntime<=1.19.2; extra == 'owl'
 Requires-Dist: openapi-spec-validator<0.8,>=0.7.1; extra == 'owl'
 Requires-Dist: openpyxl>=3.1.5; extra == 'owl'
-Requires-Dist: pandas<2,>=1.5.3; extra == 'owl'
-Requires-Dist: pandasai<3,>=2.3.0; extra == 'owl'
+Requires-Dist: pandas>=2; extra == 'owl'
 Requires-Dist: playwright>=1.50.0; extra == 'owl'
 Requires-Dist: prance<24,>=23.6.21.0; extra == 'owl'
 Requires-Dist: pyautogui<0.10,>=0.9.54; extra == 'owl'
@@ -343,7 +340,6 @@ Requires-Dist: google-genai>=1.13.0; extra == 'rag'
 Requires-Dist: nebula3-python==3.8.2; extra == 'rag'
 Requires-Dist: neo4j<6,>=5.18.0; extra == 'rag'
 Requires-Dist: numpy<=2.2,>=1.2; extra == 'rag'
-Requires-Dist: pandasai<3,>=2.3.0; extra == 'rag'
 Requires-Dist: protobuf>=6.0.0; extra == 'rag'
 Requires-Dist: pymilvus<3,>=2.4.0; extra == 'rag'
 Requires-Dist: pyobvector>=0.1.18; extra == 'rag'

{camel_ai-0.2.76a12 → camel_ai-0.2.76a13}/camel/__init__.py

@@ -14,7 +14,7 @@
 
 from camel.logger import disable_logging, enable_logging, set_log_level
 
-__version__ = '0.2.76a12'
+__version__ = '0.2.76a13'
 
 __all__ = [
     '__version__',

{camel_ai-0.2.76a12 → camel_ai-0.2.76a13}/camel/agents/mcp_agent.py

@@ -15,16 +15,25 @@
 import asyncio
 import json
 import platform
-import re
-from typing import Any, Callable, Dict, List, Optional, Union, cast
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Dict,
+    List,
+    Optional,
+    Union,
+    cast,
+)
 
-from camel.agents import ChatAgent
+from camel.agents.chat_agent import ChatAgent
 from camel.logger import get_logger
 from camel.messages import BaseMessage
-from camel.models import BaseModelBackend, ModelFactory
+from camel.models.base_model import BaseModelBackend
+from camel.models.model_factory import ModelFactory
 from camel.prompts import TextPrompt
 from camel.responses import ChatAgentResponse
-from camel.toolkits import FunctionTool, MCPToolkit
+from camel.toolkits.function_tool import FunctionTool
 from camel.types import (
     BaseMCPRegistryConfig,
     MCPRegistryType,
@@ -33,6 +42,9 @@ from camel.types import (
     RoleType,
 )
 
+if TYPE_CHECKING:
+    from camel.toolkits.mcp_toolkit import MCPToolkit
+
 # AgentOps decorator setting
 try:
     import os
@@ -44,6 +56,8 @@ try:
 except (ImportError, AttributeError):
     from camel.utils import track_agent
 
+from camel.parsers.mcp_tool_call_parser import extract_tool_calls_from_text
+
 logger = get_logger(__name__)
 
 
@@ -168,8 +182,10 @@ class MCPAgent(ChatAgent):
             **kwargs,
         )
 
-    def _initialize_mcp_toolkit(self) -> MCPToolkit:
+    def _initialize_mcp_toolkit(self) -> "MCPToolkit":
         r"""Initialize the MCP toolkit from the provided configuration."""
+        from camel.toolkits.mcp_toolkit import MCPToolkit
+
         config_dict = {}
         for registry_config in self.registry_configs:
             config_dict.update(registry_config.get_config())
@@ -334,27 +350,14 @@ class MCPAgent(ChatAgent):
             task = f"## Task:\n  {input_message}"
             input_message = str(self._text_tools) + task
             response = await super().astep(input_message, *args, **kwargs)
-            content = response.msgs[0].content.lower()
-
-            tool_calls = []
-            while "```json" in content:
-                json_match = re.search(r'```json', content)
-                if not json_match:
-                    break
-                json_start = json_match.span()[1]
-
-                end_match = re.search(r'```', content[json_start:])
-                if not end_match:
-                    break
-                json_end = end_match.span()[0] + json_start
-
-                tool_json = content[json_start:json_end].strip('\n')
-                try:
-                    tool_calls.append(json.loads(tool_json))
-                except json.JSONDecodeError:
-                    logger.warning(f"Failed to parse JSON: {tool_json}")
-                    continue
-                content = content[json_end:]
+            raw_content = response.msgs[0].content if response.msgs else ""
+            content = (
+                raw_content
+                if isinstance(raw_content, str)
+                else str(raw_content)
+            )
+
+            tool_calls = extract_tool_calls_from_text(content)
 
             if not tool_calls:
                 return response

{camel_ai-0.2.76a12 → camel_ai-0.2.76a13}/camel/loaders/__init__.py

@@ -21,7 +21,6 @@ from .jina_url_reader import JinaURLReader
 from .markitdown import MarkItDownLoader
 from .mineru_extractor import MinerU
 from .mistral_reader import MistralReader
-from .pandas_reader import PandasReader
 from .scrapegraph_reader import ScrapeGraphAI
 from .unstructured_io import UnstructuredIO
 
@@ -33,7 +32,6 @@ __all__ = [
     'JinaURLReader',
     'Firecrawl',
     'Apify',
-    'PandasReader',
     'ChunkrReader',
     'ChunkrReaderConfig',
     'MinerU',
@@ -42,3 +40,14 @@ __all__ = [
     'ScrapeGraphAI',
     'MistralReader',
 ]
+
+
+def __getattr__(name: str):
+    if name == 'PandasReader':
+        raise ImportError(
+            "PandasReader has been removed from camel.loaders. "
+            "The pandasai dependency limited pandas to version 1.5.3. "
+            "Please use ExcelToolkit from camel.toolkits instead for "
+            "handling structured data."
+        )
+    raise AttributeError(f"module '{__name__}' has no attribute '{name}'")

camel_ai-0.2.76a13/camel/parsers/__init__.py

@@ -0,0 +1,18 @@
+# ========= 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. =========
+"""Helper parsers used across the CAMEL project."""
+
+from .mcp_tool_call_parser import extract_tool_calls_from_text
+
+__all__ = ["extract_tool_calls_from_text"]

camel_ai-0.2.76a13/camel/parsers/mcp_tool_call_parser.py

@@ -0,0 +1,176 @@
+# ========= 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. =========
+"""Utility functions for parsing MCP tool calls from model output."""
+
+import ast
+import json
+import logging
+import re
+from typing import Any, Dict, List, Optional
+
+try:  # pragma: no cover - optional dependency
+    import yaml
+except ImportError:  # pragma: no cover
+    yaml = None  # type: ignore[assignment]
+
+
+CODE_BLOCK_PATTERN = re.compile(
+    r"```(?:[a-z0-9_-]+)?\s*([\s\S]+?)\s*```",
+    re.IGNORECASE,
+)
+
+JSON_START_PATTERN = re.compile(r"[{\[]")
+JSON_TOKEN_PATTERN = re.compile(
+    r"""
+    (?P<double>"(?:\\.|[^"\\])*")
+    |
+    (?P<single>'(?:\\.|[^'\\])*')
+    |
+    (?P<brace>[{}\[\]])
+    """,
+    re.VERBOSE,
+)
+
+logger = logging.getLogger(__name__)
+
+
+def extract_tool_calls_from_text(content: str) -> List[Dict[str, Any]]:
+    """Extract tool call dictionaries from raw text output."""
+
+    if not content:
+        return []
+
+    tool_calls: List[Dict[str, Any]] = []
+    seen_ranges: List[tuple[int, int]] = []
+
+    for match in CODE_BLOCK_PATTERN.finditer(content):
+        snippet = match.group(1).strip()
+        if not snippet:
+            continue
+
+        parsed = _try_parse_json_like(snippet)
+        if parsed is None:
+            logger.warning(
+                "Failed to parse JSON payload from fenced block: %s",
+                snippet,
+            )
+            continue
+
+        _collect_tool_calls(parsed, tool_calls)
+        seen_ranges.append((match.start(1), match.end(1)))
+
+    for start_match in JSON_START_PATTERN.finditer(content):
+        start_idx = start_match.start()
+
+        if any(start <= start_idx < stop for start, stop in seen_ranges):
+            continue
+
+        segment = _find_json_candidate(content, start_idx)
+        if segment is None:
+            continue
+
+        end_idx = start_idx + len(segment)
+        if any(start <= start_idx < stop for start, stop in seen_ranges):
+            continue
+
+        parsed = _try_parse_json_like(segment)
+        if parsed is None:
+            logger.debug(
+                "Unable to parse JSON-like candidate: %s",
+                _truncate_snippet(segment),
+            )
+            continue
+
+        _collect_tool_calls(parsed, tool_calls)
+        seen_ranges.append((start_idx, end_idx))
+
+    return tool_calls
+
+
+def _collect_tool_calls(
+    payload: Any, accumulator: List[Dict[str, Any]]
+) -> None:
+    """Collect valid tool call dictionaries from parsed payloads."""
+
+    if isinstance(payload, dict):
+        if payload.get("tool_name") is None:
+            return
+        accumulator.append(payload)
+    elif isinstance(payload, list):
+        for item in payload:
+            _collect_tool_calls(item, accumulator)
+
+
+def _try_parse_json_like(snippet: str) -> Optional[Any]:
+    """Parse a JSON or JSON-like snippet into Python data."""
+
+    try:
+        return json.loads(snippet)
+    except json.JSONDecodeError as exc:
+        logger.debug(
+            "json.loads failed: %s | snippet=%s",
+            exc,
+            _truncate_snippet(snippet),
+        )
+
+    if yaml is not None:
+        try:
+            return yaml.safe_load(snippet)
+        except yaml.YAMLError:
+            pass
+
+    try:
+        return ast.literal_eval(snippet)
+    except (ValueError, SyntaxError):
+        return None
+
+
+def _find_json_candidate(content: str, start_idx: int) -> Optional[str]:
+    """Locate a balanced JSON-like segment starting at ``start_idx``."""
+
+    opening = content[start_idx]
+    if opening not in "{[":
+        return None
+
+    stack = ["}" if opening == "{" else "]"]
+
+    for token in JSON_TOKEN_PATTERN.finditer(content, start_idx + 1):
+        if token.lastgroup in {"double", "single"}:
+            continue
+
+        brace = token.group("brace")
+        if brace in "{[":
+            stack.append("}" if brace == "{" else "]")
+            continue
+
+        if not stack:
+            return None
+
+        expected = stack.pop()
+        if brace != expected:
+            return None
+
+        if not stack:
+            return content[start_idx : token.end()]
+
+    return None
+
+
+def _truncate_snippet(snippet: str, limit: int = 120) -> str:
+    """Return a truncated representation suitable for logging."""
+
+    compact = " ".join(snippet.strip().split())
+    if len(compact) <= limit:
+        return compact
+    return f"{compact[: limit - 3]}..."

{camel_ai-0.2.76a12 → camel_ai-0.2.76a13}/camel/toolkits/mcp_toolkit.py

@@ -21,7 +21,8 @@ from typing import Any, Dict, List, Optional
 from typing_extensions import TypeGuard
 
 from camel.logger import get_logger
-from camel.toolkits import BaseToolkit, FunctionTool
+from camel.toolkits.base import BaseToolkit
+from camel.toolkits.function_tool import FunctionTool
 from camel.utils.commons import run_async
 from camel.utils.mcp_client import MCPClient, create_mcp_client
 

{camel_ai-0.2.76a12 → camel_ai-0.2.76a13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "camel-ai"
-version = "0.2.76a12"
+version = "0.2.76a13"
 description = "Communicative Agents for AI Society Study"
 authors = [{ name = "CAMEL-AI.org" }]
 requires-python = ">=3.10,<3.13"
@@ -79,7 +79,6 @@ rag = [
     "rank-bm25>=0.2.2,<0.3",
     "cohere>=5.11.0,<6",
     "unstructured==0.16.20",
-    "pandasai>=2.3.0,<3",
     "crawl4ai>=0.3.745",
     "pyobvector>=0.1.18",
     "google-genai>=1.13.0",
@@ -116,7 +115,6 @@ document_tools = [
     "docx2txt>=0.8,<0.9",
     "PyMuPDF>=1.22.5,<2",
     "unstructured==0.16.20",
-    "pandasai>=2.3.0,<3",
     "prance>=23.6.21.0,<24",
     "openapi-spec-validator>=0.7.1,<0.8",
     "xls2xlsx>=0.2.0",
@@ -152,7 +150,7 @@ communication_tools = [
 ]
 data_tools = [
     "numpy>=1.2,<=2.2",
-    "pandas>=1.5.3,<2",
+    "pandas>=2",
     "textblob>=0.17.1,<0.18",
     "datacommons>=1.4.3,<2",
     "datacommons_pandas>=0.0.3,<0.0.4",
@@ -239,7 +237,6 @@ owl = [
     "docx2txt>=0.8,<0.9",
     "PyMuPDF>=1.22.5,<2",
     "unstructured==0.16.20",
-    "pandasai>=2.3.0,<3",
     "prance>=23.6.21.0,<24",
     "openapi-spec-validator>=0.7.1,<0.8",
     "xls2xlsx>=0.2.0",
@@ -256,7 +253,7 @@ owl = [
     "typer>=0.15.2",
     "tree-sitter-python>=0.23.6,<0.24",
     "tree-sitter>=0.23.2,<0.24",
-    "pandas>=1.5.3,<2",
+    "pandas>=2",
     "rouge>=1.0.1,<2",
     "crawl4ai>=0.3.745",
     "scrapegraph-py>=1.12.0,<2",
@@ -290,7 +287,7 @@ eigent = [
     "wikipedia>=1,<2",
     "requests_oauthlib>=1.3.1,<2",
     "websockets>=13.0,<15.1",
-    "pandas>=1.5.3,<2",
+    "pandas>=2",
     "pylatex>=1.4.2",
     "python-pptx>=1.0.2",
     "pytesseract>=0.3.13",
@@ -314,7 +311,6 @@ all = [
     "docx2txt>=0.8,<0.9",
     "PyMuPDF>=1.22.5,<2",
     "unstructured==0.16.20",
-    "pandasai>=2.3.0,<3",
     "wikipedia>=1,<2",
     "linkup-sdk>=0.2.1,<0.3",
     "duckduckgo-search>=6.3.5,<7",
@@ -359,7 +355,7 @@ all = [
     "tavily-python>=0.5.0,<0.6",
     "apify_client>=1.8.1,<2",
     "stripe>=11.3.0,<12",
-    "pandas>=1.5.3,<2",
+    "pandas>=2",
     "tree-sitter-python>=0.23.6,<0.24",
     "tree-sitter>=0.23.2,<0.24",
     "networkx>=3.4.2,<4",
@@ -610,7 +606,6 @@ module = [
     "tree-sitter-python",
     "tree-sitter",
     "networkx",
-    "pandasai",
     "sklearn.metrics.pairwise",
     "sympy.*",
     "astor",