Skip to content

Commit 320bbdb

Browse files
authored
Merge branch 'google:main' into Issue-google#4796
2 parents 5d4bd49 + 62d7ee0 commit 320bbdb

306 files changed

Lines changed: 29909 additions & 6809 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.27.4"
2+
".": "1.31.0"
33
}

‎.github/release-please-config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
3-
"last-release-sha": "066fcec3e8e669d1c5360e1556afce3f7e068072",
3+
"last-release-sha": "d69477f6ff348311e1d53e3f2c389dcf037fb049",
44
"packages": {
55
".": {
66
"release-type": "python",

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

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,20 @@ on:
66
types: [published]
77
# Manual trigger for testing and retrying.
88
workflow_dispatch:
9+
inputs:
10+
resume:
11+
description: 'Resume from the last failed/interrupted run'
12+
required: false
13+
type: boolean
14+
default: false
15+
start_tag:
16+
description: 'Older release tag (base), e.g. v1.26.0'
17+
required: false
18+
type: string
19+
end_tag:
20+
description: 'Newer release tag (head), e.g. v1.27.0'
21+
required: false
22+
type: string
923

1024
jobs:
1125
analyze-new-release-for-adk-docs-updates:
@@ -33,6 +47,13 @@ jobs:
3347
python -m pip install --upgrade pip
3448
pip install requests google-adk
3549
50+
- name: Restore session DB from cache
51+
if: ${{ github.event.inputs.resume == 'true' }}
52+
uses: actions/cache/restore@v4
53+
with:
54+
path: contributing/samples/adk_documentation/adk_release_analyzer/sessions.db
55+
key: analyzer-session-db
56+
3657
- name: Run Analyzing Script
3758
env:
3859
GITHUB_TOKEN: ${{ secrets.ADK_TRIAGE_AGENT }}
@@ -44,4 +65,15 @@ jobs:
4465
CODE_REPO: 'adk-python'
4566
INTERACTIVE: 0
4667
PYTHONPATH: contributing/samples/adk_documentation
47-
run: python -m adk_release_analyzer.main
68+
run: >-
69+
python -m adk_release_analyzer.main
70+
${{ github.event.inputs.resume == 'true' && '--resume' || '' }}
71+
${{ github.event.inputs.start_tag && format('--start-tag {0}', github.event.inputs.start_tag) || '' }}
72+
${{ github.event.inputs.end_tag && format('--end-tag {0}', github.event.inputs.end_tag) || '' }}
73+
74+
- name: Save session DB to cache
75+
if: always()
76+
uses: actions/cache/save@v4
77+
with:
78+
path: contributing/samples/adk_documentation/adk_release_analyzer/sessions.db
79+
key: analyzer-session-db

‎.github/workflows/pre-commit.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Copyright 2026 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
name: pre-commit
16+
17+
on:
18+
push:
19+
branches: [main, v2]
20+
paths:
21+
- '**.py'
22+
- '.pre-commit-config.yaml'
23+
- 'pyproject.toml'
24+
pull_request:
25+
branches: [main, v2]
26+
paths:
27+
- '**.py'
28+
- '.pre-commit-config.yaml'
29+
- 'pyproject.toml'
30+
31+
jobs:
32+
pre-commit:
33+
runs-on: ubuntu-latest
34+
steps:
35+
- name: Checkout Code
36+
uses: actions/checkout@v6
37+
38+
- name: Run pre-commit checks
39+
uses: pre-commit/[email protected]

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Step 6 (v2): Builds and publishes the v2 package to PyPI from a release/v{version} branch.
2-
# Converts semver pre-release version to PEP 440 format before building.
2+
# Reads version from .release-please-manifest-v2.json, converts to PEP 440,
3+
# updates version.py, then builds and publishes.
34
# Creates a merge-back PR (step 7) to sync release changes to v2.
45
name: "Release v2: Publish to PyPi"
56

@@ -17,15 +18,16 @@ jobs:
1718
- name: Validate branch
1819
run: |
1920
if [[ ! "${GITHUB_REF_NAME}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+ ]]; then
20-
echo "Error: Must run from a release/v* branch (e.g., release/v2.0.0-alpha.1)"
21+
echo "Error: Must run from a release/v* branch (e.g., release/v2.0.0-alpha.2)"
2122
exit 1
2223
fi
2324
24-
- name: Extract and convert version to PEP 440
25+
- uses: actions/checkout@v6
26+
27+
- name: Extract version from manifest and convert to PEP 440
2528
id: version
2629
run: |
27-
VERSION="${GITHUB_REF_NAME}"
28-
VERSION="${VERSION#release/v}"
30+
VERSION=$(jq -r '.["."]' .github/.release-please-manifest-v2.json)
2931
echo "semver=$VERSION" >> $GITHUB_OUTPUT
3032
echo "Semver version: $VERSION"
3133
@@ -38,8 +40,6 @@ jobs:
3840
echo "pep440=$PEP440" >> $GITHUB_OUTPUT
3941
echo "PEP 440 version: $PEP440"
4042
41-
- uses: actions/checkout@v6
42-
4343
- name: Install uv
4444
uses: astral-sh/setup-uv@v4
4545
with:
@@ -50,13 +50,13 @@ jobs:
5050
with:
5151
python-version: "3.11"
5252

53-
- name: Update pyproject.toml with PEP 440 version
53+
- name: Update version.py with PEP 440 version
5454
env:
5555
PEP440_VERSION: ${{ steps.version.outputs.pep440 }}
5656
run: |
57-
# Update version in pyproject.toml if it differs from PEP 440
58-
sed -i "s/^version = .*/version = \"${PEP440_VERSION}\"/" pyproject.toml
59-
echo "Updated pyproject.toml version to ${PEP440_VERSION}"
57+
sed -i "s/^__version__ = .*/__version__ = \"${PEP440_VERSION}\"/" src/google/adk/version.py
58+
echo "Updated version.py to ${PEP440_VERSION}"
59+
grep __version__ src/google/adk/version.py
6060
6161
- name: Build package
6262
run: uv build

‎.github/workflows/triage.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ jobs:
1717
if: >-
1818
github.repository == 'google/adk-python' && (
1919
github.event_name == 'schedule' ||
20-
github.event.action == 'opened' ||
21-
github.event.label.name == 'planned'
20+
github.event.action == 'opened'
2221
)
2322
permissions:
2423
issues: write

0 commit comments

Comments
 (0)