Merge branch 'main' into fix/fastapi-resume-4100

Author: Akshat8510

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

@@ -0,0 +1,74 @@
+name: Mypy New Error Check
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+
+jobs:
+  mypy-diff:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.10', '3.11', '3.12', '3.13',]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Generate Baseline (Main)
+        run: |
+          # Switch to main branch to generate baseline
+          git checkout origin/main
+
+          git checkout ${{ github.sha }} -- pyproject.toml
+          
+          # Install dependencies for main
+          uv venv .venv
+          source .venv/bin/activate
+          uv sync --all-extras
+          
+          # Run mypy, filter for errors only, remove line numbers (file:123: -> file::), and sort
+          # We ignore exit code (|| true) because we expect errors on main
+          uv run mypy . | grep "error:" | sed 's/:\([0-9]\+\):/::/g' | sort > main_errors.txt || true
+          
+          echo "Found $(wc -l < main_errors.txt) errors on main."
+
+      - name: Check PR Branch
+        run: |
+          # Switch back to the PR commit
+          git checkout ${{ github.sha }}
+          
+          # Re-sync dependencies in case the PR changed them
+          source .venv/bin/activate
+          uv sync --all-extras
+          
+          # Run mypy on PR code, apply same processing
+          uv run mypy . | grep "error:" | sed 's/:\([0-9]\+\):/::/g' | sort > pr_errors.txt || true
+          
+          echo "Found $(wc -l < pr_errors.txt) errors on PR branch."
+
+      - name: Compare and Fail on New Errors
+        run: |
+          # 'comm -13' suppresses unique lines in file1 (main) and common lines, 
+          # leaving only lines unique to file2 (PR) -> The new errors.
+          comm -13 main_errors.txt pr_errors.txt > new_errors.txt
+          
+          if [ -s new_errors.txt ]; then
+            echo "::error::The following NEW mypy errors were introduced:"
+            cat new_errors.txt
+            exit 1
+          else
+            echo "Great job! No new mypy errors introduced."
+          fi

.github/workflows/mypy.yml

@@ -0,0 +1,32 @@
+name: Mypy Type Check
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  mypy:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.10', '3.11', '3.12', '3.13',]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v1
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: uv sync --all-extras
+
+      - name: Run mypy
+
+        run: uv run mypy . --strict

contributing/samples/adk_documentation/adk_release_analyzer/agent.py

@@ -57,8 +57,25 @@
 from google.adk.agents.loop_agent import LoopAgent
 from google.adk.agents.readonly_context import ReadonlyContext
 from google.adk.agents.sequential_agent import SequentialAgent
+from google.adk.models import Gemini
 from google.adk.tools.exit_loop_tool import exit_loop
 from google.adk.tools.tool_context import ToolContext
+from google.genai import types
+
+# Retry configuration for handling API rate limits and overload
+_RETRY_OPTIONS = types.HttpRetryOptions(
+    initial_delay=10,
+    attempts=8,
+    exp_base=2,
+    max_delay=300,
+    http_status_codes=[429, 503],
+)
+
+# Use gemini-3-pro-preview for planning and summary (better quality)
+GEMINI_PRO_WITH_RETRY = Gemini(
+    model="gemini-3-pro-preview",
+    retry_options=_RETRY_OPTIONS,
+)
 
 # Maximum number of files per analysis group to avoid context overflow
 MAX_FILES_PER_GROUP = 5
