fast-agent-mcp 0.1.11__tar.gz → 0.1.13__tar.gz

{fast_agent_mcp-0.1.11 → fast_agent_mcp-0.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.1.11
+Version: 0.1.13
 Summary: Define, Prompt and Test MCP enabled Agents and Workflows
 Author-email: Shaun Smith <fastagent@llmindset.co.uk>, Sarmad Qadri <sarmad@lastmileai.dev>
 License:                                  Apache License

{fast_agent_mcp-0.1.11 → fast_agent_mcp-0.1.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fast-agent-mcp"
-version = "0.1.11"
+version = "0.1.13"
 description = "Define, Prompt and Test MCP enabled Agents and Workflows"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -112,3 +112,19 @@ mcp_agent = [
     "resources/examples/**/mount-point/*.csv"
 ]
 
+[tool.ruff]
+line-length = 160
+target-version = "py310"
+
+[tool.ruff.lint]
+select = [
+    "E",   # pycodestyle errors
+    "F",   # pyflakes
+    "I",   # isort
+    "TCH"  # type checking
+]
+ignore=["E501"]
+
+# More lenient settings for existing code
+[tool.ruff.lint.per-file-ignores]
+"tests/*" = ["ANN"]  # Don't require type annotations in tests

{fast_agent_mcp-0.1.11 → fast_agent_mcp-0.1.13}/src/mcp_agent/agents/agent.py

@@ -1,30 +1,30 @@
 import asyncio
 import uuid
-from dataclasses import dataclass
-from typing import Callable, Dict, List, Optional, TypeVar, Union, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, TypeVar, Union
 
 from mcp.server.fastmcp.tools import Tool as FastTool
 from mcp.types import (
     CallToolResult,
+    EmbeddedResource,
     ListToolsResult,
+    ReadResourceResult,
     TextContent,
     Tool,
-    EmbeddedResource,
-    ReadResourceResult,
 )
-from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
 
+from mcp_agent.core.agent_types import AgentConfig
 from mcp_agent.core.exceptions import PromptExitError
-from mcp_agent.mcp.mcp_aggregator import MCPAggregator
-from mcp_agent.workflows.llm.augmented_llm import RequestParams
+from mcp_agent.core.request_params import RequestParams
 from mcp_agent.human_input.types import (
+    HUMAN_INPUT_SIGNAL_NAME,
     HumanInputCallback,
     HumanInputRequest,
     HumanInputResponse,
-    HUMAN_INPUT_SIGNAL_NAME,
 )
-from mcp_agent.workflows.llm.augmented_llm import AugmentedLLM
 from mcp_agent.logging.logger import get_logger
+from mcp_agent.mcp.mcp_aggregator import MCPAggregator
+from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
+from mcp_agent.workflows.llm.augmented_llm import AugmentedLLMProtocol
 
 if TYPE_CHECKING:
     from mcp_agent.context import Context
@@ -33,33 +33,11 @@ import traceback
 logger = get_logger(__name__)
 
 # Define a TypeVar for AugmentedLLM and its subclasses
-LLM = TypeVar("LLM", bound=AugmentedLLM)
+LLM = TypeVar("LLM", bound=AugmentedLLMProtocol)
 
 HUMAN_INPUT_TOOL_NAME = "__human_input__"
 
 
-@dataclass
-class AgentConfig:
-    """Configuration for an Agent instance"""
-
-    name: str
-    instruction: Union[str, Callable[[Dict], str]]
-    servers: List[str]
-    model: Optional[str] = None
-    use_history: bool = True
-    default_request_params: Optional[RequestParams] = None
-    human_input: bool = False
-
-    def __post_init__(self):
-        """Ensure default_request_params exists with proper history setting"""
-
-        if self.default_request_params is None:
-            self.default_request_params = RequestParams(use_history=self.use_history)
-        else:
-            # Override the request params history setting if explicitly configured
-            self.default_request_params.use_history = self.use_history
-
-
 class Agent(MCPAggregator):
     """
     An Agent is an entity that has access to a set of MCP servers and can interact with them.
@@ -68,17 +46,15 @@ class Agent(MCPAggregator):
 
     def __init__(
         self,
-        config: Union[
-            AgentConfig, str
-        ],  # Can be AgentConfig or backward compatible str name
+        config: Union[AgentConfig, str],  # Can be AgentConfig or backward compatible str name
         instruction: Optional[Union[str, Callable[[Dict], str]]] = None,
         server_names: Optional[List[str]] = None,
         functions: Optional[List[Callable]] = None,
         connection_persistence: bool = True,
         human_input_callback: Optional[HumanInputCallback] = None,
         context: Optional["Context"] = None,
-        **kwargs,
-    ):
+        **kwargs: dict[str, Any],
+    ) -> None:
         # Handle backward compatibility where first arg was name
         if isinstance(config, str):
             self.config = AgentConfig(
@@ -117,14 +93,12 @@ class Agent(MCPAggregator):
                 if self.context.human_input_handler:
                     self.human_input_callback = self.context.human_input_handler
 
-    async def initialize(self):
+    async def initialize(self) -> None:
         """
         Initialize the agent and connect to the MCP servers.
         NOTE: This method is called automatically when the agent is used as an async context manager.
         """
-        await (
-            self.__aenter__()
-        )  # This initializes the connection manager and loads the servers
+        await self.__aenter__()  # This initializes the connection manager and loads the servers
 
         for function in self.functions:
             tool: FastTool = FastTool.from_function(function)
@@ -142,11 +116,9 @@ class Agent(MCPAggregator):
         Returns:
             An instance of AugmentedLLM or one of its subclasses.
         """
-        return llm_factory(
-            agent=self, default_request_params=self._default_request_params
-        )
+        return llm_factory(agent=self, default_request_params=self._default_request_params)
 
-    async def shutdown(self):
+    async def shutdown(self) -> None:
         """
         Shutdown the agent and close all MCP server connections.
         NOTE: This method is called automatically when the agent is used as an async context manager.
@@ -176,8 +148,9 @@ class Agent(MCPAggregator):
         request.metadata = {"agent_name": self.name}
         self.logger.debug("Requesting human input:", data=request)
 
-        async def call_callback_and_signal():
+        async def call_callback_and_signal() -> None:
             try:
+                assert self.human_input_callback is not None
                 user_input = await self.human_input_callback(request)
 
                 self.logger.debug("Received human input:", data=user_input)
@@ -190,9 +163,7 @@ class Agent(MCPAggregator):
                     payload={"exit_requested": True, "error": str(e)},
                 )
             except Exception as e:
-                await self.executor.signal(
-                    request_id, payload=f"Error getting human input: {str(e)}"
-                )
+                await self.executor.signal(request_id, payload=f"Error getting human input: {str(e)}")
 
         asyncio.create_task(call_callback_and_signal())
 
@@ -209,9 +180,7 @@ class Agent(MCPAggregator):
         )
 
         if isinstance(result, dict) and result.get("exit_requested", False):
-            raise PromptExitError(
-                result.get("error", "User requested to exit FastAgent session")
-            )
+            raise PromptExitError(result.get("error", "User requested to exit FastAgent session"))
         self.logger.debug("Received human input signal", data=result)
         return result
 
@@ -249,9 +218,7 @@ class Agent(MCPAggregator):
         return result
 
     # todo would prefer to use tool_name to disambiguate agent name
-    async def call_tool(
-        self, name: str, arguments: dict | None = None
-    ) -> CallToolResult:
+    async def call_tool(self, name: str, arguments: dict | None = None) -> CallToolResult:
         if name == HUMAN_INPUT_TOOL_NAME:
             # Call the human input tool
             return await self._call_human_input_tool(arguments)
@@ -263,9 +230,7 @@ class Agent(MCPAggregator):
         else:
             return await super().call_tool(name, arguments)
 
-    async def _call_human_input_tool(
-        self, arguments: dict | None = None
-    ) -> CallToolResult:
+    async def _call_human_input_tool(self, arguments: dict | None = None) -> CallToolResult:
         # Handle human input request
         try:
             # Make sure arguments is not None
@@ -287,17 +252,9 @@ class Agent(MCPAggregator):
             result = await self.request_human_input(request=request)
 
             # Use response attribute if available, otherwise use the result directly
-            response_text = (
-                result.response
-                if isinstance(result, HumanInputResponse)
-                else str(result)
-            )
+            response_text = result.response if isinstance(result, HumanInputResponse) else str(result)
 
-            return CallToolResult(
-                content=[
-                    TextContent(type="text", text=f"Human response: {response_text}")
-                ]
-            )
+            return CallToolResult(content=[TextContent(type="text", text=f"Human response: {response_text}")])
 
         except PromptExitError:
             raise
@@ -316,21 +273,10 @@ class Agent(MCPAggregator):
 
             return CallToolResult(
                 isError=True,
-                content=[
-                    TextContent(
-                        type="text", text=f"Error requesting human input: {str(e)}"
-                    )
-                ],
+                content=[TextContent(type="text", text=f"Error requesting human input: {str(e)}")],
             )
 
-    async def read_resource(
-        self, server_name: str, resource_name: str
-    ) -> ReadResourceResult:
-        return None
-
-    async def apply_prompt(
-        self, prompt_name: str, arguments: dict[str, str] = None
-    ) -> str:
+    async def apply_prompt(self, prompt_name: str, arguments: dict[str, str] | None) -> str:
         """
         Apply an MCP Server Prompt by name and return the assistant's response.
         Will search all available servers for the prompt if not namespaced.
@@ -354,9 +300,7 @@ class Agent(MCPAggregator):
         prompt_result = await self.get_prompt(prompt_name, arguments)
 
         if not prompt_result or not prompt_result.messages:
-            error_msg = (
-                f"Prompt '{prompt_name}' could not be found or contains no messages"
-            )
+            error_msg = f"Prompt '{prompt_name}' could not be found or contains no messages"
             self.logger.warning(error_msg)
             return error_msg
 
@@ -395,16 +339,10 @@ class Agent(MCPAggregator):
             resource_result = await server.get_resource(resource_name)
             return resource_result
         except Exception as e:
-            self.logger.error(
-                f"Error retrieving resource '{resource_name}' from server '{server_name}': {str(e)}"
-            )
-            raise ValueError(
-                f"Failed to retrieve resource '{resource_name}' from server '{server_name}': {str(e)}"
-            )
+            self.logger.error(f"Error retrieving resource '{resource_name}' from server '{server_name}': {str(e)}")
+            raise ValueError(f"Failed to retrieve resource '{resource_name}' from server '{server_name}': {str(e)}")
 
-    async def get_embedded_resources(
-        self, server_name: str, resource_name: str
-    ) -> List[EmbeddedResource]:
+    async def get_embedded_resources(self, server_name: str, resource_name: str) -> List[EmbeddedResource]:
         """
         Get a resource from an MCP server and return it as a list of embedded resources ready for use in prompts.
 
@@ -419,20 +357,19 @@ class Agent(MCPAggregator):
             ValueError: If the server doesn't exist or the resource couldn't be found
         """
         # Get the raw resource result
-        result: ReadResourceResult = await super().get_resource(
-            server_name, resource_name
-        )
+        result: ReadResourceResult = await super().get_resource(server_name, resource_name)
 
         # Convert each resource content to an EmbeddedResource
         embedded_resources: List[EmbeddedResource] = []
         for resource_content in result.contents:
-            embedded_resource = EmbeddedResource(
-                type="resource", resource=resource_content, annotations=None
-            )
+            embedded_resource = EmbeddedResource(type="resource", resource=resource_content, annotations=None)
             embedded_resources.append(embedded_resource)
 
         return embedded_resources
 
+    async def apply_prompt_messages(self, prompts: List[PromptMessageMultipart], request_params: RequestParams | None) -> str:
+        return self._llm.apply_prompt_messages(prompts, request_params)
+
     async def with_resource(
         self,
         prompt_content: Union[str, PromptMessageMultipart],
@@ -451,9 +388,7 @@ class Agent(MCPAggregator):
             The agent's response as a string
         """
         # Get the embedded resources
-        embedded_resources: List[EmbeddedResource] = await self.get_embedded_resources(
-            server_name, resource_name
-        )
+        embedded_resources: List[EmbeddedResource] = await self.get_embedded_resources(server_name, resource_name)
 
         # Create or update the prompt message
         prompt: PromptMessageMultipart

{fast_agent_mcp-0.1.11 → fast_agent_mcp-0.1.13}/src/mcp_agent/app.py

@@ -1,17 +1,18 @@
-from typing import Any, Dict, Optional, Type, TypeVar, Callable
-from datetime import timedelta
 import asyncio
 from contextlib import asynccontextmanager
+from datetime import timedelta
+from typing import TYPE_CHECKING, Any, Callable, Dict, Optional, Type, TypeVar
 
-from mcp import ServerSession
-from mcp_agent.context import Context, initialize_context, cleanup_context
 from mcp_agent.config import Settings
+from mcp_agent.context import Context, cleanup_context, initialize_context
 from mcp_agent.event_progress import ProgressAction
-from mcp_agent.logging.logger import get_logger
 from mcp_agent.executor.workflow_signal import SignalWaitCallback
-from mcp_agent.human_input.types import HumanInputCallback
 from mcp_agent.human_input.handler import console_input_callback
-from mcp_agent.workflows.llm.llm_selector import ModelSelector
+from mcp_agent.human_input.types import HumanInputCallback
+from mcp_agent.logging.logger import get_logger
+
+if TYPE_CHECKING:
+    from mcp import ServerSession
 
 R = TypeVar("R")
 
@@ -44,8 +45,7 @@ class MCPApp:
         human_input_callback: Optional[HumanInputCallback] = console_input_callback,
         signal_notification: Optional[SignalWaitCallback] = None,
         upstream_session: Optional["ServerSession"] = None,
-        model_selector: ModelSelector = None,
-    ):
+    ) -> None:
         """
         Initialize the application with a name and optional settings.
         Args:
@@ -55,7 +55,6 @@ class MCPApp:
             human_input_callback: Callback for handling human input
             signal_notification: Callback for getting notified on workflow signals/events.
             upstream_session: Optional upstream session if the MCPApp is running as a server to an MCP client.
-            initialize_model_selector: Initializes the built-in ModelSelector to help with model selection. Defaults to False.
         """
         self.name = name
 
@@ -64,7 +63,6 @@ class MCPApp:
         self._human_input_callback = human_input_callback
         self._signal_notification = signal_notification
         self._upstream_session = upstream_session
-        self._model_selector = model_selector
 
         self._workflows: Dict[str, Type] = {}  # id to workflow class
         self._logger = None
@@ -74,9 +72,7 @@ class MCPApp:
     @property
     def context(self) -> Context:
         if self._context is None:
-            raise RuntimeError(
-                "MCPApp not initialized, please call initialize() first, or use async with app.run()."
-            )
+            raise RuntimeError("MCPApp not initialized, please call initialize() first, or use async with app.run().")
         return self._context
 
     @property
@@ -100,7 +96,7 @@ class MCPApp:
         return self._context.upstream_session
 
     @upstream_session.setter
-    def upstream_session(self, value):
+    def upstream_session(self, value) -> None:
         self._context.upstream_session = value
 
     @property
@@ -117,7 +113,7 @@ class MCPApp:
             self._logger = get_logger(f"mcp_agent.{self.name}")
         return self._logger
 
-    async def initialize(self):
+    async def initialize(self) -> None:
         """Initialize the application."""
         if self._initialized:
             return
@@ -128,7 +124,6 @@ class MCPApp:
         self._context.human_input_handler = self._human_input_callback
         self._context.signal_notification = self._signal_notification
         self._context.upstream_session = self._upstream_session
-        self._context.model_selector = self._model_selector
 
         self._initialized = True
         self.logger.info(
@@ -140,7 +135,7 @@ class MCPApp:
             },
         )
 
-    async def cleanup(self):
+    async def cleanup(self) -> None:
         """Cleanup application resources."""
         if not self._initialized:
             return
@@ -178,9 +173,7 @@ class MCPApp:
         finally:
             await self.cleanup()
 
-    def workflow(
-        self, cls: Type, *args, workflow_id: str | None = None, **kwargs
-    ) -> Type:
+    def workflow(self, cls: Type, *args, workflow_id: str | None = None, **kwargs) -> Type:
         """
         Decorator for a workflow class. By default it's a no-op,
         but different executors can use this to customize behavior
@@ -192,9 +185,7 @@ class MCPApp:
         """
         decorator_registry = self.context.decorator_registry
         execution_engine = self.engine
-        workflow_defn_decorator = decorator_registry.get_workflow_defn_decorator(
-            execution_engine
-        )
+        workflow_defn_decorator = decorator_registry.get_workflow_defn_decorator(execution_engine)
 
         if workflow_defn_decorator:
             return workflow_defn_decorator(cls, *args, **kwargs)
@@ -216,9 +207,7 @@ class MCPApp:
 
         decorator_registry = self.context.decorator_registry
         execution_engine = self.engine
-        workflow_run_decorator = decorator_registry.get_workflow_run_decorator(
-            execution_engine
-        )
+        workflow_run_decorator = decorator_registry.get_workflow_run_decorator(execution_engine)
 
         if workflow_run_decorator:
             return workflow_run_decorator(fn)

{fast_agent_mcp-0.1.11 → fast_agent_mcp-0.1.13}/src/mcp_agent/cli/commands/bootstrap.py

@@ -2,10 +2,11 @@
 
 import shutil
 from pathlib import Path
+
 import typer
 from rich.console import Console
-from rich.table import Table
 from rich.panel import Panel
+from rich.table import Table
 
 app = typer.Typer(
     help="Create example applications",
@@ -49,9 +50,7 @@ EXAMPLE_TYPES = {
 }
 
 
-def copy_example_files(
-    example_type: str, target_dir: Path, force: bool = False
-) -> list[str]:
+def copy_example_files(example_type: str, target_dir: Path, force: bool = False) -> list[str]:
     """Copy example files from resources to target directory."""
     created = []
 
@@ -72,12 +71,7 @@ def copy_example_files(
             console.print(f"Created mount-point directory: {mount_point_dir}")
 
     # Use the resources directory from the package
-    source_dir = (
-        Path(__file__).parent.parent.parent
-        / "resources"
-        / "examples"
-        / ("workflows" if example_type == "workflow" else f"{example_type}")
-    )
+    source_dir = Path(__file__).parent.parent.parent / "resources" / "examples" / ("workflows" if example_type == "workflow" else f"{example_type}")
 
     if not source_dir.exists():
         console.print(f"[red]Error: Source directory not found: {source_dir}[/red]")
@@ -116,9 +110,7 @@ def copy_example_files(
                     continue
 
                 if target.exists() and not force:
-                    console.print(
-                        f"[yellow]Skipping[/yellow] mount-point/{filename} (already exists)"
-                    )
+                    console.print(f"[yellow]Skipping[/yellow] mount-point/{filename} (already exists)")
                     continue
 
                 shutil.copy2(source, target)
@@ -126,22 +118,18 @@ def copy_example_files(
                 console.print(f"[green]Created[/green] mount-point/{filename}")
 
             except Exception as e:
-                console.print(
-                    f"[red]Error copying mount-point/{filename}: {str(e)}[/red]"
-                )
+                console.print(f"[red]Error copying mount-point/{filename}: {str(e)}[/red]")
 
     return created
 
 
-def show_overview():
+def show_overview() -> None:
     """Display an overview of available examples in a nicely formatted table."""
     console.print("\n[bold cyan]fast-agent Example Applications[/bold cyan]")
     console.print("Build agents and compose workflows through practical examples\n")
 
     # Create a table for better organization
-    table = Table(
-        show_header=True, header_style="bold magenta", box=None, padding=(0, 2)
-    )
+    table = Table(show_header=True, header_style="bold magenta", box=None, padding=(0, 2))
     table.add_column("Example")
     table.add_column("Description")
     table.add_column("Files")
@@ -149,9 +137,7 @@ def show_overview():
     for name, info in EXAMPLE_TYPES.items():
         files_list = "\n".join(f"• {f}" for f in info["files"])
         if "mount_point_files" in info:
-            files_list += "\n[blue]mount-point:[/blue]\n" + "\n".join(
-                f"• {f}" for f in info["mount_point_files"]
-            )
+            files_list += "\n[blue]mount-point:[/blue]\n" + "\n".join(f"• {f}" for f in info["mount_point_files"])
         table.add_row(f"[green]{name}[/green]", info["description"], files_list)
 
     console.print(table)
@@ -178,10 +164,8 @@ def workflow(
         Path("."),
         help="Directory where workflow examples will be created",
     ),
-    force: bool = typer.Option(
-        False, "--force", "-f", help="Force overwrite existing files"
-    ),
-):
+    force: bool = typer.Option(False, "--force", "-f", help="Force overwrite existing files"),
+) -> None:
     """Create workflow pattern examples."""
     target_dir = directory.resolve()
     if not target_dir.exists():
@@ -198,10 +182,8 @@ def researcher(
         Path("."),
         help="Directory where researcher examples will be created (in 'researcher' subdirectory)",
     ),
-    force: bool = typer.Option(
-        False, "--force", "-f", help="Force overwrite existing files"
-    ),
-):
+    force: bool = typer.Option(False, "--force", "-f", help="Force overwrite existing files"),
+) -> None:
     """Create researcher pattern examples."""
     target_dir = directory.resolve()
     if not target_dir.exists():
@@ -218,10 +200,8 @@ def data_analysis(
         Path("."),
         help="Directory where data analysis examples will be created (creates 'data-analysis' subdirectory with mount-point)",
     ),
-    force: bool = typer.Option(
-        False, "--force", "-f", help="Force overwrite existing files"
-    ),
-):
+    force: bool = typer.Option(False, "--force", "-f", help="Force overwrite existing files"),
+) -> None:
     """Create data analysis examples with sample dataset."""
     target_dir = directory.resolve()
     if not target_dir.exists():
@@ -232,7 +212,7 @@ def data_analysis(
     _show_completion_message("data-analysis", created)
 
 
-def _show_completion_message(example_type: str, created: list[str]):
+def _show_completion_message(example_type: str, created: list[str]) -> None:
     """Show completion message and next steps."""
     if created:
         console.print("\n[green]Setup completed successfully![/green]")
@@ -249,33 +229,23 @@ def _show_completion_message(example_type: str, created: list[str]):
             console.print("   - evaluator.py: Add evaluation capabilities")
             console.print("   - human_input.py: Incorporate human feedback")
             console.print("3. Run an example with: uv run <example>.py")
-            console.print(
-                "4. Try a different model with --model=<model>, or update the agent config"
-            )
+            console.print("4. Try a different model with --model=<model>, or update the agent config")
 
         elif example_type == "researcher":
-            console.print(
-                "1. Set up the Brave MCP Server (get an API key from https://brave.com/search/api/)"
-            )
+            console.print("1. Set up the Brave MCP Server (get an API key from https://brave.com/search/api/)")
             console.print("2. Try `uv run researcher.py` for the basic version")
-            console.print(
-                "3. Try `uv run researcher-eval.py` for the eval/optimize version"
-            )
+            console.print("3. Try `uv run researcher-eval.py` for the eval/optimize version")
         elif example_type == "data-analysis":
-            console.print(
-                "1. Run uv `analysis.py` to perform data analysis and visualization"
-            )
+            console.print("1. Run uv `analysis.py` to perform data analysis and visualization")
             console.print("2. The dataset is available in the mount-point directory:")
             console.print("   - mount-point/WA_Fn-UseC_-HR-Employee-Attrition.csv")
-            console.print(
-                "On Windows platforms, please edit the fastagent.config.yaml and adjust the volume mount point."
-            )
+            console.print("On Windows platforms, please edit the fastagent.config.yaml and adjust the volume mount point.")
     else:
         console.print("\n[yellow]No files were created.[/yellow]")
 
 
 @app.callback(invoke_without_command=True)
-def main(ctx: typer.Context):
+def main(ctx: typer.Context) -> None:
     """Create example applications and learn FastAgent patterns."""
     if ctx.invoked_subcommand is None:
         show_overview()

fast_agent_mcp-0.1.13/src/mcp_agent/cli/commands/config.py

@@ -0,0 +1,11 @@
+from typing import NoReturn
+
+import typer
+
+app = typer.Typer()
+
+
+@app.command()
+def show() -> NoReturn:
+    """Show the configuration."""
+    raise NotImplementedError("The show configuration command has not been implemented yet")