fast-agent-mcp 0.2.14__tar.gz → 0.2.16__tar.gz

{fast_agent_mcp-0.2.14 → fast_agent_mcp-0.2.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.2.14
+Version: 0.2.16
 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.2.14 → fast_agent_mcp-0.2.16}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fast-agent-mcp"
-version = "0.2.14"
+version = "0.2.16"
 description = "Define, Prompt and Test MCP enabled Agents and Workflows"
 readme = "README.md"
 license = { file = "LICENSE" }

{fast_agent_mcp-0.2.14 → fast_agent_mcp-0.2.16}/src/mcp_agent/config.py

@@ -149,15 +149,16 @@ class GenericSettings(BaseModel):
     base_url: str | None = None
 
     model_config = ConfigDict(extra="allow", arbitrary_types_allowed=True)
-    
+
 
 class OpenRouterSettings(BaseModel):
     """
     Settings for using OpenRouter models via its OpenAI-compatible API.
     """
+
     api_key: str | None = None
-    
-    base_url: str | None = None # Optional override, defaults handled in provider
+
+    base_url: str | None = None  # Optional override, defaults handled in provider
 
     model_config = ConfigDict(extra="allow", arbitrary_types_allowed=True)
 
@@ -294,8 +295,6 @@ class Settings(BaseSettings):
         while current_dir != current_dir.parent:
             for filename in [
                 "fastagent.config.yaml",
-                "mcp-agent.config.yaml",
-                "mcp_agent.config.yaml",
             ]:
                 config_path = current_dir / filename
                 if config_path.exists():
@@ -367,8 +366,6 @@ def get_settings(config_path: str | None = None) -> Settings:
             while current_dir != current_dir.parent and not found_secrets:
                 for secrets_filename in [
                     "fastagent.secrets.yaml",
-                    "mcp-agent.secrets.yaml",
-                    "mcp_agent.secrets.yaml",
                 ]:
                     secrets_file = current_dir / secrets_filename
                     if secrets_file.exists():

{fast_agent_mcp-0.2.14 → fast_agent_mcp-0.2.16}/src/mcp_agent/core/enhanced_prompt.py

@@ -14,6 +14,7 @@ from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.styles import Style
 from rich import print as rich_print
 
+from mcp_agent.core.agent_types import AgentType
 from mcp_agent.core.exceptions import PromptExitError
 
 # Get the application version
@@ -86,7 +87,7 @@ class AgentCompleter(Completer):
             for agent in self.agents:
                 if agent.lower().startswith(agent_name.lower()):
                     # Get agent type or default to "Agent"
