fast-agent-mcp 0.2.41__py3-none-any.whl → 0.2.42__py3-none-any.whl

{fast_agent_mcp-0.2.41.dist-info → fast_agent_mcp-0.2.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.2.41
+Version: 0.2.42
 Summary: Define, Prompt and Test MCP enabled Agents and Workflows
 Author-email: Shaun Smith <fastagent@llmindset.co.uk>
 License:                                  Apache License
@@ -213,6 +213,7 @@ Requires-Dist: a2a-sdk>=0.2.9
 Requires-Dist: aiohttp>=3.11.13
 Requires-Dist: anthropic>=0.55.0
 Requires-Dist: azure-identity>=1.14.0
+Requires-Dist: boto3>=1.35.0
 Requires-Dist: deprecated>=1.2.18
 Requires-Dist: email-validator>=2.2.0
 Requires-Dist: fastapi>=0.115.6

{fast_agent_mcp-0.2.41.dist-info → fast_agent_mcp-0.2.42.dist-info}/RECORD

@@ -1,6 +1,6 @@
 mcp_agent/__init__.py,sha256=18T0AG0W9sJhTY38O9GFFOzliDhxx9p87CvRyti9zbw,1620
 mcp_agent/app.py,sha256=3mtHP1nRQcRaKhhxgTmCOv00alh70nT7UxNA8bN47QE,5560
-mcp_agent/config.py,sha256=3XjoGlBzL7nItt6oxzsJb1pEKXWB-bHkdkc8F0hDX7o,18394
+mcp_agent/config.py,sha256=ORid5f2YSkkNHIWHFgIWdcqyqr3g1TGV5ZTQMinuMi0,18869
 mcp_agent/console.py,sha256=Gjf2QLFumwG1Lav__c07X_kZxxEUSkzV-1_-YbAwcwo,813
 mcp_agent/context.py,sha256=9s1F1-UfcI8rz9Yxm6EXHZ4cInuE_cOl_HFu8N8k3yc,7497
 mcp_agent/context_dependent.py,sha256=QXfhw3RaQCKfscEEBRGuZ3sdMWqkgShz2jJ1ivGGX1I,1455
@@ -9,7 +9,7 @@ mcp_agent/mcp_server_registry.py,sha256=lmz-aES-l7Gbg4itDF0iCmpso_KD8bVazVKSVzjw
 mcp_agent/progress_display.py,sha256=GeJU9VUt6qKsFVymG688hCMVCsAygG9ifiiEb5IcbN4,361
 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=240FsLvgsjj_exhsj37WIBxEGEyuBuM8mx9d30T26zs,25841
+mcp_agent/agents/base_agent.py,sha256=EpdwZKktelEVdQUYyMoohtVwGgwas-rdM9r1nuMQIQk,30597
 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=ysUMGM2NzeCIutgr_vXH6kUPpZMw0cX4J_Wl1r8eT84,13296
@@ -31,10 +31,10 @@ mcp_agent/cli/commands/setup.py,sha256=eOEd4TL-b0DaDeSJMGOfNOsTEItoZ67W88eTP4aP-
 mcp_agent/cli/commands/url_parser.py,sha256=5VdtcHRHzi67YignStVbz7u-rcvNNErw9oJLAUFOtEY,5855
 mcp_agent/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/core/agent_app.py,sha256=mMWfScEylf1l-rKzmRdoA7WIIBRvSypfZONDBYdo1M8,15919
-mcp_agent/core/agent_types.py,sha256=LbSXolCIqXDt7p7AGCNO0MykgobT2IFjPy3jDEEJClk,1536
-mcp_agent/core/direct_decorators.py,sha256=VutR9hO2dkWIWMRHXmPUeW2ZpfSZVOW2NaiVTcWEa3c,17824
+mcp_agent/core/agent_types.py,sha256=7zVzAFWjvh5dDV3TuDwmO9LAWmDjYnZd3eeLH-wvvIQ,1705
+mcp_agent/core/direct_decorators.py,sha256=sYoEA1EmdyAxTpQwUDUjQYWY73VviM-fBnV1Zv7KfeU,19047
 mcp_agent/core/direct_factory.py,sha256=d_HvbAxyv2WrM07zyCpLXFVn7eArXk1LZmLKS49hzJo,19537
-mcp_agent/core/enhanced_prompt.py,sha256=3TBSwDUBE_dRd46sZnDvuInptdF9MU2sYwCNbr2QY4E,32769
+mcp_agent/core/enhanced_prompt.py,sha256=wAsPu8GdKXFTArr2tW2k_wmKZE207gPen6s2ho8x2ZM,33363
 mcp_agent/core/error_handling.py,sha256=xoyS2kLe0eG0bj2eSJCJ2odIhGUve2SbDR7jP-A-uRw,624
 mcp_agent/core/exceptions.py,sha256=ENAD_qGG67foxy6vDkIvc-lgopIUQy6O7zvNPpPXaQg,2289
 mcp_agent/core/fastagent.py,sha256=tAxapB3sjNyK6FqsJdOZt-IN5uYAi8DL1B9RHcGu55g,24849
@@ -63,10 +63,10 @@ mcp_agent/llm/augmented_llm_silent.py,sha256=IUnK_1Byy4D9TG0Pj46LFeNezgSTQ8d6MQI
 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=YgqltGMDcmuoVrx-jiRj7Z5NCzKz2bshk7Rgkng2tsM,9401
-mcp_agent/llm/model_factory.py,sha256=NY9FQJZ9oLnFNyt8RjSQha9dlCEUKDsCP76H73dBl3s,11225
+mcp_agent/llm/model_factory.py,sha256=Vr7Ypt2laE_gPPdLWOFAQSXZkD7p3D5KKSvH3ijDwWw,11616
 mcp_agent/llm/prompt_utils.py,sha256=yWQHykoK13QRF7evHUKxVF0SpVLN-Bsft0Yixzvn0g0,4825
 mcp_agent/llm/provider_key_manager.py,sha256=LSWIgcXlrUS4sfBvQBCya82qC6NcXQPYLtDHwHNOXR4,3394
-mcp_agent/llm/provider_types.py,sha256=pY67LJGhaUv0VtkgyWo8l0Lpia10JhQo0aML8-2-B3M,1054
+mcp_agent/llm/provider_types.py,sha256=XK9IwmJND7Gd-WvggRXKovBSV9tTwtLD2BSUs86epp4,1091
 mcp_agent/llm/sampling_converter.py,sha256=C7wPBlmT0eD90XWabC22zkxsrVHKCrjwIwg6cG628cI,2926
 mcp_agent/llm/sampling_format_converter.py,sha256=xGz4odHpOcP7--eFaJaFtUR8eR9jxZS7MnLH6J7n0EU,1263
 mcp_agent/llm/usage_tracking.py,sha256=rF6v8QQDam8QbvlP4jzHljKqvuNHExeYDLkUMI86czY,16073
@@ -75,11 +75,12 @@ mcp_agent/llm/providers/anthropic_utils.py,sha256=vYDN5G5jKMhD2CQg8veJYab7tvvzYk
 mcp_agent/llm/providers/augmented_llm_aliyun.py,sha256=XylkJKZ9theSVUxJKOZkf1244hgzng4Ng4Dr209Qb-w,1101
 mcp_agent/llm/providers/augmented_llm_anthropic.py,sha256=dKXP8d36jzqThV8E404PUYbTuQbRz9x7uQScW4_BU6U,24060
 mcp_agent/llm/providers/augmented_llm_azure.py,sha256=sBVWgY88F4OsdRSHl71BAT2p3XPvuZp844z1ubwcV7U,6098
+mcp_agent/llm/providers/augmented_llm_bedrock.py,sha256=tcbMovzA4W1JMB-PrvxXlwea8if-tmYooq9ME2W6Leo,82327
 mcp_agent/llm/providers/augmented_llm_deepseek.py,sha256=zI9a90dwT4r6E1f_xp4K50Cj9sD7y7kNRgjo0s1pd5w,3804
 mcp_agent/llm/providers/augmented_llm_generic.py,sha256=5Uq8ZBhcFuQTt7koP_5ykolREh2iWu8zKhNbh3pM9lQ,1210
 mcp_agent/llm/providers/augmented_llm_google_native.py,sha256=meWvjiNny2T8Map_TuLl8gx9JX8Ly8orHMFUCx3gtFU,22389
 mcp_agent/llm/providers/augmented_llm_google_oai.py,sha256=cO4dvjTl9ymqEurCOo5nP09ATfXVjgkuk1yZAlWpS1s,1137
-mcp_agent/llm/providers/augmented_llm_openai.py,sha256=R3w_XPg9hegcq-bM-W2HKivEPVJPvr5ipYKr-4mJeDQ,24264
+mcp_agent/llm/providers/augmented_llm_openai.py,sha256=AP2ZXZhFXntZlhm50Bi2QwLfTybIX134Y6e_OktdhG8,24321
 mcp_agent/llm/providers/augmented_llm_openrouter.py,sha256=V_TlVKm92GHBxYIo6gpvH_6cAaIdppS25Tz6x5T7LW0,2341
 mcp_agent/llm/providers/augmented_llm_tensorzero.py,sha256=Mol_Wzj_ZtccW-LMw0oFwWUt1m1yfofloay9QYNP23c,20729
 mcp_agent/llm/providers/augmented_llm_xai.py,sha256=fJiO9Vkgi32pEMijxMbqoKrPCCNJmR_3YEnX0UCqOVs,1332
@@ -95,7 +96,7 @@ mcp_agent/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 mcp_agent/logging/events.py,sha256=dSJJfuCd59-ZyYTVcf0M4HQd6iXb5k50PSAeoq1CpH0,4278
 mcp_agent/logging/json_serializer.py,sha256=qkfxnR9ka6OgvwSpM2CggELbEtzzkApm0s_KYz11RDY,5791
 mcp_agent/logging/listeners.py,sha256=_S4Jp5_KWp0kUfrx4BxDdNCeQK3MNT3Zi9AaolPri7A,6648
-mcp_agent/logging/logger.py,sha256=l02OGX_c5FOyH0rspd4ZvnkJcbb0FahhUhlh2KI8mqE,10724
+mcp_agent/logging/logger.py,sha256=v2_D5kWLSS9u4ueSU7q6cWF1oSmTVeAAtgnwR0LrbXI,11056
 mcp_agent/logging/rich_progress.py,sha256=NQbW010VxfzgJw8BRaqKVTIFlTNvDfmMcoOt7pxGvzQ,5362
 mcp_agent/logging/transport.py,sha256=m8YsLLu5T8eof_ndpLQs4gHOzqqEL98xsVwBwDsBfxI,17335
 mcp_agent/mcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -103,7 +104,7 @@ mcp_agent/mcp/common.py,sha256=MpSC0fLO21RcDz4VApah4C8_LisVGz7OXkR17Xw-9mY,431
 mcp_agent/mcp/elicitation_factory.py,sha256=gY0gEsF8Jdg01nSsrVbbl62ZS1A725QgDRB6UDPCadc,3162
 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=YwEt7hMDJODFUIc6Zi1HLYsfVnvANGvyhpQwcPCMAgI,3379
+mcp_agent/mcp/hf_auth.py,sha256=7szw4rkwRyK3J-sUTcVZHdwoLIZqlYo8XolJnZdjOww,4571
 mcp_agent/mcp/interfaces.py,sha256=NxUDi4eI-qWfaOS1QHWr3EjAweV-CX_CBJeBCwTwr7g,7102
 mcp_agent/mcp/logger_textio.py,sha256=vljC1BtNTCxBAda9ExqNB-FwVNUZIuJT3h1nWmCjMws,3172
 mcp_agent/mcp/mcp_agent_client_session.py,sha256=nEHrSalG5z47BKGwE9ooOmlSTc4Gb7qdEut071Dwepo,8987
@@ -160,8 +161,8 @@ mcp_agent/resources/examples/workflows/short_story.md,sha256=XN9I2kzCcMmke3dE5F2
 mcp_agent/resources/examples/workflows/short_story.txt,sha256=X3y_1AyhLFN2AKzCKvucJtDgAFIJfnlbsbGZO5bBWu0,1187
 mcp_agent/tools/tool_definition.py,sha256=L3Pxl-uLEXqlVoo-bYuFTFALeI-2pIU44YgFhsTKEtM,398
 mcp_agent/ui/console_display.py,sha256=U9ZWzeu3dUGNCDcyFVSTqX_rpxXbn3uNmuvJ4SIlzi0,15730
-fast_agent_mcp-0.2.41.dist-info/METADATA,sha256=SbuDturRmLzPWvatrCfSzeNkiOwrvLvZuK_u0jnn-uY,30983
-fast_agent_mcp-0.2.41.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fast_agent_mcp-0.2.41.dist-info/entry_points.txt,sha256=QaX5kLdI0VdMPRdPUF1nkG_WdLUTNjp_icW6e3EhNYU,232
-fast_agent_mcp-0.2.41.dist-info/licenses/LICENSE,sha256=Gx1L3axA4PnuK4FxsbX87jQ1opoOkSFfHHSytW6wLUU,10935
-fast_agent_mcp-0.2.41.dist-info/RECORD,,
+fast_agent_mcp-0.2.42.dist-info/METADATA,sha256=Usid8c-xlf44Efu98pJSkr-CrDWdohM5GLrw9cpmgb8,31012
+fast_agent_mcp-0.2.42.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fast_agent_mcp-0.2.42.dist-info/entry_points.txt,sha256=QaX5kLdI0VdMPRdPUF1nkG_WdLUTNjp_icW6e3EhNYU,232
+fast_agent_mcp-0.2.42.dist-info/licenses/LICENSE,sha256=Gx1L3axA4PnuK4FxsbX87jQ1opoOkSFfHHSytW6wLUU,10935
+fast_agent_mcp-0.2.42.dist-info/RECORD,,

mcp_agent/agents/base_agent.py

@@ -6,6 +6,7 @@ and delegates operations to an attached AugmentedLLMProtocol instance.
 """
 
 import asyncio
+import fnmatch
 import uuid
 from typing import (
     TYPE_CHECKING,
@@ -13,6 +14,7 @@ from typing import (
     Callable,
     Dict,
     List,
+    Mapping,
     Optional,
     Tuple,
     Type,
@@ -325,9 +327,29 @@ class BaseAgent(MCPAggregator, AgentProtocol):
         self.logger.debug("Received human input signal", data=result)
         return result
 
+    def _matches_pattern(self, name: str, pattern: str, server_name: str) -> bool:
+        """
+        Check if a name matches a pattern for a specific server.
+        
+        Args:
+            name: The name to match (could be tool name, resource URI, or prompt name)
+            pattern: The pattern to match against (e.g., "add", "math*", "resource://math/*")
+            server_name: The server name (used for tool name prefixing)
+            
+        Returns:
+            True if the name matches the pattern
+        """
+        # For tools, build the full pattern with server prefix: server_name-pattern
+        if name.startswith(f"{server_name}-"):
+            full_pattern = f"{server_name}-{pattern}"
+            return fnmatch.fnmatch(name, full_pattern)
+        
+        # For resources and prompts, match directly against the pattern
+        return fnmatch.fnmatch(name, pattern)
+
     async def list_tools(self) -> ListToolsResult:
         """
-        List all tools available to this agent.
+        List all tools available to this agent, filtered by configuration.
 
         Returns:
             ListToolsResult with available tools
@@ -335,8 +357,26 @@ class BaseAgent(MCPAggregator, AgentProtocol):
         if not self.initialized:
             await self.initialize()
 
+        # Get all tools from the parent class
         result = await super().list_tools()
 
+        # Apply filtering if tools are specified in config
+        if self.config.tools is not None:
+            filtered_tools = []
+            for tool in result.tools:
+                # Extract server name from tool name (e.g., "mathematics-add" -> "mathematics")
+                if '-' in tool.name:
+                    server_name = tool.name.split('-', 1)[0]
+                    
+                    # Check if this server has tool filters
+                    if server_name in self.config.tools:
+                        # Check if tool matches any pattern for this server
+                        for pattern in self.config.tools[server_name]:
+                            if self._matches_pattern(tool.name, pattern, server_name):
+                                filtered_tools.append(tool)
+                                break
+            result.tools = filtered_tools
+
         if not self.human_input_callback:
             return result
 
@@ -635,6 +675,76 @@ class BaseAgent(MCPAggregator, AgentProtocol):
         response = await self.generate(prompts, request_params)
         return response.first_text()
 
+    async def list_prompts(self, server_name: str | None = None) -> Mapping[str, List[Prompt]]:
+        """
+        List all prompts available to this agent, filtered by configuration.
+
+        Args:
+            server_name: Optional server name to list prompts from
+
+        Returns:
+            Dictionary mapping server names to lists of Prompt objects
+        """
+        if not self.initialized:
+            await self.initialize()
+
+        # Get all prompts from the parent class
+        result = await super().list_prompts(server_name)
+
+        # Apply filtering if prompts are specified in config
+        if self.config.prompts is not None:
+            filtered_result = {}
+            for server, prompts in result.items():
+                # Check if this server has prompt filters
+                if server in self.config.prompts:
+                    filtered_prompts = []
+                    for prompt in prompts:
+                        # Check if prompt matches any pattern for this server
+                        for pattern in self.config.prompts[server]:
+                            if self._matches_pattern(prompt.name, pattern, server):
+                                filtered_prompts.append(prompt)
+                                break
+                    if filtered_prompts:
+                        filtered_result[server] = filtered_prompts
+            result = filtered_result
+
+        return result
+
+    async def list_resources(self, server_name: str | None = None) -> Dict[str, List[str]]:
+        """
+        List all resources available to this agent, filtered by configuration.
+
+        Args:
+            server_name: Optional server name to list resources from
+
+        Returns:
+            Dictionary mapping server names to lists of resource URIs
+        """
+        if not self.initialized:
+            await self.initialize()
+
+        # Get all resources from the parent class
+        result = await super().list_resources(server_name)
+
+        # Apply filtering if resources are specified in config
+        if self.config.resources is not None:
+            filtered_result = {}
+            for server, resources in result.items():
+                # Check if this server has resource filters
+                if server in self.config.resources:
+                    filtered_resources = []
+                    for resource in resources:
+                        # Check if resource matches any pattern for this server
+                        for pattern in self.config.resources[server]:
+                            if self._matches_pattern(resource, pattern, server):
+                                filtered_resources.append(resource)
+                                break
+                    if filtered_resources:
+                        filtered_result[server] = filtered_resources
+            result = filtered_result
+
+        return result
+
     @property
     def agent_type(self) -> AgentType:
         """

mcp_agent/config.py

@@ -253,6 +253,20 @@ class TensorZeroSettings(BaseModel):
     model_config = ConfigDict(extra="allow", arbitrary_types_allowed=True)
 
 
+class BedrockSettings(BaseModel):
+    """
+    Settings for using AWS Bedrock models in the fast-agent application.
+    """
+
+    region: str | None = None
+    """AWS region for Bedrock service"""
+
+    profile: str | None = None
+    """AWS profile to use for authentication"""
+
+    model_config = ConfigDict(extra="allow", arbitrary_types_allowed=True)
+
+
 class HuggingFaceSettings(BaseModel):
     """
     Settings for HuggingFace authentication (used for MCP connections).
@@ -419,6 +433,9 @@ class Settings(BaseSettings):
     aliyun: OpenAISettings | None = None
     """Settings for using Aliyun OpenAI Service in the fast-agent application"""
 
+    bedrock: BedrockSettings | None = None
+    """Settings for using AWS Bedrock models in the fast-agent application"""
+
     huggingface: HuggingFaceSettings | None = None
     """Settings for HuggingFace authentication (used for MCP connections)"""
 

mcp_agent/core/agent_types.py

@@ -4,7 +4,7 @@ Type definitions for agents and agent configurations.
 
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import List
+from typing import Dict, List, Optional
 
 from mcp.client.session import ElicitationFnT
 
@@ -31,6 +31,9 @@ class AgentConfig:
     name: str
     instruction: str = "You are a helpful agent."
     servers: List[str] = field(default_factory=list)
+    tools: Optional[Dict[str, List[str]]] = None
+    resources: Optional[Dict[str, List[str]]] = None
+    prompts: Optional[Dict[str, List[str]]] = None
     model: str | None = None
     use_history: bool = True
     default_request_params: RequestParams | None = None

mcp_agent/core/direct_decorators.py

@@ -9,6 +9,7 @@ from functools import wraps
 from typing import (
     Awaitable,
     Callable,
+    Dict,
     List,
     Literal,
     Optional,
@@ -93,6 +94,9 @@ def _decorator_impl(
     request_params: RequestParams | None = None,
     human_input: bool = False,
     default: bool = False,
+    tools: Optional[Dict[str, List[str]]] = None,
+    resources: Optional[Dict[str, List[str]]] = None,
+    prompts: Optional[Dict[str, List[str]]] = None,
     **extra_kwargs,
 ) -> Callable[[AgentCallable[P, R]], DecoratedAgentProtocol[P, R]]:
     """
@@ -133,6 +137,9 @@ def _decorator_impl(
             name=name,
             instruction=instruction,
             servers=servers,
+            tools=tools,
+            resources=resources,
+            prompts=prompts,
             model=model,
             use_history=use_history,
             human_input=human_input,
@@ -177,6 +184,9 @@ def agent(
     *,
     instruction: str = "You are a helpful agent.",
     servers: List[str] = [],
+    tools: Optional[Dict[str, List[str]]] = None,
+    resources: Optional[Dict[str, List[str]]] = None,
+    prompts: Optional[Dict[str, List[str]]] = None,
     model: Optional[str] = None,
     use_history: bool = True,
     request_params: RequestParams | None = None,
@@ -193,12 +203,16 @@ def agent(
         instruction_or_kwarg: Optional positional parameter for instruction
         instruction: Base instruction for the agent (keyword arg)
         servers: List of server names the agent should connect to
+        tools: Optional list of tool names or patterns to include
+        resources: Optional list of resource names or patterns to include
+        prompts: Optional list of prompt names or patterns to include
         model: Model specification string
         use_history: Whether to maintain conversation history
         request_params: Additional request parameters for the LLM
         human_input: Whether to enable human input capabilities
         default: Whether to mark this as the default agent
         elicitation_handler: Custom elicitation handler function (ElicitationFnT)
+        api_key: Optional API key for the LLM provider
 
     Returns:
         A decorator that registers the agent with proper type annotations
@@ -217,6 +231,9 @@ def agent(
         human_input=human_input,
         default=default,
         elicitation_handler=elicitation_handler,
+        tools=tools,
+        resources=resources,
+        prompts=prompts,
         api_key=api_key,
     )
 
@@ -229,6 +246,9 @@ def custom(
     *,
     instruction: str = "You are a helpful agent.",
     servers: List[str] = [],
+    tools: Optional[Dict[str, List[str]]] = None,
+    resources: Optional[Dict[str, List[str]]] = None,
+    prompts: Optional[Dict[str, List[str]]] = None,
     model: Optional[str] = None,
     use_history: bool = True,
     request_params: RequestParams | None = None,
@@ -270,6 +290,9 @@ def custom(
         default=default,
         elicitation_handler=elicitation_handler,
         api_key=api_key,
+        tools=tools,
+        resources=resources,
+        prompts=prompts,
     )
 
 
@@ -344,6 +367,9 @@ def router(
     agents: List[str],
     instruction: Optional[str] = None,
     servers: List[str] = [],
+    tools: Optional[Dict[str, List[str]]] = None,
+    resources: Optional[Dict[str, List[str]]] = None,
+    prompts: Optional[Dict[str, List[str]]] = None,
     model: Optional[str] = None,
     use_history: bool = False,
     request_params: RequestParams | None = None,
@@ -392,6 +418,9 @@ def router(
             router_agents=agents,
             elicitation_handler=elicitation_handler,
             api_key=api_key,
+            tools=tools,
+            prompts=prompts,
+            resources=resources,
         ),
     )
 

mcp_agent/core/enhanced_prompt.py

@@ -68,6 +68,9 @@ async def _display_agent_info_helper(agent_name: str, agent_provider: object) ->
             len(tools_result.tools) if tools_result and hasattr(tools_result, "tools") else 0
         )
 
+        resources_dict = await agent.list_resources()
+        resource_count = sum(len(resources) for resources in resources_dict.values()) if resources_dict else 0
+
         prompts_dict = await agent.list_prompts()
         prompt_count = sum(len(prompts) for prompts in prompts_dict.values()) if prompts_dict else 0
 
@@ -104,10 +107,11 @@ async def _display_agent_info_helper(agent_name: str, agent_provider: object) ->
                 # Pluralization helpers
                 server_word = "Server" if server_count == 1 else "Servers"
                 tool_word = "tool" if tool_count == 1 else "tools"
+                resource_word = "resource" if resource_count == 1 else "resources"
                 prompt_word = "prompt" if prompt_count == 1 else "prompts"
 
                 rich_print(
-                    f"[dim]Agent [/dim][blue]{agent_name}[/blue][dim]:[/dim] {server_count:,}[dim] MCP {server_word}, [/dim]{tool_count:,}[dim] {tool_word}, [/dim]{prompt_count:,}[dim] {prompt_word} available[/dim]"
+                    f"[dim]Agent [/dim][blue]{agent_name}[/blue][dim]:[/dim] {server_count:,}[dim] MCP {server_word}, [/dim]{tool_count:,}[dim] {tool_word}, [/dim]{resource_count:,}[dim] {resource_word}, [/dim]{prompt_count:,}[dim] {prompt_word} available[/dim]"
                 )
 
         # Mark as shown
@@ -221,6 +225,9 @@ async def _display_child_agent_info(child_agent, prefix: str, agent_provider) ->
             len(tools_result.tools) if tools_result and hasattr(tools_result, "tools") else 0
         )
 
+        resources_dict = await child_agent.list_resources()
+        resource_count = sum(len(resources) for resources in resources_dict.values()) if resources_dict else 0
+
         prompts_dict = await child_agent.list_prompts()
         prompt_count = sum(len(prompts) for prompts in prompts_dict.values()) if prompts_dict else 0
 
@@ -229,10 +236,11 @@ async def _display_child_agent_info(child_agent, prefix: str, agent_provider) ->
             # Pluralization helpers
             server_word = "Server" if server_count == 1 else "Servers"
             tool_word = "tool" if tool_count == 1 else "tools"
+            resource_word = "resource" if resource_count == 1 else "resources"
             prompt_word = "prompt" if prompt_count == 1 else "prompts"
 
             rich_print(
-                f"[dim]  {prefix} [/dim][blue]{child_agent.name}[/blue][dim]:[/dim] {server_count:,}[dim] MCP {server_word}, [/dim]{tool_count:,}[dim] {tool_word}, [/dim]{prompt_count:,}[dim] {prompt_word} available[/dim]"
+                f"[dim]  {prefix} [/dim][blue]{child_agent.name}[/blue][dim]:[/dim] {server_count:,}[dim] MCP {server_word}, [/dim]{tool_count:,}[dim] {tool_word}, [/dim]{resource_count:,}[dim] {resource_word}, [/dim]{prompt_count:,}[dim] {prompt_word} available[/dim]"
             )
         else:
             # Show child even without MCP servers for context

mcp_agent/llm/model_factory.py

@@ -14,6 +14,7 @@ from mcp_agent.llm.provider_types import Provider
 from mcp_agent.llm.providers.augmented_llm_aliyun import AliyunAugmentedLLM
 from mcp_agent.llm.providers.augmented_llm_anthropic import AnthropicAugmentedLLM
 from mcp_agent.llm.providers.augmented_llm_azure import AzureOpenAIAugmentedLLM
+from mcp_agent.llm.providers.augmented_llm_bedrock import BedrockAugmentedLLM
 from mcp_agent.llm.providers.augmented_llm_deepseek import DeepSeekAugmentedLLM
 from mcp_agent.llm.providers.augmented_llm_generic import GenericAugmentedLLM
 from mcp_agent.llm.providers.augmented_llm_google_native import GoogleNativeAugmentedLLM
@@ -41,6 +42,7 @@ LLMClass = Union[
     Type[GoogleNativeAugmentedLLM],
     Type[GenericAugmentedLLM],
     Type[AzureOpenAIAugmentedLLM],
+    Type[BedrockAugmentedLLM],
 ]
 
 
@@ -120,6 +122,7 @@ class ModelFactory:
         "qwen-plus": Provider.ALIYUN,
         "qwen-max": Provider.ALIYUN,
         "qwen-long": Provider.ALIYUN,
+
     }
 
     MODEL_ALIASES = {
@@ -155,6 +158,7 @@ class ModelFactory:
         Provider.TENSORZERO: TensorZeroAugmentedLLM,
         Provider.AZURE: AzureOpenAIAugmentedLLM,
         Provider.ALIYUN: AliyunAugmentedLLM,
+        Provider.BEDROCK: BedrockAugmentedLLM,
     }
 
     # Mapping of special model names to their specific LLM classes
@@ -209,6 +213,11 @@ class ModelFactory:
         # If provider still None, try to get from DEFAULT_PROVIDERS using the model_name_str
         if provider is None:
             provider = cls.DEFAULT_PROVIDERS.get(model_name_str)
+            
+            # If still None, try pattern matching for Bedrock models
+            if provider is None and BedrockAugmentedLLM.matches_model_pattern(model_name_str):
+                provider = Provider.BEDROCK
+            
             if provider is None:
                 raise ModelConfigError(
                     f"Unknown model or provider for: {model_string}. Model name parsed as '{model_name_str}'"

mcp_agent/llm/provider_types.py

@@ -27,3 +27,4 @@ class Provider(Enum):
     ALIYUN = ("aliyun", "Aliyun")  # Aliyun Bailian OpenAI Service
     HUGGINGFACE = ("huggingface", "HuggingFace")  # For HuggingFace MCP connections
     XAI = ("xai", "XAI")  # For xAI Grok models
+    BEDROCK = ("bedrock", "Bedrock")