Merge branch 'main' into feat/fallback-invalid-attached-file-with-gemini

Author: rohityan

.github/workflows/isort.yml

@@ -1,17 +1,3 @@
-# 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.
-
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0
@@ -47,5 +33,6 @@ repos:
     hooks:
       - id: mdformat
         files: ^(README\.md|CONTRIBUTING\.md|contributing/.*\.md)$
+        exclude: (?i)SKILL\.md$
         additional_dependencies:
           - mdformat-gfm

.github/workflows/pyink.yml

@@ -255,17 +255,7 @@ the key style points:
 
 ### Autoformat (Required Before Committing)
 
-**Always run** before committing code: `bash ./autoformat.sh`
-
-**Manual formatting** (if needed): ```bash
-
-# Format imports
-
-isort src/ tests/ contributing/
-
-# Format code style
-
-pyink --config pyproject.toml src/ tests/ contributing/ ```
+**Always run** before committing code: `pre-commit run --all-files`
 
 **Check formatting** without making changes: `bash pyink --check --diff --config
 pyproject.toml src/ isort --check src/`
@@ -512,7 +502,9 @@ Quick reference to important project files:
 -   **Main config:** `pyproject.toml` (uses `flit_core` build backend)
 -   **Dependencies:** `uv.lock` (managed by `uv`)
 -   **Linting:** `pylintrc` (Google Python Style Guide)
--   **Auto-format:** `autoformat.sh` (runs isort + pyink)
+-   **Auto-format:** `pre-commit` (runs isort + pyink)
+-   **Run on all files:** `pre-commit run --all-files`
+-   **Install as hook:** `pre-commit install`
 -   **CLI entry point:** `src/google/adk/cli/cli_tools_click.py`
 -   **Web UI backend:** `src/google/adk/cli/adk_web_server.py`
 -   **Main exports:** `src/google/adk/__init__.py` (exports Agent, Runner)

.pre-commit-config.yaml

@@ -202,11 +202,18 @@ part before or alongside your code PR.
 
 1. **Auto-format the code:**
 
-   **NOTE**: We use `isort` and `pyink` for styles. Use the included
-   autoformat.sh to auto-format.
+   We use `pre-commit` to manage code style and formatting (including `isort` and `pyink`).
+
+   To run it manually on all files:
+
+   ```shell
+   pre-commit run --all-files
+   ```
+
+   You can also install it as a git hook to run automatically on every commit:
 
    ```shell
-   ./autoformat.sh
+   pre-commit install
    ```
 
 1. **Build the wheel file:**

AGENTS.md

@@ -1,2 +1 @@
 google-adk[a2a]==1.28.1
-

CONTRIBUTING.md

@@ -1,2 +1 @@
 google-adk==1.28.1
-

autoformat.sh

@@ -1,6 +1,10 @@
-______________________________________________________________________
-
-## name: weather-skill description: A skill that provides weather information based on reference data. metadata: adk_additional_tools: - get_wind_speed
+---
+name: weather-skill
+description: A skill that provides weather information based on reference data.
+metadata:
+  adk_additional_tools:
+    - get_wind_speed
+---
 
 Step 1: Check 'references/weather_info.md' for the current weather.
 Step 2: If humidity is requested, use run 'scripts/get_humidity.py' with the `location` argument.

contributing/samples/adk_knowledge_agent/requirements.txt

@@ -32,6 +32,9 @@
 
 logger = logging.getLogger("google_adk." + __name__)
 
+# Gemini API requires a minimum of 4096 tokens for cached content.
+_GEMINI_MIN_CACHE_TOKENS = 4096
+
 if TYPE_CHECKING:
   from google.genai import Client
 
@@ -119,6 +122,19 @@ async def handle_context_caching(
             )
             return cache_metadata
 
+          # Cache creation failed (e.g., below Gemini's 4096 token minimum).
+          # Preserve the original contents_count so the fingerprint stays
+          # stable for subsequent calls instead of resetting to total.
+          logger.debug(
+              "Cache creation failed, preserving prefix fingerprint "
+              "(contents_count=%d)",
+              cache_contents_count,
+          )
+          return CacheMetadata(
+              fingerprint=current_fingerprint,
+              contents_count=cache_contents_count,
+          )
+
         # Fingerprints don't match - recalculate with total contents
         logger.debug(
             "Fingerprints don't match, returning fingerprint-only metadata"
@@ -304,6 +320,15 @@ async def _create_new_cache_with_contents(
       )
       return None
 
+    # Check client-side to avoid unnecessary API round-trips.
+    if llm_request.cacheable_contents_token_count < _GEMINI_MIN_CACHE_TOKENS:
+      logger.info(
+          "Request below Gemini minimum cache size (%d < %d tokens)",
+          llm_request.cacheable_contents_token_count,
+          _GEMINI_MIN_CACHE_TOKENS,
+      )
+      return None
+
     try:
       # Create cache using Gemini API directly
       return await self._create_gemini_cache(llm_request, cache_contents_count)