Merge branch 'main' into olliefr-4500

Author: olliefr

.github/release-please-config.json

@@ -4,6 +4,7 @@
   "packages": {
     ".": {
       "release-type": "python",
+      "versioning": "always-bump-minor",
       "package-name": "google-adk",
       "include-component-in-tag": false,
       "skip-github-release": true,

.github/workflows/check-file-contents.yml

@@ -30,8 +30,8 @@ jobs:
 
       - name: Check for logger pattern in all changed Python files
         run: |
-          git fetch origin ${{ github.base_ref }}
-          CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${{ github.base_ref }}...HEAD | grep -E '\.py$' || true)
+          git fetch origin ${GITHUB_BASE_REF}
+          CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${GITHUB_BASE_REF}...HEAD | grep -E '\.py$' || true)
           if [ -n "$CHANGED_FILES" ]; then
             echo "Changed Python files to check:"
             echo "$CHANGED_FILES"
@@ -61,8 +61,8 @@ jobs:
 
       - name: Check for import pattern in certain changed Python files
         run: |
-          git fetch origin ${{ github.base_ref }}
-          CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${{ github.base_ref }}...HEAD | grep -E '\.py$' | grep -v -E '__init__.py$|version.py$|tests/.*|contributing/samples/' || true)
+          git fetch origin ${GITHUB_BASE_REF}
+          CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${GITHUB_BASE_REF}...HEAD | grep -E '\.py$' | grep -v -E '__init__.py$|version.py$|tests/.*|contributing/samples/' || true)
           if [ -n "$CHANGED_FILES" ]; then
             echo "Changed Python files to check:"
             echo "$CHANGED_FILES"
@@ -88,8 +88,8 @@ jobs:
 
       - name: Check for import from cli package in certain changed Python files
         run: |
-          git fetch origin ${{ github.base_ref }}
-          CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${{ github.base_ref }}...HEAD | grep -E '\.py$' | grep -v -E 'cli/.*|src/google/adk/tools/apihub_tool/apihub_toolset.py|tests/.*|contributing/samples/' || true)
+          git fetch origin ${GITHUB_BASE_REF}
+          CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${GITHUB_BASE_REF}...HEAD | grep -E '\.py$' | grep -v -E 'cli/.*|src/google/adk/tools/apihub_tool/apihub_toolset.py|tests/.*|contributing/samples/' || true)
           if [ -n "$CHANGED_FILES" ]; then
             echo "Changed Python files to check:"
             echo "$CHANGED_FILES"
@@ -110,4 +110,4 @@ jobs:
             fi
           else
             echo "✅ No relevant Python files found."
-          fi
+          fi

.github/workflows/isort.yml

@@ -42,8 +42,8 @@ jobs:
       - name: Run isort on changed files
         id: run_isort
         run: |
-          git fetch origin ${{ github.base_ref }}
-          CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${{ github.base_ref }}...HEAD | grep -E '\.py$' || true)
+          git fetch origin ${GITHUB_BASE_REF}
+          CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${GITHUB_BASE_REF}...HEAD | grep -E '\.py$' || true)
           if [ -n "$CHANGED_FILES" ]; then
             echo "Changed Python files:"
             echo "$CHANGED_FILES"

.github/workflows/pyink.yml

@@ -42,8 +42,8 @@ jobs:
       - name: Run pyink on changed files
         id: run_pyink
         run: |
-          git fetch origin ${{ github.base_ref }}
-          CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${{ github.base_ref }}...HEAD | grep -E '\.py$' || true)
+          git fetch origin ${GITHUB_BASE_REF}
+          CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${GITHUB_BASE_REF}...HEAD | grep -E '\.py$' || true)
           if [ -n "$CHANGED_FILES" ]; then
             echo "Changed Python files:"
             echo "$CHANGED_FILES"

.github/workflows/release-cherry-pick.yml

@@ -30,8 +30,10 @@ jobs:
 
       - name: Cherry-pick commit
         run: |
-          echo "Cherry-picking ${{ inputs.commit_sha }} to release/candidate"
-          git cherry-pick ${{ inputs.commit_sha }}
+          echo "Cherry-picking ${INPUTS_COMMIT_SHA} to release/candidate"
+          git cherry-pick ${INPUTS_COMMIT_SHA}
+        env:
+          INPUTS_COMMIT_SHA: ${{ inputs.commit_sha }}
 
       - name: Push changes
         run: |

