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

mcp_agent/logging/transport.py

@@ -269,17 +269,9 @@ class AsyncEventBus:
     def __init__(self, transport: EventTransport | None = None) -> None:
         self.transport: EventTransport = transport or NoOpTransport()
         self.listeners: Dict[str, EventListener] = {}
-        self._queue = asyncio.Queue()
+        self._queue: asyncio.Queue | None = None
         self._task: asyncio.Task | None = None
         self._running = False
-        self._stop_event = asyncio.Event()
-
-        # Store the loop we're created on
-        try:
-            self._loop = asyncio.get_running_loop()
-        except RuntimeError:
-            self._loop = asyncio.new_event_loop()
-            asyncio.set_event_loop(self._loop)
 
     @classmethod
     def get(cls, transport: EventTransport | None = None) -> "AsyncEventBus":
@@ -301,7 +293,6 @@ class AsyncEventBus:
         if cls._instance:
             # Signal shutdown
             cls._instance._running = False
-            cls._instance._stop_event.set()
 
             # Clear the singleton instance
             cls._instance = None
@@ -311,13 +302,20 @@ class AsyncEventBus:
         if self._running:
             return
 
+        try:
+            asyncio.get_running_loop()
+        except RuntimeError:
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
+
+        self._queue = asyncio.Queue()
+
         # Start each lifecycle-aware listener
         for listener in self.listeners.values():
             if isinstance(listener, LifecycleAwareListener):
                 await listener.start()
 
-        # Clear stop event and start processing
-        self._stop_event.clear()
+        # Start processing
         self._running = True
         self._task = asyncio.create_task(self._process_events())
 
@@ -328,7 +326,6 @@ class AsyncEventBus:
 
         # Signal processing to stop
         self._running = False
-        self._stop_event.set()
 
         # Try to process remaining items with a timeout
         if not self._queue.empty():
@@ -345,6 +342,7 @@ class AsyncEventBus:
                         break
             except Exception as e:
                 print(f"Error during queue cleanup: {e}")
+        self._queue = None
 
         # Cancel and wait for task with timeout
         if self._task and not self._task.done():
@@ -356,8 +354,7 @@ class AsyncEventBus:
                 pass  # Task was cancelled or timed out
             except Exception as e:
                 print(f"Error cancelling process task: {e}")
-            finally:
-                self._task = None
+        self._task = None
 
         # Stop each lifecycle-aware listener
         for listener in self.listeners.values():
@@ -371,6 +368,9 @@ class AsyncEventBus:
 
     async def emit(self, event: Event) -> None:
         """Emit an event to all listeners and transport."""
+        if not self._running:
+            return
+
         # Inject current tracing info if available
         span = trace.get_current_span()
         if span.is_recording():
@@ -402,15 +402,8 @@ class AsyncEventBus:
             try:
                 # Use wait_for with a timeout to allow checking running state
                 try:
-                    # Check if we should be stopping first
-                    if not self._running or self._stop_event.is_set():
-                        break
-
                     event = await asyncio.wait_for(self._queue.get(), timeout=0.1)
                 except asyncio.TimeoutError:
-                    # Check again before continuing
-                    if not self._running or self._stop_event.is_set():
-                        break
                     continue
 
                 # Process the event through all listeners
@@ -443,20 +436,21 @@ class AsyncEventBus:
                     self._queue.task_done()
 
         # Process remaining events in queue
