Merge branch 'main' into fix/parallel-state-delta-list-merge

Author: rohityan

.github/workflows/triage.yml

@@ -17,8 +17,7 @@ jobs:
     if: >-
       github.repository == 'google/adk-python' && (
         github.event_name == 'schedule' ||
-        github.event.action == 'opened' ||
-        github.event.label.name == 'planned'
+        github.event.action == 'opened'
       )
     permissions:
       issues: write

contributing/samples/adk_triaging_agent/agent.py

@@ -42,6 +42,14 @@
     "workflow": "DeanChensj",
 }
 
+
+LABEL_TO_GTECH = [
+    "klateefa",
+    "llalitkumarrr",
+    "surajksharma07",
+    "sanketpatil06",
+]
+
 LABEL_GUIDELINES = """
       Label rubric and disambiguation rules:
       - "documentation": Tutorials, README content, reference docs, or samples.
@@ -121,15 +129,13 @@ def list_untriaged_issues(issue_count: int) -> dict[str, Any]:
 
     existing_component_labels = issue_labels & component_labels
     has_component = bool(existing_component_labels)
-    has_planned = "planned" in issue_labels
 
     # Determine what actions are needed
     needs_component_label = not has_component
-    needs_owner = has_planned and not assignees
+    needs_owner = not assignees
 
     # Include issue if it needs any action
     if needs_component_label or needs_owner:
-      issue["has_planned_label"] = has_planned
       issue["has_component_label"] = has_component
       issue["existing_component_label"] = (
           list(existing_component_labels)[0]
@@ -146,7 +152,6 @@ def list_untriaged_issues(issue_count: int) -> dict[str, Any]:
 
 def add_label_to_issue(issue_number: int, label: str) -> dict[str, Any]:
   """Add the specified component label to the given issue number.
-
   Args:
     issue_number: issue number of the GitHub issue.
     label: label to assign
@@ -177,37 +182,30 @@ def add_label_to_issue(issue_number: int, label: str) -> dict[str, Any]:
   }
 
 
-def add_owner_to_issue(issue_number: int, label: str) -> dict[str, Any]:
-  """Assign an owner to the issue based on the component label.
+def assign_gtech_owner_to_issue(issue_number: int) -> dict[str, Any]:
+  """Assign an owner from the GTech team to the given issue number.
 
-  This should only be called for issues that have the 'planned' label.
+  This is go to option irrespective of component label or planned label,
+  as long as the issue needs an owner.
+
+  All unassigned issues will be considered for GTech ownership. Unassigned
+  issues will seperated in two categories: issues with type "Bug" and issues
+  with type "Feature". Then bug issues and feature issues will be equally
+  assigned to the Gtech members in such a way that every day all members get
+  equal number of bug and feature issues.
 
   Args:
     issue_number: issue number of the GitHub issue.
