Port over cli changes (#421)

Author: rholinshead

src/mcp_agent/cli/cloud/commands/configure/main.py

@@ -24,8 +24,6 @@
 from mcp_agent.cli.exceptions import CLIError
 from mcp_agent.cli.mcp_app.api_client import (
     MCPAppClient,
-    is_valid_app_id_format,
-    is_valid_server_url_format,
 )
 from mcp_agent.cli.mcp_app.mock_client import MockMCPAppClient
 from mcp_agent.cli.secrets.mock_client import MockSecretsClient
@@ -41,11 +39,11 @@
 
 
 def configure_app(
-    app_id_or_url: str = typer.Option(
+    app_server_url: str = typer.Option(
         None,
         "--id",
         "-i",
-        help="ID or server URL of the app to configure.",
+        help="Server URL of the app to configure.",
     ),
     secrets_file: Optional[Path] = typer.Option(
         None,
@@ -90,7 +88,7 @@ def configure_app(
     """Configure an MCP app with the required params (e.g. user secrets).
 
     Args:
-        app_id_or_url: ID or server URL of the MCP App to configure
+        app_server_url: Server URL of the MCP App to configure
         secrets_file: Path to an existing secrets file containing processed user secrets to use for configuring the app
         secrets_output_file: Path to write processed secrets to, if secrets are prompted. Defaults to mcp-agent.configured.secrets.yaml
         dry_run: Don't actually store secrets, just validate
@@ -101,8 +99,8 @@ def configure_app(
         Configured app ID.
     """
     # Check what params the app requires (doubles as an access check)
-    if not app_id_or_url:
-        raise CLIError("You must provide an app ID or server URL to configure.")
+    if not app_server_url:
+        raise CLIError("You must provide a server URL to configure.")
 
     effective_api_key = api_key or settings.API_KEY or load_api_key_credentials()
     if not effective_api_key:
@@ -122,30 +120,6 @@ def configure_app(
             api_url=api_url or DEFAULT_API_BASE_URL, api_key=effective_api_key
         )
 
-    app_id = app_server_url = None
-    if is_valid_app_id_format(app_id_or_url):
-        app_id = app_id_or_url
-    elif is_valid_server_url_format(app_id_or_url):
-        app_server_url = app_id_or_url
-
-    try:
-        app = client.get_app(app_id=app_id, server_url=app_server_url)
-        app = run_async(client.get_app(app_id=app_id, server_url=app_server_url))
-
-        if not app:
-            raise CLIError(f"App with ID or URL '{app_id_or_url}' not found.")
-
-        app_id = app.appId
-
-    except UnauthenticatedError as e:
-        raise CLIError(
-            "Invalid API key. Run 'mcp-agent login' or set MCP_API_KEY environment variable with new API key."
-        ) from e
-    except Exception as e:
-        raise CLIError(
-            f"Error retrieving app to configure with ID or URL {app_id_or_url}",
-        ) from e
-
     # Cannot provide both secrets_file and secrets_output_file; either must be yaml files
     if secrets_file and secrets_output_file:
         raise CLIError(
@@ -162,20 +136,28 @@ def configure_app(
 
     required_params = []
     try:
-        required_params = run_async(client.list_config_params(app_id=app_id))
+        required_params = run_async(
+            client.list_config_params(app_server_url=app_server_url)
+        )
+    except UnauthenticatedError as e:
+        raise CLIError(
+            "Invalid API key. Run 'mcp-agent login' or set MCP_API_KEY environment variable with new API key."
+        ) from e
     except Exception as e:
-        raise CLIError(f"Failed to retrieve required secrets for app {app_id}: {e}")
+        raise CLIError(
+            f"Failed to retrieve required secrets for app {app_server_url}: {e}"
+        ) from e
 
     requires_secrets = len(required_params) > 0
     configured_secrets = {}
 
     if params:
         if requires_secrets:
             print_info(
-                f"App {app_id} requires the following ({len(required_params)}) user secrets: {', '.join(required_params)}"
+                f"App {app_server_url} requires the following ({len(required_params)}) user secrets: {', '.join(required_params)}"
             )
         else:
-            print_info(f"App {app_id} does not require any user secrets.")
+            print_info(f"App {app_server_url} does not require any user secrets.")
         raise typer.Exit(0)
 
     if requires_secrets:
@@ -187,7 +169,7 @@ def configure_app(
         print_configuration_header(secrets_file, secrets_output_file, dry_run)
 
         print_info(
-            f"App {app_id} requires the following ({len(required_params)}) user secrets: {', '.join(required_params)}"
+            f"App {app_server_url} requires the following ({len(required_params)}) user secrets: {', '.join(required_params)}"
         )
 
         try:
@@ -238,10 +220,10 @@ def configure_app(
             raise CLIError(f"{str(e)}") from e
 
     else:
-        print_info(f"App {app_id} does not require any parameters.")
+        print_info(f"App {app_server_url} does not require any parameters.")
         if secrets_file:
             raise CLIError(
-                f"App {app_id} does not require any parameters, but a secrets file was provided: {secrets_file}"
+                f"App {app_server_url} does not require any parameters, but a secrets file was provided: {secrets_file}"
             )
 
     if dry_run:
@@ -257,7 +239,9 @@ def configure_app(
 
         try:
             config = run_async(
-                client.configure_app(app_id=app_id, config_params=configured_secrets)
+                client.configure_app(
+                    app_server_url=app_server_url, config_params=configured_secrets
+                )
             )
             progress.update(task, description="✅ MCP App configured successfully!")
             console.print(
@@ -273,4 +257,4 @@ def configure_app(
 
         except Exception as e:
             progress.update(task, description="❌ MCP App configuration failed")
-            raise CLIError(f"Failed to configure app {app_id}: {str(e)}") from e
+            raise CLIError(f"Failed to configure app {app_server_url}: {str(e)}") from e

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

@@ -33,10 +33,10 @@ def configure_logger(
     ),
 ) -> None:
     """Configure OTEL endpoint and headers for log collection.
-    
+
     This command allows you to configure the OpenTelemetry endpoint and headers
     that will be used for collecting logs from your deployed MCP apps.
-    
+
     Examples:
         mcp-agent cloud logger configure https://otel.example.com:4318/v1/logs
         mcp-agent cloud logger configure https://otel.example.com --headers "Authorization=Bearer token,X-Custom=value"
@@ -45,17 +45,19 @@ def configure_logger(
     if not endpoint and not test:
         print_error("Must specify endpoint or use --test")
         raise typer.Exit(1)
-    
+
     config_path = _find_config_file()
-    
+
     if test:
         if config_path and config_path.exists():
             config = _load_config(config_path)
             otel_config = config.get("otel", {})
             endpoint = otel_config.get("endpoint")
             headers_dict = otel_config.get("headers", {})
         else:
-            console.print("[yellow]No configuration file found. Use --endpoint to set up OTEL configuration.[/yellow]")
+            console.print(
+                "[yellow]No configuration file found. Use --endpoint to set up OTEL configuration.[/yellow]"
+            )
             raise typer.Exit(1)
     else:
         headers_dict = {}
@@ -67,52 +69,64 @@ def configure_logger(
             except ValueError:
                 print_error("Headers must be in format 'key=value,key2=value2'")
                 raise typer.Exit(1)
-    
+
     if endpoint:
         console.print(f"[blue]Testing connection to {endpoint}...[/blue]")
-        
+
         try:
             with httpx.Client(timeout=10.0) as client:
                 response = client.get(
-                    endpoint.replace("/v1/logs", "/health") if "/v1/logs" in endpoint else f"{endpoint}/health",
-                    headers=headers_dict
+                    endpoint.replace("/v1/logs", "/health")
+                    if "/v1/logs" in endpoint
+                    else f"{endpoint}/health",
+                    headers=headers_dict,
                 )
-                
-                if response.status_code in [200, 404]:  # 404 is fine, means endpoint exists
+
+                if response.status_code in [
+                    200,
+                    404,
+                ]:  # 404 is fine, means endpoint exists
                     console.print("[green]✓ Connection successful[/green]")
                 else:
-                    console.print(f"[yellow]⚠ Got status {response.status_code}, but endpoint is reachable[/yellow]")
-                    
+                    console.print(
+                        f"[yellow]⚠ Got status {response.status_code}, but endpoint is reachable[/yellow]"
+                    )
+
         except httpx.RequestError as e:
             print_error(f"✗ Connection failed: {e}")
             if not test:
-                console.print("[yellow]Configuration will be saved anyway. Check your endpoint URL and network connection.[/yellow]")
-    
+                console.print(
+                    "[yellow]Configuration will be saved anyway. Check your endpoint URL and network connection.[/yellow]"
+                )
+
     if not test:
         if not config_path:
             config_path = Path.cwd() / "mcp_agent.config.yaml"
-            
+
         config = _load_config(config_path) if config_path.exists() else {}
-        
+
         if "otel" not in config:
             config["otel"] = {}
-            
+
         config["otel"]["endpoint"] = endpoint
         config["otel"]["headers"] = headers_dict
-        
+
         try:
             config_path.parent.mkdir(parents=True, exist_ok=True)
             with open(config_path, "w") as f:
                 yaml.dump(config, f, default_flow_style=False, sort_keys=False)
-                
-            console.print(Panel(
-                f"[green]✓ OTEL configuration saved to {config_path}[/green]\n\n"
-                f"Endpoint: {endpoint}\n"
-                f"Headers: {len(headers_dict)} configured" + (f" ({', '.join(headers_dict.keys())})" if headers_dict else ""),
-                title="Configuration Saved",
-                border_style="green"
-            ))
-            
+
+            console.print(
+                Panel(
+                    f"[green]✓ OTEL configuration saved to {config_path}[/green]\n\n"
+                    f"Endpoint: {endpoint}\n"
+                    f"Headers: {len(headers_dict)} configured"
+                    + (f" ({', '.join(headers_dict.keys())})" if headers_dict else ""),
+                    title="Configuration Saved",
+                    border_style="green",
+                )
+            )
+
         except Exception as e:
             raise CLIError(f"Error saving configuration: {e}")
 
@@ -134,4 +148,4 @@ def _load_config(config_path: Path) -> dict:
         with open(config_path, "r") as f:
             return yaml.safe_load(f) or {}
     except Exception as e:
-        raise CLIError(f"Failed to load config from {config_path}: {e}")
+        raise CLIError(f"Failed to load config from {config_path}: {e}")