-        while not self._queue.empty():
-            try:
-                event = self._queue.get_nowait()
-                tasks = []
-                for listener in self.listeners.values():
-                    try:
-                        tasks.append(listener.handle_event(event))
-                    except Exception:
-                        pass
-                if tasks:
-                    await asyncio.gather(*tasks, return_exceptions=True)
-                self._queue.task_done()
-            except asyncio.QueueEmpty:
-                break
+        if self._queue:
+            while not self._queue.empty():
+                try:
+                    event = self._queue.get_nowait()
+                    tasks = []
+                    for listener in self.listeners.values():
+                        try:
+                            tasks.append(listener.handle_event(event))
+                        except Exception:
+                            pass
+                    if tasks:
+                        await asyncio.gather(*tasks, return_exceptions=True)
+                    self._queue.task_done()
+                except asyncio.QueueEmpty:
+                    break
 
 
 def create_transport(

mcp_agent/mcp/helpers/content_helpers.py

@@ -9,20 +9,22 @@ from typing import Optional, Union
 
 from mcp.types import (
     BlobResourceContents,
+    ContentBlock,
     EmbeddedResource,
     ImageContent,
     ReadResourceResult,
+    ResourceLink,
     TextContent,
     TextResourceContents,
 )
 
 
-def get_text(content: Union[TextContent, ImageContent, EmbeddedResource]) -> Optional[str]:
+def get_text(content: ContentBlock) -> Optional[str]:
     """
     Extract text content from a content object if available.
 
     Args:
-        content: A content object (TextContent, ImageContent, or EmbeddedResource)
+        content: A content object ContentBlock
 
     Returns:
         The text content as a string or None if not a text content
@@ -40,12 +42,12 @@ def get_text(content: Union[TextContent, ImageContent, EmbeddedResource]) -> Opt
     return None
 
 
-def get_image_data(content: Union[TextContent, ImageContent, EmbeddedResource]) -> Optional[str]:
+def get_image_data(content: ContentBlock) -> Optional[str]:
     """
     Extract image data from a content object if available.
 
     Args:
-        content: A content object (TextContent, ImageContent, or EmbeddedResource)
+        content: A content object ContentBlock
 
     Returns:
         The image data as a base64 string or None if not an image content
@@ -62,12 +64,12 @@ def get_image_data(content: Union[TextContent, ImageContent, EmbeddedResource])
     return None
 
 
-def get_resource_uri(content: Union[TextContent, ImageContent, EmbeddedResource]) -> Optional[str]:
+def get_resource_uri(content: ContentBlock) -> Optional[str]:
     """
     Extract resource URI from an EmbeddedResource if available.
 
     Args:
-        content: A content object (TextContent, ImageContent, or EmbeddedResource)
+        content: A content object ContentBlock
 
     Returns:
         The resource URI as a string or None if not an embedded resource
@@ -78,12 +80,12 @@ def get_resource_uri(content: Union[TextContent, ImageContent, EmbeddedResource]
     return None
 
 
-def is_text_content(content: Union[TextContent, ImageContent, EmbeddedResource]) -> bool:
+def is_text_content(content: ContentBlock) -> bool:
     """
     Check if the content is text content.
 
     Args:
-        content: A content object (TextContent, ImageContent, or EmbeddedResource)
+        content: A content object ContentBlock
 
     Returns:
         True if the content is TextContent, False otherwise
@@ -96,7 +98,7 @@ def is_image_content(content: Union[TextContent, ImageContent, EmbeddedResource]
     Check if the content is image content.
 
     Args:
-        content: A content object (TextContent, ImageContent, or EmbeddedResource)
+        content: A content object ContentBlock
 
     Returns:
         True if the content is ImageContent, False otherwise
@@ -104,12 +106,12 @@ def is_image_content(content: Union[TextContent, ImageContent, EmbeddedResource]
     return isinstance(content, ImageContent)
 
 
-def is_resource_content(content: Union[TextContent, ImageContent, EmbeddedResource]) -> bool:
+def is_resource_content(content: ContentBlock) -> bool:
     """
     Check if the content is an embedded resource.
 
     Args:
-        content: A content object (TextContent, ImageContent, or EmbeddedResource)
+        content: A content object ContentBlock
 
     Returns:
         True if the content is EmbeddedResource, False otherwise
@@ -117,6 +119,19 @@ def is_resource_content(content: Union[TextContent, ImageContent, EmbeddedResour
     return isinstance(content, EmbeddedResource)
 
 
+def is_resource_link(content: ContentBlock) -> bool:
+    """
+    Check if the content is an embedded resource.
+
+    Args:
+        content: A ContentBlock object
+
+    Returns:
+        True if the content is ResourceLink, False otherwise
+    """
+    return isinstance(content, ResourceLink)
+
+
 def get_resource_text(result: ReadResourceResult, index: int = 0) -> Optional[str]:
     """
     Extract text content from a ReadResourceResult at the specified index.

mcp_agent/mcp/interfaces.py

@@ -126,6 +126,21 @@ class AugmentedLLMProtocol(Protocol):
         """
         ...
 
+    async def apply_prompt_template(
+        self, prompt_result: "GetPromptResult", prompt_name: str
+    ) -> str:
+        """
+        Apply a prompt template as persistent context that will be included in all future conversations.
+
+        Args:
+            prompt_result: The GetPromptResult containing prompt messages
+            prompt_name: The name of the prompt being applied
+
+        Returns:
+            String representation of the assistant's response if generated
+        """
+        ...
+
     @property
     def message_history(self) -> List[PromptMessageMultipart]:
         """
@@ -157,8 +172,13 @@ class AgentProtocol(AugmentedLLMProtocol, Protocol):
         """Send a message to the agent and get a response"""
         ...
 
-    async def apply_prompt(self, prompt_name: str, arguments: Dict[str, str] | None = None) -> str:
-        """Apply an MCP prompt template by name"""
+    async def apply_prompt(
+        self,
+        prompt: Union[str, "GetPromptResult"],
+        arguments: Dict[str, str] | None = None,
+        as_template: bool = False,
+    ) -> str:
+        """Apply an MCP prompt template by name or GetPromptResult object"""
         ...
 
     async def get_prompt(

mcp_agent/mcp/mcp_aggregator.py

@@ -258,7 +258,12 @@ class MCPAggregator(ContextDependent):
                 },
             )
 
-        async def fetch_tools(client: ClientSession):
+        async def fetch_tools(client: ClientSession, server_name: str) -> List[Tool]:
+            # Only fetch tools if the server supports them
+            if not await self.server_supports_feature(server_name, "tools"):
+                logger.debug(f"Server '{server_name}' does not support tools")
+                return []
+
             try:
                 result: ListToolsResult = await client.list_tools()
                 return result.tools or []
@@ -287,7 +292,7 @@ class MCPAggregator(ContextDependent):
                 server_connection = await self._persistent_connection_manager.get_server(
                     server_name, client_session_factory=MCPAgentClientSession
                 )
-                tools = await fetch_tools(server_connection.session)
+                tools = await fetch_tools(server_connection.session, server_name)
                 prompts = await fetch_prompts(server_connection.session, server_name)
             else:
                 # Create a factory function for the client session
@@ -326,7 +331,7 @@ class MCPAggregator(ContextDependent):
                     server_registry=self.context.server_registry,
                     client_session_factory=create_session,
                 ) as client:
-                    tools = await fetch_tools(client)
+                    tools = await fetch_tools(client, server_name)
                     prompts = await fetch_prompts(client, server_name)
 
             return server_name, tools, prompts
@@ -962,6 +967,11 @@ class MCPAggregator(ContextDependent):
             logger.error(f"Cannot refresh tools for unknown server '{server_name}'")
             return
 
+        # Check if server supports tools capability
+        if not await self.server_supports_feature(server_name, "tools"):
+            logger.debug(f"Server '{server_name}' does not support tools")
+            return
+
         await self.display.show_tool_update(aggregator=self, updated_server=server_name)
 
         async with self._refresh_lock:
@@ -1103,6 +1113,10 @@ class MCPAggregator(ContextDependent):
         Raises:
             Exception: If the resource couldn't be found or other error occurs
         """
+        # Check if server supports resources capability
+        if not await self.server_supports_feature(server_name, "resources"):
+            raise ValueError(f"Server '{server_name}' does not support resources")
+
         logger.info(
             "Requesting resource",
             data={
@@ -1163,6 +1177,11 @@ class MCPAggregator(ContextDependent):
             # Initialize empty list for this server
             results[s_name] = []
 
+            # Check if server supports resources capability
+            if not await self.server_supports_feature(s_name, "resources"):
+                logger.debug(f"Server '{s_name}' does not support resources")
+                continue
+
             try:
                 # Use the _execute_on_server method to call list_resources on the server
                 result = await self._execute_on_server(

mcp_agent/mcp/prompt_message_multipart.py

@@ -1,9 +1,8 @@
 from typing import List, Optional, Union
 
 from mcp.types import (
-    EmbeddedResource,
+    ContentBlock,
     GetPromptResult,
-    ImageContent,
     PromptMessage,
     Role,
     TextContent,
@@ -20,7 +19,7 @@ class PromptMessageMultipart(BaseModel):
     """
 
     role: Role
-    content: List[Union[TextContent, ImageContent, EmbeddedResource]]
+    content: List[Union[ContentBlock]]
 
     @classmethod
     def to_multipart(cls, messages: List[PromptMessage]) -> List["PromptMessageMultipart"]: