fast-agent-mcp 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

mcp_agent/mcp/mcp_aggregator.py

@@ -5,6 +5,7 @@ from typing import (
     Callable,
     Dict,
     List,
+    Mapping,
     Optional,
     TypeVar,
 )
@@ -373,7 +374,11 @@ class MCPAggregator(ContextDependent):
                     f"Failed to {method_name} '{operation_name}' on server '{server_name}': {e}"
                 )
                 logger.error(error_msg)
-                return error_factory(error_msg) if error_factory else None
+                if error_factory:
+                    return error_factory(error_msg)
+                else:
+                    # Re-raise the original exception to propagate it
+                    raise e
 
         if self.connection_persistence:
             server_connection = await self._persistent_connection_manager.get_server(
@@ -476,7 +481,10 @@ class MCPAggregator(ContextDependent):
         )
 
     async def get_prompt(
-        self, prompt_name: str | None, arguments: dict[str, str] | None
+        self,
+        prompt_name: str | None,
+        arguments: dict[str, str] | None = None,
+        server_name: str | None = None,
     ) -> GetPromptResult:
         """
         Get a prompt from a server.
@@ -485,6 +493,8 @@ class MCPAggregator(ContextDependent):
                            using the format 'server_name-prompt_name'
         :param arguments: Optional dictionary of string arguments to pass to the prompt template
                          for templating
+        :param server_name: Optional name of the server to get the prompt from. If not provided
+                          and prompt_name is not namespaced, will search all servers.
         :return: GetPromptResult containing the prompt description and messages
                  with a namespaced_name property for display purposes
         """
@@ -493,17 +503,17 @@ class MCPAggregator(ContextDependent):
 
         # Handle the case where prompt_name is None
         if not prompt_name:
-            server_name = self.server_names[0] if self.server_names else None
+            if server_name is None:
+                server_name = self.server_names[0] if self.server_names else None
             local_prompt_name = None
             namespaced_name = None
         # Handle namespaced prompt name
-        elif SEP in prompt_name:
+        elif SEP in prompt_name and server_name is None:
             server_name, local_prompt_name = prompt_name.split(SEP, 1)
             namespaced_name = prompt_name  # Already namespaced
-        # Plain prompt name - will use cache to find the server
+        # Plain prompt name - use provided server or search
         else:
             local_prompt_name = prompt_name
-            server_name = None
             namespaced_name = None  # Will be set when server is found
 
         # If we have a specific server to check
@@ -700,7 +710,7 @@ class MCPAggregator(ContextDependent):
             messages=[],
         )
 
-    async def list_prompts(self, server_name: str = None) -> Dict[str, List[Prompt]]:
+    async def list_prompts(self, server_name: str | None = None) -> Mapping[str, List[Prompt]]:
         """
         List available prompts from one or all servers.
 
@@ -795,13 +805,16 @@ class MCPAggregator(ContextDependent):
         logger.debug(f"Available prompts across servers: {results}")
         return results
 
-    async def get_resource(self, server_name: str, resource_uri: str) -> ReadResourceResult:
+    async def get_resource(
+        self, resource_uri: str, server_name: str | None = None
+    ) -> ReadResourceResult:
         """
         Get a resource directly from an MCP server by URI.
+        If server_name is None, will search all available servers.
 
         Args:
-            server_name: Name of the MCP server to retrieve the resource from
             resource_uri: URI of the resource to retrieve
+            server_name: Optional name of the MCP server to retrieve the resource from
 
         Returns:
             ReadResourceResult object containing the resource content
@@ -812,9 +825,45 @@ class MCPAggregator(ContextDependent):
         if not self.initialized:
             await self.load_servers()
 
