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

mcp_agent/core/agent_app.py

@@ -2,25 +2,25 @@
 Main application wrapper for interacting with agents.
 """
 
-from typing import Optional, Dict, Union, TYPE_CHECKING
+from typing import TYPE_CHECKING, Dict, Optional, Union
 
 from mcp_agent.app import MCPApp
-from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
-from mcp_agent.progress_display import progress_display
-from mcp_agent.workflows.orchestrator.orchestrator import Orchestrator
-from mcp_agent.workflows.parallel.parallel_llm import ParallelLLM
-from mcp_agent.workflows.evaluator_optimizer.evaluator_optimizer import (
-    EvaluatorOptimizerLLM,
-)
 
 # Import proxies directly - they handle their own circular imports
 from mcp_agent.core.proxies import (
     BaseAgentProxy,
+    ChainProxy,
     LLMAgentProxy,
     RouterProxy,
-    ChainProxy,
     WorkflowProxy,
 )
+from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
+from mcp_agent.progress_display import progress_display
+from mcp_agent.workflows.evaluator_optimizer.evaluator_optimizer import (
+    EvaluatorOptimizerLLM,
+)
+from mcp_agent.workflows.orchestrator.orchestrator import Orchestrator
+from mcp_agent.workflows.parallel.parallel_llm import ParallelLLM
 
 # Handle possible circular imports with types
 if TYPE_CHECKING:
@@ -32,15 +32,13 @@ else:
 class AgentApp:
     """Main application wrapper"""
 
-    def __init__(self, app: MCPApp, agents: ProxyDict):
+    def __init__(self, app: MCPApp, agents: ProxyDict) -> None:
         self._app = app
         self._agents = agents
         # Optional: set default agent for direct calls
         self._default = next(iter(agents)) if agents else None
 
-    async def send_prompt(
-        self, prompt: PromptMessageMultipart, agent_name: Optional[str] = None
-    ) -> str:
+    async def send_prompt(self, prompt: PromptMessageMultipart, agent_name: Optional[str] = None) -> str:
         """
         Send a PromptMessageMultipart to an agent
 
@@ -112,7 +110,7 @@ class AgentApp:
 
         proxy = self._agents[target]
         return await proxy.apply_prompt(prompt_name, arguments)
-        
+
     async def with_resource(
         self,
         prompt_content: Union[str, PromptMessageMultipart],
@@ -218,15 +216,9 @@ class AgentApp:
                             found_prompts = False
                             for agent_name, agent_proxy in self._agents.items():
                                 # Check if agent has an mcp_aggregator (agent instance)
-                                if hasattr(agent_proxy, "_agent") and hasattr(
-                                    agent_proxy._agent, "list_prompts"
-                                ):
-                                    rich_print(
-                                        f"\n[bold]Fetching prompts for agent [cyan]{agent_name}[/cyan]...[/bold]"
-                                    )
-                                    prompt_servers = (
-                                        await agent_proxy._agent.list_prompts()
-                                    )
+                                if hasattr(agent_proxy, "_agent") and hasattr(agent_proxy._agent, "list_prompts"):
+                                    rich_print(f"\n[bold]Fetching prompts for agent [cyan]{agent_name}[/cyan]...[/bold]")
+                                    prompt_servers = await agent_proxy._agent.list_prompts()
 
                                     if prompt_servers:
                                         found_prompts = True
@@ -234,31 +226,15 @@ class AgentApp:
                                             server_name,
                                             prompts_info,
                                         ) in prompt_servers.items():
-                                            if (
-                                                prompts_info
-                                                and hasattr(prompts_info, "prompts")
-                                                and prompts_info.prompts
-                                            ):
-                                                rich_print(
-                                                    f"\n[bold cyan]{server_name}:[/bold cyan]"
-                                                )
+                                            if prompts_info and hasattr(prompts_info, "prompts") and prompts_info.prompts:
+                                                rich_print(f"\n[bold cyan]{server_name}:[/bold cyan]")
                                                 for prompt in prompts_info.prompts:
                                                     rich_print(f"  {prompt.name}")
-                                            elif (
-                                                isinstance(prompts_info, list)
-                                                and prompts_info
-                                            ):
-                                                rich_print(
-                                                    f"\n[bold cyan]{server_name}:[/bold cyan]"
-                                                )
+                                            elif isinstance(prompts_info, list) and prompts_info:
+                                                rich_print(f"\n[bold cyan]{server_name}:[/bold cyan]")
                                                 for prompt in prompts_info:
