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

mcp_agent/mcp/prompt_serialization.py

@@ -19,9 +19,9 @@ 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
 
 # -------------------------------------------------------------------------
 # JSON Serialization Functions
@@ -43,10 +43,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_dicts = [message.model_dump(by_alias=True, mode="json", exclude_none=True) for message in messages]
 
     # Convert to JSON string
     return json.dumps(message_dicts, indent=2)
@@ -76,9 +73,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.
 
@@ -169,9 +164,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 +179,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))
@@ -237,31 +228,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 +269,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 +284,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 +347,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)

mcp_agent/mcp/prompts/prompt_load.py

@@ -0,0 +1,99 @@
+from pathlib import Path
+from typing import List, Literal
+
+from mcp.server.fastmcp.prompts.base import (
+    AssistantMessage,
+    Message,
+    UserMessage,
+)
+from mcp.types import PromptMessage, TextContent
+
+from mcp_agent.logging.logger import get_logger
+from mcp_agent.mcp import mime_utils, resource_utils
+from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
+from mcp_agent.mcp.prompts.prompt_template import (
+    PromptContent,
+    PromptTemplate,
+    PromptTemplateLoader,
+)
+
+# Define message role type
+MessageRole = Literal["user", "assistant"]
+logger = get_logger("prompt_load")
+
+
+def cast_message_role(role: str) -> MessageRole:
+    """Cast a string role to a MessageRole literal type"""
+    if role == "user" or role == "assistant":
+        return role  # type: ignore
+    # Default to user if the role is invalid
+    logger.warning(f"Invalid message role: {role}, defaulting to 'user'")
+    return "user"
+
+
+def create_messages_with_resources(content_sections: List[PromptContent], prompt_files: List[Path]) -> List[PromptMessage]:
+    """
+    Create a list of messages from content sections, with resources properly handled.
+
+    This implementation produces one message for each content section's text,
+    followed by separate messages for each resource (with the same role type
+    as the section they belong to).
+
+    Args:
+        content_sections: List of PromptContent objects
+        prompt_files: List of prompt files (to help locate resource files)
+
+    Returns:
+        List of Message objects
+    """
+
+    messages = []
+
+    for section in content_sections:
+        # Convert to our literal type for role
+        role = cast_message_role(section.role)
+
+        # Add the text message
+        messages.append(create_content_message(section.text, role))
+
+        # Add resource messages with the same role type as the section
+        for resource_path in section.resources:
+            try:
+                # Load resource with information about its type
+                resource_content, mime_type, is_binary = resource_utils.load_resource_content(resource_path, prompt_files)
+
+                # Create and add the resource message
+                resource_message = create_resource_message(resource_path, resource_content, mime_type, is_binary, role)
+                messages.append(resource_message)
+            except Exception as e:
+                logger.error(f"Error loading resource {resource_path}: {e}")
+
+    return messages
+
+
+def create_content_message(text: str, role: MessageRole) -> PromptMessage:
+    """Create a text content message with the specified role"""
+    return PromptMessage(role=role, content=TextContent(type="text", text=text))
+
+
+def create_resource_message(resource_path: str, content: str, mime_type: str, is_binary: bool, role: MessageRole) -> Message:
+    """Create a resource message with the specified content and role"""
+    message_class = UserMessage if role == "user" else AssistantMessage
+
+    if mime_utils.is_image_mime_type(mime_type):
+        # For images, create an ImageContent
+        image_content = resource_utils.create_image_content(data=content, mime_type=mime_type)
+        return message_class(content=image_content)
+    else:
+        # For other resources, create an EmbeddedResource
+        embedded_resource = resource_utils.create_embedded_resource(resource_path, content, mime_type, is_binary)
+        return message_class(content=embedded_resource)
+
+
+def load_prompt(file: Path) -> List[PromptMessage]:
+    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))

mcp_agent/mcp/prompts/prompt_server.py

