Merge branch 'main' into use-starred-tuple-unpacking-on-gcs-artifact-blob-names-versions

Author: DeanChensj

contributing/samples/a2a_auth/agent.py

@@ -14,6 +14,7 @@
 
 
 from google.adk.agents import Agent
+from google.adk.agents.remote_a2a_agent import AGENT_CARD_WELL_KNOWN_PATH
 from google.adk.agents.remote_a2a_agent import RemoteA2aAgent
 from google.adk.tools.langchain_tool import LangchainTool
 from langchain_community.tools import YouTubeSearchTool
@@ -41,7 +42,7 @@
     name="bigquery_agent",
     description="Help customer to manage notion workspace.",
     agent_card=(
-        "http://localhost:8001/a2a/bigquery_agent/.well-known/agent.json"
+        f"http://localhost:8001/a2a/bigquery_agent{AGENT_CARD_WELL_KNOWN_PATH}"
     ),
 )
 

contributing/samples/a2a_basic/agent.py

@@ -15,6 +15,7 @@
 import random
 
 from google.adk.agents import Agent
+from google.adk.agents.remote_a2a_agent import AGENT_CARD_WELL_KNOWN_PATH
 from google.adk.agents.remote_a2a_agent import RemoteA2aAgent
 from google.adk.tools.example_tool import ExampleTool
 from google.genai import types
@@ -87,7 +88,7 @@ def roll_die(sides: int) -> int:
     name="prime_agent",
     description="Agent that handles checking if numbers are prime.",
     agent_card=(
-        "http://localhost:8001/a2a/check_prime_agent/.well-known/agent.json"
+        f"http://localhost:8001/a2a/check_prime_agent{AGENT_CARD_WELL_KNOWN_PATH}"
     ),
 )
 

contributing/samples/a2a_human_in_loop/agent.py

@@ -14,6 +14,7 @@
 
 
 from google.adk import Agent
+from google.adk.agents.remote_a2a_agent import AGENT_CARD_WELL_KNOWN_PATH
 from google.adk.agents.remote_a2a_agent import RemoteA2aAgent
 from google.genai import types
 
@@ -28,7 +29,9 @@ def reimburse(purpose: str, amount: float) -> str:
 approval_agent = RemoteA2aAgent(
     name='approval_agent',
     description='Help approve the reimburse if the amount is greater than 100.',
-    agent_card='http://localhost:8001/a2a/human_in_loop/.well-known/agent.json',
+    agent_card=(
+        f'http://localhost:8001/a2a/human_in_loop{AGENT_CARD_WELL_KNOWN_PATH}'
+    ),
 )
 
 

contributing/samples/adk_answering_agent/agent.py

@@ -14,6 +14,7 @@
 
 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
@@ -57,7 +58,14 @@ def get_discussion_and_comments(discussion_number: int) -> dict[str, Any]:
               author {
                 login
               }
-              # For each comment, fetch the latest 100 comments.
+              # 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
@@ -66,7 +74,7 @@ def get_discussion_and_comments(discussion_number: int) -> dict[str, Any]:
                   author {
                     login
                   }
