swarms 7.6.4__tar.gz → 7.6.6__tar.gz

{swarms-7.6.4 → swarms-7.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: swarms
-Version: 7.6.4
+Version: 7.6.6
 Summary: Swarms - TGSC
 Home-page: https://github.com/kyegomez/swarms
 License: MIT
@@ -23,6 +23,7 @@ Requires-Dist: docstring_parser (==0.16)
 Requires-Dist: httpx
 Requires-Dist: litellm
 Requires-Dist: loguru
+Requires-Dist: mcp
 Requires-Dist: networkx
 Requires-Dist: numpy
 Requires-Dist: psutil

{swarms-7.6.4 → swarms-7.6.6}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "swarms"
-version = "7.6.4"
+version = "7.6.6"
 description = "Swarms - TGSC"
 license = "MIT"
 authors = ["Kye Gomez <kye@apac.ai>"]
@@ -77,6 +77,8 @@ numpy = "*"
 litellm = "*"
 torch = "*"
 httpx = "*"
+mcp = "*"
+
 [tool.poetry.scripts]
 swarms = "swarms.cli.main:main"
 

{swarms-7.6.4 → swarms-7.6.6}/swarms/structs/__init__.py

@@ -2,7 +2,7 @@ from swarms.structs.agent import Agent
 from swarms.structs.agent_builder import AgentsBuilder
 from swarms.structs.agents_available import showcase_available_agents
 from swarms.structs.async_workflow import AsyncWorkflow
-from swarms.structs.auto_swarm import AutoSwarm, AutoSwarmRouter
+from experimental.auto_swarm import AutoSwarm, AutoSwarmRouter
 from swarms.structs.base_structure import BaseStructure
 from swarms.structs.base_swarm import BaseSwarm
 from swarms.structs.base_workflow import BaseWorkflow
@@ -85,8 +85,6 @@ from swarms.structs.swarming_architectures import (
 __all__ = [
     "Agent",
     "AsyncWorkflow",
-    "AutoSwarm",
-    "AutoSwarmRouter",
     "BaseStructure",
     "BaseSwarm",
     "BaseWorkflow",

{swarms-7.6.4 → swarms-7.6.6}/swarms/structs/agent.py

@@ -46,6 +46,11 @@ from swarms.structs.safe_loading import (
 )
 from swarms.telemetry.main import log_agent_data
 from swarms.tools.base_tool import BaseTool
+from swarms.tools.mcp_integration import (
+    MCPServerSseParams,
+    batch_mcp_flow,
+    mcp_flow_get_tool_schema,
+)
 from swarms.tools.tool_parse_exec import parse_and_execute_json
 from swarms.utils.any_to_str import any_to_str
 from swarms.utils.data_to_text import data_to_text
@@ -55,6 +60,7 @@ from swarms.utils.history_output_formatter import (
     history_output_formatter,
 )
 from swarms.utils.litellm_tokenizer import count_tokens
+from swarms.utils.litellm_wrapper import LiteLLM
 from swarms.utils.pdf_to_text import pdf_to_text
 from swarms.utils.str_to_dict import str_to_dict
 
@@ -98,6 +104,51 @@ agent_output_type = Literal[
 ToolUsageType = Union[BaseModel, Dict[str, Any]]
 
 
+# Agent Exceptions
+
+
+class AgentError(Exception):
+    """Base class for all agent-related exceptions."""
+
+    pass
+
+
+class AgentInitializationError(AgentError):
+    """Exception raised when the agent fails to initialize properly. Please check the configuration and parameters."""
+
+    pass
+
+
+class AgentRunError(AgentError):
+    """Exception raised when the agent encounters an error during execution. Ensure that the task and environment are set up correctly."""
+
+    pass
+
+
+class AgentLLMError(AgentError):
+    """Exception raised when there is an issue with the language model (LLM). Verify the model's availability and compatibility."""
+
+    pass
+
+
+class AgentToolError(AgentError):
+    """Exception raised when the agent fails to utilize a tool. Check the tool's configuration and availability."""
+
+    pass
+
+
+class AgentMemoryError(AgentError):
+    """Exception raised when the agent encounters a memory-related issue. Ensure that memory resources are properly allocated and accessible."""
+
+    pass
+
+
+class AgentLLMInitializationError(AgentError):
+    """Exception raised when the LLM fails to initialize properly. Please check the configuration and parameters."""
+
+    pass
+
+
 # [FEAT][AGENT]
 class Agent:
     """
@@ -352,6 +403,7 @@ class Agent:
         role: agent_roles = "worker",
         no_print: bool = False,
         tools_list_dictionary: Optional[List[Dict[str, Any]]] = None,
+        mcp_servers: List[MCPServerSseParams] = [],
         *args,
         **kwargs,
     ):
@@ -471,6 +523,13 @@ class Agent:
         self.role = role
         self.no_print = no_print
         self.tools_list_dictionary = tools_list_dictionary
+        self.mcp_servers = mcp_servers
+        self._cached_llm = (
+            None  # Add this line to cache the LLM instance
+        )
+        self._default_model = (
+            "gpt-4o-mini"  # Move default model name here
+        )
 
         if (
             self.agent_name is not None
@@ -584,51 +643,119 @@ class Agent:
         if self.llm is None:
             self.llm = self.llm_handling()
 
+        if (
+            self.tools_list_dictionary is None
+            and self.mcp_servers is not None
+        ):
+            self.tools_list_dictionary = self.mcp_tool_handling()
+
     def llm_handling(self):
-        from swarms.utils.litellm_wrapper import LiteLLM
+        # Use cached instance if available
+        if self._cached_llm is not None:
+            return self._cached_llm
 
         if self.model_name is None:
-            # raise ValueError("Model name cannot be None")
             logger.warning(
-                "Model name is not provided, using gpt-4o-mini. You can configure any model from litellm if desired."
+                f"Model name is not provided, using {self._default_model}. You can configure any model from litellm if desired."
             )
-            self.model_name = "gpt-4o-mini"
+            self.model_name = self._default_model
 
         try:
+            # Simplify initialization logic
+            common_args = {
+                "model_name": self.model_name,
+                "temperature": self.temperature,
+                "max_tokens": self.max_tokens,
+                "system_prompt": self.system_prompt,
+            }
+
             if self.llm_args is not None:
-                llm = LiteLLM(
-                    model_name=self.model_name, **self.llm_args
+                self._cached_llm = LiteLLM(
+                    **{**common_args, **self.llm_args}
                 )
             elif self.tools_list_dictionary is not None:
-
-                length_of_tools_list_dictionary = len(
-                    self.tools_list_dictionary
-                )
-
-                if length_of_tools_list_dictionary > 0:
-
-                    parallel_tool_calls = True
-
-                llm = LiteLLM(
-                    model_name=self.model_name,
-                    temperature=self.temperature,
-                    max_tokens=self.max_tokens,
-                    system_prompt=self.system_prompt,
+                self._cached_llm = LiteLLM(
+                    **common_args,
                     tools_list_dictionary=self.tools_list_dictionary,
                     tool_choice="auto",
-                    parallel_tool_calls=parallel_tool_calls,
+                    parallel_tool_calls=len(
+                        self.tools_list_dictionary
+                    )
+                    > 1,
                 )
             else:
-                llm = LiteLLM(
-                    model_name=self.model_name,
-                    temperature=self.temperature,
-                    max_tokens=self.max_tokens,
-                    system_prompt=self.system_prompt,
-                    stream=self.streaming_on,
+                self._cached_llm = LiteLLM(
+                    **common_args, stream=self.streaming_on
                 )
-            return llm
+
+            return self._cached_llm
+        except AgentLLMInitializationError as e:
+            logger.error(
+                f"Error in llm_handling: {e} Your current configuration is not supported. Please check the configuration and parameters."
+            )
+            return None
+
+    def mcp_execution_flow(self, response: any):
+        """
+        Executes the MCP (Model Context Protocol) flow based on the provided response.
+
+        This method takes a response, converts it from a string to a dictionary format,
+        and checks for the presence of a tool name or a name in the response. If either
+        is found, it retrieves the tool name and proceeds to call the batch_mcp_flow
+        function to execute the corresponding tool actions.
+
+        Args:
+            response (any): The response to be processed, which can be in string format
+            that represents a dictionary.
+
+        Returns:
+            The output from the batch_mcp_flow function, which contains the results of
+            the tool execution. If an error occurs during processing, it logs the error
+            and returns None.
+
+        Raises:
+            Exception: Logs any exceptions that occur during the execution flow.
+        """
+        try:
+            response = str_to_dict(response)
+
+            tool_output = batch_mcp_flow(
+                self.mcp_servers,
+                function_call=response,
+            )
+
+            return tool_output
         except Exception as e:
-            logger.error(f"Error in llm_handling: {e}")
+            logger.error(f"Error in mcp_execution_flow: {e}")
+            return None
+
+    def mcp_tool_handling(self):
+        """
+        Handles the retrieval of tool schemas from the MCP servers.
+
+        This method iterates over the list of MCP servers, retrieves the tool schema
+        for each server using the mcp_flow_get_tool_schema function, and compiles
+        these schemas into a list. The resulting list is stored in the
+        tools_list_dictionary attribute.
+
+        Returns:
+            list: A list of tool schemas retrieved from the MCP servers. If an error
+            occurs during the retrieval process, it logs the error and returns None.
+
+        Raises:
+            Exception: Logs any exceptions that occur during the tool handling process.
+        """
+        try:
+            self.tools_list_dictionary = []
+
+            for mcp_server in self.mcp_servers:
+                tool_schema = mcp_flow_get_tool_schema(mcp_server)
+                self.tools_list_dictionary.append(tool_schema)
+
+            print(self.tools_list_dictionary)
+            return self.tools_list_dictionary
+        except Exception as e:
+            logger.error(f"Error in mcp_tool_handling: {e}")
             return None
 
     def setup_config(self):
@@ -2259,6 +2386,8 @@ class Agent:
 
         Args:
             task (str): The task to be performed by the `llm` object.
+            img (str, optional): Path or URL to an image file.
+            audio (str, optional): Path or URL to an audio file.
             *args: Variable length argument list.
             **kwargs: Arbitrary keyword arguments.
 
@@ -2270,22 +2399,22 @@ class Agent:
             TypeError: If task is not a string or llm object is None.
             ValueError: If task is empty.
         """
-        if not isinstance(task, str):
-            raise TypeError("Task must be a string")
+        # if not isinstance(task, str):
+        #     task = any_to_str(task)
 
-        if task is None:
-            raise ValueError("Task cannot be None")
+        # if img is not None:
+        #     kwargs['img'] = img
 
-        # if self.llm is None:
-        #     raise TypeError("LLM object cannot be None")
+        # if audio is not None:
+        #     kwargs['audio'] = audio
 
         try:
-            out = self.llm.run(task, *args, **kwargs)
+            out = self.llm.run(task=task, *args, **kwargs)
 
             return out
-        except AttributeError as e:
+        except AgentLLMError as e:
             logger.error(
-                f"Error calling LLM: {e} You need a class with a run(task: str) method"
+                f"Error calling LLM: {e}. Task: {task}, Args: {args}, Kwargs: {kwargs}"
             )
             raise e