google-adk 1.6.1__py3-none-any.whl → 1.8.0__py3-none-any.whl

google/adk/tools/agent_tool.py

@@ -23,15 +23,12 @@ from typing_extensions import override
 
 from . import _automatic_function_calling_util
 from ..memory.in_memory_memory_service import InMemoryMemoryService
-from ..runners import Runner
-from ..sessions.in_memory_session_service import InMemorySessionService
 from ._forwarding_artifact_service import ForwardingArtifactService
 from .base_tool import BaseTool
 from .tool_context import ToolContext
 
 if TYPE_CHECKING:
   from ..agents.base_agent import BaseAgent
-  from ..agents.llm_agent import LlmAgent
 
 
 class AgentTool(BaseTool):
@@ -61,6 +58,7 @@ class AgentTool(BaseTool):
   @override
   def _get_declaration(self) -> types.FunctionDeclaration:
     from ..agents.llm_agent import LlmAgent
+    from ..utils.variant_utils import GoogleLLMVariant
 
     if isinstance(self.agent, LlmAgent) and self.agent.input_schema:
       result = _automatic_function_calling_util.build_function_declaration(
@@ -80,6 +78,17 @@ class AgentTool(BaseTool):
           description=self.agent.description,
           name=self.name,
       )
+
+    # Set response schema for non-GEMINI_API variants
+    if self._api_variant != GoogleLLMVariant.GEMINI_API:
+      # Determine response type based on agent's output schema
+      if isinstance(self.agent, LlmAgent) and self.agent.output_schema:
+        # Agent has structured output schema - response is an object
+        result.response = types.Schema(type=types.Type.OBJECT)
+      else:
+        # Agent returns text - response is a string
+        result.response = types.Schema(type=types.Type.STRING)
+
     result.name = self.name
     return result
 
@@ -91,6 +100,8 @@ class AgentTool(BaseTool):
       tool_context: ToolContext,
   ) -> Any:
     from ..agents.llm_agent import LlmAgent
+    from ..runners import Runner
+    from ..sessions.in_memory_session_service import InMemorySessionService
 
     if self.skip_summarization:
       tool_context.actions.skip_summarization = True
@@ -116,6 +127,7 @@ class AgentTool(BaseTool):
         artifact_service=ForwardingArtifactService(tool_context),
         session_service=InMemorySessionService(),
         memory_service=InMemoryMemoryService(),
