fix(adk): wrap tool execution errors and align CI tests

Author: Deeven-Seru

packages/toolbox-adk/integration.cloudbuild.yaml

@@ -13,14 +13,6 @@
 # limitations under the License.
 
 steps:
-  - id: Build toolbox
-    name: 'golang:1.26'
-    entrypoint: /bin/bash
-    args:
-      - '-c'
-      - |
-        cd packages/toolbox-adk/genai-toolbox
-        go build -o ../toolbox main.go
   - id: Install requirements
     name: 'python:${_VERSION}'
     dir: 'packages/toolbox-adk'
@@ -47,20 +39,16 @@ steps:
       - TOOLBOX_VERSION=$_TOOLBOX_VERSION
       - GOOGLE_CLOUD_PROJECT=$PROJECT_ID
       - TOOLBOX_MANIFEST_VERSION=${_TOOLBOX_MANIFEST_VERSION}
-      - TEST_MOCK_GCP=false
     args:
       - '-c'
       - |
-        chmod +x toolbox
         source /workspace/venv/bin/activate
-        python -m pytest -s --cov=src/toolbox_adk --cov-report=term --cov-fail-under=90 tests/
+        python -m pytest --cov=src/toolbox_adk --cov-report=term --cov-fail-under=90 tests/
     entrypoint: /bin/bash
 options:
-  machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY
 substitutions:
   _VERSION: '3.13'
   # Default values (can be overridden by triggers)
   _TOOLBOX_VERSION: '1.1.0'
   _TOOLBOX_MANIFEST_VERSION: '34'
-  _TOOLBOX_URL: 'http://localhost:5000'

packages/toolbox-adk/src/toolbox_adk/tool.py

@@ -49,10 +49,12 @@ def __init__(
         auth_config: Optional[CredentialConfig] = None,
         adk_token_getters: Optional[Mapping[str, Any]] = None,
     ):
-        """Args:
-        core_tool: The underlying toolbox_core.py tool instance.
-        auth_config: Credential configuration to handle interactive flows.
-        adk_token_getters: Tool-specific auth token getters.
+        """Initialize a toolbox-adk wrapper around a toolbox-core tool.
+
+        Args:
+            core_tool: The underlying `toolbox_core.tool.ToolboxTool` instance.
+            auth_config: Credential configuration to handle interactive flows.
+            adk_token_getters: Tool-specific auth token getters.
         """
         name = getattr(core_tool, "__name__", None)
         if not name:
@@ -220,6 +222,8 @@ async def run_async(
                                 )
                         try:
                             if tool_context._invocation_context.credential_service:
+                                # Persist the exchanged credential so future runs can load
+                                # from ADK credential storage instead of re-requesting consent.
                                 auth_config_adk.exchanged_auth_credential = creds
                                 await tool_context._invocation_context.credential_service.save_credential(
                                     auth_config=auth_config_adk,

packages/toolbox-adk/tests/integration/test_integration.py

@@ -28,7 +28,6 @@
 from google.adk.sessions.in_memory_session_service import InMemorySessionService
 from google.adk.tools.base_tool import BaseTool
 from google.genai import types
-from pydantic import ValidationError
 from toolbox_core.protocol import Protocol
 
 from toolbox_adk import CredentialStrategy, ToolboxTool, ToolboxToolset
@@ -479,11 +478,11 @@ async def test_run_tool_wrong_param_type(self):
             tool = tools[0]
 
             ctx = MagicMock()
-            with pytest.raises(
-                ValidationError,
-                match=r"num_rows\s+Input should be a valid string\s+\[type=string_type,\s+input_value=2,\s+input_type=int\]",
-            ):
-                await tool.run_async({"num_rows": 2}, ctx)
+            response = await tool.run_async({"num_rows": 2}, ctx)
+            assert isinstance(response, dict)
+            assert response.get("is_error") is True
+            assert "ValidationError" in response.get("error", "")
+            assert "Input should be a valid string" in response.get("error", "")
         finally:
             await toolset.close()
 
@@ -631,11 +630,11 @@ async def test_run_tool_wrong_auth(self, auth_token2: str):
             tool = tools[0]
             ctx = MagicMock()
 
-            with pytest.raises(
-                Exception,
-                match=r"401 \(Unauthorized\)",
-            ):
-                await tool.run_async({"id": "2"}, ctx)
+            response = await tool.run_async({"id": "2"}, ctx)
+            assert isinstance(response, dict)
+            assert response.get("is_error") is True
+            assert "RuntimeError" in response.get("error", "")
+            assert "401 (Unauthorized)" in response.get("error", "")
         finally:
             await toolset.close()
 
@@ -794,14 +793,17 @@ async def test_run_tool_with_wrong_map_value_type(self):
             tool = tools[0]
             ctx = MagicMock()
 
-            with pytest.raises(ValidationError):
-                await tool.run_async(
-                    {
-                        "execution_context": {"env": "staging"},
-                        "user_scores": {"user4": "not-an-integer"},
-                    },
-                    ctx,
-                )
+            response = await tool.run_async(
+                {
+                    "execution_context": {"env": "staging"},
+                    "user_scores": {"user4": "not-an-integer"},
+                },
+                ctx,
+            )
+            assert isinstance(response, dict)
+            assert response.get("is_error") is True
+            assert "ValidationError" in response.get("error", "")
+            assert "Input should be a valid integer" in response.get("error", "")
         finally:
             await toolset.close()
 

packages/toolbox-adk/tests/unit/test_tool.py

@@ -16,6 +16,7 @@
 
 import pytest
 from google.genai.types import Type
+from pydantic import ValidationError
 
 from toolbox_adk.credentials import CredentialConfig, CredentialType
 from toolbox_adk.tool import ToolboxTool
@@ -99,7 +100,7 @@ async def test_run_async_returns_error_on_validation_error(self):
         assert isinstance(result, dict) and "error" in result
         assert result.get("is_error") is True
         assert "ValidationError" in result["error"]
-        assert "field required" in result["error"]
+        assert "Field required" in result["error"]
 
     @pytest.mark.asyncio
     async def test_bind_params(self):