mirror of
https://github.com/encounter/adk-python.git
synced 2026-07-09 18:19:28 -07:00
Merge https://github.com/google/adk-python/pull/3700 ### Description This PR refactors the `adk_stale_agent` to address `429 RESOURCE_EXHAUSTED` errors encountered during workflow execution. The previous implementation was inefficient in fetching issue history (using pagination over the REST API) and lacked server-side filtering, causing excessive API calls and huge token consumption that breached Gemini API quotas. The new implementation switches to a **GraphQL-first approach**, implements server-side filtering via the Search API, adds robust concurrency controls, and significantly improves code maintainability through modular refactoring. ### Root Cause of Failure The previous workflow failed with the following error due to passing too much context to the LLM and processing too many irrelevant issues: ```text google.genai.errors.ClientError: 429 RESOURCE_EXHAUSTED. Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_paid_tier_input_token_count ``` ### Key Changes #### 1. Optimization: REST → GraphQL (`agent.py`) * **Old:** Fetched issue comments and timeline events using multiple paginated REST API calls (`/timeline`). * **New:** Implemented `get_issue_state` using a single **GraphQL** query. This fetches comments, `userContentEdits`, and specific timeline events (Labels, Renames) in one network request. * **Refactoring:** The complex analysis logic has been decomposed into focused helper functions (_fetch_graphql_data, _build_history_timeline, _replay_history_to_find_state) for better readability and testing. * **Configurable:** Added GRAPHQL_COMMENT_LIMIT and GRAPHQL_TIMELINE_LIMIT settings to tune context depth * **Impact:** Drastically reduces the data payload size and eliminates multiple API round-trips, significantly lowering the token count sent to the LLM. #### 2. Optimization: Server-Side Filtering (`utils.py`) * **Old:** Fetched *all* open issues via REST and filtered them in Python memory. * **New:** Uses the GitHub Search API (`get_old_open_issue_numbers`) with `created:<DATE` syntax. * **Impact:** Only fetches issue numbers that actually meet the age threshold, preventing the agent from wasting cycles and tokens on brand-new issues. #### 3. Concurrency & Rate Limiting (`main.py` & `settings.py`) * **Old:** Sequential execution loop. * **New:** Implemented `asyncio.gather` with a configurable `CONCURRENCY_LIMIT` (set to 3). * **New:** Added `urllib3` retry strategies (exponential backoff) in `utils.py` to handle GitHub API rate limits (HTTP 429) gracefully. #### 4. Logic Improvements ("Ghost Edits") * **New Feature:** The agent now detects "Ghost Edits" (where an author updates the issue description without posting a new comment). * **Action:** If a silent edit is detected on a stale candidate, the agent now alerts maintainers instead of marking it stale, preventing false positives. ### File Comparison Summary | File | Change | | :--- | :--- | | `main.py` | Switched from `InMemoryRunner` loop to `asyncio` chunked processing. Added execution timing and API usage logging. | | `agent.py` | Replaced REST logic with GraphQL query. Added logic to handle silent body edits. Decomposed giant get_issue_state into helper functions with docstrings. Added _format_days helper. | | `utils.py` | Added `HTTPAdapter` with Retries. Added `get_old_open_issue_numbers` using Search API. | | `settings.py` | Removed `ISSUES_PER_RUN`; added configuration for CONCURRENCY_LIMIT, SLEEP_BETWEEN_CHUNKS, and GraphQL limits. | | `PROMPT_INSTRUCTIONS.txt` | Simplified decision tree; removed date calculation responsibility from LLM. | ### Verification The new logic minimizes token usage by offloading date calculations to Python and strictly limiting the context passed to the LLM to semantic intent analysis (e.g., "Is this a question?"). * **Metric Check:** The workflow now tracks API calls per issue to ensure we stay within limits. * **Safety:** Silent edits by users now correctly reset the "Stale" timer. * **Maintainability:** All complex logic is now isolated in typed helper functions with comprehensive docstrings. Co-authored-by: Xuan Yang <xygoogle@google.com> COPYBARA_INTEGRATE_REVIEW=https://github.com/google/adk-python/pull/3700 from ryanaiagent:feat/improve-stale-agent 888064eff125ae74f7c3a9ad6c74f98de80243a2 PiperOrigin-RevId: 838885530
196 lines
6.1 KiB
Python
196 lines
6.1 KiB
Python
# Copyright 2025 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.
|
|
|
|
import asyncio
|
|
import logging
|
|
import time
|
|
from typing import Tuple
|
|
|
|
from adk_stale_agent.agent import root_agent
|
|
from adk_stale_agent.settings import CONCURRENCY_LIMIT
|
|
from adk_stale_agent.settings import OWNER
|
|
from adk_stale_agent.settings import REPO
|
|
from adk_stale_agent.settings import SLEEP_BETWEEN_CHUNKS
|
|
from adk_stale_agent.settings import STALE_HOURS_THRESHOLD
|
|
from adk_stale_agent.utils import get_api_call_count
|
|
from adk_stale_agent.utils import get_old_open_issue_numbers
|
|
from adk_stale_agent.utils import reset_api_call_count
|
|
from google.adk.cli.utils import logs
|
|
from google.adk.runners import InMemoryRunner
|
|
from google.genai import types
|
|
|
|
logs.setup_adk_logger(level=logging.INFO)
|
|
logger = logging.getLogger("google_adk." + __name__)
|
|
|
|
APP_NAME = "stale_bot_app"
|
|
USER_ID = "stale_bot_user"
|
|
|
|
|
|
async def process_single_issue(issue_number: int) -> Tuple[float, int]:
|
|
"""
|
|
Processes a single GitHub issue using the AI agent and logs execution metrics.
|
|
|
|
Args:
|
|
issue_number (int): The GitHub issue number to audit.
|
|
|
|
Returns:
|
|
Tuple[float, int]: A tuple containing:
|
|
- duration (float): Time taken to process the issue in seconds.
|
|
- api_calls (int): The number of API calls made during this specific execution.
|
|
|
|
Raises:
|
|
Exception: catches generic exceptions to prevent one failure from stopping the batch.
|
|
"""
|
|
start_time = time.perf_counter()
|
|
|
|
start_api_calls = get_api_call_count()
|
|
|
|
logger.info(f"Processing Issue #{issue_number}...")
|
|
logger.debug(f"#{issue_number}: Initializing runner and session.")
|
|
|
|
try:
|
|
runner = InMemoryRunner(agent=root_agent, app_name=APP_NAME)
|
|
session = await runner.session_service.create_session(
|
|
user_id=USER_ID, app_name=APP_NAME
|
|
)
|
|
|
|
prompt_text = f"Audit Issue #{issue_number}."
|
|
prompt_message = types.Content(
|
|
role="user", parts=[types.Part(text=prompt_text)]
|
|
)
|
|
|
|
logger.debug(f"#{issue_number}: Sending prompt to agent.")
|
|
|
|
async for event in runner.run_async(
|
|
user_id=USER_ID, session_id=session.id, new_message=prompt_message
|
|
):
|
|
if (
|
|
event.content
|
|
and event.content.parts
|
|
and hasattr(event.content.parts[0], "text")
|
|
):
|
|
text = event.content.parts[0].text
|
|
if text:
|
|
clean_text = text[:150].replace("\n", " ")
|
|
logger.info(f"#{issue_number} Decision: {clean_text}...")
|
|
|
|
except Exception as e:
|
|
logger.error(f"Error processing issue #{issue_number}: {e}", exc_info=True)
|
|
|
|
duration = time.perf_counter() - start_time
|
|
|
|
end_api_calls = get_api_call_count()
|
|
issue_api_calls = end_api_calls - start_api_calls
|
|
|
|
logger.info(
|
|
f"Issue #{issue_number} finished in {duration:.2f}s "
|
|
f"with ~{issue_api_calls} API calls."
|
|
)
|
|
|
|
return duration, issue_api_calls
|
|
|
|
|
|
async def main():
|
|
"""
|
|
Main entry point to run the stale issue bot concurrently.
|
|
|
|
Fetches old issues and processes them in batches to respect API rate limits
|
|
and concurrency constraints.
|
|
"""
|
|
logger.info(f"--- Starting Stale Bot for {OWNER}/{REPO} ---")
|
|
logger.info(f"Concurrency level set to {CONCURRENCY_LIMIT}")
|
|
|
|
reset_api_call_count()
|
|
|
|
filter_days = STALE_HOURS_THRESHOLD / 24
|
|
logger.debug(f"Fetching issues older than {filter_days:.2f} days...")
|
|
|
|
try:
|
|
all_issues = get_old_open_issue_numbers(OWNER, REPO, days_old=filter_days)
|
|
except Exception as e:
|
|
logger.critical(f"Failed to fetch issue list: {e}", exc_info=True)
|
|
return
|
|
|
|
total_count = len(all_issues)
|
|
|
|
search_api_calls = get_api_call_count()
|
|
|
|
if total_count == 0:
|
|
logger.info("No issues matched the criteria. Run finished.")
|
|
return
|
|
|
|
logger.info(
|
|
f"Found {total_count} issues to process. "
|
|
f"(Initial search used {search_api_calls} API calls)."
|
|
)
|
|
|
|
total_processing_time = 0.0
|
|
total_issue_api_calls = 0
|
|
processed_count = 0
|
|
|
|
# Process the list in chunks of size CONCURRENCY_LIMIT
|
|
for i in range(0, total_count, CONCURRENCY_LIMIT):
|
|
chunk = all_issues[i : i + CONCURRENCY_LIMIT]
|
|
current_chunk_num = i // CONCURRENCY_LIMIT + 1
|
|
|
|
logger.info(
|
|
f"--- Starting chunk {current_chunk_num}: Processing issues {chunk} ---"
|
|
)
|
|
|
|
tasks = [process_single_issue(issue_num) for issue_num in chunk]
|
|
|
|
results = await asyncio.gather(*tasks)
|
|
|
|
for duration, api_calls in results:
|
|
total_processing_time += duration
|
|
total_issue_api_calls += api_calls
|
|
|
|
processed_count += len(chunk)
|
|
logger.info(
|
|
f"--- Finished chunk {current_chunk_num}. Progress:"
|
|
f" {processed_count}/{total_count} ---"
|
|
)
|
|
|
|
if (i + CONCURRENCY_LIMIT) < total_count:
|
|
logger.debug(
|
|
f"Sleeping for {SLEEP_BETWEEN_CHUNKS}s to respect rate limits..."
|
|
)
|
|
await asyncio.sleep(SLEEP_BETWEEN_CHUNKS)
|
|
|
|
total_api_calls_for_run = search_api_calls + total_issue_api_calls
|
|
avg_time_per_issue = (
|
|
total_processing_time / total_count if total_count > 0 else 0
|
|
)
|
|
|
|
logger.info("--- Stale Agent Run Finished ---")
|
|
logger.info(f"Successfully processed {processed_count} issues.")
|
|
logger.info(f"Total API calls made this run: {total_api_calls_for_run}")
|
|
logger.info(
|
|
f"Average processing time per issue: {avg_time_per_issue:.2f} seconds."
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
start_time = time.perf_counter()
|
|
|
|
try:
|
|
asyncio.run(main())
|
|
except KeyboardInterrupt:
|
|
logger.warning("Bot execution interrupted manually.")
|
|
except Exception as e:
|
|
logger.critical(f"Unexpected fatal error: {e}", exc_info=True)
|
|
|
|
duration = time.perf_counter() - start_time
|
|
logger.info(f"Full audit finished in {duration/60:.2f} minutes.")
|