-                  # For each comment, fetch the latest 50 replies
+                  # For each discussion, fetch the latest 50 replies
                   replies(last: 50) {
                     nodes {
                       id
@@ -142,6 +150,76 @@ def add_comment_to_discussion(
     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",
@@ -160,6 +238,10 @@ def add_comment_to_discussion(
       * The latest comment is not from you or other agents (marked as "Response from XXX Agent").
       * The latest comment is asking a question or requesting information.
     4. Use the `VertexAiSearchTool` to find relevant information before answering.
+    5. If you can find relevant information, use the `add_comment_to_discussion` tool to add a comment to the discussion.
+    6. If you post a commment and the discussion does not have a label named {BOT_RESPONSE_LABEL},
+       add the label {BOT_RESPONSE_LABEL} to the discussion using the `add_label_to_discussion` tool.
+
 
     IMPORTANT:
       * {APPROVAL_INSTRUCTION}
@@ -188,5 +270,6 @@ def add_comment_to_discussion(
         VertexAiSearchTool(data_store_id=VERTEXAI_DATASTORE_ID),
         get_discussion_and_comments,
         add_comment_to_discussion,
+        add_label_to_discussion,
     ],
 )

contributing/samples/adk_answering_agent/settings.py

@@ -31,6 +31,7 @@
 
 OWNER = os.getenv("OWNER", "google")
 REPO = os.getenv("REPO", "adk-python")
+BOT_RESPONSE_LABEL = os.getenv("BOT_RESPONSE_LABEL", "bot_responded")
 DISCUSSION_NUMBER = os.getenv("DISCUSSION_NUMBER")
 
 IS_INTERACTIVE = os.getenv("INTERACTIVE", "1").lower() in ["true", "1"]

pyproject.toml

@@ -80,7 +80,7 @@ dev = [
 
 a2a = [
   # go/keep-sorted start
-  "a2a-sdk>=0.2.7;python_version>='3.10'"
+  "a2a-sdk>=0.2.11;python_version>='3.10'"
   # go/keep-sorted end
 ]
 

src/google/adk/agents/__init__.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from .base_agent import BaseAgent
+from .invocation_context import InvocationContext
 from .live_request_queue import LiveRequest
 from .live_request_queue import LiveRequestQueue
 from .llm_agent import Agent
@@ -29,4 +30,8 @@
     'LoopAgent',
     'ParallelAgent',
     'SequentialAgent',
+    'InvocationContext',
+    'LiveRequest',
+    'LiveRequestQueue',
+    'RunConfig',
 ]

src/google/adk/agents/invocation_context.py

@@ -149,7 +149,7 @@ class InvocationContext(BaseModel):
   """The running streaming tools of this invocation."""
 
   transcription_cache: Optional[list[TranscriptionEntry]] = None
-  """Caches necessary, data audio or contents, that are needed by transcription."""
+  """Caches necessary data, audio or contents, that are needed by transcription."""
 
   run_config: Optional[RunConfig] = None
   """Configurations for live agents under this invocation."""

src/google/adk/agents/llm_agent.py

@@ -168,9 +168,9 @@ class LlmAgent(BaseAgent):
   """Controls content inclusion in model requests.
 
   Options:
-      default: Model receives relevant conversation history
-      none: Model receives no prior history, operates solely on current
-            instruction and input
+    default: Model receives relevant conversation history
+    none: Model receives no prior history, operates solely on current
+    instruction and input
   """
 
   # Controlled input/output configurations - Start
@@ -179,8 +179,9 @@ class LlmAgent(BaseAgent):
   output_schema: Optional[type[BaseModel]] = None
   """The output schema when agent replies.
 
-  NOTE: when this is set, agent can ONLY reply and CANNOT use any tools, such as
-  function tools, RAGs, agent transfer, etc.
+  NOTE:
+    When this is set, agent can ONLY reply and CANNOT use any tools, such as
+    function tools, RAGs, agent transfer, etc.
   """
   output_key: Optional[str] = None
   """The key in session state to store the output of the agent.
@@ -195,9 +196,9 @@ class LlmAgent(BaseAgent):
   planner: Optional[BasePlanner] = None
   """Instructs the agent to make a plan and execute it step by step.
 
-  NOTE: to use model's built-in thinking features, set the `thinking_config`
-  field in `google.adk.planners.built_in_planner`.
-
+  NOTE:
+    To use model's built-in thinking features, set the `thinking_config`
+    field in `google.adk.planners.built_in_planner`.
   """
 
   code_executor: Optional[BaseCodeExecutor] = None
@@ -206,7 +207,8 @@ class LlmAgent(BaseAgent):
 
   Check out available code executions in `google.adk.code_executor` package.
 
-  NOTE: to use model's built-in code executor, use the `BuiltInCodeExecutor`.
+  NOTE:
+    To use model's built-in code executor, use the `BuiltInCodeExecutor`.
   """
   # Advance features - End
 

src/google/adk/agents/remote_a2a_agent.py

@@ -26,7 +26,7 @@
 
 try:
   from a2a.client import A2AClient
-  from a2a.client.client import A2ACardResolver  # Import A2ACardResolver
+  from a2a.client.client import A2ACardResolver
   from a2a.types import AgentCard
   from a2a.types import Message as A2AMessage
   from a2a.types import MessageSendParams as A2AMessageSendParams
@@ -35,7 +35,6 @@
   from a2a.types import SendMessageRequest
   from a2a.types import SendMessageSuccessResponse
   from a2a.types import Task as A2ATask
-
 except ImportError as e:
   import sys
 
@@ -46,6 +45,12 @@
   else:
     raise e
 
+try:
+  from a2a.utils.constants import AGENT_CARD_WELL_KNOWN_PATH
+except ImportError:
+  # Fallback for older versions of a2a-sdk.
+  AGENT_CARD_WELL_KNOWN_PATH = "/.well-known/agent.json"
+
 from google.genai import types as genai_types
 import httpx
 
@@ -63,11 +68,18 @@
 from ..utils.feature_decorator import experimental
 from .base_agent import BaseAgent
 
+__all__ = [
+    "A2AClientError",
+    "AGENT_CARD_WELL_KNOWN_PATH",
+    "AgentCardResolutionError",
+    "RemoteA2aAgent",
+]
+
+
 # Constants
 A2A_METADATA_PREFIX = "a2a:"
 DEFAULT_TIMEOUT = 600.0
 
-
 logger = logging.getLogger("google_adk." + __name__)