fix: return input-required status when agent needs clarification (#755)

* fix: bump a2a version to latest and simplify the long running tool

* fix: update python agent ordering

* fix: linter issues

Author: allen-stephen

agent_starter_pack/agents/adk_a2a/.template/templateconfig.yaml

@@ -17,6 +17,6 @@ example_question: "What's the weather in San Francisco?"
 settings:
   requires_data_ingestion: false
   deployment_targets: ["agent_engine", "cloud_run"]
-  extra_dependencies: ["google-adk>=1.16.0,<2.0.0", "a2a-sdk~=0.3.9", "nest-asyncio>=1.6.0,<2.0.0"]
+  extra_dependencies: ["google-adk>=1.16.0,<2.0.0", "a2a-sdk~=0.3.22", "nest-asyncio>=1.6.0,<2.0.0"]
   tags: ["adk", "a2a"]
   frontend_type: "None"

agent_starter_pack/agents/adk_a2a/app/agent.py

@@ -19,6 +19,7 @@
 from google.adk.agents import Agent
 from google.adk.apps import App
 from google.adk.models import Gemini
+from google.adk.tools import LongRunningFunctionTool
 from google.genai import types
 {%- if not cookiecutter.use_google_api_key %}
 
@@ -65,6 +66,18 @@ def get_current_time(query: str) -> str:
     return f"The current time for query {query} is {now.strftime('%Y-%m-%d %H:%M:%S %Z%z')}"
 
 
+def request_user_input(message: str) -> dict:
+    """Request additional input from the user.
+
+    Use this tool when you need more information from the user to complete a task.
+    Calling this tool will pause execution until the user responds.
+
+    Args:
+        message: The question or clarification request to show the user.
+    """
+    return {"status": "pending", "message": message}
+
+
 root_agent = Agent(
     name="root_agent",
     model=Gemini(
@@ -73,7 +86,11 @@ def get_current_time(query: str) -> str:
     ),
     description="An agent that can provide information about the weather and time.",
     instruction="You are a helpful AI assistant designed to provide accurate and useful information.",
-    tools=[get_weather, get_current_time],
+    tools=[
+        get_weather,
+        get_current_time,
+        LongRunningFunctionTool(func=request_user_input),
+    ],
 )
 
 app = App(root_agent=root_agent, name="{{cookiecutter.agent_directory}}")

agent_starter_pack/base_templates/python/.cloudbuild/staging.yaml

@@ -210,7 +210,7 @@ steps:
       - |
         export _ID_TOKEN=$(cat id_token.txt)
         export _STAGING_URL=$(cat staging_url.txt)
-        pip install locust==2.31.1{%- if cookiecutter.is_a2a %} a2a-sdk~=0.3.9{%- endif %} --user
+        pip install locust==2.31.1{%- if cookiecutter.is_a2a %} a2a-sdk~=0.3.22{%- endif %} --user
         locust -f tests/load_test/load_test.py \
         --headless \
         -H $$_STAGING_URL \

agent_starter_pack/base_templates/python/.github/workflows/staging.yaml

@@ -199,7 +199,7 @@ jobs:
 {%- elif cookiecutter.deployment_target == 'cloud_run' %}
           export _ID_TOKEN="{% raw %}${{ steps.fetch-token.outputs._id_token }}{% endraw %}"
           export _STAGING_URL="{% raw %}${{ steps.fetch-url.outputs._staging_url }}{% endraw %}"
-          pip install locust==2.31.1{%- if cookiecutter.is_a2a %} a2a-sdk~=0.3.9{%- endif %}
+          pip install locust==2.31.1{%- if cookiecutter.is_a2a %} a2a-sdk~=0.3.22{%- endif %}
           locust -f tests/load_test/load_test.py \
           --headless \
           -H ${_STAGING_URL} \

agent_starter_pack/cli/utils/template.py

@@ -404,7 +404,7 @@ def get_available_agents(deployment_target: str | None = None) -> dict:
         "adk_a2a": 1,
         "adk_live": 2,
         "agentic_rag": 3,
-        "langgraph": 0,
+        "langgraph": 4,  # displayed as "custom_a2a"
         "adk_go": 0,
         "adk_java": 0,
     }

agent_starter_pack/deployment_targets/agent_engine/python/{{cookiecutter.agent_directory}}/agent_engine_app.py

@@ -172,9 +172,11 @@ def clone(self) -> "AgentEngineApp":
 {%- else %}
 agent_engine = AgentEngineApp(
     app=adk_app,
-    artifact_service_builder=lambda: GcsArtifactService(bucket_name=logs_bucket_name)
-    if logs_bucket_name
-    else InMemoryArtifactService(),
+    artifact_service_builder=lambda: (
+        GcsArtifactService(bucket_name=logs_bucket_name)
+        if logs_bucket_name
+        else InMemoryArtifactService()
+    ),
 )
 {%- endif -%}
 {% else %}

agent_starter_pack/deployment_targets/cloud_run/python/tests/load_test/README.md

@@ -99,7 +99,7 @@ uv run uvicorn {{cookiecutter.agent_directory}}.fast_api_app:app --host 0.0.0.0
 Using another terminal tab, This is suggested to avoid conflicts with the existing application python environment.
 
 ```bash
-python3 -m venv .locust_env && source .locust_env/bin/activate && pip install locust==2.31.1{%- if cookiecutter.is_a2a %} a2a-sdk~=0.3.9{%- endif %}
+python3 -m venv .locust_env && source .locust_env/bin/activate && pip install locust==2.31.1{%- if cookiecutter.is_a2a %} a2a-sdk~=0.3.22{%- endif %}
 ```
 
 **3. Execute the Load Test:**
@@ -150,7 +150,7 @@ export _ID_TOKEN=$(gcloud auth print-identity-token -q)
 **3. Execute the Load Test:**
 Create virtual environment with Locust:
 ```bash
-python3 -m venv .locust_env && source .locust_env/bin/activate && pip install locust==2.31.1{%- if cookiecutter.is_a2a %} a2a-sdk~=0.3.9{%- endif %}
+python3 -m venv .locust_env && source .locust_env/bin/activate && pip install locust==2.31.1{%- if cookiecutter.is_a2a %} a2a-sdk~=0.3.22{%- endif %}
 ```
 
 Execute load tests. The following command executes the same load test parameters as the local test but targets your remote Cloud Run instance.