Add prompt.ask cancel handling (#457)

Author: rholinshead

examples/basic/mcp_basic_agent/main.py

@@ -46,12 +46,13 @@
 # or loaded from mcp_agent.config.yaml/mcp_agent.secrets.yaml
 app = MCPApp(name="mcp_basic_agent")  # settings=settings)
 
+
 @app.tool()
-async def example_usage()->str:
+async def example_usage() -> str:
     """
-    An example function/tool that uses an agent with access to the fetch and filesystem 
-    mcp servers. The agent will read the contents of mcp_agent.config.yaml, print the 
-    first 2 paragraphs of the mcp homepage, and summarize the paragraphs into a tweet. 
+    An example function/tool that uses an agent with access to the fetch and filesystem
+    mcp servers. The agent will read the contents of mcp_agent.config.yaml, print the
+    first 2 paragraphs of the mcp homepage, and summarize the paragraphs into a tweet.
     The example uses both OpenAI, Anthropic, and simulates a multi-turn conversation.
     """
     async with app.run() as agent_app:
@@ -113,6 +114,7 @@ async def example_usage()->str:
 
     return result
 
+
 async def display_token_summary(app_ctx: MCPApp, agent: Agent | None = None):
     """Display comprehensive token usage summary using app/agent convenience APIs."""
     summary: TokenSummary = await app_ctx.get_token_summary()

examples/basic/mcp_model_selector/main.py

@@ -10,8 +10,9 @@
 app = MCPApp(name="llm_selector")
 model_selector = ModelSelector()
 
+
 @app.tool
-async def example_usage()->str:
+async def example_usage() -> str:
     """
     An example function/tool that demonstrates MCP's ModelPreferences type
     to select a model based on speed, cost, and intelligence priorities.
@@ -31,7 +32,7 @@ async def example_usage()->str:
         "Smartest OpenAI model:",
         data={"model_preferences": model_preferences, "model": model},
     )
-    result+="Smartest OpenAI model: " + model.name
+    result += "Smartest OpenAI model: " + model.name
 
     model_preferences = ModelPreferences(
         costPriority=0.25, speedPriority=0.25, intelligencePriority=0.5
@@ -44,7 +45,7 @@ async def example_usage()->str:
         "Most balanced OpenAI model:",
         data={"model_preferences": model_preferences, "model": model},
     )
-    result+="\nMost balanced OpenAI model: " + model.name
+    result += "\nMost balanced OpenAI model: " + model.name
 
     model_preferences = ModelPreferences(
         costPriority=0.3, speedPriority=0.6, intelligencePriority=0.1
@@ -57,7 +58,7 @@ async def example_usage()->str:
         "Fastest and cheapest OpenAI model:",
         data={"model_preferences": model_preferences, "model": model},
     )
-    result+="\nFastest and cheapest OpenAI model: " + model.name
+    result += "\nFastest and cheapest OpenAI model: " + model.name
 
     model_preferences = ModelPreferences(
         costPriority=0.1, speedPriority=0.1, intelligencePriority=0.8
@@ -70,7 +71,7 @@ async def example_usage()->str:
         "Smartest Anthropic model:",
         data={"model_preferences": model_preferences, "model": model},
     )
-    result+="\nSmartest Anthropic model: " + model.name
+    result += "\nSmartest Anthropic model: " + model.name
 
     model_preferences = ModelPreferences(
         costPriority=0.8, speedPriority=0.1, intelligencePriority=0.1
@@ -83,7 +84,7 @@ async def example_usage()->str:
         "Cheapest Anthropic model:",
         data={"model_preferences": model_preferences, "model": model},
     )
-    result+="\nCheapest Anthropic model: " + model.name
+    result += "\nCheapest Anthropic model: " + model.name
 
     model_preferences = ModelPreferences(
         costPriority=0.1,
@@ -101,7 +102,7 @@ async def example_usage()->str:
         "Select fastest model between gpt-4o/mini/sonnet/haiku:",
         data={"model_preferences": model_preferences, "model": model},
     )
-    result+="\nSelect fastest model between gpt-4o/mini/sonnet/haiku: " + model.name
+    result += "\nSelect fastest model between gpt-4o/mini/sonnet/haiku: " + model.name
 
     model_preferences = ModelPreferences(
         costPriority=0.15,
@@ -119,7 +120,7 @@ async def example_usage()->str:
         "Most balanced model between gpt-4o/mini/sonnet/haiku:",
         data={"model_preferences": model_preferences, "model": model},
     )
-    result+="\nMost balanced model between gpt-4o/mini/sonnet/haiku: " + model.name
+    result += "\nMost balanced model between gpt-4o/mini/sonnet/haiku: " + model.name
 
     # Examples showcasing new filtering capabilities
     print("\n[bold cyan]Testing new filtering capabilities:[/bold cyan]")
@@ -139,7 +140,7 @@ async def example_usage()->str:
             "context_window": model.context_window,
         },
     )
-    result+="\nBest model with context window >100k tokens: " + model.name
+    result += "\nBest model with context window >100k tokens: " + model.name
 
     # Example 2: Models with tool calling support
     model_preferences = ModelPreferences(
@@ -156,7 +157,7 @@ async def example_usage()->str:
             "tool_calling": model.tool_calling,
         },
     )
-    result+="\nBest model with tool calling support: " + model.name
+    result += "\nBest model with tool calling support: " + model.name
 
     # Example 3: Models with structured outputs (JSON mode)
     model_preferences = ModelPreferences(
@@ -173,7 +174,7 @@ async def example_usage()->str:
             "structured_outputs": model.structured_outputs,
         },
     )
-    result+="\nBest model with structured outputs support: " + model.name
+    result += "\nBest model with structured outputs support: " + model.name
 
     # Example 4: Models with medium context window (50k-150k tokens) and tool calling
     model_preferences = ModelPreferences(
@@ -194,7 +195,9 @@ async def example_usage()->str:
             "tool_calling": model.tool_calling,
         },
     )
-    result+="\nBest model with 50k-150k context window and tool calling: " + model.name    
+    result += (
+        "\nBest model with 50k-150k context window and tool calling: " + model.name
+    )
 
     # Example 5: Fast models with both tool calling and structured outputs
     model_preferences = ModelPreferences(
@@ -213,9 +216,12 @@ async def example_usage()->str:
             "speed": model.metrics.speed.tokens_per_second,
         },
     )
-    result+="\nFastest model with both tool calling and structured outputs: " + model.name
+    result += (
+        "\nFastest model with both tool calling and structured outputs: " + model.name
+    )
+
+    return result
 
-    return result  
 
 if __name__ == "__main__":
     import time

src/mcp_agent/cli/cloud/commands/app/status/main.py

@@ -140,12 +140,15 @@ async def print_mcp_server_details(server_url: str, api_key: str) -> None:
                 console.print(f"[cyan]{key}[/cyan]: {description}")
 
             if sys.stdout.isatty():
-                choice = Prompt.ask(
-                    "\nWhat would you like to display?",
-                    choices=list(choices.keys()),
-                    default="0",
-                    show_choices=False,
-                )
+                try:
+                    choice = Prompt.ask(
+                        "\nWhat would you like to display?",
+                        choices=list(choices.keys()),
+                        default="0",
+                        show_choices=False,
+                    )
+                except (EOFError, KeyboardInterrupt):
+                    return
             else:
                 console.print("Choosing 0 (Show All)")
                 choice = "0"

src/mcp_agent/cli/cloud/commands/app/workflows/main.py

@@ -118,17 +118,20 @@ async def print_mcp_server_workflow_details(server_url: str, api_key: str) -> No
             for key, description in choices.items():
                 console.print(f"[cyan]{key}[/cyan]: {description}")
 
-            choice = Prompt.ask(
-                "\nWhat would you like to display?",
-                choices=list(choices.keys()),
-                default="0",
-                show_choices=False,
-            )
+            try:
+                choice = Prompt.ask(
+                    "\nWhat would you like to display?",
+                    choices=list(choices.keys()),
+                    default="0",
+                    show_choices=False,
+                )
 
-            if choice in ["0", "1"]:
-                await print_workflows_list(mcp_client_session)
-            if choice in ["0", "2"]:
-                await print_runs_list(mcp_client_session)
+                if choice in ["0", "1"]:
+                    await print_workflows_list(mcp_client_session)
+                if choice in ["0", "2"]:
+                    await print_runs_list(mcp_client_session)
+            except (EOFError, KeyboardInterrupt):
+                return
 
     except Exception as e:
         raise CLIError(

src/mcp_agent/cli/cloud/commands/logger/tail/main.py

@@ -17,7 +17,10 @@
 
 from mcp_agent.cli.exceptions import CLIError
 from mcp_agent.cli.auth import load_credentials, UserCredentials
-from mcp_agent.cli.cloud.commands.utils import setup_authenticated_client, resolve_server
+from mcp_agent.cli.cloud.commands.utils import (
+    setup_authenticated_client,
+    resolve_server,
+)
 from mcp_agent.cli.core.api_client import UnauthenticatedError
 from mcp_agent.cli.utils.ux import print_error
 from mcp_agent.cli.mcp_app.api_client import MCPApp, MCPAppConfiguration
@@ -135,7 +138,7 @@ def tail_logs(
 
     client = setup_authenticated_client()
     server = resolve_server(client, app_identifier)
-    
+
     try:
         if follow:
             asyncio.run(
@@ -183,7 +186,7 @@ async def _fetch_logs(
     """Fetch logs one-time via HTTP API."""
 
     # Extract app_id and config_id from the server object
-    if hasattr(server, 'appId'):  # MCPApp
+    if hasattr(server, "appId"):  # MCPApp
         app_id = server.appId
         config_id = None
     else:  # MCPAppConfiguration
@@ -264,7 +267,7 @@ async def _stream_logs(
     # Get server URL directly from the server object
     if not server.appServerInfo or not server.appServerInfo.serverUrl:
         raise CLIError("Server URL not available - server may not be deployed")
-    
+
     server_url = server.appServerInfo.serverUrl
 
     parsed = urlparse(server_url)