Merge branch 'main' into fix-issue-1641-database-session-service

Author: DeanChensj

.github/workflows/pr-commit-check.yml

@@ -0,0 +1,62 @@
+# .github/workflows/pr-commit-check.yml
+# This GitHub Action workflow checks if a pull request has more than one commit.
+# If it does, it fails the check and instructs the user to squash their commits.
+
+name: 'PR Commit Check'
+
+# This workflow runs on pull request events.
+# It's configured to run on any pull request that is opened or synchronized (new commits pushed).
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+# Defines the jobs that will run as part of the workflow.
+jobs:
+  check-commit-count:
+    # The type of runner that the job will run on. 'ubuntu-latest' is a good default.
+    runs-on: ubuntu-latest
+
+    # The steps that will be executed as part of the job.
+    steps:
+      # Step 1: Check out the code
+      # This action checks out your repository under $GITHUB_WORKSPACE, so your workflow can access it.
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          # We need to fetch all commits to accurately count them.
+          # '0' means fetch all history for all branches and tags.
+          fetch-depth: 0
+
+      # Step 2: Count the commits in the pull request
+      # This step runs a script to get the number of commits in the PR.
+      - name: Count Commits
+        id: count_commits
+        # We use `git rev-list --count` to count the commits.
+        # ${{ github.event.pull_request.base.sha }} is the commit SHA of the base branch.
+        # ${{ github.event.pull_request.head.sha }} is the commit SHA of the head branch (the PR branch).
+        # The '..' syntax gives us the list of commits in the head branch that are not in the base branch.
+        # The output of the command (the count) is stored in a step output variable named 'count'.
+        run: |
+          count=$(git rev-list --count ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }})
+          echo "commit_count=$count" >> $GITHUB_OUTPUT
+
+      # Step 3: Check if the commit count is greater than 1
+      # This step uses the output from the previous step to decide whether to pass or fail.
+      - name: Check Commit Count
+        # This step only runs if the 'commit_count' output from the 'count_commits' step is greater than 1.
+        if: steps.count_commits.outputs.commit_count > 1
+        # If the condition is met, the workflow will exit with a failure status.
+        run: |
+          echo "This pull request has ${{ steps.count_commits.outputs.commit_count }} commits."
+          echo "Please squash them into a single commit before merging."
+          echo "You can use git rebase -i HEAD~N"
+          echo "...where N is the number of commits you want to squash together. The PR check conveniently tells you this number! For example, if the check says you have 3 commits, you would run: git rebase -i HEAD~3."
+          echo "Because you have rewritten the commit history, you must use the --force flag to update the pull request: git push --force"
+          exit 1
+
+      # Step 4: Success message
+      # This step runs if the commit count is not greater than 1 (i.e., it's 1).
+      - name: Success
+        if: steps.count_commits.outputs.commit_count <= 1
+        run: |
+          echo "This pull request has a single commit. Great job!"

CONTRIBUTING.md

@@ -147,11 +147,11 @@ For any changes that impact user-facing documentation (guides, API reference, tu
     pytest ./tests/unittests
     ```
 
-    NOTE: for accurately repro test failure, only include `test` and `eval` as
-    extra dependencies.
+    NOTE: for accurate repro of test failure, only include `test`, `eval` and 
+    `a2a` as extra dependencies.
 
     ```shell
-    uv sync --extra test --extra eval
+    uv sync --extra test --extra eval --extra a2a
     pytest ./tests/unittests
     ```
 

pyproject.toml

@@ -95,7 +95,8 @@ test = [
   # go/keep-sorted start
   "anthropic>=0.43.0",               # For anthropic model tests
   "langchain-community>=0.3.17",
-  "langgraph>=0.2.60",               # For LangGraphAgent
+  # langgraph 0.5 removed langgraph.graph.graph which we depend on
+  "langgraph>=0.2.60, <= 0.4.10",    # For LangGraphAgent
   "litellm>=1.71.2",                 # For LiteLLM tests
   "llama-index-readers-file>=0.4.0", # For retrieval tests
   "pytest-asyncio>=0.25.0",

src/google/adk/a2a/converters/part_converter.py

@@ -21,18 +21,18 @@
 import base64
 import json
 import logging
-import sys
 from typing import Optional
 
 from .utils import _get_adk_metadata_key
 
 try:
   from a2a import types as a2a_types
 except ImportError as e:
+  import sys
+
   if sys.version_info < (3, 10):
     raise ImportError(
-        'A2A Tool requires Python 3.10 or above. Please upgrade your Python'
-        ' version.'
+        'A2A requires Python 3.10 or above. Please upgrade your Python version.'
     ) from e
   else:
     raise e

src/google/adk/a2a/converters/request_converter.py

@@ -33,37 +33,19 @@
 from ...runners import RunConfig
 from ...utils.feature_decorator import working_in_progress
 from .part_converter import convert_a2a_part_to_genai_part
-from .utils import _from_a2a_context_id
-from .utils import _get_adk_metadata_key
 
 
-def _get_user_id(request: RequestContext, user_id_from_context: str) -> str:
+def _get_user_id(request: RequestContext) -> str:
   # Get user from call context if available (auth is enabled on a2a server)
-  if request.call_context and request.call_context.user:
+  if (
+      request.call_context
+      and request.call_context.user
+      and request.call_context.user.user_name
+  ):
     return request.call_context.user.user_name
 
-  # Get user from context id if available
-  if user_id_from_context:
-    return user_id_from_context
-
-  # Get user from message metadata if available (client is an ADK agent)
-  if request.message.metadata:
-    user_id = request.message.metadata.get(_get_adk_metadata_key('user_id'))
-    if user_id:
-      return f'ADK_USER_{user_id}'
-
-  # Get user from task if available (client is a an ADK agent)
-  if request.current_task:
-    user_id = request.current_task.metadata.get(
-        _get_adk_metadata_key('user_id')
-    )
-    if user_id:
-      return f'ADK_USER_{user_id}'
-  return (
-      f'temp_user_{request.task_id}'
-      if request.task_id
-      else f'TEMP_USER_{request.message.messageId}'
-  )
+  # Get user from context id
+  return f'A2A_USER_{request.context_id}'
 
 
 @working_in_progress
@@ -74,11 +56,9 @@ def convert_a2a_request_to_adk_run_args(
   if not request.message:
     raise ValueError('Request message cannot be None')
 
-  _, user_id, session_id = _from_a2a_context_id(request.context_id)
-
   return {
-      'user_id': _get_user_id(request, user_id),
-      'session_id': session_id,
+      'user_id': _get_user_id(request),
+      'session_id': request.context_id,
       'new_message': genai_types.Content(
           role='user',
           parts=[

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

@@ -0,0 +1,13 @@
+# Copyright 2025 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.