Merge branch 'main' into dev-ui-url

Author: racinmat

.github/workflows/discussion_answering.yml

@@ -3,11 +3,10 @@ name: ADK Answering Agent for Discussions
 on:
   discussion:
     types: [created]
-  discussion_comment:
-    types: [created]
 
 jobs:
   agent-answer-questions:
+    if: github.event.discussion.category.name == 'Q&A'
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/upload-adk-docs-to-vertex-ai-search.yml

@@ -0,0 +1,51 @@
+name: Upload ADK Docs to Vertex AI Search
+
+on:
+  # Runs once per day at 16:00 UTC
+  schedule:
+   - cron: '00 16 * * *'
+  # Manual trigger for testing and fixing
+  workflow_dispatch:
+
+jobs:
+  upload-adk-docs-to-vertex-ai-search:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Clone adk-docs repository
+        run: git clone https://github.com/google/adk-docs.git /tmp/adk-docs
+
+      - name: Clone adk-python repository
+        run: git clone https://github.com/google/adk-python.git /tmp/adk-python
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Authenticate to Google Cloud
+        id: auth
+        uses: 'google-github-actions/auth@v2'
+        with:
+          credentials_json: '${{ secrets.ADK_GCP_SA_KEY }}'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install google-adk markdown google-cloud-storage google-cloud-discoveryengine
+
+      - name: Run Answering Script
+        env:
+          GITHUB_TOKEN: ${{ secrets.ADK_TRIAGE_AGENT }}
+          GOOGLE_CLOUD_PROJECT: ${{ secrets.GOOGLE_CLOUD_PROJECT }}
+          GOOGLE_CLOUD_LOCATION: ${{ secrets.GOOGLE_CLOUD_LOCATION }}
+          VERTEXAI_DATASTORE_ID: ${{ secrets.VERTEXAI_DATASTORE_ID }}
+          GOOGLE_GENAI_USE_VERTEXAI: 1
+          GCS_BUCKET_NAME: ${{ secrets.GCS_BUCKET_NAME }}
+          ADK_DOCS_ROOT_PATH: /tmp/adk-docs
+          ADK_PYTHON_ROOT_PATH: /tmp/adk-python
+          PYTHONPATH: contributing/samples
+        run: python -m adk_answering_agent.upload_docs_to_vertex_ai_search

CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+## [1.10.0](https://github.com/google/adk-python/compare/v1.9.0...v1.10.0) (2025-08-07)
+
+### Features
+
+* [Live] Implement Live Session Resumption ([71fbc92](https://github.com/google/adk-python/commit/71fbc9275b3d74700ec410cb4155ba0cb18580b7))
+* [Tool] Support parallel execution of parallel function calls ([57cd41f](https://github.com/google/adk-python/commit/57cd41f424b469fb834bb8f2777b5f7be9aa6cdf))
+* [Models] Allow max tokens to be customizable in Claude ([7556ebc](https://github.com/google/adk-python/commit/7556ebc76abd3c776922c2803aed831661cf7f82))
+* [Tool] Create enterprise_web_search_tool as a tool instance ([0e28d64](https://github.com/google/adk-python/commit/0e28d64712e481cfd3b964be0166f529657024f6))
+
+### Bug Fixes
+
+* Fix shared default plugin manager and cost manager instances among multiple invocations ([423542a](https://github.com/google/adk-python/commit/423542a43fb8316195e9f79d97f87593751bebd3))
+* Correct the type annotation in anthropic_llm implementation ([97318bc](https://github.com/google/adk-python/commit/97318bcd199acdacadfe8664da3fbfc3c806cdd2))
+* Fix adk deploy cloud_run cli, which was broken in v1.9.0 ([e41dbcc](https://github.com/google/adk-python/commit/e41dbccf7f610e249108f9321f60f71fe2cc10f4))
+* Remove thoughts from contents in llm requests from history contents ([d620bcb](https://github.com/google/adk-python/commit/d620bcb384d3068228ea2059fb70274e68e69682))
+* Annotate response type as None for transfer_to_agent tool ([86a4487](https://github.com/google/adk-python/commit/86a44873e9b2dfc7e62fa31a9ac3be57c0bbff7b))
+* Fix incompatible a2a sdk changes ([faadef1](https://github.com/google/adk-python/commit/faadef167ee8e4dd1faf4da5685a577c3155556e))
+* Fix adk cli options and method parameters mismatching ([8ef2177](https://github.com/google/adk-python/commit/8ef2177658fbfc74b1a74b0c3ea8150bae866796))
+
+### Improvements
+
+* Add Github workflow config for the ADK Answering agent ([8dc0c94](https://github.com/google/adk-python/commit/8dc0c949afb9024738ff7ac1b2c19282175c3200))
+* Import AGENT_CARD_WELL_KNOWN_PATH from adk instead of from a2a directly ([37dae9b](https://github.com/google/adk-python/commit/37dae9b631db5060770b66fce0e25cf0ffb56948))
+* Make `LlmRequest.LiveConnectConfig` field default to a factory ([74589a1](https://github.com/google/adk-python/commit/74589a1db7df65e319d1ad2f0676ee0cf5d6ec1d))
+* Update the prompt to make the ADK Answering Agent more objective ([2833030](https://github.com/google/adk-python/commit/283303032a174d51b8d72f14df83c794d66cb605))
+* Add sample agent for testing parallel functions execution ([90b9193](https://github.com/google/adk-python/commit/90b9193a20499b8dd7f57d119cda4c534fcfda10))
+* Hide the ask_data_insights tool until the API is publicly available ([bead607](https://github.com/google/adk-python/commit/bead607364be7ac8109357c9d3076d9b345e9e8a))
+* Change `LlmRequest.config`'s default value to be `types.GenerateContentConfig()` ([041f04e](https://github.com/google/adk-python/commit/041f04e89cee30532facccce4900d10f1b8c69ce))
+* Prevent triggering of _load_from_yaml_config in AgentLoader ([db975df](https://github.com/google/adk-python/commit/db975dfe2a09a6d056d02bc03c1247ac10f6da7d))
+
+### Documentation
+
+* Fix typos ([16a15c8](https://github.com/google/adk-python/commit/16a15c8709b47c9bebe7cffe888e8e7e48ec605a))
+
+
 ## [1.9.0](https://github.com/google/adk-python/compare/v1.8.0...v1.9.0) (2025-07-31)
 
 

README.md

@@ -1,6 +1,7 @@
 # Agent Development Kit (ADK)
 
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](LICENSE)
+[![PyPI](https://img.shields.io/pypi/v/google-adk)](https://pypi.org/project/google-adk/)
 [![Python Unit Tests](https://github.com/google/adk-python/actions/workflows/python-unit-tests.yml/badge.svg)](https://github.com/google/adk-python/actions/workflows/python-unit-tests.yml)
 [![r/agentdevelopmentkit](https://img.shields.io/badge/Reddit-r%2Fagentdevelopmentkit-FF4500?style=flat&logo=reddit&logoColor=white)](https://www.reddit.com/r/agentdevelopmentkit/)
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/google/adk-python)
@@ -14,7 +15,7 @@
     </h3>
     <h3 align="center">
       Important Links:
-      <a href="https://google.github.io/adk-docs/">Docs</a>, 
+      <a href="https://google.github.io/adk-docs/">Docs</a>,
       <a href="https://github.com/google/adk-samples">Samples</a>,
       <a href="https://github.com/google/adk-java">Java ADK</a> &
       <a href="https://github.com/google/adk-web">ADK Web</a>.

contributing/samples/adk_answering_agent/agent.py

@@ -12,18 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any
-
 from adk_answering_agent.settings import BOT_RESPONSE_LABEL
 from adk_answering_agent.settings import IS_INTERACTIVE
 from adk_answering_agent.settings import OWNER
 from adk_answering_agent.settings import REPO
 from adk_answering_agent.settings import VERTEXAI_DATASTORE_ID
-from adk_answering_agent.utils import error_response
-from adk_answering_agent.utils import run_graphql_query
+from adk_answering_agent.tools import add_comment_to_discussion
+from adk_answering_agent.tools import add_label_to_discussion
+from adk_answering_agent.tools import convert_gcs_links_to_https
+from adk_answering_agent.tools import get_discussion_and_comments
 from google.adk.agents.llm_agent import Agent
 from google.adk.tools.vertex_ai_search_tool import VertexAiSearchTool
-import requests
 
 if IS_INTERACTIVE:
   APPROVAL_INSTRUCTION = (
@@ -35,191 +34,6 @@
       " comment."
   )
 
-
-def get_discussion_and_comments(discussion_number: int) -> dict[str, Any]:
-  """Fetches a discussion and its comments using the GitHub GraphQL API.
-
-  Args:
-      discussion_number: The number of the GitHub discussion.
-
-  Returns:
-      A dictionary with the request status and the discussion details.
-  """
-  print(f"Attempting to get discussion #{discussion_number} and its comments")
-  query = """
-        query($owner: String!, $repo: String!, $discussionNumber: Int!) {
-          repository(owner: $owner, name: $repo) {
-            discussion(number: $discussionNumber) {
-              id
-              title
-              body
-              createdAt
-              closed
-              author {
-                login
-              }
-              # For each discussion, fetch the latest 20 labels.
-              labels(last: 20) {
-                nodes {
-                  id
-                  name
-                }
-              }
-              # For each discussion, fetch the latest 100 comments.
-              comments(last: 100) {
-                nodes {
-                  id
-                  body
-                  createdAt
-                  author {
-                    login
-                  }
-                  # For each discussion, fetch the latest 50 replies
-                  replies(last: 50) {
-                    nodes {
-                      id
-                      body
-                      createdAt
-                      author {
-                        login
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-    """
-  variables = {
-      "owner": OWNER,
-      "repo": REPO,
-      "discussionNumber": discussion_number,
-  }
-  try:
-    response = run_graphql_query(query, variables)
-    if "errors" in response:
-      return error_response(str(response["errors"]))
-    discussion_data = (
-        response.get("data", {}).get("repository", {}).get("discussion")
-    )
-    if not discussion_data:
-      return error_response(f"Discussion #{discussion_number} not found.")
-    return {"status": "success", "discussion": discussion_data}
-  except requests.exceptions.RequestException as e:
-    return error_response(str(e))
-
-
-def add_comment_to_discussion(
-    discussion_id: str, comment_body: str
-) -> dict[str, Any]:
-  """Adds a comment to a specific discussion.
-
-  Args:
-      discussion_id: The GraphQL node ID of the discussion.
-      comment_body: The content of the comment in Markdown.
-
-  Returns:
-      The status of the request and the new comment's details.
-  """
-  print(f"Adding comment to discussion {discussion_id}")
-  query = """
-        mutation($discussionId: ID!, $body: String!) {
-          addDiscussionComment(input: {discussionId: $discussionId, body: $body}) {
-            comment {
-              id
-              body
-              createdAt
-              author {
-                login
-              }
-            }
-          }
-        }
-    """
-  variables = {"discussionId": discussion_id, "body": comment_body}
-  try:
-    response = run_graphql_query(query, variables)
-    if "errors" in response:
-      return error_response(str(response["errors"]))
-    new_comment = (
-        response.get("data", {}).get("addDiscussionComment", {}).get("comment")
-    )
-    return {"status": "success", "comment": new_comment}
-  except requests.exceptions.RequestException as e:
-    return error_response(str(e))
-
-
-def get_label_id(label_name: str) -> str | None:
-  """Helper function to find the GraphQL node ID for a given label name."""
-  print(f"Finding ID for label '{label_name}'...")
-  query = """
-    query($owner: String!, $repo: String!, $labelName: String!) {
-      repository(owner: $owner, name: $repo) {
-        label(name: $labelName) {
-          id
-        }
-      }
-    }
-    """
-  variables = {"owner": OWNER, "repo": REPO, "labelName": label_name}
-
-  try:
-    response = run_graphql_query(query, variables)
-    if "errors" in response:
-      print(
-          f"[Warning] Error from GitHub API response for label '{label_name}':"
-          f" {response['errors']}"
-      )
-      return None
-    label_info = response["data"].get("repository", {}).get("label")
-    if label_info:
-      return label_info.get("id")
-    print(f"[Warning] Label information for '{label_name}' not found.")
-    return None
-  except requests.exceptions.RequestException as e:
-    print(f"[Warning] Error from GitHub API: {e}")
-    return None
-
-
-def add_label_to_discussion(
-    discussion_id: str, label_name: str
-) -> dict[str, Any]:
-  """Adds a label to a specific discussion.
-
-  Args:
-      discussion_id: The GraphQL node ID of the discussion.
-      label_name: The name of the label to add (e.g., "bug").
-
-  Returns:
-      The status of the request and the label details.
-  """
-  print(
-      f"Attempting to add label '{label_name}' to discussion {discussion_id}..."
-  )
-  # First, get the GraphQL ID of the label by its name
-  label_id = get_label_id(label_name)
-  if not label_id:
-    return error_response(f"Label '{label_name}' not found.")
-
-  # Then, perform the mutation to add the label to the discussion
-  mutation = """
-    mutation AddLabel($discussionId: ID!, $labelId: ID!) {
-      addLabelsToLabelable(input: {labelableId: $discussionId, labelIds: [$labelId]}) {
-        clientMutationId
-      }
-    }
-    """
-  variables = {"discussionId": discussion_id, "labelId": label_id}
-  try:
-    response = run_graphql_query(mutation, variables)
-    if "errors" in response:
-      return error_response(str(response["errors"]))
-    return {"status": "success", "label_id": label_id, "label_name": label_name}
-  except requests.exceptions.RequestException as e:
-    return error_response(str(e))
-
-
 root_agent = Agent(
     model="gemini-2.5-pro",
     name="adk_answering_agent",
@@ -249,28 +63,20 @@ def add_label_to_discussion(
         information that is not in the document store. Do not invent citations which are not in the document store.
       * **Be Objective**: your answer should be based on the facts you found in the document store, do not be misled by user's assumptions or user's understanding of ADK.
       * If you can't find the answer or information in the document store, **do not** respond.
-      * Include a bolded note (e.g. "Response from ADK Answering Agent") in your comment
-        to indicate this comment was added by an ADK Answering Agent.
-      * Have an empty line between the note and the rest of your response.
       * Inlclude a short summary of your response in the comment as a TLDR, e.g. "**TLDR**: <your summary>".
       * Have a divider line between the TLDR and your detail response.
       * Do not respond to any other discussion except the one specified by the user.
       * Please include your justification for your decision in your output
         to the user who is telling with you.
       * If you uses citation from the document store, please provide a footnote
-        referencing the source document format it as: "[1] URL of the document".
-        * Replace the "gs://prefix/" part, e.g. "gs://adk-qa-bucket/", to be "https://github.com/google/"
-        * Add "blob/main/" after the repo name, e.g. "adk-python", "adk-docs", for example:
-          * If the original URL is "gs://adk-qa-bucket/adk-python/src/google/adk/version.py",
-            then the citation URL is "https://github.com/google/adk-python/blob/main/src/google/adk/version.py",
-          * If the original URL is "gs://adk-qa-bucket/adk-docs/docs/index.md",
-            then the citation URL is "https://github.com/google/adk-docs/blob/main/docs/index.md"
-        * If the file is a html file, replace the ".html" to be ".md"
+        referencing the source document format it as: "[1] publicly accessible HTTPS URL of the document".
+        * You can use the `convert_gcs_links_to_https` tool to convert GCS links to HTTPS links.
     """,
     tools=[
         VertexAiSearchTool(data_store_id=VERTEXAI_DATASTORE_ID),
         get_discussion_and_comments,
         add_comment_to_discussion,
         add_label_to_discussion,
+        convert_gcs_links_to_https,
     ],
 )