+        credential_service=tool_context._invocation_context.credential_service,
     )
     session = await runner.session_service.create_session(
         app_name=self.agent.name,

google/adk/tools/apihub_tool/apihub_toolset.py

@@ -35,27 +35,25 @@ from .clients.apihub_client import APIHubClient
 class APIHubToolset(BaseToolset):
   """APIHubTool generates tools from a given API Hub resource.
 
-  Examples:
+  Examples::
 
-  ```
-  apihub_toolset = APIHubToolset(
-      apihub_resource_name="projects/test-project/locations/us-central1/apis/test-api",
-      service_account_json="...",
-      tool_filter=lambda tool, ctx=None: tool.name in ('my_tool',
-      'my_other_tool')
-  )
-
-  # Get all available tools
-  agent = LlmAgent(tools=apihub_toolset)
+    apihub_toolset = APIHubToolset(
+        apihub_resource_name="projects/test-project/locations/us-central1/apis/test-api",
+        service_account_json="...",
+        tool_filter=lambda tool, ctx=None: tool.name in ('my_tool',
+        'my_other_tool')
+    )
 
-  ```
+    # Get all available tools
+    agent = LlmAgent(tools=apihub_toolset)
 
   **apihub_resource_name** is the resource name from API Hub. It must include
-    API name, and can optionally include API version and spec name.
-    - If apihub_resource_name includes a spec resource name, the content of that
-      spec will be used for generating the tools.
-    - If apihub_resource_name includes only an api or a version name, the
-      first spec of the first version of that API will be used.
+  API name, and can optionally include API version and spec name.
+
+  - If apihub_resource_name includes a spec resource name, the content of that
+    spec will be used for generating the tools.
+  - If apihub_resource_name includes only an api or a version name, the
+    first spec of the first version of that API will be used.
   """
 
   def __init__(
@@ -78,44 +76,45 @@ class APIHubToolset(BaseToolset):
   ):
     """Initializes the APIHubTool with the given parameters.
 
-    Examples:
-    ```
-    apihub_toolset = APIHubToolset(
-        apihub_resource_name="projects/test-project/locations/us-central1/apis/test-api",
-        service_account_json="...",
-    )
+    Examples::
 
-    # Get all available tools
-    agent = LlmAgent(tools=[apihub_toolset])
+      apihub_toolset = APIHubToolset(
+          apihub_resource_name="projects/test-project/locations/us-central1/apis/test-api",
+          service_account_json="...",
+      )
 
-    apihub_toolset = APIHubToolset(
-        apihub_resource_name="projects/test-project/locations/us-central1/apis/test-api",
-        service_account_json="...",
-        tool_filter = ['my_tool']
-    )
-    # Get a specific tool
-    agent = LlmAgent(tools=[
-        ...,
-        apihub_toolset,
-    ])
-    ```
+      # Get all available tools
+      agent = LlmAgent(tools=[apihub_toolset])
+
+      apihub_toolset = APIHubToolset(
+          apihub_resource_name="projects/test-project/locations/us-central1/apis/test-api",
+          service_account_json="...",
+          tool_filter = ['my_tool']
+      )
+      # Get a specific tool
+      agent = LlmAgent(tools=[
+          ...,
+          apihub_toolset,
+      ])
 
     **apihub_resource_name** is the resource name from API Hub. It must include
     API name, and can optionally include API version and spec name.
+
     - If apihub_resource_name includes a spec resource name, the content of that
       spec will be used for generating the tools.
     - If apihub_resource_name includes only an api or a version name, the
       first spec of the first version of that API will be used.
 
     Example:
+
     * projects/xxx/locations/us-central1/apis/apiname/...
     * https://console.cloud.google.com/apigee/api-hub/apis/apiname?project=xxx
 
     Args:
         apihub_resource_name: The resource name of the API in API Hub.
-          Example: `projects/test-project/locations/us-central1/apis/test-api`.
-        access_token: Google Access token. Generate with gcloud cli `gcloud auth
-          auth print-access-token`. Used for fetching API Specs from API Hub.
+          Example: ``projects/test-project/locations/us-central1/apis/test-api``.
+        access_token: Google Access token. Generate with gcloud cli
+          ``gcloud auth auth print-access-token``. Used for fetching API Specs from API Hub.
         service_account_json: The service account config as a json string.
           Required if not using default service credential. It is used for
           creating the API Hub client and fetching the API Specs from API Hub.

google/adk/tools/application_integration_tool/application_integration_toolset.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import logging
 from typing import List
 from typing import Optional
@@ -42,43 +44,39 @@ logger = logging.getLogger("google_adk." + __name__)
 # TODO(cheliu): Apply a common toolset interface
 class ApplicationIntegrationToolset(BaseToolset):
   """ApplicationIntegrationToolset generates tools from a given Application
-
   Integration or Integration Connector resource.
-  Example Usage:
-  ```
-  # Get all available tools for an integration with api trigger
-  application_integration_toolset = ApplicationIntegrationToolset(
 
-      project="test-project",
-      location="us-central1"
-      integration="test-integration",
-      triggers=["api_trigger/test_trigger"],
-      service_account_credentials={...},
-  )
+  Example Usage::
 
-  # Get all available tools for a connection using entity operations and
-  # actions
-  # Note: Find the list of supported entity operations and actions for a
-  connection
-  # using integration connector apis:
-  #
-  https://cloud.google.com/integration-connectors/docs/reference/rest/v1/projects.locations.connections.connectionSchemaMetadata
-  application_integration_toolset = ApplicationIntegrationToolset(
-      project="test-project",
-      location="us-central1"
-      connection="test-connection",
-      entity_operations=["EntityId1": ["LIST","CREATE"], "EntityId2": []],
-      #empty list for actions means all operations on the entity are supported
-      actions=["action1"],
-      service_account_credentials={...},
-  )
+    # Get all available tools for an integration with api trigger
+    application_integration_toolset = ApplicationIntegrationToolset(
+        project="test-project",
+        location="us-central1"
+        integration="test-integration",
+        triggers=["api_trigger/test_trigger"],
+        service_account_credentials={...},
+    )
+
+    # Get all available tools for a connection using entity operations and
+    # actions
+    # Note: Find the list of supported entity operations and actions for a
+    # connection using integration connector apis:
+    # https://cloud.google.com/integration-connectors/docs/reference/rest/v1/projects.locations.connections.connectionSchemaMetadata
+    application_integration_toolset = ApplicationIntegrationToolset(
+        project="test-project",
+        location="us-central1"
+        connection="test-connection",
+        entity_operations=["EntityId1": ["LIST","CREATE"], "EntityId2": []],
+        #empty list for actions means all operations on the entity are supported
+        actions=["action1"],
+        service_account_credentials={...},
+    )
 
-  # Feed the toolset to agent
-  agent = LlmAgent(tools=[
-      ...,
-      application_integration_toolset,
-  ])
-  ```
+    # Feed the toolset to agent
+    agent = LlmAgent(tools=[
+        ...,
+        application_integration_toolset,
+    ])
   """
 
   def __init__(
@@ -122,11 +120,11 @@ class ApplicationIntegrationToolset(BaseToolset):
 
     Raises:
         ValueError: If none of the following conditions are met:
-            - `integration` is provided.
-            - `connection` is provided and at least one of `entity_operations`
-              or `actions` is provided.
+          - ``integration`` is provided.
+          - ``connection`` is provided and at least one of ``entity_operations``
+            or ``actions`` is provided.
         Exception: If there is an error during the initialization of the
-            integration or connection client.
+          integration or connection client.
     """
     super().__init__(tool_filter=tool_filter)
     self.project = project

google/adk/tools/application_integration_tool/integration_connector_tool.py

@@ -45,13 +45,12 @@ class IntegrationConnectorTool(BaseTool):
   * Generates request params and body
   * Attaches auth credentials to API call.
 
-  Example:
-  ```
+  Example::
+
     # Each API operation in the spec will be turned into its own tool
     # Name of the tool is the operationId of that operation, in snake case
     operations = OperationGenerator().parse(openapi_spec_dict)
     tool = [RestApiTool.from_parsed_operation(o) for o in operations]
-  ```
   """
 
   EXCLUDE_FIELDS = [

google/adk/tools/base_tool.py

@@ -49,11 +49,11 @@ class BaseTool(ABC):
   def _get_declaration(self) -> Optional[types.FunctionDeclaration]:
     """Gets the OpenAPI specification of this tool in the form of a FunctionDeclaration.
 
-    NOTE
-    - Required if subclass uses the default implementation of
-      `process_llm_request` to add function declaration to LLM request.
-    - Otherwise, can be skipped, e.g. for a built-in GoogleSearch tool for
-      Gemini.
+    NOTE:
+      - Required if subclass uses the default implementation of
+        `process_llm_request` to add function declaration to LLM request.
+      - Otherwise, can be skipped, e.g. for a built-in GoogleSearch tool for
+        Gemini.
 
     Returns:
       The FunctionDeclaration of this tool, or None if it doesn't need to be
@@ -66,10 +66,10 @@ class BaseTool(ABC):
   ) -> Any:
     """Runs the tool with the given arguments and context.
 
-    NOTE
-    - Required if this tool needs to run at the client side.
-    - Otherwise, can be skipped, e.g. for a built-in GoogleSearch tool for
-      Gemini.
+    NOTE:
+      - Required if this tool needs to run at the client side.
+      - Otherwise, can be skipped, e.g. for a built-in GoogleSearch tool for
+        Gemini.
 
     Args:
       args: The LLM-filled arguments.

google/adk/tools/base_toolset.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
 
 from abc import ABC
 from abc import abstractmethod
@@ -19,11 +20,16 @@ from typing import List
 from typing import Optional
 from typing import Protocol
 from typing import runtime_checkable
+from typing import TYPE_CHECKING
 from typing import Union
 
 from ..agents.readonly_context import ReadonlyContext
 from .base_tool import BaseTool
 
+if TYPE_CHECKING:
+  from ..models.llm_request import LlmRequest
+  from .tool_context import ToolContext
+
 
 @runtime_checkable
 class ToolPredicate(Protocol):
@@ -64,7 +70,7 @@ class BaseToolset(ABC):
     """Return all tools in the toolset based on the provided context.
 
     Args:
