Merge branch 'main' into release/v1.31.0

wukath · web-flow · commit f0204a7fcba0 · 2026-04-16T18:03:45.000-07:00
diff --git a/src/google/adk/agents/common_configs.py b/src/google/adk/agents/common_configs.py
@@ -118,7 +118,7 @@ class AgentRefConfig(BaseModel):
     my_custom_agent = LlmAgent(
         name="my_custom_agent",
         instruction="You are a helpful custom agent.",
-        model="gemini-2.0-flash",
+        model="gemini-2.5-flash",
     )
     ```
 
diff --git a/src/google/adk/agents/config_schemas/AgentConfig.json b/src/google/adk/agents/config_schemas/AgentConfig.json
@@ -2461,7 +2461,7 @@
             }
           ],
           "default": null,
-          "description": "Optional. LlmAgent.model. Provide a model name string (e.g. \"gemini-2.0-flash\"). If not set, the model will be inherited from the ancestor or fall back to the system default (gemini-2.5-flash unless overridden via LlmAgent.set_default_model). To construct a model instance from code, use model_code.",
+          "description": "Optional. LlmAgent.model. Provide a model name string (e.g. \"gemini-2.5-flash\"). If not set, the model will be inherited from the ancestor or fall back to the system default (gemini-2.5-flash unless overridden via LlmAgent.set_default_model). To construct a model instance from code, use model_code.",
           "title": "Model"
         },
         "instruction": {
diff --git a/src/google/adk/agents/llm_agent_config.py b/src/google/adk/agents/llm_agent_config.py
@@ -55,7 +55,7 @@ class LlmAgentConfig(BaseAgentConfig):
       default=None,
       description=(
           'Optional. LlmAgent.model. Provide a model name string (e.g.'
-          ' "gemini-2.0-flash"). If not set, the model will be inherited from'
+          ' "gemini-2.5-flash"). If not set, the model will be inherited from'
           ' the ancestor or fall back to the system default (gemini-2.5-flash'
           ' unless overridden via LlmAgent.set_default_model). To construct a'
           ' model instance from code, use model_code.'
diff --git a/src/google/adk/flows/llm_flows/base_llm_flow.py b/src/google/adk/flows/llm_flows/base_llm_flow.py
@@ -720,19 +720,21 @@ async def _receive_from_model(
   ) -> AsyncGenerator[Event, None]:
     """Receive data from model and process events using BaseLlmConnection."""
 
-    def get_author_for_event(llm_response):
+    def get_author_for_event(llm_response: LlmResponse) -> str:
       """Get the author of the event.
 
-      When the model returns transcription, the author is "user". Otherwise, the
-      author is the agent name(not 'model').
+      When the model returns input transcription, the author is set to "user".
+      Otherwise, the author is the agent name (not 'model').
 
       Args:
         llm_response: The LLM response from the LLM call.
+
+      Returns:
+        The author of the event as a string, either "user" or the agent's name.
       """
-      if (
-          llm_response
-          and llm_response.content
-          and llm_response.content.role == 'user'
+      if llm_response and (
+          llm_response.input_transcription
+          or (llm_response.content and llm_response.content.role == 'user')
       ):
         return 'user'
       else:
diff --git a/src/google/adk/flows/llm_flows/contents.py b/src/google/adk/flows/llm_flows/contents.py
@@ -572,6 +572,28 @@ def _get_current_turn_contents(
 
 def _is_other_agent_reply(current_agent_name: str, event: Event) -> bool:
   """Whether the event is a reply from another agent."""
+  # In live/bidi mode, all events from any agents, including the current
+  # agent, will be marked as other agent's reply. When agent transfers,
+  # the conversation history will be sent to the Live API. If the current
+  # agent previously used `transfer_to_agent` to transfer to another agent,
+  # when the conversation is sent back to the current agent, the history will
+  # contain a `transfer_to_agent` function call event from the current agent.
+  # The Live API marks anything after the function response as model response.
+  # This will confuse the model and cause the model to not respond.
+  #
+  # E.g. when the conversation is transferred from agent A to agent B, then
+  # back to agent A, the history in the last transfer will be:
+  #   User: "Some message that triggers transfer to agent B"
+  #   Model: transfer_to_agent(B)
+  #   User: transfer_to_agent(B) response
+  #   User: "Some message that triggers transfer to agent A"
+  #   User: "For context: [agent B] called transfer_to_agent(A)"
+  #   User: "For context: [agent B] tool transfer_to_agent(A) returned result:"
+  #
+  # In this case, the last three events are marked as model response by the
+  # Live API, instead of user input.
+  if event.live_session_id:
+    return event.author != 'user'
   return bool(
       current_agent_name
       and event.author != current_agent_name
diff --git a/src/google/adk/tools/mcp_tool/mcp_toolset.py b/src/google/adk/tools/mcp_tool/mcp_toolset.py
@@ -82,7 +82,7 @@ class McpToolset(BaseToolset):
 
     # Use in an agent
     agent = LlmAgent(
-        model='gemini-2.0-flash',
+        model='gemini-2.5-flash',
         name='enterprise_assistant',
         instruction='Help user accessing their file systems',
         tools=[toolset],
diff --git a/src/google/adk/tools/skill_toolset.py b/src/google/adk/tools/skill_toolset.py
@@ -165,7 +165,7 @@ async def run_async(
     agent_name = tool_context.agent_name
     state_key = f"_adk_activated_skill_{agent_name}"
 
-    activated_skills = list(tool_context.state.get(state_key, []))
+    activated_skills = list(tool_context.state.get(state_key) or [])
     if skill_name not in activated_skills:
       activated_skills.append(skill_name)
       tool_context.state[state_key] = activated_skills
@@ -732,7 +732,6 @@ async def run_async(
           "error_code": "SKILL_NOT_FOUND",
       }
 
-    script = None
     if file_path.startswith("scripts/"):
       script = skill.resources.get_script(file_path[len("scripts/") :])
     else:
@@ -845,7 +844,7 @@ async def _resolve_additional_tools_from_state(
 
     agent_name = readonly_context.agent_name
     state_key = f"_adk_activated_skill_{agent_name}"
-    activated_skills = readonly_context.state.get(state_key, [])
+    activated_skills = readonly_context.state.get(state_key) or []
 
     if not activated_skills:
       return []
diff --git a/src/google/adk/utils/instructions_utils.py b/src/google/adk/utils/instructions_utils.py
@@ -51,7 +51,7 @@ async def build_instruction(
     )
 
   agent = Agent(
-      model="gemini-2.0-flash",
+      model="gemini-2.5-flash",
       name="agent",
       instruction=build_instruction,
   )
diff --git a/src/google/adk/utils/model_name_utils.py b/src/google/adk/utils/model_name_utils.py
@@ -41,7 +41,7 @@ def extract_model_name(model_string: str) -> str:
 
   Args:
     model_string: Either a simple model name like "gemini-2.5-pro" or a
-      path-based model name like "projects/.../models/gemini-2.0-flash-001"
+      path-based model name like "projects/.../models/gemini-2.5-flash"
 
   Returns:
     The extracted model name (e.g., "gemini-2.5-pro")
diff --git a/tests/integration/fixture/ecommerce_customer_service_agent/agent.py b/tests/integration/fixture/ecommerce_customer_service_agent/agent.py
@@ -288,7 +288,7 @@ def get_user_id_from_cookie() -> str:
 
 
 root_agent = Agent(
-    model="gemini-2.0-flash-001",
+    model="gemini-2.5-flash",
     name="Ecommerce_Customer_Service",
     instruction="""
       You are an intelligent customer service assistant for an e-commerce platform. Your goal is to accurately understand user queries and use the appropriate tools to fulfill requests. Follow these guidelines:
diff --git a/tests/integration/fixture/hello_world_agent/agent.py b/tests/integration/fixture/hello_world_agent/agent.py
@@ -60,7 +60,7 @@ def check_prime(nums: list[int]) -> list[str]:
 
 
 root_agent = Agent(
-    model='gemini-2.0-flash-001',
+    model='gemini-2.5-flash',
     name='data_processing_agent',
     instruction="""
       You roll dice and answer questions about the outcome of the dice rolls.
diff --git a/tests/integration/fixture/hello_world_agent_async/agent.py b/tests/integration/fixture/hello_world_agent_async/agent.py
@@ -68,7 +68,7 @@ async def get_agent_async() -> (
 ):
   """Returns the root agent."""
   root_agent = Agent(
-      model='gemini-2.0-flash-001',
+      model='gemini-2.5-flash',
       name='data_processing_agent',
       instruction="""
       You roll dice and answer questions about the outcome of the dice rolls.
diff --git a/tests/integration/fixture/home_automation_agent/agent.py b/tests/integration/fixture/home_automation_agent/agent.py
@@ -284,7 +284,7 @@ def list_devices(status: str = "", location: str = "") -> list:
 
 
 root_agent = Agent(
-    model="gemini-2.0-flash-001",
+    model="gemini-2.5-flash",
     name="Home_automation_agent",
     instruction="""
     You are Home Automation Agent. You are responsible for controlling the devices in the home.
diff --git a/tests/integration/fixture/trip_planner_agent/agent.py b/tests/integration/fixture/trip_planner_agent/agent.py
@@ -99,7 +99,7 @@
 )
 
 root_agent = Agent(
-    model='gemini-2.0-flash-001',
+    model='gemini-2.5-flash',
     name='trip_planner',
     description='Plan the best trip ever',
     instruction="""
diff --git a/tests/integration/test_vertex_ai_search_grounding_streaming.py b/tests/integration/test_vertex_ai_search_grounding_streaming.py
@@ -44,7 +44,7 @@
 _COLLECTION = "default_collection"
 _DATA_STORE_ID = f"adk-grounding-test-{uuid.uuid4().hex[:8]}"
 _DATA_STORE_DISPLAY_NAME = "ADK Grounding Integration Test"
-_MODEL = "gemini-2.0-flash"
+_MODEL = "gemini-2.5-flash"
 
 _TEST_DOCUMENTS = (
     {
diff --git a/tests/unittests/flows/llm_flows/test_base_llm_flow.py b/tests/unittests/flows/llm_flows/test_base_llm_flow.py
@@ -925,3 +925,59 @@ async def test_postprocess_live_session_resumption_update():
   assert len(events) == 1
   assert events[0].live_session_resumption_update is not None
   assert events[0].live_session_resumption_update.new_handle == 'test_handle'
+
+
+@pytest.mark.asyncio
+async def test_receive_from_model_author_attribution():
+  """Test that _receive_from_model sets the correct author for events based on LlmResponse."""
+  agent = Agent(name='test_agent')
+  invocation_context = await testing_utils.create_invocation_context(
+      agent=agent
+  )
+  flow = BaseLlmFlowForTesting()
+
+  mock_connection = mock.AsyncMock()
+
+  # Case 1: input_transcription is set -> author should be 'user'
+  response_1 = LlmResponse(
+      input_transcription=types.Transcription(text='test', finished=True)
+  )
+
+  # Case 2: default -> author should be agent.name
+  response_2 = LlmResponse(
+      content=types.Content(
+          role='model', parts=[types.Part.from_text(text='hello')]
+      )
+  )
+
+  # Case 3: content.role is 'user' -> author should be 'user'
+  response_3 = LlmResponse(
+      content=types.Content(
+          role='user', parts=[types.Part.from_text(text='user text')]
+      )
+  )
+
+  class StopTest(Exception):
+    pass
+
+  async def mock_receive():
+    yield response_1
+    yield response_2
+    yield response_3
+    raise StopTest()
+
+  mock_connection.receive = mock.Mock(side_effect=mock_receive)
+
+  events = []
+  try:
+    async for event in flow._receive_from_model(
+        mock_connection, 'event_id', invocation_context, LlmRequest()
+    ):
+      events.append(event)
+  except StopTest:
+    pass
+
+  assert len(events) == 3
+  assert events[0].author == 'user'
+  assert events[1].author == 'test_agent'
+  assert events[2].author == 'user'
diff --git a/tests/unittests/flows/llm_flows/test_contents.py b/tests/unittests/flows/llm_flows/test_contents.py
@@ -1068,3 +1068,30 @@ async def test_adk_function_call_ids_preserved_for_interactions_model():
   user_fr_part = llm_request.contents[2].parts[0]
   assert user_fr_part.function_response is not None
   assert user_fr_part.function_response.id == function_call_id
+
+
+def test_is_other_agent_reply_live_session():
+  """Test _is_other_agent_reply when live_session_id is present."""
+  event = Event(author="another_agent", live_session_id="session_123")
+  assert contents._is_other_agent_reply("current_agent", event) is True
+
+  event = Event(author="user", live_session_id="session_123")
+  assert contents._is_other_agent_reply("current_agent", event) is False
+
+  event = Event(author="current_agent", live_session_id="session_123")
+  assert contents._is_other_agent_reply("current_agent", event) is True
+
+
+def test_is_other_agent_reply_non_live_session():
+  """Test _is_other_agent_reply when live_session_id is not present."""
+  event = Event(author="another_agent")
+  assert contents._is_other_agent_reply("current_agent", event) is True
+
+  event = Event(author="user")
+  assert contents._is_other_agent_reply("current_agent", event) is False
+
+  event = Event(author="current_agent")
+  assert contents._is_other_agent_reply("current_agent", event) is False
+
+  event = Event(author="another_agent")
+  assert contents._is_other_agent_reply("", event) is False
diff --git a/tests/unittests/tools/test_skill_toolset.py b/tests/unittests/tools/test_skill_toolset.py
@@ -186,6 +186,20 @@ async def test_get_tools(mock_skill1, mock_skill2):
   assert isinstance(tools[3], skill_toolset.RunSkillScriptTool)
 
 
+@pytest.mark.asyncio
+async def test_resolve_additional_tools_from_state_none(mock_skill1):
+  toolset = skill_toolset.SkillToolset([mock_skill1])
+
+  # Mock ReadonlyContext
+  readonly_context = mock.create_autospec(ReadonlyContext, instance=True)
+  readonly_context.agent_name = "test_agent"
+  readonly_context.state.get.return_value = None
+
+  result = await toolset._resolve_additional_tools_from_state(readonly_context)
+
+  assert not result
+
+
 @pytest.mark.asyncio
 async def test_list_skills_tool(
     mock_skill1, mock_skill2, tool_context_instance
@@ -238,6 +252,28 @@ async def test_load_skill_run_async(
   assert result == expected_result
 
 
+@pytest.mark.asyncio
+async def test_load_skill_run_async_state_none(
+    mock_skill1, tool_context_instance
+):
+  toolset = skill_toolset.SkillToolset([mock_skill1])
+  tool = skill_toolset.LoadSkillTool(toolset)
+
+  # Mock state to return None for the key
+  state_key = "_adk_activated_skill_test_agent"
+  tool_context_instance.state.get.return_value = None
+
+  result = await tool.run_async(
+      args={"skill_name": "skill1"}, tool_context=tool_context_instance
+  )
+
+  assert result["skill_name"] == "skill1"
+  # Verify that it correctly set the list in state
+  tool_context_instance.state.__setitem__.assert_called_with(
+      state_key, ["skill1"]
+  )
+
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     "args, expected_result",

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ class AgentRefConfig(BaseModel):`
`118`	`118`	`my_custom_agent = LlmAgent(`
`119`	`119`	`name="my_custom_agent",`
`120`	`120`	`instruction="You are a helpful custom agent.",`
`121`		`- model="gemini-2.0-flash",`
	`121`	`+ model="gemini-2.5-flash",`