@@ -5,33 +5,27 @@ A server that loads prompts from text files with simple delimiters and serves th
 Uses the prompt_template module for clean, testable handling of prompt templates.
 """
 
-import asyncio
 import argparse
+import asyncio
 import base64
 import logging
 import sys
 from pathlib import Path
-from typing import List, Dict, Optional, Callable, Awaitable, Literal, Any
-from mcp.server.fastmcp.resources import FileResource
-from pydantic import AnyUrl
-
-from mcp_agent.mcp import mime_utils, resource_utils
+from typing import Any, Awaitable, Callable, Dict, List, Optional
 
 from mcp.server.fastmcp import FastMCP
 from mcp.server.fastmcp.prompts.base import (
-    UserMessage,
-    AssistantMessage,
     Message,
 )
-from mcp.types import (
-    TextContent,
-)
+from mcp.server.fastmcp.resources import FileResource
+from pydantic import AnyUrl
 
+from mcp_agent.mcp import mime_utils, resource_utils
+from mcp_agent.mcp.prompts.prompt_load import create_messages_with_resources
 from mcp_agent.mcp.prompts.prompt_template import (
-    PromptTemplateLoader,
     PromptMetadata,
-    PromptContent,
     PromptTemplate,
+    PromptTemplateLoader,
 )
 
 # Configure logging
@@ -61,97 +55,17 @@ config = None
 exposed_resources: Dict[str, Path] = {}
 prompt_registry: Dict[str, PromptMetadata] = {}
 
-# Define message role type
-MessageRole = Literal["user", "assistant"]
-
-
-def create_content_message(text: str, role: MessageRole) -> Message:
-    """Create a text content message with the specified role"""
-    message_class = UserMessage if role == "user" else AssistantMessage
-    return message_class(content=TextContent(type="text", text=text))
-
-
-def create_resource_message(
-    resource_path: str, content: str, mime_type: str, is_binary: bool, role: MessageRole
-) -> Message:
-    """Create a resource message with the specified content and role"""
-    message_class = UserMessage if role == "user" else AssistantMessage
-
-    if mime_utils.is_image_mime_type(mime_type):
-        # For images, create an ImageContent
-        image_content = resource_utils.create_image_content(
-            data=content, mime_type=mime_type
-        )
-        return message_class(content=image_content)
-    else:
-        # For other resources, create an EmbeddedResource
-        embedded_resource = resource_utils.create_embedded_resource(
-            resource_path, content, mime_type, is_binary
-        )
-        return message_class(content=embedded_resource)
-
-
-def create_messages_with_resources(
-    content_sections: List[PromptContent], prompt_files: List[Path]
-) -> List[Message]:
-    """
-    Create a list of messages from content sections, with resources properly handled.
-
-    This implementation produces one message for each content section's text,
-    followed by separate messages for each resource (with the same role type
-    as the section they belong to).
-
-    Args:
-        content_sections: List of PromptContent objects
-        prompt_files: List of prompt files (to help locate resource files)
-
-    Returns:
-        List of Message objects
-    """
-    messages = []
-
-    for section in content_sections:
-        # Convert to our literal type for role
-        role = cast_message_role(section.role)
-
-        # Add the text message
-        messages.append(create_content_message(section.text, role))
-
-        # Add resource messages with the same role type as the section
-        for resource_path in section.resources:
-            try:
-                # Load resource with information about its type
-                resource_content, mime_type, is_binary = (
-                    resource_utils.load_resource_content(resource_path, prompt_files)
-                )
-
-                # Create and add the resource message
-                resource_message = create_resource_message(
-                    resource_path, resource_content, mime_type, is_binary, role
-                )
-                messages.append(resource_message)
-            except Exception as e:
-                logger.error(f"Error loading resource {resource_path}: {e}")
-
-    return messages
-
-
-def cast_message_role(role: str) -> MessageRole:
-    """Cast a string role to a MessageRole literal type"""
-    if role == "user" or role == "assistant":
-        return role  # type: ignore
-    # Default to user if the role is invalid
-    logger.warning(f"Invalid message role: {role}, defaulting to 'user'")
-    return "user"
+# Default delimiter values
+DEFAULT_USER_DELIMITER = "---USER"
+DEFAULT_ASSISTANT_DELIMITER = "---ASSISTANT"
+DEFAULT_RESOURCE_DELIMITER = "---RESOURCE"
 
 
 # Define a single type for prompt handlers to avoid mypy issues
 PromptHandler = Callable[..., Awaitable[List[Message]]]
 
 
-def create_prompt_handler(
-    template: "PromptTemplate", template_vars: List[str], prompt_files: List[Path]
-) -> PromptHandler:
+def create_prompt_handler(template: "PromptTemplate", template_vars: List[str], prompt_files: List[Path]) -> PromptHandler:
     """Create a prompt handler function for the given template"""
     if template_vars:
         # With template variables
@@ -159,23 +73,18 @@ def create_prompt_handler(
 
         async def prompt_handler(**kwargs: Any) -> List[Message]:
             # Build context from parameters
-            context = {
-                var: kwargs.get(var)
-                for var in template_vars
-                if var in kwargs and kwargs[var] is not None
-            }
+            context = {var: kwargs.get(var) for var in template_vars if var in kwargs and kwargs[var] is not None}
 
-            # Apply substitutions to the template
             content_sections = template.apply_substitutions(context)
 
             # Convert to MCP Message objects, handling resources properly
             return create_messages_with_resources(content_sections, prompt_files)
+
     else:
         # No template variables
         docstring = "Get a prompt with no variable substitution"
 
         async def prompt_handler(**kwargs: Any) -> List[Message]:
-            # Get the content sections
             content_sections = template.content_sections
 
             # Convert to MCP Message objects, handling resources properly
@@ -208,12 +117,6 @@ def create_resource_handler(resource_path: Path, mime_type: str) -> ResourceHand
     return get_resource
 
 
-# Default delimiter values
-DEFAULT_USER_DELIMITER = "---USER"
-DEFAULT_ASSISTANT_DELIMITER = "---ASSISTANT"
-DEFAULT_RESOURCE_DELIMITER = "---RESOURCE"
-
-
 def get_delimiter_config(file_path: Optional[Path] = None) -> Dict[str, Any]:
     """Get delimiter configuration, falling back to defaults if config is None"""
     # Set defaults
@@ -234,7 +137,7 @@ def get_delimiter_config(file_path: Optional[Path] = None) -> Dict[str, Any]:
     return config_values
 
 
-def register_prompt(file_path: Path):
+def register_prompt(file_path: Path) -> None:
     """Register a prompt file"""
     try:
         # Get delimiter configuration
@@ -268,9 +171,7 @@ def register_prompt(file_path: Path):
 
         # Create and register prompt handler
         template_vars = list(metadata.template_variables)
-        handler = create_prompt_handler(
-            template, template_vars, config_values["prompt_files"]
-        )
+        handler = create_prompt_handler(template, template_vars, config_values["prompt_files"])
         mcp.prompt(name=metadata.name, description=metadata.description)(handler)
 
         # Register any referenced resources in the prompt
@@ -295,9 +196,7 @@ def register_prompt(file_path: Path):
                             )
                         )
 
-                        logger.info(
-                            f"Registered resource: {resource_id} ({resource_file})"
-                        )
+                        logger.info(f"Registered resource: {resource_id} ({resource_file})")
     except Exception as e:
         logger.error(f"Error registering prompt {file_path}: {e}", exc_info=True)
 
@@ -305,9 +204,7 @@ def register_prompt(file_path: Path):
 def parse_args():
     """Parse command line arguments"""
     parser = argparse.ArgumentParser(description="FastMCP Prompt Server")
-    parser.add_argument(
-        "prompt_files", nargs="+", type=str, help="Prompt files to serve"
-    )
+    parser.add_argument("prompt_files", nargs="+", type=str, help="Prompt files to serve")
     parser.add_argument(
         "--user-delimiter",
         type=str,
@@ -345,14 +242,12 @@ def parse_args():
         default=8000,
         help="Port to use for SSE transport (default: 8000)",
     )
-    parser.add_argument(
-        "--test", type=str, help="Test a specific prompt without starting the server"
-    )
+    parser.add_argument("--test", type=str, help="Test a specific prompt without starting the server")
 
     return parser.parse_args()
 
 
-async def register_file_resource_handler():
+async def register_file_resource_handler() -> None:
     """Register the general file resource handler"""
 
     @mcp.resource("file://{path}")
@@ -478,9 +373,7 @@ async def async_main():
     logger.info("Starting prompt server")
     logger.info(f"Registered {len(prompt_registry)} prompts")
     logger.info(f"Registered {len(exposed_resources)} resources")
-    logger.info(
-        f"Using delimiters: {config.user_delimiter}, {config.assistant_delimiter}, {config.resource_delimiter}"
-    )
+    logger.info(f"Using delimiters: {config.user_delimiter}, {config.assistant_delimiter}, {config.resource_delimiter}")
 
     # If a test prompt was specified, print it and exit
     if args.test:

mcp_agent/mcp/prompts/prompt_template.py

@@ -7,11 +7,15 @@ Provides clean, testable classes for managing template substitution.
 
 import re
 from pathlib import Path
-from typing import Dict, List, Set, Any, Optional, Literal
+from typing import Any, Dict, List, Literal, Optional, Set
 
+from mcp.types import (
+    EmbeddedResource,
+    TextContent,
+    TextResourceContents,
+)
 from pydantic import BaseModel, field_validator
 
-from mcp.types import TextContent, EmbeddedResource, TextResourceContents
 from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
 from mcp_agent.mcp.prompt_serialization import (
     multipart_messages_to_delimited_format,
@@ -67,9 +71,7 @@ class PromptContent(BaseModel):
                 substituted = substituted.replace(make_placeholder(key), str(value))
             substituted_resources.append(substituted)
 
-        return PromptContent(
-            text=result, role=self.role, resources=substituted_resources
-        )
+        return PromptContent(text=result, role=self.role, resources=substituted_resources)
 
 
 class PromptTemplate:
@@ -82,7 +84,7 @@ class PromptTemplate:
         template_text: str,
         delimiter_map: Optional[Dict[str, str]] = None,
         template_file_path: Optional[Path] = None,
-    ):
+    ) -> None:
         """
         Initialize a prompt template.
 
