swarms 7.7.9__py3-none-any.whl → 7.8.0__py3-none-any.whl

swarms/utils/litellm_wrapper.py

@@ -1,3 +1,4 @@
+from typing import Optional
 import base64
 import requests
 
@@ -6,25 +7,13 @@ from typing import List
 
 from loguru import logger
 import litellm
+from pydantic import BaseModel
 
-try:
-    from litellm import completion, acompletion
-except ImportError:
-    import subprocess
-    import sys
-    import litellm
+from litellm import completion, acompletion
 
-    print("Installing litellm")
-
-    subprocess.check_call(
-        [sys.executable, "-m", "pip", "install", "-U", "litellm"]
-    )
-    print("litellm installed")
-
-    from litellm import completion
-
-    litellm.set_verbose = True
-    litellm.ssl_verify = False
+litellm.set_verbose = True
+litellm.ssl_verify = False
+# litellm._turn_on_debug()
 
 
 class LiteLLMException(Exception):
@@ -86,6 +75,9 @@ class LiteLLM:
         retries: int = 3,
         verbose: bool = False,
         caching: bool = False,
+        mcp_call: bool = False,
+        top_p: float = 1.0,
+        functions: List[dict] = None,
         *args,
         **kwargs,
     ):
@@ -110,6 +102,9 @@ class LiteLLM:
         self.tool_choice = tool_choice
         self.parallel_tool_calls = parallel_tool_calls
         self.caching = caching
+        self.mcp_call = mcp_call
+        self.top_p = top_p
+        self.functions = functions
         self.modalities = []
         self._cached_messages = {}  # Cache for prepared messages
         self.messages = []  # Initialize messages list
@@ -123,6 +118,23 @@ class LiteLLM:
             retries  # Add retries for better reliability
         )
 