`122`	`122`	`)`
`123`	`123`	```
`124`	`124`
Original file line number	Diff line number	Diff line change
`@@ -2461,7 +2461,7 @@`
`2461`	`2461`	`}`
`2462`	`2462`	`],`
`2463`	`2463`	`"default": null,`
`2464`		`- "description": "Optional. LlmAgent.model. Provide a model name string (e.g. \"gemini-2.0-flash\"). If not set, the model will be inherited from the ancestor or fall back to the system default (gemini-2.5-flash unless overridden via LlmAgent.set_default_model). To construct a model instance from code, use model_code.",`
	`2464`	`+ "description": "Optional. LlmAgent.model. Provide a model name string (e.g. \"gemini-2.5-flash\"). If not set, the model will be inherited from the ancestor or fall back to the system default (gemini-2.5-flash unless overridden via LlmAgent.set_default_model). To construct a model instance from code, use model_code.",`
`2465`	`2465`	`"title": "Model"`
`2466`	`2466`	`},`
`2467`	`2467`	`"instruction": {`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ async def build_instruction(`
`51`	`51`	`)`
`52`	`52`
`53`	`53`	`agent = Agent(`
`54`		`- model="gemini-2.0-flash",`
	`54`	`+ model="gemini-2.5-flash",`
`55`	`55`	`name="agent",`
`56`	`56`	`instruction=build_instruction,`
`57`	`57`	`)`