-                                                    if (
-                                                        isinstance(prompt, dict)
-                                                        and "name" in prompt
-                                                    ):
-                                                        rich_print(
-                                                            f"  {prompt['name']}"
-                                                        )
+                                                    if isinstance(prompt, dict) and "name" in prompt:
+                                                        rich_print(f"  {prompt['name']}")
                                                     else:
                                                         rich_print(f"  {prompt}")
 
@@ -269,8 +245,8 @@ class AgentApp:
                         continue
                     elif "select_prompt" in command_result:
                         from rich import print as rich_print
-                        from rich.table import Table
                         from rich.console import Console
+                        from rich.table import Table
 
                         console = Console()
 
@@ -278,12 +254,8 @@ class AgentApp:
                         current_proxy = self._agents[agent]
 
                         # Check if the agent has prompt capabilities
-                        if not hasattr(current_proxy, "_agent") or not hasattr(
-                            current_proxy._agent, "list_prompts"
-                        ):
-                            rich_print(
-                                f"[red]Current agent '{agent}' does not support prompts[/red]"
-                            )
+                        if not hasattr(current_proxy, "_agent") or not hasattr(current_proxy._agent, "list_prompts"):
+                            rich_print(f"[red]Current agent '{agent}' does not support prompts[/red]")
                             continue
 
                         try:
@@ -291,15 +263,11 @@ class AgentApp:
                             all_prompts = []
 
                             # Get prompts from the current agent
-                            rich_print(
-                                f"\n[bold]Fetching prompts for agent [cyan]{agent}[/cyan]...[/bold]"
-                            )
+                            rich_print(f"\n[bold]Fetching prompts for agent [cyan]{agent}[/cyan]...[/bold]")
                             prompt_servers = await current_proxy._agent.list_prompts()
 
                             if not prompt_servers:
-                                rich_print(
-                                    "[yellow]No prompts available for this agent[/yellow]"
-                                )
+                                rich_print("[yellow]No prompts available for this agent[/yellow]")
                                 continue
 
                             # Process retrieved prompts
@@ -319,9 +287,7 @@ class AgentApp:
                                 for prompt in prompts:
                                     # Basic prompt information
                                     prompt_name = getattr(prompt, "name", "Unknown")
-                                    description = getattr(
-                                        prompt, "description", "No description"
-                                    )
+                                    description = getattr(prompt, "description", "No description")
 
                                     # Extract argument information
                                     arg_names = []
@@ -339,9 +305,7 @@ class AgentApp:
                                                 arg_names.append(name)
 
                                                 # Store description if available
-                                                description = getattr(
-                                                    arg, "description", None
-                                                )
+                                                description = getattr(arg, "description", None)
                                                 if description:
                                                     arg_descriptions[name] = description
 
@@ -371,32 +335,20 @@ class AgentApp:
 
                             # If no prompts were found
                             if not all_prompts:
-                                rich_print(
-                                    "[yellow]No prompts available for this agent[/yellow]"
-                                )
+                                rich_print("[yellow]No prompts available for this agent[/yellow]")
                                 continue
 
                             # Sort prompts by server then name
                             all_prompts.sort(key=lambda p: (p["server"], p["name"]))
 
                             # Check if a specific prompt was requested
-                            if (
-                                "prompt_name" in command_result
-                                and command_result["prompt_name"]
-                            ):
+                            if "prompt_name" in command_result and command_result["prompt_name"]:
                                 requested_name = command_result["prompt_name"]
                                 # Find the prompt in our list (either by name or namespaced name)
-                                matching_prompts = [
-                                    p
-                                    for p in all_prompts
-                                    if p["name"] == requested_name
-                                    or p["namespaced_name"] == requested_name
-                                ]
+                                matching_prompts = [p for p in all_prompts if p["name"] == requested_name or p["namespaced_name"] == requested_name]
 
                                 if not matching_prompts:
-                                    rich_print(
-                                        f"[red]Prompt '{requested_name}' not found[/red]"
-                                    )
+                                    rich_print(f"[red]Prompt '{requested_name}' not found[/red]")
                                     rich_print("[yellow]Available prompts:[/yellow]")
                                     for p in all_prompts:
                                         rich_print(f"  {p['namespaced_name']}")
@@ -407,22 +359,16 @@ class AgentApp:
                                     selected_prompt = matching_prompts[0]
                                 else:
                                     # If multiple matches, show them and ask user to be more specific
-                                    rich_print(
-                                        f"[yellow]Multiple prompts match '{requested_name}':[/yellow]"
-                                    )
+                                    rich_print(f"[yellow]Multiple prompts match '{requested_name}':[/yellow]")
                                     for i, p in enumerate(matching_prompts):
