fix: Set role='model' for request_input event Content

DeanChensj · copybara-github · commit 0c6974cbc475 · 2026-06-09T19:19:51.000-07:00
Set role='model' in the Content object generated by create_request_input_event()
to ensure proper role attribution when returning function call events to the client.

Co-authored-by: Shangjie Chen &lt;deanchen@google.com&gt;
PiperOrigin-RevId: 929538818
diff --git a/contributing/samples/hitl/tool_confirmation/tests/Transfer_500_and_close_account_ACC123.json b/contributing/samples/hitl/tool_confirmation/tests/Transfer_500_and_close_account_ACC123.json
@@ -94,7 +94,7 @@
             }
           }
         ],
-        "role": "user"
+        "role": "model"
       },
       "id": "e-3",
       "invocationId": "i-1",
diff --git a/contributing/samples/hitl/tool_confirmation/tests/close_account_acc123.json b/contributing/samples/hitl/tool_confirmation/tests/close_account_acc123.json
@@ -64,7 +64,7 @@
             }
           }
         ],
-        "role": "user"
+        "role": "model"
       },
       "id": "e-3",
       "invocationId": "i-1",
diff --git a/contributing/samples/hitl/tool_confirmation/tests/transfer_200_confirmed.json b/contributing/samples/hitl/tool_confirmation/tests/transfer_200_confirmed.json
@@ -66,7 +66,7 @@
             }
           }
         ],
-        "role": "user"
+        "role": "model"
       },
       "id": "e-3",
       "invocationId": "i-1",
diff --git a/contributing/samples/hitl/tool_confirmation/tests/transfer_200_declined.json b/contributing/samples/hitl/tool_confirmation/tests/transfer_200_declined.json
@@ -66,7 +66,7 @@
             }
           }
         ],
-        "role": "user"
+        "role": "model"
       },
       "id": "e-3",
       "invocationId": "i-1",
diff --git a/contributing/samples/multi_agent/sub_agents/tests/check_and_close.json b/contributing/samples/multi_agent/sub_agents/tests/check_and_close.json
@@ -208,7 +208,7 @@
             }
           }
         ],
-        "role": "user"
+        "role": "model"
       },
       "id": "e-9",
       "invocationId": "i-1",
diff --git a/contributing/samples/multi_agent/task_sub_agent/tests/10_burgers.json b/contributing/samples/multi_agent/task_sub_agent/tests/10_burgers.json
@@ -176,7 +176,7 @@
             }
           }
         ],
-        "role": "user"
+        "role": "model"
       },
       "id": "e-9",
       "invocationId": "i-3",
diff --git a/contributing/samples/workflows/auth_api_key/tests/go.json b/contributing/samples/workflows/auth_api_key/tests/go.json
@@ -43,7 +43,8 @@
               "name": "adk_request_credential"
             }
           }
-        ]
+        ],
+        "role": "model"
       },
       "id": "e-2",
       "invocationId": "i-1",
diff --git a/contributing/samples/workflows/request_input/tests/phone_broke.json b/contributing/samples/workflows/request_input/tests/phone_broke.json
@@ -73,7 +73,8 @@
               "name": "adk_request_input"
             }
           }
-        ]
+        ],
+        "role": "model"
       },
       "id": "e-4",
       "invocationId": "i-1",
@@ -162,7 +163,8 @@
               "name": "adk_request_input"
             }
           }
-        ]
+        ],
+        "role": "model"
       },
       "id": "e-8",
       "invocationId": "i-1",
diff --git a/contributing/samples/workflows/request_input/tests/phone_broke_reject.json b/contributing/samples/workflows/request_input/tests/phone_broke_reject.json
@@ -72,7 +72,8 @@
               "name": "adk_request_input"
             }
           }
-        ]
+        ],
+        "role": "model"
       },
       "id": "e-4",
       "invocationId": "i-1",
diff --git a/contributing/samples/workflows/request_input_advanced/tests/2_sick_days.json b/contributing/samples/workflows/request_input_advanced/tests/2_sick_days.json
@@ -92,7 +92,8 @@
               "name": "adk_request_input"
             }
           }
-        ]
+        ],
+        "role": "model"
       },
       "id": "e-3",
       "invocationId": "i-1",
diff --git a/contributing/samples/workflows/request_input_rerun/tests/phone_broke.json b/contributing/samples/workflows/request_input_rerun/tests/phone_broke.json
@@ -73,7 +73,8 @@
               "name": "adk_request_input"
             }
           }
