Merge branch 'main' into feat/dns-aid-integration

Author: IngmarVG-IB

.github/.release-please-manifest.json

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

.github/ISSUE_TEMPLATE/feature_request.md

@@ -45,4 +45,4 @@ If you have ideas on how this should look in code, please share a
 pseudo-code example.
 
 ### Additional Context
-Add any other context or screenshots about the feature request here.
+Add any other context or screenshots about the feature request here.

.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": "d69477f6ff348311e1d53e3f2c389dcf037fb049",
   "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/isort.yml

@@ -33,38 +33,38 @@ jobs:
           git checkout origin/main
 
           git checkout ${{ github.sha }} -- pyproject.toml
-          
+
           # Install dependencies for main
           uv venv .venv
           source .venv/bin/activate
           uv sync --all-extras
-          
+
           # Run mypy, filter for errors only, remove line numbers (file:123: -> file::), and sort
           # We ignore exit code (|| true) because we expect errors on main
           uv run mypy . | grep "error:" | sed 's/:\([0-9]\+\):/::/g' | sort > main_errors.txt || true
-          
+
           echo "Found $(wc -l < main_errors.txt) errors on main."
 
       - name: Check PR Branch
         run: |
           # Switch back to the PR commit
           git checkout ${{ github.sha }}
-          
+
           # Re-sync dependencies in case the PR changed them
           source .venv/bin/activate
           uv sync --all-extras
-          
+
           # Run mypy on PR code, apply same processing
           uv run mypy . | grep "error:" | sed 's/:\([0-9]\+\):/::/g' | sort > pr_errors.txt || true
-          
+
           echo "Found $(wc -l < pr_errors.txt) errors on PR branch."
 
       - name: Compare and Fail on New Errors
         run: |
-          # 'comm -13' suppresses unique lines in file1 (main) and common lines, 
+          # 'comm -13' suppresses unique lines in file1 (main) and common lines,
           # leaving only lines unique to file2 (PR) -> The new errors.
           comm -13 main_errors.txt pr_errors.txt > new_errors.txt
-          
+
           if [ -s new_errors.txt ]; then
             echo "::error::The following NEW mypy errors were introduced:"
             cat new_errors.txt

.github/workflows/mypy-new-errors.yml

@@ -0,0 +1,39 @@
+# 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.
+
+name: Pre-commit Checks
+
+on:
+  push:
+    branches: [main, v2]
+    paths:
+      - '**.py'
+      - '.pre-commit-config.yaml'
+      - 'pyproject.toml'
+  pull_request:
+    branches: [main, v2]
+    paths:
+      - '**.py'
+      - '.pre-commit-config.yaml'
+      - 'pyproject.toml'
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v6
+
+      - name: Run pre-commit checks
+        uses: pre-commit/action@v3.0.1

.github/workflows/pre-commit.yml

@@ -50,4 +50,4 @@ jobs:
         source .venv/bin/activate
         pytest tests/unittests \
           --ignore=tests/unittests/artifacts/test_artifact_service.py \
-          --ignore=tests/unittests/tools/google_api_tool/test_googleapi_to_openapi_converter.py
+          --ignore=tests/unittests/tools/google_api_tool/test_googleapi_to_openapi_converter.py

.github/workflows/pyink.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