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

mcp_agent/mcp/prompts/prompt_template.py

@@ -7,15 +7,25 @@ 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,
 )
+from mcp_agent.mcp.prompts.prompt_constants import (
+    ASSISTANT_DELIMITER,
+    DEFAULT_DELIMITER_MAP,
+    RESOURCE_DELIMITER,
+    USER_DELIMITER,
+)
 
 
 class PromptMetadata(BaseModel):
@@ -67,9 +77,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 +90,7 @@ class PromptTemplate:
         template_text: str,
         delimiter_map: Optional[Dict[str, str]] = None,
         template_file_path: Optional[Path] = None,
-    ):
+    ) -> None:
         """
         Initialize a prompt template.
 
@@ -93,11 +101,7 @@ class PromptTemplate:
         """
         self.template_text = template_text
         self.template_file_path = template_file_path
-        self.delimiter_map = delimiter_map or {
-            "---USER": "user",
-            "---ASSISTANT": "assistant",
-            "---RESOURCE": "resource",
-        }
+        self.delimiter_map = delimiter_map or DEFAULT_DELIMITER_MAP
         self._template_variables = self._extract_template_variables(template_text)
         self._parsed_content = self._parse_template()
 
@@ -118,21 +122,17 @@ class PromptTemplate:
             A new PromptTemplate object
         """
         # Use default delimiter map if none provided
-        delimiter_map = delimiter_map or {
-            "---USER": "user",
-            "---ASSISTANT": "assistant",
-            "---RESOURCE": "resource",
-        }
+        delimiter_map = delimiter_map or DEFAULT_DELIMITER_MAP
 
         # 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"
+                (k for k, v in delimiter_map.items() if v == "user"), USER_DELIMITER
             ),
             assistant_delimiter=next(
                 (k for k, v in delimiter_map.items() if v == "assistant"),
-                "---ASSISTANT",
+                ASSISTANT_DELIMITER,
             ),
         )
 
@@ -162,10 +162,8 @@ class PromptTemplate:
         Returns:
             List of PromptContent with substitutions applied
         """
-        result = []
-        for section in self._parsed_content:
-            result.append(section.apply_substitutions(context))
-        return result
+        # Create a new list with substitutions applied to each section
+        return [section.apply_substitutions(context) for section in self._parsed_content]
 
     def apply_substitutions_to_multipart(
         self, context: Dict[str, Any]
@@ -179,9 +177,11 @@ class PromptTemplate:
         Returns:
             List of PromptMessageMultipart objects with substitutions applied
         """
+        # First create a substituted template
         content_sections = self.apply_substitutions(context)
-        multiparts = []
 
+        # Convert content sections to multipart messages
+        multiparts = []
         for section in content_sections:
             # Handle text content
             content_items = [TextContent(type="text", text=section.text)]
@@ -201,9 +201,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 +239,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 +256,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,18 +324,14 @@ 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.
 
         Args:
             delimiter_map: Optional map of delimiters to roles
         """
-        self.delimiter_map = delimiter_map or {
-            "---USER": "user",
-            "---ASSISTANT": "assistant",
-            "---RESOURCE": "resource",
-        }
+        self.delimiter_map = delimiter_map or DEFAULT_DELIMITER_MAP
 
     def load_from_file(self, file_path: Path) -> PromptTemplate:
         """
@@ -358,9 +348,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.
 
@@ -370,19 +358,8 @@ class PromptTemplateLoader:
         Returns:
             A PromptTemplate object
         """
-        delimited_content = multipart_messages_to_delimited_format(
-            messages,
-            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",
-            ),
-        )
-
-        content = "\n".join(delimited_content)
-        return PromptTemplate(content, self.delimiter_map)
+        # Use the class method directly to avoid code duplication
+        return PromptTemplate.from_multipart_messages(messages, self.delimiter_map)
 
     def get_metadata(self, file_path: Path) -> PromptMetadata:
         """
@@ -401,18 +378,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 +405,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)
@@ -453,7 +422,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"
+            (k for k, v in self.delimiter_map.items() if v == "resource"), RESOURCE_DELIMITER
         )
         for i, line in enumerate(lines):
             if line.strip() == resource_delimiter:

mcp_agent/mcp/resource_utils.py

@@ -1,13 +1,15 @@
 import base64
 from pathlib import Path
 from typing import List, Optional, Tuple
+
 from mcp.types import (
-    EmbeddedResource,
-    TextResourceContents,
     BlobResourceContents,
+    EmbeddedResource,
     ImageContent,
+    TextResourceContents,
 )
 from pydantic import AnyUrl
+
 import mcp_agent.mcp.mime_utils as mime_utils
 
 HTTP_TIMEOUT = 10  # Default timeout for HTTP requests
@@ -25,9 +27,7 @@ def find_resource_file(resource_path: str, prompt_files: List[Path]) -> Optional
     return None
 
 
-def load_resource_content(
-    resource_path: str, prompt_files: List[Path]
-) -> ResourceContent:
+def load_resource_content(resource_path: str, prompt_files: List[Path]) -> ResourceContent:
     """
     Load a resource's content and determine its mime type
 