-        if server_name not in self.server_names:
-            raise ValueError(f"Server '{server_name}' not found")
+        # If specific server requested, use only that server
+        if server_name is not None:
+            if server_name not in self.server_names:
+                raise ValueError(f"Server '{server_name}' not found")
+
+            # Get the resource from the specified server
+            return await self._get_resource_from_server(server_name, resource_uri)
+
+        # If no server specified, search all servers
+        if not self.server_names:
+            raise ValueError("No servers available to get resource from")
+
+        # Try each server in order - simply attempt to get the resource
+        for s_name in self.server_names:
+            try:
+                return await self._get_resource_from_server(s_name, resource_uri)
+            except Exception:
+                # Continue to next server if not found
+                continue
+
+        # If we reach here, we couldn't find the resource on any server
+        raise ValueError(f"Resource '{resource_uri}' not found on any server")
+
+    async def _get_resource_from_server(
+        self, server_name: str, resource_uri: str
+    ) -> ReadResourceResult:
+        """
+        Internal helper method to get a resource from a specific server.
+
+        Args:
+            server_name: Name of the server to get the resource from
+            resource_uri: URI of the resource to retrieve
+
+        Returns:
+            ReadResourceResult containing the resource
 
+        Raises:
+            Exception: If the resource couldn't be found or other error occurs
+        """
         logger.info(
             "Requesting resource",
             data={
@@ -831,15 +880,70 @@ class MCPAggregator(ContextDependent):
             raise ValueError(f"Invalid resource URI: {resource_uri}. Error: {e}")
 
         # Use the _execute_on_server method to call read_resource on the server
-        return await self._execute_on_server(
+        result = await self._execute_on_server(
             server_name=server_name,
             operation_type="resource",
             operation_name=resource_uri,
             method_name="read_resource",
             method_args={"uri": uri},
-            error_factory=lambda msg: ValueError(f"Failed to retrieve resource: {msg}"),
+            # Don't create ValueError, just return None on error so we can catch it
+            #            error_factory=lambda _: None,
         )
 
+        # If result is None, the resource was not found
+        if result is None:
+            raise ValueError(f"Resource '{resource_uri}' not found on server '{server_name}'")
+
+        return result
+
+    async def list_resources(self, server_name: str | None = None) -> Dict[str, List[str]]:
+        """
+        List available resources from one or all servers.
+
+        Args:
+            server_name: Optional server name to list resources from. If not provided,
+                        lists resources from all servers.
+
+        Returns:
+            Dictionary mapping server names to lists of resource URIs
+        """
+        if not self.initialized:
+            await self.load_servers()
+
+        results: Dict[str, List[str]] = {}
+
+        # 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 resources
+        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] = []
+
+            try:
+                # Use the _execute_on_server method to call list_resources on the server
+                result = await self._execute_on_server(
+                    server_name=s_name,
+                    operation_type="resources-list",
+                    operation_name="",
+                    method_name="list_resources",
+                    method_args={},  # Empty dictionary instead of None
+                    # No error_factory to allow exceptions to propagate
+                )
+
+                # Get resources from result
+                resources = getattr(result, "resources", [])
+                results[s_name] = [str(r.uri) for r in resources]
+
+            except Exception as e:
+                logger.error(f"Error fetching resources from {s_name}: {e}")
+
+        return results
+
 
 class MCPCompoundServer(Server):
     """

mcp_agent/mcp/prompt_message_multipart.py

@@ -1,4 +1,4 @@
-from typing import List, Union
+from typing import List, Optional, Union
 
 from mcp.types import (
     EmbeddedResource,
@@ -7,29 +7,10 @@ from mcp.types import (
     PromptMessage,
     Role,
     TextContent,
-    TextResourceContents,
 )
 from pydantic import BaseModel
 
-
-def get_text(content: Union[TextContent, ImageContent, EmbeddedResource]) -> str | None:
-    """
-    Extract text content from a content object if available.
-
-    Args:
-        content: A content object (TextContent, ImageContent, or EmbeddedResource)
-
-    Returns:
-        The text content as a string or None if not a text content
-    """
-    if isinstance(content, TextContent):
-        return content.text
-
-    if isinstance(content, EmbeddedResource):
-        if isinstance(content.resource, TextResourceContents):
-            return content.resource.text
-
-    return None
+from mcp_agent.mcp.helpers.content_helpers import get_text
 
 
 class PromptMessageMultipart(BaseModel):
@@ -112,5 +93,31 @@ class PromptMessageMultipart(BaseModel):
 
     @classmethod
     def parse_get_prompt_result(cls, result: GetPromptResult) -> List["PromptMessageMultipart"]:
-        """Parse a GetPromptResult into PromptMessageMultipart objects."""
+        """
+        Parse a GetPromptResult into PromptMessageMultipart objects.
+
+        Args:
+            result: GetPromptResult from MCP server
+
+        Returns:
+            List of PromptMessageMultipart objects
+        """
         return cls.to_multipart(result.messages)
+
+    @classmethod
+    def from_get_prompt_result(
+        cls, result: Optional[GetPromptResult]
+    ) -> List["PromptMessageMultipart"]:
+        """
+        Convert a GetPromptResult to PromptMessageMultipart objects with error handling.
+        This method safely handles None values and empty results.
+
+        Args:
+            result: GetPromptResult from MCP server or None
+
+        Returns:
+            List of PromptMessageMultipart objects or empty list if result is None/empty
+        """
+        if not result or not result.messages:
+            return []
+        return cls.to_multipart(result.messages)

mcp_agent/mcp/prompt_render.py

@@ -6,14 +6,14 @@ from typing import List
 
 from mcp.types import BlobResourceContents, TextResourceContents
 
-from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
-from mcp_agent.mcp.prompts.prompt_helpers import (
+from mcp_agent.mcp.helpers.content_helpers import (
     get_resource_uri,
     get_text,
     is_image_content,
     is_resource_content,
     is_text_content,
 )
+from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
 
 
 def render_multipart_message(message: PromptMessageMultipart) -> str:
@@ -34,36 +34,39 @@ def render_multipart_message(message: PromptMessageMultipart) -> str:
     for content in message.content:
         if is_text_content(content):
             # Handle text content
-            text_content = content  # type: TextContent
-            rendered_parts.append(text_content.text)
+            text = get_text(content)
+            if text:
+                rendered_parts.append(text)
             
         elif is_image_content(content):
             # Format details about the image
-            image_content = content  # type: ImageContent
-            data_size = len(image_content.data) if image_content.data else 0
-            image_info = f"[IMAGE: {image_content.mimeType}, {data_size} bytes]"
+            image_data = getattr(content, "data", "")
+            data_size = len(image_data) if image_data else 0
+            mime_type = getattr(content, "mimeType", "unknown")
+            image_info = f"[IMAGE: {mime_type}, {data_size} bytes]"
             rendered_parts.append(image_info)
             
         elif is_resource_content(content):
             # Handle embedded resources
-            resource = content  # type: EmbeddedResource
-            uri = get_resource_uri(resource)
+            uri = get_resource_uri(content)
+            resource = getattr(content, "resource", None)
             
-            if isinstance(resource.resource, TextResourceContents):
+            if resource and isinstance(resource, TextResourceContents):
                 # Handle text resources
-                text = resource.resource.text
+                text = resource.text
                 text_length = len(text)
-                mime_type = resource.resource.mimeType
+                mime_type = getattr(resource, "mimeType", "text/plain")
                 
                 # Preview with truncation for long content
                 preview = text[:300] + ("..." if text_length > 300 else "")
                 resource_info = f"[EMBEDDED TEXT RESOURCE: {mime_type}, {uri}, {text_length} chars]\n{preview}"
                 rendered_parts.append(resource_info)
                 
-            elif isinstance(resource.resource, BlobResourceContents):
+            elif resource and isinstance(resource, BlobResourceContents):
                 # Handle blob resources (binary data)
-                blob_length = len(resource.resource.blob) if resource.resource.blob else 0
-                mime_type = resource.resource.mimeType
+                blob = getattr(resource, "blob", "")
+                blob_length = len(blob) if blob else 0
+                mime_type = getattr(resource, "mimeType", "application/octet-stream")
                 
                 resource_info = f"[EMBEDDED BLOB RESOURCE: {mime_type}, {uri}, {blob_length} bytes]"
                 rendered_parts.append(resource_info)

mcp_agent/mcp/prompt_serialization.py

@@ -110,6 +110,48 @@ def load_messages_from_json_file(file_path: str) -> List[PromptMessageMultipart]
     return json_to_multipart_messages(json_str)
 
 
+def save_messages_to_file(messages: List[PromptMessageMultipart], file_path: str) -> None:
+    """
+    Save PromptMessageMultipart objects to a file, with format determined by file extension.
+    
+    Uses JSON format for .json files and delimited text format for other extensions.
+    
+    Args:
+        messages: List of PromptMessageMultipart objects
+        file_path: Path to save the file
+    """
+    path_str = str(file_path).lower()
+    
+    if path_str.endswith(".json"):
+        # Use JSON format for .json files (MCP SDK compatible format)
+        save_messages_to_json_file(messages, file_path)
+    else:
+        # Use delimited text format for other extensions
+        save_messages_to_delimited_file(messages, file_path)
+
+
+def load_messages_from_file(file_path: str) -> List[PromptMessageMultipart]:
+    """
+    Load PromptMessageMultipart objects from a file, with format determined by file extension.
+    
+    Uses JSON format for .json files and delimited text format for other extensions.
+    
+    Args:
+        file_path: Path to the file
+        
+    Returns:
+        List of PromptMessageMultipart objects
+    """
+    path_str = str(file_path).lower()
+    
+    if path_str.endswith(".json"):
+        # Use JSON format for .json files (MCP SDK compatible format)
+        return load_messages_from_json_file(file_path)
+    else:
+        # Use delimited text format for other extensions
+        return load_messages_from_delimited_file(file_path)
+
+
 # -------------------------------------------------------------------------
 # Delimited Text Format Functions
 # -------------------------------------------------------------------------

mcp_agent/mcp/prompts/prompt_helpers.py

@@ -8,112 +8,22 @@ without repetitive type checking.
 from typing import List, Optional, Union, cast
 
 from mcp.types import (
-    BlobResourceContents,
     EmbeddedResource,
-    ImageContent,
     PromptMessage,
     TextContent,
-    TextResourceContents,
 )
 
-from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
+from mcp_agent.mcp.helpers.content_helpers import get_image_data, get_text
 
-
-def get_text(content: Union[TextContent, ImageContent, EmbeddedResource]) -> Optional[str]:
-    """
-    Extract text content from a content object if available.
-
-    Args:
-        content: A content object (TextContent, ImageContent, or EmbeddedResource)
-
-    Returns:
-        The text content as a string or None if not a text content
-    """
-    if isinstance(content, TextContent):
-        return content.text
-
-    if isinstance(content, EmbeddedResource):
-        if isinstance(content.resource, TextResourceContents):
-            return content.resource.text
-
-    return None
-
-
-def get_image_data(content: Union[TextContent, ImageContent, EmbeddedResource]) -> Optional[str]:
-    """
-    Extract image data from a content object if available.
-
-    Args:
-        content: A content object (TextContent, ImageContent, or EmbeddedResource)
-
-    Returns:
-        The image data as a base64 string or None if not an image content
-    """
-    if isinstance(content, ImageContent):
-        return content.data
-
-    if isinstance(content, EmbeddedResource):
-        if isinstance(content.resource, BlobResourceContents):
-            # This assumes the blob might be an image, which isn't always true
-            # Consider checking the mimeType if needed
-            return content.resource.blob
-
-    return None
-
-
-def get_resource_uri(content: Union[TextContent, ImageContent, EmbeddedResource]) -> Optional[str]:
-    """
-    Extract resource URI from an EmbeddedResource if available.
-
-    Args:
-        content: A content object (TextContent, ImageContent, or EmbeddedResource)
-
-    Returns:
-        The resource URI as a string or None if not an embedded resource
-    """
-    if isinstance(content, EmbeddedResource):
-        return str(content.resource.uri)
-
-    return None
-
-
-def is_text_content(content: Union[TextContent, ImageContent, EmbeddedResource]) -> bool:
-    """
-    Check if the content is text content.
-
-    Args:
-        content: A content object (TextContent, ImageContent, or EmbeddedResource)
-
-    Returns:
-        True if the content is TextContent, False otherwise
-    """
-    return isinstance(content, TextContent)
-
-
-def is_image_content(content: Union[TextContent, ImageContent, EmbeddedResource]) -> bool:
-    """
-    Check if the content is image content.
-
-    Args:
-        content: A content object (TextContent, ImageContent, or EmbeddedResource)
-
-    Returns:
-        True if the content is ImageContent, False otherwise
-    """
-    return isinstance(content, ImageContent)
-
-
-def is_resource_content(content: Union[TextContent, ImageContent, EmbeddedResource]) -> bool:
-    """
-    Check if the content is an embedded resource.
-
-    Args:
-        content: A content object (TextContent, ImageContent, or EmbeddedResource)
-
-    Returns:
-        True if the content is EmbeddedResource, False otherwise
-    """
-    return isinstance(content, EmbeddedResource)
+# Forward reference for PromptMessageMultipart, actual import happens at runtime
+PromptMessageMultipartType = Union[object]  # Will be replaced with actual type
+try:
+    from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
+    PromptMessageMultipartType = PromptMessageMultipart
+except ImportError:
+    # During initialization, there might be a circular import.
+    # We'll handle this gracefully.
+    pass
 
 
 class MessageContent:
@@ -123,7 +33,7 @@ class MessageContent:
     """
 
     @staticmethod
-    def get_all_text(message: Union[PromptMessage, PromptMessageMultipart]) -> List[str]:
+    def get_all_text(message: Union[PromptMessage, "PromptMessageMultipart"]) -> List[str]:
         """
         Extract all text content from a message.
 
@@ -147,7 +57,7 @@ class MessageContent:
 
     @staticmethod
     def join_text(
-        message: Union[PromptMessage, PromptMessageMultipart], separator: str = "\n\n"
+        message: Union[PromptMessage, "PromptMessageMultipart"], separator: str = "\n\n"
     ) -> str:
         """
         Join all text content in a message with a separator.
@@ -162,7 +72,7 @@ class MessageContent:
         return separator.join(MessageContent.get_all_text(message))
 
     @staticmethod
-    def get_first_text(message: Union[PromptMessage, PromptMessageMultipart]) -> Optional[str]:
+    def get_first_text(message: Union[PromptMessage, "PromptMessageMultipart"]) -> Optional[str]:
         """
         Get the first available text content from a message.
 
@@ -183,7 +93,7 @@ class MessageContent:
         return None
 
     @staticmethod
-    def has_text_at_first_position(message: Union[PromptMessage, PromptMessageMultipart]) -> bool:
+    def has_text_at_first_position(message: Union[PromptMessage, "PromptMessageMultipart"]) -> bool:
         """
         Check if a message has a TextContent at the first position.
         This is a common case when dealing with messages that start with text.
@@ -202,7 +112,7 @@ class MessageContent:
 
     @staticmethod
     def get_text_at_first_position(
-        message: Union[PromptMessage, PromptMessageMultipart],
+        message: Union[PromptMessage, "PromptMessageMultipart"],
     ) -> Optional[str]:
         """
         Get the text from the first position of a message if it's TextContent.
@@ -224,7 +134,7 @@ class MessageContent:
         return cast("TextContent", message.content[0]).text
 
     @staticmethod
-    def get_all_images(message: Union[PromptMessage, PromptMessageMultipart]) -> List[str]:
+    def get_all_images(message: Union[PromptMessage, "PromptMessageMultipart"]) -> List[str]:
         """
         Extract all image data from a message.
 
@@ -247,7 +157,7 @@ class MessageContent:
         return result
 
     @staticmethod
-    def get_first_image(message: Union[PromptMessage, PromptMessageMultipart]) -> Optional[str]:
+    def get_first_image(message: Union[PromptMessage, "PromptMessageMultipart"]) -> Optional[str]:
         """
         Get the first available image data from a message.
 
@@ -269,7 +179,7 @@ class MessageContent:
 
     @staticmethod
     def get_all_resources(
-        message: Union[PromptMessage, PromptMessageMultipart],
+        message: Union[PromptMessage, "PromptMessageMultipart"],
     ) -> List[EmbeddedResource]:
         """
         Extract all embedded resources from a message.
@@ -288,7 +198,7 @@ class MessageContent:
         return [content for content in message.content if isinstance(content, EmbeddedResource)]
 
     @staticmethod
-    def has_text(message: Union[PromptMessage, PromptMessageMultipart]) -> bool:
+    def has_text(message: Union[PromptMessage, "PromptMessageMultipart"]) -> bool:
         """
         Check if the message has any text content.
 
@@ -301,7 +211,7 @@ class MessageContent:
         return len(MessageContent.get_all_text(message)) > 0
 
     @staticmethod
-    def has_images(message: Union[PromptMessage, PromptMessageMultipart]) -> bool:
+    def has_images(message: Union[PromptMessage, "PromptMessageMultipart"]) -> bool:
         """
         Check if the message has any image content.
 
@@ -314,7 +224,7 @@ class MessageContent:
         return len(MessageContent.get_all_images(message)) > 0
 
     @staticmethod
-    def has_resources(message: Union[PromptMessage, PromptMessageMultipart]) -> bool:
+    def has_resources(message: Union[PromptMessage, "PromptMessageMultipart"]) -> bool:
         """
         Check if the message has any embedded resources.
 
@@ -324,4 +234,4 @@ class MessageContent:
         Returns:
             True if the message has embedded resources, False otherwise
         """
-        return len(MessageContent.get_all_resources(message)) > 0
+        return len(MessageContent.get_all_resources(message)) > 0

mcp_agent/mcp/prompts/prompt_load.py

@@ -101,9 +101,57 @@ def create_resource_message(
 
 
 def load_prompt(file: Path) -> List[PromptMessage]:
-    template: PromptTemplate = PromptTemplateLoader().load_from_file(file)
-    return create_messages_with_resources(template.content_sections, [file])
+    """
+    Load a prompt from a file and return as PromptMessage objects.
+    
+    The loader uses file extension to determine the format:
+    - .json files are loaded as MCP SDK compatible JSON format
+    - All other files are loaded using the template-based delimited format
+    
+    Args:
+        file: Path to the prompt file
+        
+    Returns:
+        List of PromptMessage objects
+    """
+    file_str = str(file).lower()
+    
+    if file_str.endswith(".json"):
+        # JSON format (MCP SDK compatible)
+        from mcp_agent.mcp.prompt_serialization import load_messages_from_json_file
+        
+        # Load multipart messages and convert to flat messages
+        multipart_messages = load_messages_from_json_file(str(file))
+        messages = []
+        for mp in multipart_messages:
+            messages.extend(mp.from_multipart())
+        return messages
+    else:
+        # Template-based format (delimited text)
+        template: PromptTemplate = PromptTemplateLoader().load_from_file(file)
+        return create_messages_with_resources(template.content_sections, [file])
 
 
 def load_prompt_multipart(file: Path) -> List[PromptMessageMultipart]:
-    return PromptMessageMultipart.to_multipart(load_prompt(file))
+    """
+    Load a prompt from a file and return as PromptMessageMultipart objects.
+    
+    The loader uses file extension to determine the format:
+    - .json files are loaded as MCP SDK compatible JSON format
+    - All other files are loaded using the template-based delimited format
+    
+    Args:
+        file: Path to the prompt file
+        
+    Returns:
+        List of PromptMessageMultipart objects
+    """
+    file_str = str(file).lower()
+    
+    if file_str.endswith(".json"):
+        # JSON format (MCP SDK compatible)
+        from mcp_agent.mcp.prompt_serialization import load_messages_from_json_file
+        return load_messages_from_json_file(str(file))
+    else:
+        # Template-based format (delimited text)
+        return PromptMessageMultipart.to_multipart(load_prompt(file))