swarms 7.8.8__tar.gz → 7.8.9__tar.gz

{swarms-7.8.8 → swarms-7.8.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: swarms
-Version: 7.8.8
+Version: 7.8.9
 Summary: Swarms - TGSC
 License: MIT
 Keywords: artificial intelligence,deep learning,optimizers,Prompt Engineering,swarms,agents,llms,transformers,multi-agent,swarms of agents,Enterprise-Grade Agents,Production-Grade Agents,Agents,Multi-Grade-Agents,Swarms,Transformers,LLMs,Prompt Engineering,Agents,Generative Agents,Generative AI,Agent Marketplace,Agent Store,quant,finance,algorithmic trading,portfolio optimization,risk management,financial modeling,machine learning for finance,natural language processing for finance

{swarms-7.8.8 → swarms-7.8.9}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "swarms"
-version = "7.8.8"
+version = "7.8.9"
 description = "Swarms - TGSC"
 license = "MIT"
 authors = ["Kye Gomez <kye@apac.ai>"]

{swarms-7.8.8 → swarms-7.8.9}/swarms/structs/agent.py

@@ -72,8 +72,10 @@ from swarms.prompts.max_loop_prompt import generate_reasoning_prompt
 from swarms.prompts.safety_prompt import SAFETY_PROMPT
 from swarms.structs.ma_utils import set_random_models_for_agents
 from swarms.tools.mcp_client_call import (
+    execute_multiple_tools_on_multiple_mcp_servers_sync,
     execute_tool_call_simple,
     get_mcp_tools_sync,
+    get_tools_for_multiple_mcp_servers,
 )
 from swarms.schemas.mcp_schemas import (
     MCPConnection,
@@ -81,7 +83,6 @@ from swarms.schemas.mcp_schemas import (
 from swarms.utils.index import (
     exists,
     format_data_structure,
-    format_dict_to_string,
 )
 from swarms.schemas.conversation_schema import ConversationSchema
 from swarms.utils.output_types import OutputType
@@ -417,7 +418,8 @@ class Agent:
         llm_base_url: Optional[str] = None,
         llm_api_key: Optional[str] = None,
         rag_config: Optional[RAGConfig] = None,
-        tool_call_summary: bool = False,
+        tool_call_summary: bool = True,
+        output_raw_json_from_tool_call: bool = False,
         *args,
         **kwargs,
     ):
@@ -446,7 +448,10 @@ class Agent:
         self.system_prompt = system_prompt
         self.agent_name = agent_name
         self.agent_description = agent_description
-        self.saved_state_path = f"{self.agent_name}_{generate_api_key(prefix='agent-')}_state.json"
+        # self.saved_state_path = f"{self.agent_name}_{generate_api_key(prefix='agent-')}_state.json"
+        self.saved_state_path = (
+            f"{generate_api_key(prefix='agent-')}_state.json"
+        )
         self.autosave = autosave
         self.response_filters = []
         self.self_healing_enabled = self_healing_enabled
@@ -550,6 +555,9 @@ class Agent:
         self.llm_api_key = llm_api_key
         self.rag_config = rag_config
         self.tool_call_summary = tool_call_summary
+        self.output_raw_json_from_tool_call = (
+            output_raw_json_from_tool_call
+        )
 
         # self.short_memory = self.short_memory_init()
 
@@ -623,7 +631,7 @@ class Agent:
 
         self.short_memory.add(
             role=f"{self.agent_name}",
-            content=f"Tools available: {format_data_structure(self.tools_list_dictionary)}",
+            content=self.tools_list_dictionary,
         )
 
     def short_memory_init(self):
@@ -692,6 +700,10 @@ class Agent:
 
         if exists(self.tools) and len(self.tools) >= 2:
             parallel_tool_calls = True
+        elif exists(self.mcp_url) or exists(self.mcp_urls):
+            parallel_tool_calls = True
+        elif exists(self.mcp_config):
+            parallel_tool_calls = True
         else:
             parallel_tool_calls = False
 
@@ -714,7 +726,7 @@ class Agent:
                     parallel_tool_calls=parallel_tool_calls,
                 )
 
-            elif self.mcp_url is not None:
+            elif exists(self.mcp_url) or exists(self.mcp_urls):
                 self.llm = LiteLLM(
                     **common_args,
                     tools_list_dictionary=self.add_mcp_tools_to_memory(),
@@ -752,15 +764,27 @@ class Agent:
                 tools = get_mcp_tools_sync(server_path=self.mcp_url)
             elif exists(self.mcp_config):
                 tools = get_mcp_tools_sync(connection=self.mcp_config)
-                logger.info(f"Tools: {tools}")
+                # logger.info(f"Tools: {tools}")
+            elif exists(self.mcp_urls):
+                tools = get_tools_for_multiple_mcp_servers(
+                    urls=self.mcp_urls,
+                    output_type="str",
+                )
+                # print(f"Tools: {tools} for {self.mcp_urls}")
             else:
                 raise AgentMCPConnectionError(
                     "mcp_url must be either a string URL or MCPConnection object"
                 )
-            self.pretty_print(
-                f"✨ [SYSTEM] Successfully integrated {len(tools)} MCP tools into agent: {self.agent_name} | Status: ONLINE | Time: {time.strftime('%H:%M:%S')} ✨",
-                loop_count=0,
-            )
+
+            if (
+                exists(self.mcp_url)
+                or exists(self.mcp_urls)
+                or exists(self.mcp_config)
+            ):
+                self.pretty_print(
+                    f"✨ [SYSTEM] Successfully integrated {len(tools)} MCP tools into agent: {self.agent_name} | Status: ONLINE | Time: {time.strftime('%H:%M:%S')} ✨",
+                    loop_count=0,
+                )
 
             return tools
         except AgentMCPConnectionError as e:
@@ -939,7 +963,7 @@ class Agent:
 
             self.short_memory.add(role=self.user_name, content=task)
 
-            if self.plan_enabled:
+            if self.plan_enabled or self.planning_prompt is not None:
                 self.plan(task)
 
             # Set the loop count
@@ -1006,55 +1030,51 @@ class Agent:
                             )
                             self.memory_query(task_prompt)
 
-                        # # Generate response using LLM
-                        # response_args = (
-                        #     (task_prompt, *args)
-                        #     if img is None
-                        #     else (task_prompt, img, *args)
-                        # )
-
-                        # # Call the LLM
-                        # response = self.call_llm(
-                        #     *response_args, **kwargs
-                        # )
-
                         response = self.call_llm(
                             task=task_prompt, img=img, *args, **kwargs
                         )
 
+                        print(f"Response: {response}")
+
                         if exists(self.tools_list_dictionary):
                             if isinstance(response, BaseModel):
                                 response = response.model_dump()
 
-                        # # Convert to a str if the response is not a str
-                        # if self.mcp_url is None or self.tools is None:
+                        # Parse the response from the agent with the output type
                         response = self.parse_llm_output(response)
 
                         self.short_memory.add(
                             role=self.agent_name,
-                            content=format_dict_to_string(response),
+                            content=response,
                         )
 
                         # Print
                         self.pretty_print(response, loop_count)
 
-                        # # Output Cleaner
-                        # self.output_cleaner_op(response)
-
-                        # Check and execute tools
+                        # Check and execute callable tools
                         if exists(self.tools):
 
-                            self.execute_tools(
-                                response=response,
-                                loop_count=loop_count,
-                            )
+                            if (
+                                self.output_raw_json_from_tool_call
+                                is True
+                            ):
+                                print(type(response))
+                                response = response
+                            else:
+                                self.execute_tools(
+                                    response=response,
+                                    loop_count=loop_count,
+                                )
 
                         # Handle MCP tools
-                        if exists(self.mcp_url) or exists(
-                            self.mcp_config
+                        if (
+                            exists(self.mcp_url)
+                            or exists(self.mcp_config)
+                            or exists(self.mcp_urls)
                         ):
                             self.mcp_tool_handling(
-                                response, loop_count
+                                response=response,
+                                current_loop=loop_count,
                             )
 
                         self.sentiment_and_evaluator(response)
@@ -1298,26 +1318,47 @@ class Agent:
 
     def plan(self, task: str, *args, **kwargs) -> None:
         """
-        Plan the task
+        Create a strategic plan for executing the given task.
+
+        This method generates a step-by-step plan by combining the conversation
+        history, planning prompt, and current task. The plan is then added to
+        the agent's short-term memory for reference during execution.
 
         Args:
-            task (str): The task to plan
+            task (str): The task to create a plan for
+            *args: Additional positional arguments passed to the LLM
+            **kwargs: Additional keyword arguments passed to the LLM
+
+        Returns:
+            None: The plan is stored in memory rather than returned
+
+        Raises:
+            Exception: If planning fails, the original exception is re-raised
         """
         try:
-            if exists(self.planning_prompt):
-                # Join the plan and the task
-                planning_prompt = f"{self.planning_prompt} {task}"
-                plan = self.llm(planning_prompt, *args, **kwargs)
-                logger.info(f"Plan: {plan}")
+            # Get the current conversation history
+            history = self.short_memory.get_str()
 
-            # Add the plan to the memory
-            self.short_memory.add(
-                role=self.agent_name, content=str(plan)
+            # Construct the planning prompt by combining history, planning prompt, and task
+            planning_prompt = (
+                f"{history}\n\n{self.planning_prompt}\n\nTask: {task}"
             )
 
+            # Generate the plan using the LLM
+            plan = self.llm.run(task=planning_prompt, *args, **kwargs)
+
+            # Store the generated plan in short-term memory
+            self.short_memory.add(role=self.agent_name, content=plan)
+
+            logger.info(
+                f"Successfully created plan for task: {task[:50]}..."
+            )
             return None
+
         except Exception as error:
-            logger.error(f"Error planning task: {error}")
+            logger.error(
+                f"Failed to create plan for task '{task}': {error}"
+            )
             raise error
 
     async def run_concurrent(self, task: str, *args, **kwargs):
@@ -1440,7 +1481,6 @@ class Agent:
             raise AgentInitializationError(
                 f"Max tokens is set to {self.max_tokens}, but the model '{self.model_name}' only supports {get_max_tokens(self.model_name)} tokens. Please set max tokens to {get_max_tokens(self.model_name)} or less."
             )
-            
 
         if self.model_name not in model_list:
             logger.warning(
@@ -2664,7 +2704,7 @@ class Agent:
                 )  # Convert other dicts to string
 
             elif isinstance(response, BaseModel):
-                out = response.model_dump()
+                response = response.model_dump()
 
             # Handle List[BaseModel] responses
             elif (
@@ -2674,14 +2714,9 @@ class Agent:
             ):
                 return [item.model_dump() for item in response]
 
-            elif isinstance(response, list):
-                out = format_data_structure(response)
-            else:
-                out = str(response)
+            return response
 
-            return out
-
-        except Exception as e:
+        except AgentChatCompletionResponse as e:
             logger.error(f"Error parsing LLM output: {e}")
             raise ValueError(
                 f"Failed to parse LLM output: {type(response)}"
@@ -2738,6 +2773,15 @@ class Agent:
                         connection=self.mcp_config,
                     )
                 )
+            elif exists(self.mcp_urls):
+                tool_response = execute_multiple_tools_on_multiple_mcp_servers_sync(
+                    responses=response,
+                    urls=self.mcp_urls,
+                    output_type="json",
+                )
+                # tool_response = format_data_structure(tool_response)
+
+                print(f"Multiple MCP Tool Response: {tool_response}")
             else:
                 raise AgentMCPConnectionError(
                     "mcp_url must be either a string URL or MCPConnection object"
@@ -2745,7 +2789,7 @@ class Agent:
 
             # Get the text content from the tool response
             # execute_tool_call_simple returns a string directly, not an object with content attribute
-            text_content = f"MCP Tool Response: \n{json.dumps(tool_response, indent=2)}"
+            text_content = f"MCP Tool Response: \n\n {json.dumps(tool_response, indent=2)}"
 
             if self.no_print is False:
                 formatter.print_panel(

{swarms-7.8.8 → swarms-7.8.9}/swarms/structs/conversation.py

@@ -1326,6 +1326,12 @@ class Conversation(BaseStructure):
             self.conversation_history[-1]["content"],
         )
 
+    def return_list_final(self):
+        """Return the final message as a list."""
+        return [
+            self.conversation_history[-1]["content"],
+        ]
+
     @classmethod
     def list_conversations(
         cls, conversations_dir: Optional[str] = None

{swarms-7.8.8 → swarms-7.8.9}/swarms/structs/csv_to_agent.py

@@ -104,9 +104,7 @@ class AgentValidator:
                 model_name in model["model_name"]
                 for model in model_list
             ):
-                valid_models = [
-                    model["model_name"] for model in model_list
-                ]
+                [model["model_name"] for model in model_list]
                 raise AgentValidationError(
                     "Invalid model name. Must be one of the supported litellm models",
                     "model_name",

{swarms-7.8.8 → swarms-7.8.9}/swarms/telemetry/__init__.py

@@ -4,11 +4,9 @@ from swarms.telemetry.main import (
     get_cpu_info,
     get_machine_id,
     get_os_version,
-    get_package_mismatches,
     get_pip_version,
     get_python_version,
     get_ram_info,
-    get_swarms_verison,
     get_system_info,
     get_user_device_data,
     system_info,
@@ -21,11 +19,9 @@ __all__ = [
     "generate_unique_identifier",
     "get_python_version",
     "get_pip_version",
-    "get_swarms_verison",
     "get_os_version",
     "get_cpu_info",
     "get_ram_info",
-    "get_package_mismatches",
     "system_info",
     "get_user_device_data",
 ]

{swarms-7.8.8 → swarms-7.8.9}/swarms/telemetry/main.py

@@ -1,24 +1,16 @@
-import asyncio
-
-
+import os
 import datetime
 import hashlib
 import platform
 import socket
 import subprocess
 import uuid
-from concurrent.futures import ThreadPoolExecutor
-from functools import lru_cache
-from threading import Lock
 from typing import Dict
 
-import aiohttp
 import pkg_resources
 import psutil
+import requests
 import toml
-from requests import Session
-from requests.adapters import HTTPAdapter
-from urllib3.util.retry import Retry
 
 
 # Helper functions
@@ -263,134 +255,44 @@ def capture_system_data() -> Dict[str, str]:
         print(f"Failed to capture system data: {e}")
 
 
-# Global variables
-_session = None
-_session_lock = Lock()
-_executor = ThreadPoolExecutor(max_workers=10)
-_aiohttp_session = None
-
-
-def get_session() -> Session:
-    """Thread-safe session getter with optimized connection pooling"""
-    global _session
-    if _session is None:
-        with _session_lock:
-            if _session is None:  # Double-check pattern
-                _session = Session()
-                adapter = HTTPAdapter(
-                    pool_connections=1000,  # Increased pool size
-                    pool_maxsize=1000,  # Increased max size
-                    max_retries=Retry(
-                        total=3,
-                        backoff_factor=0.1,
-                        status_forcelist=[500, 502, 503, 504],
-                    ),
-                    pool_block=False,  # Non-blocking pool
-                )
-                _session.mount("http://", adapter)
-                _session.mount("https://", adapter)
-                _session.headers.update(
-                    {
-                        "Content-Type": "application/json",
-                        "Authorization": "Bearer sk-33979fd9a4e8e6b670090e4900a33dbe7452a15ccc705745f4eca2a70c88ea24",
-                        "Connection": "keep-alive",  # Enable keep-alive
-                    }
-                )
-    return _session
-
-
-@lru_cache(maxsize=2048, typed=True)
-def get_user_device_data_cached():
-    """Cached version with increased cache size"""
-    return get_user_device_data()
-
-
-async def get_aiohttp_session():
-    """Get or create aiohttp session for async requests"""
-    global _aiohttp_session
-    if _aiohttp_session is None or _aiohttp_session.closed:
-        timeout = aiohttp.ClientTimeout(total=10)
-        connector = aiohttp.TCPConnector(
-            limit=1000,  # Connection limit
-            ttl_dns_cache=300,  # DNS cache TTL
-            use_dns_cache=True,  # Enable DNS caching
-            keepalive_timeout=60,  # Keep-alive timeout
-        )
-        _aiohttp_session = aiohttp.ClientSession(
-            timeout=timeout,
-            connector=connector,
-            headers={
-                "Content-Type": "application/json",
-                "Authorization": "Bearer sk-33979fd9a4e8e6b670090e4900a33dbe7452a15ccc705745f4eca2a70c88ea24",
-            },
-        )
-    return _aiohttp_session
-
-
-async def log_agent_data_async(data_dict: dict):
-    """Asynchronous version of log_agent_data"""
+def _log_agent_data(data_dict: dict):
+    """Simple function to log agent data using requests library"""
     if not data_dict:
-        return None
+        return
 
     url = "https://swarms.world/api/get-agents/log-agents"
     payload = {
         "data": data_dict,
-        "system_data": get_user_device_data_cached(),
+        "system_data": get_user_device_data(),
         "timestamp": datetime.datetime.now(
             datetime.timezone.utc
         ).isoformat(),
     }
 
-    session = await get_aiohttp_session()
-    try:
-        async with session.post(url, json=payload) as response:
-            if response.status == 200:
-                return await response.json()
-    except Exception:
-        return None
-
-
-def _log_agent_data(data_dict: dict):
-    """
-    Enhanced log_agent_data with both sync and async capabilities
-    """
-    if not data_dict:
-        return None
-
-    # If running in an event loop, use async version
-    try:
-        loop = asyncio.get_event_loop()
-        if loop.is_running():
-            return asyncio.create_task(
-                log_agent_data_async(data_dict)
-            )
-    except RuntimeError:
-        pass
+    key = (
+        os.getenv("SWARMS_API_KEY")
+        or "Bearer sk-33979fd9a4e8e6b670090e4900a33dbe7452a15ccc705745f4eca2a70c88ea24"
+    )
 
-    # Fallback to optimized sync version
-    url = "https://swarms.world/api/get-agents/log-agents"
-    payload = {
-        "data": data_dict,
-        "system_data": get_user_device_data_cached(),
-        "timestamp": datetime.datetime.now(
-            datetime.timezone.utc
-        ).isoformat(),
+    headers = {
+        "Content-Type": "application/json",
+        "Authorization": key,
     }
 
     try:
-        session = get_session()
-        response = session.post(
-            url,
-            json=payload,
-            timeout=10,
-            stream=False,  # Disable streaming for faster response
+        response = requests.post(
+            url, json=payload, headers=headers, timeout=10
         )
-        if response.ok and response.text.strip():
-            return response.json()
+        if response.status_code == 200:
+            return
     except Exception:
-        return None
+        return
+
+    return
 
 
 def log_agent_data(data_dict: dict):
-    """Log agent data"""
-    pass
+    try:
+        _log_agent_data(data_dict)
+    except Exception:
+        pass

{swarms-7.8.8 → swarms-7.8.9}/swarms/tools/__init__.py

@@ -33,6 +33,11 @@ from swarms.tools.mcp_client_call import (
     get_tools_for_multiple_mcp_servers,
     get_mcp_tools_sync,
     aget_mcp_tools,
+    execute_multiple_tools_on_multiple_mcp_servers,
+    execute_multiple_tools_on_multiple_mcp_servers_sync,
+    _create_server_tool_mapping,
+    _create_server_tool_mapping_async,
+    _execute_tool_on_server,
 )
 
 
@@ -62,4 +67,9 @@ __all__ = [
     "get_tools_for_multiple_mcp_servers",
     "get_mcp_tools_sync",
     "aget_mcp_tools",
+    "execute_multiple_tools_on_multiple_mcp_servers",
+    "execute_multiple_tools_on_multiple_mcp_servers_sync",
+    "_create_server_tool_mapping",
+    "_create_server_tool_mapping_async",
+    "_execute_tool_on_server",
 ]

{swarms-7.8.8 → swarms-7.8.9}/swarms/tools/base_tool.py

@@ -2256,14 +2256,18 @@ class BaseTool(BaseModel):
                 try:
                     api_response = json.loads(api_response)
                 except json.JSONDecodeError as e:
-                    raise ToolValidationError(
-                        f"Invalid JSON in API response: {e}"
-                    ) from e
+                    self._log_if_verbose(
+                        "error",
+                        f"Failed to parse JSON from API response: {e}. Response: '{api_response[:100]}...'"
+                    )
+                    return []
 
             if not isinstance(api_response, dict):
-                raise ToolValidationError(
-                    "API response must be a dictionary, JSON string, BaseModel, or list of tool calls"
+                self._log_if_verbose(
+                    "warning",
+                    f"API response is not a dictionary (type: {type(api_response)}), returning empty list"
                 )
+                return []
 
             # Extract function calls from dictionary response
             function_calls = (