Skip to content

Commit 7bd5a78

Browse files
authored
Merge branch 'main' into fix/non-english-eval-support
2 parents cb3b2c1 + f973673 commit 7bd5a78

556 files changed

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

.github/release-please.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/release-trigger.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 35 additions & 3 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:
@@ -24,7 +38,7 @@ jobs:
2438
python-version: '3.11'
2539

2640
- name: Load adk-bot SSH Private Key
27-
uses: webfactory/ssh-agent@v0.9.0
41+
uses: webfactory/ssh-agent@v0.9.1
2842
with:
2943
ssh-private-key: ${{ secrets.ADK_BOT_SSH_PRIVATE_KEY }}
3044

@@ -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/check-file-contents.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030

3131
- name: Check for logger pattern in all changed Python files
3232
run: |
33-
git fetch origin ${{ github.base_ref }}
34-
CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${{ github.base_ref }}...HEAD | grep -E '\.py$' || true)
33+
git fetch origin ${GITHUB_BASE_REF}
34+
CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${GITHUB_BASE_REF}...HEAD | grep -E '\.py$' || true)
3535
if [ -n "$CHANGED_FILES" ]; then
3636
echo "Changed Python files to check:"
3737
echo "$CHANGED_FILES"
@@ -61,8 +61,8 @@ jobs:
6161
6262
- name: Check for import pattern in certain changed Python files
6363
run: |
64-
git fetch origin ${{ github.base_ref }}
65-
CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${{ github.base_ref }}...HEAD | grep -E '\.py$' | grep -v -E '__init__.py$|version.py$|tests/.*|contributing/samples/' || true)
64+
git fetch origin ${GITHUB_BASE_REF}
65+
CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${GITHUB_BASE_REF}...HEAD | grep -E '\.py$' | grep -v -E '__init__.py$|version.py$|tests/.*|contributing/samples/' || true)
6666
if [ -n "$CHANGED_FILES" ]; then
6767
echo "Changed Python files to check:"
6868
echo "$CHANGED_FILES"
@@ -88,8 +88,8 @@ jobs:
8888
8989
- name: Check for import from cli package in certain changed Python files
9090
run: |
91-
git fetch origin ${{ github.base_ref }}
92-
CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${{ github.base_ref }}...HEAD | grep -E '\.py$' | grep -v -E 'cli/.*|src/google/adk/tools/apihub_tool/apihub_toolset.py|tests/.*|contributing/samples/' || true)
91+
git fetch origin ${GITHUB_BASE_REF}
92+
CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${GITHUB_BASE_REF}...HEAD | grep -E '\.py$' | grep -v -E 'cli/.*|src/google/adk/tools/apihub_tool/apihub_toolset.py|tests/.*|contributing/samples/' || true)
9393
if [ -n "$CHANGED_FILES" ]; then
9494
echo "Changed Python files to check:"
9595
echo "$CHANGED_FILES"
@@ -110,4 +110,4 @@ jobs:
110110
fi
111111
else
112112
echo "✅ No relevant Python files found."
113-
fi
113+
fi

.github/workflows/isort.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Set up Python
3434
uses: actions/setup-python@v6
3535
with:
36-
python-version: '3.x'
36+
python-version: '3.11'
3737

3838
- name: Install isort
3939
run: |
@@ -42,8 +42,8 @@ jobs:
4242
- name: Run isort on changed files
4343
id: run_isort
4444
run: |
45-
git fetch origin ${{ github.base_ref }}
46-
CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${{ github.base_ref }}...HEAD | grep -E '\.py$' || true)
45+
git fetch origin ${GITHUB_BASE_REF}
46+
CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${GITHUB_BASE_REF}...HEAD | grep -E '\.py$' || true)
4747
if [ -n "$CHANGED_FILES" ]; then
4848
echo "Changed Python files:"
4949
echo "$CHANGED_FILES"
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

0 commit comments

Comments
 (0)