@@ -71,9 +71,6 @@ def create_resource_uri(path: str) -> str:
     return f"resource://fast-agent/{Path(path).name}"
 
 
-# Add this to your resource_utils.py module
-
-
 def create_resource_reference(uri: str, mime_type: str) -> "EmbeddedResource":
     """
     Create a reference to a resource without embedding its content directly.
@@ -141,9 +138,7 @@ def create_image_content(data: str, mime_type: str) -> ImageContent:
     )
 
 
-def create_blob_resource(
-    resource_path: str, content: str, mime_type: str
-) -> EmbeddedResource:
+def create_blob_resource(resource_path: str, content: str, mime_type: str) -> EmbeddedResource:
     """Create an embedded resource for binary data"""
     return EmbeddedResource(
         type="resource",
@@ -155,9 +150,7 @@ def create_blob_resource(
     )
 
 
-def create_text_resource(
-    resource_path: str, content: str, mime_type: str
-) -> EmbeddedResource:
+def create_text_resource(resource_path: str, content: str, mime_type: str) -> EmbeddedResource:
     """Create an embedded resource for text data"""
     return EmbeddedResource(
         type="resource",

mcp_agent/mcp/sampling.py

@@ -2,17 +2,18 @@
 This simplified implementation directly converts between MCP types and PromptMessageMultipart.
 """
 
+from typing import TYPE_CHECKING
+
 from mcp import ClientSession
-from mcp.types import (
-    CreateMessageRequestParams,
-    CreateMessageResult,
-)
+from mcp.types import CreateMessageRequestParams, CreateMessageResult, TextContent
 
 from mcp_agent.core.agent_types import AgentConfig
+from mcp_agent.llm.sampling_converter import SamplingConverter
 from mcp_agent.logging.logger import get_logger
 from mcp_agent.mcp.interfaces import AugmentedLLMProtocol
 
-from mcp_agent.workflows.llm.sampling_converter import SamplingConverter
+if TYPE_CHECKING:
+    from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
 
 logger = get_logger(__name__)
 