-      readony_context (ReadonlyContext, optional): Context used to filter tools
+      readonly_context (ReadonlyContext, optional): Context used to filter tools
         available to the agent. If None, all tools in the toolset are returned.
 
     Returns:
@@ -75,10 +81,11 @@ class BaseToolset(ABC):
   async def close(self) -> None:
     """Performs cleanup and releases resources held by the toolset.
 
-    NOTE: This method is invoked, for example, at the end of an agent server's
-    lifecycle or when the toolset is no longer needed. Implementations
-    should ensure that any open connections, files, or other managed
-    resources are properly released to prevent leaks.
+    NOTE:
+      This method is invoked, for example, at the end of an agent server's
+      lifecycle or when the toolset is no longer needed. Implementations
+      should ensure that any open connections, files, or other managed
+      resources are properly released to prevent leaks.
     """
 
   def _is_tool_selected(
@@ -94,3 +101,20 @@ class BaseToolset(ABC):
       return tool.name in self.tool_filter
 
     return False
+
+  async def process_llm_request(
+      self, *, tool_context: ToolContext, llm_request: LlmRequest
+  ) -> None:
+    """Processes the outgoing LLM request for this toolset. This method will be
+    called before each tool processes the llm request.
+
+    Use cases:
+    - Instead of let each tool process the llm request, we can let the toolset
+      process the llm request. e.g. ComputerUseToolset can add computer use
+      tool to the llm request.
+
+    Args:
+      tool_context: The context of the tool.
+      llm_request: The outgoing LLM request, mutable this method.
+    """
+    pass

google/adk/tools/bigquery/__init__.py

@@ -20,11 +20,11 @@ definition. The rationales to have customized tool are:
 
 1. BigQuery APIs have functions overlaps and LLM can't tell what tool to use
 2. BigQuery APIs have a lot of parameters with some rarely used, which are not
- LLM-friendly
+   LLM-friendly
 3. We want to provide more high-level tools like forecasting, RAG, segmentation,
- etc.
+   etc.
 4. We want to provide extra access guardrails in those tools. For example,
- execute_sql can't arbitrarily mutate existing data.
+   execute_sql can't arbitrarily mutate existing data.
 """
 
 from .bigquery_credentials import BigQueryCredentialsConfig

google/adk/tools/bigquery/metadata_tool.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from google.auth.credentials import Credentials
 from google.cloud import bigquery
 

google/adk/tools/bigquery/query_tool.py

@@ -12,7 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import functools
+import json
 import types
 from typing import Callable
 
@@ -159,7 +162,18 @@ def execute_sql(
         project=project_id,
         max_results=MAX_DOWNLOADED_QUERY_RESULT_ROWS,
     )
-    rows = [{key: val for key, val in row.items()} for row in row_iterator]
+    rows = []
+    for row in row_iterator:
+      row_values = {}
+      for key, val in row.items():
+        try:
+          # if the json serialization of the value succeeds, use it as is
+          json.dumps(val)
+        except:
+          val = str(val)
+        row_values[key] = val
+      rows.append(row_values)
+
     result = {"status": "SUCCESS", "rows": rows}
     if (
         MAX_DOWNLOADED_QUERY_RESULT_ROWS is not None

google/adk/tools/computer_use/__init__.py

@@ -0,0 +1,13 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.