-                    agent_type = self.agent_types.get(agent, "Agent")
+                    agent_type = self.agent_types.get(agent, AgentType.BASIC).value
                     yield Completion(
                         agent,
                         start_position=-len(agent_name),
@@ -149,7 +150,7 @@ async def get_enhanced_input(
     show_stop_hint: bool = False,
     multiline: bool = False,
     available_agent_names: List[str] = None,
-    agent_types: dict = None,
+    agent_types: dict[str, AgentType] = None,
     is_human_input: bool = False,
     toolbar_color: str = "ansiblue",
 ) -> str:
@@ -430,18 +431,18 @@ async def get_argument_input(
 async def handle_special_commands(command, agent_app=None):
     """
     Handle special input commands.
-    
+
     Args:
         command: The command to handle, can be string or dictionary
         agent_app: Optional agent app reference
-        
+
     Returns:
         True if command was handled, False if not, or a dict with action info
     """
     # Quick guard for empty or None commands
     if not command:
         return False
-        
+
     # If command is already a dictionary, it has been pre-processed
     # Just return it directly (like when /prompts converts to select_prompt dict)
     if isinstance(command, dict):

{fast_agent_mcp-0.2.14 → fast_agent_mcp-0.2.16}/src/mcp_agent/core/interactive_prompt.py

@@ -20,6 +20,7 @@ from rich import print as rich_print
 from rich.console import Console
 from rich.table import Table
 
+from mcp_agent.core.agent_types import AgentType
 from mcp_agent.core.enhanced_prompt import (
     get_argument_input,
     get_enhanced_input,
@@ -36,14 +37,14 @@ class InteractivePrompt:
     This is extracted from the original AgentApp implementation to support DirectAgentApp.
     """
 
-    def __init__(self, agent_types: Optional[Dict[str, str]] = None) -> None:
+    def __init__(self, agent_types: Optional[Dict[str, AgentType]] = None) -> None:
         """
         Initialize the interactive prompt.
 
         Args:
             agent_types: Dictionary mapping agent names to their types for display
         """
-        self.agent_types = agent_types or {}
+        self.agent_types: Dict[str, AgentType] = agent_types or {}
 
     async def prompt_loop(
         self,
@@ -97,7 +98,7 @@ class InteractivePrompt:
 
                 # Handle special commands - pass "True" to enable agent switching
                 command_result = await handle_special_commands(user_input, True)
-                
+
                 # Check if we should switch agents
                 if isinstance(command_result, dict):
                     if "switch_agent" in command_result:
@@ -113,11 +114,13 @@ class InteractivePrompt:
                         # Use the list_prompts_func directly
                         await self._list_prompts(list_prompts_func, agent)
                         continue
-                    elif "select_prompt" in command_result and (list_prompts_func and apply_prompt_func):
+                    elif "select_prompt" in command_result and (
+                        list_prompts_func and apply_prompt_func
+                    ):
                         # Handle prompt selection, using both list_prompts and apply_prompt
                         prompt_name = command_result.get("prompt_name")
                         prompt_index = command_result.get("prompt_index")
-                        
+
                         # If a specific index was provided (from /prompt <number>)
                         if prompt_index is not None:
                             # First get a list of all prompts to look up the index
@@ -125,20 +128,29 @@ class InteractivePrompt:
                             if not all_prompts:
                                 rich_print("[yellow]No prompts available[/yellow]")
                                 continue
-                                
+
                             # Check if the index is valid
                             if 1 <= prompt_index <= len(all_prompts):
                                 # Get the prompt at the specified index (1-based to 0-based)
                                 selected_prompt = all_prompts[prompt_index - 1]
                                 # Use the already created namespaced_name to ensure consistency
-                                await self._select_prompt(list_prompts_func, apply_prompt_func, agent, selected_prompt["namespaced_name"])
+                                await self._select_prompt(
+                                    list_prompts_func,
+                                    apply_prompt_func,
+                                    agent,
+                                    selected_prompt["namespaced_name"],
+                                )
                             else:
-                                rich_print(f"[red]Invalid prompt number: {prompt_index}. Valid range is 1-{len(all_prompts)}[/red]")
+                                rich_print(
+                                    f"[red]Invalid prompt number: {prompt_index}. Valid range is 1-{len(all_prompts)}[/red]"
+                                )
                                 # Show the prompt list for convenience
                                 await self._list_prompts(list_prompts_func, agent)
                         else:
                             # Use the name-based selection
-                            await self._select_prompt(list_prompts_func, apply_prompt_func, agent, prompt_name)
+                            await self._select_prompt(
+                                list_prompts_func, apply_prompt_func, agent, prompt_name
+                            )
                         continue
 
                 # Skip further processing if command was handled
@@ -158,11 +170,11 @@ class InteractivePrompt:
     async def _get_all_prompts(self, list_prompts_func, agent_name):
         """
         Get a list of all available prompts.
-        
+
         Args:
             list_prompts_func: Function to get available prompts
             agent_name: Name of the agent
-            
+
         Returns:
             List of prompt info dictionaries, sorted by server and name
         """
@@ -171,7 +183,7 @@ class InteractivePrompt:
             # the agent_name parameter should never be used as a server name
             prompt_servers = await list_prompts_func(None)
             all_prompts = []
-            
+
             # Process the returned prompt servers
             if prompt_servers:
                 # First collect all prompts
@@ -179,44 +191,51 @@ class InteractivePrompt:
                     if prompts_info and hasattr(prompts_info, "prompts") and prompts_info.prompts:
                         for prompt in prompts_info.prompts:
                             # Use the SEP constant for proper namespacing
-                            all_prompts.append({
-                                "server": server_name,
-                                "name": prompt.name,
-                                "namespaced_name": f"{server_name}{SEP}{prompt.name}",
-                                "description": getattr(prompt, "description", "No description"),
-                                "arg_count": len(getattr(prompt, "arguments", [])),
-                                "arguments": getattr(prompt, "arguments", [])
-                            })
+                            all_prompts.append(
+                                {
+                                    "server": server_name,
+                                    "name": prompt.name,
+                                    "namespaced_name": f"{server_name}{SEP}{prompt.name}",
+                                    "description": getattr(prompt, "description", "No description"),
+                                    "arg_count": len(getattr(prompt, "arguments", [])),
+                                    "arguments": getattr(prompt, "arguments", []),
+                                }
+                            )
                     elif isinstance(prompts_info, list) and prompts_info:
                         for prompt in prompts_info:
                             if isinstance(prompt, dict) and "name" in prompt:
-                                all_prompts.append({
-                                    "server": server_name,
-                                    "name": prompt["name"],
-                                    "namespaced_name": f"{server_name}{SEP}{prompt['name']}",
-                                    "description": prompt.get("description", "No description"),
-                                    "arg_count": len(prompt.get("arguments", [])),
-                                    "arguments": prompt.get("arguments", [])
-                                })
+                                all_prompts.append(
+                                    {
+                                        "server": server_name,
+                                        "name": prompt["name"],
+                                        "namespaced_name": f"{server_name}{SEP}{prompt['name']}",
+                                        "description": prompt.get("description", "No description"),
+                                        "arg_count": len(prompt.get("arguments", [])),
+                                        "arguments": prompt.get("arguments", []),
+                                    }
+                                )
                             else:
-                                all_prompts.append({
-                                    "server": server_name,
-                                    "name": str(prompt),
-                                    "namespaced_name": f"{server_name}{SEP}{str(prompt)}",
-                                    "description": "No description",
-                                    "arg_count": 0,
-                                    "arguments": []
-                                })
-                
+                                all_prompts.append(
+                                    {
+                                        "server": server_name,
+                                        "name": str(prompt),
+                                        "namespaced_name": f"{server_name}{SEP}{str(prompt)}",
+                                        "description": "No description",
+                                        "arg_count": 0,
+                                        "arguments": [],
+                                    }
+                                )
+
                 # Sort prompts by server and name for consistent ordering
                 all_prompts.sort(key=lambda p: (p["server"], p["name"]))
-            
+
             return all_prompts
-        
+
         except Exception as e:
             import traceback
 
             from rich import print as rich_print
+
             rich_print(f"[red]Error getting prompts: {e}[/red]")
             rich_print(f"[dim]{traceback.format_exc()}[/dim]")
             return []
@@ -238,11 +257,11 @@ class InteractivePrompt:
         try:
             # Directly call the list_prompts function for this agent
             rich_print(f"\n[bold]Fetching prompts for agent [cyan]{agent_name}[/cyan]...[/bold]")
-            
+
             # Get all prompts using the helper function - pass None as server name
             # to get prompts from all available servers
             all_prompts = await self._get_all_prompts(list_prompts_func, None)
-            
+
             if all_prompts:
                 # Create a table for better display
                 table = Table(title="Available MCP Prompts")
@@ -251,7 +270,7 @@ class InteractivePrompt:
                 table.add_column("Prompt Name", style="bright_blue")
                 table.add_column("Description")
                 table.add_column("Args", justify="center")
-                
+
                 # Add prompts to table
                 for i, prompt in enumerate(all_prompts):
                     table.add_row(
@@ -259,11 +278,11 @@ class InteractivePrompt:
                         prompt["server"],
                         prompt["name"],
                         prompt["description"],
-                        str(prompt["arg_count"])
+                        str(prompt["arg_count"]),
                     )
-                
+
                 console.print(table)
-                
+
                 # Add usage instructions
                 rich_print("\n[bold]Usage:[/bold]")
                 rich_print("  • Use [cyan]/prompt <number>[/cyan] to select a prompt by number")
@@ -272,10 +291,13 @@ class InteractivePrompt:
                 rich_print("[yellow]No prompts available[/yellow]")
         except Exception as e:
             import traceback
+
             rich_print(f"[red]Error listing prompts: {e}[/red]")
             rich_print(f"[dim]{traceback.format_exc()}[/dim]")
 
-    async def _select_prompt(self, list_prompts_func, apply_prompt_func, agent_name, requested_name=None) -> None:
+    async def _select_prompt(
+        self, list_prompts_func, apply_prompt_func, agent_name, requested_name=None
+    ) -> None:
         """
         Select and apply a prompt.
 
@@ -293,7 +315,7 @@ class InteractivePrompt:
         try:
             # Get all available prompts directly from the list_prompts function
             rich_print(f"\n[bold]Fetching prompts for agent [cyan]{agent_name}[/cyan]...[/bold]")
-            # IMPORTANT: list_prompts_func gets MCP server prompts, not agent prompts 
+            # IMPORTANT: list_prompts_func gets MCP server prompts, not agent prompts
             # So we pass None to get prompts from all servers, not using agent_name as server name
             prompt_servers = await list_prompts_func(None)
 
@@ -514,9 +536,7 @@ class InteractivePrompt:
 
             # Apply the prompt
             namespaced_name = selected_prompt["namespaced_name"]
-            rich_print(
-                f"\n[bold]Applying prompt [cyan]{namespaced_name}[/cyan]...[/bold]"
-            )
+            rich_print(f"\n[bold]Applying prompt [cyan]{namespaced_name}[/cyan]...[/bold]")
 
             # Call apply_prompt function with the prompt name and arguments
             await apply_prompt_func(namespaced_name, arg_values, agent_name)

{fast_agent_mcp-0.2.14 → fast_agent_mcp-0.2.16}/src/mcp_agent/llm/providers/augmented_llm_generic.py

@@ -10,8 +10,10 @@ DEFAULT_OLLAMA_API_KEY = "ollama"
 
 
 class GenericAugmentedLLM(OpenAIAugmentedLLM):
-    def __init__(self, *args, provider=Provider.GENERIC, **kwargs) -> None:
-        super().__init__(*args, **kwargs)  # Properly pass args and kwargs to parent
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(
+            *args, provider=Provider.GENERIC, **kwargs
+        )  # Properly pass args and kwargs to parent
 
     def _initialize_default_params(self, kwargs: dict) -> RequestParams:
         """Initialize Generic  parameters"""