fast-agent-mcp 0.1.12__py3-none-any.whl → 0.2.0__py3-none-any.whl

mcp_agent/mcp/prompt_message_multipart.py

@@ -1,14 +1,35 @@
 from typing import List, Union
-from pydantic import BaseModel
 
 from mcp.types import (
-    PromptMessage,
-    TextContent,
-    ImageContent,
     EmbeddedResource,
-    Role,
     GetPromptResult,
+    ImageContent,
+    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
 
 
 class PromptMessageMultipart(BaseModel):
@@ -21,9 +42,7 @@ class PromptMessageMultipart(BaseModel):
     content: List[Union[TextContent, ImageContent, EmbeddedResource]]
 
     @classmethod
-    def from_prompt_messages(
-        cls, messages: List[PromptMessage]
-    ) -> List["PromptMessageMultipart"]:
+    def to_multipart(cls, messages: List[PromptMessage]) -> List["PromptMessageMultipart"]:
         """Convert a sequence of PromptMessages into PromptMessageMultipart objects."""
         if not messages:
             return []
@@ -41,7 +60,8 @@ class PromptMessageMultipart(BaseModel):
                 current_group = cls(role=msg.role, content=[msg.content])
             else:
                 # Same role, add to current message
-                current_group.content.append(msg.content)
+                if current_group is not None:
+                    current_group.content.append(msg.content)
 
         # Add the last group
         if current_group is not None:
@@ -49,16 +69,48 @@ class PromptMessageMultipart(BaseModel):
 
         return result
 
-    def to_prompt_messages(self) -> List[PromptMessage]:
+    def from_multipart(self) -> List[PromptMessage]:
         """Convert this PromptMessageMultipart to a sequence of standard PromptMessages."""
         return [
-            PromptMessage(role=self.role, content=content_part)
-            for content_part in self.content
+            PromptMessage(role=self.role, content=content_part) for content_part in self.content
         ]
 
+    def first_text(self) -> str:
+        """
+        Get the first available text content from a message.
+
+        Args:
+            message: A PromptMessage or PromptMessageMultipart
+
+        Returns:
+            First text content or None if no text content exists
+        """
+        for content in self.content:
+            text = get_text(content)
+            if text is not None:
+                return text
+
+        return "<no text>"
+
+    def all_text(self) -> str:
+        """
+        Get all the text available.
+
+        Args:
+            message: A PromptMessage or PromptMessageMultipart
+
+        Returns:
+            First text content or None if no text content exists
+        """
+        result = []
+        for content in self.content:
+            text = get_text(content)
+            if text is not None:
+                result.append(text)
+
+        return "\n".join(result)
+
     @classmethod
-    def parse_get_prompt_result(
-        cls, result: GetPromptResult
-    ) -> List["PromptMessageMultipart"]:
+    def parse_get_prompt_result(cls, result: GetPromptResult) -> List["PromptMessageMultipart"]:
         """Parse a GetPromptResult into PromptMessageMultipart objects."""
-        return cls.from_prompt_messages(result.messages)
+        return cls.to_multipart(result.messages)

mcp_agent/mcp/prompt_render.py

@@ -0,0 +1,77 @@
+"""
+Utilities for rendering PromptMessageMultipart objects for display.
+"""
+
+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 (
+    get_resource_uri,
+    get_text,
+    is_image_content,
+    is_resource_content,
+    is_text_content,
+)
+
+
+def render_multipart_message(message: PromptMessageMultipart) -> str:
+    """
+    Render a multipart message for display purposes.
+    
+    This function formats the message content for user-friendly display,
+    handling different content types appropriately.
+    
+    Args:
+        message: A PromptMessageMultipart object to render
+        
+    Returns:
+        A string representation of the message's content
+    """
+    rendered_parts: List[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)
+            
+        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]"
+            rendered_parts.append(image_info)
+            
+        elif is_resource_content(content):
+            # Handle embedded resources
+            resource = content  # type: EmbeddedResource
+            uri = get_resource_uri(resource)
+            
+            if isinstance(resource.resource, TextResourceContents):
+                # Handle text resources
+                text = resource.resource.text
+                text_length = len(text)
+                mime_type = resource.resource.mimeType
+                
+                # 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):
+                # Handle blob resources (binary data)
+                blob_length = len(resource.resource.blob) if resource.resource.blob else 0
+                mime_type = resource.resource.mimeType
+                
+                resource_info = f"[EMBEDDED BLOB RESOURCE: {mime_type}, {uri}, {blob_length} bytes]"
+                rendered_parts.append(resource_info)
+                
+        else:
+            # Fallback for other content types
+            text = get_text(content)
+            if text is not None:
+                rendered_parts.append(text)
+    
+    return "\n".join(rendered_parts)