-                                        rich_print(
-                                            f"  {i + 1}. {p['namespaced_name']} - {p['description']}"
-                                        )
+                                        rich_print(f"  {i + 1}. {p['namespaced_name']} - {p['description']}")
 
                                     # Ask user to select one
                                     from mcp_agent.core.enhanced_prompt import (
                                         get_selection_input,
                                     )
 
-                                    selection = await get_selection_input(
-                                        "Enter prompt number to select: ", default="1"
-                                    )
+                                    selection = await get_selection_input("Enter prompt number to select: ", default="1")
 
                                     try:
                                         idx = int(selection) - 1
@@ -432,9 +378,7 @@ class AgentApp:
                                             rich_print("[red]Invalid selection[/red]")
                                             continue
                                     except ValueError:
-                                        rich_print(
-                                            "[red]Invalid input, please enter a number[/red]"
-                                        )
+                                        rich_print("[red]Invalid input, please enter a number[/red]")
                                         continue
                             else:
                                 # Display prompt selection UI
@@ -455,9 +399,7 @@ class AgentApp:
                                     if required_args and optional_args:
                                         args_display = f"[bold]{len(required_args)}[/bold]+{len(optional_args)}"
                                     elif required_args:
-                                        args_display = (
-                                            f"[bold]{len(required_args)}[/bold]"
-                                        )
+                                        args_display = f"[bold]{len(required_args)}[/bold]"
                                     elif optional_args:
                                         args_display = f"{len(optional_args)} opt"
                                     else:
@@ -472,9 +414,7 @@ class AgentApp:
                                     )
 
                                 console.print(table)
-                                prompt_names = [
-                                    str(i + 1) for i in range(len(all_prompts))
-                                ]
+                                prompt_names = [str(i + 1) for i in range(len(all_prompts))]
 
                                 # Ask user to select a prompt
                                 from mcp_agent.core.enhanced_prompt import (
@@ -489,9 +429,7 @@ class AgentApp:
 
                                 # Make cancellation easier
                                 if not selection or selection.strip() == "":
-                                    rich_print(
-                                        "[yellow]Prompt selection cancelled[/yellow]"
-                                    )
+                                    rich_print("[yellow]Prompt selection cancelled[/yellow]")
                                     continue
 
                                 try:
@@ -502,17 +440,13 @@ class AgentApp:
                                         rich_print("[red]Invalid selection[/red]")
                                         continue
                                 except ValueError:
-                                    rich_print(
-                                        "[red]Invalid input, please enter a number[/red]"
-                                    )
+                                    rich_print("[red]Invalid input, please enter a number[/red]")
                                     continue
 
                             # Get our prompt arguments
                             required_args = selected_prompt["required_args"]
                             optional_args = selected_prompt["optional_args"]
-                            arg_descriptions = selected_prompt.get(
-                                "arg_descriptions", {}
-                            )
+                            arg_descriptions = selected_prompt.get("arg_descriptions", {})
 
                             # Always initialize arg_values
                             arg_values = {}
@@ -525,13 +459,9 @@ class AgentApp:
                                         f"\n[bold]Prompt [cyan]{selected_prompt['name']}[/cyan] requires {len(required_args)} arguments and has {len(optional_args)} optional arguments:[/bold]"
                                     )
                                 elif required_args:
-                                    rich_print(
-                                        f"\n[bold]Prompt [cyan]{selected_prompt['name']}[/cyan] requires {len(required_args)} arguments:[/bold]"
-                                    )
+                                    rich_print(f"\n[bold]Prompt [cyan]{selected_prompt['name']}[/cyan] requires {len(required_args)} arguments:[/bold]")
                                 elif optional_args:
-                                    rich_print(
-                                        f"\n[bold]Prompt [cyan]{selected_prompt['name']}[/cyan] has {len(optional_args)} optional arguments:[/bold]"
-                                    )
+                                    rich_print(f"\n[bold]Prompt [cyan]{selected_prompt['name']}[/cyan] has {len(optional_args)} optional arguments:[/bold]")
 
                                 # Collect required arguments
                                 for arg_name in required_args:
@@ -573,21 +503,15 @@ class AgentApp:
                                             arg_values[arg_name] = arg_value
 
                             # Apply the prompt with or without arguments
-                            rich_print(
-                                f"\n[bold]Applying prompt [cyan]{selected_prompt['namespaced_name']}[/cyan]...[/bold]"
-                            )
+                            rich_print(f"\n[bold]Applying prompt [cyan]{selected_prompt['namespaced_name']}[/cyan]...[/bold]")
 
                             # Call apply_prompt on the agent - always pass arg_values (empty dict if no args)
