Merge branch 'main' into feat/app-name-override

Author: amitjborate

src/google/adk/agents/llm_agent.py

@@ -1089,6 +1089,18 @@ def validate_generate_content_config(
       raise ValueError(
           'Response schema must be set via LlmAgent.output_schema.'
       )
+    if generate_content_config.http_options:
+      if generate_content_config.http_options.base_url:
+        raise ValueError(
+            'Base URL is a transport setting and must be set on the model or'
+            ' its client, not via LlmAgent.generate_content_config.'
+        )
+      if generate_content_config.http_options.extra_body:
+        raise ValueError(
+            'Extra body is merged into the request body and can overwrite the'
+            ' tools, system instruction and response schema rejected above.'
+            ' Set it on the model or its client.'
+        )
     return generate_content_config
 
   @override

tests/unittests/agents/test_llm_agent_fields.py

@@ -329,6 +329,42 @@ class Schema(BaseModel):
     )
 
 
+def test_validate_generate_content_config_http_options_base_url_throw():
+  """Tests that a transport base URL cannot be set directly in config."""
+  with pytest.raises(ValueError):
+    _ = LlmAgent(
+        name='test_agent',
+        generate_content_config=types.GenerateContentConfig(
+            http_options=types.HttpOptions(base_url='http://example.invalid')
+        ),
+    )
+
+
+def test_validate_generate_content_config_http_options_extra_body_throw():
+  """Tests that an extra request body cannot be set directly in config."""
+  with pytest.raises(ValueError):
+    _ = LlmAgent(
+        name='test_agent',
+        generate_content_config=types.GenerateContentConfig(
+            http_options=types.HttpOptions(
+                extra_body={'systemInstruction': {'parts': [{'text': 'hi'}]}}
+            )
+        ),
+    )
+
+
+def test_validate_generate_content_config_http_options_allowed():
+  """Tests that request-time http options remain settable in config."""
+  agent = LlmAgent(
+      name='test_agent',
+      generate_content_config=types.GenerateContentConfig(
+          http_options=types.HttpOptions(timeout=1000)
+      ),
+  )
+
+  assert agent.generate_content_config.http_options.timeout == 1000
+
+
 def test_allow_transfer_by_default():
   sub_agent = LlmAgent(name='sub_agent')
   agent = LlmAgent(name='test_agent', sub_agents=[sub_agent])

tests/unittests/flows/llm_flows/test_request_confirmation.py

@@ -587,3 +587,108 @@ async def test_request_confirmation_processor_dynamic_success():
     assert (
         args[4][MOCK_FUNCTION_CALL_ID] == user_confirmation
     )  # tool_confirmation_dict
+
+
+@pytest.mark.parametrize(
+    "tools, original_args, confirmation_args, expected_exception_match",
+    [
+        (
+            [],
+            {"param1": "test"},
+            {"param1": "test"},
+            "is not registered",
+        ),
+        (
+            [FunctionTool(mock_tool, require_confirmation=False)],
+            {"param1": "test"},
+            {"param1": "test"},
+            "does not require confirmation",
+        ),
+        (
+            [FunctionTool(mock_tool, require_confirmation=True)],
+            {"param1": "test"},
+            {"param1": "tampered"},
+            "arguments mismatch",
+        ),
+    ],
+)
+@pytest.mark.asyncio
+async def test_request_confirmation_processor_rejections(
+    tools, original_args, confirmation_args, expected_exception_match
+):
+  """Test various validation rejections in request confirmation processor."""
+  agent = LlmAgent(name="test_agent", tools=tools)
+  invocation_context = await testing_utils.create_invocation_context(
+      agent=agent
+  )
+  llm_request = LlmRequest()
+
+  original_function_call = types.FunctionCall(
+      name=MOCK_TOOL_NAME, args=original_args, id=MOCK_FUNCTION_CALL_ID
+  )
+
+  # 1. Event with the original tool call
+  invocation_context.session.events.append(
+      Event(
+          author=agent.name,
+          content=types.Content(
+              parts=[types.Part(function_call=original_function_call)]
+          ),
+      )
+  )
+
+  # 2. Confirmation request event from the agent to the client.
+  confirmation_function_call = types.FunctionCall(
+      name=MOCK_TOOL_NAME, args=confirmation_args, id=MOCK_FUNCTION_CALL_ID
+  )
+  tool_confirmation = ToolConfirmation(confirmed=False, hint="test hint")
+  tool_confirmation_args = {
+      "originalFunctionCall": confirmation_function_call.model_dump(
+          exclude_none=True, by_alias=True
+      ),
+      "toolConfirmation": tool_confirmation.model_dump(
+          by_alias=True, exclude_none=True
+      ),
+  }
+
+  invocation_context.session.events.append(
+      Event(
+          author=agent.name,
+          content=types.Content(
+              parts=[
+                  types.Part(
+                      function_call=types.FunctionCall(
+                          name=functions.REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
+                          args=tool_confirmation_args,
+                          id=MOCK_CONFIRMATION_FUNCTION_CALL_ID,
+                      )
+                  )
+              ]
+          ),
+      )
+  )
+
+  # 3. Event with the user's confirmation response.
+  user_confirmation = ToolConfirmation(confirmed=True)
+  invocation_context.session.events.append(
+      Event(
+          author="user",
+          content=types.Content(
+              parts=[
+                  types.Part(
+                      function_response=types.FunctionResponse(
+                          name=functions.REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
+                          id=MOCK_CONFIRMATION_FUNCTION_CALL_ID,
+                          response={
+                              "response": user_confirmation.model_dump_json()
+                          },
+                      )
+                  )
+              ]
+          ),
+      )
+  )
+
+  with pytest.raises(ValueError, match=expected_exception_match):
+    async for _ in request_processor.run_async(invocation_context, llm_request):
+      pass