Merge branch 'main' into fix-922

2026-01-11 16:38:15 -05:00 · 2025-09-02 15:49:27 +05:30 · 2025-08-28 15:07:19 +05:30 · 2025-08-25 11:03:02 +05:30 · 2025-08-20 15:08:25 +05:30 · 2025-08-19 14:27:32 +05:30
54 changed files with 638 additions and 1178 deletions
--- a/.github/workflows/docs_preview_deploy.yaml
+++ b/.github/workflows/docs_preview_deploy.yaml
@@ -49,23 +49,6 @@ jobs:
      group: "preview-${{ github.event.number }}"
      cancel-in-progress: true
    steps:
-      - name: Remove PR label
-        if: "${{ github.event.action == 'labeled' && github.event.label.name == 'docs: deploy-preview' }}"
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            try {
-              await github.rest.issues.removeLabel({
-                name: 'docs: deploy-preview',
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.payload.pull_request.number
-              });
-            } catch (e) {
-              console.log('Failed to remove label. Another job may have already removed it!');
-            }
-
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
        with:
          # Checkout the PR's HEAD commit (supports forks).
@@ -115,4 +98,4 @@ jobs:
              owner: context.repo.owner,
              repo: context.repo.repo,
              body: "🔎 Preview at https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/previews/PR-${{ github.event.number }}/"
-            })
+            })
--- a/docs/en/getting-started/quickstart/python/core/quickstart.py
+++ b/docs/en/getting-started/quickstart/python/core/quickstart.py
@@ -29,7 +29,7 @@ queries = [
    "My check in dates for my booking would be from April 10, 2024 to April 19, 2024.",
 ]

-async def main():
+async def run_application():
    async with ToolboxClient("http://127.0.0.1:5000") as toolbox_client:

        # The toolbox_tools list contains Python callables (functions/methods) designed for LLM tool-use
@@ -105,4 +105,4 @@ async def main():
            history.append(final_model_response_content)
            print(response2.text)

-asyncio.run(main())
+asyncio.run(run_application())
--- a/docs/en/getting-started/quickstart/python/langchain/quickstart.py
+++ b/docs/en/getting-started/quickstart/python/langchain/quickstart.py
@@ -31,7 +31,7 @@ queries = [
    "My check in dates would be from April 10, 2024 to April 19, 2024.",
 ]

-async def main():
+async def run_application():
    # TODO(developer): replace this with another model if needed
    model = ChatVertexAI(model_name="gemini-2.0-flash-001")
    # model = ChatGoogleGenerativeAI(model="gemini-2.0-flash-001")
@@ -49,4 +49,4 @@ async def main():
            response = agent.invoke(inputs, stream_mode="values", config=config)
            print(response["messages"][-1].content)

-asyncio.run(main())
+asyncio.run(run_application())
--- a/docs/en/getting-started/quickstart/python/llamaindex/quickstart.py
+++ b/docs/en/getting-started/quickstart/python/llamaindex/quickstart.py
@@ -30,7 +30,7 @@ queries = [
    "My check in dates would be from April 10, 2024 to April 19, 2024.",
 ]