-                            await current_proxy._agent.apply_prompt(
-                                selected_prompt["namespaced_name"], arg_values
-                            )
+                            await current_proxy._agent.apply_prompt(selected_prompt["namespaced_name"], arg_values)
 
                         except Exception as e:
                             import traceback
 
-                            rich_print(
-                                f"[red]Error selecting or applying prompt: {e}[/red]"
-                            )
+                            rich_print(f"[red]Error selecting or applying prompt: {e}[/red]")
                             rich_print(f"[dim]{traceback.format_exc()}[/dim]")
                         continue
 

mcp_agent/core/agent_types.py

@@ -1,8 +1,13 @@
 """
-Enum definitions for supported agent types.
+Type definitions for agents and agent configurations.
 """
 
+from dataclasses import dataclass
 from enum import Enum
+from typing import Callable, Dict, List, Optional, Union
+
+# Forward imports to avoid circular dependencies
+from mcp_agent.core.request_params import RequestParams
 
 
 class AgentType(Enum):
@@ -13,4 +18,26 @@ class AgentType(Enum):
     PARALLEL = "parallel"
     EVALUATOR_OPTIMIZER = "evaluator_optimizer"
     ROUTER = "router"
-    CHAIN = "chain"
+    CHAIN = "chain"
+
+
+@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

mcp_agent/core/agent_utils.py

@@ -2,7 +2,7 @@
 Utility functions for agent operations.
 """
 
-from typing import List, TYPE_CHECKING
+from typing import TYPE_CHECKING, List
 
 from mcp_agent.event_progress import ProgressAction
 
@@ -28,7 +28,7 @@ def unwrap_proxy(proxy: BaseAgentProxy) -> AgentOrWorkflow:
     Returns:
         The underlying Agent or workflow instance
     """
-    from mcp_agent.core.proxies import LLMAgentProxy, ChainProxy
+    from mcp_agent.core.proxies import ChainProxy, LLMAgentProxy
 
     if isinstance(proxy, LLMAgentProxy):
         return proxy._agent
@@ -38,9 +38,7 @@ def unwrap_proxy(proxy: BaseAgentProxy) -> AgentOrWorkflow:
     return proxy._workflow
 
 
-def get_agent_instances(
-    agent_names: List[str], active_agents: ProxyDict
-) -> List[AgentOrWorkflow]:
+def get_agent_instances(agent_names: List[str], active_agents: ProxyDict) -> List[AgentOrWorkflow]:
     """
     Get list of actual agent/workflow instances from a list of names.
 

mcp_agent/core/decorators.py

@@ -3,10 +3,10 @@ Decorators for FastAgent applications.
 Contains decorator definitions extracted from fastagent.py.
 """
 
-from typing import Callable, Dict, List, Optional, TypeVar, Literal
-from mcp_agent.agents.agent import AgentConfig
+from typing import Callable, Dict, List, Literal, Optional, TypeVar
+
+from mcp_agent.core.agent_types import AgentConfig, AgentType
 from mcp_agent.workflows.llm.augmented_llm import RequestParams
-from mcp_agent.core.agent_types import AgentType
 
 T = TypeVar("T")  # For the wrapper classes
 
@@ -47,11 +47,7 @@ def _create_decorator(
         # Create base request params
         def decorator(func: Callable) -> Callable:
             # Create base request params
-            if (
-                request_params is not None
-                or model is not None
-                or use_history != default_use_history
-            ):
+            if request_params is not None or model is not None or use_history != default_use_history:
                 max_tokens = 4096 if agent_type == AgentType.BASIC else None
                 params_dict = {"use_history": use_history, "model": model}
                 if max_tokens:
@@ -143,9 +139,7 @@ def agent(
         @fast.agent("agent_name", instruction="Your instruction here")  # Using keyword arg
     """
     # Use positional argument if provided, otherwise use keyword argument
-    final_instruction = (
-        instruction_or_kwarg if instruction_or_kwarg is not None else instruction
-    )
+    final_instruction = instruction_or_kwarg if instruction_or_kwarg is not None else instruction
 
     decorator = self._create_decorator(
         AgentType.BASIC,
@@ -428,9 +422,7 @@ def chain(
     return decorator
 
 
-def passthrough(
-    self, name: str = "Passthrough", use_history: bool = True, **kwargs
-) -> Callable:
+def passthrough(self, name: str = "Passthrough", use_history: bool = True, **kwargs) -> Callable:
     """
     Decorator to create and register a passthrough agent.
     A passthrough agent simply returns any input message without modification.