google-adk 1.1.0__py3-none-any.whl → 1.2.0__py3-none-any.whl

google/adk/tools/bigquery/bigquery_toolset.py

@@ -0,0 +1,86 @@
+# 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.
+
+from __future__ import annotations
+
+from typing import List
+from typing import Optional
+from typing import Union
+
+from google.adk.agents.readonly_context import ReadonlyContext
+from typing_extensions import override
+
+from . import metadata_tool
+from . import query_tool
+from ...tools.base_tool import BaseTool
+from ...tools.base_toolset import BaseToolset
+from ...tools.base_toolset import ToolPredicate
+from .bigquery_credentials import BigQueryCredentialsConfig
+from .bigquery_tool import BigQueryTool
+
+
+class BigQueryToolset(BaseToolset):
+  """BigQuery Toolset contains tools for interacting with BigQuery data and metadata."""
+
+  def __init__(
+      self,
+      *,
+      tool_filter: Optional[Union[ToolPredicate, List[str]]] = None,
+      credentials_config: Optional[BigQueryCredentialsConfig] = None,
+  ):
+    self._credentials_config = credentials_config
+    self.tool_filter = tool_filter
+
+  def _is_tool_selected(
+      self, tool: BaseTool, readonly_context: ReadonlyContext
+  ) -> bool:
+    if self.tool_filter is None:
+      return True
+
+    if isinstance(self.tool_filter, ToolPredicate):
+      return self.tool_filter(tool, readonly_context)
+
+    if isinstance(self.tool_filter, list):
+      return tool.name in self.tool_filter
+
+    return False
+
+  @override
+  async def get_tools(
+      self, readonly_context: Optional[ReadonlyContext] = None
+  ) -> List[BaseTool]:
+    """Get tools from the toolset."""
+    all_tools = [
+        BigQueryTool(
+            func=func,
+            credentials=self._credentials_config,
+        )
+        for func in [
+            metadata_tool.get_dataset_info,
+            metadata_tool.get_table_info,
+            metadata_tool.list_dataset_ids,
+            metadata_tool.list_table_ids,
+            query_tool.execute_sql,
+        ]
+    ]
+
+    return [
+        tool
+        for tool in all_tools
+        if self._is_tool_selected(tool, readonly_context)
+    ]
+
+  @override
+  async def close(self):
+    pass

google/adk/tools/bigquery/client.py

@@ -0,0 +1,33 @@
+# 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.
+
+from __future__ import annotations
+
+import google.api_core.client_info
+from google.cloud import bigquery
+from google.oauth2.credentials import Credentials
+
+USER_AGENT = "adk-bigquery-tool"
+
+
+def get_bigquery_client(*, credentials: Credentials) -> bigquery.Client:
+  """Get a BigQuery client."""
+
+  client_info = google.api_core.client_info.ClientInfo(user_agent=USER_AGENT)
+
+  bigquery_client = bigquery.Client(
+      credentials=credentials, client_info=client_info
+  )
+
+  return bigquery_client

google/adk/tools/bigquery/metadata_tool.py