+    def output_for_tools(self, response: any):
+        if self.mcp_call is True:
+            out = response.choices[0].message.tool_calls[0].function
+            output = {
+                "function": {
+                    "name": out.name,
+                    "arguments": out.arguments,
+                }
+            }
+            return output
+        else:
+            out = response.choices[0].message.tool_calls
+
+            if isinstance(out, BaseModel):
+                out = out.model_dump()
+            return out
+
     def _prepare_messages(self, task: str) -> list:
         """
         Prepare the messages for the given task.
@@ -222,8 +234,8 @@ class LiteLLM:
     def run(
         self,
         task: str,
-        audio: str = None,
-        img: str = None,
+        audio: Optional[str] = None,
+        img: Optional[str] = None,
         *args,
         **kwargs,
     ):
@@ -250,38 +262,28 @@ class LiteLLM:
                 self.handle_modalities(
                     task=task, audio=audio, img=img
                 )
-                messages = (
-                    self.messages
-                )  # Use modality-processed messages
-
-            if (
-                self.model_name == "openai/o4-mini"
-                or self.model_name == "openai/o3-2025-04-16"
-            ):
-                # Prepare common completion parameters
-                completion_params = {
-                    "model": self.model_name,
-                    "messages": messages,
-                    "stream": self.stream,
-                    # "temperature": self.temperature,
-                    "max_completion_tokens": self.max_tokens,
-                    "caching": self.caching,
-                    **kwargs,
-                }
+                messages = self.messages
 
-            else:
-                # Prepare common completion parameters
-                completion_params = {
-                    "model": self.model_name,
-                    "messages": messages,
-                    "stream": self.stream,
-                    "temperature": self.temperature,
-                    "max_tokens": self.max_tokens,
-                    "caching": self.caching,
-                    **kwargs,
-                }
+            # Base completion parameters
+            completion_params = {
+                "model": self.model_name,
+                "messages": messages,
+                "stream": self.stream,
+                "max_tokens": self.max_tokens,
+                "caching": self.caching,
+                "temperature": self.temperature,
+                "top_p": self.top_p,
+                **kwargs,
+            }
 
-            # Handle tool-based completion
+            # Add temperature for non-o4/o3 models
+            if self.model_name not in [
+                "openai/o4-mini",
+                "openai/o3-2025-04-16",
+            ]:
+                completion_params["temperature"] = self.temperature
+
+            # Add tools if specified
             if self.tools_list_dictionary is not None:
                 completion_params.update(
                     {
@@ -290,28 +292,24 @@ class LiteLLM:
                         "parallel_tool_calls": self.parallel_tool_calls,
                     }
                 )
-                response = completion(**completion_params)
-                return (
-                    response.choices[0]
-                    .message.tool_calls[0]
-                    .function.arguments
-                )
 
-            # Handle modality-based completion
-            if (
-                self.modalities and len(self.modalities) > 1
-            ):  # More than just text
+            if self.functions is not None:
                 completion_params.update(
-                    {"modalities": self.modalities}
+                    {"functions": self.functions}
                 )
-                response = completion(**completion_params)
-                return response.choices[0].message.content
 
-            # Standard completion
-            if self.stream:
-                return completion(**completion_params)
+            # Add modalities if needed
+            if self.modalities and len(self.modalities) >= 2:
+                completion_params["modalities"] = self.modalities
+
+            # Make the completion call
+            response = completion(**completion_params)
+
+            # Handle tool-based response
+            if self.tools_list_dictionary is not None:
+                return self.output_for_tools(response)
             else:
-                response = completion(**completion_params)
+                # Return standard response content
                 return response.choices[0].message.content
 
         except LiteLLMException as error:
@@ -322,7 +320,7 @@ class LiteLLM:
                 )
                 import time
 
-                time.sleep(2)  # Add a small delay before retry
+                time.sleep(2)
                 return self.run(task, audio, img, *args, **kwargs)
             raise error
 

{swarms-7.7.9.dist-info → swarms-7.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: swarms
-Version: 7.7.9
+Version: 7.8.0
 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
@@ -21,13 +21,13 @@ Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: asyncio (>=3.4.3,<4.0)
 Requires-Dist: docstring_parser (==0.16)
-Requires-Dist: fastmcp
 Requires-Dist: httpx
 Requires-Dist: litellm
 Requires-Dist: loguru
 Requires-Dist: mcp
 Requires-Dist: networkx
 Requires-Dist: numpy
+Requires-Dist: numpydoc
 Requires-Dist: psutil
 Requires-Dist: pydantic
 Requires-Dist: pypdf (==5.1.0)

{swarms-7.7.9.dist-info → swarms-7.8.0.dist-info}/RECORD

@@ -14,6 +14,7 @@ swarms/agents/openai_assistant.py,sha256=mTSEtj26J0mc5pCeWrmMY0EXzTRYQfyfw_BtOqt
 swarms/agents/react_agent.py,sha256=yM8lQoRsqJZicqtmgBrC7RHv0aKEb5oZHh4q5aAA_xs,5804
 swarms/agents/reasoning_agents.py,sha256=tF7K710lj-VZQVc2VjqxMWGLNGMsEWRarXcJnXz1wkc,5741
 swarms/agents/reasoning_duo.py,sha256=s9SnXoproQaBrShLtiruGJituy8sJlZJATc5Vy_FdwI,3875
+swarms/agents/self_agent_builder.py,sha256=bX7xSwak6HiyK901VdeE8OlT4yqE0n7jyHcWJrkMeew,1104
 swarms/agents/tool_agent.py,sha256=G7rhBACsHsGUMT4H9eF5aY7e3Gx-5jOmJkhCF1jm9mU,5087
 swarms/artifacts/__init__.py,sha256=M111xTw7IVVt8gLDwW7Kau5n1YdwkL3vbCJPVeEWktI,83
 swarms/artifacts/main_artifact.py,sha256=bu2TcsTR81ttJEjVJ3NzT7D4x7uuM57okC92QuigV9I,11139
@@ -34,6 +35,7 @@ swarms/prompts/aga.py,sha256=4rRG7r9LF9JBrGOLN4Hy_6cSe0z5YOeKFbGnOmRfFJ0,9156
 swarms/prompts/agent_judge_prompt.py,sha256=-2q5mWLRyO7pj7j512ZNYRm-uEZttPgDGaxZo3oM_QQ,2235
 swarms/prompts/agent_prompt.py,sha256=6SXkMWcFIIAY02N9P6kMdzo4wtPwzg1Bl9R2qsIdicM,2705
 swarms/prompts/agent_prompts.py,sha256=63ZqAO1jfH3TKtl9ibLLagSG5kAPlbq4xtCGgGEuuoA,6886
+swarms/prompts/agent_self_builder_prompt.py,sha256=cpO6VgtKaZAZ0aD3spzkzsMgdwEKo1_UALfLgczkFdU,6167
 swarms/prompts/agent_system_prompts.py,sha256=3Ae6bSZjyRtV1nlkHkm8pYgWoZjzzVR1_amaNQ-Z9Do,7796
 swarms/prompts/ai_research_team.py,sha256=6j8eqKih4PKSwYoS1BSBSEhZEGPiZCbTVX6aBUVNRIw,5233
 swarms/prompts/aot_prompt.py,sha256=c1CBRixF2ucKZ0erwAjSOTSNHo_qO2jwUR-D3dxpfXw,1148
@@ -87,24 +89,30 @@ swarms/prompts/urban_planning.py,sha256=z483ehEuZwKuddbxS2s7fteDlb_iQ_Cj8DMCM_QC
 swarms/prompts/visual_cot.py,sha256=PKePf57hu5sjaG5IvMFAxPzbLuPYrmnWEQG1MOq3TIg,3675
 swarms/prompts/worker_prompt.py,sha256=f6qPN24vEciGRTHyYjNDguhzCFPZqa2u05rEHIPcJto,5554
 swarms/prompts/xray_swarm_prompt.py,sha256=AfV_y8GVuEodznOGQ9Q8QlInoLE5Px3Nl9GS_EpsDxg,2349
-swarms/schemas/__init__.py,sha256=AZ7BZE3bLabA5_m83jbELB6SaOMHx1MhMy9EeUODBqs,107
+swarms/schemas/__init__.py,sha256=G2PKMJONzT3x6_edNqNjTgCgpTyul4UKhpC5cSe8Zjw,247
+swarms/schemas/agent_class_schema.py,sha256=SG04rPZEHE4XWwC402qvfRMRJpyhQ0AvsHF-_B-e2Cg,4581
+swarms/schemas/agent_mcp_errors.py,sha256=2BDsZAt9Pgmfh_D5DKY5vc9psw4Wl0FevL60yfiQvKk,266
 swarms/schemas/agent_step_schemas.py,sha256=a14gb58vR0xOwB_fwSJQbN6yb9HddEaT30E6hUrzEQA,2573
+swarms/schemas/agent_tool_schema.py,sha256=XdaKie6R0WhNXlnEl9f5T3hHmMedFbVwG17fdHP_U3E,385
 swarms/schemas/base_schemas.py,sha256=UvBLVWg2qRen4tK5GJz50v42SiX95EQ5qK7hfyAHTEU,3267
-swarms/structs/__init__.py,sha256=jfvyqtA5WMpjYgvmngBqijwOhjLhRkjWAucPGe91THU,4051
-swarms/structs/agent.py,sha256=43N4gCWEects0BTej-CtPIsLdKEL4vQnz3CRJjXZ4xI,98663
+swarms/schemas/llm_agent_schema.py,sha256=om3tPSjwbkIj2Hr38mKMLJvWs0E2BaE1jw2kzzd0Www,3020
+swarms/schemas/mcp_schemas.py,sha256=XZJ4HyiY_cv8Gvj-53ddjzXuqT9hBU2f0cHbhIKs_jY,1330
+swarms/structs/__init__.py,sha256=VEHVLHULQDqpCKGhBQ-oxiQAwP_9dI9K1mRF8WSYRvg,4231
+swarms/structs/agent.py,sha256=MsPTIbIeOCa43eU6hIIp1pd8VSm07SjWB0he19msoyQ,100435
 swarms/structs/agent_builder.py,sha256=tYNpfO4_8cgfMHfgA5DAOWffHnt70p6CLt59esqfVCY,12133
 swarms/structs/agent_registry.py,sha256=il507cO1NF-d4ChyANVLuWrN8bXsEAi8_7bLJ_sTU6A,12112
 swarms/structs/agent_roles.py,sha256=8XEw6RjOOZelaZaWt4gXaYQm5WMLEhSO7W6Z8sQjmFg,582
 swarms/structs/agent_router.py,sha256=YZw5AaK2yTvxkOA7ouED_4MoYgn0XZggvo1wrglp-4E,13017
-swarms/structs/aop.py,sha256=-IzyDGDg9zJ-Ib42UTiA14dXfu0fRQOg9UR9jst8UNs,17374
+swarms/structs/aop.py,sha256=VQS1oDtg4cXVBxRaxMSYSM5X4nzVFy7u7mLmiOqDWZo,17408
 swarms/structs/auto_swarm_builder.py,sha256=79hd-3GpEyCGgS6tj4FvGFyM8768McQZJQXbGGj9XMk,12973
 swarms/structs/base_structure.py,sha256=GDu4QJQQmhU7IyuFJHIh9UVThACCva-L7uoMbVD9l4s,15901
 swarms/structs/base_swarm.py,sha256=LSGJDPJdyUCcK6698mNtjxoC1OU3s_J2NxC2k_ccGUs,23779
 swarms/structs/base_workflow.py,sha256=DTfFwX3AdFYxACDYwUDqhsbcDZnITlg5TeEYyxmJBCc,11414
+swarms/structs/batch_agent_execution.py,sha256=d85DzeCq4uTbbPqLhAXFqFx_cxXUS5yRnJ1-gJkwU5w,1871
 swarms/structs/concat.py,sha256=utezSxNyh1mIwXgdf8-dJ803NDPyEy79WE8zJHuooGk,732
 swarms/structs/concurrent_workflow.py,sha256=OqXI-X-9a0hG2a7aLzobwd7CVF2ez0rgLj3ZHqri5bg,12952
-swarms/structs/conversation.py,sha256=6Wq93O0F-ZoSy4QjtZbNHI-UP1ym5k4QHQ-nJ37I1ro,27162
-swarms/structs/council_judge.py,sha256=QkV7xVJRJxkGDKjzFiVGgjuNxm-jFsYzApUQnI8Bqoc,16567
+swarms/structs/conversation.py,sha256=88FgnM5tHOjC_F0TGRT04gkiPnE3tiept4ipnCO4iw8,27501
+swarms/structs/council_judge.py,sha256=siYDKiHMvFmShUTXxdo4R6vXiQhKt7bEBI205oC3kU4,19639
 swarms/structs/csv_to_agent.py,sha256=ug9JqQFPguXeU9JQpSUXuVtOpHYdJhlpKJUJBovo694,9443
 swarms/structs/de_hallucination_swarm.py,sha256=9cC0rSSXGwYu6SRDwpeMbCcQ40C1WI1RE9SNapKRLOQ,10309
 swarms/structs/deep_research_swarm.py,sha256=3f8T_t-gIg5wbfU2JrMmZ9Ob4Qn153zXdzt5ZpydmXk,16777
@@ -113,9 +121,10 @@ swarms/structs/graph_workflow.py,sha256=TAaUG_J3898hhghPOp0WEAV3Zf0in6s48ZSVbSTX
 swarms/structs/groupchat.py,sha256=jjH0BqU9Nrd_3jl9QzrcvbSce527SFpUaepawaRiw2o,15391
 swarms/structs/hiearchical_swarm.py,sha256=2x3InS4HJg4T9Y195l_ANTGu6DYcllqCdJcR3v5Xuro,33402
 swarms/structs/hybrid_hiearchical_peer_swarm.py,sha256=D1iBtNNee_mxPoOWS5WGTqcci5FQKtt38mW-J42GvfM,9494
-swarms/structs/ma_utils.py,sha256=FxMNCmeSpYEczZOxK0gpgn5a50CJTc1USmRHCqvxP54,3091
+swarms/structs/long_agent.py,sha256=KFjE2uUI8ONTkeJO43Sh3y5-Ec0kga28BECGklic-S4,15049
+swarms/structs/ma_utils.py,sha256=s8uTCplQtiFvxyqyTTTUCnJDMwNLJEuxbdGZyOURjLg,3244
 swarms/structs/majority_voting.py,sha256=F_t_MOC3YCRyMw5N6qKdFThpaXZxwixRw592Ku5Uhto,10122
-swarms/structs/malt.py,sha256=Z0aTeu0TCjQhmdNOyVaeedWGo6uxNLIWobjuZ1a5GfQ,19596
+swarms/structs/malt.py,sha256=uLofKBWHkP3uNhyCkkgEyE4Z7qnOHTtcg-OTiR19x_Y,19572
 swarms/structs/matrix_swarm.py,sha256=qHuhOYrTyOv6ujHMe8PrQT-h-WmaCPCfX4ghv5L8UFI,9765
 swarms/structs/meme_agent_persona_generator.py,sha256=b3kKlumhsV4KV88-GS3CUnGO1UfKTU3fT8SAMj0ZlwQ,10645
 swarms/structs/mixture_of_agents.py,sha256=Ix2YTdrzISPQJLrQ5vrZtYOpZwIYDx0vUaNmvBwDDVM,7762
@@ -137,7 +146,7 @@ swarms/structs/swarm_eval.py,sha256=148E2R2zaCmt_LZYx15nmdFjybXHiQ2CZbl6pk77jNs,
 swarms/structs/swarm_id_generator.py,sha256=Wly7AtGM9e6VgzhYmfg8_gSOdxAdsOvWHJFK81cpQNQ,68
 swarms/structs/swarm_matcher.py,sha256=E2KwHHEJxmW-UfTeMPWZ6VCmYdQ_I9_fwrfJbxD02GY,23322
 swarms/structs/swarm_registry.py,sha256=P0XRrqp1qBNyt0BycqPQljUzKv9jClaQMhtaBMinhYg,5578
-swarms/structs/swarm_router.py,sha256=DfLS7HwmqFJ7hJLgkCNT7qwIQM4Hk6YB7askKNLTdNE,28503
+swarms/structs/swarm_router.py,sha256=oj5QumyxutVawthcTFUsY8DcHbn3iWOxAi7xpkoDRQg,30457
 swarms/structs/swarming_architectures.py,sha256=q2XrY2lOqFhVckA8oin65Dz1VPUe-lfbEJHlP1Z8aTE,28278
 swarms/structs/tree_swarm.py,sha256=AnIxrt0KhWxAQN8uGjfCcOq-XCmsuTJiH8Ex4mXy8V8,12500
 swarms/structs/utils.py,sha256=Mo6wHQYOB8baWZUKnAJN5Dsgubpo81umNwJIEDitb2A,1873
@@ -145,27 +154,28 @@ swarms/structs/various_alt_swarms.py,sha256=qdBuOF31UjatlKRu-9bxwyRQzIjohRhTv_63
 swarms/telemetry/__init__.py,sha256=yibtkHEbQRPUv6ir1FhDHlAO_3nwKJPQH4LjzBC2AuQ,661
 swarms/telemetry/bootup.py,sha256=0leCNCy5rhzL19EsOsqHWSDI85KVcWO6_5hLDS0h4sY,1155
 swarms/telemetry/main.py,sha256=8FxivorvclSvhgfU03cHFktaRgRNV1UXCMi0VV8-U60,11248
-swarms/tools/__init__.py,sha256=pqIMcRQr4gtoNdbyI1N5k4upkYSBMxACJbxfB9yrV4c,1493
-swarms/tools/base_tool.py,sha256=BiBCFHin8AyZO3FYOGA-n3M2o-F36xUeIBUiybnZYjI,15179
+swarms/tools/__init__.py,sha256=tyGQpcfrosMx06fdV9h_8_9WB-1vfT-aAjZufiTXyPQ,1838
+swarms/tools/base_tool.py,sha256=LMGfH2o9nrCdsuVxI2mfxtkIMcXTs2oO_jAF1ebU-YY,107065
 swarms/tools/cohere_func_call_schema.py,sha256=XJ6_yBMXCrV9KjN7v9Bk1iFj69TRlGIWYKsUTA1oGiQ,600
+swarms/tools/create_agent_tool.py,sha256=YsiBgrR9gkn2Jenu_mIFXOMJCWb_Hdw4gBYPQN5HEQk,3467
 swarms/tools/func_calling_utils.py,sha256=PhHHZRHN-vRHA_h21ELRjXIhSRIrsT4UhU5-1Bhy-iU,3542
 swarms/tools/func_to_str.py,sha256=J_E3ejEYxl_u7Te9xvHWGE83EW0-CRBRqafiXMUvto8,1129
 swarms/tools/function_util.py,sha256=DAnAPO0Ik__TAqL7IJzFmkukHnhpsW_QtALl3yj837g,1158
 swarms/tools/json_former.py,sha256=4ugLQ_EZpghhuhFsVKsy-ehin9K64pqVE2gLU7BTO_M,14376
 swarms/tools/json_utils.py,sha256=WKMZjcJ0Vt6lgIjiTBenslcfjgRSLX4UWs4uDkKFMQI,1316
 swarms/tools/logits_processor.py,sha256=NifZZ5w9yemWGJAJ5nHFrphtZVX1XlyesgvYZTxK1GM,2965
-swarms/tools/mcp_client.py,sha256=U_RQIxT2xXKTLvoS0AiJCOrQfCT_BK4P60-ggCOwAjE,7198
-swarms/tools/mcp_integration.py,sha256=ZxVj5T6qBy9K9YTpXmDn2LiA4Q-Wj0TTuF3SnI_Jiu0,11725
+swarms/tools/mcp_client_call.py,sha256=4iYDpMT_v0Kk_RTgL0bfQruxJJJuXNPmZQalHL1vm6c,15287
 swarms/tools/openai_func_calling_schema_pydantic.py,sha256=6BAH9kuaVTvJIbjgSSJ5XvHhWvWszPxgarkfUuE5Ads,978
 swarms/tools/openai_tool_creator_decorator.py,sha256=SYZjHnARjWvnH9cBdj7Kc_Yy1muvNxMT3RQz8KkA2SE,2578
-swarms/tools/py_func_to_openai_func_str.py,sha256=AsYgSOF_PkDgnuTaQrbeyZLU1azEZXSSc2fNmtahOtI,15712
-swarms/tools/pydantic_to_json.py,sha256=-tjUBwKVnKUWWtEGfYGLEfJbIOCrSVF-p1e6kT4_Geg,3850
+swarms/tools/py_func_to_openai_func_str.py,sha256=sjoNutRZ11-0kYFDalUTxZxQ0TEDyn5R8EXMdS4gsgw,17091
+swarms/tools/pydantic_to_json.py,sha256=sd5uWwjSHsu7M8wCBrPv0uje05-K4xcfbvKQ_zOaww8,3399
 swarms/tools/tool_parse_exec.py,sha256=FW5XzkuNEs2YrroybjKChbCzDvaCs7ypknSDpYhfkd4,8717
 swarms/tools/tool_registry.py,sha256=ULZmIKBTx9XRCJRD9hwXfY3iQw9v94arw-VV6jcuftY,7992
 swarms/tools/tool_schema_base_model.py,sha256=0biTGIoibsPPP3fOrkC6WvNU5vXaalyccVKC1fpO_eg,1409
 swarms/tools/tool_utils.py,sha256=yXzzqG7Ytd8ybB8bsjNUNLaXIuIp9JbbpUKCiHxQqo8,2816
 swarms/utils/__init__.py,sha256=9qKE_11pxom74j3qExSm6Z_LwR5lrpC5YG17v22eLlo,975
 swarms/utils/any_to_str.py,sha256=Qi4N9ed6LYnCs2AeFYo1zwEfYhOKUesGVFUmVUz54KI,2936
+swarms/utils/audio_processing.py,sha256=Y3KaWG9WJrgquWCeaty20HWPIXfeuPAhcJFzoSBIQjE,9893
 swarms/utils/auto_download_check_packages.py,sha256=mqx3jCetfkTuxTdeGLx-gGMB1xWOU5vata8lTKXLatk,4580
 swarms/utils/calculate_func_metrics.py,sha256=Nb5r7rWf809m5F7mWIYXZ0H_WeyGr78A2UZD2GHtJkM,5007
 swarms/utils/data_to_text.py,sha256=1PUoWokylp7MOrGNk1cmO3cJlfskdAIiImGk9ECwsKU,3427
@@ -175,8 +185,9 @@ swarms/utils/formatter.py,sha256=e15FsyTIIkyRreMUApkkZCzJC1Sm67w5Zd6EQcUkMwA,453
 swarms/utils/function_caller_model.py,sha256=ZfgCMzOizNnuZipYLclTziECNHszH9p8RQcUq7VNr4Q,4156
 swarms/utils/generate_keys.py,sha256=i0Ewm1LCTLaqp7qm7B7MgNolaI9IZyJcxNVRLUZklt4,1700
 swarms/utils/history_output_formatter.py,sha256=d4J-TF63ENCjsQXU36MGR2pvx59y0qBFuBlOrJt_K8M,1487
+swarms/utils/index.py,sha256=iYVlMiuSpBuKHF34uSrxDUuSYmS26bbYoAqyz_VIyvY,6902
 swarms/utils/litellm_tokenizer.py,sha256=0AAj4NffBe2eHii_3_5SpQAhSiBbunJR8MzaBTIm7hg,484
-swarms/utils/litellm_wrapper.py,sha256=xdRRj2MvO-4RtfD1SHOCKoidX1UTKRj__I7CvWxQV3o,15145
+swarms/utils/litellm_wrapper.py,sha256=dZ9KCR_Rxlm3VZWWVfhpTb4Y6KM_xHipynueJUeU_Jc,15023
 swarms/utils/loguru_logger.py,sha256=hIoSK3NHLpe7eAmjHRURrEYzNXYC2gbR7_Vv63Yaydk,685
 swarms/utils/markdown_message.py,sha256=RThHNnMf6ZLTlYK4vKn3yuewChaxWAYAWb0Xm_pTyIU,652
 swarms/utils/parse_code.py,sha256=XFOLymbdP3HzMZuqsj7pwUyisvUmTm0ev9iThR_ambI,1987
@@ -187,8 +198,8 @@ swarms/utils/visualizer.py,sha256=0ylohEk62MAS6iPRaDOV03m9qo2k5J56tWlKJk_46p4,16
 swarms/utils/vllm_wrapper.py,sha256=OIGnU9Vf81vE_hul1FK-xEhChFK8fxqZX6-fhQeW22c,4987
 swarms/utils/wrapper_clusterop.py,sha256=PMSCVM7ZT1vgj1D_MYAe835RR3SMLYxA-si2JS02yNQ,4220
 swarms/utils/xml_utils.py,sha256=j8byUa56VT7V4e18pL8UBftLdyWKsUHbid1KDxnAWBo,1416
-swarms-7.7.9.dist-info/LICENSE,sha256=jwRtEmTWjLrEsvFB6QFdYs2cEeZPRMdj-UMOFkPF8_0,11363
-swarms-7.7.9.dist-info/METADATA,sha256=yB7CpcxnWc-LHHimV-rkBgMQITl6_nYKvwnAf94wudI,94968
-swarms-7.7.9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-swarms-7.7.9.dist-info/entry_points.txt,sha256=2K0rTtfO1X1WaO-waJlXIKw5Voa_EpAL_yU0HXE2Jgc,47
-swarms-7.7.9.dist-info/RECORD,,
+swarms-7.8.0.dist-info/LICENSE,sha256=jwRtEmTWjLrEsvFB6QFdYs2cEeZPRMdj-UMOFkPF8_0,11363
+swarms-7.8.0.dist-info/METADATA,sha256=6Npfe5U1IoF9Rty5vbt4vp-17U5psURrMEIFPdqCDXw,94969
+swarms-7.8.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+swarms-7.8.0.dist-info/entry_points.txt,sha256=2K0rTtfO1X1WaO-waJlXIKw5Voa_EpAL_yU0HXE2Jgc,47
+swarms-7.8.0.dist-info/RECORD,,

swarms/tools/mcp_client.py

@@ -1,246 +0,0 @@
-import asyncio
-import json
-from typing import List, Literal, Dict, Any, Union
-from fastmcp import Client
-from swarms.utils.str_to_dict import str_to_dict
-from loguru import logger
-
-
-def parse_agent_output(
-    dictionary: Union[str, Dict[Any, Any]],
-) -> tuple[str, Dict[Any, Any]]:
-    """
-    Parse agent output into tool name and parameters.
-
-    Args:
-        dictionary: Either a string or dictionary containing tool information.
-                   If string, it will be converted to a dictionary.
-                   Must contain a 'name' key for the tool name.
-
-    Returns:
-        tuple[str, Dict[Any, Any]]: A tuple containing the tool name and its parameters.
-
-    Raises:
-        ValueError: If the input is invalid or missing required 'name' key.
-    """
-    try:
-        if isinstance(dictionary, str):
-            dictionary = str_to_dict(dictionary)
-
-        elif not isinstance(dictionary, dict):
-            raise ValueError("Invalid dictionary")
-
-        # Handle regular dictionary format
-        if "name" in dictionary:
-            name = dictionary["name"]
-            # Remove the name key and use remaining key-value pairs as parameters
-            params = dict(dictionary)
-            params.pop("name")
-            return name, params
-
-        raise ValueError("Invalid function call format")
-    except Exception as e:
-        raise ValueError(f"Error parsing agent output: {str(e)}")
-
-
-async def _list_all(url: str):
-    """
-    Asynchronously list all tools available on a given MCP server.
-
-    Args:
-        url: The URL of the MCP server to query.
-
-    Returns:
-        List of available tools.
-
-    Raises:
-        ValueError: If there's an error connecting to or querying the server.
-    """
-    try:
-        async with Client(url) as client:
-            return await client.list_tools()
-    except Exception as e:
-        raise ValueError(f"Error listing tools: {str(e)}")
-
-
-def list_all(url: str, output_type: Literal["str", "json"] = "json"):
-    """
-    Synchronously list all tools available on a given MCP server.
-
-    Args:
-        url: The URL of the MCP server to query.
-
-    Returns:
-        List of dictionaries containing tool information.
-
-    Raises:
-        ValueError: If there's an error connecting to or querying the server.
-    """
-    try:
-        out = asyncio.run(_list_all(url))
-
-        outputs = []
-        for tool in out:
-            outputs.append(tool.model_dump())
-
-        if output_type == "json":
-            return json.dumps(outputs, indent=4)
-        else:
-            return outputs
-    except Exception as e:
-        raise ValueError(f"Error in list_all: {str(e)}")
-
-
-def list_tools_for_multiple_urls(
-    urls: List[str], output_type: Literal["str", "json"] = "json"
-):
-    """
-    List tools available across multiple MCP servers.
-
-    Args:
-        urls: List of MCP server URLs to query.
-        output_type: Format of the output, either "json" (string) or "str" (list).
-
-    Returns:
-        If output_type is "json": JSON string containing all tools with server URLs.
-        If output_type is "str": List of tools with server URLs.
-
-    Raises:
-        ValueError: If there's an error querying any of the servers.
-    """
-    try:
-        out = []
-        for url in urls:
-            tools = list_all(url)
-            # Add server URL to each tool's data
-            for tool in tools:
-                tool["server_url"] = url
-            out.append(tools)
-
-        if output_type == "json":
-            return json.dumps(out, indent=4)
-        else:
-            return out
-    except Exception as e:
-        raise ValueError(
-            f"Error listing tools for multiple URLs: {str(e)}"
-        )
-
-
-async def _execute_mcp_tool(
-    url: str,
-    parameters: Dict[Any, Any] = None,
-    *args,
-    **kwargs,
-) -> Dict[Any, Any]:
-    """
-    Asynchronously execute a tool on an MCP server.
-
-    Args:
-        url: The URL of the MCP server.
-        parameters: Dictionary containing tool name and parameters.
-        *args: Additional positional arguments for the Client.
-        **kwargs: Additional keyword arguments for the Client.
-
-    Returns:
-        Dictionary containing the tool execution results.
-
-    Raises:
-        ValueError: If the URL is invalid or tool execution fails.
-    """
-    try:
-
-        name, params = parse_agent_output(parameters)
-
-        outputs = []
-
-        async with Client(url, *args, **kwargs) as client:
-            out = await client.call_tool(
-                name=name,
-                arguments=params,
-            )
-
-            for output in out:
-                outputs.append(output.model_dump())
-
-        # convert outputs to string
-        return json.dumps(outputs, indent=4)
-    except Exception as e:
-        raise ValueError(f"Error executing MCP tool: {str(e)}")
-
-
-def execute_mcp_tool(
-    url: str,
-    parameters: Dict[Any, Any] = None,
-) -> Dict[Any, Any]:
-    """
-    Synchronously execute a tool on an MCP server.
-
-    Args:
-        url: The URL of the MCP server.
-        parameters: Dictionary containing tool name and parameters.
-
-    Returns:
-        Dictionary containing the tool execution results.
-
-    Raises:
-        ValueError: If tool execution fails.
-    """
-    try:
-        logger.info(f"Executing MCP tool with URL: {url}")
-        logger.debug(f"Tool parameters: {parameters}")
-
-        result = asyncio.run(
-            _execute_mcp_tool(
-                url=url,
-                parameters=parameters,
-            )
-        )
-
-        logger.info("MCP tool execution completed successfully")
-        logger.debug(f"Tool execution result: {result}")
-        return result
-    except Exception as e:
-        logger.error(f"Error in execute_mcp_tool: {str(e)}")
-        raise ValueError(f"Error in execute_mcp_tool: {str(e)}")
-
-
-def find_and_execute_tool(
-    urls: List[str], tool_name: str, parameters: Dict[Any, Any]
-) -> Dict[Any, Any]:
-    """
-    Find a tool across multiple servers and execute it with the given parameters.
-
-    Args:
-        urls: List of server URLs to search through.
-        tool_name: Name of the tool to find and execute.
-        parameters: Parameters to pass to the tool.
-
-    Returns:
-        Dict containing the tool execution results.
-
-    Raises:
-        ValueError: If tool is not found on any server or execution fails.
-    """
-    try:
-        # Search for tool across all servers
-        for url in urls:
-            try:
-                tools = list_all(url)
-                # Check if tool exists on this server
-                if any(tool["name"] == tool_name for tool in tools):
-                    # Prepare parameters in correct format
-                    tool_params = {"name": tool_name, **parameters}
-                    # Execute tool on this server
-                    return execute_mcp_tool(
-                        url=url, parameters=tool_params
-                    )
-            except Exception:
-                # Skip servers that fail and continue searching
-                continue
-
-        raise ValueError(
-            f"Tool '{tool_name}' not found on any provided servers"
-        )
-    except Exception as e:
-        raise ValueError(f"Error in find_and_execute_tool: {str(e)}")