mcp_agent/mcp/prompt_serialization.py

@@ -19,9 +19,14 @@ and PromptMessageMultipart objects. It includes functionality for:
 import json
 from typing import List
 
-from mcp.types import TextContent, EmbeddedResource, ImageContent, TextResourceContents
-from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
+from mcp.types import EmbeddedResource, ImageContent, TextContent, TextResourceContents
 
+from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
+from mcp_agent.mcp.prompts.prompt_constants import (
+    ASSISTANT_DELIMITER,
+    RESOURCE_DELIMITER,
+    USER_DELIMITER,
+)
 
 # -------------------------------------------------------------------------
 # JSON Serialization Functions
@@ -44,8 +49,7 @@ def multipart_messages_to_json(messages: List[PromptMessageMultipart]) -> str:
     # Convert to dictionaries using model_dump with proper JSON mode
     # The mode="json" parameter ensures proper handling of AnyUrl objects
     message_dicts = [
-        message.model_dump(by_alias=True, mode="json", exclude_none=True)
-        for message in messages
+        message.model_dump(by_alias=True, mode="json", exclude_none=True) for message in messages
     ]
 
     # Convert to JSON string
@@ -76,9 +80,7 @@ def json_to_multipart_messages(json_str: str) -> List[PromptMessageMultipart]:
     return messages
 
 
-def save_messages_to_json_file(
-    messages: List[PromptMessageMultipart], file_path: str
-) -> None:
+def save_messages_to_json_file(messages: List[PromptMessageMultipart], file_path: str) -> None:
     """
     Save PromptMessageMultipart objects to a JSON file.
 
@@ -115,9 +117,9 @@ def load_messages_from_json_file(file_path: str) -> List[PromptMessageMultipart]
 
 def multipart_messages_to_delimited_format(
     messages: List[PromptMessageMultipart],
-    user_delimiter: str = "---USER",
-    assistant_delimiter: str = "---ASSISTANT",
-    resource_delimiter: str = "---RESOURCE",
+    user_delimiter: str = USER_DELIMITER,
+    assistant_delimiter: str = ASSISTANT_DELIMITER,
+    resource_delimiter: str = RESOURCE_DELIMITER,
     combine_text: bool = True,  # Set to False to maintain backward compatibility
 ) -> List[str]:
     """