.github/workflows/release-finalize.yml

@@ -68,9 +68,11 @@ jobs:
       - name: Rename release/candidate to release/v{version}
         if: steps.check.outputs.is_release_pr == 'true'
         run: |
-          VERSION="v${{ steps.version.outputs.version }}"
+          VERSION="v${STEPS_VERSION_OUTPUTS_VERSION}"
           git push origin "release/candidate:refs/heads/release/$VERSION" ":release/candidate"
           echo "Renamed release/candidate to release/$VERSION"
+        env:
+          STEPS_VERSION_OUTPUTS_VERSION: ${{ steps.version.outputs.version }}
 
       - name: Update PR label to tagged
         if: steps.check.outputs.is_release_pr == 'true'

.github/workflows/release-publish.yml

@@ -15,15 +15,15 @@ jobs:
     steps:
       - name: Validate branch
         run: |
-          if [[ ! "${{ github.ref_name }}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+          if [[ ! "${GITHUB_REF_NAME}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
             echo "Error: Must run from a release/v* branch (e.g., release/v0.3.0)"
             exit 1
           fi
 
       - name: Extract version
         id: version
         run: |
-          VERSION="${{ github.ref_name }}"
+          VERSION="${GITHUB_REF_NAME}"
           VERSION="${VERSION#release/v}"
           echo "version=$VERSION" >> $GITHUB_OUTPUT
           echo "Publishing version: $VERSION"
@@ -51,9 +51,10 @@ jobs:
       - name: Create merge-back PR
         env:
           GH_TOKEN: ${{ secrets.RELEASE_PAT }}
+          STEPS_VERSION_OUTPUTS_VERSION: ${{ steps.version.outputs.version }}
         run: |
           gh pr create \
             --base main \
-            --head "${{ github.ref_name }}" \
-            --title "chore: merge release v${{ steps.version.outputs.version }} to main" \
-            --body "Syncs version bump and CHANGELOG from release v${{ steps.version.outputs.version }} to main."
+            --head "${GITHUB_REF_NAME}" \
+            --title "chore: merge release v${STEPS_VERSION_OUTPUTS_VERSION} to main" \
+            --body "Syncs version bump and CHANGELOG from release v${STEPS_VERSION_OUTPUTS_VERSION} to main."

contributing/samples/bigtable/agent.py

@@ -16,14 +16,17 @@
 
 from google.adk.agents.llm_agent import LlmAgent
 from google.adk.auth.auth_credential import AuthCredentialTypes
+from google.adk.tools.bigtable import query_tool as bigtable_query_tool
 from google.adk.tools.bigtable.bigtable_credentials import BigtableCredentialsConfig
 from google.adk.tools.bigtable.bigtable_toolset import BigtableToolset
 from google.adk.tools.bigtable.settings import BigtableToolSettings
+from google.adk.tools.google_tool import GoogleTool
 import google.auth
+from google.cloud.bigtable.data.execute_query.metadata import SqlType
 
-# Define an appropriate credential type
-CREDENTIALS_TYPE = AuthCredentialTypes.OAUTH2
-
+# Define an appropriate credential type.
+# None for Application Default Credentials
+CREDENTIALS_TYPE = None
 
 # Define Bigtable tool config with read capability set to allowed.
 tool_settings = BigtableToolSettings()
@@ -59,6 +62,53 @@
     credentials_config=credentials_config, bigtable_tool_settings=tool_settings
 )
 
+_BIGTABLE_PROJECT_ID = "google.com:cloud-bigtable-dev"
+_BIGTABLE_INSTANCE_ID = "annenguyen-bus-instance"
+
+
+def search_hotels_by_location(
+    location_name: str,
+    credentials: google.auth.credentials.Credentials,
+    settings: BigtableToolSettings,
+    tool_context: google.adk.tools.tool_context.ToolContext,
+):
+  """Search hotels by location name.
+
+  This function takes a location name and returns a list of hotels
+  in that area.
+
+  Args:
+    location_name (str): The geographical location (e.g., city or town) for the
+      hotel search.
+    Example: { "location_name": "Basel" }
+
+  Returns:
+      The hotels name, price tier.
+  """
+
+  sql_template = """
+  SELECT
+    TO_INT64(cf['id']) as id,
+    CAST(cf['name'] AS STRING) AS name,
+    CAST(cf['location'] AS STRING) AS location,
+    CAST(cf['price_tier'] AS STRING) AS price_tier,
+    CAST(cf['checkin_date'] AS STRING) AS checkin_date,
+    CAST(cf['checkout_date'] AS STRING) AS checkout_date
+  FROM hotels
+  WHERE LOWER(CAST(cf['location'] AS STRING)) LIKE LOWER(CONCAT('%', @location_name, '%'))
+  """
+  return bigtable_query_tool.execute_sql(
+      project_id=_BIGTABLE_PROJECT_ID,
+      instance_id=_BIGTABLE_INSTANCE_ID,
+      query=sql_template,
+      credentials=credentials,
+      settings=settings,
+      tool_context=tool_context,
+      parameters={"location": location_name},
+      parameter_types={"location": SqlType.String()},
+  )
+
+
 # The variable name `root_agent` determines what your root agent is for the
 # debug CLI
 root_agent = LlmAgent(
@@ -72,5 +122,13 @@
         You are a data agent with access to several Bigtable tools.
         Make use of those tools to answer the user's questions.
     """,
-    tools=[bigtable_toolset],
+    tools=[
+        bigtable_toolset,
+        # Or, uncomment to use customized Bigtable tools.
+        # GoogleTool(
+        #     func=search_hotels_by_location,
+        #     credentials_config=credentials_config,
+        #     tool_settings=tool_settings,
+        # ),
+    ],
 )

src/google/adk/a2a/agent/__init__.py

@@ -0,0 +1,25 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""A2A agents package."""
+
+from .config import A2aRemoteAgentConfig
+from .config import ParametersConfig
+from .config import RequestInterceptor
+
+__all__ = [
+    "A2aRemoteAgentConfig",
+    "ParametersConfig",
+    "RequestInterceptor",
+]

src/google/adk/a2a/agent/config.py

@@ -0,0 +1,76 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Configuration for A2A agents."""
+
+from __future__ import annotations
+
+from typing import Any
+from typing import Awaitable
+from typing import Callable
+from typing import Optional
+from typing import Union
+
+from a2a.client.middleware import ClientCallContext
+from a2a.server.events import Event as A2AEvent
+from a2a.types import Message as A2AMessage
+from a2a.types import MessageSendConfiguration
+from pydantic import BaseModel
+
+from ...agents.invocation_context import InvocationContext
+from ...events.event import Event
+
+
+class ParametersConfig(BaseModel):
+  """Configuration for the parameters passed to the A2A send_message request."""
+
+  request_metadata: Optional[dict[str, Any]] = None
+  client_call_context: Optional[ClientCallContext] = None
+  # TODO: Add support for requested_extension and
+  # message_send_configuration once they are supported by the A2A client.
+  #
+  # requested_extension: Optional[list[str]] = None
+  # message_send_configuration: Optional[MessageSendConfiguration] = None
+
+
+class RequestInterceptor(BaseModel):
+  """Interceptor for A2A requests."""
+
+  before_request: Optional[
+      Callable[
+          [InvocationContext, A2AMessage, ParametersConfig],
+          Awaitable[tuple[Union[A2AMessage, Event], ParametersConfig]],
+      ]
+  ] = None
+  """Hook executed before the agent starts processing the request.
+
+    Returns an Event if the request should be aborted and the Event
+    returned to the caller.
+  """
+
+  after_request: Optional[
+      Callable[
+          [InvocationContext, A2AEvent, Event], Awaitable[Union[Event, None]]
+      ]
+  ] = None
+  """Hook executed after the agent has processed the request.
+
+    Returns None if the event should not be sent to the caller.
+  """
+
+
+class A2aRemoteAgentConfig(BaseModel):
+  """Configuration for the RemoteA2aAgent."""
+
+  request_interceptors: Optional[list[RequestInterceptor]] = None