fix(adk): include validation errors in recoverable wrapping logic

Author: Deeven-Seru

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

@@ -15,7 +15,6 @@
 import inspect
 import logging
 from typing import Any, Dict, Mapping, Optional
-from pydantic import ValidationError
 
 import toolbox_core
 from fastapi.openapi.models import (
@@ -32,6 +31,7 @@
 from google.adk.tools.base_tool import BaseTool
 from google.adk.tools.tool_context import ToolContext
 from google.genai.types import FunctionDeclaration, Schema, Type
+from pydantic import ValidationError
 from toolbox_core.protocol import AdditionalPropertiesSchema, ParameterSchema
 from toolbox_core.tool import ToolboxTool as CoreToolboxTool
 from typing_extensions import override
@@ -50,9 +50,9 @@ def __init__(
         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.
+        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.
         """
         name = getattr(core_tool, "__name__", None)
         if not name:
@@ -216,8 +216,7 @@ async def run_async(
                             ):
                                 self._core_tool = self._core_tool.add_auth_token_getter(
                                     s,
-                                    lambda t=creds.oauth2.id_token
-                                    or creds.oauth2.access_token: t,
+                                    lambda t=creds.oauth2.id_token or creds.oauth2.access_token: t,
                                 )
                         try:
                             if tool_context._invocation_context.credential_service:
@@ -270,12 +269,12 @@ async def run_async(
 
         try:
             return await self._core_tool(**args)
-        except (TypeError, PermissionError, ValueError, ValidationError) as e:
-            # Propagate framework-level errors to ensure compatibility with existing tests
+        except (TypeError, PermissionError) as e:
+            # Propagate system-level errors
             raise e
-        except Exception as e:
-            # Catch unexpected tool execution errors and return as a structured dictionary
-            # This handles cases like remote tool crashes or server errors gracefully for LLMs
+        except (ValueError, ValidationError, Exception) as e:
+            # Catch tool execution and validation errors and return as a structured dictionary
+            # This handles cases like invalid parameters, tool crashes, or server errors
             logging.warning(
                 "Toolbox tool '%s' execution failed: %s", self.name, e, exc_info=True
             )

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

@@ -71,6 +71,36 @@ async def test_run_async_returns_error_on_exception(self):
         assert result.get("is_error") is True
         assert "RuntimeError" in result["error"]
 
+    @pytest.mark.asyncio
+    async def test_run_async_returns_error_on_validation_error(self):
+        # Setup mock to raise a ValidationError
+        mock_core = AsyncMock()
+        mock_core.__name__ = "my_tool"
+        mock_core.__doc__ = "my description"
+
+        # We simulate a ValidationError by raising it from the mock
+        mock_core.side_effect = ValidationError.from_exception_data(
+            "MyModel",
+            [
+                {
+                    "type": "missing",
+                    "loc": ("param",),
+                    "msg": "field required",
+                    "input": {},
+                }
+            ],
+        )
+
+        tool = ToolboxTool(mock_core)
+        ctx = MagicMock()
+
+        result = await tool.run_async({"arg": 1}, ctx)
+
+        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"]
+
     @pytest.mark.asyncio
     async def test_bind_params(self):
         mock_core = MagicMock()