@@ -249,7 +266,7 @@ def get_release_context(tool_context: ToolContext) -> dict[str, Any]:
 # =============================================================================
 
 planner_agent = Agent(
-    model="gemini-2.5-pro",
+    model=GEMINI_PRO_WITH_RETRY,
     name="release_planner",
     description=(
         "Plans the analysis by fetching release info and organizing files into"
@@ -272,12 +289,12 @@ def get_release_context(tool_context: ToolContext) -> dict[str, Any]:
 
 3. Call `get_changed_files_summary` to get the list of changed files WITHOUT
    the full patches (to save context space).
-   - **IMPORTANT**: Pass `local_repo_path="{LOCAL_REPOS_DIR_PATH}/{CODE_REPO}"`
-     to use local git and avoid GitHub API's 300-file limit.
+   - **IMPORTANT**: Pass these parameters:
+     - `local_repo_path="{LOCAL_REPOS_DIR_PATH}/{CODE_REPO}"` to avoid 300-file limit
+     - `path_filter="src/google/adk/"` to only get ADK source files (reduces token usage)
 
-4. Filter and organize the files:
-   - **INCLUDE** only files in `src/google/adk/` directory
-   - **EXCLUDE** test files, `__init__.py`, and files outside src/
+4. Further filter the returned files:
+   - **EXCLUDE** test files and `__init__.py` files
    - **IMPORTANT**: Do NOT exclude any file just because it has few changes.
      Even single-line changes to public APIs need documentation updates.
    - **PRIORITIZE** by importance:
@@ -423,7 +440,7 @@ def file_analyzer_instruction(readonly_context: ReadonlyContext) -> str:
 
 
 file_group_analyzer = Agent(
-    model="gemini-2.5-pro",
+    model=GEMINI_PRO_WITH_RETRY,
     name="file_group_analyzer",
     description=(
         "Analyzes a group of changed files and generates recommendations."
@@ -507,7 +524,7 @@ def summary_instruction(readonly_context: ReadonlyContext) -> str:
 
 
 summary_agent = Agent(
-    model="gemini-2.5-pro",
+    model=GEMINI_PRO_WITH_RETRY,
     name="summary_agent",
     description="Compiles recommendations and creates the GitHub issue.",
     instruction=summary_instruction,
@@ -542,7 +559,7 @@ def summary_instruction(readonly_context: ReadonlyContext) -> str:
 # =============================================================================
 
 root_agent = Agent(
-    model="gemini-2.5-pro",
+    model=GEMINI_PRO_WITH_RETRY,
     name="adk_release_analyzer",
     description=(
         "Analyzes ADK Python releases and generates documentation update"

contributing/samples/adk_documentation/tools.py

@@ -605,6 +605,7 @@ def get_changed_files_summary(
     start_tag: str,
     end_tag: str,
     local_repo_path: Optional[str] = None,
+    path_filter: Optional[str] = None,
 ) -> Dict[str, Any]:
   """Gets a summary of changed files between two releases without patches.
 
@@ -620,14 +621,17 @@ def get_changed_files_summary(
       local_repo_path: Optional absolute path to local git repo. If provided
           and valid, uses git diff instead of GitHub API to get complete
           file list (avoids 300-file limit).
+      path_filter: Optional path prefix to filter files. Only files whose
+          path starts with this prefix will be included. Example:
+          "src/google/adk/" to only include ADK source files.
 
   Returns:
       A dictionary containing the status and a summary of changed files.
   """
   # Use local git if valid path is provided (avoids GitHub API 300-file limit)
   if local_repo_path and os.path.isdir(os.path.join(local_repo_path, ".git")):
     return _get_changed_files_from_local_git(
-        local_repo_path, start_tag, end_tag, repo_owner, repo_name
+        local_repo_path, start_tag, end_tag, repo_owner, repo_name, path_filter
     )
 
   # Fall back to GitHub API (limited to 300 files)
@@ -689,6 +693,7 @@ def _get_changed_files_from_local_git(
     end_tag: str,
     repo_owner: str,
     repo_name: str,
+    path_filter: Optional[str] = None,
 ) -> Dict[str, Any]:
   """Gets changed files using local git commands (no file limit).
 
@@ -698,6 +703,7 @@ def _get_changed_files_from_local_git(
       end_tag: The newer tag (head) for the comparison.
       repo_owner: Repository owner for compare URL.
       repo_name: Repository name for compare URL.
+      path_filter: Optional path prefix to filter files.
 
   Returns:
       A dictionary containing the status and a summary of changed files.
@@ -766,6 +772,10 @@ def _get_changed_files_from_local_git(
         status_code = parts[0][0]  # First char is the status
         filename = parts[-1]  # Last part is filename (handles renames)
 
+        # Apply path filter if specified
+        if path_filter and not filename.startswith(path_filter):
+          continue
+
         stats = file_stats.get(
             filename,
             {

pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
   "anyio>=4.9.0, <5.0.0",                                    # For MCP Session Manager
   "authlib>=1.6.6, <2.0.0",                                  # For RestAPI Tool
   "click>=8.1.8, <9.0.0",                                    # For CLI tools
-  "fastapi>=0.115.0, <0.124.0",                              # FastAPI framework
+  "fastapi>=0.124.1, <1.0.0",                                # FastAPI framework
   "google-api-python-client>=2.157.0, <3.0.0",               # Google API client discovery
   "google-auth>=2.47.0",                                     # Google Auth library
   "google-cloud-aiplatform[agent_engines]>=1.132.0, <2.0.0", # For VertexAI integrations, e.g. example store.
@@ -216,9 +216,9 @@ asyncio_mode = "auto"
 
 [tool.mypy]
 python_version = "3.10"
-exclude = "tests/"
+exclude = ["tests/", "contributing/samples/"]
 plugins = ["pydantic.mypy"]
 # Start with non-strict mode, and swtich to strict mode later.
-# strict = true
+strict = true
 disable_error_code = ["import-not-found", "import-untyped", "unused-ignore"]
 follow_imports = "skip"

src/google/adk/a2a/converters/event_converter.py

@@ -131,6 +131,7 @@ def _get_context_metadata(
         _get_adk_metadata_key("session_id"): invocation_context.session.id,
         _get_adk_metadata_key("invocation_id"): event.invocation_id,
         _get_adk_metadata_key("author"): event.author,
+        _get_adk_metadata_key("event_id"): event.id,
     }
 
     # Add optional metadata fields if present
@@ -479,7 +480,6 @@ def _create_status_update_event(
     task_id: Optional task ID to use for generated events.
     context_id: Optional Context ID to use for generated events.
 
-
   Returns:
     A TaskStatusUpdateEvent with RUNNING state.
   """

src/google/adk/cli/adk_web_server.py

@@ -946,27 +946,6 @@ async def create_eval_set(
             detail=str(ve),
         ) from ve
 
-    @deprecated(
-        "Please use create_eval_set instead. This will be removed in future"
-        " releases."
-    )
-    @app.post(
-        "/apps/{app_name}/eval_sets/{eval_set_id}",
-        response_model_exclude_none=True,
-        tags=[TAG_EVALUATION],
-    )
-    async def create_eval_set_legacy(
-        app_name: str,
-        eval_set_id: str,
-    ):
-      """Creates an eval set, given the id."""
-      await create_eval_set(
-          app_name=app_name,
-          create_eval_set_request=CreateEvalSetRequest(
-              eval_set=EvalSet(eval_set_id=eval_set_id, eval_cases=[])
-          ),
-      )
-
     @app.get(
         "/apps/{app_name}/eval-sets",
         response_model_exclude_none=True,
@@ -982,19 +961,6 @@ async def list_eval_sets(app_name: str) -> ListEvalSetsResponse:
 
       return ListEvalSetsResponse(eval_set_ids=eval_sets)
 
-    @deprecated(
-        "Please use list_eval_sets instead. This will be removed in future"
-        " releases."
-    )
-    @app.get(
-        "/apps/{app_name}/eval_sets",
-        response_model_exclude_none=True,
-        tags=[TAG_EVALUATION],
-    )
-    async def list_eval_sets_legacy(app_name: str) -> list[str]:
-      list_eval_sets_response = await list_eval_sets(app_name)
-      return list_eval_sets_response.eval_set_ids
-
     @app.post(
         "/apps/{app_name}/eval-sets/{eval_set_id}/add-session",
         response_model_exclude_none=True,
@@ -1142,22 +1108,6 @@ async def delete_eval(
       except NotFoundError as nfe:
         raise HTTPException(status_code=404, detail=str(nfe)) from nfe
 
-    @deprecated(
-        "Please use run_eval instead. This will be removed in future releases."
-    )
-    @app.post(
-        "/apps/{app_name}/eval_sets/{eval_set_id}/run_eval",
-        response_model_exclude_none=True,
-        tags=[TAG_EVALUATION],
-    )
-    async def run_eval_legacy(
-        app_name: str, eval_set_id: str, req: RunEvalRequest
-    ) -> list[RunEvalResult]:
-      run_eval_response = await run_eval(
-          app_name=app_name, eval_set_id=eval_set_id, req=req
-      )
-      return run_eval_response.run_eval_results
-
     @app.post(
         "/apps/{app_name}/eval-sets/{eval_set_id}/run",
         response_model_exclude_none=True,
@@ -1251,28 +1201,6 @@ async def get_eval_result(
       except ValidationError as ve:
         raise HTTPException(status_code=500, detail=str(ve)) from ve
 
-    @deprecated(
-        "Please use get_eval_result instead. This will be removed in future"
-        " releases."
-    )
-    @app.get(
-        "/apps/{app_name}/eval_results/{eval_result_id}",
-        response_model_exclude_none=True,
-        tags=[TAG_EVALUATION],
-    )
-    async def get_eval_result_legacy(
-        app_name: str,
-        eval_result_id: str,
-    ) -> EvalSetResult:
-      try:
-        return self.eval_set_results_manager.get_eval_set_result(
-            app_name, eval_result_id
-        )
-      except ValueError as ve:
-        raise HTTPException(status_code=404, detail=str(ve)) from ve
-      except ValidationError as ve:
-        raise HTTPException(status_code=500, detail=str(ve)) from ve
-
     @app.get(
         "/apps/{app_name}/eval-results",
         response_model_exclude_none=True,
@@ -1285,19 +1213,6 @@ async def list_eval_results(app_name: str) -> ListEvalResultsResponse:
       )
       return ListEvalResultsResponse(eval_result_ids=eval_result_ids)
 
-    @deprecated(
-        "Please use list_eval_results instead. This will be removed in future"
-        " releases."
-    )
-    @app.get(
-        "/apps/{app_name}/eval_results",
-        response_model_exclude_none=True,
-        tags=[TAG_EVALUATION],
-    )
-    async def list_eval_results_legacy(app_name: str) -> list[str]:
-      list_eval_results_response = await list_eval_results(app_name)
-      return list_eval_results_response.eval_result_ids
-
     @app.get(
         "/apps/{app_name}/metrics-info",
         response_model_exclude_none=True,