@@ -31,8 +32,8 @@ def create_sampling_llm(
     Returns:
         An initialized LLM instance ready to use
     """
-    from mcp_agent.workflows.llm.model_factory import ModelFactory
     from mcp_agent.agents.agent import Agent
+    from mcp_agent.llm.model_factory import ModelFactory
 
     app_context = None
     try:
@@ -58,9 +59,7 @@ def create_sampling_llm(
     return llm
 
 
-async def sample(
-    mcp_ctx: ClientSession, params: CreateMessageRequestParams
-) -> CreateMessageResult:
+async def sample(mcp_ctx: ClientSession, params: CreateMessageRequestParams) -> CreateMessageResult:
     """
     Handle sampling requests from the MCP protocol using SamplingConverter.
 
@@ -105,13 +104,14 @@ async def sample(
         # Extract request parameters using our converter
         request_params = SamplingConverter.extract_request_params(params)
 
-        # Use the new public apply_prompt method which is cleaner than calling the protected method
-        llm_response = await llm.apply_prompt(conversation, request_params)
-        logger.info(f"Complete sampling request : {llm_response[:50]}...")
+        llm_response: PromptMessageMultipart = await llm.generate(conversation, request_params)
+        logger.info(f"Complete sampling request : {llm_response.first_text()[:50]}...")
 
-        # Create result using our converter
-        return SamplingConverter.create_message_result(
-            response=llm_response, model=model
+        return CreateMessageResult(
+            role=llm_response.role,
+            content=TextContent(type="text", text=llm_response.first_text()),
+            model=model,
+            stopReason="endTurn",
         )
     except Exception as e:
         logger.error(f"Error in sampling: {str(e)}")
@@ -121,7 +121,7 @@ async def sample(
 
 
 def sampling_agent_config(
-    params: CreateMessageRequestParams = None,
+    params: CreateMessageRequestParams | None = None,
 ) -> AgentConfig:
     """
     Build a sampling AgentConfig based on request parameters.
@@ -134,7 +134,7 @@ def sampling_agent_config(
     """
     # Use systemPrompt from params if available, otherwise use default
     instruction = "You are a helpful AI Agent."
-    if params and hasattr(params, "systemPrompt") and params.systemPrompt is not None:
+    if params and params.systemPrompt is not None:
         instruction = params.systemPrompt
 
     return AgentConfig(name="sampling_agent", instruction=instruction, servers=[])

mcp_agent/mcp_server/agent_server.py

@@ -1,10 +1,10 @@
 # src/mcp_agent/mcp_server/agent_server.py
 
+from mcp.server.fastmcp import Context as MCPContext
 from mcp.server.fastmcp import FastMCP
 
-# Remove circular import
-from mcp_agent.core.agent_app import AgentApp
-from mcp.server.fastmcp import Context as MCPContext
+# Import the DirectAgentApp instead of AgentApp
+from mcp_agent.core.direct_agent_app import DirectAgentApp
 
 
 class AgentMCPServer:
@@ -12,24 +12,24 @@ class AgentMCPServer:
 
     def __init__(
         self,
-        agent_app: AgentApp,
+        agent_app: DirectAgentApp,
         server_name: str = "FastAgent-MCP-Server",
         server_description: str = None,
-    ):
+    ) -> None:
         self.agent_app = agent_app
         self.mcp_server = FastMCP(
             name=server_name,
             instructions=server_description
-            or f"This server provides access to {len(agent_app.agents)} agents",
+            or f"This server provides access to {len(agent_app._agents)} agents",
         )
         self.setup_tools()
 
-    def setup_tools(self):
+    def setup_tools(self) -> None:
         """Register all agents as MCP tools."""
         for agent_name, agent_proxy in self.agent_app._agents.items():
             self.register_agent_tools(agent_name, agent_proxy)
 
-    def register_agent_tools(self, agent_name: str, agent_proxy):
+    def register_agent_tools(self, agent_name: str, agent_proxy) -> None:
         """Register tools for a specific agent."""
 
         # Basic send message tool
@@ -42,9 +42,7 @@ class AgentMCPServer:
 
             # Get the agent's context
             agent_context = None
-            if hasattr(agent_proxy, "_agent") and hasattr(
-                agent_proxy._agent, "context"
-            ):
+            if hasattr(agent_proxy, "_agent") and hasattr(agent_proxy._agent, "context"):
                 agent_context = agent_proxy._agent.context
 
             # Define the function to execute
@@ -57,7 +55,7 @@ class AgentMCPServer:
             else:
                 return await execute_send()
 
-    def run(self, transport: str = "sse", host: str = "0.0.0.0", port: int = 8000):
+    def run(self, transport: str = "sse", host: str = "0.0.0.0", port: int = 8000) -> None:
         """Run the MCP server."""
         if transport == "sse":
             # For running as a web server
@@ -68,7 +66,7 @@ class AgentMCPServer:
 
     async def run_async(
         self, transport: str = "sse", host: str = "0.0.0.0", port: int = 8000
-    ):
+    ) -> None:
         """Run the MCP server asynchronously."""
         if transport == "sse":
             self.mcp_server.settings.host = host
@@ -77,9 +75,7 @@ class AgentMCPServer:
         else:  # stdio
             await self.mcp_server.run_stdio_async()
 
-    async def with_bridged_context(
-        self, agent_context, mcp_context, func, *args, **kwargs
-    ):
+    async def with_bridged_context(self, agent_context, mcp_context, func, *args, **kwargs):
         """
         Execute a function with bridged context between MCP and agent
 
@@ -98,7 +94,7 @@ class AgentMCPServer:
         agent_context.mcp_context = mcp_context
 
         # Create bridged progress reporter
-        async def bridged_progress(progress, total=None):
+        async def bridged_progress(progress, total=None) -> None:
             if mcp_context:
                 await mcp_context.report_progress(progress, total)
             if original_progress_reporter:

mcp_agent/mcp_server_registry.py

@@ -9,24 +9,24 @@ server initialization.
 
 from contextlib import asynccontextmanager
 from datetime import timedelta
-from typing import Callable, Dict, AsyncGenerator
+from typing import AsyncGenerator, Callable, Dict
 
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
-from mcp import ClientSession
+from mcp import ClientSession, stdio_client
+from mcp.client.sse import sse_client
 from mcp.client.stdio import (
     StdioServerParameters,
     get_default_environment,
 )
-from mcp_agent.mcp.stdio import stdio_client_with_rich_stderr
-from mcp.client.sse import sse_client
 
 from mcp_agent.config import (
-    get_settings,
     MCPServerAuthSettings,
     MCPServerSettings,
     Settings,
+    get_settings,
 )
 from mcp_agent.logging.logger import get_logger
+from mcp_agent.mcp.logger_textio import get_stderr_handler
 from mcp_agent.mcp.mcp_connection_manager import MCPConnectionManager
 
 logger = get_logger(__name__)
@@ -58,7 +58,7 @@ class ServerRegistry:
         init_hooks (Dict[str, InitHookCallable]): Registered initialization hooks.
     """
 
-    def __init__(self, config: Settings | None = None, config_path: str | None = None):
+    def __init__(self, config: Settings | None = None, config_path: str | None = None) -> None:
         """
         Initialize the ServerRegistry with a configuration file.
 
@@ -67,9 +67,7 @@ class ServerRegistry:
             config_path (str): Path to the YAML configuration file.
         """
         self.registry = (
-            self.load_registry_from_file(config_path)
-            if config is None
-            else config.mcp.servers
+            self.load_registry_from_file(config_path) if config is None else config.mcp.servers
         )
         self.init_hooks: Dict[str, InitHookCallable] = {}
         self.connection_manager = MCPConnectionManager(self)
@@ -117,9 +115,7 @@ class ServerRegistry:
         config = self.registry[server_name]
 
         read_timeout_seconds = (
-            timedelta(config.read_timeout_seconds)
-            if config.read_timeout_seconds
-            else None
+            timedelta(config.read_timeout_seconds) if config.read_timeout_seconds else None
         )
 
         if config.transport == "stdio":
@@ -134,7 +130,8 @@ class ServerRegistry:
                 env={**get_default_environment(), **(config.env or {})},
             )
 
-            async with stdio_client_with_rich_stderr(server_params) as (
+            # Create a stderr handler that logs to our application logger
+            async with stdio_client(server_params, errlog=get_stderr_handler(server_name)) as (
                 read_stream,
                 write_stream,
             ):
@@ -144,9 +141,7 @@ class ServerRegistry:
                     read_timeout_seconds,
                 )
                 async with session:
-                    logger.info(
-                        f"{server_name}: Connected to server using stdio transport."
-                    )
+                    logger.info(f"{server_name}: Connected to server using stdio transport.")
                     try:
                         yield session
                     finally:
@@ -164,9 +159,7 @@ class ServerRegistry:
                     read_timeout_seconds,
                 )
                 async with session:
