Merge branch 'main' into sample/a2a-state-forwarding

Author: rohityan

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.27.2"
+  ".": "1.30.0"
 }

.github/release-please-config.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
-  "last-release-sha": "7b94a767337e0d642e808734608f07a70e077c62",
+  "last-release-sha": "80a7ecf4b31e4c6de4a1425b03422f384c1a032d",
   "packages": {
     ".": {
       "release-type": "python",

.github/workflows/analyze-releases-for-adk-docs-updates.yml

@@ -6,6 +6,20 @@ on:
     types: [published]
   # Manual trigger for testing and retrying.
   workflow_dispatch:
+    inputs:
+      resume:
+        description: 'Resume from the last failed/interrupted run'
+        required: false
+        type: boolean
+        default: false
+      start_tag:
+        description: 'Older release tag (base), e.g. v1.26.0'
+        required: false
+        type: string
+      end_tag:
+        description: 'Newer release tag (head), e.g. v1.27.0'
+        required: false
+        type: string
 
 jobs:
   analyze-new-release-for-adk-docs-updates:
@@ -33,6 +47,13 @@ jobs:
           python -m pip install --upgrade pip
           pip install requests google-adk
 
+      - name: Restore session DB from cache
+        if: ${{ github.event.inputs.resume == 'true' }}
+        uses: actions/cache/restore@v4
+        with:
+          path: contributing/samples/adk_documentation/adk_release_analyzer/sessions.db
+          key: analyzer-session-db
+
       - name: Run Analyzing Script
         env:
           GITHUB_TOKEN: ${{ secrets.ADK_TRIAGE_AGENT }}
@@ -44,4 +65,15 @@ jobs:
           CODE_REPO: 'adk-python'
           INTERACTIVE: 0
           PYTHONPATH: contributing/samples/adk_documentation
-        run: python -m adk_release_analyzer.main
+        run: >-
+          python -m adk_release_analyzer.main
+          ${{ github.event.inputs.resume == 'true' && '--resume' || '' }}
+          ${{ github.event.inputs.start_tag && format('--start-tag {0}', github.event.inputs.start_tag) || '' }}
+          ${{ github.event.inputs.end_tag && format('--end-tag {0}', github.event.inputs.end_tag) || '' }}
+
+      - name: Save session DB to cache
+        if: always()
+        uses: actions/cache/save@v4
+        with:
+          path: contributing/samples/adk_documentation/adk_release_analyzer/sessions.db
+          key: analyzer-session-db

.github/workflows/release-v2-publish.yml

@@ -1,5 +1,6 @@
 # Step 6 (v2): Builds and publishes the v2 package to PyPI from a release/v{version} branch.
-# Converts semver pre-release version to PEP 440 format before building.
+# Reads version from .release-please-manifest-v2.json, converts to PEP 440,
+# updates version.py, then builds and publishes.
 # Creates a merge-back PR (step 7) to sync release changes to v2.
 name: "Release v2: Publish to PyPi"
 
@@ -17,15 +18,16 @@ jobs:
       - name: Validate branch
         run: |
           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/v2.0.0-alpha.1)"
+            echo "Error: Must run from a release/v* branch (e.g., release/v2.0.0-alpha.2)"
             exit 1
           fi
 
-      - name: Extract and convert version to PEP 440
+      - uses: actions/checkout@v6
+
+      - name: Extract version from manifest and convert to PEP 440
         id: version
         run: |
-          VERSION="${GITHUB_REF_NAME}"
-          VERSION="${VERSION#release/v}"
+          VERSION=$(jq -r '.["."]' .github/.release-please-manifest-v2.json)
           echo "semver=$VERSION" >> $GITHUB_OUTPUT
           echo "Semver version: $VERSION"
 
@@ -38,8 +40,6 @@ jobs:
           echo "pep440=$PEP440" >> $GITHUB_OUTPUT
           echo "PEP 440 version: $PEP440"
 
-      - uses: actions/checkout@v6
-
       - name: Install uv
         uses: astral-sh/setup-uv@v4
         with:
@@ -50,13 +50,13 @@ jobs:
         with:
           python-version: "3.11"
 
-      - name: Update pyproject.toml with PEP 440 version
+      - name: Update version.py with PEP 440 version
         env:
           PEP440_VERSION: ${{ steps.version.outputs.pep440 }}
         run: |
-          # Update version in pyproject.toml if it differs from PEP 440
-          sed -i "s/^version = .*/version = \"${PEP440_VERSION}\"/" pyproject.toml
-          echo "Updated pyproject.toml version to ${PEP440_VERSION}"
+          sed -i "s/^__version__ = .*/__version__ = \"${PEP440_VERSION}\"/" src/google/adk/version.py
+          echo "Updated version.py to ${PEP440_VERSION}"
+          grep __version__ src/google/adk/version.py
 
       - name: Build package
         run: uv build

.github/workflows/triage.yml

@@ -17,8 +17,7 @@ jobs:
     if: >-
       github.repository == 'google/adk-python' && (
         github.event_name == 'schedule' ||
-        github.event.action == 'opened' ||
-        github.event.label.name == 'planned'
+        github.event.action == 'opened'
       )
     permissions:
       issues: write