Skip to content

Commit 4064c44

Browse files
Merge branch 'main' into fix/parallel-agent-silent-stall-5455
2 parents 8397231 + 2343973 commit 4064c44

309 files changed

Lines changed: 8182 additions & 3253 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.

.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.

.github/workflows/isort.yml

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

.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
name: pre-commit
15+
name: Pre-commit Checks
1616

1717
on:
1818
push:

.github/workflows/pyink.yml

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

.github/workflows/python-unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ jobs:
5050
source .venv/bin/activate
5151
pytest tests/unittests \
5252
--ignore=tests/unittests/artifacts/test_artifact_service.py \
53-
--ignore=tests/unittests/tools/google_api_tool/test_googleapi_to_openapi_converter.py
53+
--ignore=tests/unittests/tools/google_api_tool/test_googleapi_to_openapi_converter.py

.github/workflows/stale-bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ jobs:
5555
LLM_MODEL_NAME: "gemini-2.5-flash"
5656
PYTHONPATH: contributing/samples
5757

58-
run: python -m adk_stale_agent.main
58+
run: python -m adk_stale_agent.main

.pre-commit-config.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v4.6.0
4+
hooks:
5+
- id: check-yaml
6+
args: [--allow-multiple-documents]
7+
- id: end-of-file-fixer
8+
- id: trailing-whitespace
9+
- repo: https://github.com/tox-dev/pyproject-fmt
10+
rev: v2.5.0
11+
hooks:
12+
- id: pyproject-fmt
13+
- repo: https://github.com/PyCQA/isort
14+
rev: 8.0.1
15+
hooks:
16+
- id: isort
17+
- repo: https://github.com/google/pyink
18+
rev: 25.12.0
19+
hooks:
20+
- id: pyink
21+
- repo: local
22+
hooks:
23+
- id: addlicense
24+
name: addlicense
25+
entry: >
26+
bash -c 'if command -v addlicense >/dev/null 2>&1;
27+
then addlicense -c "Google LLC" -l apache "$@";
28+
else echo "Warning: addlicense not installed, skipping"; fi' --
29+
language: system
30+
files: \.(py|sh)$
31+
- repo: https://github.com/executablebooks/mdformat
32+
rev: 0.7.22
33+
hooks:
34+
- id: mdformat
35+
files: ^(README\.md|CONTRIBUTING\.md|contributing/.*\.md)$
36+
exclude: (?i)SKILL\.md$
37+
additional_dependencies:
38+
- mdformat-gfm

AGENTS.md

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -255,17 +255,7 @@ the key style points:
255255

256256
### Autoformat (Required Before Committing)
257257

258-
**Always run** before committing code: `bash ./autoformat.sh`
259-
260-
**Manual formatting** (if needed): ```bash
261-
262-
# Format imports
263-
264-
isort src/ tests/ contributing/
265-
266-
# Format code style
267-
268-
pyink --config pyproject.toml src/ tests/ contributing/ ```
258+
**Always run** before committing code: `pre-commit run --all-files`
269259

270260
**Check formatting** without making changes: `bash pyink --check --diff --config
271261
pyproject.toml src/ isort --check src/`
@@ -512,7 +502,9 @@ Quick reference to important project files:
512502
- **Main config:** `pyproject.toml` (uses `flit_core` build backend)
513503
- **Dependencies:** `uv.lock` (managed by `uv`)
514504
- **Linting:** `pylintrc` (Google Python Style Guide)
515-
- **Auto-format:** `autoformat.sh` (runs isort + pyink)
505+
- **Auto-format:** `pre-commit` (runs isort + pyink)
506+
- **Run on all files:** `pre-commit run --all-files`
507+
- **Install as hook:** `pre-commit install`
516508
- **CLI entry point:** `src/google/adk/cli/cli_tools_click.py`
517509
- **Web UI backend:** `src/google/adk/cli/adk_web_server.py`
518510
- **Main exports:** `src/google/adk/__init__.py` (exports Agent, Runner)

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
* Rolling back change to fix issue affecting LlmAgent creation due to missing version field ([0e18f81](https://github.com/google/adk-python/commit/0e18f81a5cd0d0392ded653b1a63a236449a2685))
233233

234234

235-
## [1.27.0](https://github.com/google/adk-python/compare/v1.26.0...v1.27.0) (2026-03-12)
235+
## [1.27.0](https://github.com/google/adk-python/compare/v1.26.0...v1.27.0) (2026-03-12)
236236

237237
### Features
238238
* **[Core]**
@@ -261,7 +261,7 @@
261261
* **otel:** add experimental semantic convention and emit `gen_ai.client.inference.operation.details` event ([19718e9](https://github.com/google/adk-python/commit/19718e9c174af7b1287b627e6b23a609db1ee5e2))
262262
* add missing token usage span attributes during model usage ([77bf325](https://github.com/google/adk-python/commit/77bf325d2bf556621c3276f74ee2816fce2a7085))
263263
* capture tool execution error code in OpenTelemetry spans ([e0a6c6d](https://github.com/google/adk-python/commit/e0a6c6db6f8e2db161f8b86b9f11030f0cec807a))
264-
264+
265265
* **[Tools]**
266266
* Warn when accessing DEFAULT_SKILL_SYSTEM_INSTRUCTION ([35366f4](https://github.com/google/adk-python/commit/35366f4e2a0575090fe12cd85f51e8116a1cd0d3))
267267
* add preserve_property_names option to OpenAPIToolset ([078b516](https://github.com/google/adk-python/commit/078b5163ff47acec69b1c8e105f62eb7b74f5548))

0 commit comments

Comments
 (0)