-                    logger.info(
-                        f"{server_name}: Connected to server using SSE transport."
-                    )
+                    logger.info(f"{server_name}: Connected to server using SSE transport.")
                     try:
                         yield session
                     finally:
@@ -215,9 +208,7 @@ class ServerRegistry:
                 logger.info(f"{server_name}: Initialized.")
 
                 intialization_callback = (
-                    init_hook
-                    if init_hook is not None
-                    else self.init_hooks.get(server_name)
+                    init_hook if init_hook is not None else self.init_hooks.get(server_name)
                 )
 
                 if intialization_callback:

mcp_agent/resources/examples/{workflows → in_dev}/agent_build.py

@@ -3,8 +3,9 @@ This demonstrates creating multiple agents and an orchestrator to coordinate the
 """
 
 import asyncio
+
 from mcp_agent.core.fastagent import FastAgent
-from mcp_agent.workflows.llm.augmented_llm import RequestParams
+from mcp_agent.llm.augmented_llm import RequestParams
 
 # Create the application
 fast = FastAgent("Agent Builder")
@@ -62,7 +63,7 @@ if needed. Remind the Human of this.
     request_params=RequestParams(maxTokens=8192),
     max_iterations=5,
 )
-async def main():
+async def main() -> None:
     async with fast.run() as agent:
         CODER_WARMUP = """
 - Read this paper: https://www.anthropic.com/research/building-effective-agents" to understand how