@@ -0,0 +1,249 @@
+# 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.
+
+from google.cloud import bigquery
+from google.oauth2.credentials import Credentials
+
+from ...tools.bigquery import client
+
+
+def list_dataset_ids(project_id: str, credentials: Credentials) -> list[str]:
+  """List BigQuery dataset ids in a Google Cloud project.
+
+  Args:
+      project_id (str): The Google Cloud project id.
+      credentials (Credentials): The credentials to use for the request.
+
+  Returns:
+      list[str]: List of the BigQuery dataset ids present in the project.
+
+  Examples:
+      >>> list_dataset_ids("bigquery-public-data")
+      ['america_health_rankings',
+       'american_community_survey',
+       'aml_ai_input_dataset',
+       'austin_311',
+       'austin_bikeshare',
+       'austin_crime',
+       'austin_incidents',
+       'austin_waste',
+       'baseball',
+       'bbc_news']
+  """
+  try:
+    bq_client = client.get_bigquery_client(credentials=credentials)
+
+    datasets = []
+    for dataset in bq_client.list_datasets(project_id):
+      datasets.append(dataset.dataset_id)
+    return datasets
+  except Exception as ex:
+    return {
+        "status": "ERROR",
+        "error_details": str(ex),
+    }
+
+
+def get_dataset_info(
+    project_id: str, dataset_id: str, credentials: Credentials
+) -> dict:
+  """Get metadata information about a BigQuery dataset.
+
+  Args:
+      project_id (str): The Google Cloud project id containing the dataset.
+      dataset_id (str): The BigQuery dataset id.
+      credentials (Credentials): The credentials to use for the request.
+
+  Returns:
+      dict: Dictionary representing the properties of the dataset.
+
+  Examples:
+      >>> get_dataset_info("bigquery-public-data", "penguins")
+      {
+        "kind": "bigquery#dataset",
+        "etag": "PNC5907iQbzeVcAru/2L3A==",
+        "id": "bigquery-public-data:ml_datasets",
+        "selfLink":
+          "https://bigquery.googleapis.com/bigquery/v2/projects/bigquery-public-data/datasets/ml_datasets",
+        "datasetReference": {
+            "datasetId": "ml_datasets",
+            "projectId": "bigquery-public-data"
+        },
+        "access": [
+            {
+                "role": "OWNER",
+                "groupByEmail": "cloud-datasets-eng@google.com"
+            },
+            {
+                "role": "READER",
+                "iamMember": "allUsers"
+            },
+            {
+                "role": "READER",
+                "groupByEmail": "bqml-eng@google.com"
+            }
+        ],
+        "creationTime": "1553208775542",
+        "lastModifiedTime": "1686338918114",
+        "location": "US",
+        "type": "DEFAULT",
+        "maxTimeTravelHours": "168"
+      }
+  """
+  try:
+    bq_client = client.get_bigquery_client(credentials=credentials)
+    dataset = bq_client.get_dataset(
+        bigquery.DatasetReference(project_id, dataset_id)
+    )
+    return dataset.to_api_repr()
+  except Exception as ex:
+    return {
+        "status": "ERROR",
+        "error_details": str(ex),
+    }
+
+
+def list_table_ids(
+    project_id: str, dataset_id: str, credentials: Credentials
+) -> list[str]:
+  """List table ids in a BigQuery dataset.
+
+  Args:
+      project_id (str): The Google Cloud project id containing the dataset.
+      dataset_id (str): The BigQuery dataset id.
+      credentials (Credentials): The credentials to use for the request.
+
+  Returns:
+      list[str]: List of the tables ids present in the dataset.
+
+  Examples:
+      >>> list_table_ids("bigquery-public-data", "ml_datasets")
+      ['census_adult_income',
+       'credit_card_default',
+       'holidays_and_events_for_forecasting',
+       'iris',
+       'penguins',
+       'ulb_fraud_detection']
+  """
+  try:
+    bq_client = client.get_bigquery_client(credentials=credentials)
+
+    tables = []
+    for table in bq_client.list_tables(
+        bigquery.DatasetReference(project_id, dataset_id)
+    ):
+      tables.append(table.table_id)
+    return tables
+  except Exception as ex:
+    return {
+        "status": "ERROR",
+        "error_details": str(ex),
+    }
+
+
+def get_table_info(
+    project_id: str, dataset_id: str, table_id: str, credentials: Credentials
+) -> dict:
+  """Get metadata information about a BigQuery table.
+
+  Args:
+      project_id (str): The Google Cloud project id containing the dataset.
+      dataset_id (str): The BigQuery dataset id containing the table.
+      table_id (str): The BigQuery table id.
+      credentials (Credentials): The credentials to use for the request.
+
+  Returns:
+      dict: Dictionary representing the properties of the table.
+
+  Examples:
+      >>> get_table_info("bigquery-public-data", "ml_datasets", "penguins")
+      {
+        "kind": "bigquery#table",
+        "etag": "X0ZkRohSGoYvWemRYEgOHA==",
+        "id": "bigquery-public-data:ml_datasets.penguins",
+        "selfLink":
+        "https://bigquery.googleapis.com/bigquery/v2/projects/bigquery-public-data/datasets/ml_datasets/tables/penguins",
+        "tableReference": {
+            "projectId": "bigquery-public-data",
+            "datasetId": "ml_datasets",
+            "tableId": "penguins"
+        },
+        "schema": {
+            "fields": [
+                {
+                    "name": "species",
+                    "type": "STRING",
+                    "mode": "REQUIRED"
+                },
+                {
+                    "name": "island",
+                    "type": "STRING",
+                    "mode": "NULLABLE"
+                },
+                {
+                    "name": "culmen_length_mm",
+                    "type": "FLOAT",
+                    "mode": "NULLABLE"
+                },
+                {
+                    "name": "culmen_depth_mm",
+                    "type": "FLOAT",
+                    "mode": "NULLABLE"
+                },
+                {
+                    "name": "flipper_length_mm",
+                    "type": "FLOAT",
+                    "mode": "NULLABLE"
+                },
+                {
+                    "name": "body_mass_g",
+                    "type": "FLOAT",
+                    "mode": "NULLABLE"
+                },
+                {
+                    "name": "sex",
+                    "type": "STRING",
+                    "mode": "NULLABLE"
+                }
+            ]
+        },
+        "numBytes": "28947",
+        "numLongTermBytes": "28947",
+        "numRows": "344",
+        "creationTime": "1619804743188",
+        "lastModifiedTime": "1634584675234",
+        "type": "TABLE",
+        "location": "US",
+        "numTimeTravelPhysicalBytes": "0",
+        "numTotalLogicalBytes": "28947",
+        "numActiveLogicalBytes": "0",
+        "numLongTermLogicalBytes": "28947",
+        "numTotalPhysicalBytes": "5350",
+        "numActivePhysicalBytes": "0",
+        "numLongTermPhysicalBytes": "5350",
+        "numCurrentPhysicalBytes": "5350"
+      }
+  """
+  try:
+    bq_client = client.get_bigquery_client(credentials=credentials)
+    return bq_client.get_table(
+        bigquery.TableReference(
+            bigquery.DatasetReference(project_id, dataset_id), table_id
+        )
+    ).to_api_repr()
+  except Exception as ex:
+    return {
+        "status": "ERROR",
+        "error_details": str(ex),
+    }

