Merge branch 'main' into fix/safe-json-serialize-exception-handling

Author: voidborne-d

pyproject.toml

@@ -102,6 +102,7 @@ optional-dependencies.docs = [
   "myst-parser",
   "sphinx<9",
   "sphinx-autodoc-typehints",
+  "sphinx-click",
   "sphinx-rtd-theme",
 ]
 optional-dependencies.eval = [

src/google/adk/integrations/agent_identity/gcp_auth_provider.py

@@ -200,10 +200,7 @@ def _is_consent_completed(context: CallbackContext) -> bool:
     for call_id, _ in euc_responses.items():
       if call_id in euc_calls:
         call = euc_calls[call_id]
-        if (
-            call.args
-            and call.args.get("function_call_id") == target_tool_call_id
-        ):
+        if call.args and call.args.get("functionCallId") == target_tool_call_id:
           return True
     return False
 

src/google/adk/optimization/local_eval_sampler.py

@@ -289,7 +289,11 @@ def _extract_eval_data(
         for eval_metric_result in per_invocation_result.eval_metric_results:
           eval_metric_results.append({
               "metric_name": eval_metric_result.metric_name,
-              "score": round(eval_metric_result.score, 2),  # accurate enough
+              "score": (
+                  round(eval_metric_result.score, 2)
+                  if eval_metric_result.score is not None
+                  else None
+              ),  # accurate enough
               "eval_status": eval_metric_result.eval_status.name,
           })
         per_invocation_result_dict = {

tests/unittests/integrations/agent_identity/test_gcp_auth_provider.py

@@ -25,6 +25,7 @@
 from google.adk.agents.callback_context import CallbackContext
 from google.adk.auth.auth_credential import AuthCredentialTypes
 from google.adk.auth.auth_tool import AuthConfig
+from google.adk.auth.auth_tool import AuthToolArguments
 from google.adk.flows.llm_flows.functions import REQUEST_EUC_FUNCTION_CALL_NAME
 from google.adk.integrations.agent_identity import gcp_auth_provider
 from google.adk.integrations.agent_identity import GcpAuthProvider
@@ -399,7 +400,9 @@ async def test_get_auth_credential_returns_token_if_consent_was_completed(
   function_call = Mock()
   function_call.id = "auth-req-1"
   function_call.name = REQUEST_EUC_FUNCTION_CALL_NAME
-  function_call.args = {"function_call_id": "call-123"}
+  function_call.args = AuthToolArguments(
+      function_call_id="call-123", auth_config=auth_config
+  ).model_dump(by_alias=True, exclude_none=True)
 
   event1 = Mock()
   event1.get_function_calls.return_value = [function_call]
@@ -432,3 +435,43 @@ async def test_get_auth_credential_returns_token_if_consent_was_completed(
   assert auth_credential.auth_type == AuthCredentialTypes.HTTP
   assert auth_credential.http.scheme == "bearer"
   assert auth_credential.http.credentials.token == "test-token"
+
+
+async def test_get_auth_credential_raises_error_if_consent_canceled(
+    mock_operation, auth_config, context, provider
+):
+  function_call = Mock()
+  function_call.id = "auth-req-1"
+  function_call.name = REQUEST_EUC_FUNCTION_CALL_NAME
+  function_call.args = AuthToolArguments(
+      function_call_id="call-123", auth_config=auth_config
+  ).model_dump(by_alias=True, exclude_none=True)
+
+  event1 = Mock()
+  event1.get_function_calls.return_value = [function_call]
+  event1.get_function_responses.return_value = []
+
+  function_response = Mock()
+  function_response.id = "auth-req-1"
+  function_response.name = REQUEST_EUC_FUNCTION_CALL_NAME
+
+  event2 = Mock()
+  event2.get_function_calls.return_value = []
+  event2.get_function_responses.return_value = [function_response]
+
+  context.session.events = [event1, event2]
+  context.function_call_id = "call-123"
+
+  meta = RetrieveCredentialsMetadata({
+      "uri_consent_required": {
+          "authorization_uri": "https://example.com/auth",
+          "consent_nonce": "sample-nonce",
+      }
+  })
+  mock_operation.metadata.value = RetrieveCredentialsMetadata.serialize(meta)
+  mock_operation.done = False
+
+  with pytest.raises(
+      RuntimeError, match="Failed to retrieve consent based credential."
+  ):
+    await provider.get_auth_credential(auth_config, context)

tests/unittests/optimization/local_eval_sampler_test.py

@@ -338,6 +338,48 @@ async def test_extract_eval_data(mocker):
   ]
 
 
+def test_extract_eval_data_preserves_none_metric_score(mocker):
+  mock_eval_sets_manager = mocker.MagicMock(spec=EvalSetsManager)
+  mock_eval_case = mocker.MagicMock()
+  mock_eval_case.conversation_scenario = "test_scenario"
+  mock_eval_sets_manager.get_eval_case.return_value = mock_eval_case
+
+  mock_metric_result = mocker.MagicMock(spec=EvalMetricResult)
+  mock_metric_result.metric_name = "test_metric"
+  mock_metric_result.score = None
+  mock_metric_result.eval_status = EvalStatus.NOT_EVALUATED
+
+  mock_per_inv_result = mocker.MagicMock(spec=EvalMetricResultPerInvocation)
+  mock_per_inv_result.actual_invocation = mocker.MagicMock(spec=Invocation)
+  mock_per_inv_result.expected_invocation = mocker.MagicMock(spec=Invocation)
+  mock_per_inv_result.eval_metric_results = [mock_metric_result]
+
+  mock_eval_result = mocker.MagicMock(spec=EvalCaseResult)
+  mock_eval_result.eval_id = "t1"
+  mock_eval_result.eval_metric_result_per_invocation = [mock_per_inv_result]
+
+  mocker.patch(
+      "google.adk.optimization.local_eval_sampler.extract_single_invocation_info",
+      side_effect=[{"info": "actual"}, {"info": "expected"}],
+  )
+
+  config = LocalEvalSamplerConfig(
+      eval_config=EvalConfig(),
+      app_name="test_app",
+      train_eval_set="train_set",
+      train_eval_case_ids=["t1"],
+  )
+  interface = LocalEvalSampler(config, mock_eval_sets_manager)
+
+  eval_data = interface._extract_eval_data("train_set", [mock_eval_result])
+
+  assert eval_data["t1"]["invocations"][0]["eval_metric_results"] == [{
+      "metric_name": "test_metric",
+      "score": None,
+      "eval_status": "NOT_EVALUATED",
+  }]
+
+
 @pytest.mark.asyncio
 async def test_sample_and_score(mocker):
   # Mock results