@@ -169,9 +171,7 @@ def multipart_messages_to_delimited_format(
                     delimited_content.append(resource_delimiter)
 
                     # Convert to dictionary using proper JSON mode
-                    content_dict = content.model_dump(
-                        by_alias=True, mode="json", exclude_none=True
-                    )
+                    content_dict = content.model_dump(by_alias=True, mode="json", exclude_none=True)
 
                     # Add to delimited content as JSON
                     delimited_content.append(json.dumps(content_dict, indent=2))
@@ -186,9 +186,7 @@ def multipart_messages_to_delimited_format(
                     delimited_content.append(resource_delimiter)
 
                     # Convert to dictionary using proper JSON mode
-                    content_dict = content.model_dump(
-                        by_alias=True, mode="json", exclude_none=True
-                    )
+                    content_dict = content.model_dump(by_alias=True, mode="json", exclude_none=True)
 
                     # Add to delimited content as JSON
                     delimited_content.append(json.dumps(content_dict, indent=2))
@@ -198,9 +196,9 @@ def multipart_messages_to_delimited_format(
 
 def delimited_format_to_multipart_messages(
     content: str,
-    user_delimiter: str = "---USER",
-    assistant_delimiter: str = "---ASSISTANT",
-    resource_delimiter: str = "---RESOURCE",
+    user_delimiter: str = USER_DELIMITER,
+    assistant_delimiter: str = ASSISTANT_DELIMITER,
+    resource_delimiter: str = RESOURCE_DELIMITER,
 ) -> List[PromptMessageMultipart]:
     """
     Parse hybrid delimited format into PromptMessageMultipart objects:
@@ -237,31 +235,23 @@ def delimited_format_to_multipart_messages(
         collecting_text = True
 
     # Process each line
-    for line in (
-        lines[1:] if lines else []
-    ):  # Skip the first line if already processed above
+    for line in lines[1:] if lines else []:  # Skip the first line if already processed above
         line_stripped = line.strip()
 
         # Handle role delimiters
         if line_stripped == user_delimiter or line_stripped == assistant_delimiter:
             # Save previous message if it exists
-            if current_role is not None and (
-                text_contents or resource_contents or text_lines
-            ):
+            if current_role is not None and (text_contents or resource_contents or text_lines):
                 # If we were collecting text, add it to the text contents
                 if collecting_text and text_lines:
-                    text_contents.append(
-                        TextContent(type="text", text="\n".join(text_lines))
-                    )
+                    text_contents.append(TextContent(type="text", text="\n".join(text_lines)))
                     text_lines = []
 
                 # Create content list with text parts first, then resource parts
                 combined_content = []
 
                 # Filter out any empty text content items
-                filtered_text_contents = [
-                    tc for tc in text_contents if tc.text.strip() != ""
-                ]
+                filtered_text_contents = [tc for tc in text_contents if tc.text.strip() != ""]
 
                 combined_content.extend(filtered_text_contents)
                 combined_content.extend(resource_contents)
@@ -286,9 +276,7 @@ def delimited_format_to_multipart_messages(
         elif line_stripped == resource_delimiter:
             # If we were collecting text, add it to text contents
             if collecting_text and text_lines:
-                text_contents.append(
-                    TextContent(type="text", text="\n".join(text_lines))
-                )
+                text_contents.append(TextContent(type="text", text="\n".join(text_lines)))
                 text_lines = []
 
             # Switch to collecting JSON or legacy format
@@ -303,11 +291,7 @@ def delimited_format_to_multipart_messages(
                 json_lines.append(line)
 
                 # For legacy format or files where resources are just plain text
-                if (
-                    legacy_format
-                    and line_stripped
-                    and not line_stripped.startswith("{")
-                ):
+                if legacy_format and line_stripped and not line_stripped.startswith("{"):
                     # This is probably a legacy resource reference like a filename
                     resource_uri = line_stripped
                     if not resource_uri.startswith("resource://"):
@@ -370,9 +354,7 @@ def delimited_format_to_multipart_messages(
             combined_content = []
 
             # Filter out any empty text content items
-            filtered_text_contents = [
-                tc for tc in text_contents if tc.text.strip() != ""
-            ]
+            filtered_text_contents = [tc for tc in text_contents if tc.text.strip() != ""]
 
             combined_content.extend(filtered_text_contents)
             combined_content.extend(resource_contents)
@@ -390,9 +372,9 @@ def delimited_format_to_multipart_messages(
 def save_messages_to_delimited_file(
     messages: List[PromptMessageMultipart],
     file_path: str,
-    user_delimiter: str = "---USER",
-    assistant_delimiter: str = "---ASSISTANT",
-    resource_delimiter: str = "---RESOURCE",
+    user_delimiter: str = USER_DELIMITER,
+    assistant_delimiter: str = ASSISTANT_DELIMITER,
+    resource_delimiter: str = RESOURCE_DELIMITER,
     combine_text: bool = True,
 ) -> None:
     """
@@ -420,9 +402,9 @@ def save_messages_to_delimited_file(
 
 def load_messages_from_delimited_file(
     file_path: str,
-    user_delimiter: str = "---USER",
-    assistant_delimiter: str = "---ASSISTANT",
-    resource_delimiter: str = "---RESOURCE",
+    user_delimiter: str = USER_DELIMITER,
+    assistant_delimiter: str = ASSISTANT_DELIMITER,
+    resource_delimiter: str = RESOURCE_DELIMITER,
 ) -> List[PromptMessageMultipart]:
     """
     Load PromptMessageMultipart objects from a file in hybrid delimited format.

mcp_agent/mcp/prompts/prompt_constants.py

@@ -0,0 +1,18 @@
+"""
+Constants for the prompt system.
+
+This module defines constants used throughout the prompt system, including
+delimiters for parsing prompt files and serializing prompt messages.
+"""
+
+# Standard delimiters used for prompt template parsing and serialization
+USER_DELIMITER = "---USER"
+ASSISTANT_DELIMITER = "---ASSISTANT"
+RESOURCE_DELIMITER = "---RESOURCE"
+
+# Default delimiter mapping used by PromptTemplate and PromptTemplateLoader
+DEFAULT_DELIMITER_MAP = {
+    USER_DELIMITER: "user",
+    ASSISTANT_DELIMITER: "assistant",
+    RESOURCE_DELIMITER: "resource",
+}