google/adk/tools/bigquery/query_tool.py

@@ -0,0 +1,76 @@
+# 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.
+
+from google.oauth2.credentials import Credentials
+
+from ...tools.bigquery import client
+
+MAX_DOWNLOADED_QUERY_RESULT_ROWS = 50
+
+
+def execute_sql(project_id: str, query: str, credentials: Credentials) -> dict:
+  """Run a BigQuery SQL query in the project and return the result.
+
+  Args:
+      project_id (str): The GCP project id in which the query should be
+        executed.
+      query (str): The BigQuery SQL query to be executed.
+      credentials (Credentials): The credentials to use for the request.
+
+  Returns:
+      dict: Dictionary representing the result of the query.
+            If the result contains the key "result_is_likely_truncated" with
+            value True, it means that there may be additional rows matching the
+            query not returned in the result.
+
+  Examples:
+      >>> execute_sql("bigframes-dev",
+      ... "SELECT island, COUNT(*) AS population "
+      ... "FROM bigquery-public-data.ml_datasets.penguins GROUP BY island")
+      {
+        "rows": [
+            {
+                "island": "Dream",
+                "population": 124
+            },
+            {
+                "island": "Biscoe",
+                "population": 168
+            },
+            {
+                "island": "Torgersen",
+                "population": 52
+            }
+        ]
+      }
+  """
+
+  try:
+    bq_client = client.get_bigquery_client(credentials=credentials)
+    row_iterator = bq_client.query_and_wait(
+        query, project=project_id, max_results=MAX_DOWNLOADED_QUERY_RESULT_ROWS
+    )
+    rows = [{key: val for key, val in row.items()} for row in row_iterator]
+    result = {"rows": rows}
+    if (
+        MAX_DOWNLOADED_QUERY_RESULT_ROWS is not None
+        and len(rows) == MAX_DOWNLOADED_QUERY_RESULT_ROWS
+    ):
+      result["result_is_likely_truncated"] = True
+    return result
+  except Exception as ex:
+    return {
+        "status": "ERROR",
+        "error_details": str(ex),
+    }

