feat: passing protocol

racinmat · racinmat · commit b0fc8ad5d5dc · 2025-08-29T22:02:43.000+02:00
diff --git a/contributing/samples/a2a_auth/README.md b/contributing/samples/a2a_auth/README.md
@@ -185,15 +185,16 @@ When deploying the remote BigQuery A2A agent to different environments (e.g., Cl
 }
 ```
 
-**Important:** The `url` field in `remote_a2a/bigquery_agent/agent.json` must point to the actual RPC endpoint where your remote BigQuery A2A agent is deployed and accessible. If the `url` field is an empty string, it will be automatically filled by the base URL provided to `get_fast_api_app`.
+**Important:** The `url` field in `remote_a2a/bigquery_agent/agent.json` must point to the actual RPC endpoint where your remote BigQuery A2A agent is deployed and accessible. 
+If the `url` field is an empty string, it will be automatically filled by the `--host`, `--host`, and `--protocol` provided to `adk api_server`.
 
 ## Troubleshooting
 
 **Connection Issues:**
 - Ensure the local ADK web server is running on port 8000
 - Ensure the remote A2A server is running on port 8001
 - Check that no firewall is blocking localhost connections
-- **Verify the `url` field in `remote_a2a/bigquery_agent/agent.json` matches the actual deployed location of your remote A2A server**
+- **Verify the `url` field in `remote_a2a/human_in_loop/agent.json` matches the actual deployed location of your remote A2A server, or if it's empty, make sure the `--host`, `--port`, and `--protocol` provided to `adk api_server` match the actual deployed location of your remote A2A server**
 - Verify the agent card URL passed to RemoteA2AAgent constructor matches the running A2A server
 
 
diff --git a/contributing/samples/a2a_basic/README.md b/contributing/samples/a2a_basic/README.md
@@ -135,15 +135,16 @@ When deploying the remote A2A agent to different environments (e.g., Cloud Run,
 }
 ```
 
-**Important:** The `url` field in `remote_a2a/check_prime_agent/agent.json` must point to the actual RPC endpoint where your remote A2A agent is deployed and accessible. If the `url` field is an empty string, it will be automatically filled by the base URL provided to `get_fast_api_app`.
+**Important:** The `url` field in `remote_a2a/check_prime_agent/agent.json` must point to the actual RPC endpoint where your remote A2A agent is deployed and accessible.
+If the `url` field is an empty string, it will be automatically filled by the `--host`, `--host`, and `--protocol` provided to `adk api_server`.
 
 ## Troubleshooting
 
 **Connection Issues:**
 - Ensure the local ADK web server is running on port 8000
 - Ensure the remote A2A server is running on port 8001
 - Check that no firewall is blocking localhost connections
-- **Verify the `url` field in `remote_a2a/check_prime_agent/agent.json` matches the actual deployed location of your remote A2A server**
+- **Verify the `url` field in `remote_a2a/human_in_loop/agent.json` matches the actual deployed location of your remote A2A server, or if it's empty, make sure the `--host`, `--port`, and `--protocol` provided to `adk api_server` match the actual deployed location of your remote A2A server**
 - Verify the agent card URL passed to RemoteA2AAgent constructor matches the running A2A server
 
 