-    label: component label that determines the owner to assign
 
   Returns:
     The status of this request, with the assigned owner when successful.
   """
-  print(
-      f"Attempting to assign owner for label '{label}' to issue #{issue_number}"
-  )
-  if label not in LABEL_TO_OWNER:
-    return error_response(
-        f"Error: Label '{label}' is not a valid component label."
-    )
-
-  owner = LABEL_TO_OWNER.get(label, None)
-  if not owner:
-    return {
-        "status": "warning",
-        "message": f"Label '{label}' does not have an owner. Will not assign.",
-    }
-
+  print(f"Attempting to assign GTech owner to issue #{issue_number}")
+  gtech_assignee = LABEL_TO_GTECH[issue_number % len(LABEL_TO_GTECH)]
   assignee_url = (
       f"{GITHUB_BASE_URL}/repos/{OWNER}/{REPO}/issues/{issue_number}/assignees"
   )
-  assignee_payload = {"assignees": [owner]}
+  assignee_payload = {"assignees": [gtech_assignee]}
 
   try:
     response = post_request(assignee_url, assignee_payload)
@@ -217,7 +215,7 @@ def add_owner_to_issue(issue_number: int, label: str) -> dict[str, Any]:
   return {
       "status": "success",
       "message": response,
-      "assigned_owner": owner,
+      "assigned_owner": gtech_assignee,
   }
 
 
@@ -259,7 +257,7 @@ def change_issue_type(issue_number: int, issue_type: str) -> dict[str, Any]:
 
       Each issue will have flags indicating what actions are needed:
       - `needs_component_label`: true if the issue needs a component label
-      - `needs_owner`: true if the issue needs an owner assigned (has 'planned' label but no assignee)
+      - `needs_owner`: true if the issue needs an owner assigned
 
       For each issue, perform ONLY the required actions based on the flags:
 
@@ -271,8 +269,8 @@ def change_issue_type(issue_number: int, issue_type: str) -> dict[str, Any]:
            - Otherwise → do not change the issue type
 
       2. **If `needs_owner` is true**:
-         - Use `add_owner_to_issue` to assign an owner based on the component label
-         - Note: If the issue already has a component label (`has_component_label: true`), use that existing label to determine the owner
+         - Use `assign_gtech_owner_to_issue` to assign an owner.
+
 
       Do NOT add a component label if `needs_component_label` is false.
       Do NOT assign an owner if `needs_owner` is false.
@@ -282,19 +280,18 @@ def change_issue_type(issue_number: int, issue_type: str) -> dict[str, Any]:
         placeholders (never output text like "[fill in later]").
       - Justify the chosen label with a short explanation referencing the issue
         details.
-      - Mention the assigned owner only when you actually assign one (i.e., when
-        the issue has the 'planned' label).
+      - Mention the assigned owner only when you actually assign one.
       - If no label is applied, clearly state why.
 
       Present the following in an easy to read format highlighting issue number and your label.
       - the issue summary in a few sentence
       - your label recommendation and justification
-      - the owner of the label if you assign the issue to an owner (only for planned issues)
+      - the owner, if you assign the issue to an owner
     """,
     tools=[
         list_untriaged_issues,
         add_label_to_issue,
-        add_owner_to_issue,
+        assign_gtech_owner_to_issue,
         change_issue_type,
     ],
 )

contributing/samples/adk_triaging_agent/main.py

@@ -57,7 +57,7 @@ async def fetch_specific_issue_details(issue_number: int):
 
     # Determine what actions are needed
     needs_component_label = not has_component