google/adk/tools/function_tool.py

@@ -46,14 +46,14 @@ class FunctionTool(BaseTool):
 
     # Get documentation (prioritize direct __doc__ if available)
     if hasattr(func, '__doc__') and func.__doc__:
-      doc = func.__doc__
+      doc = inspect.cleandoc(func.__doc__)
     elif (
         hasattr(func, '__call__')
         and hasattr(func.__call__, '__doc__')
         and func.__call__.__doc__
     ):
       # For callable objects, try to get docstring from __call__ method
-      doc = func.__call__.__doc__
+      doc = inspect.cleandoc(func.__call__.__doc__)
 
     super().__init__(name=name, description=doc)
     self.func = func
@@ -107,9 +107,9 @@ You could retry calling this tool, but it is IMPORTANT for you to provide all th
         or hasattr(self.func, '__call__')
         and inspect.iscoroutinefunction(self.func.__call__)
     ):
-      return await self.func(**args_to_call) or {}
+      return await self.func(**args_to_call)
     else:
-      return self.func(**args_to_call) or {}
+      return self.func(**args_to_call)
 
   # TODO(hangfei): fix call live for function stream.
   async def _call_live(

google/adk/tools/langchain_tool.py

@@ -12,13 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any
+from __future__ import annotations
+
 from typing import Optional
 from typing import Union
 
 from google.genai import types
 from langchain.agents import Tool
 from langchain_core.tools import BaseTool
+from langchain_core.tools.structured import StructuredTool
 from typing_extensions import override
 
 from . import _automatic_function_calling_util
@@ -63,9 +65,13 @@ class LangchainTool(FunctionTool):
       raise ValueError("Langchain tool must have a 'run' or '_run' method")
 
     # Determine which function to use
-    func = tool._run if hasattr(tool, '_run') else tool.run
+    if isinstance(tool, StructuredTool):
+      func = tool.func
+    else:
+      func = tool._run if hasattr(tool, '_run') else tool.run
     super().__init__(func)
-
+    # run_manager is a special parameter for langchain tool
+    self._ignore_params.append('run_manager')
     self._langchain_tool = tool
 
     # Set name: priority is 1) explicitly provided name, 2) tool's name, 3) default
@@ -112,20 +118,21 @@ class LangchainTool(FunctionTool):
         ):
           tool_wrapper.args_schema = self._langchain_tool.args_schema
 
-        return _automatic_function_calling_util.build_function_declaration_for_langchain(
-            False,
-            self.name,
-            self.description,
-            tool_wrapper.func,
-            getattr(tool_wrapper, 'args', None),
-        )
+          return _automatic_function_calling_util.build_function_declaration_for_langchain(
+              False,
+              self.name,
+              self.description,
+              tool_wrapper.func,
+              tool_wrapper.args,
+          )
 
       # Need to provide a way to override the function names and descriptions
       # as the original function names are mostly ".run" and the descriptions
       # may not meet users' needs
-      return _automatic_function_calling_util.build_function_declaration(
-          func=self._langchain_tool.run,
-      )
+      function_decl = super()._get_declaration()
+      function_decl.name = self.name
+      function_decl.description = self.description
+      return function_decl
 
     except Exception as e:
       raise ValueError(

google/adk/tools/load_memory_tool.py

@@ -69,6 +69,7 @@ class LoadMemoryTool(FunctionTool):
                     type=types.Type.STRING,
                 )
             },
+            required=['query'],
         ),
     )
 

google/adk/tools/mcp_tool/conversion_utils.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from typing import Any
 from typing import Dict
 
@@ -41,10 +43,10 @@ def adk_to_mcp_tool_type(tool: BaseTool) -> mcp_types.Tool:
       print(mcp_tool)
   """
   tool_declaration = tool._get_declaration()
-  if not tool_declaration:
+  if not tool_declaration or not tool_declaration.parameters:
     input_schema = {}
   else:
-    input_schema = gemini_to_json_schema(tool._get_declaration().parameters)
+    input_schema = gemini_to_json_schema(tool_declaration.parameters)
   return mcp_types.Tool(
       name=tool.name,
       description=tool.description,