diff --git a/contributing/samples/a2a_human_in_loop/README.md b/contributing/samples/a2a_human_in_loop/README.md
@@ -144,15 +144,16 @@ When deploying the remote approval A2A agent to different environments (e.g., Cl
 }
 ```
 
-**Important:** The `url` field in `remote_a2a/human_in_loop/agent.json` must point to the actual RPC endpoint where your remote approval A2A agent is deployed and accessible. If the `url` field is an empty string, it will be automatically filled by the base URL provided to `get_fast_api_app`.
+**Important:** The `url` field in `remote_a2a/human_in_loop/agent.json` must point to the actual RPC endpoint where your remote approval A2A agent is deployed and accessible.
+If the `url` field is an empty string, it will be automatically filled by the `--host`, `--host`, and `--protocol` provided to `adk api_server`.
 
 ## Troubleshooting
 
 **Connection Issues:**
 - Ensure the local ADK web server is running on port 8000
 - Ensure the remote A2A server is running on port 8001
 - Check that no firewall is blocking localhost connections
-- **Verify the `url` field in `remote_a2a/human_in_loop/agent.json` matches the actual deployed location of your remote A2A server**
+- **Verify the `url` field in `remote_a2a/human_in_loop/agent.json` matches the actual deployed location of your remote A2A server, or if it's empty, make sure the `--host`, `--port`, and `--protocol` provided to `adk api_server` match the actual deployed location of your remote A2A server**
 - Verify the agent card URL passed to RemoteA2AAgent constructor matches the running A2A server
 
 **Agent Not Responding:**
diff --git a/src/google/adk/cli/cli_tools_click.py b/src/google/adk/cli/cli_tools_click.py
@@ -617,10 +617,23 @@ def fast_api_common_options():
 
   def decorator(func):
     @click.option(
-        "--base_url",
+        "--host",
         type=str,
-        help="Optional. The base URL of the server.",
-        default="http://127.0.0.1:8000",
+        help="Optional. The binding host of the server",
+        default="127.0.0.1",
+        show_default=True,
+    )
+    @click.option(
+        "--port",
+        type=int,
+        help="Optional. The port of the server",
+        default=8000,
+    )
+    @click.option(
+        "--protocol",
+        type=str,
+        help="Protocol, either http or https.",
+        default="http",
         show_default=True,
     )
     @click.option(
@@ -714,7 +727,9 @@ def cli_web(
     eval_storage_uri: Optional[str] = None,
     log_level: str = "INFO",
     allow_origins: Optional[list[str]] = None,
-    base_url="http://127.0.0.1:8000",
+    host: str = "127.0.0.1",
+    port: int = 8000,
+    protocol: str = "http",
     trace_to_cloud: bool = False,
     reload: bool = True,
     session_service_uri: Optional[str] = None,
@@ -735,9 +750,6 @@ def cli_web(
     adk web --session_service_uri=[uri] --port=[port] path/to/agents_dir
   """
   logs.setup_adk_logger(getattr(logging, log_level.upper()))
-  parsed_url = urlparse(base_url)
-  host = parsed_url.hostname
-  port = parsed_url.port
 
   @asynccontextmanager
   async def _lifespan(app: FastAPI):
@@ -746,7 +758,7 @@ async def _lifespan(app: FastAPI):
 +-----------------------------------------------------------------------------+
 | ADK Web Server started                                                      |
 |                                                                             |
-| For local testing, access at http://{host}:{port}.{" "*(29 - len(str(port)))}|
+| For local testing, access at {protocol}://{host}:{port}.{" "*(29 - len(str(port)))}|
 +-----------------------------------------------------------------------------+
 """,
         fg="green",
@@ -806,7 +818,9 @@ def cli_api_server(
     eval_storage_uri: Optional[str] = None,
     log_level: str = "INFO",
     allow_origins: Optional[list[str]] = None,
-    base_url="http://127.0.0.1:8000",
+    host: str = "127.0.0.1",
+    port: int = 8000,
+    protocol: str = "http",
     trace_to_cloud: bool = False,
     reload: bool = True,
     session_service_uri: Optional[str] = None,
@@ -828,9 +842,6 @@ def cli_api_server(
   """
   logs.setup_adk_logger(getattr(logging, log_level.upper()))
 
-  parsed_url = urlparse(base_url)
-  host = parsed_url.hostname
-  port = parsed_url.port
   session_service_uri = session_service_uri or session_db_url
   artifact_service_uri = artifact_service_uri or artifact_storage_uri
   config = uvicorn.Config(
@@ -844,7 +855,6 @@ def cli_api_server(
           web=False,
           trace_to_cloud=trace_to_cloud,
           a2a=a2a,
-          base_url=base_url,
           reload_agents=reload_agents,
       ),
       host=host,
diff --git a/src/google/adk/cli/fast_api.py b/src/google/adk/cli/fast_api.py
@@ -64,7 +64,9 @@ def get_fast_api_app(
     allow_origins: Optional[list[str]] = None,
     web: bool,
     a2a: bool = False,
-    base_url: str = "http://127.0.0.1:8000",
+    host: str = "127.0.0.1",
+    port: int = 8000,
+    protocol: str = "http",
     trace_to_cloud: bool = False,
     reload_agents: bool = False,
     lifespan: Optional[Lifespan[FastAPI]] = None,
@@ -351,7 +353,7 @@ async def _get_a2a_runner_async() -> Runner:
         logger.info("Setting up A2A agent: %s", app_name)
 
         try:
-          a2a_rpc_path = f"{base_url}/a2a/{app_name}"
+          a2a_rpc_path = f"{protocol}://{host}:{port}/a2a/{app_name}"
 
           agent_executor = A2aAgentExecutor(
               runner=create_a2a_runner_loader(app_name),
@@ -364,8 +366,10 @@ async def _get_a2a_runner_async() -> Runner:
           with (p / "agent.json").open("r", encoding="utf-8") as f:
             data = json.load(f)
             agent_card = AgentCard(**data)
-            if agent_card.url == "":    # empty url is a placeholder to be filled with the provided url
-                agent_card.url = a2a_rpc_path
+            if (
+                agent_card.url == ""
+            ):  # empty url is a placeholder to be filled with the provided url
+              agent_card.url = a2a_rpc_path
 
           a2a_app = A2AStarletteApplication(
               agent_card=agent_card,
diff --git a/tests/unittests/cli/test_fast_api.py b/tests/unittests/cli/test_fast_api.py
@@ -502,36 +502,21 @@ def temp_agents_dir_with_a2a():
 
     # Create agent.json file
     agent_card = {
-        "capabilities": {
-            "pushNotifications": True,
-            "streaming": True
-        },
-        "defaultInputModes": [
-            "text",
-            "text/plain"
-        ],
-        "defaultOutputModes": [
-            "text",
-            "text/plain"
-        ],
+        "capabilities": {"pushNotifications": True, "streaming": True},
+        "defaultInputModes": ["text", "text/plain"],
+        "defaultOutputModes": ["text", "text/plain"],
         "name": "test_a2a_agent",
         "description": "Test A2A agent",
         "version": "1.0.0",
         "author": "test",
         "protocolVersion": "0.2.6",
-        "skills": [
-            {
-                "description": "Makes the tests pass",
-                "examples": [
-                    "Fix the tests."
-                ],
-                "id": "test_a2a_agent",
-                "name": "Test A2A agent",
-                "tags": [
-                    "testing"
-                ]
-            }
-        ],
+        "skills": [{
+            "description": "Makes the tests pass",
+            "examples": ["Fix the tests."],
+            "id": "test_a2a_agent",
+            "name": "Test A2A agent",
+            "tags": ["testing"],
+        }],
         "url": "",
     }
 
@@ -902,7 +887,9 @@ def test_a2a_agent_discovery(test_app_with_a2a):
   # and that the well known card works
   response = test_app_with_a2a.get("/list-apps")
   assert response.status_code == 200
-  response2 = test_app_with_a2a.get(f"/a2a/test_a2a_agent{AGENT_CARD_WELL_KNOWN_PATH}")
+  response2 = test_app_with_a2a.get(
+      f"/a2a/test_a2a_agent{AGENT_CARD_WELL_KNOWN_PATH}"
+  )
   assert response2.status_code == 200
   logger.info("A2A agent discovery test passed")
 
