camel-ai 0.2.61__tar.gz → 0.2.62__tar.gz

{camel_ai-0.2.61 → camel_ai-0.2.62}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camel-ai
-Version: 0.2.61
+Version: 0.2.62
 Summary: Communicative Agents for AI Society Study
 Project-URL: Homepage, https://www.camel-ai.org/
 Project-URL: Repository, https://github.com/camel-ai/camel
@@ -103,6 +103,7 @@ Requires-Dist: pytelegrambotapi<5,>=4.18.0; extra == 'all'
 Requires-Dist: pytest-asyncio<0.24,>=0.23.0; extra == 'all'
 Requires-Dist: pytest-cov<5,>=4; extra == 'all'
 Requires-Dist: pytest<8,>=7; extra == 'all'
+Requires-Dist: python-pptx>=1.0.2; extra == 'all'
 Requires-Dist: pytidb-experimental==0.0.1.dev4; extra == 'all'
 Requires-Dist: qdrant-client<2,>=1.9.0; extra == 'all'
 Requires-Dist: rank-bm25<0.3,>=0.2.2; extra == 'all'
@@ -209,6 +210,7 @@ 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'
+Requires-Dist: python-pptx>=1.0.2; extra == 'document-tools'
 Requires-Dist: tabulate>=0.9.0; extra == 'document-tools'
 Requires-Dist: unstructured==0.16.20; extra == 'document-tools'
 Requires-Dist: xls2xlsx>=0.2.0; extra == 'document-tools'
@@ -268,6 +270,7 @@ Requires-Dist: pydub<0.26,>=0.25.1; extra == 'owl'
 Requires-Dist: pylatex>=1.4.2; extra == 'owl'
 Requires-Dist: pymupdf<2,>=1.22.5; extra == 'owl'
 Requires-Dist: python-dotenv<2,>=1.0.0; extra == 'owl'
+Requires-Dist: python-pptx>=1.0.2; 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'

{camel_ai-0.2.61 → camel_ai-0.2.62}/camel/__init__.py

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

{camel_ai-0.2.61 → camel_ai-0.2.62}/camel/agents/chat_agent.py

@@ -204,7 +204,7 @@ class ChatAgent(BaseAgent):
         self.model_type = self.model_backend.model_type
 
         # Assign unique ID
