Skip to content

Commit 4e8f01d

Browse files
authored
Merge branch 'main' into fix/issue-5584
2 parents d2aeb47 + ce578ff commit 4e8f01d

712 files changed

Lines changed: 51704 additions & 11769 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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "2.0.0-alpha.0"
3+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.26.0"
2+
".": "1.32.0"
33
}

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ If you have ideas on how this should look in code, please share a
4545
pseudo-code example.
4646

4747
### Additional Context
48-
Add any other context or screenshots about the feature request here.
48+
Add any other context or screenshots about the feature request here.
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
3+
"packages": {
4+
".": {
5+
"release-type": "python",
6+
"versioning": "prerelease",
7+
"prerelease": true,
8+
"prerelease-type": "alpha",
9+
"package-name": "google-adk",
10+
"include-component-in-tag": false,
11+
"skip-github-release": true,
12+
"changelog-path": "CHANGELOG-v2.md",
13+
"changelog-sections": [
14+
{
15+
"type": "feat",
16+
"section": "Features"
17+
},
18+
{
19+
"type": "fix",
20+
"section": "Bug Fixes"
21+
},
22+
{
23+
"type": "perf",
24+
"section": "Performance Improvements"
25+
},
26+
{
27+
"type": "refactor",
28+
"section": "Code Refactoring"
29+
},
30+
{
31+
"type": "docs",
32+
"section": "Documentation"
33+
},
34+
{
35+
"type": "test",
36+
"section": "Tests",
37+
"hidden": true
38+
},
39+
{
40+
"type": "build",
41+
"section": "Build System",
42+
"hidden": true
43+
},
44+
{
45+
"type": "ci",
46+
"section": "CI/CD",
47+
"hidden": true
48+
},
49+
{
50+
"type": "style",
51+
"section": "Styles",
52+
"hidden": true
53+
},
54+
{
55+
"type": "chore",
56+
"section": "Miscellaneous Chores",
57+
"hidden": true
58+
}
59+
]
60+
}
61+
}
62+
}

.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": "8f5428150d18ed732b66379c0acb806a9121c3cb",
3+
"last-release-sha": "5e49cfa6567a09e06409b0f380434f12f85a17c9",
44
"packages": {
55
".": {
66
"release-type": "python",

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

Lines changed: 34 additions & 2 deletions
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,15 +47,33 @@ 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 }}
39-
GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
60+
GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY_FOR_DOCS_AGENTS }}
4061
GOOGLE_GENAI_USE_VERTEXAI: 0
4162
DOC_OWNER: 'google'
4263
CODE_OWNER: 'google'
4364
DOC_REPO: 'adk-docs'
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/isort.yml

Lines changed: 0 additions & 69 deletions
This file was deleted.
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
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: ADK Issue Monitoring Agent
16+
17+
on:
18+
schedule:
19+
# Runs daily at 6:00 AM UTC
20+
- cron: '0 6 * * *'
21+
22+
# Allows manual triggering from the GitHub Actions tab
23+
workflow_dispatch:
24+
inputs:
25+
full_scan:
26+
description: 'Run an Initial Full Scan of ALL open issues'
27+
required: false
28+
type: boolean
29+
default: false
30+
31+
jobs:
32+
sweep-spam:
33+
runs-on: ubuntu-latest
34+
timeout-minutes: 120
35+
permissions:
36+
issues: write
37+
contents: read
38+
39+
steps:
40+
- name: Checkout repository
41+
uses: actions/checkout@v6
42+
43+
- name: Set up Python
44+
uses: actions/setup-python@v6
45+
with:
46+
python-version: '3.11'
47+
48+
- name: Install dependencies
49+
run: |
50+
python -m pip install --upgrade pip
51+
pip install requests google-adk python-dotenv
52+
53+
- name: Run Issue Monitoring Agent
54+
env:
55+
GITHUB_TOKEN: ${{ secrets.ADK_TRIAGE_AGENT }}
56+
GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
57+
OWNER: ${{ github.repository_owner }}
58+
REPO: ${{ github.event.repository.name }}
59+
CONCURRENCY_LIMIT: 3
60+
INITIAL_FULL_SCAN: ${{ github.event.inputs.full_scan == 'true' }}
61+
LLM_MODEL_NAME: "gemini-2.5-flash"
62+
PYTHONPATH: contributing/samples
63+
run: python -m adk_issue_monitoring_agent.main

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,38 +33,38 @@ jobs:
3333
git checkout origin/main
3434
3535
git checkout ${{ github.sha }} -- pyproject.toml
36-
36+
3737
# Install dependencies for main
3838
uv venv .venv
3939
source .venv/bin/activate
4040
uv sync --all-extras
41-
41+
4242
# Run mypy, filter for errors only, remove line numbers (file:123: -> file::), and sort
4343
# We ignore exit code (|| true) because we expect errors on main
4444
uv run mypy . | grep "error:" | sed 's/:\([0-9]\+\):/::/g' | sort > main_errors.txt || true
45-
45+
4646
echo "Found $(wc -l < main_errors.txt) errors on main."
4747
4848
- name: Check PR Branch
4949
run: |
5050
# Switch back to the PR commit
5151
git checkout ${{ github.sha }}
52-
52+
5353
# Re-sync dependencies in case the PR changed them
5454
source .venv/bin/activate
5555
uv sync --all-extras
56-
56+
5757
# Run mypy on PR code, apply same processing
5858
uv run mypy . | grep "error:" | sed 's/:\([0-9]\+\):/::/g' | sort > pr_errors.txt || true
59-
59+
6060
echo "Found $(wc -l < pr_errors.txt) errors on PR branch."
6161
6262
- name: Compare and Fail on New Errors
6363
run: |
64-
# 'comm -13' suppresses unique lines in file1 (main) and common lines,
64+
# 'comm -13' suppresses unique lines in file1 (main) and common lines,
6565
# leaving only lines unique to file2 (PR) -> The new errors.
6666
comm -13 main_errors.txt pr_errors.txt > new_errors.txt
67-
67+
6868
if [ -s new_errors.txt ]; then
6969
echo "::error::The following NEW mypy errors were introduced:"
7070
cat new_errors.txt

.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 Checks
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/action@v3.0.1

0 commit comments

Comments
 (0)