-async def main():
+async def run_application():
    # TODO(developer): replace this with another model if needed
    llm = GoogleGenAI(
        model="gemini-2.0-flash-001",
@@ -60,4 +60,4 @@ async def main():
            print(f"---- {query} ----")
            print(str(response))

-asyncio.run(main())
+asyncio.run(run_application())
--- a/docs/en/how-to/connect-ide/firestore_mcp.md
+++ b/docs/en/how-to/connect-ide/firestore_mcp.md
@@ -5,9 +5,329 @@ weight: 2
 description: >
  Connect your IDE to Firestore using Toolbox.
 ---
-<html>
-  <head>
-    <link rel="canonical" href="https://cloud.google.com/firestore/native/docs/connect-ide-using-mcp-toolbox"/>
-    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/firestore/native/docs/connect-ide-using-mcp-toolbox"/>
-  </head>
-</html>
+
+[Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is
+an open protocol for connecting Large Language Models (LLMs) to data sources
+like Firestore. This guide covers how to use [MCP Toolbox for Databases][toolbox]
+to expose your developer assistant tools to a Firestore instance:
+
+* [Cursor][cursor]
+* [Windsurf][windsurf] (Codium)
+* [Visual Studio Code][vscode] (Copilot)
+* [Cline][cline]  (VS Code extension)
+* [Claude desktop][claudedesktop]
+* [Claude code][claudecode]
+* [Gemini CLI][geminicli]
+* [Gemini Code Assist][geminicodeassist]
+
+[toolbox]: https://github.com/googleapis/genai-toolbox
+[cursor]: #configure-your-mcp-client
+[windsurf]: #configure-your-mcp-client
+[vscode]: #configure-your-mcp-client
+[cline]: #configure-your-mcp-client
+[claudedesktop]: #configure-your-mcp-client
+[claudecode]: #configure-your-mcp-client
+[geminicli]: #configure-your-mcp-client
+[geminicodeassist]: #configure-your-mcp-client
+
+## Set up Firestore
+
+1. Create or select a Google Cloud project.
+
+    * [Create a new
+      project](https://cloud.google.com/resource-manager/docs/creating-managing-projects)
+    * [Select an existing
+      project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#identifying_projects)
+
+1. [Enable the Firestore
+   API](https://console.cloud.google.com/apis/library/firestore.googleapis.com)
+   for your project.
+
+1. [Create a Firestore
+   database](https://cloud.google.com/firestore/docs/create-database-web-mobile-client-library)
+   if you haven't already.
+
+1. Set up authentication for your local environment.
+
+    * [Install gcloud CLI](https://cloud.google.com/sdk/docs/install)
+    * Run `gcloud auth application-default login` to authenticate
+
+## Install MCP Toolbox
+
+1. Download the latest version of Toolbox as a binary. Select the [correct
+   binary](https://github.com/googleapis/genai-toolbox/releases) corresponding
+   to your OS and CPU architecture. You are required to use Toolbox version
+   V0.10.0+:
+
+   <!-- {x-release-please-start-version} -->
+   {{< tabpane persist=header >}}
+{{< tab header="linux/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/linux/amd64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/arm64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/darwin/arm64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/darwin/amd64/toolbox
+{{< /tab >}}
+
+{{< tab header="windows/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.13.0/windows/amd64/toolbox
+{{< /tab >}}
+{{< /tabpane >}}
+    <!-- {x-release-please-end} -->
+
+1. Make the binary executable:
+
+    ```bash
+    chmod +x toolbox
+    ```
+
+1. Verify the installation:
+
+    ```bash
+    ./toolbox --version
+    ```
+
+## Configure your MCP Client
+
+{{< tabpane text=true >}}
+{{% tab header="Claude code" lang="en" %}}
+
+1. Install [Claude
+   Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview).
+1. Create a `.mcp.json` file in your project root if it doesn't exist.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+1. Restart Claude code to apply the new configuration.
+{{% /tab %}}
+
+{{% tab header="Claude desktop" lang="en" %}}
+
+1. Open [Claude desktop](https://claude.ai/download) and navigate to Settings.
+1. Under the Developer tab, tap Edit Config to open the configuration file.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+1. Restart Claude desktop.
+1. From the new chat screen, you should see a hammer (MCP) icon appear with the
+   new MCP server available.
+{{% /tab %}}
+
+{{% tab header="Cline" lang="en" %}}
+
+1. Open the [Cline](https://github.com/cline/cline) extension in VS Code and tap
+   the **MCP Servers** icon.
+1. Tap Configure MCP Servers to open the configuration file.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+1. You should see a green active status after the server is successfully
+   connected.
+{{% /tab %}}
+
+{{% tab header="Cursor" lang="en" %}}
+
+1. Create a `.cursor` directory in your project root if it doesn't exist.
+1. Create a `.cursor/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+1. [Cursor](https://www.cursor.com/) and navigate to **Settings > Cursor
+   Settings > MCP**. You should see a green active status after the server is
+   successfully connected.
+{{% /tab %}}
+
+{{% tab header="Visual Studio Code (Copilot)" lang="en" %}}
+
+1. Open [VS Code](https://code.visualstudio.com/docs/copilot/overview) and
+   create a `.vscode` directory in your project root if it doesn't exist.
+1. Create a `.vscode/mcp.json` file if it doesn't exist and open it.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+    ```
+
+{{% /tab %}}
+
+{{% tab header="Windsurf" lang="en" %}}
+
+1. Open [Windsurf](https://docs.codeium.com/windsurf) and navigate to the
+   Cascade assistant.
+1. Tap on the hammer (MCP) icon, then Configure to open the configuration file.
+1. Add the following configuration, replace the environment variables with your
+   values, and save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+
+    ```
+
+{{% /tab %}}
+{{% tab header="Gemini CLI" lang="en" %}}
+
+1. Install the [Gemini
+   CLI](https://github.com/google-gemini/gemini-cli?tab=readme-ov-file#quickstart).
+1. In your working directory, create a folder named `.gemini`. Within it, create
+   a `settings.json` file.
+1. Add the following configuration, replace the environment variables with your
+   values, and then save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+
+    ```
+
+{{% /tab %}}
+{{% tab header="Gemini Code Assist" lang="en" %}}
+
+1. Install the [Gemini Code
+   Assist](https://marketplace.visualstudio.com/items?itemName=Google.geminicodeassist)
+   extension in Visual Studio Code.
+1. Enable Agent Mode in Gemini Code Assist chat.
+1. In your working directory, create a folder named `.gemini`. Within it, create
+   a `settings.json` file.
+1. Add the following configuration, replace the environment variables with your
+   values, and then save:
+
+    ```json
+    {
+      "mcpServers": {
+        "firestore": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","firestore","--stdio"],
+          "env": {
+            "FIRESTORE_PROJECT": "your-project-id",
+            "FIRESTORE_DATABASE": "(default)"
+          }
+        }
+      }
+    }
+
+    ```
+
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Use Tools
+
+Your AI tool is now connected to Firestore using MCP. Try asking your AI
+assistant to list collections, get documents, query collections, or manage
+security rules.
+
+The following tools are available to the LLM:
+
+1. **firestore-get-documents**: Gets multiple documents from Firestore by their
+   paths
+1. **firestore-list-collections**: List Firestore collections for a given parent
+   path
+1. **firestore-delete-documents**: Delete multiple documents from Firestore
+1. **firestore-query-collection**: Query documents from a collection with
+   filtering, ordering, and limit options
+1. **firestore-get-rules**: Retrieves the active Firestore security rules for
+   the current project
+1. **firestore-validate-rules**: Validates Firestore security rules syntax and
+   errors
+
+{{< notice note >}}
+Prebuilt tools are pre-1.0, so expect some tool changes between versions. LLMs
+will adapt to the tools available, so this shouldn't affect most users.
+{{< /notice >}}
--- a/docs/en/resources/sources/bigquery.md
+++ b/docs/en/resources/sources/bigquery.md
@@ -36,15 +36,12 @@ avoiding full table scans or complex filters.

 ## Available Tools

- [`bigquery-conversational-analytics`](../tools/bigquery/bigquery-conversational-analytics.md)
-  Allows conversational interaction with a BigQuery source.
+- [`bigquery-sql`](../tools/bigquery/bigquery-sql.md)  
+  Run SQL queries directly against BigQuery datasets.

 - [`bigquery-execute-sql`](../tools/bigquery/bigquery-execute-sql.md)  
  Execute structured queries using parameters.

- [`bigquery-forecast`](../tools/bigquery/bigquery-forecast.md)
-  Forecasts time series data in BigQuery.
-
 - [`bigquery-get-dataset-info`](../tools/bigquery/bigquery-get-dataset-info.md)  
  Retrieve metadata for a specific dataset.

@@ -57,9 +54,6 @@ avoiding full table scans or complex filters.
 - [`bigquery-list-table-ids`](../tools/bigquery/bigquery-list-table-ids.md)  
  List tables in a given dataset.

- [`bigquery-sql`](../tools/bigquery/bigquery-sql.md)  
-  Run SQL queries directly against BigQuery datasets.
-
 ### Pre-built Configurations

 - [BigQuery using MCP](https://googleapis.github.io/genai-toolbox/how-to/connect-ide/bigquery_mcp/)  
@@ -110,7 +104,6 @@ sources:
  my-bigquery-source:
    kind: "bigquery"
    project: "my-project-id"
-    # location: "US" # Optional: Specifies the location for query jobs.
 ```

 Initialize a BigQuery source that uses the client's access token:
@@ -121,7 +114,6 @@ sources:
    kind: "bigquery"
    project: "my-project-id"
    useClientOAuth: true
-    # location: "US" # Optional: Specifies the location for query jobs.
 ```

 ## Reference
--- a/docs/en/resources/sources/looker.md
+++ b/docs/en/resources/sources/looker.md
@@ -47,8 +47,7 @@ a self-signed ssl certificate for the Looker server. Anything other than "true"
 will be interpreted as false.

 The client id and client secret are seemingly random character sequences
-assigned by the looker server. If you are using Looker OAuth you don't need
-these settings
+assigned by the looker server.

 {{< notice tip >}}
 Use environment variable replacement with the format ${ENV_NAME}
@@ -61,11 +60,10 @@ instead of hardcoding your secrets into the configuration file.
 | -------------------- | :------: | :----------: | ----------------------------------------------------------------------------------------- |
 | kind                 |  string  |     true     | Must be "looker".                                                                         |
 | base_url             |  string  |     true     | The URL of your Looker server with no trailing /).                                        |
-| client_id            |  string  |    false     | The client id assigned by Looker.                                                         |
-| client_secret        |  string  |    false     | The client secret assigned by Looker.                                                     |
-| verify_ssl           |  string  |    false     | Whether to check the ssl certificate of the server.                                       |
+| client_id            |  string  |     true     | The client id assigned by Looker.                                                         |
+| client_secret        |  string  |     true     | The client secret assigned by Looker.                                                     |
+| verify_ssl           |  string  |     true     | Whether to check the ssl certificate of the server.                                       |
 | timeout              |  string  |    false     | Maximum time to wait for query execution (e.g. "30s", "2m"). By default, 120s is applied. |
-| use_client_oauth     |  string  |    false     | Use OAuth tokens instead of client_id and client_secret. (default: false)                 |
 | show_hidden_models   |  string  |    false     | Show or hide hidden models. (default: true)                                               |
 | show_hidden_explores |  string  |    false     | Show or hide hidden explores. (default: true)                                             |
 | show_hidden_fields   |  string  |    false     | Show or hide hidden fields. (default: true)                                               |
--- a/docs/en/resources/sources/mysql.md
+++ b/docs/en/resources/sources/mysql.md
@@ -42,9 +42,6 @@ sources:
        database: my_db
        user: ${USER_NAME}
        password: ${PASSWORD}
-        # Optional TLS and other driver parameters. For example, enable preferred TLS:
-        # queryParams:
-        #     tls: preferred
        queryTimeout: 30s # Optional: query timeout duration
 ```

@@ -64,4 +61,3 @@ instead of hardcoding your secrets into the configuration file.
 | user         |  string  |     true     | Name of the MySQL user to connect as (e.g. "my-mysql-user").                                    |
 | password     |  string  |     true     | Password of the MySQL user (e.g. "my-password").                                                |
 | queryTimeout |  string  |    false     | Maximum time to wait for query execution (e.g. "30s", "2m"). By default, no timeout is applied. |
-| queryParams | map<string,string> | false | Arbitrary DSN parameters passed to the driver (e.g. `tls: preferred`, `charset: utf8mb4`). Useful for enabling TLS or other connection options. |
--- a/docs/en/resources/tools/looker/looker-get-dimensions.md
+++ b/docs/en/resources/tools/looker/looker-get-dimensions.md
@@ -33,12 +33,6 @@ tools:

          It takes two parameters, the model_name looked up from get_models and the
          explore_name looked up from get_explores.
-
-          If this returns a suggestions field for a dimension, the contents of suggestions
-          can be used as filters for this field. If this returns a suggest_explore and
-          suggest_dimension, a query against that explore and dimension can be used to find
-          valid filters for this field.
-
 ```

 The response is a json array with the following elements:
@@ -51,10 +45,7 @@ The response is a json array with the following elements:
  "label": "field label",
  "label_short": "field short label",
  "tags": ["tags", ...],
-  "synonyms": ["synonyms", ...],
-  "suggestions": ["suggestion", ...],
-  "suggest_explore": "explore",
-  "suggest_dimension": "dimension"
+  "synonyms": ["synonyms", ...]
 }
 ```

--- a/docs/en/resources/tools/looker/looker-get-filters.md
+++ b/docs/en/resources/tools/looker/looker-get-filters.md
@@ -45,10 +45,7 @@ The response is a json array with the following elements:
  "label": "field label",
  "label_short": "field short label",
  "tags": ["tags", ...],
-  "synonyms": ["synonyms", ...],
-  "suggestions": ["suggestion", ...],
-  "suggest_explore": "explore",
-  "suggest_dimension": "dimension"
+  "synonyms": ["synonyms", ...]
 }
 ```

--- a/docs/en/resources/tools/looker/looker-get-measures.md
+++ b/docs/en/resources/tools/looker/looker-get-measures.md
@@ -33,12 +33,6 @@ tools:

          It takes two parameters, the model_name looked up from get_models and the
          explore_name looked up from get_explores.
-
-          If this returns a suggestions field for a measure, the contents of suggestions
-          can be used as filters for this field. If this returns a suggest_explore and
-          suggest_dimension, a query against that explore and dimension can be used to find
-          valid filters for this field.
-
 ```

 The response is a json array with the following elements:
@@ -51,10 +45,7 @@ The response is a json array with the following elements:
  "label": "field label",
  "label_short": "field short label",
  "tags": ["tags", ...],
-  "synonyms": ["synonyms", ...],
-  "suggestions": ["suggestion", ...],
-  "suggest_explore": "explore",
-  "suggest_dimension": "dimension"
+  "synonyms": ["synonyms", ...]
 }
 ```

--- a/docs/en/resources/tools/looker/looker-get-parameters.md
+++ b/docs/en/resources/tools/looker/looker-get-parameters.md
@@ -45,10 +45,7 @@ The response is a json array with the following elements:
  "label": "field label",
  "label_short": "field short label",
  "tags": ["tags", ...],
-  "synonyms": ["synonyms", ...],
-  "suggestions": ["suggestion", ...],
-  "suggest_explore": "explore",
-  "suggest_dimension": "dimension"
+  "synonyms": ["synonyms", ...]
 }
 ```

--- a/docs/en/samples/looker/looker_gemini_oauth/_index.md
+++ b/docs/en/samples/looker/looker_gemini_oauth/_index.md
@@ -1,140 +0,0 @@
---
-title: "Gemini-CLI and OAuth"
-type: docs
-weight: 2
-description: >
-  How to connect to Looker from Gemini-CLI with end-user credentials
---
-
-## Overview
-
-Gemini-CLI can be configured to get an OAuth token from Looker, then send this
-token to MCP Toolbox as part of the request. MCP Toolbox can then use this token
-to authentincate with Looker. This means that there is no need to get a Looker
-Client ID and Client Secret. This also means that MCP Toolbox can be set up as a
-shared resource.
-
-This configuration requires Toolbox v0.14.0 or later.
-
-## Step 1: Register the OAuth App in Looker
-
-You first need to register the OAuth application. Refer to the documentation
-[here](https://cloud.google.com/looker/docs/api-cors#registering_an_oauth_client_application).
-You may need to ask an administrator to do this for you.
-
-1. Go to the API Explorer application, locate "Register OAuth App", and press
-   the "Run It" button.
-1. Set the `client_guid` to "gemini-cli".
-1. Set the `redirect_uri` to "http://localhost:7777/oauth/callback".
-1. The `display_name` and `description` can be "Gemini-CLI" or anything
-   meaningful.
-1. Set `enabled` to "true".
-1. Check the box confirming that you understand this API will change data.
-1. Click the "Run" button.
-
-    ![OAuth Registration](./registration.png)
-
-## Step 2: Install and configure Toolbox
-
-In this section, we will download Toolbox and run the Toolbox server.
-
-1. Download the latest version of Toolbox as a binary:
-
-    {{< notice tip >}}
-   Select the
-   [correct binary](https://github.com/googleapis/genai-toolbox/releases)
-   corresponding to your OS and CPU architecture.
-    {{< /notice >}}
-    <!-- {x-release-please-start-version} -->
-    ```bash
-    export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.14.0/$OS/toolbox
-    ```
-    <!-- {x-release-please-end} -->
-
-1. Make the binary executable:
-
-    ```bash
-    chmod +x toolbox
-    ```
-
-1. Create a file `looker_env` with the settings for your
-   Looker instance.
-
-   ```bash
-    export LOOKER_BASE_URL=https://looker.example.com
-    export LOOKER_VERIFY_SSL=true
-   ```
-
-   In some instances you may need to append `:19999` to
-   the LOOKER_BASE_URL.
-
-1. Load the looker_env file into your environment.
-
-   ```bash
-   source looker_env
-   ```
-
-1. Run the Toolbox server using the prebuilt Looker tools.
-
-    ```bash
-    ./toolbox --prebuilt looker
-    ```
-
-    The toolbox server will begin listening on localhost port 5000. Leave it
-    running and continue in another terminal.
-
-    Later, when it is time to shut everything down, you can quit the toolbox
-    server with Ctrl-C in this terminal window.
-
-## Step 3: Configure Gemini-CLI
-
-1. Edit the file `~/.gemini/settings.json`. Add the following, substituting your
-   Looker server host name for `looker.example.com`.
-
-    ```json
-    "mcpServers": {
-        "looker": {
-            "httpUrl": "http://localhost:5000/mcp",
-            "oauth": {
-                "enabled": true,
-                "clientId": "gemini-cli",
-                "authorizationUrl": "https://looker.example.com/auth",
-                "tokenUrl": "https://looker.example.com/api/token",
-                "scopes": ["cors_api"]
-            }
-        }
-    }
-    ```
-
-    The `authorizationUrl` should point to the URL you use to access Looker via the
-    web UI. The `tokenUrl` should point to the URL you use to access Looker via
-    the API. In some cases you will need to use the port number `:19999` after
-    the host name but before the `/api/token` part.
-
-1. Start Gemini-CLI.
-
-1. Authenticate with the command `/mcp auth looker`. Gemini-CLI will open up a
-   browser where you will confirm that you want to access Looker with your
-   account.
-
-   ![Authorizing](./authorize.png)
-
-   ![Authenticated](./authenticated.png)
-
-1. Use Gemini-CLI with your tools.
-
-## Using Toolbox as a Shared Service
-
-Toolbox can be run on another server as a shared service accessed by multiple
-users. We strongly recommend running toolbox behind a web proxy such as `nginx`
-which will provide SSL encryption. Google Cloud Run is another good way to run
-toolbox. You will connect to a service like `https://toolbox.example.com/mcp`.
-The proxy server will handle the SSL encryption and certificates. Then it will
-foward the requests to `http://localhost:5000/mcp` running in that environment.
-The details of the config are beyond the scope of this document, but will be
-familiar to your system administrators.
-
-To use the shared service, just change the `localhost:5000` in the `httpUrl` in
-`~/.gemini/settings.json` to the host name and possibly the port of the shared
-service.
--- a/docs/en/samples/looker/looker_gemini_oauth/authenticated.png
+++ b/docs/en/samples/looker/looker_gemini_oauth/authenticated.png
--- a/docs/en/samples/looker/looker_gemini_oauth/authorize.png
+++ b/docs/en/samples/looker/looker_gemini_oauth/authorize.png
--- a/docs/en/samples/looker/looker_gemini_oauth/registration.png
+++ b/docs/en/samples/looker/looker_gemini_oauth/registration.png
--- a/go.mod
+++ b/go.mod
@@ -33,7 +33,7 @@ require (
 	github.com/looker-open-source/sdk-codegen/go v0.25.10
 	github.com/microsoft/go-mssqldb v1.9.3
 	github.com/nakagami/firebirdsql v0.9.15
-	github.com/neo4j/neo4j-go-driver/v5 v5.28.3
+	github.com/neo4j/neo4j-go-driver/v5 v5.28.2
 	github.com/redis/go-redis/v9 v9.12.1
 	github.com/spf13/cobra v1.9.1
 	github.com/thlib/go-timezone-local v0.0.7
--- a/go.sum
+++ b/go.sum
@@ -1155,8 +1155,8 @@ github.com/nakagami/firebirdsql v0.9.15 h1:Mf05jaFI8+kjy6sBstsAu76zOkJ44AGd6cpAp
 github.com/nakagami/firebirdsql v0.9.15/go.mod h1:bZKRs3rpHAjJgXAoc9YiPobTz3R22i41Zjo+llIS2B0=
 github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
-github.com/neo4j/neo4j-go-driver/v5 v5.28.3 h1:OHP/vzX0oZ2YUY5DnGUp7QY21BIpOzw+Pp+Dga8zYl4=
-github.com/neo4j/neo4j-go-driver/v5 v5.28.3/go.mod h1:Vff8OwT7QpLm7L2yYr85XNWe9Rbqlbeb9asNXJTHO4k=
+github.com/neo4j/neo4j-go-driver/v5 v5.28.2 h1:uG7nMK0zS/a/iSWMZgCIY40SfYzWBc6uSrMONhiIS0U=
+github.com/neo4j/neo4j-go-driver/v5 v5.28.2/go.mod h1:Vff8OwT7QpLm7L2yYr85XNWe9Rbqlbeb9asNXJTHO4k=
 github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
 github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
--- a/internal/prebuiltconfigs/tools/looker.yaml
+++ b/internal/prebuiltconfigs/tools/looker.yaml
@@ -1,26 +1,11 @@
-# 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.
-
 sources:
    looker-source:
        kind: looker
        base_url: ${LOOKER_BASE_URL}
-        client_id: ${LOOKER_CLIENT_ID:}
-        client_secret: ${LOOKER_CLIENT_SECRET:}
+        client_id: ${LOOKER_CLIENT_ID}
+        client_secret: ${LOOKER_CLIENT_SECRET}
        verify_ssl: ${LOOKER_VERIFY_SSL:true}
        timeout: 600s
-        use_client_oauth: ${LOOKER_USE_CLIENT_OAUTH:false}
        show_hidden_models: ${LOOKER_SHOW_HIDDEN_MODELS:true}
        show_hidden_explores: ${LOOKER_SHOW_HIDDEN_EXPLORES:true}
        show_hidden_fields: ${LOOKER_SHOW_HIDDEN_FIELDS:true}
@@ -53,11 +38,6 @@ tools:
          It takes two parameters, the model_name looked up from get_models and the
          explore_name looked up from get_explores.

-          If this returns a suggestions field for a dimension, the contents of suggestions
-          can be used as filters for this field. If this returns a suggest_explore and
-          suggest_dimension, a query against that explore and dimension can be used to find
-          valid filters for this field.
-
    get_measures:
        kind: looker-get-measures
        source: looker-source
@@ -68,11 +48,6 @@ tools:
          It takes two parameters, the model_name looked up from get_models and the
          explore_name looked up from get_explores.

-          If this returns a suggestions field for a measure, the contents of suggestions
-          can be used as filters for this field. If this returns a suggest_explore and
-          suggest_dimension, a query against that explore and dimension can be used to find
-          valid filters for this field.
-
    get_filters:
        kind: looker-get-filters
        source: looker-source
--- a/internal/sources/looker/looker.go
+++ b/internal/sources/looker/looker.go
@@ -43,7 +43,6 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 		Name:               name,
 		SslVerification:    true,
 		Timeout:            "600s",
-		UseClientOAuth:     false,
 		ShowHiddenModels:   true,
 		ShowHiddenExplores: true,
 		ShowHiddenFields:   true,
@@ -61,7 +60,6 @@ type Config struct {
 	ClientId           string `yaml:"client_id" validate:"required"`
 	ClientSecret       string `yaml:"client_secret" validate:"required"`
 	SslVerification    bool   `yaml:"verify_ssl"`
-	UseClientOAuth     bool   `yaml:"use_client_oauth"`
 	Timeout            string `yaml:"timeout"`
 	ShowHiddenModels   bool   `yaml:"show_hidden_models"`
 	ShowHiddenExplores bool   `yaml:"show_hidden_explores"`
@@ -102,29 +100,23 @@ func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.So
 		ClientSecret: r.ClientSecret,
 	}

+	sdk := v4.NewLookerSDK(rtl.NewAuthSession(cfg))
+	me, err := sdk.Me("", &cfg)
+	if err != nil {
+		return nil, fmt.Errorf("unable to log in: %s", err)
+	}
+	logger.DebugContext(ctx, fmt.Sprintf("logged in as user %v %v.\n", *me.FirstName, *me.LastName))
+
 	s := &Source{
 		Name:               r.Name,
 		Kind:               SourceKind,
 		Timeout:            r.Timeout,
-		UseClientOAuth:     r.UseClientOAuth,
+		Client:             sdk,
 		ApiSettings:        &cfg,
 		ShowHiddenModels:   r.ShowHiddenModels,
 		ShowHiddenExplores: r.ShowHiddenExplores,
 		ShowHiddenFields:   r.ShowHiddenFields,
 	}
-
-	if !r.UseClientOAuth {
-		if r.ClientId == "" || r.ClientSecret == "" {
-			return nil, fmt.Errorf("client_id and client_secret need to be specified")
-		}
-		s.Client = v4.NewLookerSDK(rtl.NewAuthSession(cfg))
-		resp, err := s.Client.Me("", s.ApiSettings)
-		if err != nil {
-			return nil, fmt.Errorf("incorrect settings: %w", err)
-		}
-		logger.DebugContext(ctx, fmt.Sprintf("logged in as %s %s", *resp.FirstName, *resp.LastName))
-	}
-
 	return s, nil

 }
@@ -137,7 +129,6 @@ type Source struct {
 	Timeout            string `yaml:"timeout"`
 	Client             *v4.LookerSDK
 	ApiSettings        *rtl.ApiSettings
-	UseClientOAuth     bool `yaml:"use_client_oauth"`
 	ShowHiddenModels   bool `yaml:"show_hidden_models"`
 	ShowHiddenExplores bool `yaml:"show_hidden_explores"`
 	ShowHiddenFields   bool `yaml:"show_hidden_fields"`
--- a/internal/sources/looker/looker_test.go
+++ b/internal/sources/looker/looker_test.go
@@ -50,7 +50,6 @@ func TestParseFromYamlLooker(t *testing.T) {
 					ClientSecret:       "sdakl;jgflkasdfkfg",
 					Timeout:            "600s",
 					SslVerification:    true,
-					UseClientOAuth:     false,
 					ShowHiddenModels:   true,
 					ShowHiddenExplores: true,
 					ShowHiddenFields:   true,
--- a/internal/sources/mysql/mysql.go
+++ b/internal/sources/mysql/mysql.go
@@ -18,7 +18,6 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"net/url"
 	"time"

 	_ "github.com/go-sql-driver/mysql"
@@ -47,15 +46,14 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 }

 type Config struct {
-	Name         string            `yaml:"name" validate:"required"`
-	Kind         string            `yaml:"kind" validate:"required"`
-	Host         string            `yaml:"host" validate:"required"`
-	Port         string            `yaml:"port" validate:"required"`
-	User         string            `yaml:"user" validate:"required"`
-	Password     string            `yaml:"password" validate:"required"`
-	Database     string            `yaml:"database" validate:"required"`
-	QueryTimeout string            `yaml:"queryTimeout"`
-	QueryParams  map[string]string `yaml:"queryParams"`
+	Name         string `yaml:"name" validate:"required"`
+	Kind         string `yaml:"kind" validate:"required"`
+	Host         string `yaml:"host" validate:"required"`
+	Port         string `yaml:"port" validate:"required"`
+	User         string `yaml:"user" validate:"required"`
+	Password     string `yaml:"password" validate:"required"`
+	Database     string `yaml:"database" validate:"required"`
+	QueryTimeout string `yaml:"queryTimeout"`
 }

 func (r Config) SourceConfigKind() string {
@@ -63,7 +61,7 @@ func (r Config) SourceConfigKind() string {
 }

 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
-	pool, err := initMySQLConnectionPool(ctx, tracer, r.Name, r.Host, r.Port, r.User, r.Password, r.Database, r.QueryTimeout, r.QueryParams)
+	pool, err := initMySQLConnectionPool(ctx, tracer, r.Name, r.Host, r.Port, r.User, r.Password, r.Database, r.QueryTimeout)
 	if err != nil {
 		return nil, fmt.Errorf("unable to create pool: %w", err)
 	}
@@ -97,34 +95,21 @@ func (s *Source) MySQLPool() *sql.DB {
 	return s.Pool
 }

-func initMySQLConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname, queryTimeout string, queryParams map[string]string) (*sql.DB, error) {
+func initMySQLConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname, queryTimeout string) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
 	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()

-	// Build query parameters via url.Values for deterministic order and proper escaping.
-	values := url.Values{}
+	// Configure the driver to connect to the database
+	dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?parseTime=true", user, pass, host, port, dbname)

-	// Derive readTimeout from queryTimeout when provided.
+	// Add query timeout to DSN if specified
 	if queryTimeout != "" {
 		timeout, err := time.ParseDuration(queryTimeout)
 		if err != nil {
 			return nil, fmt.Errorf("invalid queryTimeout %q: %w", queryTimeout, err)
 		}
-		values.Set("readTimeout", timeout.String())
-	}
-
-	// Custom user parameters
-	for k, v := range queryParams {
-		if v == "" {
-			continue // skip empty values
-		}
-		values.Set(k, v)
-	}
-
-	dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?parseTime=true", user, pass, host, port, dbname)
-	if enc := values.Encode(); enc != "" {
-		dsn += "&" + enc
+		dsn += "&readTimeout=" + timeout.String()
 	}

 	// Interact with the driver directly as you normally would
--- a/internal/sources/mysql/mysql_test.go
+++ b/internal/sources/mysql/mysql_test.go
@@ -15,15 +15,10 @@
 package mysql_test

 import (
-	"context"
-	"strings"
 	"testing"

 	yaml "github.com/goccy/go-yaml"
 	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-	"go.opentelemetry.io/otel/trace/noop"
-
 	"github.com/googleapis/genai-toolbox/internal/server"
 	"github.com/googleapis/genai-toolbox/internal/sources/mysql"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
@@ -85,41 +80,9 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 				},
 			},
 		},
-		{
-			desc: "with query params",
-			in: `
-			sources:
-				my-mysql-instance:
-					kind: mysql
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					queryParams:
-						tls: preferred
-						charset: utf8mb4
-			`,
-			want: server.SourceConfigs{
-				"my-mysql-instance": mysql.Config{
-					Name:     "my-mysql-instance",
-					Kind:     mysql.SourceKind,
-					Host:     "0.0.0.0",
-					Port:     "my-port",
-					Database: "my_db",
-					User:     "my_user",
-					Password: "my_pass",
-					QueryParams: map[string]string{
-						"tls":     "preferred",
-						"charset": "utf8mb4",
-					},
-				},
-			},
-		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			t.Parallel()
 			got := struct {
 				Sources server.SourceConfigs `yaml:"sources"`
 			}{}
@@ -128,8 +91,8 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Sources, cmpopts.EquateEmpty()); diff != "" {
-				t.Fatalf("mismatch (-want +got):\n%s", diff)
+			if !cmp.Equal(tc.want, got.Sources) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
 			}
 		})
 	}
@@ -155,7 +118,7 @@ func TestFailParseFromYaml(t *testing.T) {
 					password: my_pass
 					foo: bar
 			`,
-			err: "unknown field \"foo\"",
+			err: "unable to parse source \"my-mysql-instance\" as \"mysql\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | host: 0.0.0.0\n   4 | kind: mysql\n   5 | password: my_pass\n   6 | ",
 		},
 		{
 			desc: "missing required field",
@@ -168,27 +131,11 @@ func TestFailParseFromYaml(t *testing.T) {
 					user: my_user
 					password: my_pass
 			`,
-			err: "Field validation for 'Host' failed",
-		},
-		{
-			desc: "invalid query params type",
-			in: `
-			sources:
-				my-mysql-instance:
-					kind: mysql
-					host: 0.0.0.0
-					port: 3306
-					database: my_db
-					user: my_user
-					password: my_pass
-					queryParams: not-a-map
-			`,
-			err: "string was used where mapping is expected",
+			err: "unable to parse source \"my-mysql-instance\" as \"mysql\": Key: 'Config.Host' Error:Field validation for 'Host' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			t.Parallel()
 			got := struct {
 				Sources server.SourceConfigs `yaml:"sources"`
 			}{}
@@ -198,32 +145,9 @@ func TestFailParseFromYaml(t *testing.T) {
 				t.Fatalf("expect parsing to fail")
 			}
 			errStr := err.Error()
-			if !strings.Contains(errStr, tc.err) {
-				t.Fatalf("unexpected error: got %q, want substring %q", errStr, tc.err)
+			if errStr != tc.err {
+				t.Fatalf("unexpected error: got %q, want %q", errStr, tc.err)
 			}
 		})
 	}
 }
-
-// TestFailInitialization test error during initialization without attempting a DB connection.
-func TestFailInitialization(t *testing.T) {
-	t.Parallel()
-
-	cfg := mysql.Config{
-		Name:         "instance",
-		Kind:         "mysql",
-		Host:         "localhost",
-		Port:         "3306",
-		Database:     "db",
-		User:         "user",
-		Password:     "pass",
-		QueryTimeout: "abc", // invalid duration
-	}
-	_, err := cfg.Initialize(context.Background(), noop.NewTracerProvider().Tracer("test"))
-	if err == nil {
-		t.Fatalf("expected error for invalid queryTimeout, got nil")
-	}
-	if !strings.Contains(err.Error(), "invalid queryTimeout") {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
--- a/internal/tools/bigquery/bigquerysql/bigquerysql.go
+++ b/internal/tools/bigquery/bigquerysql/bigquerysql.go
@@ -65,6 +65,7 @@ type Config struct {
 	Description        string           `yaml:"description" validate:"required"`
 	Statement          string           `yaml:"statement" validate:"required"`
 	AuthRequired       []string         `yaml:"authRequired"`
+	UseClientOAuth     bool             `yaml:"useClientOAuth"`
 	Parameters         tools.Parameters `yaml:"parameters"`
 	TemplateParameters tools.Parameters `yaml:"templateParameters"`
 }
--- a/internal/tools/firestore/firestoreadddocuments/firestoreadddocuments.go
+++ b/internal/tools/firestore/firestoreadddocuments/firestoreadddocuments.go
@@ -85,7 +85,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// Create parameters
 	collectionPathParameter := tools.NewStringParameter(
 		collectionPathKey,
-		"The relative path of the collection where the document will be added to (e.g., 'users' or 'users/userId/posts'). Note: This is a relative path, NOT an absolute path like 'projects/{project_id}/databases/{database_id}/documents/...'",
+		"The path of the collection where the document will be added to",
 	)

 	documentDataParameter := tools.NewMapParameter(
@@ -159,11 +159,6 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		return nil, fmt.Errorf("invalid or missing '%s' parameter", collectionPathKey)
 	}

-	// Validate collection path
-	if err := util.ValidateCollectionPath(collectionPath); err != nil {
-		return nil, fmt.Errorf("invalid collection path: %w", err)
-	}
-
 	// Get document data
 	documentDataRaw, ok := mapParams[documentDataKey]
 	if !ok {
--- a/internal/tools/firestore/firestoredeletedocuments/firestoredeletedocuments.go
+++ b/internal/tools/firestore/firestoredeletedocuments/firestoredeletedocuments.go
@@ -23,7 +23,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	firestoreds "github.com/googleapis/genai-toolbox/internal/sources/firestore"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
 )

 const kind string = "firestore-delete-documents"
@@ -80,7 +79,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 		return nil, fmt.Errorf("invalid source for %q tool: source kind must be one of %q", kind, compatibleSources)
 	}

-	documentPathsParameter := tools.NewArrayParameter(documentPathsKey, "Array of relative document paths to delete from Firestore (e.g., 'users/userId' or 'users/userId/posts/postId'). Note: These are relative paths, NOT absolute paths like 'projects/{project_id}/databases/{database_id}/documents/...'", tools.NewStringParameter("item", "Relative document path"))
+	documentPathsParameter := tools.NewArrayParameter(documentPathsKey, "Array of document paths to delete from Firestore.", tools.NewStringParameter("item", "Document path"))
 	parameters := tools.Parameters{documentPathsParameter}

 	mcpManifest := tools.McpManifest{
@@ -138,13 +137,6 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		return nil, fmt.Errorf("unexpected type conversion error for document paths")
 	}

-	// Validate each document path
-	for i, path := range documentPaths {
-		if err := util.ValidateDocumentPath(path); err != nil {
-			return nil, fmt.Errorf("invalid document path at index %d: %w", i, err)
-		}
-	}
-
 	// Create a BulkWriter to handle multiple deletions efficiently
 	bulkWriter := t.Client.BulkWriter(ctx)

--- a/internal/tools/firestore/firestoregetdocuments/firestoregetdocuments.go
+++ b/internal/tools/firestore/firestoregetdocuments/firestoregetdocuments.go
@@ -23,7 +23,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	firestoreds "github.com/googleapis/genai-toolbox/internal/sources/firestore"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
 )

 const kind string = "firestore-get-documents"
@@ -80,7 +79,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 		return nil, fmt.Errorf("invalid source for %q tool: source kind must be one of %q", kind, compatibleSources)
 	}

-	documentPathsParameter := tools.NewArrayParameter(documentPathsKey, "Array of relative document paths to retrieve from Firestore (e.g., 'users/userId' or 'users/userId/posts/postId'). Note: These are relative paths, NOT absolute paths like 'projects/{project_id}/databases/{database_id}/documents/...'", tools.NewStringParameter("item", "Relative document path"))
+	documentPathsParameter := tools.NewArrayParameter(documentPathsKey, "Array of document paths to retrieve from Firestore.", tools.NewStringParameter("item", "Document path"))
 	parameters := tools.Parameters{documentPathsParameter}

 	mcpManifest := tools.McpManifest{
@@ -138,13 +137,6 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		return nil, fmt.Errorf("unexpected type conversion error for document paths")
 	}

-	// Validate each document path
-	for i, path := range documentPaths {
-		if err := util.ValidateDocumentPath(path); err != nil {
-			return nil, fmt.Errorf("invalid document path at index %d: %w", i, err)
-		}
-	}
-
 	// Create document references from paths
 	docRefs := make([]*firestoreapi.DocumentRef, len(documentPaths))
 	for i, path := range documentPaths {
--- a/internal/tools/firestore/firestorelistcollections/firestorelistcollections.go
+++ b/internal/tools/firestore/firestorelistcollections/firestorelistcollections.go
@@ -23,7 +23,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	firestoreds "github.com/googleapis/genai-toolbox/internal/sources/firestore"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
 )

 const kind string = "firestore-list-collections"
@@ -81,7 +80,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}

 	emptyString := ""
-	parentPathParameter := tools.NewStringParameterWithDefault(parentPathKey, emptyString, "Relative parent document path to list subcollections from (e.g., 'users/userId'). If not provided, lists root collections. Note: This is a relative path, NOT an absolute path like 'projects/{project_id}/databases/{database_id}/documents/...'")
+	parentPathParameter := tools.NewStringParameterWithDefault(parentPathKey, emptyString, "Parent document path to list subcollections from. If not provided, lists root collections.")
 	parameters := tools.Parameters{parentPathParameter}

 	mcpManifest := tools.McpManifest{
@@ -127,11 +126,6 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	parentPath, hasParent := mapParams[parentPathKey].(string)

 	if hasParent && parentPath != "" {
-		// Validate parent document path
-		if err := util.ValidateDocumentPath(parentPath); err != nil {
-			return nil, fmt.Errorf("invalid parent document path: %w", err)
-		}
-		
 		// List subcollections of the specified document
 		docRef := t.Client.Doc(parentPath)
 		collectionRefs, err = docRef.Collections(ctx).GetAll()
--- a/internal/tools/firestore/firestorequerycollection/firestorequerycollection.go
+++ b/internal/tools/firestore/firestorequerycollection/firestorequerycollection.go
@@ -25,7 +25,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	firestoreds "github.com/googleapis/genai-toolbox/internal/sources/firestore"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
 )

 // Constants for tool configuration
@@ -153,7 +152,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 func createParameters() tools.Parameters {
 	collectionPathParameter := tools.NewStringParameter(
 		collectionPathKey,
-		"The relative path to the Firestore collection to query (e.g., 'users' or 'users/userId/posts'). Note: This is a relative path, NOT an absolute path like 'projects/{project_id}/databases/{database_id}/documents/...'",
+		"The path to the Firestore collection to query",
 	)

 	filtersDescription := `Array of filter objects to apply to the query. Each filter is a JSON string with:
@@ -304,11 +303,6 @@ func (t Tool) parseQueryParameters(params tools.ParamValues) (*queryParameters,
 		return nil, fmt.Errorf(errMissingCollectionPath, collectionPathKey)
 	}

-	// Validate collection path
-	if err := util.ValidateCollectionPath(collectionPath); err != nil {
-		return nil, fmt.Errorf("invalid collection path: %w", err)
-	}
-
 	result := &queryParameters{
 		CollectionPath: collectionPath,
 		Limit:          defaultLimit,
--- a/internal/tools/firestore/firestoreupdatedocument/firestoreupdatedocument.go
+++ b/internal/tools/firestore/firestoreupdatedocument/firestoreupdatedocument.go
@@ -87,7 +87,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// Create parameters
 	documentPathParameter := tools.NewStringParameter(
 		documentPathKey,
-		"The relative path of the document which needs to be updated (e.g., 'users/userId' or 'users/userId/posts/postId'). Note: This is a relative path, NOT an absolute path like 'projects/{project_id}/databases/{database_id}/documents/...'",
+		"The path of the document which needs to be updated",
 	)

 	documentDataParameter := tools.NewMapParameter(
@@ -169,11 +169,6 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		return nil, fmt.Errorf("invalid or missing '%s' parameter", documentPathKey)
 	}

-	// Validate document path
-	if err := util.ValidateDocumentPath(documentPath); err != nil {
-		return nil, fmt.Errorf("invalid document path: %w", err)
-	}
-
 	// Get document data
 	documentDataRaw, ok := mapParams[documentDataKey]
 	if !ok {
--- a/internal/tools/firestore/util/validator.go
+++ b/internal/tools/firestore/util/validator.go
@@ -1,137 +0,0 @@
-// 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.
-
-package util
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-)
-
-// Regular expressions for validating Firestore paths
-var (
-	// Pattern to detect absolute paths (those starting with "projects/")
-	absolutePathRegex = regexp.MustCompile(`^projects/[^/]+/databases/[^/]+/documents/`)
-)
-
-// PathType represents the type of Firestore path
-type PathType int
-
-const (
-	CollectionPath PathType = iota
-	DocumentPath
-)
-
-// ValidateCollectionPath validates that a path is a valid Firestore collection path.
-// Collection paths must have an odd number of segments (collection/doc/collection)
-func ValidateCollectionPath(path string) error {
-	return validatePath(path, CollectionPath)
-}
-
-// ValidateDocumentPath validates that a path is a valid Firestore document path.
-// Document paths must have an even number of segments (collection/doc or collection/doc/collection/doc)
-func ValidateDocumentPath(path string) error {
-	return validatePath(path, DocumentPath)
-}
-
-// validatePath is the common validation function for both collection and document paths
-func validatePath(path string, pathType PathType) error {
-	pathTypeName := "document"
-	if pathType == CollectionPath {
-		pathTypeName = "collection"
-	}
-
-	// Check for empty path
-	if path == "" {
-		return fmt.Errorf("%s path cannot be empty", pathTypeName)
-	}
-
-	// Check if it's an absolute path
-	if absolutePathRegex.MatchString(path) {
-		example := "users/userId"
-		if pathType == CollectionPath {
-			example = "users"
-		}
-		return fmt.Errorf("path must be relative (e.g., '%s'), not absolute (matching pattern: ^projects/[^/]+/databases/[^/]+/documents/)", example)
-	}
-
-	// Split the path using strings.Split to preserve empty segments
-	segments := strings.Split(path, "/")
-
-	// Check for empty result
-	if len(segments) == 0 {
-		return fmt.Errorf("%s path cannot be empty or contain only slashes", pathTypeName)
-	}
-
-	// Check segment count based on path type
-	segmentCount := len(segments)
-	if pathType == CollectionPath && segmentCount%2 == 0 {
-		// Collection paths must have an odd number of segments
-		return fmt.Errorf("invalid collection path: must have an odd number of segments (e.g., 'collection' or 'collection/doc/subcollection'), got %d segments", segmentCount)
-	} else if pathType == DocumentPath && segmentCount%2 != 0 {
-		// Document paths must have an even number of segments
-		return fmt.Errorf("invalid document path: must have an even number of segments (e.g., 'collection/doc'), got %d segments", segmentCount)
-	}
-
-	// Validate each segment
-	for i, segment := range segments {
-		isCollectionSegment := (i % 2) == 0
-		if err := validateSegment(segment, isCollectionSegment); err != nil {
-			return fmt.Errorf("invalid segment at position %d (%s): %w", i+1, segment, err)
-		}
-	}
-
-	return nil
-}
-
-// validateSegment validates a single path segment
-func validateSegment(segment string, isCollection bool) error {
-	segmentType := "document ID"
-	if isCollection {
-		segmentType = "collection ID"
-	}
-
-	// Check for empty segment
-	if segment == "" {
-		return fmt.Errorf("segment cannot be empty")
-	}
-
-	// Check for whitespace-only segment
-	if strings.TrimSpace(segment) == "" {
-		return fmt.Errorf("segment cannot be only whitespace")
-	}
-
-	// Check for single or double period
-	if segment == "." || segment == ".." {
-		return fmt.Errorf("segment cannot be '.' or '..'")
-	}
-
-	// Check for reserved prefix
-	if strings.HasPrefix(segment, "__") {
-		return fmt.Errorf("%s cannot start with '__' (reserved prefix)", segmentType)
-	}
-
-	return nil
-}
-
-// IsAbsolutePath checks if a path is an absolute Firestore path
-func IsAbsolutePath(path string) bool {
-	return absolutePathRegex.MatchString(path)
-}
-
-// IsRelativePath checks if a path is a relative Firestore path
-func IsRelativePath(path string) bool {
-	return path != "" && !IsAbsolutePath(path)
-}
--- a/internal/tools/firestore/util/validator_test.go
+++ b/internal/tools/firestore/util/validator_test.go
@@ -1,218 +0,0 @@
-// 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.
-
-package util
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestValidateCollectionPath(t *testing.T) {
-	tests := []struct {
-		name    string
-		path    string
-		wantErr bool
-		errMsg  string
-	}{
-		// Valid cases
-		{
-			name:    "valid root collection",
-			path:    "users",
-			wantErr: false,
-		},
-		{
-			name:    "valid subcollection",
-			path:    "users/user123/posts",
-			wantErr: false,
-		},
-		{
-			name:    "valid deeply nested",
-			path:    "users/user123/posts/post456/comments",
-			wantErr: false,
-		},
-
-		// Invalid cases
-		{
-			name:    "empty path",
-			path:    "",
-			wantErr: true,
-			errMsg:  "collection path cannot be empty",
-		},
-		{
-			name:    "even segments (document path)",
-			path:    "users/user123",
-			wantErr: true,
-			errMsg:  "must have an odd number of segments",
-		},
-		{
-			name:    "absolute path",
-			path:    "projects/my-project/databases/(default)/documents/users",
-			wantErr: true,
-			errMsg:  "path must be relative",
-		},
-		{
-			name:    "reserved prefix __",
-			path:    "__users",
-			wantErr: true,
-			errMsg:  "collection ID cannot start with '__'",
-		},
-		{
-			name:    "dot segment",
-			path:    "users/./posts",
-			wantErr: true,
-			errMsg:  "segment cannot be '.'",
-		},
-		{
-			name:    "double slashes",
-			path:    "users//posts",
-			wantErr: true,
-			errMsg:  "segment cannot be empty",
-		},
-		{
-			name:    "trailing slash",
-			path:    "users/",
-			wantErr: true,
-			errMsg:  "must have an odd number of segments",
-		},
-		{
-			name:    "whitespace only segment",
-			path:    "users/   /posts",
-			wantErr: true,
-			errMsg:  "segment cannot be only whitespace",
-		},
-		{
-			name:    "tab whitespace segment",
-			path:    "users/\t/posts",
-			wantErr: true,
-			errMsg:  "segment cannot be only whitespace",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := ValidateCollectionPath(tt.path)
-			if tt.wantErr {
-				if err == nil {
-					t.Errorf("ValidateCollectionPath(%q) expected error but got none", tt.path)
-				} else if tt.errMsg != "" && !strings.Contains(err.Error(), tt.errMsg) {
-					t.Errorf("ValidateCollectionPath(%q) error = %v, want error containing %q", tt.path, err, tt.errMsg)
-				}
-			} else {
-				if err != nil {
-					t.Errorf("ValidateCollectionPath(%q) unexpected error: %v", tt.path, err)
-				}
-			}
-		})
-	}
-}
-
-func TestValidateDocumentPath(t *testing.T) {
-	tests := []struct {
-		name    string
-		path    string
-		wantErr bool
-		errMsg  string
-	}{
-		// Valid cases
-		{
-			name:    "valid root document",
-			path:    "users/user123",
-			wantErr: false,
-		},
-		{
-			name:    "valid nested document",
-			path:    "users/user123/posts/post456",
-			wantErr: false,
-		},
-		{
-			name:    "valid deeply nested",
-			path:    "users/user123/posts/post456/comments/comment789",
-			wantErr: false,
-		},
-
-		// Invalid cases
-		{
-			name:    "empty path",
-			path:    "",
-			wantErr: true,
-			errMsg:  "document path cannot be empty",
-		},
-		{
-			name:    "odd segments (collection path)",
-			path:    "users",
-			wantErr: true,
-			errMsg:  "must have an even number of segments",
-		},
-		{
-			name:    "absolute path",
-			path:    "projects/my-project/databases/(default)/documents/users/user123",
-			wantErr: true,
-			errMsg:  "path must be relative",
-		},
-		{
-			name:    "reserved prefix __",
-			path:    "users/__user123",
-			wantErr: true,
-			errMsg:  "document ID cannot start with '__'",
-		},
-		{
-			name:    "double dot segment",
-			path:    "users/..",
-			wantErr: true,
-			errMsg:  "segment cannot be '.'",
-		},
-		{
-			name:    "double slashes in document path",
-			path:    "users//user123",
-			wantErr: true,
-			errMsg:  "must have an even number of segments",
-		},
-		{
-			name:    "trailing slash document",
-			path:    "users/user123/",
-			wantErr: true,
-			errMsg:  "must have an even number of segments",
-		},
-		{
-			name:    "whitespace only document ID",
-			path:    "users/   ",
-			wantErr: true,
-			errMsg:  "segment cannot be only whitespace",
-		},
-		{
-			name:    "whitespace in middle segment",
-			path:    "users/user123/posts/ \t ",
-			wantErr: true,
-			errMsg:  "segment cannot be only whitespace",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := ValidateDocumentPath(tt.path)
-			if tt.wantErr {
-				if err == nil {
-					t.Errorf("ValidateDocumentPath(%q) expected error but got none", tt.path)
-				} else if tt.errMsg != "" && !strings.Contains(err.Error(), tt.errMsg) {
-					t.Errorf("ValidateDocumentPath(%q) error = %v, want error containing %q", tt.path, err, tt.errMsg)
-				}
-			} else {
-				if err != nil {
-					t.Errorf("ValidateDocumentPath(%q) unexpected error: %v", tt.path, err)
-				}
-			}
-		})
-	}
-}
--- a/internal/tools/looker/lookeradddashboardelement/lookeradddashboardelement.go
+++ b/internal/tools/looker/lookeradddashboardelement/lookeradddashboardelement.go
@@ -93,13 +93,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		AuthRequired:   cfg.AuthRequired,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -113,15 +112,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name           string `yaml:"name"`
-	Kind           string `yaml:"kind"`
-	UseClientOAuth bool
-	Client         *v4.LookerSDK
-	ApiSettings    *rtl.ApiSettings
-	AuthRequired   []string         `yaml:"authRequired"`
-	Parameters     tools.Parameters `yaml:"parameters"`
-	manifest       tools.Manifest
-	mcpManifest    tools.McpManifest
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 var (
@@ -148,15 +146,9 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	wq.VisConfig = &visConfig

 	qrespFields := "id"
-
-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
+	qresp, err := t.Client.CreateQuery(*wq, qrespFields, t.ApiSettings)
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
-
-	qresp, err := sdk.CreateQuery(*wq, qrespFields, t.ApiSettings)
-	if err != nil {
-		return nil, fmt.Errorf("error making create query request: %w", err)
+		return nil, fmt.Errorf("error making create query request: %s", err)
 	}

 	wde := v4.WriteDashboardElement{
@@ -178,9 +170,9 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		Fields: &fields,
 	}

-	resp, err := sdk.CreateDashboardElement(req, t.ApiSettings)
+	resp, err := t.Client.CreateDashboardElement(req, t.ApiSettings)
 	if err != nil {
-		return nil, fmt.Errorf("error making create dashboard element request: %w", err)
+		return nil, fmt.Errorf("error making create dashboard element request: %s", err)
 	}
 	logger.DebugContext(ctx, "resp = %v", resp)

@@ -208,5 +200,5 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
--- a/internal/tools/looker/lookercommon/lookercommon.go
+++ b/internal/tools/looker/lookercommon/lookercommon.go
@@ -15,67 +15,20 @@ package lookercommon

 import (
 	"context"
-	"crypto/tls"
 	"fmt"
-	"net/http"
 	"strings"

 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/util"
-	rtl "github.com/looker-open-source/sdk-codegen/go/rtl"
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 	"github.com/thlib/go-timezone-local/tzlocal"
 )

-// Make types for RoundTripper
-type transportWithAuthHeader struct {
-	Base      http.RoundTripper
-	AuthToken tools.AccessToken
-}
-
-func (t *transportWithAuthHeader) RoundTrip(req *http.Request) (*http.Response, error) {
-	req.Header.Set("x-looker-appid", "go-sdk")
-	req.Header.Set("Authorization", string(t.AuthToken))
-	return t.Base.RoundTrip(req)
-}
-
-func GetLookerSDK(useClientOAuth bool, config *rtl.ApiSettings, client *v4.LookerSDK, accessToken tools.AccessToken) (*v4.LookerSDK, error) {
-
-	if useClientOAuth {
-		if accessToken == "" {
-			return nil, fmt.Errorf("no access token supplied with request")
-		}
-		// Configure base transport with TLS
-		transport := &http.Transport{
-			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: !config.VerifySsl,
-			},
-		}
-
-		// Build transport for end user token
-		newTransport := &transportWithAuthHeader{
-			Base:      transport,
-			AuthToken: accessToken,
-		}
-
-		// return SDK with new Transport
-		return v4.NewLookerSDK(&rtl.AuthSession{
-			Config: *config,
-			Client: http.Client{Transport: newTransport},
-		}), nil
-	}
-
-	if client == nil {
-		return nil, fmt.Errorf("client id or client secret not valid")
-	}
-	return client, nil
-}
-
 const (
-	DimensionsFields = "fields(dimensions(name,type,label,label_short,description,synonyms,tags,hidden,suggestable,suggestions,suggest_dimension,suggest_explore))"
-	FiltersFields    = "fields(filters(name,type,label,label_short,description,synonyms,tags,hidden,suggestable,suggestions,suggest_dimension,suggest_explore))"
-	MeasuresFields   = "fields(measures(name,type,label,label_short,description,synonyms,tags,hidden,suggestable,suggestions,suggest_dimension,suggest_explore))"
-	ParametersFields = "fields(parameters(name,type,label,label_short,description,synonyms,tags,hidden,suggestable,suggestions,suggest_dimension,suggest_explore))"
+	DimensionsFields = "fields(dimensions(name,type,label,label_short,description,synonyms,tags,hidden))"
+	FiltersFields    = "fields(filters(name,type,label,label_short,description,synonyms,tags,hidden))"
+	MeasuresFields   = "fields(measures(name,type,label,label_short,description,synonyms,tags,hidden))"
+	ParametersFields = "fields(parameters(name,type,label,label_short,description,synonyms,tags,hidden))"
 )

 // ExtractLookerFieldProperties extracts common properties from Looker field objects.
@@ -118,21 +71,12 @@ func ExtractLookerFieldProperties(ctx context.Context, fields *[]v4.LookmlModelE
 		if v.Description != nil {
 			vMap["description"] = *v.Description
 		}
-		if v.Tags != nil && len(*v.Tags) > 0 {
+		if v.Tags != nil {
 			vMap["tags"] = *v.Tags
 		}
-		if v.Synonyms != nil && len(*v.Synonyms) > 0 {
+		if v.Synonyms != nil {
 			vMap["synonyms"] = *v.Synonyms
 		}
-		if v.Suggestable != nil && *v.Suggestable {
-			if v.Suggestions != nil && len(*v.Suggestions) > 0 {
-				vMap["suggestions"] = *v.Suggestions
-			}
-			if v.SuggestExplore != nil && v.SuggestDimension != nil {
-				vMap["suggest_explore"] = *v.SuggestExplore
-				vMap["suggest_dimension"] = *v.SuggestDimension
-			}
-		}
 		logger.DebugContext(ctx, "Converted to %v\n", vMap)
 		data = append(data, vMap)
 	}
--- a/internal/tools/looker/lookercommon/lookercommon_test.go
+++ b/internal/tools/looker/lookercommon/lookercommon_test.go
@@ -31,8 +31,6 @@ func TestExtractLookerFieldProperties(t *testing.T) {

 	// Helper function to create string pointers
 	stringPtr := func(s string) *string { return &s }
-	stringArrayPtr := func(s []string) *[]string { return &s }
-	boolPtr := func(b bool) *bool { return &b }

 	tcs := []struct {
 		desc   string
@@ -43,27 +41,20 @@ func TestExtractLookerFieldProperties(t *testing.T) {
 			desc: "field with all properties including description",
 			fields: []v4.LookmlModelExploreField{
 				{
-					Name:             stringPtr("dimension_name"),
-					Type:             stringPtr("string"),
-					Label:            stringPtr("Dimension Label"),
-					LabelShort:       stringPtr("Dim Label"),
-					Description:      stringPtr("This is a dimension description"),
-					Suggestable:      boolPtr(true),
-					SuggestExplore:   stringPtr("explore"),
-					SuggestDimension: stringPtr("dimension"),
-					Suggestions:      stringArrayPtr([]string{"foo", "bar", "baz"}),
+					Name:        stringPtr("dimension_name"),
+					Type:        stringPtr("string"),
+					Label:       stringPtr("Dimension Label"),
+					LabelShort:  stringPtr("Dim Label"),
+					Description: stringPtr("This is a dimension description"),
 				},
 			},
 			want: []any{
 				map[string]any{
-					"name":              "dimension_name",
-					"type":              "string",
-					"label":             "Dimension Label",
-					"label_short":       "Dim Label",
-					"description":       "This is a dimension description",
-					"suggest_explore":   "explore",
-					"suggest_dimension": "dimension",
-					"suggestions":       []string{"foo", "bar", "baz"},
+					"name":        "dimension_name",
+					"type":        "string",
+					"label":       "Dimension Label",
+					"label_short": "Dim Label",
+					"description": "This is a dimension description",
 				},
 			},
 		},
--- a/internal/tools/looker/lookergetdashboards/lookergetdashboards.go
+++ b/internal/tools/looker/lookergetdashboards/lookergetdashboards.go
@@ -21,7 +21,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	lookersrc "github.com/googleapis/genai-toolbox/internal/sources/looker"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/looker/lookercommon"
 	"github.com/googleapis/genai-toolbox/internal/util"

 	"github.com/looker-open-source/sdk-codegen/go/rtl"
@@ -91,13 +90,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		AuthRequired:   cfg.AuthRequired,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -111,15 +109,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name           string `yaml:"name"`
-	Kind           string `yaml:"kind"`
-	UseClientOAuth bool
-	Client         *v4.LookerSDK
-	ApiSettings    *rtl.ApiSettings
-	AuthRequired   []string         `yaml:"authRequired"`
-	Parameters     tools.Parameters `yaml:"parameters"`
-	manifest       tools.Manifest
-	mcpManifest    tools.McpManifest
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -141,10 +138,6 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	limit := int64(paramsMap["limit"].(int))
 	offset := int64(paramsMap["offset"].(int))

-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
 	req := v4.RequestSearchDashboards{
 		Title:       title_ptr,
 		Description: desc_ptr,
@@ -152,7 +145,7 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		Offset:      &offset,
 	}
 	logger.ErrorContext(ctx, "Making request %v", req)
-	resp, err := sdk.SearchDashboards(req, t.ApiSettings)
+	resp, err := t.Client.SearchDashboards(req, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making get_dashboards request: %s", err)
 	}
--- a/internal/tools/looker/lookergetdimensions/lookergetdimensions.go
+++ b/internal/tools/looker/lookergetdimensions/lookergetdimensions.go
@@ -82,13 +82,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		AuthRequired:   cfg.AuthRequired,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -105,7 +104,6 @@ var _ tools.Tool = Tool{}
 type Tool struct {
 	Name             string `yaml:"name"`
 	Kind             string `yaml:"kind"`
-	UseClientOAuth   bool
 	Client           *v4.LookerSDK
 	ApiSettings      *rtl.ApiSettings
 	AuthRequired     []string         `yaml:"authRequired"`
@@ -125,17 +123,13 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		return nil, fmt.Errorf("error processing model or explore: %w", err)
 	}

-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
 	fields := lookercommon.DimensionsFields
 	req := v4.RequestLookmlModelExplore{
 		LookmlModelName: *model,
 		ExploreName:     *explore,
 		Fields:          &fields,
 	}
-	resp, err := sdk.LookmlModelExplore(req, t.ApiSettings)
+	resp, err := t.Client.LookmlModelExplore(req, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making get_dimensions request: %w", err)
 	}
@@ -170,5 +164,5 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
--- a/internal/tools/looker/lookergetexplores/lookergetexplores.go
+++ b/internal/tools/looker/lookergetexplores/lookergetexplores.go
@@ -21,7 +21,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	lookersrc "github.com/googleapis/genai-toolbox/internal/sources/looker"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/looker/lookercommon"
 	"github.com/googleapis/genai-toolbox/internal/util"

 	"github.com/looker-open-source/sdk-codegen/go/rtl"
@@ -83,13 +82,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		AuthRequired:   cfg.AuthRequired,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -106,7 +104,6 @@ var _ tools.Tool = Tool{}
 type Tool struct {
 	Name               string `yaml:"name"`
 	Kind               string `yaml:"kind"`
-	UseClientOAuth     bool
 	Client             *v4.LookerSDK
 	ApiSettings        *rtl.ApiSettings
 	AuthRequired       []string         `yaml:"authRequired"`
@@ -127,11 +124,7 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		return nil, fmt.Errorf("'model' must be a string, got %T", mapParams["model"])
 	}

-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
-	resp, err := sdk.LookmlModel(model, "explores(name,description,label,group_label,hidden)", t.ApiSettings)
+	resp, err := t.Client.LookmlModel(model, "explores(name,description,label,group_label,hidden)", t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making get_explores request: %s", err)
 	}
@@ -180,5 +173,5 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
--- a/internal/tools/looker/lookergetfilters/lookergetfilters.go
+++ b/internal/tools/looker/lookergetfilters/lookergetfilters.go
@@ -82,13 +82,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		AuthRequired:   cfg.AuthRequired,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -105,7 +104,6 @@ var _ tools.Tool = Tool{}
 type Tool struct {
 	Name             string `yaml:"name"`
 	Kind             string `yaml:"kind"`
-	UseClientOAuth   bool
 	Client           *v4.LookerSDK
 	ApiSettings      *rtl.ApiSettings
 	AuthRequired     []string         `yaml:"authRequired"`
@@ -126,16 +124,12 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	}

 	fields := lookercommon.FiltersFields
-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
 	req := v4.RequestLookmlModelExplore{
 		LookmlModelName: *model,
 		ExploreName:     *explore,
 		Fields:          &fields,
 	}
-	resp, err := sdk.LookmlModelExplore(req, t.ApiSettings)
+	resp, err := t.Client.LookmlModelExplore(req, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making get_filters request: %w", err)
 	}
@@ -170,5 +164,5 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
--- a/internal/tools/looker/lookergetlooks/lookergetlooks.go
+++ b/internal/tools/looker/lookergetlooks/lookergetlooks.go
@@ -21,7 +21,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	lookersrc "github.com/googleapis/genai-toolbox/internal/sources/looker"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/looker/lookercommon"
 	"github.com/googleapis/genai-toolbox/internal/util"

 	"github.com/looker-open-source/sdk-codegen/go/rtl"
@@ -91,13 +90,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		AuthRequired:   cfg.AuthRequired,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -111,15 +109,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name           string `yaml:"name"`
-	Kind           string `yaml:"kind"`
-	UseClientOAuth bool
-	Client         *v4.LookerSDK
-	ApiSettings    *rtl.ApiSettings
-	AuthRequired   []string         `yaml:"authRequired"`
-	Parameters     tools.Parameters `yaml:"parameters"`
-	manifest       tools.Manifest
-	mcpManifest    tools.McpManifest
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -141,17 +138,13 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	limit := int64(paramsMap["limit"].(int))
 	offset := int64(paramsMap["offset"].(int))

-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
 	req := v4.RequestSearchLooks{
 		Title:       title_ptr,
 		Description: desc_ptr,
 		Limit:       &limit,
 		Offset:      &offset,
 	}
-	resp, err := sdk.SearchLooks(req, t.ApiSettings)
+	resp, err := t.Client.SearchLooks(req, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making get_looks request: %s", err)
 	}
@@ -195,5 +188,5 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
--- a/internal/tools/looker/lookergetmeasures/lookergetmeasures.go
+++ b/internal/tools/looker/lookergetmeasures/lookergetmeasures.go
@@ -82,13 +82,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		AuthRequired:   cfg.AuthRequired,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -105,7 +104,6 @@ var _ tools.Tool = Tool{}
 type Tool struct {
 	Name             string `yaml:"name"`
 	Kind             string `yaml:"kind"`
-	UseClientOAuth   bool
 	Client           *v4.LookerSDK
 	ApiSettings      *rtl.ApiSettings
 	AuthRequired     []string         `yaml:"authRequired"`
@@ -126,16 +124,12 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	}

 	fields := lookercommon.MeasuresFields
-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
 	req := v4.RequestLookmlModelExplore{
 		LookmlModelName: *model,
 		ExploreName:     *explore,
 		Fields:          &fields,
 	}
-	resp, err := sdk.LookmlModelExplore(req, t.ApiSettings)
+	resp, err := t.Client.LookmlModelExplore(req, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making get_measures request: %w", err)
 	}
@@ -170,5 +164,5 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
--- a/internal/tools/looker/lookergetmodels/lookergetmodels.go
+++ b/internal/tools/looker/lookergetmodels/lookergetmodels.go
@@ -21,7 +21,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	lookersrc "github.com/googleapis/genai-toolbox/internal/sources/looker"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/looker/lookercommon"
 	"github.com/googleapis/genai-toolbox/internal/util"

 	"github.com/looker-open-source/sdk-codegen/go/rtl"
@@ -82,13 +81,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		AuthRequired:   cfg.AuthRequired,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -105,7 +103,6 @@ var _ tools.Tool = Tool{}
 type Tool struct {
 	Name             string `yaml:"name"`
 	Kind             string `yaml:"kind"`
-	UseClientOAuth   bool
 	Client           *v4.LookerSDK
 	ApiSettings      *rtl.ApiSettings
 	AuthRequired     []string         `yaml:"authRequired"`
@@ -125,16 +122,12 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	excludeHidden := !t.ShowHiddenModels
 	includeInternal := true

-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
 	req := v4.RequestAllLookmlModels{
 		ExcludeEmpty:    &excludeEmpty,
 		ExcludeHidden:   &excludeHidden,
 		IncludeInternal: &includeInternal,
 	}
-	resp, err := sdk.AllLookmlModels(req, t.ApiSettings)
+	resp, err := t.Client.AllLookmlModels(req, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making get_models request: %s", err)
 	}
@@ -171,5 +164,5 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
--- a/internal/tools/looker/lookergetparameters/lookergetparameters.go
+++ b/internal/tools/looker/lookergetparameters/lookergetparameters.go
@@ -82,13 +82,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		AuthRequired:   cfg.AuthRequired,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -105,7 +104,6 @@ var _ tools.Tool = Tool{}
 type Tool struct {
 	Name             string `yaml:"name"`
 	Kind             string `yaml:"kind"`
-	UseClientOAuth   bool
 	Client           *v4.LookerSDK
 	ApiSettings      *rtl.ApiSettings
 	AuthRequired     []string         `yaml:"authRequired"`
@@ -126,16 +124,12 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	}

 	fields := lookercommon.ParametersFields
-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
 	req := v4.RequestLookmlModelExplore{
 		LookmlModelName: *model,
 		ExploreName:     *explore,
 		Fields:          &fields,
 	}
-	resp, err := sdk.LookmlModelExplore(req, t.ApiSettings)
+	resp, err := t.Client.LookmlModelExplore(req, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making get_parameters request: %w", err)
 	}
@@ -170,5 +164,5 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
--- a/internal/tools/looker/lookermakedashboard/lookermakedashboard.go
+++ b/internal/tools/looker/lookermakedashboard/lookermakedashboard.go
@@ -23,7 +23,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	lookersrc "github.com/googleapis/genai-toolbox/internal/sources/looker"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/looker/lookercommon"
 	"github.com/googleapis/genai-toolbox/internal/util"

 	"github.com/looker-open-source/sdk-codegen/go/rtl"
@@ -89,13 +88,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		AuthRequired:   cfg.AuthRequired,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -109,15 +107,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name           string `yaml:"name"`
-	Kind           string `yaml:"kind"`
-	UseClientOAuth bool
-	Client         *v4.LookerSDK
-	ApiSettings    *rtl.ApiSettings
-	AuthRequired   []string         `yaml:"authRequired"`
-	Parameters     tools.Parameters `yaml:"parameters"`
-	manifest       tools.Manifest
-	mcpManifest    tools.McpManifest
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -127,12 +124,8 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	}
 	logger.DebugContext(ctx, "params = ", params)

-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
 	mrespFields := "id,personal_folder_id"
-	mresp, err := sdk.Me(mrespFields, t.ApiSettings)
+	mresp, err := t.Client.Me(mrespFields, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making me request: %s", err)
 	}
@@ -145,7 +138,7 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		return nil, fmt.Errorf("user does not have a personal folder. cannot continue")
 	}

-	dashs, err := sdk.FolderDashboards(*mresp.PersonalFolderId, "title", t.ApiSettings)
+	dashs, err := t.Client.FolderDashboards(*mresp.PersonalFolderId, "title", t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error getting existing dashboards in folder: %s", err)
 	}
@@ -164,13 +157,13 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		Description: &description,
 		FolderId:    mresp.PersonalFolderId,
 	}
-	resp, err := sdk.CreateDashboard(wd, t.ApiSettings)
+	resp, err := t.Client.CreateDashboard(wd, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making create dashboard request: %s", err)
 	}
 	logger.DebugContext(ctx, "resp = %v", resp)

-	setting, err := sdk.GetSetting("host_url", t.ApiSettings)
+	setting, err := t.Client.GetSetting("host_url", t.ApiSettings)
 	if err != nil {
 		logger.ErrorContext(ctx, "error getting settings: %s", err)
 	}
@@ -208,5 +201,5 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
--- a/internal/tools/looker/lookermakelook/lookermakelook.go
+++ b/internal/tools/looker/lookermakelook/lookermakelook.go
@@ -95,13 +95,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		AuthRequired:   cfg.AuthRequired,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -115,15 +114,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name           string `yaml:"name"`
-	Kind           string `yaml:"kind"`
-	UseClientOAuth bool
-	Client         *v4.LookerSDK
-	ApiSettings    *rtl.ApiSettings
-	AuthRequired   []string         `yaml:"authRequired"`
-	Parameters     tools.Parameters `yaml:"parameters"`
-	manifest       tools.Manifest
-	mcpManifest    tools.McpManifest
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -137,12 +135,8 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		return nil, fmt.Errorf("error building query request: %w", err)
 	}

-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
 	mrespFields := "id,personal_folder_id"
-	mresp, err := sdk.Me(mrespFields, t.ApiSettings)
+	mresp, err := t.Client.Me(mrespFields, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making me request: %s", err)
 	}
@@ -151,7 +145,7 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	title := paramsMap["title"].(string)
 	description := paramsMap["description"].(string)

-	looks, err := sdk.FolderLooks(*mresp.PersonalFolderId, "title", t.ApiSettings)
+	looks, err := t.Client.FolderLooks(*mresp.PersonalFolderId, "title", t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error getting existing looks in folder: %s", err)
 	}
@@ -169,7 +163,7 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	wq.VisConfig = &visConfig

 	qrespFields := "id"
-	qresp, err := sdk.CreateQuery(*wq, qrespFields, t.ApiSettings)
+	qresp, err := t.Client.CreateQuery(*wq, qrespFields, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making create query request: %s", err)
 	}
@@ -181,13 +175,13 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 		QueryId:     qresp.Id,
 		FolderId:    mresp.PersonalFolderId,
 	}
-	resp, err := sdk.CreateLook(wlwq, "", t.ApiSettings)
+	resp, err := t.Client.CreateLook(wlwq, "", t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making create look request: %s", err)
 	}
 	logger.DebugContext(ctx, "resp = %v", resp)

-	setting, err := sdk.GetSetting("host_url", t.ApiSettings)
+	setting, err := t.Client.GetSetting("host_url", t.ApiSettings)
 	if err != nil {
 		logger.ErrorContext(ctx, "error getting settings: %s", err)
 	}
@@ -225,5 +219,5 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
--- a/internal/tools/looker/lookerquery/lookerquery.go
+++ b/internal/tools/looker/lookerquery/lookerquery.go
@@ -83,13 +83,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		AuthRequired:   cfg.AuthRequired,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -103,15 +102,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name           string `yaml:"name"`
-	Kind           string `yaml:"kind"`
-	UseClientOAuth bool
-	Client         *v4.LookerSDK
-	ApiSettings    *rtl.ApiSettings
-	AuthRequired   []string         `yaml:"authRequired"`
-	Parameters     tools.Parameters `yaml:"parameters"`
-	manifest       tools.Manifest
-	mcpManifest    tools.McpManifest
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -123,15 +121,11 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	if err != nil {
 		return nil, fmt.Errorf("error building WriteQuery request: %w", err)
 	}
-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
 	req := v4.RequestRunInlineQuery{
 		Body:         *wq,
 		ResultFormat: "json",
 	}
-	resp, err := sdk.RunInlineQuery(req, t.ApiSettings)
+	resp, err := t.Client.RunInlineQuery(req, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making query request: %s", err)
 	}
@@ -165,5 +159,5 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
--- a/internal/tools/looker/lookerquerysql/lookerquerysql.go
+++ b/internal/tools/looker/lookerquerysql/lookerquerysql.go
@@ -82,13 +82,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		AuthRequired:   cfg.AuthRequired,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -102,15 +101,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name           string `yaml:"name"`
-	Kind           string `yaml:"kind"`
-	UseClientOAuth bool
-	Client         *v4.LookerSDK
-	ApiSettings    *rtl.ApiSettings
-	AuthRequired   []string         `yaml:"authRequired"`
-	Parameters     tools.Parameters `yaml:"parameters"`
-	manifest       tools.Manifest
-	mcpManifest    tools.McpManifest
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -122,15 +120,11 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	if err != nil {
 		return nil, fmt.Errorf("error building query request: %w", err)
 	}
-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
 	req := v4.RequestRunInlineQuery{
 		Body:         *wq,
 		ResultFormat: "sql",
 	}
-	resp, err := sdk.RunInlineQuery(req, t.ApiSettings)
+	resp, err := t.Client.RunInlineQuery(req, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making query_sql request: %s", err)
 	}
@@ -156,5 +150,5 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
--- a/internal/tools/looker/lookerqueryurl/lookerqueryurl.go
+++ b/internal/tools/looker/lookerqueryurl/lookerqueryurl.go
@@ -89,13 +89,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		AuthRequired:   cfg.AuthRequired,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -109,15 +108,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name           string `yaml:"name"`
-	Kind           string `yaml:"kind"`
-	UseClientOAuth bool
-	Client         *v4.LookerSDK
-	ApiSettings    *rtl.ApiSettings
-	AuthRequired   []string         `yaml:"authRequired"`
-	Parameters     tools.Parameters `yaml:"parameters"`
-	manifest       tools.Manifest
-	mcpManifest    tools.McpManifest
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -135,12 +133,8 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	visConfig := paramsMap["vis_config"].(map[string]any)
 	wq.VisConfig = &visConfig

-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
 	respFields := "id,slug,share_url,expanded_share_url"
-	resp, err := sdk.CreateQuery(*wq, respFields, t.ApiSettings)
+	resp, err := t.Client.CreateQuery(*wq, respFields, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making query request: %s", err)
 	}
@@ -181,5 +175,5 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
--- a/internal/tools/looker/lookerrunlook/lookerrunlook.go
+++ b/internal/tools/looker/lookerrunlook/lookerrunlook.go
@@ -22,7 +22,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	lookersrc "github.com/googleapis/genai-toolbox/internal/sources/looker"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/looker/lookercommon"
 	"github.com/googleapis/genai-toolbox/internal/util"

 	"github.com/looker-open-source/sdk-codegen/go/rtl"
@@ -89,13 +88,12 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)

 	// finish tool setup
 	return Tool{
-		Name:           cfg.Name,
-		Kind:           kind,
-		Parameters:     parameters,
-		AuthRequired:   cfg.AuthRequired,
-		UseClientOAuth: s.UseClientOAuth,
-		Client:         s.Client,
-		ApiSettings:    s.ApiSettings,
+		Name:         cfg.Name,
+		Kind:         kind,
+		Parameters:   parameters,
+		AuthRequired: cfg.AuthRequired,
+		Client:       s.Client,
+		ApiSettings:  s.ApiSettings,
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   parameters.Manifest(),
@@ -109,15 +107,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 var _ tools.Tool = Tool{}

 type Tool struct {
-	Name           string `yaml:"name"`
-	Kind           string `yaml:"kind"`
-	UseClientOAuth bool
-	Client         *v4.LookerSDK
-	ApiSettings    *rtl.ApiSettings
-	AuthRequired   []string         `yaml:"authRequired"`
-	Parameters     tools.Parameters `yaml:"parameters"`
-	manifest       tools.Manifest
-	mcpManifest    tools.McpManifest
+	Name         string `yaml:"name"`
+	Kind         string `yaml:"kind"`
+	Client       *v4.LookerSDK
+	ApiSettings  *rtl.ApiSettings
+	AuthRequired []string         `yaml:"authRequired"`
+	Parameters   tools.Parameters `yaml:"parameters"`
+	manifest     tools.Manifest
+	mcpManifest  tools.McpManifest
 }

 func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken tools.AccessToken) (any, error) {
@@ -131,16 +128,12 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 	look_id := paramsMap["look_id"].(string)
 	limit := int64(paramsMap["limit"].(int))

-	sdk, err := lookercommon.GetLookerSDK(t.UseClientOAuth, t.ApiSettings, t.Client, accessToken)
-	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
-	}
 	req := v4.RequestRunLook{
 		LookId:       look_id,
 		ResultFormat: "json",
 		Limit:        &limit,
 	}
-	resp, err := sdk.RunLook(req, t.ApiSettings)
+	resp, err := t.Client.RunLook(req, t.ApiSettings)
 	if err != nil {
 		return nil, fmt.Errorf("error making run_look request: %s", err)
 	}
@@ -174,5 +167,5 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }

 func (t Tool) RequiresClientAuthorization() bool {
-	return t.UseClientOAuth
+	return false
 }
--- a/internal/tools/oceanbase/oceanbaseexecutesql/oceanbaseexecutesql.go
+++ b/internal/tools/oceanbase/oceanbaseexecutesql/oceanbaseexecutesql.go
@@ -23,7 +23,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/oceanbase"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlcommon"
 )

 const kind string = "oceanbase-execute-sql"
@@ -160,10 +159,13 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 				continue
 			}

-			// oceanbase uses mysql driver
-			vMap[name], err = mysqlcommon.ConvertToType(colTypes[i], val)
-			if err != nil {
-				return nil, fmt.Errorf("errors encountered when converting values: %w", err)
+			// oceanbase driver returns []uint8 type for "TEXT", "VARCHAR", and "NVARCHAR"
+			// we'll need to cast it back to string
+			switch colTypes[i].DatabaseTypeName() {
+			case "TEXT", "VARCHAR", "NVARCHAR":
+				vMap[name] = string(val.([]byte))
+			default:
+				vMap[name] = val
 			}
 		}
 		out = append(out, vMap)
--- a/internal/tools/oceanbase/oceanbasesql/oceanbasesql.go
+++ b/internal/tools/oceanbase/oceanbasesql/oceanbasesql.go
@@ -23,7 +23,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/oceanbase"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlcommon"
 )

 const kind string = "oceanbase-sql"
@@ -177,10 +176,13 @@ func (t Tool) Invoke(ctx context.Context, params tools.ParamValues, accessToken
 				continue
 			}

-			// oceanbase uses mysql driver
-			vMap[name], err = mysqlcommon.ConvertToType(colTypes[i], val)
-			if err != nil {
-				return nil, fmt.Errorf("errors encountered when converting values: %w", err)
+			// oceanbase driver returns []uint8 type for "TEXT", "VARCHAR", and "NVARCHAR"
+			// we'll need to cast it back to string
+			switch colTypes[i].DatabaseTypeName() {
+			case "TEXT", "VARCHAR", "NVARCHAR":
+				vMap[name] = string(val.([]byte))
+			default:
+				vMap[name] = val
 			}
 		}
 		out = append(out, vMap)
--- a/internal/tools/redis/redis.go
+++ b/internal/tools/redis/redis.go
@@ -16,6 +16,7 @@ package redis
 import (
 	"context"
 	"fmt"
+	"strings"

 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/sources"
@@ -193,21 +194,32 @@ func replaceCommandsParams(commands [][]string, params tools.Parameters, paramVa
 	for i, cmd := range commands {
 		newCmd := make([]any, 0)
 		for _, part := range cmd {
-			v, ok := paramMap[part]
-			if !ok {
-				// Command part is not a Parameter placeholder
-				newCmd = append(newCmd, part)
-				continue
+			replaced := part
+			isArray := false
+			var arrayItems []any
+
+			if v, ok := paramMap[part]; ok {
+				if typeMap[part] == "array" {
+					isArray = true
+					arrayItems = v.([]any)
+				} else {
+					replaced = fmt.Sprintf("%v", v)
+				}
+			} else {
+				for placeholder, v := range paramMap {
+					replaced = strings.ReplaceAll(replaced, placeholder, fmt.Sprintf("%v", v))
+				}
 			}
-			if typeMap[part] == "array" {
-				for _, item := range v.([]any) {
+
+			if isArray {
+				for _, item := range arrayItems {
 					// Nested arrays will only be expanded once
 					// e.g., [A, [B, C]]  --> ["A", "[B C]"]
 					newCmd = append(newCmd, fmt.Sprintf("%s", item))
 				}
 				continue
 			}
-			newCmd = append(newCmd, fmt.Sprintf("%s", v))
+			newCmd = append(newCmd, replaced)
 		}
 		newCommands[i] = newCmd
 	}
--- a/tests/clickhouse/clickhouse_integration_test.go
+++ b/tests/clickhouse/clickhouse_integration_test.go
@@ -147,10 +147,10 @@ func TestClickHouse(t *testing.T) {
 		t.Fatalf("toolbox didn't start successfully: %s", err)
 	}

-	// Get configs for tests
+    // Get configs for tests
 	select1Want, mcpSelect1Want, mcpMyFailToolWant, createTableStatement, nilIdWant := getClickHouseWants()

-	// Run tests
+    // Run tests
 	tests.RunToolGetTest(t)
 	tests.RunToolInvokeTest(t, select1Want, tests.WithMyToolById4Want(nilIdWant))
 	tests.RunExecuteSqlToolInvokeTest(t, createTableStatement, select1Want)
--- a/tests/looker/looker_integration_test.go
+++ b/tests/looker/looker_integration_test.go
@@ -624,10 +624,10 @@ func TestLooker(t *testing.T) {
 	wantResult = "{\"description\":\"Data about Look and dashboard usage, including frequency of views, favoriting, scheduling, embedding, and access via the API. Also includes details about individual Looks and dashboards.\",\"group_label\":\"System Activity\",\"label\":\"Content Usage\",\"name\":\"content_usage\"}"
 	tests.RunToolInvokeParametersTest(t, "get_explores", []byte(`{"model": "system__activity"}`), wantResult)

-	wantResult = "{\"description\":\"Number of times this content has been viewed via the Looker API\",\"label\":\"Content Usage API Count\",\"label_short\":\"API Count\",\"name\":\"content_usage.api_count\",\"type\":\"number\"}"
+	wantResult = "{\"description\":\"Number of times this content has been viewed via the Looker API\",\"label\":\"Content Usage API Count\",\"label_short\":\"API Count\",\"name\":\"content_usage.api_count\",\"synonyms\":[],\"tags\":[],\"type\":\"number\"}"
 	tests.RunToolInvokeParametersTest(t, "get_dimensions", []byte(`{"model": "system__activity", "explore": "content_usage"}`), wantResult)

-	wantResult = "{\"description\":\"The total number of views via the Looker API\",\"label\":\"Content Usage API Total\",\"label_short\":\"API Total\",\"name\":\"content_usage.api_total\",\"type\":\"sum\"}"
+	wantResult = "{\"description\":\"The total number of views via the Looker API\",\"label\":\"Content Usage API Total\",\"label_short\":\"API Total\",\"name\":\"content_usage.api_total\",\"synonyms\":[],\"tags\":[],\"type\":\"sum\"}"
 	tests.RunToolInvokeParametersTest(t, "get_measures", []byte(`{"model": "system__activity", "explore": "content_usage"}`), wantResult)

 	wantResult = "[]"
Author	SHA1	Message	Date
Anmol Shukla	b58d959de1	Merge branch 'main' into fix-922	2025-09-02 15:49:27 +05:30
Anmol Shukla	8c532476e0	Merge branch 'main' into fix-922	2025-08-28 15:07:19 +05:30
Anmol Shukla	b8b59f0a4d	Merge branch 'main' into fix-922	2025-08-25 11:03:02 +05:30
Anmol Shukla	ec6942c94b	Merge branch 'main' into fix-922	2025-08-20 15:08:25 +05:30
Anmol Shukla	c92e84f869	Merge branch 'main' into fix-922	2025-08-19 14:27:32 +05:30
Anmol Shukla	0f30709050	improve parameter substitution	2025-08-18 10:50:21 +05:30
Anmol Shukla	175277fcad	fix: FT.SEARCH command fails with "Syntax error" on a parameterized query for Redis DB [Docker image].	2025-08-18 10:50:21 +05:30