-        self.agent_id = agent_id if agent_id else str(uuid.uuid4())
+        self.agent_id = agent_id if agent_id else str(uuid.uuid4())[:6]
 
         # Set up memory
         context_creator = ScoreBasedContextCreator(

{camel_ai-0.2.61 → camel_ai-0.2.62}/camel/agents/mcp_agent.py

@@ -191,7 +191,7 @@ class MCPAgent(ChatAgent):
         self.mcp_toolkit = self._initialize_mcp_toolkit()
 
         # If already connected, reconnect to apply changes
-        if self.mcp_toolkit and self.mcp_toolkit.is_connected():
+        if self.mcp_toolkit and self.mcp_toolkit.is_connected:
             try:
                 asyncio.run(self.disconnect())
                 asyncio.run(self.connect())
@@ -325,7 +325,7 @@ class MCPAgent(ChatAgent):
         Returns:
             ChatAgentResponse: The response from the agent.
         """
-        if self.mcp_toolkit and not self.mcp_toolkit.is_connected():
+        if self.mcp_toolkit and not self.mcp_toolkit.is_connected:
             await self.connect()
 
         if self.function_calling_available:
@@ -378,14 +378,14 @@ class MCPAgent(ChatAgent):
                         if (
                             not isinstance(server_idx, int)
                             or server_idx < 0
-                            or server_idx >= len(self.mcp_toolkit.servers)
+                            or server_idx >= len(self.mcp_toolkit.clients)
                         ):
                             logger.warning(
                                 f"Invalid server index: {server_idx}"
                             )
                             continue
 
-                        server = self.mcp_toolkit.servers[server_idx]
+                        server = self.mcp_toolkit.clients[server_idx]
                         result = await server.call_tool(tool_name, tool_args)
 
                         # Safely access content
@@ -431,7 +431,7 @@ class MCPAgent(ChatAgent):
             # Use create_task and run with a future
             coro = self.astep(input_message, *args, **kwargs)
             future = asyncio.ensure_future(coro)
-            return asyncio.run_coroutine_threadsafe(future, loop).result()
+            return asyncio.run_coroutine_threadsafe(future, loop).result()  # type: ignore [arg-type]
         else:
             # Safe to run normally
             return asyncio.run(self.astep(input_message, *args, **kwargs))

{camel_ai-0.2.61/camel/data_collector → camel_ai-0.2.62/camel/data_collectors}/alpaca_collector.py

@@ -17,7 +17,7 @@ from typing import Any, Dict, List, Optional, Union
 from typing_extensions import Self
 
 from camel.agents import ChatAgent
-from camel.data_collector.base import BaseDataCollector
+from camel.data_collectors.base import BaseDataCollector
 from camel.messages import AlpacaItem, BaseMessage
 from camel.schemas import OpenAISchemaConverter
 

{camel_ai-0.2.61/camel/data_collector → camel_ai-0.2.62/camel/data_collectors}/sharegpt_collector.py

@@ -19,7 +19,7 @@ from pydantic import BaseModel
 from typing_extensions import Self
 
 from camel.agents import ChatAgent
-from camel.data_collector.base import BaseDataCollector
+from camel.data_collectors.base import BaseDataCollector
 from camel.messages import BaseMessage
 from camel.messages.conversion.conversation_models import (
     ShareGPTConversation,

{camel_ai-0.2.61 → camel_ai-0.2.62}/camel/retrievers/auto_retriever.py

@@ -128,12 +128,31 @@ class AutoRetriever:
         Returns:
             str: A sanitized, valid collection name suitable for use.
         """
+        import hashlib
+        import os
+
         from unstructured.documents.elements import Element
 
         if isinstance(content, Element):
             content = content.metadata.file_directory or str(uuid.uuid4())
 
-        collection_name = re.sub(r'[^a-zA-Z0-9]', '', content)[:20]
+        # For file paths, use a combination of directory hash and filename
+        if os.path.isfile(content):
+            # Get directory and filename
+            directory = os.path.dirname(content)
+            filename = os.path.basename(content)
+            # Create a short hash of the directory path
+            dir_hash = hashlib.md5(directory.encode()).hexdigest()[:6]
+            # Get filename without extension and remove special chars
+            base_name = os.path.splitext(filename)[0]
+            clean_name = re.sub(r'[^a-zA-Z0-9]', '', base_name)[:10]
+            # Combine for a unique name
+            collection_name = f"{clean_name}_{dir_hash}"
+        else:
+            # For URL content
+            content_hash = hashlib.md5(content.encode()).hexdigest()[:6]
+            clean_content = re.sub(r'[^a-zA-Z0-9]', '', content)[-10:]
+            collection_name = f"{clean_content}_{content_hash}"
 
         # Ensure the first character is either an underscore or a letter for
         # Milvus

{camel_ai-0.2.61/camel/runtime → camel_ai-0.2.62/camel/runtimes}/daytona_runtime.py

@@ -21,7 +21,7 @@ from typing import Any, Dict, List, Optional, Union
 from pydantic import BaseModel
 
 from camel.logger import get_logger
-from camel.runtime import BaseRuntime
+from camel.runtimes import BaseRuntime
 from camel.toolkits.function_tool import FunctionTool
 
 logger = get_logger(__name__)

{camel_ai-0.2.61/camel/runtime → camel_ai-0.2.62/camel/runtimes}/docker_runtime.py

@@ -26,7 +26,7 @@ import requests
 from pydantic import BaseModel
 from tqdm import tqdm
 
-from camel.runtime import BaseRuntime, TaskConfig
+from camel.runtimes import BaseRuntime, TaskConfig
 from camel.toolkits import FunctionTool
 
 if TYPE_CHECKING:

{camel_ai-0.2.61/camel/runtime → camel_ai-0.2.62/camel/runtimes}/llm_guard_runtime.py

@@ -19,8 +19,8 @@ from typing import List, Optional, Union
 from camel.agents import ChatAgent
 from camel.configs import ChatGPTConfig
 from camel.models import BaseModelBackend, ModelFactory
-from camel.runtime import BaseRuntime
-from camel.runtime.utils import FunctionRiskToolkit, IgnoreRiskToolkit
+from camel.runtimes import BaseRuntime
+from camel.runtimes.utils import FunctionRiskToolkit, IgnoreRiskToolkit
 from camel.toolkits import FunctionTool
 from camel.types import ModelPlatformType, ModelType
 

{camel_ai-0.2.61/camel/runtime → camel_ai-0.2.62/camel/runtimes}/remote_http_runtime.py

@@ -24,7 +24,7 @@ from typing import Any, Dict, List, Optional, Union
 import requests
 from pydantic import BaseModel
 
-from camel.runtime import BaseRuntime
+from camel.runtimes import BaseRuntime
 from camel.toolkits.function_tool import FunctionTool
 
 logger = logging.getLogger(__name__)

{camel_ai-0.2.61/camel/runtime → camel_ai-0.2.62/camel/runtimes}/ubuntu_docker_runtime.py

@@ -18,7 +18,7 @@ import time
 from pathlib import Path
 from typing import Callable, List, Optional, Union
 
-from camel.runtime.docker_runtime import DockerRuntime
+from camel.runtimes.docker_runtime import DockerRuntime
 from camel.toolkits import FunctionTool
 
 logger = logging.getLogger(__name__)

{camel_ai-0.2.61 → camel_ai-0.2.62}/camel/societies/workforce/base.py

@@ -12,7 +12,7 @@
 # limitations under the License.
 # ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========
 from abc import ABC, abstractmethod
-from typing import Any
+from typing import Any, Optional
 
 from camel.societies.workforce.task_channel import TaskChannel
 from camel.societies.workforce.utils import check_if_running
@@ -23,10 +23,14 @@ class BaseNode(ABC):
 
     Args:
         description (str): Description of the node.
+        node_id (Optional[str]): ID of the node. If not provided, it will
+            be generated automatically. (default: :obj:`None`)
     """
 
-    def __init__(self, description: str) -> None:
-        self.node_id = str(id(self))
+    def __init__(
+        self, description: str, node_id: Optional[str] = None
+    ) -> None:
+        self.node_id = node_id if node_id is not None else str(id(self))
         self.description = description
         self._channel: TaskChannel = TaskChannel()
         self._running = False

{camel_ai-0.2.61 → camel_ai-0.2.62}/camel/societies/workforce/single_agent_worker.py

@@ -39,7 +39,8 @@ class SingleAgentWorker(Worker):
         description: str,
         worker: ChatAgent,
     ) -> None:
-        super().__init__(description)
+        node_id = worker.agent_id
+        super().__init__(description, node_id=node_id)
         self.worker = worker
 
     def reset(self) -> Any:

{camel_ai-0.2.61 → camel_ai-0.2.62}/camel/societies/workforce/worker.py

@@ -15,7 +15,7 @@ from __future__ import annotations
 
 import logging
 from abc import ABC, abstractmethod
-from typing import List
+from typing import List, Optional
 
 from colorama import Fore
 
@@ -33,14 +33,16 @@ class Worker(BaseNode, ABC):
 
     Args:
         description (str): Description of the node.
-
+        node_id (Optional[str]): ID of the node. If not provided, it will
+            be generated automatically. (default: :obj:`None`)
     """
 
     def __init__(
         self,
         description: str,
+        node_id: Optional[str] = None,
     ) -> None:
-        super().__init__(description)
+        super().__init__(description, node_id=node_id)
 
     def __repr__(self):
         return f"Worker node {self.node_id} ({self.description})"

{camel_ai-0.2.61 → camel_ai-0.2.62}/camel/toolkits/__init__.py

@@ -62,6 +62,7 @@ from .mcp_toolkit import MCPToolkit
 from .browser_toolkit import BrowserToolkit
 from .async_browser_toolkit import AsyncBrowserToolkit
 from .file_write_toolkit import FileWriteToolkit
+from .pptx_toolkit import PPTXToolkit
 from .terminal_toolkit import TerminalToolkit
 from .pubmed_toolkit import PubMedToolkit
 from .data_commons_toolkit import DataCommonsToolkit
@@ -124,6 +125,7 @@ __all__ = [
     'BrowserToolkit',
     'AsyncBrowserToolkit',
     'FileWriteToolkit',
+    'PPTXToolkit',
     'TerminalToolkit',
     'PubMedToolkit',
     'DataCommonsToolkit',

{camel_ai-0.2.61 → camel_ai-0.2.62}/camel/toolkits/file_write_toolkit.py

@@ -338,8 +338,10 @@ class FileWriteToolkit(BaseToolkit):
 
         Args:
             content (Union[str, List[List[str]]]): The content to write to the
-                file. For all formats, content must be a string or list in the
-                appropriate format.
+                file. Content format varies by file type:
+                - Text formats (txt, md, html, yaml): string
+                - CSV: string or list of lists
+                - JSON: string or serializable object
             filename (str): The name or path of the file. If a relative path is
                 supplied, it is resolved to self.output_dir.
             encoding (Optional[str]): The character encoding to use. (default: