fast-agent-mcp 0.2.53__py3-none-any.whl → 0.2.55__py3-none-any.whl

{fast_agent_mcp-0.2.53.dist-info → fast_agent_mcp-0.2.55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.2.53
+Version: 0.2.55
 Summary: Define, Prompt and Test MCP enabled Agents and Workflows
 Author-email: Shaun Smith <fastagent@llmindset.co.uk>
 License:                                  Apache License
@@ -218,7 +218,7 @@ Requires-Dist: deprecated>=1.2.18
 Requires-Dist: email-validator>=2.2.0
 Requires-Dist: fastapi>=0.115.6
 Requires-Dist: google-genai>=1.27.0
-Requires-Dist: mcp==1.12.1
+Requires-Dist: mcp==1.12.4
 Requires-Dist: openai>=1.97.1
 Requires-Dist: opentelemetry-distro>=0.55b0
 Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.7.0

{fast_agent_mcp-0.2.53.dist-info → fast_agent_mcp-0.2.55.dist-info}/RECORD

@@ -10,7 +10,7 @@ mcp_agent/progress_display.py,sha256=GeJU9VUt6qKsFVymG688hCMVCsAygG9ifiiEb5IcbN4
 mcp_agent/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/agents/agent.py,sha256=EAYlcP1qqI1D0_CS808I806z1048FBjZQxxpcCZPeIU,3154
-mcp_agent/agents/base_agent.py,sha256=VCBWJ-l1zMQiBuONGzqcbqPUQfXK4oq-pBB5lJrMgQ0,32318
+mcp_agent/agents/base_agent.py,sha256=4hyEdJJENxIDLCtYOAmRlmM7dRVE0JPEhOYktPTw1I0,34566
 mcp_agent/agents/workflow/__init__.py,sha256=HloteEW6kalvgR0XewpiFAqaQlMPlPJYg5p3K33IUzI,25
 mcp_agent/agents/workflow/chain_agent.py,sha256=eIlImirrSXkqBJmPuAJgOKis81Cl6lZEGM0-6IyaUV8,6105
 mcp_agent/agents/workflow/evaluator_optimizer.py,sha256=LT81m2B7fxgBZY0CorXFOZJbVhM5fnjDjfrcywO5UrM,12210
@@ -67,7 +67,7 @@ mcp_agent/llm/augmented_llm_playback.py,sha256=rLzgai496e2RlxqQp_Bp0U-Y1FF1SGsWl
 mcp_agent/llm/augmented_llm_silent.py,sha256=IUnK_1Byy4D9TG0Pj46LFeNezgSTQ8d6MQIHWAImBwE,1846
 mcp_agent/llm/augmented_llm_slow.py,sha256=DDSD8bL2flmQrVHZm-UDs7sR8aHRWkDOcOW-mX_GPok,2067
 mcp_agent/llm/memory.py,sha256=pTOaTDV3EA3X68yKwEtUAu7s0xGIQQ_cKBhfYUnfR0w,8614
-mcp_agent/llm/model_database.py,sha256=mxKcs7i3R1o09IrD2eao3voXE8tqcjkQaxOiwjnb0d4,11176
+mcp_agent/llm/model_database.py,sha256=MXCf1dHwZZq_JeLUcuGshlfNyqTYPfS6MNr9zAM4fWs,11221
 mcp_agent/llm/model_factory.py,sha256=Dd3Drg9OyodkT4G4blFSbNiD8PAcphnZIWEmCjXP-QE,12203
 mcp_agent/llm/prompt_utils.py,sha256=yWQHykoK13QRF7evHUKxVF0SpVLN-Bsft0Yixzvn0g0,4825
 mcp_agent/llm/provider_key_manager.py,sha256=LSWIgcXlrUS4sfBvQBCya82qC6NcXQPYLtDHwHNOXR4,3394
@@ -77,7 +77,7 @@ mcp_agent/llm/sampling_format_converter.py,sha256=xGz4odHpOcP7--eFaJaFtUR8eR9jxZ
 mcp_agent/llm/usage_tracking.py,sha256=rF6v8QQDam8QbvlP4jzHljKqvuNHExeYDLkUMI86czY,16073
 mcp_agent/llm/providers/__init__.py,sha256=heVxtmuqFJOnjjxHz4bWSqTAxXoN1E8twC_gQ_yJpHk,265
 mcp_agent/llm/providers/anthropic_utils.py,sha256=vYDN5G5jKMhD2CQg8veJYab7tvvzYkDMq8M1g_hUAQg,3275
-mcp_agent/llm/providers/augmented_llm_aliyun.py,sha256=JlRfhohIQQlo5RgM1B2t4ITLC9dok8LQNKLf0BK8Ai8,1158
+mcp_agent/llm/providers/augmented_llm_aliyun.py,sha256=Th4qeyihOSfTrojPw8YsgzEyaDwhybk7hkXkFjH-1dY,1277
 mcp_agent/llm/providers/augmented_llm_anthropic.py,sha256=U8znA9HSCOx4FlhIjl-J29nbYc8Y-T6BXevtXuDafio,30352
 mcp_agent/llm/providers/augmented_llm_azure.py,sha256=Xoo6dFst6L9SaGKurqptwwTUzr-sYsolZ-AFb_79puc,6098
 mcp_agent/llm/providers/augmented_llm_bedrock.py,sha256=nfby1udL07zPTOLlN_tFxd1h0JRioo2oIW7v4iP4Bnk,82267
@@ -85,8 +85,8 @@ mcp_agent/llm/providers/augmented_llm_deepseek.py,sha256=vphkYMFyukaejBw8SkCN-Mq
 mcp_agent/llm/providers/augmented_llm_generic.py,sha256=5Uq8ZBhcFuQTt7koP_5ykolREh2iWu8zKhNbh3pM9lQ,1210
 mcp_agent/llm/providers/augmented_llm_google_native.py,sha256=c6zczfs-Iw70j3OYELHJ4S7CRwAddkeXinex_yLMhmU,22194
 mcp_agent/llm/providers/augmented_llm_google_oai.py,sha256=g_g46h-YuxqbRZiO_dVo5zO2OkX1yx7nb6xDaQbOvWs,1137
-mcp_agent/llm/providers/augmented_llm_groq.py,sha256=5pqWgOoEJpvL230rJekBNlmBzUegbgwYitArlXgAmY0,4424
-mcp_agent/llm/providers/augmented_llm_openai.py,sha256=Rd5M1yYJ7r-Ln4RlL_j2ZbJ8HqQJpagO2T2Zh1vBwCY,25392
+mcp_agent/llm/providers/augmented_llm_groq.py,sha256=Nj4X7wL7nOz_JYC-3bFOWut-hleZxGqWHNe0U-0ga8Y,4419
+mcp_agent/llm/providers/augmented_llm_openai.py,sha256=d5WeCU6smP7a5egZOBpblF62mK5kOzK4tn2YeQoK34A,25401
 mcp_agent/llm/providers/augmented_llm_openrouter.py,sha256=m3wS83fabBOmaZJH9gQ9sFw_2TB4xTb44WCOPB-2NJ4,2001
 mcp_agent/llm/providers/augmented_llm_tensorzero_openai.py,sha256=D53Fry2AfBLOB5z9hM19U6_HMJeVNTpiBCAJb11ulNg,5503
 mcp_agent/llm/providers/augmented_llm_xai.py,sha256=MhlX91IUNynQ_NDknx4EQJLwg-NbR8lcHS1P4JuLOnA,1433
@@ -110,10 +110,10 @@ mcp_agent/mcp/elicitation_factory.py,sha256=gY0gEsF8Jdg01nSsrVbbl62ZS1A725QgDRB6
 mcp_agent/mcp/elicitation_handlers.py,sha256=w2S4kBn05pIKdq2-X13MErinFg5jSElwFsoTuW3zFSs,6618
 mcp_agent/mcp/gen_client.py,sha256=fAVwFVCgSamw4PwoWOV4wrK9TABx1S_zZv8BctRyF2k,3030
 mcp_agent/mcp/hf_auth.py,sha256=7szw4rkwRyK3J-sUTcVZHdwoLIZqlYo8XolJnZdjOww,4571
-mcp_agent/mcp/interfaces.py,sha256=pe8WKvu3dnNnPWmrkDlu15xdkhuRDAjLUMn2vIE0Mj8,7963
+mcp_agent/mcp/interfaces.py,sha256=5y7zuXkpGCfsJfZOAEZAZtbFd5rAKjn7oG4JoblPHZ4,8070
 mcp_agent/mcp/logger_textio.py,sha256=vljC1BtNTCxBAda9ExqNB-FwVNUZIuJT3h1nWmCjMws,3172
 mcp_agent/mcp/mcp_agent_client_session.py,sha256=ssRgxMOzyCPyAr25AeRBz3Xr-08OBdmsJf8A-ofc3bY,9115
-mcp_agent/mcp/mcp_aggregator.py,sha256=3L_UDxg7nz_Cp1hHVxxCrhDybxg-Bg2QH8e0F8x1_W4,51377
+mcp_agent/mcp/mcp_aggregator.py,sha256=6fZTgoiUfE7YHjLug1ZQ2VtKYj8HVe_diMwNN6npPGk,53343
 mcp_agent/mcp/mcp_connection_manager.py,sha256=dJxjnv2IRzlFIxrbPFl39-pmGcZHgyeMXVlMfqpREhE,17974
 mcp_agent/mcp/mime_utils.py,sha256=difepNR_gpb4MpMLkBRAoyhDk-AjXUHTiqKvT_VwS1o,1805
 mcp_agent/mcp/prompt_message_multipart.py,sha256=-oSO0mnc5gkSgulE1gAntPEwAKF4asOjEeVyLjhYrEk,4336
@@ -185,8 +185,8 @@ mcp_agent/resources/examples/workflows/short_story.txt,sha256=X3y_1AyhLFN2AKzCKv
 mcp_agent/tools/tool_definition.py,sha256=L3Pxl-uLEXqlVoo-bYuFTFALeI-2pIU44YgFhsTKEtM,398
 mcp_agent/ui/console_display.py,sha256=XXrHr950wSBSedEKUaaGkXjOzuFpQYzUKKiyaZ58Mps,28280
 mcp_agent/ui/console_display_legacy.py,sha256=sm2v61-IPVafbF7uUaOyhO2tW_zgFWOjNS83IEWqGgI,14931
-fast_agent_mcp-0.2.53.dist-info/METADATA,sha256=WT16JT-7AyeRZtVwKEtC0-Gxqj_OzdpHpZ1foFs_x4M,31048
-fast_agent_mcp-0.2.53.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fast_agent_mcp-0.2.53.dist-info/entry_points.txt,sha256=QaX5kLdI0VdMPRdPUF1nkG_WdLUTNjp_icW6e3EhNYU,232
-fast_agent_mcp-0.2.53.dist-info/licenses/LICENSE,sha256=Gx1L3axA4PnuK4FxsbX87jQ1opoOkSFfHHSytW6wLUU,10935
-fast_agent_mcp-0.2.53.dist-info/RECORD,,
+fast_agent_mcp-0.2.55.dist-info/METADATA,sha256=wJSX8ZuwOm6h7kbWev3_cv1CQRDHT0C60xwlE9tXPqE,31048
+fast_agent_mcp-0.2.55.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fast_agent_mcp-0.2.55.dist-info/entry_points.txt,sha256=QaX5kLdI0VdMPRdPUF1nkG_WdLUTNjp_icW6e3EhNYU,232
+fast_agent_mcp-0.2.55.dist-info/licenses/LICENSE,sha256=Gx1L3axA4PnuK4FxsbX87jQ1opoOkSFfHHSytW6wLUU,10935
+fast_agent_mcp-0.2.55.dist-info/RECORD,,

mcp_agent/agents/base_agent.py

@@ -783,6 +783,60 @@ class BaseAgent(MCPAggregator, AgentProtocol):
 
         return result
 
+    async def list_mcp_tools(self, server_name: str | None = None) -> Mapping[str, List[Tool]]:
+        """
+        List all tools available to this agent, grouped by server and filtered by configuration.
+
+        Args:
+            server_name: Optional server name to list tools from
+
+        Returns:
+            Dictionary mapping server names to lists of Tool objects (with original names, not namespaced)
+        """
+        if not self.initialized:
+            await self.initialize()
+
+        # Get all tools from the parent class
+        result = await super().list_mcp_tools(server_name)
+
+        # Apply filtering if tools are specified in config
+        if self.config.tools is not None:
+            filtered_result = {}
+            for server, tools in result.items():
+                # Check if this server has tool filters
+                if server in self.config.tools:
+                    filtered_tools = []
+                    for tool in tools:
+                        # Check if tool matches any pattern for this server
+                        for pattern in self.config.tools[server]:
+                            if self._matches_pattern(tool.name, pattern, server):
+                                filtered_tools.append(tool)
+                                break
+                    if filtered_tools:
+                        filtered_result[server] = filtered_tools
+            result = filtered_result
+
+        # Add human input tool to a special server if human input is configured
+        if self.human_input_callback:
+            from mcp.server.fastmcp.tools import Tool as FastTool
+
+            human_input_tool: FastTool = FastTool.from_function(self.request_human_input)
+            special_server_name = "__human_input__"
+            
+            # If the special server doesn't exist in result, create it
+            if special_server_name not in result:
+                result[special_server_name] = []
+            
+            result[special_server_name].append(
+                Tool(
+                    name=HUMAN_INPUT_TOOL_NAME,
+                    description=human_input_tool.description,
+                    inputSchema=human_input_tool.parameters,
+                )
+            )
+
+        return result
+
     @property
     def agent_type(self) -> AgentType:
         """

mcp_agent/llm/model_database.py

@@ -91,7 +91,10 @@ class ModelDatabase:
     )
 
     QWEN_STANDARD = ModelParameters(
-        context_window=32000, max_output_tokens=8192, tokenizes=QWEN_MULTIMODAL
+        context_window=32000,
+        max_output_tokens=8192,
+        tokenizes=QWEN_MULTIMODAL,
+        json_mode="object",
     )
     QWEN3_REASONER = ModelParameters(
         context_window=131072,

mcp_agent/llm/providers/augmented_llm_aliyun.py

@@ -1,24 +1,26 @@
 from mcp_agent.core.request_params import RequestParams
 from mcp_agent.llm.provider_types import Provider
+from mcp_agent.llm.providers.augmented_llm_groq import GroqAugmentedLLM
 from mcp_agent.llm.providers.augmented_llm_openai import OpenAIAugmentedLLM
 
 ALIYUN_BASE_URL = "https://dashscope.aliyuncs.com/compatible-mode/v1"
 DEFAULT_QWEN_MODEL = "qwen-turbo"
 
 
-class AliyunAugmentedLLM(OpenAIAugmentedLLM):
+class AliyunAugmentedLLM(GroqAugmentedLLM):
     def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, provider=Provider.ALIYUN, **kwargs)
+        OpenAIAugmentedLLM.__init__(self, *args, provider=Provider.ALIYUN, **kwargs)
 
     def _initialize_default_params(self, kwargs: dict) -> RequestParams:
         """Initialize Aliyun-specific default parameters"""
         # Get base defaults from parent (includes ModelDatabase lookup)
         base_params = super()._initialize_default_params(kwargs)
-        
+
         # Override with Aliyun-specific settings
         chosen_model = kwargs.get("model", DEFAULT_QWEN_MODEL)
         base_params.model = chosen_model
-        
+        base_params.parallel_tool_calls = True
+
         return base_params
 
     def _base_url(self) -> str:
@@ -27,3 +29,4 @@ class AliyunAugmentedLLM(OpenAIAugmentedLLM):
             base_url = self.context.config.aliyun.base_url
 
         return base_url if base_url else ALIYUN_BASE_URL
+

mcp_agent/llm/providers/augmented_llm_groq.py

@@ -46,7 +46,7 @@ class GroqAugmentedLLM(OpenAIAugmentedLLM):
         assert self.default_request_params
         llm_model = self.default_request_params.model or DEFAULT_GROQ_MODEL
         json_mode: str | None = ModelDatabase.get_json_mode(llm_model)
-        if "json_object" == json_mode:
+        if "object" == json_mode:
             request_params.response_format = {"type": "json_object"}
 
         # Get the full schema and extract just the properties

mcp_agent/llm/providers/augmented_llm_openai.py

@@ -321,20 +321,20 @@ class OpenAIAugmentedLLM(AugmentedLLM[ChatCompletionMessageParam, ChatCompletion
 
         response = await self.aggregator.list_tools()
         available_tools: List[ChatCompletionToolParam] | None = [
-            ChatCompletionToolParam(
-                type="function",
-                function={
+            {
+                "type": "function",
+                "function": {
                     "name": tool.name,
                     "description": tool.description if tool.description else "",
                     "parameters": self.adjust_schema(tool.inputSchema),
                 },
-            )
+            }
             for tool in response.tools
         ]
 
         if not available_tools:
-            if self.provider == Provider.DEEPSEEK:
-                available_tools = None  # deepseek does not allow empty array
+            if self.provider in [Provider.DEEPSEEK, Provider.ALIYUN]:
+                available_tools = None  # deepseek/aliyun does not allow empty array
             else:
                 available_tools = []
 

mcp_agent/mcp/interfaces.py

@@ -25,7 +25,7 @@ from a2a.types import AgentCard
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from deprecated import deprecated
 from mcp import ClientSession
-from mcp.types import GetPromptResult, Prompt, PromptMessage, ReadResourceResult
+from mcp.types import GetPromptResult, Prompt, PromptMessage, ReadResourceResult, Tool
 from pydantic import BaseModel
 
 from mcp_agent.core.agent_types import AgentType
@@ -203,6 +203,8 @@ class AgentProtocol(AugmentedLLMProtocol, Protocol):
 
     async def list_resources(self, server_name: str | None = None) -> Mapping[str, List[str]]: ...
 
+    async def list_mcp_tools(self, server_name: str | None = None) -> Mapping[str, List[Tool]]: ...
+
     async def get_resource(
         self, resource_uri: str, server_name: str | None = None
     ) -> ReadResourceResult:

mcp_agent/mcp/mcp_aggregator.py

@@ -1232,3 +1232,55 @@ class MCPAggregator(ContextDependent):
                 logger.error(f"Error fetching resources from {s_name}: {e}")
 
         return results
+
+    async def list_mcp_tools(self, server_name: str | None = None) -> Dict[str, List[Tool]]:
+        """
+        List available tools from one or all servers, grouped by server name.
+        
+        Args:
+            server_name: Optional server name to list tools from. If not provided,
+                        lists tools from all servers.
+        
+        Returns:
+            Dictionary mapping server names to lists of Tool objects (with original names, not namespaced)
+        """
+        if not self.initialized:
+            await self.load_servers()
+
+        results: Dict[str, List[Tool]] = {}
+
+        # Get the list of servers to check  
+        servers_to_check = [server_name] if server_name else self.server_names
+
+        # For each server, try to list its tools
+        for s_name in servers_to_check:
+            if s_name not in self.server_names:
+                logger.error(f"Server '{s_name}' not found")
+                continue
+
+            # Initialize empty list for this server
+            results[s_name] = []
+
+            # Check if server supports tools capability
+            if not await self.server_supports_feature(s_name, "tools"):
+                logger.debug(f"Server '{s_name}' does not support tools")
+                continue
+
+            try:
+                # Use the _execute_on_server method to call list_tools on the server
+                result = await self._execute_on_server(
+                    server_name=s_name,
+                    operation_type="tools-list",
+                    operation_name="",
+                    method_name="list_tools",
+                    method_args={},
+                )
+
+                # Get tools from result (these have original names, not namespaced)
+                tools = getattr(result, "tools", [])
+                results[s_name] = tools
+
+            except Exception as e:
+                logger.error(f"Error fetching tools from {s_name}: {e}")
+
+        return results