Merge branch 'main' into feature/ollama-llm

Author: ayman3000

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

.github/workflows/release-finalize.yml

@@ -68,11 +68,9 @@ 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,10 +51,9 @@ 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/agents/invocation_context.py

@@ -396,23 +396,20 @@ def should_pause_invocation(self, event: Event) -> bool:
     return False
 
   # TODO: Move this method from invocation_context to a dedicated module.
-  # TODO: Converge this method with find_matching_function_call in llm_flows.
   def _find_matching_function_call(
       self, function_response_event: Event
   ) -> Optional[Event]:
     """Finds the function call event in the current invocation that matches the function response id."""
+    from ..flows.llm_flows.functions import find_event_by_function_call_id
+
     function_responses = function_response_event.get_function_responses()
     if not function_responses:
       return None
-    function_call_id = function_responses[0].id
-
-    events = self._get_events(current_invocation=True)
-    # The last event is function_response_event, so we search backwards from the
-    # one before it.
-    for event in reversed(events[:-1]):
-      if any(fc.id == function_call_id for fc in event.get_function_calls()):
-        return event
-    return None
+
+    # Search backwards from the event before the current response event.
+    return find_event_by_function_call_id(
+        self._get_events(current_invocation=True)[:-1], function_responses[0].id
+    )
 
 
 def new_invocation_context_id() -> str:

src/google/adk/flows/llm_flows/functions.py

@@ -37,7 +37,6 @@
 from google.genai import types
 
 from ...agents.active_streaming_tool import ActiveStreamingTool
-from ...agents.invocation_context import InvocationContext
 from ...agents.live_request_queue import LiveRequestQueue
 from ...auth.auth_tool import AuthConfig
 from ...auth.auth_tool import AuthToolArguments
@@ -52,6 +51,7 @@
 from ...utils.context_utils import Aclosing
 
 if TYPE_CHECKING:
+  from ...agents.invocation_context import InvocationContext
   from ...agents.llm_agent import LlmAgent
 
 AF_FUNCTION_CALL_ID_PREFIX = 'adk-'
@@ -1157,6 +1157,18 @@ def merge_parallel_function_response_events(
   return merged_event
 
 
+def find_event_by_function_call_id(
+    events: list[Event],
+    function_call_id: str,
+) -> Optional[Event]:
+  """Finds the function call event that matches the function call id."""
+  for event in reversed(events):
+    for function_call in event.get_function_calls():
+      if function_call.id == function_call_id:
+        return event
+  return None
+
+
 def find_matching_function_call(
     events: list[Event],
 ) -> Optional[Event]:
@@ -1165,25 +1177,8 @@ def find_matching_function_call(
     return None
 
   last_event = events[-1]
-  if (
-      last_event.content
-      and last_event.content.parts
-      and any(part.function_response for part in last_event.content.parts)
-  ):
+  function_responses = last_event.get_function_responses()
+  if not function_responses:
+    return None
 
-    function_call_id = next(
-        part.function_response.id
-        for part in last_event.content.parts
-        if part.function_response
-    )
-    for i in range(len(events) - 2, -1, -1):
-      event = events[i]
-      # looking for the system long-running request euc function call
-      function_calls = event.get_function_calls()
-      if not function_calls:
-        continue
-
-      for function_call in function_calls:
-        if function_call.id == function_call_id:
-          return event
-  return None
+  return find_event_by_function_call_id(events[:-1], function_responses[0].id)