@@ -127,9 +129,7 @@ class PromptTemplate:
         # Convert to delimited format
         delimited_content = multipart_messages_to_delimited_format(
             messages,
-            user_delimiter=next(
-                (k for k, v in delimiter_map.items() if v == "user"), "---USER"
-            ),
+            user_delimiter=next((k for k, v in delimiter_map.items() if v == "user"), "---USER"),
             assistant_delimiter=next(
                 (k for k, v in delimiter_map.items() if v == "assistant"),
                 "---ASSISTANT",
@@ -167,9 +167,7 @@ class PromptTemplate:
             result.append(section.apply_substitutions(context))
         return result
 
-    def apply_substitutions_to_multipart(
-        self, context: Dict[str, Any]
-    ) -> List[PromptMessageMultipart]:
+    def apply_substitutions_to_multipart(self, context: Dict[str, Any]) -> List[PromptMessageMultipart]:
         """
         Apply variable substitutions to the template and return PromptMessageMultipart objects.
 
@@ -201,9 +199,7 @@ class PromptTemplate:
                     )
                 )
 
-            multiparts.append(
-                PromptMessageMultipart(role=section.role, content=content_items)
-            )
+            multiparts.append(PromptMessageMultipart(role=section.role, content=content_items))
 
         return multiparts
 
@@ -241,9 +237,7 @@ class PromptTemplate:
                     )
                 )
 
-            multiparts.append(
-                PromptMessageMultipart(role=section.role, content=content_items)
-            )
+            multiparts.append(PromptMessageMultipart(role=section.role, content=content_items))
 
         return multiparts
 
@@ -260,9 +254,7 @@ class PromptTemplate:
         first_non_empty_line = next((line for line in lines if line.strip()), "")
         delimiter_values = set(self.delimiter_map.keys())
 
-        is_simple_mode = (
-            first_non_empty_line and first_non_empty_line not in delimiter_values
-        )
+        is_simple_mode = first_non_empty_line and first_non_empty_line not in delimiter_values
 
         if is_simple_mode:
             # Simple mode: treat the entire content as a single user message
@@ -330,7 +322,7 @@ class PromptTemplateLoader:
     Loads and processes prompt templates from files.
     """
 
-    def __init__(self, delimiter_map: Optional[Dict[str, str]] = None):
+    def __init__(self, delimiter_map: Optional[Dict[str, str]] = None) -> None:
         """
         Initialize the loader with optional custom delimiters.
 
@@ -358,9 +350,7 @@ class PromptTemplateLoader:
 
         return PromptTemplate(content, self.delimiter_map, template_file_path=file_path)
 
-    def load_from_multipart(
-        self, messages: List[PromptMessageMultipart]
-    ) -> PromptTemplate:
+    def load_from_multipart(self, messages: List[PromptMessageMultipart]) -> PromptTemplate:
         """
         Create a PromptTemplate from a list of PromptMessageMultipart objects.
 
@@ -372,9 +362,7 @@ class PromptTemplateLoader:
         """
         delimited_content = multipart_messages_to_delimited_format(
             messages,
-            user_delimiter=next(
-                (k for k, v in self.delimiter_map.items() if v == "user"), "---USER"
-            ),
+            user_delimiter=next((k for k, v in self.delimiter_map.items() if v == "user"), "---USER"),
             assistant_delimiter=next(
                 (k for k, v in self.delimiter_map.items() if v == "assistant"),
                 "---ASSISTANT",
@@ -401,18 +389,12 @@ class PromptTemplateLoader:
         first_non_empty_line = next((line for line in lines if line.strip()), "")
 
         # Check if we're in simple mode
-        is_simple_mode = (
-            first_non_empty_line and first_non_empty_line not in self.delimiter_map
-        )
+        is_simple_mode = first_non_empty_line and first_non_empty_line not in self.delimiter_map
 
         if is_simple_mode:
             # In simple mode, use first line as description if it seems like one
             first_line = lines[0].strip() if lines else ""
-            if (
-                len(first_line) < 60
-                and "{{" not in first_line
-                and "}}" not in first_line
-            ):
+            if len(first_line) < 60 and "{{" not in first_line and "}}" not in first_line:
                 description = first_line
             else:
                 description = f"Simple prompt: {file_path.stem}"
@@ -434,9 +416,7 @@ class PromptTemplateLoader:
             if first_role and first_content_index and first_content_index < len(lines):
                 # Get up to 3 non-empty lines after the delimiter for a preview
                 preview_lines = []
-                for j in range(
-                    first_content_index, min(first_content_index + 10, len(lines))
-                ):
+                for j in range(first_content_index, min(first_content_index + 10, len(lines))):
                     stripped = lines[j].strip()
                     if stripped and stripped not in self.delimiter_map:
                         preview_lines.append(stripped)
@@ -452,9 +432,7 @@ class PromptTemplateLoader:
 
         # Extract resource paths from all sections that come after RESOURCE delimiters
         resource_paths = []
-        resource_delimiter = next(
-            (k for k, v in self.delimiter_map.items() if v == "resource"), "---RESOURCE"
-        )
+        resource_delimiter = next((k for k, v in self.delimiter_map.items() if v == "resource"), "---RESOURCE")
         for i, line in enumerate(lines):
             if line.strip() == resource_delimiter:
                 if i + 1 < len(lines) and lines[i + 1].strip():