-        ]
+        ],
+        "role": "model"
       },
       "id": "e-4",
       "invocationId": "i-1",
@@ -162,7 +163,8 @@
               "name": "adk_request_input"
             }
           }
-        ]
+        ],
+        "role": "model"
       },
       "id": "e-8",
       "invocationId": "i-1",
diff --git a/src/google/adk/cli/agent_test_runner.py b/src/google/adk/cli/agent_test_runner.py
@@ -22,6 +22,7 @@
 from typing import Optional
 from unittest import mock
 
+from google.adk.agents.base_agent import BaseAgent
 from google.adk.apps.app import App
 from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
 from google.adk.cli.utils.agent_loader import AgentLoader
@@ -249,6 +250,33 @@ def _make_nodes_sequential(obj, visited=None):
       _make_nodes_sequential(obj._node, visited)
 
 
+def _get_all_agent_names(obj, visited=None):
+  if visited is None:
+    visited = set()
+
+  if id(obj) in visited:
+    return set()
+  visited.add(id(obj))
+
+  from google.adk.workflow._parallel_worker import _ParallelWorker
+  from google.adk.workflow._workflow import Workflow
+
+  names = set()
+  if isinstance(obj, BaseAgent) and hasattr(obj, "name"):
+    names.add(obj.name)
+    if hasattr(obj, "sub_agents") and obj.sub_agents:
+      for sub in obj.sub_agents:
+        names.update(_get_all_agent_names(sub, visited))
+  elif isinstance(obj, Workflow):
+    if obj.graph and obj.graph.nodes:
+      for node in obj.graph.nodes:
+        names.update(_get_all_agent_names(node, visited))
+  elif isinstance(obj, _ParallelWorker):
+    if hasattr(obj, "_node"):
+      names.update(_get_all_agent_names(obj._node, visited))
+  return names
+
+
 def _extract_user_content(event: dict) -> Optional[types.Content]:
   """Extracts user content from an event dict and returns a types.Content object.
 
@@ -444,6 +472,26 @@ def test_agent_replay(agent_dir, test_file, monkeypatch):
         else agent_or_app
     )
     _make_nodes_sequential(root_agent)
+    agent_names = _get_all_agent_names(root_agent)
+
+    import inspect
+
+    # Dynamically locate the loaded agent module from sys.modules
+    mod = sys.modules.get(f"{agent_dir.name}.agent") or sys.modules.get(
+        agent_dir.name
+    )
+    if not mod:
+      # Fallback for namespace packages or nested imports
+      for k, v in sys.modules.items():
+        if k.endswith(f"{agent_dir.name}.agent") or k.endswith(agent_dir.name):
+          mod = v
+          break
+
+    # Reflectively find all Agent instances defined in the module (e.g. dynamic agents)
+    if mod:
+      for _, obj in inspect.getmembers(mod):
+        if isinstance(obj, BaseAgent) and hasattr(obj, "name"):
+          agent_names.add(obj.name)
 
     with open(test_file, "r") as f:
       session_data = json.load(f)
@@ -488,6 +536,23 @@ def test_agent_replay(agent_dir, test_file, monkeypatch):
             last_was_set_model_response = False
             continue
 
+          if ev.get("author", "") not in agent_names:
+            continue
+
+          parts = content_dict.get("parts", [])
+          is_sys_hitl = False
+          for part in parts:
+            if "functionCall" in part:
+              fc_name = part["functionCall"].get("name")
+              if fc_name in (
+                  "adk_request_confirmation",
+                  "adk_request_credential",
+              ):
+                is_sys_hitl = True
+                break
+          if is_sys_hitl:
+            continue
+
           try:
             content_obj = types.Content.model_validate(content_dict)
             all_responses.append(
diff --git a/src/google/adk/flows/llm_flows/functions.py b/src/google/adk/flows/llm_flows/functions.py
@@ -381,9 +381,7 @@ def generate_request_confirmation_event(
       invocation_id=invocation_context.invocation_id,
       author=invocation_context.agent.name,
       branch=invocation_context.branch,
-      content=types.Content(
-          parts=parts, role=function_response_event.content.role
-      ),
+      content=types.Content(parts=parts, role='model'),
       long_running_tool_ids=long_running_tool_ids,
   )
 
diff --git a/src/google/adk/workflow/utils/_workflow_hitl_utils.py b/src/google/adk/workflow/utils/_workflow_hitl_utils.py
@@ -55,6 +55,7 @@ def create_request_input_event(request_input: RequestInput) -> Event:
   )
   return Event(
       content=types.Content(
+          role='model',
           parts=[
               types.Part(
                   function_call=types.FunctionCall(
@@ -63,7 +64,7 @@ def create_request_input_event(request_input: RequestInput) -> Event:
                       id=request_input.interrupt_id,
                   )
               )
-          ]
+          ],
       ),
       long_running_tool_ids=[request_input.interrupt_id],
   )
@@ -179,6 +180,7 @@ def create_auth_request_event(
 
   return Event(
       content=types.Content(
+          role='model',
           parts=[
               types.Part(
                   function_call=types.FunctionCall(
@@ -187,7 +189,7 @@ def create_auth_request_event(
                       args=args,
                   )
               )
-          ]
+          ],
       ),
       long_running_tool_ids=[interrupt_id],
   )
diff --git a/tests/unittests/workflow/utils/test_workflow_hitl_utils.py b/tests/unittests/workflow/utils/test_workflow_hitl_utils.py
@@ -40,6 +40,7 @@ def test_basic_event(self):
 
     assert event.long_running_tool_ids == {"test-id"}
     assert event.content is not None
+    assert event.content.role == "model"
     fc = event.content.parts[0].function_call
     assert fc.name == "adk_request_input"
     assert fc.id == "test-id"

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`],`
`97`		`- "role": "user"`
	`97`	`+ "role": "model"`
`98`	`98`	`},`
`99`	`99`	`"id": "e-3",`
`100`	`100`	`"invocationId": "i-1",`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`],`
`67`		`- "role": "user"`
	`67`	`+ "role": "model"`
`68`	`68`	`},`
`69`	`69`	`"id": "e-3",`
`70`	`70`	`"invocationId": "i-1",`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`],`
`69`		`- "role": "user"`
	`69`	`+ "role": "model"`
`70`	`70`	`},`
`71`	`71`	`"id": "e-3",`
`72`	`72`	`"invocationId": "i-1",`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`	`],`
`211`		`- "role": "user"`
	`211`	`+ "role": "model"`
`212`	`212`	`},`
`213`	`213`	`"id": "e-9",`
`214`	`214`	`"invocationId": "i-1",`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`	`],`
`179`		`- "role": "user"`
	`179`	`+ "role": "model"`
`180`	`180`	`},`
`181`	`181`	`"id": "e-9",`
`182`	`182`	`"invocationId": "i-3",`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@`
`43`	`43`	`"name": "adk_request_credential"`
`44`	`44`	`}`
`45`	`45`	`}`
`46`		`- ]`
	`46`	`+ ],`
	`47`	`+ "role": "model"`
`47`	`48`	`},`
`48`	`49`	`"id": "e-2",`
`49`	`50`	`"invocationId": "i-1",`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,8 @@`
`73`	`73`	`"name": "adk_request_input"`
`74`	`74`	`}`
`75`	`75`	`}`
`76`		`- ]`
	`76`	`+ ],`
	`77`	`+ "role": "model"`
`77`	`78`	`},`
`78`	`79`	`"id": "e-4",`
`79`	`80`	`"invocationId": "i-1",`
`@@ -162,7 +163,8 @@`
`162`	`163`	`"name": "adk_request_input"`
`163`	`164`	`}`
`164`	`165`	`}`
`165`		`- ]`
	`166`	`+ ],`
	`167`	`+ "role": "model"`
`166`	`168`	`},`
`167`	`169`	`"id": "e-8",`
`168`	`170`	`"invocationId": "i-1",`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@`
`72`	`72`	`"name": "adk_request_input"`
`73`	`73`	`}`
`74`	`74`	`}`
`75`		`- ]`
	`75`	`+ ],`
	`76`	`+ "role": "model"`
`76`	`77`	`},`
`77`	`78`	`"id": "e-4",`
`78`	`79`	`"invocationId": "i-1",`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,8 @@`
`92`	`92`	`"name": "adk_request_input"`
`93`	`93`	`}`
`94`	`94`	`}`
`95`		`- ]`
	`95`	`+ ],`
	`96`	`+ "role": "model"`
`96`	`97`	`},`
`97`	`98`	`"id": "e-3",`
`98`	`99`	`"invocationId": "i-1",`