Merge branch 'main' into v1.25.0

AGENTS.md

@@ -187,7 +187,8 @@ uv venv --python "python3.11" ".venv" source .venv/bin/activate
 
 uv sync --all-extras ```
 
-**Minimal setup for testing only (matches CI):** `bash uv sync --extra test`
+**Minimal setup for testing only (matches CI):** `bash uv sync --extra test
+--extra eval --extra a2a`
 
 **Virtual Environment Usage (Required):** - **Always use** `.venv/bin/python` or
 `.venv/bin/pytest` directly - **Or activate** with `source .venv/bin/activate`
@@ -362,7 +363,7 @@ catching issues with the public API.
 **Quick start:** Run all tests with: `bash pytest tests/unittests`
 
 **Recommended:** Match CI configuration before submitting PRs: `bash uv sync
---extra test && pytest tests/unittests`
+--extra test --extra eval --extra a2a && pytest tests/unittests`
 
 **Additional options:** ```bash
 

CONTRIBUTING.md

@@ -180,11 +180,11 @@ part before or alongside your code PR.
     pytest ./tests/unittests
     ```
 
-    NOTE: for accurate repro of test failure, only include `test` as extra
-    dependencies.
+    NOTE: for accurate repro of test failure, only include `test`, `eval` and
+    `a2a` as extra dependencies.
 
     ```shell
-    uv sync --extra test
+    uv sync --extra test --extra eval --extra a2a
     pytest ./tests/unittests
     ```
 

contributing/samples/core_generate_content_config_config/root_agent.yaml

@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/google/adk-python/refs/heads/main/src/google/adk/agents/config_schemas/AgentConfig.json
 name: search_agent
-model: gemini-2.5-flash
+model: gemini-2.0-flash
 description: 'an agent whose job it is to perform Google search queries and answer questions about the results.'
 instruction: You are an agent whose job is to perform Google search queries and answer questions about the results.
 tools:
@@ -8,5 +8,3 @@ tools:
 generate_content_config:
   temperature: 0.1
   max_output_tokens: 2000
-  thinking_config:
-    include_thoughts: true

pyproject.toml

@@ -111,6 +111,7 @@ eval = [
   "google-cloud-aiplatform[evaluation]>=1.100.0",
   "pandas>=2.2.3",
   "rouge-score>=0.1.2",
+  "scipy<1.16; python_version<'3.11'",
   "tabulate>=0.9.0",
   # go/keep-sorted end
 ]

scripts/unittests.sh

@@ -94,7 +94,7 @@ for version in "${versions_to_run[@]}"; do
 
     # 3. perform the unit tests
     echo "Setting up test environment in .unittest_venv..."
-    uv sync --extra test --active
+    uv sync --extra test --extra eval --extra a2a --active
 
     echo "Running unit tests..."
     TEST_EXIT_CODE=0