-    needs_owner = has_planned and not has_assignee
+    needs_owner = not has_assignee
 
     if needs_component_label or needs_owner:
       print(

contributing/samples/toolbox_agent/README.md

@@ -1,6 +1,6 @@
 # Toolbox Agent
 
-This agent utilizes [MCP toolbox for database](https://googleapis.github.io/genai-toolbox/getting-started/introduction/) to assist end users based on information stored in a database.
+This agent utilizes [MCP toolbox for database](https://mcp-toolbox.dev) to assist end users based on information stored in a database.
 
 Follow the steps below to run this agent.
 

pyproject.toml

@@ -123,6 +123,7 @@ test = [
   "a2a-sdk>=0.3.0,<0.4.0",
   "anthropic>=0.43.0",                            # For anthropic model tests
   "crewai[tools];python_version>='3.11' and python_version<'3.12'",         # For CrewaiTool tests; chromadb/pypika fail on 3.12+
+  "google-cloud-parametermanager>=0.4.0, <1.0.0",
   "kubernetes>=29.0.0",                           # For GkeCodeExecutor
   "langchain-community>=0.3.17",
   "langgraph>=0.2.60, <0.4.8",                    # For LangGraphAgent
@@ -157,6 +158,7 @@ extensions = [
   "beautifulsoup4>=3.2.2",                      # For load_web_page tool.
   "crewai[tools];python_version>='3.11' and python_version<'3.12'",       # For CrewaiTool; chromadb/pypika fail on 3.12+
   "docker>=7.0.0",                              # For ContainerCodeExecutor
+  "google-cloud-parametermanager>=0.4.0, <1.0.0",
   "kubernetes>=29.0.0",                         # For GkeCodeExecutor
   "k8s-agent-sandbox>=0.1.1.post3",             # For GkeCodeExecutor sandbox mode
   "langgraph>=0.2.60, <0.4.8",                  # For LangGraphAgent

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

@@ -218,6 +218,23 @@ def convert_event_to_a2a_events(
               ),
           )
       )
+    elif _serialize_value(event.actions) is not None:
+      a2a_events.append(
+          TaskStatusUpdateEvent(
+              task_id=task_id,
+              context_id=context_id,
+              status=TaskStatus(
+                  state=TaskState.working,
+                  message=Message(
+                      message_id=str(uuid.uuid4()),
+                      role=Role.agent,
+                      parts=[],
+                  ),
+                  timestamp=datetime.now(timezone.utc).isoformat(),
+              ),
+              final=False,
+          )
+      )
 
     a2a_events = _add_event_metadata(event, a2a_events)
     return a2a_events
@@ -280,7 +297,10 @@ def _add_event_metadata(
       metadata[_get_adk_metadata_key(field_name)] = value
 
   for a2a_event in a2a_events:
-    if isinstance(a2a_event, TaskStatusUpdateEvent):
+    if (
+        isinstance(a2a_event, TaskStatusUpdateEvent)
+        and a2a_event.status.message
+    ):
       a2a_event.status.message.metadata = metadata.copy()
     elif isinstance(a2a_event, TaskArtifactUpdateEvent):
       a2a_event.artifact.metadata = metadata.copy()

src/google/adk/a2a/executor/a2a_agent_executor.py

@@ -260,17 +260,15 @@ async def _handle_request(
             context.context_id,
             self._config.gen_ai_part_converter,
         ):
-          a2a_event = await execute_after_event_interceptors(
+          a2a_events = await execute_after_event_interceptors(
               a2a_event,
               executor_context,
               adk_event,
               self._config.execute_interceptors,
           )
-          if a2a_event is None:
-            continue
-
-          task_result_aggregator.process_event(a2a_event)
-          await event_queue.enqueue_event(a2a_event)
+          for e in a2a_events:
+            task_result_aggregator.process_event(e)
+            await event_queue.enqueue_event(e)
 
     # publish the task result event - this is final
     if (

src/google/adk/a2a/executor/a2a_agent_executor_impl.py

@@ -49,6 +49,7 @@
 from ..experimental import a2a_experimental
 from .config import A2aAgentExecutorConfig
 from .executor_context import ExecutorContext
+from .interceptors.include_artifacts_in_a2a_event import include_artifacts_in_a2a_event_interceptor
 from .utils import execute_after_agent_interceptors
 from .utils import execute_after_event_interceptors
 from .utils import execute_before_agent_interceptors
@@ -221,15 +222,14 @@ async def _handle_request(
             self._config.gen_ai_part_converter,
         ):
           a2a_event.metadata = self._get_invocation_metadata(executor_context)
-          a2a_event = await execute_after_event_interceptors(
+          a2a_events = await execute_after_event_interceptors(
               a2a_event,
               executor_context,
               adk_event,
               self._config.execute_interceptors,
           )
-          if not a2a_event:
-            continue
-          await event_queue.enqueue_event(a2a_event)
+          for e in a2a_events:
+            await event_queue.enqueue_event(e)
 
     if error_event:
       final_event = error_event

src/google/adk/a2a/executor/config.py

@@ -57,7 +57,7 @@ class ExecuteInterceptor:
   after_event: Optional[
       Callable[
           [ExecutorContext, A2AEvent, Event],
-          Awaitable[Union[A2AEvent, None]],
+          Awaitable[Union[A2AEvent, list[A2AEvent], None]],
       ]
   ] = None
   """Hook executed after an ADK event is converted to an A2A event.

src/google/adk/a2a/executor/interceptors/__init__.py

@@ -0,0 +1,19 @@
+# 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.
+
+from .include_artifacts_in_a2a_event import include_artifacts_in_a2a_event_interceptor
+
+__all__ = [
+    "include_artifacts_in_a2a_event_interceptor",
+]