Merge branch 'main' into blog

Co-authored-by: Averi Kitsch <akitsch@google.com>

.ci/continuous.release.cloudbuild.yaml

@@ -17,15 +17,8 @@ steps:
     waitFor: ['-']
     script: |
         #!/usr/bin/env bash
-        docker buildx build --build-arg METADATA_TAGS=$(git rev-parse HEAD) -t ${_DOCKER_URI}:$REF_NAME .
-
-  - id: "push-docker"
-    name: "gcr.io/cloud-builders/docker"
-    waitFor:
-      - "build-docker"
-    script: |
-        #!/usr/bin/env bash
-        docker push ${_DOCKER_URI}:$REF_NAME
+        docker buildx create --name container-builder --driver docker-container --bootstrap --use
+        docker buildx build --platform linux/amd64,linux/arm64 --build-arg COMMIT_SHA=$(git rev-parse HEAD) -t ${_DOCKER_URI}:$REF_NAME --push .
 
   - id: "install-dependencies"
     name: golang:1
@@ -50,7 +43,7 @@ steps:
     script: |
         #!/usr/bin/env bash
         CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.linux.amd64.$REF_NAME" -o toolbox.linux.amd64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.linux.amd64
 
   - id: "store-linux-amd64"
     name: "gcr.io/cloud-builders/gcloud:latest"
@@ -72,7 +65,7 @@ steps:
     script: |
         #!/usr/bin/env bash
         CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.darwin.arm64.$REF_NAME" -o toolbox.darwin.arm64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.darwin.arm64
 
   - id: "store-darwin-arm64"
     name: "gcr.io/cloud-builders/gcloud:latest"
@@ -94,7 +87,7 @@ steps:
     script: |
         #!/usr/bin/env bash
         CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.darwin.amd64.$REF_NAME" -o toolbox.darwin.amd64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.darwin.amd64
 
   - id: "store-darwin-amd64"
     name: "gcr.io/cloud-builders/gcloud:latest"
@@ -116,7 +109,7 @@ steps:
     script: |
         #!/usr/bin/env bash
         CGO_ENABLED=0 GOOS=windows GOARCH=amd64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.windows.amd64.$REF_NAME" -o toolbox.windows.amd64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.windows.amd64
 
   - id: "store-windows-amd64"
     name: "gcr.io/cloud-builders/gcloud:latest"
@@ -124,12 +117,13 @@ steps:
       - "build-windows-amd64"
     script: |
         #!/usr/bin/env bash
-        gcloud storage cp toolbox.windows.amd64 gs://$_BUCKET_NAME/$REF_NAME/windows/amd64/toolbox
+        gcloud storage cp toolbox.windows.amd64 gs://$_BUCKET_NAME/$REF_NAME/windows/amd64/toolbox.exe
 
 options:
   automapSubstitutions: true
   dynamicSubstitutions: true
   logging: CLOUD_LOGGING_ONLY # Necessary for custom service account
+  machineType: 'E2_HIGHCPU_32'
 
 substitutions:
   _REGION: us-central1

.ci/generate_release_table.sh

@@ -11,20 +11,37 @@ fi
 FILES=("linux.amd64" "darwin.arm64" "darwin.amd64" "windows.amd64")
 output_string=""
 
+# Define the descriptions - ensure this array's order matches FILES
+DESCRIPTIONS=(
+    "For **Linux** systems running on **Intel/AMD 64-bit processors**."
+    "For **macOS** systems running on **Apple Silicon** (M1, M2, M3, etc.) processors."
+    "For **macOS** systems running on **Intel processors**."
+    "For **Windows** systems running on **Intel/AMD 64-bit processors**."
+)
+
 # Write the table header
-ROW_FMT="| %-93s | %73s |"
-output_string+=$(printf "$ROW_FMT" "**os/arch**" "**sha256**")$'\n'
-output_string+=$(printf "$ROW_FMT" $(printf -- '-%0.s' {1..93}) $(printf -- '-%0.s' {1..73}))$'\n'
+ROW_FMT="| %-105s | %-120s | %-67s |\n"
+output_string+=$(printf "$ROW_FMT" "**OS/Architecture**" "**Description**" "**SHA256 Hash**")$'\n'
+output_string+=$(printf "$ROW_FMT" "$(printf -- '-%0.s' {1..105})" "$(printf -- '-%0.s' {1..120})" "$(printf -- '-%0.s' {1..67})")$'\n'
+
 
 # Loop through all files matching the pattern "toolbox.*.*"
-for file in "${FILES[@]}"
+for i in "${!FILES[@]}"
 do
+    file_key="${FILES[$i]}" # e.g., "linux.amd64"
+    description_text="${DESCRIPTIONS[$i]}"
+
     # Extract OS and ARCH from the filename
-    OS=$(echo "$file" | cut -d '.' -f 1)
-    ARCH=$(echo "$file" | cut -d '.' -f 2)
+    OS=$(echo "$file_key" | cut -d '.' -f 1)
+    ARCH=$(echo "$file_key" | cut -d '.' -f 2)
 
     # Get release URL
-    URL=https://storage.googleapis.com/genai-toolbox/$VERSION/$OS/$ARCH/toolbox
+    if [ "$OS" = 'windows' ];
+    then
+        URL="https://storage.googleapis.com/genai-toolbox/$VERSION/$OS/$ARCH/toolbox.exe"
+    else
+        URL="https://storage.googleapis.com/genai-toolbox/$VERSION/$OS/$ARCH/toolbox"
+    fi
 
     curl "$URL" --fail --output toolbox || exit 1
 
@@ -32,10 +49,10 @@ do
     SHA256=$(shasum -a 256 toolbox | awk '{print $1}')
 
     # Write the table row
-    # output_string+="| [$OS/$ARCH]($URL)   | $SHA256 |\n"
-    output_string+=$(printf "$ROW_FMT" "[$OS/$ARCH]($URL)" "$SHA256")$'\n'
+    output_string+=$(printf "$ROW_FMT" "[$OS/$ARCH]($URL)" "$description_text" "$SHA256")$'\n'
 
     rm toolbox
 done
+
 printf "$output_string\n"
 

.ci/integration.cloudbuild.yaml

@@ -24,9 +24,20 @@ steps:
     script: |
       go get -d ./...
 
-  - id: "cloud-sql-pg"
+  - id: "compile-test-binary"
     name: golang:1
     waitFor: ["install-dependencies"]
+    env:
+      - "GOPATH=/gopath"
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    script: |
+      go test -c -race ./tests/...
+
+  - id: "cloud-sql-pg"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
     entrypoint: /bin/bash
     env:
       - "GOPATH=/gopath"
@@ -43,11 +54,11 @@ steps:
     args:
       - -c
       - |
-        go test -race -v -tags=integration,cloudsqlpg ./tests
+        ./cloudsqlpg.test -test.v
 
   - id: "alloydb-pg"
     name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
     entrypoint: /bin/bash
     env:
       - "GOPATH=/gopath"
@@ -64,11 +75,68 @@ steps:
     args:
       - -c
       - |
-        go test -race -v -tags=integration,alloydb ./tests
+        ./alloydbpg.test -test.v
+
+  - id: "alloydb-ai-nl"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "ALLOYDB_AI_NL_PROJECT=$PROJECT_ID"
+      - "ALLOYDB_AI_NL_CLUSTER=$_ALLOYDB_AI_NL_CLUSTER"
+      - "ALLOYDB_AI_NL_INSTANCE=$_ALLOYDB_AI_NL_INSTANCE"
+      - "ALLOYDB_AI_NL_DATABASE=$_DATABASE_NAME"
+      - "ALLOYDB_AI_NL_REGION=$_REGION"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["ALLOYDB_AI_NL_USER", "ALLOYDB_AI_NL_PASS", "CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        ./alloydbainl.test -test.v
+
+  - id: "bigtable"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "BIGTABLE_PROJECT=$PROJECT_ID"
+      - "BIGTABLE_INSTANCE=$_BIGTABLE_INSTANCE"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv:
+      ["CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        ./bigtable.test -test.v
+
+  - id: "bigquery"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "BIGQUERY_PROJECT=$PROJECT_ID"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        ./bigquery.test -test.v
 
   - id: "postgres"
     name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
     entrypoint: /bin/bash
     env:
       - "GOPATH=/gopath"
@@ -83,28 +151,30 @@ steps:
     args:
       - -c
       - |
-        go test -race -v -tags=integration,postgres ./tests
+        ./postgres.test -test.v
 
   - id: "spanner"
     name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
     entrypoint: /bin/bash
     env:
       - "GOPATH=/gopath"
       - "SPANNER_PROJECT=$PROJECT_ID"
       - "SPANNER_DATABASE=$_DATABASE_NAME"
       - "SPANNER_INSTANCE=$_SPANNER_INSTANCE"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["CLIENT_ID"]
     volumes:
       - name: "go"
         path: "/gopath"
     args:
       - -c
       - |
-        go test -race -v -tags=integration,spanner ./tests
+        ./spanner.test -test.v
 
   - id: "neo4j"
     name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
     entrypoint: /bin/bash
     env:
       - "GOPATH=/gopath"
@@ -117,11 +187,11 @@ steps:
     args:
       - -c
       - |
-        go test -race -v -tags=integration,neo4j ./tests
+        ./neo4j.test -test.v
 
   - id: "cloud-sql-mssql"
     name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
     entrypoint: /bin/bash
     env:
       - "GOPATH=/gopath"
@@ -138,11 +208,11 @@ steps:
     args:
       - -c
       - |
-        go test -race -v -tags=integration,cloudsqlmssql ./tests
+        ./cloudsqlmssql.test -test.v
 
   - id: "cloud-sql-mysql"
     name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
     entrypoint: /bin/bash
     env:
       - "GOPATH=/gopath"
@@ -159,11 +229,11 @@ steps:
     args:
       - -c
       - |
-        go test -race -v -tags=integration,cloudsqlmysql ./tests
+        ./cloudsqlmysql.test -test.v
 
   - id: "mysql"
     name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
     entrypoint: /bin/bash
     env:
       - "GOPATH=/gopath"
@@ -178,11 +248,11 @@ steps:
     args:
       - -c
       - |
-        go test -race -v -tags=integration,mysql ./tests
+        ./mysql.test -test.v
 
   - id: "mssql"
     name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
     entrypoint: /bin/bash
     env:
       - "GOPATH=/gopath"
@@ -197,11 +267,11 @@ steps:
     args:
       - -c
       - |
-        go test -race -v -tags=integration,mssql ./tests
+        ./mssql.test -test.v
 
   - id: "dgraph"
     name: golang:1
-    waitFor: ["install-dependencies"]
+    waitFor: ["compile-test-binary"]
     entrypoint: /bin/bash
     env:
       - "GOPATH=/gopath"
@@ -212,7 +282,90 @@ steps:
     args:
       - -c
       - |
-        go test -race -v -tags=integration,dgraph ./tests
+        ./dgraph.test -test.v
+
+  - id: "http"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+    secretEnv: ["CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        ./http.test -test.v
+
+  - id: "sqlite"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    secretEnv: ["CLIENT_ID"]
+    args:
+      - -c
+      - |
+        ./sqlite.test -test.v
+
+  - id: "couchbase"
+    name : golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "COUCHBASE_SCOPE=$_COUCHBASE_SCOPE"
+      - "COUCHBASE_BUCKET=$_COUCHBASE_BUCKET"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["COUCHBASE_CONNECTION", "COUCHBASE_USER", "COUCHBASE_PASS", "CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        ./couchbase.test -test.v
+
+  - id: "redis"
+    name : golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["REDIS_ADDRESS", "REDIS_PASS", "CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        ./redis.test -test.v
+        
+  - id: "valkey"
+    name : golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "VALKEY_DATABASE=$_VALKEY_DATABASE"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["VALKEY_ADDRESS", "CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        ./valkey.test -test.v
+    
 
 availableSecrets:
   secretManager:
@@ -224,6 +377,10 @@ availableSecrets:
       env: ALLOYDB_POSTGRES_USER
     - versionName: projects/$PROJECT_ID/secrets/alloydb_pg_pass/versions/latest
       env: ALLOYDB_POSTGRES_PASS
+    - versionName: projects/$PROJECT_ID/secrets/alloydb_ai_nl_user/versions/latest
+      env: ALLOYDB_AI_NL_USER
+    - versionName: projects/$PROJECT_ID/secrets/alloydb_ai_nl_pass/versions/latest
+      env: ALLOYDB_AI_NL_PASS
     - versionName: projects/$PROJECT_ID/secrets/postgres_user/versions/latest
       env: POSTGRES_USER
     - versionName: projects/$PROJECT_ID/secrets/postgres_pass/versions/latest
@@ -250,6 +407,18 @@ availableSecrets:
       env: MSSQL_USER 
     - versionName: projects/$PROJECT_ID/secrets/mssql_pass/versions/latest
       env: MSSQL_PASS
+    - versionName: projects/$PROJECT_ID/secrets/couchbase_connection/versions/latest
+      env: COUCHBASE_CONNECTION
+    - versionName: projects/$PROJECT_ID/secrets/couchbase_user/versions/latest
+      env: COUCHBASE_USER
+    - versionName: projects/$PROJECT_ID/secrets/couchbase_pass/versions/latest
+      env: COUCHBASE_PASS
+    - versionName: projects/$PROJECT_ID/secrets/memorystore_redis_address/versions/latest
+      env: REDIS_ADDRESS
+    - versionName: projects/$PROJECT_ID/secrets/memorystore_redis_pass/versions/latest
+      env: REDIS_PASS
+    - versionName: projects/$PROJECT_ID/secrets/memorystore_valkey_address/versions/latest
+      env: VALKEY_ADDRESS
 
 
 options:
@@ -266,6 +435,9 @@ substitutions:
   _CLOUD_SQL_POSTGRES_INSTANCE: "cloud-sql-pg-testing"
   _ALLOYDB_POSTGRES_CLUSTER: "alloydb-pg-testing"
   _ALLOYDB_POSTGRES_INSTANCE: "alloydb-pg-testing-instance"
+  _ALLOYDB_AI_NL_CLUSTER: "alloydb-ai-nl-testing"
+  _ALLOYDB_AI_NL_INSTANCE: "alloydb-ai-nl-testing-instance"
+  _BIGTABLE_INSTANCE: "bigtable-testing-instance"
   _POSTGRES_HOST: 127.0.0.1
   _POSTGRES_PORT: "5432"
   _SPANNER_INSTANCE: "spanner-testing"
@@ -277,3 +449,5 @@ substitutions:
   _MSSQL_HOST: 127.0.0.1
   _MSSQL_PORT: "1433"
   _DGRAPHURL: "https://play.dgraph.io"
+  _COUCHBASE_BUCKET: "couchbase-bucket"
+  _COUCHBASE_SCOPE: "couchbase-scope"

.ci/versioned.release.cloudbuild.yaml

@@ -18,19 +18,13 @@ steps:
     script: |
         #!/usr/bin/env bash
         export VERSION=$(cat ./cmd/version.txt)
-        docker buildx build --build-arg METADATA_TAGS=$(git rev-parse HEAD) -t ${_DOCKER_URI}:$VERSION -t ${_DOCKER_URI}:latest .
+        docker buildx create --name container-builder --driver docker-container --bootstrap --use
 
-  - id: "push-docker"
-    name: "gcr.io/cloud-builders/docker"
-    waitFor:
-      - "build-docker"
-    script: |
-        #!/usr/bin/env bash
-        export VERSION=$(cat ./cmd/version.txt)
-        docker push ${_DOCKER_URI}:$VERSION
+        export TAGS="-t ${_DOCKER_URI}:$VERSION"
         if [[ $_PUSH_LATEST == 'true' ]]; then
-          docker push ${_DOCKER_URI}:latest
+          export TAGS="$TAGS -t ${_DOCKER_URI}:latest"
         fi
+        docker buildx build --platform linux/amd64,linux/arm64 --build-arg BUILD_TYPE=container.release --build-arg COMMIT_SHA=$(git rev-parse HEAD) $TAGS --push .
 
   - id: "install-dependencies"
     name: golang:1
@@ -56,7 +50,7 @@ steps:
         #!/usr/bin/env bash
         export VERSION=$(cat ./cmd/version.txt)
         CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.linux.amd64.$VERSION.$(git rev-parse HEAD)" -o toolbox.linux.amd64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.linux.amd64
 
   - id: "store-linux-amd64"
     name: "gcr.io/cloud-builders/gcloud:latest"
@@ -80,7 +74,7 @@ steps:
         #!/usr/bin/env bash
         export VERSION=$(cat ./cmd/version.txt)
         CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.darwin.arm64.$VERSION.$(git rev-parse HEAD)" -o toolbox.darwin.arm64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.darwin.arm64
 
   - id: "store-darwin-arm64"
     name: "gcr.io/cloud-builders/gcloud:latest"
@@ -104,7 +98,7 @@ steps:
         #!/usr/bin/env bash
         export VERSION=$(cat ./cmd/version.txt)
         CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.darwin.amd64.$VERSION.$(git rev-parse HEAD)" -o toolbox.darwin.amd64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.darwin.amd64
 
   - id: "store-darwin-amd64"
     name: "gcr.io/cloud-builders/gcloud:latest"
@@ -128,7 +122,7 @@ steps:
         #!/usr/bin/env bash
         export VERSION=$(cat ./cmd/version.txt)
         CGO_ENABLED=0 GOOS=windows GOARCH=amd64 \
-          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=binary.windows.amd64.$VERSION.$(git rev-parse HEAD)" -o toolbox.windows.amd64
+          go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=binary -X github.com/googleapis/genai-toolbox/cmd.commitSha=$(git rev-parse HEAD)" -o toolbox.windows.amd64
 
   - id: "store-windows-amd64"
     name: "gcr.io/cloud-builders/gcloud:latest"
@@ -137,12 +131,13 @@ steps:
     script: |
         #!/usr/bin/env bash
         export VERSION=v$(cat ./cmd/version.txt)
-        gcloud storage cp toolbox.windows.amd64 gs://$_BUCKET_NAME/$VERSION/windows/amd64/toolbox
+        gcloud storage cp toolbox.windows.amd64 gs://$_BUCKET_NAME/$VERSION/windows/amd64/toolbox.exe
 
 options:
   automapSubstitutions: true
   dynamicSubstitutions: true
   logging: CLOUD_LOGGING_ONLY # Necessary for custom service account
+  machineType: 'E2_HIGHCPU_32'
 
 substitutions:
   _REGION: us-central1

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,119 @@
+# 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
+#
+#     https://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.
+
+name: 🐞 Bug Report
+description: File a report for unexpected or undesired behavior.
+title: "<brief summary of what bug or error was observed>"
+labels: ["type: bug"]
+type: "bug"
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for helping us improve! 🙏 Please answer these questions and provide as much information as possible about your problem.
+  
+  - id: preamble
+    type: checkboxes
+    attributes:
+      label: Prerequisites
+      description: |
+        Please run through the following list and make sure you've tried the usual "quick fixes":
+        - Search the [current open issues](https://github.com/googleapis/genai-toolbox/issues)
+        - Update to the [latest version of Toolbox](https://github.com/googleapis/genai-toolbox/releases)
+      options: 
+        - label: "I've searched the current open issues"
+          required: true
+        - label: "I've updated to the latest version of Toolbox"
+
+  - type: input
+    id: version
+    attributes:
+      label: Toolbox version
+      description: |
+        What version of Toolbox are you using (`toolbox --version`)? e.g.
+        - toolbox version 0.3.0 
+        - us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:0.3.0
+      placeholder: ex. toolbox version 0.3.0 
+    validations:
+      required: true
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      description: "Let us know some details about the environment in which you are seeing the bug!"
+      value: |
+        1. OS type and version: (output of `uname -a`)
+        2. How are you running Toolbox: 
+          - As a downloaded binary (e.g. from `curl -O https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox`)
+          - As a container (e.g. from `us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION`)
+          - Compiled from source (include the command used to build)
+
+  - type: textarea
+    id: client
+    attributes:
+      label: Client 
+      description: "How are you connecting to Toolbox?"
+      value: |
+        1. Client: <name and link to the client are you using>
+        2. Version: <what exact version of the client are you using> 
+        3. Example: If possible, please include your code of configuration:
+        
+        ```python
+        # Code goes here! 
+        ```
+
+  - id: expected-behavior
+    type: textarea
+    attributes:
+      label: Expected Behavior
+      description: |
+        Please enter a detailed description of the behavior you expected, and any information about what behavior you 
+        noticed and why it is defective or unintentional.
+    validations:
+      required: true
+
+  - id: current-behavior
+    type: textarea
+    attributes:
+      label: Current Behavior
+      description: "Please enter a detailed description of the behavior you encountered instead."
+    validations:
+      required: true
+
+  - type: textarea
+    id: repro
+    attributes:
+      label: Steps to reproduce?
+      description: |
+        How can we reproduce this bug? Please walk us through it step by step,
+        with as much relevant detail as possible. A 'minimal' reproduction is
+        preferred, which means removing as much of the examples as possible so
+        only the minimum required to run and reproduce the bug is left. 
+      value: |
+        1. ?
+        2. ?
+        3. ?
+        ...
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-details
+    attributes:
+      label: Additional Details
+      description: |
+        Any other information you want us to know? Things such as tools config,
+        server logs, etc. can be included here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Google Cloud Support
+    url: https://cloud.google.com/support/
+    about: If you have a support contract with Google, please both open an issue here and open Google Cloud Support portal with a link to the issue.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,60 @@
+# 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
+#
+#     https://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.
+
+name: ✨ Feature Request
+description: Suggest an idea for new or improved behavior.
+title: "<brief summary of the proposed feature>"
+labels: ["type: feature request"]
+type: feature
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for helping us improve! 🙏 Please answer these questions and provide as much information as possible about your feature request. 
+  
+  - id: preamble
+    type: checkboxes
+    attributes:
+      label: Prerequisites
+      description: |
+        Please run through the following list and make sure you've tried the usual "quick fixes":
+      options:
+        - label: "Search the [current open issues](https://github.com/googleapis/genai-toolbox/issues)"
+          required: true
+
+  - type: textarea
+    id: use-case
+    attributes:
+      label: What are you trying to do that currently feels hard or impossible? 
+      description: "A clear and concise description of what the end goal for the feature should be -- avoid generalizing and try to provide a specific use-case."
+    validations:
+      required: true
+
+  - type: textarea
+    id: suggested-solution
+    attributes:
+      label: Suggested Solution(s)
+      description: "If you have a suggestion for how this use-case can be solved, please feel free to include it."
+
+  - type: textarea
+    id: alternatives-considered
+    attributes:
+      label: Alternatives Considered
+      description: "Are there any workaround or third party tools to replicate this behavior? Why would adding this feature be preferred over them?"
+
+  - type: textarea
+    id: additional-details
+    attributes:
+      label: Additional Details
+      description: "Any additional information we should know? Please reference it here (issues, PRs, descriptions, or screenshots)"

.github/ISSUE_TEMPLATE/question.yml

@@ -0,0 +1,55 @@
+# 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
+#
+#     https://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.
+
+name: 💬 Question
+description: Questions on how something works or the best way to do something?
+title: "<brief summary of the question>"
+labels: ["type: question"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for helping us improve! 🙏 Please provide as much information as possible about your question. 
+  
+  - id: preamble
+    type: checkboxes
+    attributes:
+      label: Prerequisites
+      description: |
+        Please run through the following list and make sure you've tried the usual "quick fixes":
+      options:
+        - label: "Search the [current open issues](https://github.com/googleapis/genai-toolbox/issues)"
+          required: true
+
+  - type: textarea
+    id: question
+    attributes:
+      label: Question
+      description: "What's your question? Please provide as much relevant information as possible to reduce turnaround time. Include information like what environment, language, or framework you are using."
+      placeholder: "Example: How do I connect using private IP with the AlloyDB source?"
+    validations:
+      required: true
+
+  - type: textarea
+    id: code
+    attributes:
+      label: Code
+      description: "Please paste any useful application code that might be relevant to your question. (if your code is in a public repo, feel free to paste a link!)"
+      
+  - type: textarea
+    id: additional-details
+    attributes:
+      label: Additional Details
+      description: "Any other information you want us to know that might be helpful in answering your question? (link issues, PRs, descriptions, or screenshots)."

.github/blunderbuss.yml

@@ -0,0 +1,15 @@
+assign_issues:
+  - kurtisvg
+  - Yuan325
+  - duwenxin99
+assign_issues_by:
+  - labels:
+    - 'product: bigquery'
+    to:
+    - Genesis929
+    - shobsi
+    - jiaxunwu
+assign_prs:
+  - kurtisvg
+  - Yuan325
+  - duwenxin99

.github/label-sync.yml

@@ -0,0 +1,2 @@
+---
+ignored: true

.github/labels.yaml

@@ -68,3 +68,25 @@
 - name: 'tests: run'
   color: 3DED97
   description: Label to trigger Github Action tests.
+
+- name: 'docs: deploy-preview'
+  color: BFDADC
+  description: Label to trigger Github Action docs preview.
+
+- name: 'status: contribution welcome'
+  color: 8befd7
+  description: Status - Contributions welcome.
+
+- name: 'status: awaiting response'
+  color: 8befd7
+  description: Status - Awaiting response from author.
+
+- name: 'status: awaiting codeowners'
+  color: 8befd7
+  description: Status - Awaiting response from code owners.
+
+# Product Labels
+- name: 'product: bigquery'
+  color: 5065c7
+  description: Product - Assigned to the BigQuery team. 
+

.github/release-please.yml

@@ -16,3 +16,20 @@ handleGHRelease: true
 packageName: genai-toolbox
 releaseType: simple
 versionFile: "cmd/version.txt"
+extraFiles: [
+    "README.md",
+    "docs/en/getting-started/introduction/_index.md",
+    "docs/en/getting-started/local_quickstart.md",
+    "docs/en/getting-started/mcp_quickstart/_index.md",
+    "docs/en/samples/bigquery/local_quickstart.md",
+    "docs/en/samples/bigquery/mcp_quickstart/_index.md",
+    "docs/en/getting-started/colab_quickstart.ipynb",
+    "docs/en/samples/bigquery/colab_quickstart_bigquery.ipynb",
+    "docs/en/how-to/connect-ide/bigquery_mcp.md",
+    "docs/en/how-to/connect-ide/spanner_mcp.md",
+    "docs/en/how-to/connect-ide/alloydb_pg_mcp.md",
+    "docs/en/how-to/connect-ide/cloud_sql_mysql_mcp.md",
+    "docs/en/how-to/connect-ide/cloud_sql_pg_mcp.md",
+    "docs/en/how-to/connect-ide/postgres_mcp.md",
+    "docs/en/how-to/connect-ide/cloud_sql_mssql_mcp.md",
+]

.github/renovate.json5

@@ -0,0 +1,28 @@
+{
+  extends: [
+    'config:recommended',
+    ':semanticCommitTypeAll(chore)',
+    ':ignoreUnstable',
+    ':separateMajorReleases',
+    ':prConcurrentLimitNone',
+    ':prHourlyLimitNone',
+    ':preserveSemverRanges',
+  ],
+  minimumReleaseAge: '3',
+  rebaseWhen: 'conflicted',
+  dependencyDashboardLabels: [
+    'type: process',
+  ],
+  "postUpdateOptions": [
+    "gomodTidy"
+  ],
+  packageRules: [
+    {
+      groupName: 'GitHub Actions',
+      matchManagers: [
+        'github-actions',
+      ],
+      pinDigests: true,
+    },
+  ],
+}

.github/sync-repo-settings.yaml

@@ -31,6 +31,8 @@ branchProtectionRules:
       - "header-check"
     # - Add required status checks like presubmit tests
       - "unit tests (ubuntu-latest)"
+      - "unit tests (windows-latest)"
+      - "unit tests (macos-latest)"
       - "integration-test-pr (toolbox-testing-438616)"
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true

.github/workflows/cloud_build_failure_reporter.yml

@@ -0,0 +1,179 @@
+# 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.
+
+name: Cloud Build Failure Reporter
+
+on:
+  workflow_call:
+    inputs:
+      trigger_names:
+          required: true
+          type: string
+  workflow_dispatch:
+    inputs:
+      trigger_names:
+        description: 'Cloud Build trigger names separated by comma.'
+        required: true
+        default: ''
+
+jobs:
+  report:
+
+    permissions:
+      issues: 'write'
+      checks: 'read'
+
+    runs-on: 'ubuntu-latest'
+
+    steps:
+      - uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea' # v7
+        with:
+          script: |-
+                  // parse test names
+                  const testNameSubstring = '${{ inputs.trigger_names }}';
+                  const testNameFound = new Map(); //keeps track of whether each test is found
+                  testNameSubstring.split(',').forEach(testName => {
+                    testNameFound.set(testName, false); 
+                  });
+                  
+                  // label for all issues opened by reporter
+                  const periodicLabel = 'periodic-failure';
+
+                  // check if any reporter opened any issues previously
+                  const prevIssues = await github.paginate(github.rest.issues.listForRepo, {
+                    ...context.repo,
+                    state: 'open',
+                    creator: 'github-actions[bot]',
+                    labels: [periodicLabel]
+                  });
+
+                  // createOrCommentIssue creates a new issue or comments on an existing issue.
+                  const createOrCommentIssue = async function (title, txt) {
+                    if (prevIssues.length < 1) {
+                      console.log('no previous issues found, creating one');
+                      await github.rest.issues.create({
+                        ...context.repo,
+                        title: title,
+                        body: txt,
+                        labels: [periodicLabel]
+                      });
+                      return;
+                    }
+                    // only comment on issue related to the current test
+                    for (const prevIssue of prevIssues) {
+                      if (prevIssue.title.includes(title)){
+                          console.log(
+                          `found previous issue ${prevIssue.html_url}, adding comment`
+                        );
+
+                        await github.rest.issues.createComment({
+                          ...context.repo,
+                          issue_number: prevIssue.number,
+                          body: txt
+                        });
+                        return;
+                      }
+                    }
+                  };
+
+                  // updateIssues comments on any existing issues. No-op if no issue exists.
+                  const updateIssues = async function (checkName, txt) {
+                    if (prevIssues.length < 1) {
+                      console.log('no previous issues found.');
+                      return;
+                    }
+                    // only comment on issue related to the current test
+                    for (const prevIssue of prevIssues) {
+                      if (prevIssue.title.includes(checkName)){
+                        console.log(`found previous issue ${prevIssue.html_url}, adding comment`);
+                        await github.rest.issues.createComment({
+                          ...context.repo,
+                          issue_number: prevIssue.number,
+                          body: txt
+                        });
+                      }
+                    }
+                  };
+
+                  // Find status of check runs.
+                  // We will find check runs for each commit and then filter for the periodic.
+                  // Checks API only allows for ref and if we use main there could be edge cases where
+                  // the check run happened on a SHA that is different from head.
+                  const commits = await github.paginate(github.rest.repos.listCommits, {
+                    ...context.repo
+                  });
+
+                  const relevantChecks = new Map();
+                  for (const commit of commits) {
+                    console.log(
+                      `checking runs at ${commit.html_url}: ${commit.commit.message}`
+                    );
+                    const checks = await github.rest.checks.listForRef({
+                      ...context.repo,
+                      ref: commit.sha
+                    });
+
+                    // Iterate through each check and find matching names
+                    for (const check of checks.data.check_runs) {
+                      console.log(`Handling test name ${check.name}`);
+                      for (const testName of testNameFound.keys()) {
+                        if (testNameFound.get(testName) === true){
+                          //skip if a check is already found for this name
+                          continue; 
+                        }
+                        if (check.name.includes(testName)) {
+                          relevantChecks.set(check, commit);
+                          testNameFound.set(testName, true);
+                        }
+                      }
+                    }
+                    // Break out of the loop early if all tests are found
+                    const allTestsFound = Array.from(testNameFound.values()).every(value => value === true);
+                    if (allTestsFound){
+                      break;
+                    }
+                  }
+
+                  // Handle each relevant check
+                  relevantChecks.forEach((commit, check) => {
+                    if (
+                        check.status === 'completed' &&
+                        check.conclusion === 'success'
+                    ) {
+                        updateIssues(
+                            check.name,
+                            `[Tests are passing](${check.html_url}) for commit [${commit.sha}](${commit.html_url}).`
+                        );
+                    } else if (check.status === 'in_progress') {
+                        console.log(
+                            `Check is pending ${check.html_url} for ${commit.html_url}. Retry again later.`
+                        );
+                    } else {
+                        createOrCommentIssue(
+                            `Cloud Build Failure Reporter: ${check.name} failed`,
+                            `Cloud Build Failure Reporter found test failure for [**${check.name}** ](${check.html_url}) at [${commit.sha}](${commit.html_url}). Please fix the error and then close the issue after the **${check.name}** test passes.`
+                        );
+                    }
+                  });
+
+                  // no periodic checks found across all commits, report it
+                  const noTestFound = Array.from(testNameFound.values()).every(value => value === false);
+                  if (noTestFound){
+                    createOrCommentIssue(
+                      'Missing periodic tests: ${{ inputs.trigger_names }}',
+                      `No periodic test is found for triggers: ${{ inputs.trigger_names }}. Last checked from ${
+                        commits[0].html_url
+                      } to ${commits[commits.length - 1].html_url}.`
+                    );
+                  }

.github/workflows/docs_deploy.yaml

@@ -24,14 +24,14 @@ on:
     paths:
       - 'docs/**'
       - 'github/workflows/docs**'
-      - '.hugo'
+      - '.hugo/**'
 
   # Allow triggering manually.
   workflow_dispatch:
 
 jobs:
   deploy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: .hugo
@@ -39,23 +39,23 @@ jobs:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
 
       - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v3
+        uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3
         with:
-          hugo-version: "latest"
+          hugo-version: "0.145.0"
           extended: true
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: "22"
 
       - name: Cache dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -69,11 +69,11 @@ jobs:
           HUGO_RELATIVEURLS: false
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v4
+        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: .hugo/public
           # Do not delete previews on each production deploy.
           # CSS or JS changes will require manual clean-up.
           keep_files: true
-          commit_message: "deploy: ${{ github.event.head_commit.message }}"
+          commit_message: "deploy: ${{ github.event.head_commit.message }}"

.github/workflows/docs_preview_clean.yaml

@@ -34,7 +34,7 @@ jobs:
       group: "preview-${{ github.event.number }}"
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           ref: gh-pages
 
@@ -48,7 +48,7 @@ jobs:
           git push
 
       - name: Comment
-        uses: actions/github-script@v7
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
         with:
           script: |
             github.rest.issues.createComment({

.github/workflows/docs_preview_deploy.yaml

@@ -17,7 +17,7 @@ name: "docs"
 permissions:
   contents: write
   pull-requests: write
-
+  
 # This Workflow depends on 'github.event.number',
 # not compatible with branch or manual triggers.
 on:
@@ -26,10 +26,20 @@ on:
     paths:
       - 'docs/**'
       - 'github/workflows/docs**'
-      - '.hugo'
+      - '.hugo/**'
+  pull_request_target:
+    types: [labeled]
+    paths:
+      - 'docs/**'
+      - 'github/workflows/docs**'
+      - '.hugo/**'
 
 jobs:
   preview:
+    # run job on proper workflow event triggers (skip job for pull_request event
+    # from forks and only run pull_request_target for "docs: deploy-preview"
+    # label)
+    if: "${{ (github.event.action != 'labeled' && github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name) || github.event.label.name == 'docs: deploy-preview' }}"
     runs-on: ubuntu-24.04
     defaults:
       run:
@@ -39,23 +49,23 @@ jobs:
       group: "preview-${{ github.event.number }}"
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
 
       - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v3
+        uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3
         with:
-          hugo-version: "latest"
+          hugo-version: "0.145.0"
           extended: true
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: "22"
 
       - name: Cache dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -70,9 +80,7 @@ jobs:
           HUGO_RELATIVEURLS: false
 
       - name: Deploy
-        # If run from a fork, GitHub write operations will fail.
-        if: ${{ !github.event.pull_request.head.repo.fork }}
-        uses: peaceiris/actions-gh-pages@v4
+        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: .hugo/public
@@ -80,9 +88,7 @@ jobs:
           commit_message: "stage: PR-${{ github.event.number }}: ${{ github.event.head_commit.message }}"
 
       - name: Comment
-        # If run from a fork, GitHub write operations will fail.
-        if: ${{ !github.event.pull_request.head.repo.fork }}
-        uses: actions/github-script@v7
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
         with:
           script: |
             github.rest.issues.createComment({
@@ -90,4 +96,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 }}/"
-            })
+            })

.github/workflows/lint.yaml

@@ -51,11 +51,11 @@ jobs:
               console.log('Failed to remove label. Another job may have already removed it!');
             }
       - name: Setup Go
-        uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version: "1.22"
       - name: Checkout code
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -66,7 +66,7 @@ jobs:
         run: |
           go mod tidy && git diff --exit-code
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
           version: latest
           args: --timeout 3m

.github/workflows/schedule_reporter.yml

@@ -0,0 +1,29 @@
+# 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.
+
+name: Schedule Reporter
+
+on:
+  schedule:
+    - cron: '0 6 * * *'  # Runs at 6 AM every morning
+
+jobs:
+  run_reporter:
+    permissions:
+        issues: 'write'
+        checks: 'read'
+        contents: 'read'
+    uses: ./.github/workflows/cloud_build_failure_reporter.yml
+    with:
+      trigger_names: "toolbox-test-nightly,toolbox-test-on-merge"

.github/workflows/sync-labels.yaml

@@ -29,7 +29,7 @@ jobs:
       issues: 'write'
       pull-requests: 'write'
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: micnncim/action-label-syncer@3abd5ab72fda571e69fffd97bd4e0033dd5f495c # v1.3.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tests.yaml

@@ -26,14 +26,13 @@ permissions: read-all
 
 jobs:
   integration:
-   # run job on proper workflow event triggers (skip job for pull_request event from forks and only run pull_request_target for "tests: run" label)
+    # run job on proper workflow event triggers (skip job for pull_request event from forks and only run pull_request_target for "tests: run" label)
     if: "${{ (github.event.action != 'labeled' && github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name) || github.event.label.name == 'tests: run' }}"
     name: unit tests
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # os: [macos-latest, windows-latest, ubuntu-latest]
-        os: [ubuntu-latest]
+        os: [macos-latest, windows-latest, ubuntu-latest]
       fail-fast: false
     permissions:
       contents: 'read'
@@ -58,12 +57,12 @@ jobs:
             }
 
       - name: Setup Go
-        uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version: "1.22"
-      
+
       - name: Checkout code
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -75,5 +74,32 @@ jobs:
       - name: Build
         run: go build -v ./...
 
-      - name: Run tests
-        run: go test -race -tags="!integration" -v ./...
+      - name: Run tests with coverage
+        if: ${{ runner.os == 'Linux' }}
+        run: |
+          source_dir="./internal/sources/*"
+          tool_dir="./internal/tools/*"
+          auth_dir="./internal/auth/*"
+          int_test_dir="./tests/*"
+          included_packages=$(go list ./... | grep -v -e "$source_dir" -e "$tool_dir" -e "$auth_dir" -e "$int_test_dir")
+          go test -race -cover -coverprofile=coverage.out -v $included_packages
+          go test -race -v ./internal/sources/... ./internal/tools/... ./internal/auth/...
+
+      - name: Run tests without coverage
+        if: ${{ runner.os != 'Linux' }}
+        run: |
+          go test -race -v ./internal/... ./cmd/...
+
+      - name: Check coverage
+        if: ${{ runner.os == 'Linux' }}
+        run: |
+          FILE_TO_EXCLUDE="github.com/googleapis/genai-toolbox/internal/server/config.go"
+          ESCAPED_PATH=$(echo "$FILE_TO_EXCLUDE" | sed 's/\//\\\//g; s/\./\\\./g')
+          sed -i "/^${ESCAPED_PATH}:/d" coverage.out
+          total_coverage=$(go tool cover -func=coverage.out | grep "total:" | awk '{print $3}')
+          echo "Total coverage: $total_coverage"
+          coverage_numeric=$(echo "$total_coverage" | sed 's/%//')
+          if (( $(echo "$coverage_numeric < 40" | bc -l) )); then
+              echo "Coverage failure: total coverage($total_coverage) is below 40%."
+              exit 1
+          fi

.gitignore

@@ -13,4 +13,4 @@ node_modules
 .hugo_build.lock
 
 # coverage
-.coverage
+.coverage

.golangci.yaml

@@ -12,34 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+version: "2"
 linters:
   enable:
     - errcheck
-    - goimports
-    - gosimple
     - govet
     - ineffassign
     - staticcheck
     - unused
-linters-settings:
-  gofmt:
-    rewrite-rules:
-      - pattern: 'interface{}'
-        replacement: 'any'
-      - pattern: 'a[b:len(a)]'
-        replacement: 'a[b:]'
+  exclusions:
+    presets:
+      - std-error-handling
 issues:
   fix: true
-run:
-  build-tags:
-    - integration
-    - cloudsqlpg
-    - postgres
-    - alloydb
-    - spanner
-    - cloudsqlmssql
-    - cloudsqlmysql
-    - neo4j
-    - dgraph
-    - mssql
-    - mysql
+formatters:
+  enable:
+    - goimports
+  settings:
+    gofmt:
+      rewrite-rules:
+        - pattern: interface{}
+          replacement: any
+        - pattern: a[b:len(a)]
+          replacement: a[b:]

.hugo/assets/scss/_variables_project.scss

@@ -1,2 +1,2 @@
-$primary: #D84040;
-$secondary: #8E1616;
+$primary: #80a7e9;
+$secondary: #4484f4;

.hugo/hugo.toml

@@ -1,8 +1,7 @@
-title = 'Gen AI Toolbox'
+title = 'MCP Toolbox for Databases'
 relativeURLs = true
 
 languageCode = 'en-us'
-contentDir = "../docs/en"
 defaultContentLanguage = "en"
 defaultContentLanguageInSubdir = false
 
@@ -18,7 +17,10 @@ enableRobotsTXT = true
   proxy = "direct"
   [module.hugoVersion]
     extended = true
-    min = "0.73.0"
+    min = "0.146.0"
+  [[module.mounts]]
+    source = "../docs/en"
+    target = 'content'
   [[module.imports]]
     path = "github.com/google/docsy"
     disable = false
@@ -26,6 +28,7 @@ enableRobotsTXT = true
     path = "github.com/martignoni/hugo-notice"
 
 [params]
+  description = "MCP Toolbox for Databases is an open source MCP server for databases. It enables you to develop tools easier, faster, and more securely by handling the complexities such as connection pooling, authentication, and more."
   copyright = "Google LLC"
   github_repo = "https://github.com/googleapis/genai-toolbox"
   github_project_repo = "https://github.com/googleapis/genai-toolbox"
@@ -45,4 +48,19 @@ enableRobotsTXT = true
   pre = "<i class='fa-brands fa-github'></i>"
 
 [markup.goldmark.renderer]
-  unsafe= true 
+  unsafe= true 
+
+[outputFormats]
+  [outputFormats.LLMS]
+    mediaType = "text/plain"
+    baseName = "llms"
+    isPlainText = true
+    root = true
+  [outputFormats.LLMS-FULL]
+    mediaType = "text/plain"
+    baseName = "llms-full"
+    isPlainText = true
+    root = true
+
+[outputs]
+  home = ["HTML", "RSS", "LLMS", "LLMS-FULL"]

.hugo/layouts/_default/_markup/render-heading.html

@@ -1 +0,0 @@
-{{ template "_default/_markup/td-render-heading.html" . }}

.hugo/layouts/index.llms-full.txt

@@ -0,0 +1,14 @@
+{{ .Site.Params.description }}
+
+{{ range .Site.Sections }}
+# {{ .Title }}
+{{ .Description }}
+{{ range .Pages }}
+# {{ .Title }}
+{{ .Description }}
+{{ .RawContent }}
+{{ range .Pages }}
+# {{ .Title }}
+{{ .Description }}
+{{ .RawContent }}
+{{end }}{{ end }}{{ end }}

.hugo/layouts/index.llms.txt

@@ -0,0 +1,9 @@
+# {{ .Site.Title }}
+
+> {{ .Site.Params.description }}
+
+## Docs
+{{ range .Site.Sections }}
+### {{ .Title }}
+
+{{ .Description }}{{ range .Pages }}- [{{ .Title }}]({{ .Permalink }}): {{ .Description }}{{ range .Pages }}  - [{{ .Title }}]({{ .Permalink }}): {{ .Description }}{{end }}{{ end }}{{ end }}

.hugo/layouts/partials/page-meta-links.html

@@ -0,0 +1,52 @@
+{{/* cSpell:ignore querify subdir */ -}}
+{{/* Class names ending with `--KIND` are deprecated in favor of `__KIND`, but we're keeping them for a few releases after 0.9.0 */ -}}
+
+{{ if .File -}}
+{{ $path := urls.JoinPath $.Language.Lang $.File.Path -}}
+{{ $gh_repo := $.Param "github_repo" -}}
+{{ $gh_url := $.Param "github_url" -}}
+{{ $gh_subdir := $.Param "github_subdir" | default "" -}}
+{{ $gh_project_repo := $.Param "github_project_repo" -}}
+{{ $gh_branch := $.Param "github_branch" | default "main" -}}
+<div class="td-page-meta ms-2 pb-1 pt-2 mb-0">
+{{ if $gh_url -}}
+  {{ warnf "Warning: use of `github_url` is deprecated. For details, see https://www.docsy.dev/docs/adding-content/repository-links/#github_url-optional" -}}
+  <a href="{{ $gh_url }}" target="_blank"><i class="fa-solid fa-pen-to-square fa-fw"></i> {{ T "post_edit_this" }}</a>
+{{ else if $gh_repo -}}
+
+  {{/* Adjust $path based on path_base_for_github_subdir */ -}}
+  {{ $ghs_base := $.Param "path_base_for_github_subdir" -}}
+  {{ $ghs_rename := "" -}}
+  {{ if reflect.IsMap $ghs_base -}}
+    {{ $ghs_rename = $ghs_base.to -}}
+    {{ $ghs_base = $ghs_base.from -}}
+  {{ end -}}
+  {{ with $ghs_base -}}
+    {{ $path = replaceRE . $ghs_rename $path -}}
+  {{ end -}}
+
+  {{ $gh_repo_path := printf "%s/%s/%s" $gh_branch $gh_subdir $path -}}
+  {{ $gh_repo_path = replaceRE "//+" "/" $gh_repo_path -}}
+
+  {{ $viewURL := printf "%s/tree/%s" $gh_repo $gh_repo_path -}}
+  {{ $editURL := printf "%s/edit/%s" $gh_repo $gh_repo_path -}}
+  {{ $issuesURL := printf "%s/issues/new?title=%s" $gh_repo (safeURL $.Title ) -}}
+  {{ $newPageStub := resources.Get "stubs/new-page-template.md" -}}
+  {{ $newPageQS := querify "value" $newPageStub.Content "filename" "change-me.md" | safeURL -}}
+  {{ $newPageURL := printf "%s/new/%s?%s" $gh_repo (path.Dir $gh_repo_path) $newPageQS -}}
+
+  <a href="{{ $viewURL }}" class="td-page-meta--view td-page-meta__view" target="_blank" rel="noopener"><i class="fa-solid fa-file-lines fa-fw"></i> {{ T "post_view_this" }}</a>
+  <a href="{{ $editURL }}" class="td-page-meta--edit td-page-meta__edit" target="_blank" rel="noopener"><i class="fa-solid fa-pen-to-square fa-fw"></i> {{ T "post_edit_this" }}</a>
+  <a href="{{ $newPageURL }}" class="td-page-meta--child td-page-meta__child" target="_blank" rel="noopener"><i class="fa-solid fa-pen-to-square fa-fw"></i> {{ T "post_create_child_page" }}</a>
+  <a href="{{ $issuesURL }}" class="td-page-meta--issue td-page-meta__issue" target="_blank" rel="noopener"><i class="fa-solid fa-list-check fa-fw"></i> {{ T "post_create_issue" }}</a>
+  {{ with $gh_project_repo -}}
+    {{ $project_issueURL := printf "%s/issues/new" . -}}
+    <a href="{{ $project_issueURL }}" class="td-page-meta--project td-page-meta__project-issue" target="_blank" rel="noopener"><i class="fa-solid fa-list-check fa-fw"></i> {{ T "post_create_project_issue" }}</a>
+  {{ end -}}
+
+{{ end -}}
+{{ with .CurrentSection.AlternativeOutputFormats.Get "print" -}}
+  <a id="print" href="{{ .RelPermalink | safeURL }}"><i class="fa-solid fa-print fa-fw"></i> {{ T "print_entire_section" }}</a>
+{{ end }}
+</div>
+{{ end -}}

.hugo/layouts/partials/td/render-heading.html

@@ -0,0 +1 @@
+{{ template "partials/td/render-heading.html" . }}

.hugo/static/favicons/about.txt

@@ -1,6 +0,0 @@
-This favicon was generated using the following graphics from Twitter Twemoji:
-
-- Graphics Title: 1f9f0.svg
-- Graphics Author: Copyright 2020 Twitter, Inc and other contributors (https://github.com/twitter/twemoji)
-- Graphics Source: https://github.com/twitter/twemoji/blob/master/assets/svg/1f9f0.svg
-- Graphics License: CC-BY 4.0 (https://creativecommons.org/licenses/by/4.0/)

CHANGELOG.md

@@ -1,5 +1,98 @@
 # Changelog
 
+## [0.7.0](https://github.com/googleapis/genai-toolbox/compare/v0.6.0...v0.7.0) (2025-06-10)
+
+
+### Features
+
+* Add templateParameters field for mssqlsql ([#671](https://github.com/googleapis/genai-toolbox/issues/671)) ([b81fc6a](https://github.com/googleapis/genai-toolbox/commit/b81fc6aa6ccdfbc15676fee4d87041d9ad9682fa))
+* Add templateParameters field for mysqlsql ([#663](https://github.com/googleapis/genai-toolbox/issues/663)) ([0a08d2c](https://github.com/googleapis/genai-toolbox/commit/0a08d2c15dcbec18bb556f4dc49792ba0c69db46))
+* **metrics:** Add user agent for prebuilt tools ([#669](https://github.com/googleapis/genai-toolbox/issues/669)) ([29aa0a7](https://github.com/googleapis/genai-toolbox/commit/29aa0a70da3c2eb409a38993b3782da8bec7cb85))
+* **tools/postgressql:** Add templateParameters field ([#615](https://github.com/googleapis/genai-toolbox/issues/615)) ([b763469](https://github.com/googleapis/genai-toolbox/commit/b76346993f298b4f7493a51405d0a287bacce05f))
+
+
+### Bug Fixes
+
+* Improve versionString ([#658](https://github.com/googleapis/genai-toolbox/issues/658)) ([cf96f4c](https://github.com/googleapis/genai-toolbox/commit/cf96f4c249f0692e3eb19fc56c794ca6a3079307))
+* **server/stdio:** Notifications should not return a response ([#638](https://github.com/googleapis/genai-toolbox/issues/638)) ([69d047a](https://github.com/googleapis/genai-toolbox/commit/69d047af46f1ec00f236db8a978a7a7627217fd2))
+* **tools/mysqlsql:** Handled the null value for string case in mysqlsql tools ([#641](https://github.com/googleapis/genai-toolbox/issues/641)) ([ef94648](https://github.com/googleapis/genai-toolbox/commit/ef94648455c3b20adda4f8cff47e70ddccac8c06))
+* Update path library ([#678](https://github.com/googleapis/genai-toolbox/issues/678)) ([4998f82](https://github.com/googleapis/genai-toolbox/commit/4998f8285287b5daddd0043540f2cf871e256db5)), closes [#662](https://github.com/googleapis/genai-toolbox/issues/662)
+
+## [0.6.0](https://github.com/googleapis/genai-toolbox/compare/v0.5.0...v0.6.0) (2025-05-28)
+
+
+### Features
+
+* Add Execute sql tool for SQL Server(MSSQL) ([#585](https://github.com/googleapis/genai-toolbox/issues/585)) ([6083a22](https://github.com/googleapis/genai-toolbox/commit/6083a224aa650caf4e132b4a704323c5f18c4986))
+* Add mysql-execute-sql tool ([#577](https://github.com/googleapis/genai-toolbox/issues/577)) ([8590061](https://github.com/googleapis/genai-toolbox/commit/8590061ae4908da0e4b1bd6f7cf7ee8d972fa5ba))
+* Add new BigQuery tools: execute_sql, list_datatset_ids, list_table_ids, get_dataset_info, get_table_info ([0fd88b5](https://github.com/googleapis/genai-toolbox/commit/0fd88b574b4ab0d3bee4585999b814675d3b74ed))
+* Add spanner-execute-sql tool ([#576](https://github.com/googleapis/genai-toolbox/issues/576)) ([d65747a](https://github.com/googleapis/genai-toolbox/commit/d65747a2dcf3022f22c86a1524ee28c8229f7c20))
+* Add support for read-only in Spanner tool ([#563](https://github.com/googleapis/genai-toolbox/issues/563)) ([6512704](https://github.com/googleapis/genai-toolbox/commit/6512704e77088d92fea53a85c6e6cbf4b99c988d))
+* Adding support for the --prebuilt flag ([#604](https://github.com/googleapis/genai-toolbox/issues/604)) ([a29c800](https://github.com/googleapis/genai-toolbox/commit/a29c80012eec4729187c12968b53051d20b263a7))
+* Support MCP stdio transport protocol ([#607](https://github.com/googleapis/genai-toolbox/issues/607)) ([1702ce1](https://github.com/googleapis/genai-toolbox/commit/1702ce1e00a52170a4271ac999caf534ba00196f))
+
+
+### Bug Fixes
+
+* Explicitly set query location for BigQuery queries ([#586](https://github.com/googleapis/genai-toolbox/issues/586)) ([eb52b66](https://github.com/googleapis/genai-toolbox/commit/eb52b66d82aaa11be6b1489335f49cba8168099b))
+* Fix spellings in comments ([#561](https://github.com/googleapis/genai-toolbox/issues/561)) ([b58bf76](https://github.com/googleapis/genai-toolbox/commit/b58bf76ddaba407e3fd995dfe86d00a09484e14a))
+* Prevent tool calls through MCP when auth is required ([#544](https://github.com/googleapis/genai-toolbox/issues/544)) ([e747b6e](https://github.com/googleapis/genai-toolbox/commit/e747b6e289730c17f68be8dec0c6fa6021bb23bd))
+* Reinitialize required slice if nil ([#571](https://github.com/googleapis/genai-toolbox/issues/571)) ([04dcf47](https://github.com/googleapis/genai-toolbox/commit/04dcf4791272e1dd034b9a03664dd8dbe77fdddd)), closes [#564](https://github.com/googleapis/genai-toolbox/issues/564)
+
+## [0.5.0](https://github.com/googleapis/genai-toolbox/compare/v0.4.0...v0.5.0) (2025-05-06)
+
+
+### Features
+
+* Add Couchbase as Source and Tool ([#307](https://github.com/googleapis/genai-toolbox/issues/307)) ([d7390b0](https://github.com/googleapis/genai-toolbox/commit/d7390b06b7bcb15411388e9a4dbcfe75afcca1ee))
+* Add postgres-execute-sql tool ([#490](https://github.com/googleapis/genai-toolbox/issues/490)) ([11ea7bc](https://github.com/googleapis/genai-toolbox/commit/11ea7bc584aa4ca8e8b0e7a355f6666ccbea2883))
+
+
+## [0.4.0](https://github.com/googleapis/genai-toolbox/compare/v0.3.0...v0.4.0) (2025-04-23)
+
+
+### Features
+
+* Add `AuthRequired` to Neo4j & Dgraph Tools ([#434](https://github.com/googleapis/genai-toolbox/issues/434)) ([afbf4b2](https://github.com/googleapis/genai-toolbox/commit/afbf4b2daeb01119a22ce18469bffb9e9f57d2f8))
+* Add `AuthRequired` to tool manifest ([#433](https://github.com/googleapis/genai-toolbox/issues/433)) ([d9388ad](https://github.com/googleapis/genai-toolbox/commit/d9388ad57e832570aab56b9b357c1fb0ba994852))
+* Add BigQuery source and tool ([#463](https://github.com/googleapis/genai-toolbox/issues/463)) ([8055aa5](https://github.com/googleapis/genai-toolbox/commit/8055aa519fe6e7993ba524f8f7e684fbfdecc1b9))
+* Add Bigtable source and tool ([#418](https://github.com/googleapis/genai-toolbox/issues/418)) ([ae53b8e](https://github.com/googleapis/genai-toolbox/commit/ae53b8eeff9d0e9ec14d9c6d4286c856cc8f1811))
+* Add IAM AuthN to AlloyDB Source ([#399](https://github.com/googleapis/genai-toolbox/issues/399)) ([e8ed447](https://github.com/googleapis/genai-toolbox/commit/e8ed447d9153c60a1d6321285587e6e4ca930f87))
+* Add IAM AuthN to Cloud SQL Sources ([#414](https://github.com/googleapis/genai-toolbox/issues/414)) ([be85b82](https://github.com/googleapis/genai-toolbox/commit/be85b820785dbce79133b0cf8788bde75ff25fee))
+* Add toolset feature to mcp ([#425](https://github.com/googleapis/genai-toolbox/issues/425)) ([e307857](https://github.com/googleapis/genai-toolbox/commit/e307857085ac4c8c2ee8292c914daa5534ba74bf)), closes [#403](https://github.com/googleapis/genai-toolbox/issues/403)
+* Add SQLite source and tool ([#438](https://github.com/googleapis/genai-toolbox/issues/438)) ([fc14cbf](https://github.com/googleapis/genai-toolbox/commit/fc14cbfd078d465591e4fefb80542759e82a2731))
+* Support env replacement for tools.yaml ([#462](https://github.com/googleapis/genai-toolbox/issues/462)) ([eadb678](https://github.com/googleapis/genai-toolbox/commit/eadb678a7bd4ce74a3b1160f5ed8966ffbb13c61))
+
+
+### Bug Fixes
+
+* [#419](https://github.com/googleapis/genai-toolbox/issues/419) TLS https URL for SSE endpoint ([#420](https://github.com/googleapis/genai-toolbox/issues/420)) ([0a7d3ff](https://github.com/googleapis/genai-toolbox/commit/0a7d3ff06b88051c752b6d53bc964ed6e6be400e))
+* **docs:** Fix link 'Edit this page' ([#454](https://github.com/googleapis/genai-toolbox/issues/454)) ([969065e](https://github.com/googleapis/genai-toolbox/commit/969065e561f28ddb9755d99bbe0b288040198296)), closes [#427](https://github.com/googleapis/genai-toolbox/issues/427)
+* Update http error code from invocation ([#468](https://github.com/googleapis/genai-toolbox/issues/468)) ([ff7c0ff](https://github.com/googleapis/genai-toolbox/commit/ff7c0ffc65172a335e8d3321e5a6b92d38dc7e6d)), closes [#465](https://github.com/googleapis/genai-toolbox/issues/465)
+
+## [0.3.0](https://github.com/googleapis/genai-toolbox/compare/v0.2.1...v0.3.0) (2025-04-04)
+
+
+### Features
+
+* Add 'alloydb-ai-nl' tool ([#358](https://github.com/googleapis/genai-toolbox/issues/358)) ([f02885f](https://github.com/googleapis/genai-toolbox/commit/f02885fd4a919103fdabaa4ca38d975dc8497542))
+* Add HTTP Source and Tool ([#332](https://github.com/googleapis/genai-toolbox/issues/332)) ([64da5b4](https://github.com/googleapis/genai-toolbox/commit/64da5b4efe7d948ceb366c37fdaabd42405bc932))
+* Adding support for Model Context Protocol (MCP). ([#396](https://github.com/googleapis/genai-toolbox/issues/396)) ([a7d1d4e](https://github.com/googleapis/genai-toolbox/commit/a7d1d4eb2ae337b463d1b25ccb25c3c0eb30df6f))
+* Added [toolbox-core](https://pypi.org/project/toolbox-core/) SDK – easily integrate Toolbox into any Python function calling framework
+
+
+### Bug Fixes
+
+* Add `tools-file` flag and deprecate `tools_file`  ([#384](https://github.com/googleapis/genai-toolbox/issues/384)) ([34a7263](https://github.com/googleapis/genai-toolbox/commit/34a7263fdce40715de20ef5677f94be29f9f5c98)), closes [#383](https://github.com/googleapis/genai-toolbox/issues/383)
+
+## [0.2.1](https://github.com/googleapis/genai-toolbox/compare/v0.2.0...v0.2.1) (2025-03-20)
+
+
+### Bug Fixes
+
+* Fix variable name in quickstart ([#336](https://github.com/googleapis/genai-toolbox/issues/336)) ([5400127](https://github.com/googleapis/genai-toolbox/commit/54001278878042aff75ed421b9fbe70008e9dd4d))
+* **source/alloydb:** Correct user agents not being sent ([#323](https://github.com/googleapis/genai-toolbox/issues/323)) ([ce12a34](https://github.com/googleapis/genai-toolbox/commit/ce12a344ed6290c7c6e36ee117318c20d6fdccc2))
+
 ## [0.2.0](https://github.com/googleapis/genai-toolbox/compare/v0.1.0...v0.2.0) (2025-03-03)
 
 

DEVELOPER.md

@@ -17,9 +17,7 @@
 
 ### Run Toolbox from local source
 
-1. Open a local connection to your database by starting the [Cloud SQL Auth Proxy][cloudsql-proxy].
-
-1. You should already have a `tools.yaml` created with your [sources and tools configurations](./README.md#Configuration).
+1. Create a `tools.yaml` file with your [sources and tools configurations](./README.md#Configuration).
 
 1. You can specify flags for the Toolbox server. Execute the following to list the possible CLI flags:
 
@@ -41,20 +39,127 @@
     curl http://127.0.0.1:5000
     ```
 
-### Run tests locally
+### Testing
 
-1. Run lint with the following:
+#### Writing Tests
+
+New contributions should be added with both unit tests and integration tests.
+
+- Unit tests are in the same package as the source code.
+
+- Integration tests are in the `/tests` directory, under its dedicated package
+  named after its source. We have several pre-defined integration test suites
+  in the `/tests/tool.go` that are **required** to be run as long as your code contains related
+  features:
+
+  1. [RunToolGetTest][tool-get]: tests for the `GET` endpoint that returns the
+         tool's manifest.
+  
+  2. [RunToolInvokeTest][tool-call]: tests for tool calling through the native
+     Toolbox endpoints.
+
+  3. [RunMCPToolCallMethod][mcp-call]: tests tool calling through the MCP
+         endpoints.
+  
+  4. (Optional) [RunExecuteSqlToolInvokeTest][execute-sql]: tests an
+     `execute-sql` tool for any source. Only run this test if you are adding an
+     `execute-sql` tool.
+
+  5. (Optional) [RunToolInvokeWithTemplateParameters][temp-param]: tests for [template
+         parameters][temp-param-doc]. Only run this test if template parameters apply to your tool.
+  
+[tool-get]:
+    https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L31
+[tool-call]:
+    <https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L79>
+[mcp-call]:
+    https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L554
+[execute-sql]:
+    <https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L431>
+[temp-param]:
+    <https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/tests/tool.go#L297>
+[temp-param-doc]:
+    https://googleapis.github.io/genai-toolbox/resources/tools/#template-parameters
+
+#### Running Tests
+
+- Run the lint check:
 
     ```bash
     golangci-lint run --fix
     ```
 
-1. Run all tests with the following:
+- Run unit tests locally:
 
     ```bash
     go test -race -v ./...
     ```
 
+- Run integration tests locally:
+    1. Set required environment variables. For a complete lists of required
+    vairables for each source, check out the [Cloud Build testing
+    configuration](./.ci/integration.cloudbuild.yaml).
+        - Use your own GCP email as the `SERVICE_ACCOUNT_EMAIL`.
+        - Use the Google Cloud SDK application Client ID as the `CLIENT_ID`. Ask the
+        Toolbox maintainers if you don't know it already.
+
+    2. Run the integration test for your target source with the required Go
+    build tags specified at the top of each integration test file:
+
+        ```shell
+            go test -race -v ./tests/<YOUR_TEST_DIR>
+        ```
+
+        For example, to run the AlloyDB integration test, run:
+
+        ```shell
+            go test -race -v ./tests/alloydbpg
+        ```
+
+- Run integration tests on your PR:
+
+    For internal contributors, the testing workflows should trigger
+    automatically. For external contributors, ask the Toolbox
+    maintainers to trigger the testing workflows on your PR.
+
+## Developing Documentation
+
+Follow these steps to run a Hugo server for local preview:
+
+1. [Install Hugo](https://gohugo.io/installation/macos/) version 0.146.0+.
+1. Move into the `.hugo` directory
+
+    ```bash
+    cd .hugo
+    ```
+
+1. Install dependencies
+
+    ```bash
+    npm ci
+    ```
+
+1. Run the server
+
+    ```bash
+    hugo server
+    ```
+
+### PR documentation preview
+
+- For contributors:
+
+  - Ask a repo owner to run the preview deployment workflow on your PR. The preview link
+    will be commented under your PR automatically.
+
+- For maintainers:
+
+  - Inspect the proposed changes in the PR and ensure that it does not contain
+    malicious code changes. You should be especially alert to any proposed changes in the
+    `.github/workflows/` directory that affect workflow files.
+  - After you make sure the changes are safe, apply the `docs: deploy-preview`
+    label to the PR to deploy documentation preview.
+
 ## Compile the app locally
 
 ### Compile Toolbox binary
@@ -107,11 +212,9 @@
 
 ## Developing Toolbox SDKs
 
-Please refer to the [SDK developer guide](sdks/langchain/DEVELOPER.md)
+Please refer to the [SDK developer guide](https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/DEVELOPER.md)
 
-## CI/CD Details
-
-Cloud Build is used to run tests against Google Cloud resources in test project.
+## (Optional) Maintainer Information
 
 ### Releasing
 
@@ -143,21 +246,22 @@ Integration and unit tests are automatically triggered via CloudBuild during eac
 
 Create a Cloud Build trigger via the UI or `gcloud` with the following specs:
 
-* Event: Pull request
-* Region:
-    * global - for default worker pools
-* Source:
-  * Generation: 1st gen
-  * Repo: googleapis/genai-toolbox (GitHub App)
-  * Base branch: `^main$`
-* Comment control: Required except for owners and collaborators
-* Filters: add directory filter
-* Config: Cloud Build configuration file
-  * Location: Repository (add path to file)
-* Service account: set for demo service to enable ID token creation to use to authenticated services
+- Event: Pull request
+- Region:
+  - global - for default worker pools
+- Source:
+  - Generation: 1st gen
+  - Repo: googleapis/genai-toolbox (GitHub App)
+  - Base branch: `^main$`
+- Comment control: Required except for owners and collaborators
+- Filters: add directory filter
+- Config: Cloud Build configuration file
+  - Location: Repository (add path to file)
+- Service account: set for demo service to enable ID token creation to use to authenticated services
 
 ### Trigger
 
-To run Cloud Build tests on GitHub from external contributors, ie RenovateBot, comment: `/gcbrun`.
+Trigger the PR tests on PRs from external contributors:
 
-[cloudsql-proxy]: https://cloud.google.com/sql/docs/mysql/sql-proxy
+- Cloud Build tests: comment `/gcbrun`
+- Unit tests: add `tests:run` label

Dockerfile

@@ -13,18 +13,19 @@
 # limitations under the License.
 
 # Use the latest stable golang 1.x to compile to a binary
-FROM --platform=$BUILDPLATFORM golang:1 as build
+FROM --platform=$BUILDPLATFORM golang:1 AS build
 
 WORKDIR /go/src/genai-toolbox
 COPY . .
 
 ARG TARGETOS
 ARG TARGETARCH
-ARG METADATA_TAGS=dev
+ARG BUILD_TYPE="container.dev"
+ARG COMMIT_SHA=""
 
 RUN go get ./...
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
-    go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.metadataString=container.${METADATA_TAGS}"
+    go build -ldflags "-X github.com/googleapis/genai-toolbox/cmd.buildType=container.${BUILD_TYPE} -X github.com/googleapis/genai-toolbox/cmd.commitSha=${COMMIT_SHA}"
 
 # Final Stage
 FROM gcr.io/distroless/static:nonroot

README.md

@@ -1,17 +1,26 @@
+![logo](./logo.png)
 
-# 🧰 Gen AI Toolbox for Databases
+# MCP Toolbox for Databases
 
-> [!NOTE] 
-> Gen AI Toolbox for Databases is currently in beta, and may see breaking 
+[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/Dmm69peqjh)
+[![Go Report Card](https://goreportcard.com/badge/github.com/googleapis/genai-toolbox)](https://goreportcard.com/report/github.com/googleapis/genai-toolbox)
+
+> [!NOTE]
+> MCP Toolbox for Databases is currently in beta, and may see breaking
 > changes until the first stable release (v1.0).
 
-Gen AI Toolbox for Databases is an open source server that makes it easier to
-build Gen AI tools for interacting with databases. It enables you to develop
-tools easier, faster, and more securely by handling the complexities such as
-connection pooling, authentication, and more.
+MCP Toolbox for Databases is an open source MCP server for databases. It enables
+you to develop tools easier, faster, and more securely by handling the complexities
+such as connection pooling, authentication, and more.
 
-This README provides a brief overview. For comprehensive details, see the full
-[documentation](https://googleapis.github.io/genai-toolbox/).
+This README provides a brief overview. For comprehensive details, see the [full
+documentation](https://googleapis.github.io/genai-toolbox/).
+
+
+> [!NOTE]
+> This solution was originally named “Gen AI Toolbox for Databases” as
+> its initial development predated MCP, but was renamed to align with recently
+> added MCP compatibility.
 
 <!-- TOC ignore:true -->
 ## Table of Contents
@@ -48,6 +57,21 @@ database. Toolbox provides:
   support for OpenTelemetry.
 
 
+**⚡ Supercharge Your Workflow with an AI Database Assistant ⚡**
+
+Stop context-switching and let your AI assistant become a true co-developer. By [connecting your IDE to your databases with MCP Toolbox][connect-ide], you can delegate complex and time-consuming database tasks, allowing you to build faster and focus on what matters. This isn't just about code completion; it's about giving your AI the context it needs to handle the entire development lifecycle.
+
+Here’s how it will save you time:
+
+* **Query in Plain English**: Interact with your data using natural language right from your IDE. Ask complex questions like, *"How many orders were delivered in 2024, and what items were in them?"* without writing any SQL.
+* **Automate Database Management**: Simply describe your data needs, and let the AI assistant manage your database for you. It can handle generating queries, creating tables, adding indexes, and more.
+* **Generate Context-Aware Code**: Empower your AI assistant to generate application code and tests with a deep understanding of your real-time database schema.  This accelerates the development cycle by ensuring the generated code is directly usable.
+* **Slash Development Overhead**: Radically reduce the time spent on manual setup and boilerplate. MCP Toolbox helps streamline lengthy database configurations, repetitive code, and error-prone schema migrations.
+
+Learn [how to connect your AI tools (IDEs) to Toolbox using MCP][connect-ide].
+
+[connect-ide]: https://googleapis.github.io/genai-toolbox/how-to/connect-ide/
+
 ## General Architecture
 
 Toolbox sits between your application's orchestration framework and your
@@ -72,9 +96,10 @@ following instructions for your OS and CPU architecture.
 
 To install Toolbox as a binary:
 
+<!-- {x-release-please-start-version} -->
 ```sh
 # see releases page for other versions
-export VERSION=0.1.0
+export VERSION=0.7.0
 curl -O https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox
 chmod +x toolbox
 ```
@@ -87,7 +112,7 @@ You can also install Toolbox as a container:
 
 ```sh
 # see releases page for other versions
-export VERSION=0.1.0
+export VERSION=0.7.0
 docker pull us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION
 ```
 
@@ -100,8 +125,9 @@ To install from source, ensure you have the latest version of
 [Go installed](https://go.dev/doc/install), and then run the following command:
 
 ```sh
-go install github.com/googleapis/genai-toolbox@v0.1.0
+go install github.com/googleapis/genai-toolbox@v0.7.0
 ```
+<!-- {x-release-please-end} -->
 
 </details>
 
@@ -111,7 +137,7 @@ go install github.com/googleapis/genai-toolbox@v0.1.0
 execute `toolbox` to start the server:
 
 ```sh
-./toolbox --tools_file "tools.yaml"
+./toolbox --tools-file "tools.yaml"
 ```
 
 You can use `toolbox help` for a full list of flags! To stop the server, send a
@@ -127,6 +153,31 @@ Once your server is up and running, you can load the tools into your
 application. See below the list of Client SDKs for using various frameworks:
 
 <details open>
+<summary>Core</summary>
+
+1. Install [Toolbox Core SDK][toolbox-core]:
+    ```bash
+    pip install toolbox-core
+    ```
+1. Load tools:
+    ```python
+    from toolbox_core import ToolboxClient
+
+    # update the url to point to your server
+    async with ToolboxClient("http://127.0.0.1:5000") as client:
+
+        # these tools can be passed to your application!
+        tools = await client.load_toolset("toolset_name")
+    ```
+
+For more detailed instructions on using the Toolbox Core SDK, see the
+[project's README][toolbox-core-readme].
+
+[toolbox-core]: https://pypi.org/project/toolbox-core/
+[toolbox-core-readme]: https://github.com/googleapis/mcp-toolbox-sdk-python/tree/main/packages/toolbox-core/README.md
+
+</details>
+<details>
 <summary>LangChain / LangGraph</summary>
 
 1. Install [Toolbox LangChain SDK][toolbox-langchain]:
@@ -138,24 +189,50 @@ application. See below the list of Client SDKs for using various frameworks:
     from toolbox_langchain import ToolboxClient
 
     # update the url to point to your server
-    client = ToolboxClient("http://127.0.0.1:5000")
+    async with ToolboxClient("http://127.0.0.1:5000") as client:
 
-    # these tools can be passed to your application! 
-    tools = await client.aload_toolset()
+        # these tools can be passed to your application!
+        tools = client.load_toolset()
     ```
 
 For more detailed instructions on using the Toolbox LangChain SDK, see the
 [project's README][toolbox-langchain-readme].
 
-[toolbox-langchain]: https://github.com/googleapis/genai-toolbox-langchain-python
-[toolbox-langchain-readme]: https://github.com/googleapis/genai-toolbox-langchain-python/blob/main/README.md
+[toolbox-langchain]: https://pypi.org/project/toolbox-langchain/
+[toolbox-langchain-readme]: https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/packages/toolbox-langchain/README.md
+
+</details>
+
+<details>
+<summary>LlamaIndex</summary>
+
+1. Install [Toolbox Llamaindex SDK][toolbox-llamaindex]:
+    ```bash
+    pip install toolbox-llamaindex
+    ```
+1. Load tools:
+    ```python
+    from toolbox_llamaindex import ToolboxClient
+
+    # update the url to point to your server
+    async with ToolboxClient("http://127.0.0.1:5000") as client:
+
+        # these tools can be passed to your application!
+        tools = client.load_toolset()
+    ```
+
+For more detailed instructions on using the Toolbox Llamaindex SDK, see the
+[project's README][toolbox-llamaindex-readme].
+
+[toolbox-llamaindex]: https://pypi.org/project/toolbox-llamaindex/
+[toolbox-llamaindex-readme]: https://github.com/googleapis/genai-toolbox-llamaindex-python/blob/main/README.md
 
 </details>
 
 ## Configuration
 
 The primary way to configure Toolbox is through the `tools.yaml` file. If you
-have multiple files, you can tell toolbox which to load with the `--tools_file
+have multiple files, you can tell toolbox which to load with the `--tools-file
 tools.yaml` flag.
 
 You can find more detailed reference documentation to all resource types in the
@@ -182,9 +259,8 @@ For more details on configuring different types of sources, see the
 
 ### Tools
 
-The `tools` section of your `tools.yaml` define your the actions your agent can
-take: what kind of tool it is, which source(s) it affects, what parameters it
-uses, etc.
+The `tools` section of a `tools.yaml` define the actions an agent can take: what
+kind of tool it is, which source(s) it affects, what parameters it uses, etc.
 
 ```yaml
 tools:
@@ -223,10 +299,10 @@ You can load toolsets by name:
 
 ```python
 # This will load all tools
-all_tools = await client.aload_toolset()
+all_tools = client.load_toolset()
 
 # This will only load the tools listed in 'my_second_toolset'
-my_second_toolset = await client.aload_toolset("my_second_toolset")
+my_second_toolset = client.load_toolset("my_second_toolset")
 ```
 
 ## Versioning
@@ -239,7 +315,7 @@ This project uses [semantic versioning](https://semver.org/), including a
 - PATCH version when we make backward compatible bug fixes
 
 The public API that this applies to is the CLI associated with Toolbox, the
-interactions with official SDKs, and the definitions in the `tools.yaml` file. 
+interactions with official SDKs, and the definitions in the `tools.yaml` file.
 
 ## Contributing
 

cmd/root.go

@@ -21,24 +21,75 @@ import (
 	"io"
 	"os"
 	"os/signal"
+	"regexp"
+	"runtime"
 	"strings"
 	"syscall"
 	"time"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/log"
+	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
 	"github.com/googleapis/genai-toolbox/internal/server"
 	"github.com/googleapis/genai-toolbox/internal/telemetry"
 	"github.com/googleapis/genai-toolbox/internal/util"
+
+	// Import tool packages for side effect of registration
+	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydbainl"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigqueryexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquerygetdatasetinfo"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquerygettableinfo"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquerylistdatasetids"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquerylisttableids"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigtable"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/couchbase"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/dgraph"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/http"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mssqlexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mssqlsql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mysqlexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mysqlsql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/neo4j"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgresexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgressql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/redis"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/spannerexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlitesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/valkey"
+
 	"github.com/spf13/cobra"
+
+	_ "github.com/googleapis/genai-toolbox/internal/sources/alloydbpg"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/bigquery"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/bigtable"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmssql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmysql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/couchbase"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/dgraph"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/http"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/mssql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/mysql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/neo4j"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/postgres"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/redis"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/spanner"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/sqlite"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/valkey"
 )
 
 var (
-	// versionString indicates the version of this library.
-	//go:embed version.txt
+	// versionString stores the full semantic version, including build metadata.
 	versionString string
+	// versionNum indicates the numerical part fo the version
+	//go:embed version.txt
+	versionNum string
 	// metadataString indicates additional build or distribution metadata.
-	metadataString string
+	buildType string = "dev" // should be one of "dev", "binary", or "container"
+	// commitSha is the git commit it was built from
+	commitSha string
 )
 
 func init() {
@@ -47,10 +98,11 @@ func init() {
 
 // semanticVersion returns the version of the CLI including a compile-time metadata.
 func semanticVersion() string {
-	v := strings.TrimSpace(versionString)
-	if metadataString != "" {
-		v += "+" + metadataString
+	metadataStrings := []string{buildType, runtime.GOOS, runtime.GOARCH}
+	if commitSha != "" {
+		metadataStrings = append(metadataStrings, commitSha)
 	}
+	v := strings.TrimSpace(versionNum) + "+" + strings.Join(metadataStrings, ".")
 	return v
 }
 
@@ -67,15 +119,18 @@ func Execute() {
 type Command struct {
 	*cobra.Command
 
-	cfg        server.ServerConfig
-	logger     log.Logger
-	tools_file string
-	outStream  io.Writer
-	errStream  io.Writer
+	cfg            server.ServerConfig
+	logger         log.Logger
+	tools_file     string
+	prebuiltConfig string
+	inStream       io.Reader
+	outStream      io.Writer
+	errStream      io.Writer
 }
 
 // NewCommand returns a Command object representing an invocation of the CLI.
 func NewCommand(opts ...Option) *Command {
+	in := os.Stdin
 	out := os.Stdout
 	err := os.Stderr
 
@@ -86,6 +141,7 @@ func NewCommand(opts ...Option) *Command {
 	}
 	cmd := &Command{
 		Command:   baseCmd,
+		inStream:  in,
 		outStream: out,
 		errStream: err,
 	}
@@ -97,7 +153,8 @@ func NewCommand(opts ...Option) *Command {
 	// Set server version
 	cmd.cfg.Version = versionString
 
-	// set baseCmd out and err the same as cmd.
+	// set baseCmd in, out and err the same as cmd.
+	baseCmd.SetIn(cmd.inStream)
 	baseCmd.SetOut(cmd.outStream)
 	baseCmd.SetErr(cmd.errStream)
 
@@ -105,12 +162,17 @@ func NewCommand(opts ...Option) *Command {
 	flags.StringVarP(&cmd.cfg.Address, "address", "a", "127.0.0.1", "Address of the interface the server will listen on.")
 	flags.IntVarP(&cmd.cfg.Port, "port", "p", 5000, "Port the server will listen on.")
 
-	flags.StringVar(&cmd.tools_file, "tools_file", "tools.yaml", "File path specifying the tool configuration.")
+	flags.StringVar(&cmd.tools_file, "tools_file", "", "File path specifying the tool configuration. Cannot be used with --prebuilt.")
+	// deprecate tools_file
+	_ = flags.MarkDeprecated("tools_file", "please use --tools-file instead")
+	flags.StringVar(&cmd.tools_file, "tools-file", "", "File path specifying the tool configuration. Cannot be used with --prebuilt.")
 	flags.Var(&cmd.cfg.LogLevel, "log-level", "Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'.")
 	flags.Var(&cmd.cfg.LoggingFormat, "logging-format", "Specify logging format to use. Allowed: 'standard' or 'JSON'.")
 	flags.BoolVar(&cmd.cfg.TelemetryGCP, "telemetry-gcp", false, "Enable exporting directly to Google Cloud Monitoring.")
 	flags.StringVar(&cmd.cfg.TelemetryOTLP, "telemetry-otlp", "", "Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. 'http://127.0.0.1:4318')")
 	flags.StringVar(&cmd.cfg.TelemetryServiceName, "telemetry-service-name", "toolbox", "Sets the value of the service.name resource attribute for telemetry data.")
+	flags.StringVar(&cmd.prebuiltConfig, "prebuilt", "", "Use a prebuilt tool configuration by source type. Cannot be used with --tools-file. Allowed: 'alloydb-postgres', 'bigquery', 'cloud-sql-mysql', 'cloud-sql-postgres', 'cloud-sql-mssql', 'postgres', 'spanner', 'spanner-postgres'.")
+	flags.BoolVar(&cmd.cfg.Stdio, "stdio", false, "Listens via MCP STDIO instead of acting as a remote HTTP server.")
 
 	// wrap RunE command so that we have access to original Command object
 	cmd.RunE = func(*cobra.Command, []string) error { return run(cmd) }
@@ -126,9 +188,31 @@ type ToolsFile struct {
 	Toolsets     server.ToolsetConfigs     `yaml:"toolsets"`
 }
 
+// parseEnv replaces environment variables ${ENV_NAME} with their values.
+func parseEnv(input string) string {
+	re := regexp.MustCompile(`\$\{(\w+)\}`)
+
+	return re.ReplaceAllStringFunc(input, func(match string) string {
+		parts := re.FindStringSubmatch(match)
+		if len(parts) < 2 {
+			// technically shouldn't happen
+			return match
+		}
+
+		// extract the variable name
+		variableName := parts[1]
+		if value, found := os.LookupEnv(variableName); found {
+			return value
+		}
+		return match
+	})
+}
+
 // parseToolsFile parses the provided yaml into appropriate configs.
 func parseToolsFile(ctx context.Context, raw []byte) (ToolsFile, error) {
 	var toolsFile ToolsFile
+	// Replace environment variables if found
+	raw = []byte(parseEnv(string(raw)))
 	// Parse contents
 	err := yaml.UnmarshalContext(ctx, raw, &toolsFile, yaml.Strict())
 	if err != nil {
@@ -137,7 +221,25 @@ func parseToolsFile(ctx context.Context, raw []byte) (ToolsFile, error) {
 	return toolsFile, nil
 }
 
+// updateLogLevel checks if Toolbox have to update the existing log level set by users.
+// stdio doesn't support "debug" and "info" logs.
+func updateLogLevel(stdio bool, logLevel string) bool {
+	if stdio {
+		switch strings.ToUpper(logLevel) {
+		case log.Debug, log.Info:
+			return true
+		default:
+			return false
+		}
+	}
+	return false
+}
+
 func run(cmd *Command) error {
+	if updateLogLevel(cmd.cfg.Stdio, cmd.cfg.LogLevel.String()) {
+		cmd.cfg.LogLevel = server.StringLevel(log.Warn)
+	}
+
 	ctx, cancel := context.WithCancel(cmd.Context())
 	defer cancel()
 
@@ -176,13 +278,13 @@ func run(cmd *Command) error {
 		}
 		cmd.logger = logger
 	default:
-		return fmt.Errorf("logging format invalid.")
+		return fmt.Errorf("logging format invalid")
 	}
 
 	ctx = util.WithLogger(ctx, cmd.logger)
 
 	// Set up OpenTelemetry
-	otelShutdown, err := telemetry.SetupOTel(ctx, cmd.Command.Version, cmd.cfg.TelemetryOTLP, cmd.cfg.TelemetryGCP, cmd.cfg.TelemetryServiceName)
+	otelShutdown, err := telemetry.SetupOTel(ctx, cmd.cfg.Version, cmd.cfg.TelemetryOTLP, cmd.cfg.TelemetryGCP, cmd.cfg.TelemetryServiceName)
 	if err != nil {
 		errMsg := fmt.Errorf("error setting up OpenTelemetry: %w", err)
 		cmd.logger.ErrorContext(ctx, errMsg.Error())
@@ -196,13 +298,39 @@ func run(cmd *Command) error {
 		}
 	}()
 
-	// Read tool file contents
-	buf, err := os.ReadFile(cmd.tools_file)
-	if err != nil {
-		errMsg := fmt.Errorf("unable to read tool file at %q: %w", cmd.tools_file, err)
-		cmd.logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
+	var buf []byte
+
+	if cmd.prebuiltConfig != "" {
+		// Make sure --prebuilt and --tools-file flags are mutually exclusive
+		if cmd.tools_file != "" {
+			errMsg := fmt.Errorf("--prebuilt and --tools-file flags cannot be used simultaneously")
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
+			return errMsg
+		}
+		// Use prebuilt tools
+		buf, err = prebuiltconfigs.Get(cmd.prebuiltConfig)
+		if err != nil {
+			cmd.logger.ErrorContext(ctx, err.Error())
+			return err
+		}
+		logMsg := fmt.Sprint("Using prebuilt tool configuration for ", cmd.prebuiltConfig)
+		cmd.logger.InfoContext(ctx, logMsg)
+		// Append prebuilt.source to Version string for the User Agent
+		cmd.cfg.Version += "+prebuilt." + cmd.prebuiltConfig
+	} else {
+		// Set default value of tools-file flag to tools.yaml
+		if cmd.tools_file == "" {
+			cmd.tools_file = "tools.yaml"
+		}
+		// Read tool file contents
+		buf, err = os.ReadFile(cmd.tools_file)
+		if err != nil {
+			errMsg := fmt.Errorf("unable to read tool file at %q: %w", cmd.tools_file, err)
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
+			return errMsg
+		}
 	}
+
 	toolsFile, err := parseToolsFile(ctx, buf)
 	cmd.cfg.SourceConfigs, cmd.cfg.AuthServiceConfigs, cmd.cfg.ToolConfigs, cmd.cfg.ToolsetConfigs = toolsFile.Sources, toolsFile.AuthServices, toolsFile.Tools, toolsFile.Toolsets
 	authSourceConfigs := toolsFile.AuthSources
@@ -224,23 +352,33 @@ func run(cmd *Command) error {
 		return errMsg
 	}
 
-	err = s.Listen(ctx)
-	if err != nil {
-		errMsg := fmt.Errorf("toolbox failed to start listener: %w", err)
-		cmd.logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-	cmd.logger.InfoContext(ctx, "Server ready to serve!")
-
 	// run server in background
 	srvErr := make(chan error)
-	go func() {
-		defer close(srvErr)
-		err = s.Serve()
+	if cmd.cfg.Stdio {
+		go func() {
+			defer close(srvErr)
+			err = s.ServeStdio(ctx, cmd.inStream, cmd.outStream)
+			if err != nil {
+				srvErr <- err
+			}
+		}()
+	} else {
+		err = s.Listen(ctx)
 		if err != nil {
-			srvErr <- err
+			errMsg := fmt.Errorf("toolbox failed to start listener: %w", err)
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
+			return errMsg
 		}
-	}()
+		cmd.logger.InfoContext(ctx, "Server ready to serve!")
+
+		go func() {
+			defer close(srvErr)
+			err = s.Serve(ctx)
+			if err != nil {
+				srvErr <- err
+			}
+		}()
+	}
 
 	// wait for either the server to error out or the command's context to be canceled
 	select {
@@ -256,7 +394,7 @@ func run(cmd *Command) error {
 		cmd.logger.WarnContext(shutdownContext, "Shutting down gracefully...")
 		err := s.Shutdown(shutdownContext)
 		if err == context.DeadlineExceeded {
-			return fmt.Errorf("graceful shutdown timed out... forcing exit.")
+			return fmt.Errorf("graceful shutdown timed out... forcing exit")
 		}
 	}
 

cmd/root_test.go

@@ -18,23 +18,29 @@ import (
 	"bytes"
 	_ "embed"
 	"os"
+	"runtime"
 	"strings"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
 
 	"github.com/googleapis/genai-toolbox/internal/auth/google"
+	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
 	"github.com/googleapis/genai-toolbox/internal/server"
 	cloudsqlpgsrc "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
+	httpsrc "github.com/googleapis/genai-toolbox/internal/sources/http"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/tools/http"
 	"github.com/googleapis/genai-toolbox/internal/tools/postgressql"
 	"github.com/spf13/cobra"
 )
 
 func withDefaults(c server.ServerConfig) server.ServerConfig {
 	data, _ := os.ReadFile("version.txt")
-	c.Version = strings.TrimSpace(string(data))
+	version := strings.TrimSpace(string(data)) // Preserving 'data', new var for clarity
+	c.Version = version + "+" + strings.Join([]string{"dev", runtime.GOOS, runtime.GOARCH}, ".")
+
 	if c.Address == "" {
 		c.Address = "127.0.0.1"
 	}
@@ -161,6 +167,13 @@ func TestServerConfigFlags(t *testing.T) {
 				TelemetryServiceName: "toolbox-custom",
 			}),
 		},
+		{
+			desc: "stdio",
+			args: []string{"--stdio"},
+			want: withDefaults(server.ServerConfig{
+				Stdio: true,
+			}),
+		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
@@ -185,18 +198,53 @@ func TestToolFileFlag(t *testing.T) {
 		{
 			desc: "default value",
 			args: []string{},
-			want: "tools.yaml",
+			want: "",
 		},
 		{
 			desc: "foo file",
-			args: []string{"--tools_file", "foo.yaml"},
+			args: []string{"--tools-file", "foo.yaml"},
 			want: "foo.yaml",
 		},
 		{
 			desc: "address long",
-			args: []string{"--tools_file", "bar.yaml"},
+			args: []string{"--tools-file", "bar.yaml"},
 			want: "bar.yaml",
 		},
+		{
+			desc: "deprecated flag",
+			args: []string{"--tools_file", "foo.yaml"},
+			want: "foo.yaml",
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			c, _, err := invokeCommand(tc.args)
+			if err != nil {
+				t.Fatalf("unexpected error invoking command: %s", err)
+			}
+			if c.tools_file != tc.want {
+				t.Fatalf("got %v, want %v", c.cfg, tc.want)
+			}
+		})
+	}
+}
+
+func TestPrebuiltFlag(t *testing.T) {
+	tcs := []struct {
+		desc string
+		args []string
+		want string
+	}{
+		{
+			desc: "default value",
+			args: []string{},
+			want: "",
+		},
+		{
+			desc: "custom pre built flag",
+			args: []string{"--tools-file", "alloydb"},
+			want: "alloydb",
+		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
@@ -313,13 +361,14 @@ func TestParseToolFile(t *testing.T) {
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
 						Name:        "example_tool",
-						Kind:        postgressql.ToolKind,
+						Kind:        "postgres-sql",
 						Source:      "my-pg-instance",
 						Description: "some description",
 						Statement:   "SELECT * FROM SQL_STATEMENT;\n",
 						Parameters: []tools.Parameter{
 							tools.NewStringParameter("country", "some description"),
 						},
+						AuthRequired: []string{},
 					},
 				},
 				Toolsets: server.ToolsetConfigs{
@@ -442,11 +491,12 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
-						Name:        "example_tool",
-						Kind:        postgressql.ToolKind,
-						Source:      "my-pg-instance",
-						Description: "some description",
-						Statement:   "SELECT * FROM SQL_STATEMENT;\n",
+						Name:         "example_tool",
+						Kind:         "postgres-sql",
+						Source:       "my-pg-instance",
+						Description:  "some description",
+						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
+						AuthRequired: []string{},
 						Parameters: []tools.Parameter{
 							tools.NewStringParameter("country", "some description"),
 							tools.NewIntParameterWithAuth("id", "user id", []tools.ParamAuthService{{Name: "my-google-service", Field: "user_id"}}),
@@ -540,11 +590,113 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
-						Name:        "example_tool",
-						Kind:        postgressql.ToolKind,
-						Source:      "my-pg-instance",
-						Description: "some description",
-						Statement:   "SELECT * FROM SQL_STATEMENT;\n",
+						Name:         "example_tool",
+						Kind:         "postgres-sql",
+						Source:       "my-pg-instance",
+						Description:  "some description",
+						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
+						AuthRequired: []string{},
+						Parameters: []tools.Parameter{
+							tools.NewStringParameter("country", "some description"),
+							tools.NewIntParameterWithAuth("id", "user id", []tools.ParamAuthService{{Name: "my-google-service", Field: "user_id"}}),
+							tools.NewStringParameterWithAuth("email", "user email", []tools.ParamAuthService{{Name: "my-google-service", Field: "email"}, {Name: "other-google-service", Field: "other_email"}}),
+						},
+					},
+				},
+				Toolsets: server.ToolsetConfigs{
+					"example_toolset": tools.ToolsetConfig{
+						Name:      "example_toolset",
+						ToolNames: []string{"example_tool"},
+					},
+				},
+			},
+		},
+		{
+			description: "basic example with authRequired",
+			in: `
+			sources:
+				my-pg-instance:
+					kind: cloud-sql-postgres
+					project: my-project
+					region: my-region
+					instance: my-instance
+					database: my_db
+					user: my_user
+					password: my_pass
+			authServices:
+				my-google-service:
+					kind: google
+					clientId: my-client-id
+				other-google-service:
+					kind: google
+					clientId: other-client-id
+
+			tools:
+				example_tool:
+					kind: postgres-sql
+					source: my-pg-instance
+					description: some description
+					statement: |
+						SELECT * FROM SQL_STATEMENT;
+					authRequired:
+						- my-google-service
+					parameters:
+						- name: country
+						  type: string
+						  description: some description
+						- name: id
+						  type: integer
+						  description: user id
+						  authServices:
+							- name: my-google-service
+								field: user_id
+						- name: email
+							type: string
+							description: user email
+							authServices:
+							- name: my-google-service
+							  field: email
+							- name: other-google-service
+							  field: other_email
+
+			toolsets:
+				example_toolset:
+					- example_tool
+			`,
+			wantToolsFile: ToolsFile{
+				Sources: server.SourceConfigs{
+					"my-pg-instance": cloudsqlpgsrc.Config{
+						Name:     "my-pg-instance",
+						Kind:     cloudsqlpgsrc.SourceKind,
+						Project:  "my-project",
+						Region:   "my-region",
+						Instance: "my-instance",
+						IPType:   "public",
+						Database: "my_db",
+						User:     "my_user",
+						Password: "my_pass",
+					},
+				},
+				AuthServices: server.AuthServiceConfigs{
+					"my-google-service": google.Config{
+						Name:     "my-google-service",
+						Kind:     google.AuthServiceKind,
+						ClientID: "my-client-id",
+					},
+					"other-google-service": google.Config{
+						Name:     "other-google-service",
+						Kind:     google.AuthServiceKind,
+						ClientID: "other-client-id",
+					},
+				},
+				Tools: server.ToolConfigs{
+					"example_tool": postgressql.Config{
+						Name:         "example_tool",
+						Kind:         "postgres-sql",
+						Source:       "my-pg-instance",
+						Description:  "some description",
+						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
+						AuthRequired: []string{"my-google-service"},
 						Parameters: []tools.Parameter{
 							tools.NewStringParameter("country", "some description"),
 							tools.NewIntParameterWithAuth("id", "user id", []tools.ParamAuthService{{Name: "my-google-service", Field: "user_id"}}),
@@ -583,3 +735,328 @@ func TestParseToolFileWithAuth(t *testing.T) {
 	}
 
 }
+
+func TestEnvVarReplacement(t *testing.T) {
+	ctx, err := testutils.ContextWithNewLogger()
+	os.Setenv("TestHeader", "ACTUAL_HEADER")
+	os.Setenv("API_KEY", "ACTUAL_API_KEY")
+	os.Setenv("clientId", "ACTUAL_CLIENT_ID")
+	os.Setenv("clientId2", "ACTUAL_CLIENT_ID_2")
+	os.Setenv("toolset_name", "ACTUAL_TOOLSET_NAME")
+	os.Setenv("cat_string", "cat")
+	os.Setenv("food_string", "food")
+
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	tcs := []struct {
+		description   string
+		in            string
+		wantToolsFile ToolsFile
+	}{
+		{
+			description: "file with env var example",
+			in: `
+			sources:
+				my-http-instance:
+					kind: http
+					baseUrl: http://test_server/
+					timeout: 10s
+					headers:
+						Authorization: ${TestHeader}
+					queryParams:
+						api-key: ${API_KEY}
+			authServices:
+				my-google-service:
+					kind: google
+					clientId: ${clientId}
+				other-google-service:
+					kind: google
+					clientId: ${clientId2}
+
+			tools:
+				example_tool:
+					kind: http
+					source: my-instance
+					method: GET
+					path: "search?name=alice&pet=${cat_string}"
+					description: some description
+					authRequired:
+						- my-google-auth-service
+						- other-auth-service
+					queryParams:
+						- name: country
+						  type: string
+						  description: some description
+						  authServices:
+							- name: my-google-auth-service
+							  field: user_id
+							- name: other-auth-service
+							  field: user_id
+					requestBody: |
+							{
+								"age": {{.age}},
+								"city": "{{.city}}",
+								"food": "${food_string}",
+								"other": "$OTHER"
+							}
+					bodyParams:
+						- name: age
+						  type: integer
+						  description: age num
+						- name: city
+						  type: string
+						  description: city string
+					headers:
+						Authorization: API_KEY
+						Content-Type: application/json
+					headerParams:
+						- name: Language
+						  type: string
+						  description: language string
+
+			toolsets:
+				${toolset_name}:
+					- example_tool
+			`,
+			wantToolsFile: ToolsFile{
+				Sources: server.SourceConfigs{
+					"my-http-instance": httpsrc.Config{
+						Name:           "my-http-instance",
+						Kind:           httpsrc.SourceKind,
+						BaseURL:        "http://test_server/",
+						Timeout:        "10s",
+						DefaultHeaders: map[string]string{"Authorization": "ACTUAL_HEADER"},
+						QueryParams:    map[string]string{"api-key": "ACTUAL_API_KEY"},
+					},
+				},
+				AuthServices: server.AuthServiceConfigs{
+					"my-google-service": google.Config{
+						Name:     "my-google-service",
+						Kind:     google.AuthServiceKind,
+						ClientID: "ACTUAL_CLIENT_ID",
+					},
+					"other-google-service": google.Config{
+						Name:     "other-google-service",
+						Kind:     google.AuthServiceKind,
+						ClientID: "ACTUAL_CLIENT_ID_2",
+					},
+				},
+				Tools: server.ToolConfigs{
+					"example_tool": http.Config{
+						Name:         "example_tool",
+						Kind:         "http",
+						Source:       "my-instance",
+						Method:       "GET",
+						Path:         "search?name=alice&pet=cat",
+						Description:  "some description",
+						AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
+						QueryParams: []tools.Parameter{
+							tools.NewStringParameterWithAuth("country", "some description",
+								[]tools.ParamAuthService{{Name: "my-google-auth-service", Field: "user_id"},
+									{Name: "other-auth-service", Field: "user_id"}}),
+						},
+						RequestBody: `{
+  "age": {{.age}},
+  "city": "{{.city}}",
+  "food": "food",
+  "other": "$OTHER"
+}
+`,
+						BodyParams:   []tools.Parameter{tools.NewIntParameter("age", "age num"), tools.NewStringParameter("city", "city string")},
+						Headers:      map[string]string{"Authorization": "API_KEY", "Content-Type": "application/json"},
+						HeaderParams: []tools.Parameter{tools.NewStringParameter("Language", "language string")},
+					},
+				},
+				Toolsets: server.ToolsetConfigs{
+					"ACTUAL_TOOLSET_NAME": tools.ToolsetConfig{
+						Name:      "ACTUAL_TOOLSET_NAME",
+						ToolNames: []string{"example_tool"},
+					},
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.description, func(t *testing.T) {
+			toolsFile, err := parseToolsFile(ctx, testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("failed to parse input: %v", err)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Sources, toolsFile.Sources); diff != "" {
+				t.Fatalf("incorrect sources parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.AuthServices, toolsFile.AuthServices); diff != "" {
+				t.Fatalf("incorrect authServices parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Tools, toolsFile.Tools); diff != "" {
+				t.Fatalf("incorrect tools parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Toolsets, toolsFile.Toolsets); diff != "" {
+				t.Fatalf("incorrect tools parse: diff %v", diff)
+			}
+		})
+	}
+
+}
+
+func TestPrebuiltTools(t *testing.T) {
+	alloydb_config, _ := prebuiltconfigs.Get("alloydb-postgres")
+	bigquery_config, _ := prebuiltconfigs.Get("bigquery")
+	cloudsqlpg_config, _ := prebuiltconfigs.Get("cloud-sql-postgres")
+	cloudsqlmysql_config, _ := prebuiltconfigs.Get("cloud-sql-mysql")
+	cloudsqlmssql_config, _ := prebuiltconfigs.Get("cloud-sql-mssql")
+	postgresconfig, _ := prebuiltconfigs.Get("postgres")
+	spanner_config, _ := prebuiltconfigs.Get("spanner")
+	spannerpg_config, _ := prebuiltconfigs.Get("spanner-postgres")
+	ctx, err := testutils.ContextWithNewLogger()
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	tcs := []struct {
+		name        string
+		in          []byte
+		wantToolset server.ToolsetConfigs
+	}{
+		{
+			name: "alloydb prebuilt tools",
+			in:   alloydb_config,
+			wantToolset: server.ToolsetConfigs{
+				"alloydb-postgres-database-tools": tools.ToolsetConfig{
+					Name:      "alloydb-postgres-database-tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "bigquery prebuilt tools",
+			in:   bigquery_config,
+			wantToolset: server.ToolsetConfigs{
+				"bigquery-database-tools": tools.ToolsetConfig{
+					Name:      "bigquery-database-tools",
+					ToolNames: []string{"execute_sql", "get_dataset_info", "get_table_info", "list_dataset_ids", "list_table_ids"},
+				},
+			},
+		},
+		{
+			name: "cloudsqlpg prebuilt tools",
+			in:   cloudsqlpg_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud-sql-postgres-database-tools": tools.ToolsetConfig{
+					Name:      "cloud-sql-postgres-database-tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "cloudsqlmysql prebuilt tools",
+			in:   cloudsqlmysql_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud-sql-mysql-database-tools": tools.ToolsetConfig{
+					Name:      "cloud-sql-mysql-database-tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "cloudsqlmssql prebuilt tools",
+			in:   cloudsqlmssql_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud-sql-mssql-database-tools": tools.ToolsetConfig{
+					Name:      "cloud-sql-mssql-database-tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "postgres prebuilt tools",
+			in:   postgresconfig,
+			wantToolset: server.ToolsetConfigs{
+				"postgres-database-tools": tools.ToolsetConfig{
+					Name:      "postgres-database-tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "spanner prebuilt tools",
+			in:   spanner_config,
+			wantToolset: server.ToolsetConfigs{
+				"spanner-database-tools": tools.ToolsetConfig{
+					Name:      "spanner-database-tools",
+					ToolNames: []string{"execute_sql", "execute_sql_dql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "spanner pg prebuilt tools",
+			in:   spannerpg_config,
+			wantToolset: server.ToolsetConfigs{
+				"spanner-postgres-database-tools": tools.ToolsetConfig{
+					Name:      "spanner-postgres-database-tools",
+					ToolNames: []string{"execute_sql", "execute_sql_dql", "list_tables"},
+				},
+			},
+		},
+	}
+
+	for _, tc := range tcs {
+		t.Run(tc.name, func(t *testing.T) {
+			toolsFile, err := parseToolsFile(ctx, tc.in)
+			if err != nil {
+				t.Fatalf("failed to parse input: %v", err)
+			}
+			if diff := cmp.Diff(tc.wantToolset, toolsFile.Toolsets); diff != "" {
+				t.Fatalf("incorrect tools parse: diff %v", diff)
+			}
+		})
+	}
+}
+
+func TestUpdateLogLevel(t *testing.T) {
+	tcs := []struct {
+		desc     string
+		stdio    bool
+		logLevel string
+		want     bool
+	}{
+		{
+			desc:     "no stdio",
+			stdio:    false,
+			logLevel: "info",
+			want:     false,
+		},
+		{
+			desc:     "stdio with info log",
+			stdio:    true,
+			logLevel: "info",
+			want:     true,
+		},
+		{
+			desc:     "stdio with debug log",
+			stdio:    true,
+			logLevel: "debug",
+			want:     true,
+		},
+		{
+			desc:     "stdio with warn log",
+			stdio:    true,
+			logLevel: "warn",
+			want:     false,
+		},
+		{
+			desc:     "stdio with error log",
+			stdio:    true,
+			logLevel: "error",
+			want:     false,
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			got := updateLogLevel(tc.stdio, tc.logLevel)
+			if got != tc.want {
+				t.Fatalf("incorrect indication to update log level: got %t, want %t", got, tc.want)
+			}
+		})
+	}
+}

cmd/version.txt

@@ -1 +1 @@
-0.2.0
+0.7.0

docs/en/_index.md

@@ -12,4 +12,4 @@ description: >
     <link rel="canonical" href="getting-started/introduction/"/>
     <meta http-equiv="refresh" content="0;url=getting-started/introduction"/>
   </head>
-</html>
+</html>

docs/en/about/_index.md

@@ -1,6 +1,7 @@
 ---
 title: "About"
 type: docs
-weight: 5
-description: A list of other information related to Toolbox.
+weight: 6
+description: >
+  A list of other information related to Toolbox.
 ---

docs/en/about/blogs.md

@@ -0,0 +1,23 @@
+---
+title: "Blogs"
+type: docs
+weight: 3
+description: Toolbox Tuesday blog posts.
+---
+
+## Toolbox Tuesday Blogs
+
+Every Tuesday, we post a blog on our [Medium page][medium]. These blogs will be covering
+topics, tutorials, or samples that are related to developing with Toolbox.
+Follow us and stay tuned!
+
+## Previous Blogs
+
+- [Powering your IDE’s build-time agents with MCP Toolbox for Databases][blog1]
+- [Using HTTP endpoints as tools with MCP Toolbox for Databases][blog2]
+
+[medium]: https://medium.com/@mcp_toolbox
+[blog1]:
+    https://medium.com/google-cloud/powering-your-ides-build-time-agents-with-mcp-toolbox-for-databases-123f0d837804
+[blog2]:
+    https://medium.com/google-cloud/using-http-endpoints-as-tools-with-mcp-toolbox-for-databases-e93ab75b60cd

docs/en/about/contact.md

@@ -0,0 +1,22 @@
+---
+title: "Contact Us"
+type: docs
+weight: 10
+description: Contact the Toolbox team.
+---
+
+Toolbox is an open source project and we welcome contributions and discussion from the
+developer community.
+
+## How to Get in Touch
+
+- If you want to make a contribution, [open an issue][issue] first so that we can agree
+  on the general design.
+
+- If you found a bug or have ideas for improvements, [open an issue][issue] and
+  we will reply as soon as possible.
+
+- For any topics, join our [discord server][discord], where we can discuss things in real-time for a faster response.
+
+  [issue]: https://github.com/googleapis/genai-toolbox/issues
+  [discord]: https://discord.com/invite/Dmm69peqjh

docs/en/about/faq.md

@@ -7,7 +7,7 @@ description: Frequently asked questions about Toolbox.
 
 ## How can I deploy or run Toolbox?
 
-Gen AI Toolbox for Databases is open-source and can be ran or deployed to a
+MCP Toolbox for Databases is open-source and can be ran or deployed to a
 multitude of environments. For convenience, we release [compiled binaries and
 docker images][release-notes] (but you can always compile yourself as well!). 
 
@@ -75,14 +75,13 @@ While a large part of the Gen AI Ecosystem is predominately Python, we opted to
 use Go. We chose Go because it's still easy and simple to use, but also easier
 to write fast, efficient, and concurrent servers. Additionally, given the
 server-client architecture, we can still meet many developers where they are
-with clients in their preferred language. As Gen AI matures, we want developers to be able to use Toolbox on the serving path of mission critical applications. It's easier to build the needed robustness, performance and scalability in Go than in Python.
+with clients in their preferred language. As Gen AI matures, we want developers
+to be able to use Toolbox on the serving path of mission critical applications.
+It's easier to build the needed robustness, performance and scalability in Go
+than in Python.
 
 
 ## Is Toolbox compatible with Model Context Protocol (MCP)? 
 
-Toolbox currently uses it's own custom protocol for server-client communication.
-[Anthropic's Model Context Protocol (MCP)](https://modelcontextprotocol.io/)
-launched towards the end of Toolbox's development, and is currently missing
-functionality to support some of our features. We're currently exploring how
-best to bring Toolbox's functionality to the wider MCP ecosystem.
-
+Yes! Toolbox is compatible with [Anthropic's Model Context Protocol (MCP)](https://modelcontextprotocol.io/). Please checkout [Connect via MCP](../how-to/connect_via_mcp.md) on how to
+connect to Toolbox with an MCP client.

docs/en/concepts/_index.md

@@ -2,5 +2,6 @@
 title: "Concepts"
 type: docs
 weight: 2
-description: Some core concepts in Toolbox
+description: >
+  Some core concepts in Toolbox
 ---

docs/en/concepts/telemetry/index.md

@@ -2,7 +2,8 @@
 title: "Telemetry"
 type: docs
 weight: 2
-description: An overview of telemetry and observability in Toolbox. 
+description: >
+  An overview of telemetry and observability in Toolbox. 
 ---
 
 ## About
@@ -28,7 +29,7 @@ The following flags can be used to customize Toolbox logging:
 
 __Example:__
 ```bash
-./toolbox --tools_file "tools.yaml" --log-level warn --logging-format json
+./toolbox --tools-file "tools.yaml" --log-level warn --logging-format json
 ```
 
 ### Level
@@ -81,18 +82,22 @@ A metric is a measurement of a service captured at runtime. The collected data
 can be used to provide important insights into the service. Toolbox provides the
 following custom metrics:
 
-| **Metric Name**                    | **Description**                                       |
-|------------------------------------|-------------------------------------------------------|
-| `toolbox.server.toolset.get.count` | Counts the number of toolset manifest requests served |
-| `toolbox.server.tool.get.count`    | Counts the number of tool manifest requests served    |
-| `toolbox.server.tool.get.invoke`   | Counts the number of tool invocation requests served  |
+| **Metric Name**                    | **Description**                                         |
+|------------------------------------|---------------------------------------------------------|
+| `toolbox.server.toolset.get.count` | Counts the number of toolset manifest requests served   |
+| `toolbox.server.tool.get.count`    | Counts the number of tool manifest requests served      |
+| `toolbox.server.tool.get.invoke`   | Counts the number of tool invocation requests served    |
+| `toolbox.server.mcp.sse.count`     | Counts the number of mcp sse connection requests served |
+| `toolbox.server.mcp.post.count`    | Counts the number of mcp post requests served           |
 
 All custom metrics have the following attributes/labels:
 
-| **Metric Attributes** | **Description**                                           |
-|-----------------------|-----------------------------------------------------------|
-| `toolbox.name`        | Name of the toolset or tool, if applicable.               |
-| `toolbox.status`      | Operation status code, for example: `success`, `failure`. |
+| **Metric Attributes**      | **Description**                                           |
+|----------------------------|-----------------------------------------------------------|
+| `toolbox.name`             | Name of the toolset or tool, if applicable.               |
+| `toolbox.operation.status` | Operation status code, for example: `success`, `failure`. |
+| `toolbox.sse.sessionId`    | Session id for sse connection, if applicable.             |
+| `toolbox.method`           | Method of JSON-RPC request, if applicable.                |
 
 ### Traces
 

docs/en/getting-started/_index.md

@@ -3,5 +3,5 @@ title: "Getting Started"
 type: docs
 weight: 1
 description: >
-  How to get started with Toolbox
+  How to get started with Toolbox.
 ---

docs/en/getting-started/configure.md

@@ -1,17 +1,28 @@
 ---
 title: "Configuration"
 type: docs
-weight: 3
-description: How to configure Toolbox's tools.yaml file.
+weight: 4
+description: >
+  How to configure Toolbox's tools.yaml file.
 ---
 
 The primary way to configure Toolbox is through the `tools.yaml` file. If you
-have multiple files, you can tell toolbox which to load with the `--tools_file
+have multiple files, you can tell toolbox which to load with the `--tools-file
 tools.yaml` flag.
 
 You can find more detailed reference documentation to all resource types in the
 [Resources](../resources/).
 
+### Using Environment Variables
+
+To avoid hardcoding certain secret fields like passwords, usernames, API keys
+etc., you could use environment variables instead with the format `${ENV_NAME}`.
+
+```yaml
+  user: ${USER_NAME}
+  password: ${PASSWORD}
+```
+
 ### Sources
 
 The `sources` section of your `tools.yaml` defines what data sources your
@@ -25,8 +36,8 @@ sources:
     host: 127.0.0.1
     port: 5432
     database: toolbox_db
-    user: toolbox_user
-    password: my-password
+    user: ${USER_NAME}
+    password: ${PASSWORD}
 ```
 
 For more details on configuring different types of sources, see the
@@ -54,7 +65,6 @@ tools:
 For more details on configuring different types of tools, see the
 [Tools](../resources/tools/).
 
-
 ### Toolsets
 
 The `toolsets` section of your `tools.yaml` allows you to define groups of tools
@@ -75,8 +85,8 @@ You can load toolsets by name:
 
 ```python
 # This will load all tools
-all_tools = await client.aload_toolset()
+all_tools = client.load_toolset()
 
 # This will only load the tools listed in 'my_second_toolset'
-my_second_toolset = await client.aload_toolset("my_second_toolset")
-```
+my_second_toolset = client.load_toolset("my_second_toolset")
+```

docs/en/getting-started/introduction/_index.md

@@ -2,13 +2,20 @@
 title: "Introduction"
 type: docs
 weight: 1
-description: An introduction to Gen AI Toolbox for Databases.
+description: >
+  An introduction to MCP Toolbox for Databases.
 ---
 
-Gen AI Toolbox for Databases is an open source server that makes it easier to
-build Gen AI tools for interacting with databases. It enables you to develop
-tools easier, faster, and more securely by handling the complexities such as
-connection pooling, authentication, and more.
+MCP Toolbox for Databases is an open source MCP server for databases. It enables
+you to develop tools easier, faster, and more securely by handling the complexities
+such as connection pooling, authentication, and more.
+
+
+{{< notice note >}}
+This solution was originally named “Gen AI Toolbox for
+Databases” as its initial development predated MCP, but was renamed to align
+with recently added MCP compatibility.
+{{< /notice >}}
 
 ##  Why Toolbox?
 
@@ -24,6 +31,21 @@ database. Toolbox provides:
   support for OpenTelemetry.
 
 
+**⚡ Supercharge Your Workflow with an AI Database Assistant ⚡**
+
+Stop context-switching and let your AI assistant become a true co-developer. By [connecting your IDE to your databases with MCP Toolbox][connect-ide], you can delegate complex and time-consuming database tasks, allowing you to build faster and focus on what matters. This isn't just about code completion; it's about giving your AI the context it needs to handle the entire development lifecycle.
+
+Here’s how it will save you time:
+
+* **Query in Plain English**: Interact with your data using natural language right from your IDE. Ask complex questions like, *"How many orders were delivered in 2024, and what items were in them?"* without writing any SQL.
+* **Automate Database Management**: Simply describe your data needs, and let the AI assistant manage your database for you. It can handle generating queries, creating tables, adding indexes, and more.
+* **Generate Context-Aware Code**: Empower your AI assistant to generate application code and tests with a deep understanding of your real-time database schema.  This accelerates the development cycle by ensuring the generated code is directly usable.
+* **Slash Development Overhead**: Radically reduce the time spent on manual setup and boilerplate. MCP Toolbox helps streamline lengthy database configurations, repetitive code, and error-prone schema migrations.
+
+Learn [how to connect your AI tools (IDEs) to Toolbox using MCP][connect-ide].
+
+[connect-ide]: ../../how-to/connect-ide/
+
 ## General Architecture
 
 Toolbox sits between your application's orchestration framework and your
@@ -43,6 +65,7 @@ following instructions for your OS and CPU architecture.
 
 [releases]: https://github.com/googleapis/genai-toolbox/releases
 
+<!-- {x-release-please-start-version} -->
 {{< tabpane text=true >}}
 {{% tab header="Binary" lang="en" %}}
 
@@ -50,7 +73,7 @@ To install Toolbox as a binary:
 
 ```sh
 # see releases page for other versions
-export VERSION=0.1.0
+export VERSION=0.7.0
 curl -O https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox
 chmod +x toolbox
 ```
@@ -61,7 +84,7 @@ You can also install Toolbox as a container:
 
 ```sh
 # see releases page for other versions
-export VERSION=0.1.0
+export VERSION=0.7.0
 docker pull us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION
 ```
 
@@ -72,11 +95,12 @@ To install from source, ensure you have the latest version of
 [Go installed](https://go.dev/doc/install), and then run the following command:
 
 ```sh
-go install github.com/googleapis/genai-toolbox@v0.1.0
+go install github.com/googleapis/genai-toolbox@v0.7.0
 ```
 
 {{% /tab %}}
 {{< /tabpane >}}
+<!-- {x-release-please-end} -->
 
 ### Running the server
 
@@ -84,7 +108,7 @@ go install github.com/googleapis/genai-toolbox@v0.1.0
 execute `toolbox` to start the server:
 
 ```sh
-./toolbox --tools_file "tools.yaml"
+./toolbox --tools-file "tools.yaml"
 ```
 
 You can use `toolbox help` for a full list of flags! To stop the server, send a
@@ -98,25 +122,65 @@ out the resources in the [How-to section](../../how-to/_index.md)
 Once your server is up and running, you can load the tools into your
 application. See below the list of Client SDKs for using various frameworks:
 
-{{< tabpane text=true >}}
+{{< tabpane text=true persist=header >}}
+{{% tab header="Core" lang="en" %}}
+
+Once you've installed the [Toolbox Core
+SDK](https://pypi.org/project/toolbox-core/), you can load
+tools:
+
+{{< highlight python >}}
+from toolbox_core import ToolboxClient
+
+# update the url to point to your server
+async with ToolboxClient("http://127.0.0.1:5000") as client:
+
+    # these tools can be passed to your application!
+    tools = await client.load_toolset("toolset_name")
+{{< /highlight >}}
+
+For more detailed instructions on using the Toolbox Core SDK, see the
+[project's README](https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/packages/toolbox-core/README.md).
+
+{{% /tab %}}
 {{% tab header="LangChain" lang="en" %}}
 
 Once you've installed the [Toolbox LangChain
-SDK](https://github.com/googleapis/genai-toolbox-langchain-python), you can load
+SDK](https://pypi.org/project/toolbox-langchain/), you can load
 tools:
 
 {{< highlight python >}}
 from toolbox_langchain import ToolboxClient
 
 # update the url to point to your server
-client = ToolboxClient("http://127.0.0.1:5000")
+async with ToolboxClient("http://127.0.0.1:5000") as client:
 
-# these tools can be passed to your application! 
-tools = await client.aload_toolset()
+    # these tools can be passed to your application!
+    tools = client.load_toolset()
 {{< /highlight >}}
 
 For more detailed instructions on using the Toolbox LangChain SDK, see the
-[project's README](https://github.com/googleapis/genai-toolbox-langchain-python/blob/main/README.md).
+[project's README](https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/packages/toolbox-langchain/README.md).
+
+{{% /tab %}}
+{{% tab header="Llamaindex" lang="en" %}}
+
+Once you've installed the [Toolbox Llamaindex
+SDK](https://github.com/googleapis/genai-toolbox-llamaindex-python), you can load
+tools:
+
+{{< highlight python >}}
+from toolbox_llamaindex import ToolboxClient
+
+# update the url to point to your server
+async with ToolboxClient("http://127.0.0.1:5000") as client:
+
+  # these tools can be passed to your application!
+  tools = client.load_toolset()
+{{< /highlight >}}
+
+For more detailed instructions on using the Toolbox Llamaindex SDK, see the
+[project's README](https://github.com/googleapis/genai-toolbox-llamaindex-python/blob/main/README.md).
 
 {{% /tab %}}
 {{< /tabpane >}}

docs/en/getting-started/local_quickstart.md

@@ -1,38 +1,32 @@
 ---
-title: "Quickstart"
+title: "Quickstart (Local)"
 type: docs
 weight: 2
 description: >
   How to get started running Toolbox locally with Python, PostgreSQL, and 
-  LangGraph. 
+  [GoogleGenAI](https://pypi.org/project/google-genai/), 
+  [LangGraph](https://www.langchain.com/langgraph), [LlamaIndex](https://www.llamaindex.ai/) or [Agent Development Kit](https://google.github.io/adk-docs/). 
 ---
 
+[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/googleapis/genai-toolbox/blob/main/docs/en/getting-started/colab_quickstart.ipynb)
+
 ## Before you begin
 
-This guide assumes you have already done the following: 
+This guide assumes you have already done the following:
 
 1. Installed [Python 3.9+][install-python] (including [pip][install-pip] and
    your preferred virtual environment tool for managing dependencies e.g. [venv][install-venv])
 1. Installed [PostgreSQL 16+ and the `psql` client][install-postgres]
-1. Completed setup for usage with a [LangChain chat model][lc-chat], such as:
-    - [`langchain-vertexai` package][install-vertexai]
-    - [`langchain-google-genai` package][install-genai]
-    - [`langchain-anthropic` package][install-anthropic] 
-
 
 [install-python]: https://wiki.python.org/moin/BeginnersGuide/Download
 [install-pip]: https://pip.pypa.io/en/stable/installation/
 [install-venv]: https://packaging.python.org/en/latest/tutorials/installing-packages/#creating-virtual-environments
 [install-postgres]: https://www.postgresql.org/download/
-[lc-chat]: https://python.langchain.com/docs/integrations/chat/
-[install-vertexai]: https://python.langchain.com/docs/integrations/llms/google_vertex_ai_palm/#setup
-[install-genai]: https://python.langchain.com/docs/integrations/chat/google_generative_ai/#setup
-[install-anthropic]: https://python.langchain.com/docs/integrations/chat/anthropic/#setup
 
 ## Step 1: Set up your database
 
 In this section, we will create a database, insert some data that needs to be
-access by our agent, and create a database user for Toolbox to connect with. 
+accessed by our agent, and create a database user for Toolbox to connect with.
 
 1. Connect to postgres using the `psql` command:
 
@@ -42,11 +36,32 @@ access by our agent, and create a database user for Toolbox to connect with.
 
     Here, `postgres` denotes the default postgres superuser.
 
+    {{< notice info >}}
+#### **Having trouble connecting?**
+
+* **Password Prompt:** If you are prompted for a password for the `postgres` user and do not know it (or a blank password doesn't work), your PostgreSQL installation might require a password or a different authentication method.
+* **`FATAL: role "postgres" does not exist`:** This error means the default `postgres` superuser role isn't available under that name on your system.
+* **`Connection refused`:** Ensure your PostgreSQL server is actually running. You can typically check with `sudo systemctl status postgresql` and start it with `sudo systemctl start postgresql` on Linux systems.
+
+<br/>
+
+#### **Common Solution**
+
+For password issues or if the `postgres` role seems inaccessible directly, try switching to the `postgres` operating system user first. This user often has permission to connect without a password for local connections (this is called peer authentication).
+```bash
+sudo -i -u postgres
+psql -h 127.0.0.1
+```
+Once you are in the `psql` shell using this method, you can proceed with the database creation steps below. Afterwards, type `\q` to exit `psql`, and then `exit` to return to your normal user shell.
+
+If desired, once connected to `psql` as the `postgres` OS user, you can set a password for the `postgres` *database* user using: `ALTER USER postgres WITH PASSWORD 'your_chosen_password';`. This would allow direct connection with `-U postgres` and a password next time.
+    {{< /notice >}}
+
 1. Create a new database and a new user:
 
-    {{< notice tip >}} 
-  For a real application, it's best to follow the principle of least permission 
-  and only grant the privileges your application needs. 
+    {{< notice tip >}}
+  For a real application, it's best to follow the principle of least permission
+  and only grant the privileges your application needs.
     {{< /notice >}}
 
     ```sql
@@ -58,13 +73,12 @@ access by our agent, and create a database user for Toolbox to connect with.
       ALTER DATABASE toolbox_db OWNER TO toolbox_user;
     ```
 
-
-
 1. End the database session:
 
     ```bash
     \q
     ```
+    (If you used `sudo -i -u postgres` and then `psql`, remember you might also need to type `exit` after `\q` to leave the `postgres` user's shell session.)
 
 1. Connect to your database with your new user:
 
@@ -109,7 +123,6 @@ access by our agent, and create a database user for Toolbox to connect with.
     \q
     ```
 
-
 ## Step 2: Install and configure Toolbox
 
 In this section, we will download Toolbox, configure our tools in a
@@ -117,15 +130,17 @@ In this section, we will download Toolbox, configure our tools in a
 
 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 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.1.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.7.0/$OS/toolbox
     ```
+    <!-- {x-release-please-end} -->
 
 1. Make the binary executable:
 
@@ -137,6 +152,11 @@ In this section, we will download Toolbox, configure our tools in a
    such as `user`, `password`, or `database` that you may have customized in the
    previous step.
 
+    {{< notice tip >}}
+  In practice, use environment variable replacement with the format ${ENV_NAME}
+  instead of hardcoding your secrets into the configuration file.
+    {{< /notice >}}
+
     ```yaml
     sources:
       my-pg-source:
@@ -144,11 +164,9 @@ In this section, we will download Toolbox, configure our tools in a
         host: 127.0.0.1
         port: 5432
         database: toolbox_db
-        user: toolbox_user
-        password: my-password
+        user: ${USER_NAME}
+        password: ${PASSWORD}
     tools:
-      # Define the 5 tools we want our agent to have
-      # for more info on tools check out the "Resources" section of the docs
       search-hotels-by-name:
         kind: postgres-sql
         source: my-pg-source
@@ -171,8 +189,7 @@ In this section, we will download Toolbox, configure our tools in a
         kind: postgres-sql
         source: my-pg-source
         description: >-
-          Book a hotel by its ID. Returns a message indicating whether the hotel was
-          successfully booked or not.
+           Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.
         parameters:
           - name: hotel_id
             type: string
@@ -206,60 +223,247 @@ In this section, we will download Toolbox, configure our tools in a
             type: string
             description: The ID of the hotel to cancel.
         statement: UPDATE hotels SET booked = B'0' WHERE id = $1;
+   toolsets:
+      my-toolset:
+        - search-hotels-by-name
+        - search-hotels-by-location
+        - book-hotel
+        - update-hotel
+        - cancel-hotel
     ```
 
+    For more info on tools, check out the `Resources` section of the docs.
+
 1. Run the Toolbox server, pointing to the `tools.yaml` file created earlier:
 
     ```bash
-    ./toolbox --tools_file "tools.yaml"
+    ./toolbox --tools-file "tools.yaml"
     ```
 
 ## Step 3: Connect your agent to Toolbox
 
-In this section, we will write and run a LangGraph agent that will load the Tools
+In this section, we will write and run an agent that will load the Tools
 from Toolbox.
 
-1. In a new terminal, install the `toolbox-langchain` package.
+{{< notice tip>}} If you prefer to experiment within a Google Colab environment,
+you can connect to a
+[local runtime](https://research.google.com/colaboratory/local-runtimes.html).
+{{< /notice >}}
 
-    ```bash
-    pip install toolbox-langchain
-    ```
+1. In a new terminal, install the SDK package.
+
+    {{< tabpane persist=header >}}
+{{< tab header="Core" lang="bash" >}}
+
+pip install toolbox-core
+{{< /tab >}}
+{{< tab header="ADK" lang="bash" >}}
+
+pip install toolbox-core
+{{< /tab >}}
+{{< tab header="Langchain" lang="bash" >}}
+
+pip install toolbox-langchain
+{{< /tab >}}
+{{< tab header="LlamaIndex" lang="bash" >}}
+
+pip install toolbox-llamaindex
+{{< /tab >}}
+{{< /tabpane >}}
 
 1. Install other required dependencies:
 
-    ```bash
-    # TODO(developer): replace with correct package if needed
-    pip install langgraph langchain-google-vertexai
-    # pip install langchain_google_genai
-    # pip install langchain_anthropic
-    ```
+    {{< tabpane persist=header >}}
+{{< tab header="Core" lang="bash" >}}
 
-1. Create a new file named `langgraph_hotel_agent.py` and copy the following
-   code to create a [LangGraph agent][langgraph-agent], based on their [Hotels
-   example][langchain-hotels]:
+pip install google-genai
+{{< /tab >}}
+{{< tab header="ADK" lang="bash" >}}
 
-    ```python
-    import asyncio
+pip install google-adk
+{{< /tab >}}
+{{< tab header="Langchain" lang="bash" >}}
 
-    from langgraph.prebuilt import create_react_agent
-    # TODO(developer): replace this with another import if needed
-    from langchain_google_vertexai import ChatVertexAI
-    # from langchain_google_genai import ChatGoogleGenerativeAI
-    # from langchain_anthropic import ChatAnthropic
-    from langgraph.checkpoint.memory import MemorySaver
-    
-    from toolbox_langchain import ToolboxClient
+# TODO(developer): replace with correct package if needed
+
+pip install langgraph langchain-google-vertexai
+
+# pip install langchain-google-genai
+
+# pip install langchain-anthropic
+
+{{< /tab >}}
+{{< tab header="LlamaIndex" lang="bash" >}}
+
+# TODO(developer): replace with correct package if needed
+
+pip install llama-index-llms-google-genai
+
+# pip install llama-index-llms-anthropic
+
+{{< /tab >}}
+{{< /tabpane >}}
+
+1. Create a new file named `hotel_agent.py` and copy the following
+   code to create an agent:
+    {{< tabpane persist=header >}}
+{{< tab header="Core" lang="python" >}}
+import asyncio
+
+from google import genai
+from google.genai.types import (
+    Content,
+    FunctionDeclaration,
+    GenerateContentConfig,
+    Part,
+    Tool,
+)
+
+from toolbox_core import ToolboxClient
+
+prompt = """
+  You're a helpful hotel assistant. You handle hotel searching, booking and
+  cancellations. When the user searches for a hotel, mention it's name, id,
+  location and price tier. Always mention hotel id while performing any
+  searches. This is very important for any operations. For any bookings or
+  cancellations, please provide the appropriate confirmation. Be sure to
+  update checkin or checkout dates if mentioned by the user.
+  Don't ask for confirmations from the user.
+"""
+
+queries = [
+    "Find hotels in Basel with Basel in it's name.",
+    "Please book the hotel Hilton Basel for me.",
+    "This is too expensive. Please cancel it.",
+    "Please book Hyatt Regency for me",
+    "My check in dates for my booking would be from April 10, 2024 to April 19, 2024.",
+]
+
+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
+        # integration. While this example uses Google's genai client, these callables can be adapted for
+        # various function-calling or agent frameworks. For easier integration with supported frameworks
+        # (https://github.com/googleapis/mcp-toolbox-python-sdk/tree/main/packages), use the
+        # provided wrapper packages, which handle framework-specific boilerplate.
+        toolbox_tools = await toolbox_client.load_toolset("my-toolset")
+        genai_client = genai.Client(
+            vertexai=True, project="project-id", location="us-central1"
+        )
+
+        genai_tools = [
+            Tool(
+                function_declarations=[
+                    FunctionDeclaration.from_callable_with_api_option(callable=tool)
+                ]
+            )
+            for tool in toolbox_tools
+        ]
+        history = []
+        for query in queries:
+            user_prompt_content = Content(
+                role="user",
+                parts=[Part.from_text(text=query)],
+            )
+            history.append(user_prompt_content)
+
+            response = genai_client.models.generate_content(
+                model="gemini-2.0-flash-001",
+                contents=history,
+                config=GenerateContentConfig(
+                    system_instruction=prompt,
+                    tools=genai_tools,
+                ),
+            )
+            history.append(response.candidates[0].content)
+            function_response_parts = []
+            for function_call in response.function_calls:
+                fn_name = function_call.name
+                # The tools are sorted alphabetically
+                if fn_name == "search-hotels-by-name":
+                    function_result = await toolbox_tools[3](**function_call.args)
+                elif fn_name == "search-hotels-by-location":
+                    function_result = await toolbox_tools[2](**function_call.args)
+                elif fn_name == "book-hotel":
+                    function_result = await toolbox_tools[0](**function_call.args)
+                elif fn_name == "update-hotel":
+                    function_result = await toolbox_tools[4](**function_call.args)
+                elif fn_name == "cancel-hotel":
+                    function_result = await toolbox_tools[1](**function_call.args)
+                else:
+                    raise ValueError("Function name not present.")
+                function_response = {"result": function_result}
+                function_response_part = Part.from_function_response(
+                    name=function_call.name,
+                    response=function_response,
+                )
+                function_response_parts.append(function_response_part)
+
+            if function_response_parts:
+                tool_response_content = Content(role="tool", parts=function_response_parts)
+                history.append(tool_response_content)
+
+            response2 = genai_client.models.generate_content(
+                model="gemini-2.0-flash-001",
+                contents=history,
+                config=GenerateContentConfig(
+                    tools=genai_tools,
+                ),
+            )
+            final_model_response_content = response2.candidates[0].content
+            history.append(final_model_response_content)
+            print(response2.text)
+
+asyncio.run(run_application())
+
+{{< /tab >}}
+{{< tab header="ADK" lang="python" >}}
+from google.adk.agents import Agent
+from google.adk.runners import Runner
+from google.adk.sessions import InMemorySessionService
+from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
+from google.genai import types
+from toolbox_core import ToolboxSyncClient
+
+import os
+
+# TODO(developer): replace this with your Google API key
+
+os.environ['GOOGLE_API_KEY'] = 'your-api-key'
+
+with ToolboxSyncClient("http://127.0.0.1:5000") as toolbox_client:
 
     prompt = """
       You're a helpful hotel assistant. You handle hotel searching, booking and
-      cancellations. When the user searches for a hotel, mention it's name, id, 
-      location and price tier. Always mention hotel ids while performing any 
-      searches. This is very important for any operations. For any bookings or 
-      cancellations, please provide the appropriate confirmation. Be sure to 
+      cancellations. When the user searches for a hotel, mention it's name, id,
+      location and price tier. Always mention hotel ids while performing any
+      searches. This is very important for any operations. For any bookings or
+      cancellations, please provide the appropriate confirmation. Be sure to
       update checkin or checkout dates if mentioned by the user.
       Don't ask for confirmations from the user.
     """
-    
+
+    root_agent = Agent(
+        model='gemini-2.0-flash-001',
+        name='hotel_agent',
+        description='A helpful AI assistant.',
+        instruction=prompt,
+        tools=toolbox_client.load_toolset("my-toolset"),
+    )
+
+    session_service = InMemorySessionService()
+    artifacts_service = InMemoryArtifactService()
+    session = session_service.create_session(
+        state={}, app_name='hotel_agent', user_id='123'
+    )
+    runner = Runner(
+        app_name='hotel_agent',
+        agent=root_agent,
+        artifact_service=artifacts_service,
+        session_service=session_service,
+    )
+
     queries = [
         "Find hotels in Basel with Basel in it's name.",
         "Can you book the Hilton Basel for me?",
@@ -267,15 +471,64 @@ from Toolbox.
         "My check in dates would be from April 10, 2024 to April 19, 2024.",
     ]
 
-    def main():
-        # TODO(developer): replace this with another model if needed
-        model = ChatVertexAI(model_name="gemini-1.5-pro")
-        # model = ChatGoogleGenerativeAI(model="gemini-1.5-pro")
-        # model = ChatAnthropic(model="claude-3-5-sonnet-20240620")
-        
-        # Load the tools from the Toolbox server
-        client = ToolboxClient("http://127.0.0.1:5000")
-        tools = client.load_toolset()
+    for query in queries:
+        content = types.Content(role='user', parts=[types.Part(text=query)])
+        events = runner.run(session_id=session.id,
+                            user_id='123', new_message=content)
+
+        responses = (
+          part.text
+          for event in events
+          for part in event.content.parts
+          if part.text is not None
+        )
+
+        for text in responses:
+          print(text)
+{{< /tab >}}
+{{< tab header="LangChain" lang="python" >}}
+import asyncio
+
+from langgraph.prebuilt import create_react_agent
+
+# TODO(developer): replace this with another import if needed
+
+from langchain_google_vertexai import ChatVertexAI
+
+# from langchain_google_genai import ChatGoogleGenerativeAI
+
+# from langchain_anthropic import ChatAnthropic
+
+from langgraph.checkpoint.memory import MemorySaver
+
+from toolbox_langchain import ToolboxClient
+
+prompt = """
+  You're a helpful hotel assistant. You handle hotel searching, booking and
+  cancellations. When the user searches for a hotel, mention it's name, id,
+  location and price tier. Always mention hotel ids while performing any
+  searches. This is very important for any operations. For any bookings or
+  cancellations, please provide the appropriate confirmation. Be sure to
+  update checkin or checkout dates if mentioned by the user.
+  Don't ask for confirmations from the user.
+"""
+
+queries = [
+    "Find hotels in Basel with Basel in it's name.",
+    "Can you book the Hilton Basel for me?",
+    "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
+    "My check in dates would be from April 10, 2024 to April 19, 2024.",
+]
+
+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")
+    # model = ChatAnthropic(model="claude-3-5-sonnet-20240620")
+
+    # Load the tools from the Toolbox server
+    async with ToolboxClient("http://127.0.0.1:5000") as client:
+        tools = await client.aload_toolset()
 
         agent = create_react_agent(model, tools, checkpointer=MemorySaver())
 
@@ -285,14 +538,94 @@ from Toolbox.
             response = agent.invoke(inputs, stream_mode="values", config=config)
             print(response["messages"][-1].content)
 
-    main()
-    ```
+asyncio.run(run_application())
+{{< /tab >}}
+{{< tab header="LlamaIndex" lang="python" >}}
+import asyncio
+import os
 
-    [langgraph-agent]:https://langchain-ai.github.io/langgraph/reference/prebuilt/#langgraph.prebuilt.chat_agent_executor.create_react_agent
-    [langchain-hotels]: https://langchain-ai.github.io/langgraph/tutorials/customer-support/customer-support/#hotels
+from llama_index.core.agent.workflow import AgentWorkflow
+
+from llama_index.core.workflow import Context
+
+# TODO(developer): replace this with another import if needed
+
+from llama_index.llms.google_genai import GoogleGenAI
+
+# from llama_index.llms.anthropic import Anthropic
+
+from toolbox_llamaindex import ToolboxClient
+
+prompt = """
+  You're a helpful hotel assistant. You handle hotel searching, booking and
+  cancellations. When the user searches for a hotel, mention it's name, id,
+  location and price tier. Always mention hotel ids while performing any
+  searches. This is very important for any operations. For any bookings or
+  cancellations, please provide the appropriate confirmation. Be sure to
+  update checkin or checkout dates if mentioned by the user.
+  Don't ask for confirmations from the user.
+"""
+
+queries = [
+    "Find hotels in Basel with Basel in it's name.",
+    "Can you book the Hilton Basel for me?",
+    "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
+    "My check in dates would be from April 10, 2024 to April 19, 2024.",
+]
+
+async def run_application():
+    # TODO(developer): replace this with another model if needed
+    llm = GoogleGenAI(
+        model="gemini-2.0-flash-001",
+        vertexai_config={"project": "project-id", "location": "us-central1"},
+    )
+    # llm = GoogleGenAI(
+    #     api_key=os.getenv("GOOGLE_API_KEY"),
+    #     model="gemini-2.0-flash-001",
+    # )
+    # llm = Anthropic(
+    #   model="claude-3-7-sonnet-latest",
+    #   api_key=os.getenv("ANTHROPIC_API_KEY")
+    # )
+
+    # Load the tools from the Toolbox server
+    async with ToolboxClient("http://127.0.0.1:5000") as client:
+        tools = await client.aload_toolset()
+
+        agent = AgentWorkflow.from_tools_or_functions(
+            tools,
+            llm=llm,
+            system_prompt=prompt,
+        )
+        ctx = Context(agent)
+        for query in queries:
+            response = await agent.run(user_msg=query, ctx=ctx)
+            print(f"---- {query} ----")
+            print(str(response))
+
+asyncio.run(run_application())
+{{< /tab >}}
+{{< /tabpane >}}
+
+    {{< tabpane text=true persist=header >}}
+{{% tab header="Core" lang="en" %}}
+To learn more about tool calling with Google GenAI, check out the
+[Google GenAI Documentation](https://github.com/googleapis/python-genai?tab=readme-ov-file#manually-declare-and-invoke-a-function-for-function-calling).
+{{% /tab %}}
+{{% tab header="ADK" lang="en" %}}
+To learn more about Agent Development Kit, check out the [ADK documentation.](https://google.github.io/adk-docs/)
+{{% /tab %}}
+{{% tab header="Langchain" lang="en" %}}
+To learn more about Agents in LangChain, check out the [LangGraph Agent documentation.](https://langchain-ai.github.io/langgraph/reference/prebuilt/#langgraph.prebuilt.chat_agent_executor.create_react_agent)
+{{% /tab %}}
+{{% tab header="LlamaIndex" lang="en" %}}
+To learn more about Agents in LlamaIndex, check out the
+[LlamaIndex AgentWorkflow documentation.](https://docs.llamaindex.ai/en/stable/examples/agent/agent_workflow_basic/)
+{{% /tab %}}
+{{< /tabpane >}}
 
 1. Run your agent, and observe the results:
 
     ```sh
-    python langgraph_hotel_agent.py
+    python hotel_agent.py
     ```

docs/en/getting-started/mcp_quickstart/_index.md

@@ -0,0 +1,240 @@
+---
+title: "Quickstart (MCP)"
+type: docs
+weight: 3
+description: >
+  How to get started running Toolbox locally with MCP Inspector. 
+---
+
+## Overview
+
+[Model Context Protocol](https://modelcontextprotocol.io) is an open protocol
+that standardizes how applications provide context to LLMs. Check out this page
+on how to [connect to Toolbox via MCP](../../how-to/connect_via_mcp.md).
+
+## Step 1: Set up your database
+
+In this section, we will create a database, insert some data that needs to be
+access by our agent, and create a database user for Toolbox to connect with.
+
+1. Connect to postgres using the `psql` command:
+
+    ```bash
+    psql -h 127.0.0.1 -U postgres
+    ```
+
+    Here, `postgres` denotes the default postgres superuser.
+
+1. Create a new database and a new user:
+
+    {{< notice tip >}}
+  For a real application, it's best to follow the principle of least permission
+  and only grant the privileges your application needs.
+    {{< /notice >}}
+
+    ```sql
+      CREATE USER toolbox_user WITH PASSWORD 'my-password';
+
+      CREATE DATABASE toolbox_db;
+      GRANT ALL PRIVILEGES ON DATABASE toolbox_db TO toolbox_user;
+
+      ALTER DATABASE toolbox_db OWNER TO toolbox_user;
+    ```
+
+1. End the database session:
+
+    ```bash
+    \q
+    ```
+
+1. Connect to your database with your new user:
+
+    ```bash
+    psql -h 127.0.0.1 -U toolbox_user -d toolbox_db
+    ```
+
+1. Create a table using the following command:
+
+    ```sql
+    CREATE TABLE hotels(
+      id            INTEGER NOT NULL PRIMARY KEY,
+      name          VARCHAR NOT NULL,
+      location      VARCHAR NOT NULL,
+      price_tier    VARCHAR NOT NULL,
+      checkin_date  DATE    NOT NULL,
+      checkout_date DATE    NOT NULL,
+      booked        BIT     NOT NULL
+    );
+    ```
+
+1. Insert data into the table.
+
+    ```sql
+    INSERT INTO hotels(id, name, location, price_tier, checkin_date, checkout_date, booked)
+    VALUES 
+      (1, 'Hilton Basel', 'Basel', 'Luxury', '2024-04-22', '2024-04-20', B'0'),
+      (2, 'Marriott Zurich', 'Zurich', 'Upscale', '2024-04-14', '2024-04-21', B'0'),
+      (3, 'Hyatt Regency Basel', 'Basel', 'Upper Upscale', '2024-04-02', '2024-04-20', B'0'),
+      (4, 'Radisson Blu Lucerne', 'Lucerne', 'Midscale', '2024-04-24', '2024-04-05', B'0'),
+      (5, 'Best Western Bern', 'Bern', 'Upper Midscale', '2024-04-23', '2024-04-01', B'0'),
+      (6, 'InterContinental Geneva', 'Geneva', 'Luxury', '2024-04-23', '2024-04-28', B'0'),
+      (7, 'Sheraton Zurich', 'Zurich', 'Upper Upscale', '2024-04-27', '2024-04-02', B'0'),
+      (8, 'Holiday Inn Basel', 'Basel', 'Upper Midscale', '2024-04-24', '2024-04-09', B'0'),
+      (9, 'Courtyard Zurich', 'Zurich', 'Upscale', '2024-04-03', '2024-04-13', B'0'),
+      (10, 'Comfort Inn Bern', 'Bern', 'Midscale', '2024-04-04', '2024-04-16', B'0');
+    ```
+
+1. End the database session:
+
+    ```bash
+    \q
+    ```
+
+## Step 2: Install and configure Toolbox
+
+In this section, we will download Toolbox, configure our tools in a
+`tools.yaml`, and then 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.7.0/$OS/toolbox
+    ```
+    <!-- {x-release-please-end} -->
+
+1. Make the binary executable:
+
+    ```bash
+    chmod +x toolbox
+    ```
+
+1. Write the following into a `tools.yaml` file. Be sure to update any fields
+   such as `user`, `password`, or `database` that you may have customized in the
+   previous step.
+
+    {{< notice tip >}}
+  In practice, use environment variable replacement with the format ${ENV_NAME}
+  instead of hardcoding your secrets into the configuration file.
+    {{< /notice >}}
+
+    ```yaml
+    sources:
+      my-pg-source:
+        kind: postgres
+        host: 127.0.0.1
+        port: 5432
+        database: toolbox_db
+        user: toolbox_user
+        password: my-password
+    tools:
+      search-hotels-by-name:
+        kind: postgres-sql
+        source: my-pg-source
+        description: Search for hotels based on name.
+        parameters:
+          - name: name
+            type: string
+            description: The name of the hotel.
+        statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
+      search-hotels-by-location:
+        kind: postgres-sql
+        source: my-pg-source
+        description: Search for hotels based on location.
+        parameters:
+          - name: location
+            type: string
+            description: The location of the hotel.
+        statement: SELECT * FROM hotels WHERE location ILIKE '%' || $1 || '%';
+      book-hotel:
+        kind: postgres-sql
+        source: my-pg-source
+        description: >-
+           Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.
+        parameters:
+          - name: hotel_id
+            type: string
+            description: The ID of the hotel to book.
+        statement: UPDATE hotels SET booked = B'1' WHERE id = $1;
+      update-hotel:
+        kind: postgres-sql
+        source: my-pg-source
+        description: >-
+          Update a hotel's check-in and check-out dates by its ID. Returns a message
+          indicating  whether the hotel was successfully updated or not.
+        parameters:
+          - name: hotel_id
+            type: string
+            description: The ID of the hotel to update.
+          - name: checkin_date
+            type: string
+            description: The new check-in date of the hotel.
+          - name: checkout_date
+            type: string
+            description: The new check-out date of the hotel.
+        statement: >-
+          UPDATE hotels SET checkin_date = CAST($2 as date), checkout_date = CAST($3
+          as date) WHERE id = $1;
+      cancel-hotel:
+        kind: postgres-sql
+        source: my-pg-source
+        description: Cancel a hotel by its ID.
+        parameters:
+          - name: hotel_id
+            type: string
+            description: The ID of the hotel to cancel.
+        statement: UPDATE hotels SET booked = B'0' WHERE id = $1;
+   toolsets:
+      my-toolset:
+        - search-hotels-by-name
+        - search-hotels-by-location
+        - book-hotel
+        - update-hotel
+        - cancel-hotel
+    ```
+
+    For more info on tools, check out the [Tools](../../resources/tools/_index.md) section.
+
+1. Run the Toolbox server, pointing to the `tools.yaml` file created earlier:
+
+    ```bash
+    ./toolbox --tools-file "tools.yaml"
+    ```
+
+## Step 3: Connect to MCP Inspector
+
+1. Run the MCP Inspector:
+
+    ```bash
+    npx @modelcontextprotocol/inspector
+    ```
+
+1. Type `y` when it asks to install the inspector package.
+
+1. It should show the following when the MCP Inspector is up and running:
+
+    ```bash
+    🔍 MCP Inspector is up and running at http://127.0.0.1:5173 🚀
+    ```
+
+1. Open the above link in your browser.
+
+1. For `Transport Type`, select `SSE`.
+
+1. For `URL`, type in `http://127.0.0.1:5000/mcp/sse`.
+
+1. Click Connect.
+
+    ![inspector](./inspector.png)
+
+1. Select `List Tools`, you will see a list of tools configured in `tools.yaml`.
+
+    ![inspector_tools](./inspector_tools.png)
+
+1. Test out your tools here!

docs/en/how-to/connect-ide/_index.md

@@ -0,0 +1,9 @@
+---
+title: "Connect from your IDE"
+type: docs
+weight: 1
+description: >
+  List of guides detailing how to connect your AI tools (IDEs) to Toolbox using MCP.
+aliases:
+- /how-to/connect_tools_using_mcp
+---

docs/en/how-to/connect-ide/alloydb_pg_mcp.md

@@ -0,0 +1,13 @@
+---
+title: "AlloyDB using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to AlloyDB using Toolbox.
+---
+<html>
+  <head>
+    <link rel="canonical" href="https://cloud.google.com/alloydb/docs/pre-built-tools-with-mcp-toolbox"/>
+    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/alloydb/docs/pre-built-tools-with-mcp-toolbox"/>
+  </head>
+</html>

docs/en/how-to/connect-ide/bigquery_mcp.md

@@ -0,0 +1,13 @@
+---
+title: "BigQuery using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to BigQuery using Toolbox.
+---
+<html>
+  <head>
+    <link rel="canonical" href="https://cloud.google.com/bigquery/docs/pre-built-tools-with-mcp-toolbox"/>
+    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/bigquery/docs/pre-built-tools-with-mcp-toolbox"/>
+  </head>
+</html>

docs/en/how-to/connect-ide/cloud_sql_mssql_mcp.md

@@ -0,0 +1,13 @@
+---
+title: "Cloud SQL for SQL Server using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to Cloud SQL for SQL Server using Toolbox.
+---
+<html>
+  <head>
+    <link rel="canonical" href="https://cloud.google.com/sql/docs/sqlserver/pre-built-tools-with-mcp-toolbox"/>
+    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/sql/docs/sqlserver/pre-built-tools-with-mcp-toolbox"/>
+  </head>
+</html>

docs/en/how-to/connect-ide/cloud_sql_mysql_mcp.md

@@ -0,0 +1,13 @@
+---
+title: "Cloud SQL for MySQL using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to Cloud SQL for MySQL using Toolbox.
+---
+<html>
+  <head>
+    <link rel="canonical" href="https://cloud.google.com/sql/docs/mysql/pre-built-tools-with-mcp-toolbox"/>
+    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/sql/docs/mysql/pre-built-tools-with-mcp-toolbox"/>
+  </head>
+</html>

docs/en/how-to/connect-ide/cloud_sql_pg_mcp.md

@@ -0,0 +1,13 @@
+---
+title: "Cloud SQL for Postgres using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to Cloud SQL for Postgres using Toolbox.
+---
+<html>
+  <head>
+    <link rel="canonical" href="https://cloud.google.com/sql/docs/postgres/pre-built-tools-with-mcp-toolbox"/>
+    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/sql/docs/postgres/pre-built-tools-with-mcp-toolbox"/>
+  </head>
+</html>

docs/en/how-to/connect-ide/postgres_mcp.md

@@ -0,0 +1,252 @@
+---
+title: "PostgreSQL using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to PostgreSQL using Toolbox.
+---
+
+[Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is an open protocol for connecting Large Language Models (LLMs) to data sources like Postgres. This guide covers how to use [MCP Toolbox for Databases][toolbox] to expose your developer assistant tools to a Postgres instance:
+
+* [Cursor][cursor]
+* [Windsurf][windsurf] (Codium)
+* [Visual Studio Code ][vscode] (Copilot)
+* [Cline][cline]  (VS Code extension)
+* [Claude desktop][claudedesktop]
+* [Claude code][claudecode]
+
+[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
+
+{{< notice tip >}}
+This guide can be used with [AlloyDB Omni](https://cloud.google.com/alloydb/omni/current/docs/overview).
+{{< /notice >}}
+
+## Set up the database
+
+1. Create or select a PostgreSQL instance.
+
+    * [Install PostgreSQL locally](https://www.postgresql.org/download/)
+    * [Install AlloyDB Omni](https://cloud.google.com/alloydb/omni/current/docs/quickstart)
+
+1. Create or reuse [a database user](https://cloud.google.com/alloydb/omni/current/docs/database-users/manage-users) and have the username and password ready.
+
+
+## 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.6.0+:
+
+   <!-- {x-release-please-start-version} -->
+   {{< tabpane persist=header >}}
+{{< tab header="linux/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.7.0/linux/amd64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/arm64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.7.0/darwin/arm64/toolbox
+{{< /tab >}}
+
+{{< tab header="darwin/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.7.0/darwin/amd64/toolbox
+{{< /tab >}}
+
+{{< tab header="windows/amd64" lang="bash" >}}
+curl -O https://storage.googleapis.com/genai-toolbox/v0.7.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": {
+        "postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","postgres","--stdio"],
+          "env": {
+            "POSTGRES_HOST": "",
+            "POSTGRES_PORT": "",
+            "POSTGRES_DATABASE": "",
+            "POSTGRES_USER": "",
+            "POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","postgres","--stdio"],
+          "env": {
+            "POSTGRES_HOST": "",
+            "POSTGRES_PORT": "",
+            "POSTGRES_DATABASE": "",
+            "POSTGRES_USER": "",
+            "POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","postgres","--stdio"],
+          "env": {
+            "POSTGRES_HOST": "",
+            "POSTGRES_PORT": "",
+            "POSTGRES_DATABASE": "",
+            "POSTGRES_USER": "",
+            "POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","postgres","--stdio"],
+          "env": {
+            "POSTGRES_HOST": "",
+            "POSTGRES_PORT": "",
+            "POSTGRES_DATABASE": "",
+            "POSTGRES_USER": "",
+            "POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+
+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": {
+        "postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","postgres","--stdio"],
+          "env": {
+            "POSTGRES_HOST": "",
+            "POSTGRES_PORT": "",
+            "POSTGRES_DATABASE": "",
+            "POSTGRES_USER": "",
+            "POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+    ```
+{{% /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": {
+        "postgres": {
+          "command": "./PATH/TO/toolbox",
+          "args": ["--prebuilt","postgres","--stdio"],
+          "env": {
+            "POSTGRES_HOST": "",
+            "POSTGRES_PORT": "",
+            "POSTGRES_DATABASE": "",
+            "POSTGRES_USER": "",
+            "POSTGRES_PASSWORD": ""
+          }
+        }
+      }
+    }
+
+    ```
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Use Tools
+
+Your AI tool is now connected to Postgres using MCP. Try asking your AI assistant to list tables, create a table, or define and execute other SQL statements.
+
+The following tools are available to the LLM:
+
+1. **list_tables**: lists tables and descriptions
+1. **execute_sql**: execute any SQL statement
+
+{{< 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 >}}

docs/en/how-to/connect-ide/spanner_mcp.md

@@ -0,0 +1,13 @@
+---
+title: "Spanner using MCP"
+type: docs
+weight: 2
+description: >
+  Connect your IDE to Spanner using Toolbox.
+---
+<html>
+  <head>
+    <link rel="canonical" href="https://cloud.google.com/spanner/docs/pre-built-tools-with-mcp-toolbox"/>
+    <meta http-equiv="refresh" content="0;url=https://cloud.google.com/spanner/docs/pre-built-tools-with-mcp-toolbox"/>
+  </head>
+</html>

docs/en/how-to/connect_via_mcp.md

@@ -0,0 +1,124 @@
+---
+title: "Connect via MCP Client"
+type: docs
+weight: 1
+description: >
+  How to connect to Toolbox from a MCP Client.
+---
+
+## Toolbox SDKs vs Model Context Protocol (MCP)
+Toolbox now supports connections via both the native Toolbox SDKs and via [Model Context Protocol (MCP)](https://modelcontextprotocol.io/). However, Toolbox has several features which are not supported in the MCP specification (such as Authenticated Parameters and Authorized invocation). 
+
+We recommend using the native SDKs over MCP clients to leverage these features. The native SDKs can be combined with MCP clients in many cases. 
+
+### Protocol Versions
+Toolbox currently supports the following versions of MCP specification:
+* [2024-11-05](https://spec.modelcontextprotocol.io/specification/2024-11-05/)
+
+### Features Not Supported by MCP
+Toolbox has several features that are not yet supported in the MCP specification:
+* **AuthZ/AuthN:** There are no auth implementation in the `2024-11-05` specification. This includes:
+  * [Authenticated Parameters](../resources/tools/_index.md#authenticated-parameters)
+  * [Authorized Invocations](../resources/tools/_index.md#authorized-invocations)
+* **Notifications:** Currently, editing Toolbox Tools requires a server restart. Clients should reload tools on disconnect to get the latest version. 
+
+
+## Connecting to Toolbox with an MCP client
+### Before you begin
+
+{{< notice note >}} 
+MCP is only compatible with Toolbox version 0.3.0 and above.
+{{< /notice >}}
+
+1. [Install](../getting-started/introduction/_index.md#installing-the-server) Toolbox version 0.3.0+.
+
+1. Make sure you've set up and initialized your database.
+
+1. [Set up](../getting-started/configure.md) your `tools.yaml` file.
+
+### Connecting via Standard Input/Output (stdio)
+Toolbox supports the
+[stdio](https://modelcontextprotocol.io/docs/concepts/transports#standard-input%2Foutput-stdio)
+transport protocol. Users that wish to use stdio will have to include the
+`--stdio` flag when running Toolbox.
+
+```bash
+./toolbox --stdio
+```
+
+When running with stdio, Toolbox will listen via stdio instead of acting as a
+remote HTTP server. Logs will be set to the `warn` level by default. `debug` and `info` logs are not
+supported with stdio.
+
+### Connecting via HTTP
+Toolbox supports the HTTP transport protocol with and without SSE.
+
+{{< tabpane text=true >}} {{% tab header="HTTP with SSE" lang="en" %}}
+Add the following configuration to your MCP client configuration:
+```bash
+{
+  "mcpServers": {
+    "toolbox": {
+      "type": "sse",
+      "url": "http://127.0.0.1:5000/mcp/sse",
+    }
+  }
+}
+```
+
+If you would like to connect to a specific toolset, replace `url` with `"http://127.0.0.1:5000/mcp/{toolset_name}/sse"`.
+{{% /tab %}} {{% tab header="HTTP POST" lang="en" %}}
+Connect to Toolbox HTTP POST via `http://127.0.0.1:5000/mcp`.
+
+If you would like to connect to a specific toolset, connect via `http://127.0.0.1:5000/mcp/{toolset_name}`.
+{{% /tab %}} {{< /tabpane >}}
+
+### Using the MCP Inspector with Toolbox
+
+Use MCP [Inspector](https://github.com/modelcontextprotocol/inspector) for
+testing and debugging Toolbox server.
+
+{{< tabpane text=true >}}
+{{% tab header="STDIO" lang="en" %}}
+1. Run Inspector with Toolbox as a subprocess:
+
+   ```bash
+   npx @modelcontextprotocol/inspector ./toolbox --stdio
+   ```
+
+1. For `Transport Type` dropdown menu, select `STDIO`.
+
+1. In `Command`, make sure that it is set to :`./toolbox` (or the correct path to where the Toolbox binary is installed).
+
+1. In `Arguments`, make sure that it's filled with `--stdio`.
+
+1. Click the `Connect` button. It might take awhile to spin up Toolbox. Voila!
+   You should be able to inspect your toolbox tools!
+{{% /tab %}}
+{{% tab header="HTTP with SSE" lang="en" %}}
+1. [Run Toolbox](../getting-started/introduction/_index.md#running-the-server).
+
+1. In a separate terminal, run Inspector directly through `npx`:
+
+    ```bash
+    npx @modelcontextprotocol/inspector
+    ```
+
+1. For `Transport Type` dropdown menu, select `SSE`.
+
+1. For `URL`, type in `http://127.0.0.1:5000/mcp/sse` to use all tool or
+   `http//127.0.0.1:5000/mcp/{toolset_name}/sse` to use a specific toolset.
+
+1. Click the `Connect` button. Voila! You should be able to inspect your toolbox
+   tools!
+{{% /tab %}} {{< /tabpane >}}
+
+### Tested Clients
+
+| Client | SSE Works | MCP Config Docs |
+|--------|--------|--------|
+| Claude Desktop | ✅ | https://modelcontextprotocol.io/quickstart/user#1-download-claude-for-desktop | 
+| MCP Inspector | ✅ | https://github.com/modelcontextprotocol/inspector |
+| Cursor | ✅ | https://docs.cursor.com/context/model-context-protocol |
+| Windsurf | ✅ | https://docs.windsurf.com/windsurf/mcp | 
+| VS Code (Insiders) | ✅ | https://code.visualstudio.com/docs/copilot/chat/mcp-servers |

docs/en/how-to/deploy_docker.md

@@ -1,9 +1,9 @@
 ---
 title: "Deploy using Docker Compose"
 type: docs
-weight: 3
+weight: 4
 description: >
-  How to deploy Toolbox using Docker Compose. 
+  How to deploy Toolbox using Docker Compose.
 ---
 
 <!-- Contributor: Sujith R Pillai <sujithrpillai@gmail.com> -->
@@ -35,7 +35,7 @@ services:
       - "5000:5000"
     volumes:
       - ./config:/config
-    command: [ "toolbox", "--tools_file", "/config/tools.yaml", "--address", "0.0.0.0"]
+    command: [ "toolbox", "--tools-file", "/config/tools.yaml", "--address", "0.0.0.0"]
     depends_on:
       db:
         condition: service_healthy
@@ -75,18 +75,18 @@ networks:
     ```
 
 
-{{< notice tip >}} 
+{{< notice tip >}}
 
 You can use this setup quickly set up Toolbox + Postgres to follow along in our
 [Quickstart](../getting-started/local_quickstart.md)
 
-{{< /notice >}} 
+{{< /notice >}}
 
 
 
-## Connecting with Toolbox Client SDL
+## Connecting with Toolbox Client SDK
 
-Next, we will use Toolbox with the Client SDKs: 
+Next, we will use Toolbox with the Client SDKs:
 
 1. The url for the Toolbox server running using docker-compose will be:
 
@@ -96,11 +96,19 @@ Next, we will use Toolbox with the Client SDKs:
 
 1. Import and initialize the client with the URL:
 
-    ```bash
-    from toolbox_langchain_sdk import ToolboxClient
+   {{< tabpane persist=header >}}
+{{< tab header="LangChain" lang="Python" >}}
+from toolbox_langchain import ToolboxClient
 
-    # Replace with the cloud run service URL generated above
-    toolbox = ToolboxClient("$YOUR_URL")
-    ```
+# Replace with the cloud run service URL generated above
+async with ToolboxClient("http://$YOUR_URL") as toolbox:
+{{< /tab >}}
+{{< tab header="Llamaindex" lang="Python" >}}
+from toolbox_llamaindex import ToolboxClient
+
+# Replace with the cloud run service URL generated above
+async with ToolboxClient("http://$YOUR_URL") as toolbox:
+{{< /tab >}}
+{{< /tabpane >}}
 
 

docs/en/how-to/deploy_gke.md

@@ -1,7 +1,7 @@
 ---
 title: "Deploy to Kubernetes"
 type: docs
-weight: 2
+weight: 4
 description: >
   How to set up and configure Toolbox to deploy on Kubernetes with Google Kubernetes Engine (GKE).
 ---
@@ -40,7 +40,7 @@ description: >
     ```bash
     kubectl version --client
     ```
-   
+
 
 1. If needed, install `kubectl` component using the Google Cloud CLI:
 
@@ -76,7 +76,7 @@ description: >
     - [CloudSQL IAM Identity](../resources/sources/cloud-sql-pg.md#iam-permissions)
     - [Spanner IAM Identity](../resources/sources/spanner.md#iam-permissions)
 
-## Deploy to Kubernetes 
+## Deploy to Kubernetes
 
 1. Set environment variables:
 
@@ -94,7 +94,7 @@ description: >
 
     ```bash
     gcloud container clusters create-auto $CLUSTER_NAME \
-        --location=us-central1 
+        --location=us-central1
     ```
 
 1. Get authentication credentials to interact with the cluster. This also
@@ -172,7 +172,7 @@ description: >
           containers:
             - name: toolbox
               # Recommend to use the latest version of toolbox
-              image: us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:0.1.0
+              image: us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:latest
               args: ["--address", "0.0.0.0"]
               ports:
                 - containerPort: 5000
@@ -277,4 +277,4 @@ description: >
     ```bash
     gcloud container clusters delete $CLUSTER_NAME \
         --location=$REGION
-    ```
+    ```

docs/en/how-to/deploy_toolbox.md

@@ -1,7 +1,7 @@
 ---
 title: "Deploy to Cloud Run"
 type: docs
-weight: 1
+weight: 3
 description: >
   How to set up and configure Toolbox to run on Cloud Run.
 ---
@@ -33,7 +33,7 @@ description: >
                            cloudbuild.googleapis.com \
                            artifactregistry.googleapis.com \
                            iam.googleapis.com \
-                           secretmanager.googleapis.com 
+                           secretmanager.googleapis.com
 
     ```
 
@@ -48,18 +48,10 @@ description: >
     - Cloud Run Developer (roles/run.developer)
     - Service Account User role (roles/iam.serviceAccountUser)
 
-{{< notice note >}} 
-If you are under a domain restriction organization policy
-[restricting](https://cloud.google.com/run/docs/authenticating/public#domain-restricted-sharing)
-unauthenticated invocations for your project, you will need to access your
-deployed service as described under [Testing private
-services](https://cloud.google.com/run/docs/triggering/https-request#testing-private).
-{{< /notice >}}
-
-{{< notice note >}} 
+{{< notice note >}}
 If you are using sources that require VPC-access (such as
 AlloyDB or Cloud SQL over private IP), make sure your Cloud Run service and the
-database are in the same VPC network. 
+database are in the same VPC network.
 {{< /notice >}}
 
 
@@ -119,7 +111,7 @@ section.
         --service-account toolbox-identity \
         --region us-central1 \
         --set-secrets "/app/tools.yaml=tools:latest" \
-        --args="--tools_file=/app/tools.yaml","--address=0.0.0.0","--port=8080"
+        --args="--tools-file=/app/tools.yaml","--address=0.0.0.0","--port=8080"
         # --allow-unauthenticated # https://cloud.google.com/run/docs/authenticating/public#gcloud
     ```
 
@@ -131,34 +123,28 @@ section.
         --service-account toolbox-identity \
         --region us-central1 \
         --set-secrets "/app/tools.yaml=tools:latest" \
-        --args="--tools_file=/app/tools.yaml","--address=0.0.0.0","--port=8080" \
+        --args="--tools-file=/app/tools.yaml","--address=0.0.0.0","--port=8080" \
         # TODO(dev): update the following to match your VPC if necessary 
         --network default \
         --subnet default
         # --allow-unauthenticated # https://cloud.google.com/run/docs/authenticating/public#gcloud
     ```
 
-## Connecting to Cloud Run
-
-Next, we will use `gcloud` to authenticate requests to our Cloud Run instance:
-
-1. Run the `run services proxy` to proxy connections to Cloud Run:
-
-    ```bash
-    gcloud run services proxy toolbox --port=8080 --region=us-central1
-    ```
-
-    If you are prompted to install the proxy, reply *Y* to install.
-
-1. Finally, use `curl` to verify the endpoint works:
-
-    ```bash
-    curl http://127.0.0.1:8080
-    ``` 
-
 ## Connecting with Toolbox Client SDK
 
-Next, we will use Toolbox with client SDK:
+You can connect to Toolbox Cloud Run instances directly through the SDK
+
+1. [Set up `Cloud Run Invoker` role access](https://cloud.google.com/run/docs/securing/managing-access#service-add-principals) to your Cloud Run service.
+
+1. Set up [Application Default
+   Credentials](https://cloud.google.com/docs/authentication/set-up-adc-local-dev-environment)
+   for the principle you set up the `Cloud Run Invoker` role access to.
+   
+    {{< notice tip >}}
+  If you're working in some other environment than local, set up [environment
+    specific Default
+    Credentials](https://cloud.google.com/docs/authentication/provide-credentials-adc).
+    {{< /notice >}}
 
 1. Run the following to retrieve a non-deterministic URL for the cloud run service:
 
@@ -168,9 +154,16 @@ Next, we will use Toolbox with client SDK:
 
 1. Import and initialize the toolbox client with the URL retrieved above:
 
-    ```bash
-    from toolbox_langchain_sdk import ToolboxClient
+    ```python
+    from toolbox_core import ToolboxClient, auth_methods
 
-    # Replace with the cloud run service URL generated above
-    toolbox = ToolboxClient("http://$YOUR_URL")
+    auth_token_provider = auth_methods.aget_google_id_token # can also use sync method
+
+    # Replace with the Cloud Run service URL generated in the previous step.
+    async with ToolboxClient(
+        URL,
+        client_headers={"Authorization": auth_token_provider},
+    ) as toolbox:
     ```
+
+Now, you can use this client to connect to the deployed Cloud Run instance!

docs/en/how-to/export_telemetry.md

@@ -1,13 +1,13 @@
 ---
 title: "Export Telemetry"
 type: docs
-weight: 4
+weight: 5
 description: >
-  How to set up and configure Toolbox to use the Otel Collector. 
+  How to set up and configure Toolbox to use the Otel Collector.
 ---
 
 
-## About 
+## About
 
 The [OpenTelemetry Collector][about-collector] offers a vendor-agnostic
 implementation of how to receive, process and export telemetry data. It removes
@@ -56,7 +56,7 @@ service:
       exporters: ["googlecloud"]
 ```
 
-## Running the Connector
+## Running the Collector
 
 There are a couple of steps to run and use a Collector.
 

docs/en/resources/_index.md

@@ -2,5 +2,6 @@
 title: "Resources"
 type: docs
 weight: 4
-description: List of reference documentation for resources in Toolbox.
+description: >
+  List of reference documentation for resources in Toolbox.
 ---

docs/en/resources/authServices/_index.md

@@ -7,11 +7,11 @@ description: >
 ---
 
 AuthServices represent services that handle authentication and authorization. It
-can primarily be used by [Tools](../tools) in two different ways: 
+can primarily be used by [Tools](../tools) in two different ways:
 
 - [**Authorized Invocation**][auth-invoke] is when a tool
-  to be validate by the auth service before the call can be invoked. Toolbox
-  will rejected an calls that fail to validate or have an invalid token.
+  is validated by the auth service before the call can be invoked. Toolbox
+  will reject any calls that fail to validate or have an invalid token.
 - [**Authenticated Parameters**][auth-params] replace the value of a parameter
   with a field from an [OIDC][openid-claims] claim. Toolbox will automatically
   resolve the ID token provided by the client and replace the parameter in the
@@ -35,19 +35,24 @@ If you are accessing Toolbox with multiple applications, each
 authServices:
   my_auth_app_1:
     kind: google
-    clientId: YOUR_CLIENT_ID_1
+    clientId: ${YOUR_CLIENT_ID_1}
   my_auth_app_2:
     kind: google
-    clientId: YOUR_CLIENT_ID_2
+    clientId: ${YOUR_CLIENT_ID_2}
 ```
 
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
 After you've configured an `authService` you'll, need to reference it in the
 configuration for each tool that should use it:
-- **Authorized Invocations** for authorizing a tool call, [use the
-  `requiredAuth` field in a tool config][auth-invoke]
-- **Authenticated Parameters** for using the value from a ODIC claim, [use the
-  `authServices` field in a parameter config][auth-params]
 
+- **Authorized Invocations** for authorizing a tool call, [use the
+  `authRequired` field in a tool config][auth-invoke]
+- **Authenticated Parameters** for using the value from a OIDC claim, [use the
+  `authServices` field in a parameter config][auth-params]
 
 ## Specifying ID Tokens from Clients
 
@@ -55,37 +60,123 @@ After [configuring](#example) your `authServices` section, use a Toolbox SDK to
 add your ID tokens to the header of a Tool invocation request. When specifying a
 token you will provide a function (that returns an id). This function is called
 when the tool is invoked. This allows you to cache and refresh the ID token as
-needed. 
+needed.
+
+The primary method for providing these getters is via the `auth_token_getters` parameter when loading tools, or the `add_auth_token_getter`() / `add_auth_token_getters()` methods on a loaded tool object.
 
 ### Specifying tokens during load
-{{< tabpane >}}
-{{< tab header="LangChain" lang="Python" >}}
+
+{{< tabpane persist=header >}}
+{{< tab header="Core" lang="Python" >}}
+import asyncio
+from toolbox_core import ToolboxClient
+
 async def get_auth_token():
     # ... Logic to retrieve ID token (e.g., from local storage, OAuth flow)
     # This example just returns a placeholder. Replace with your actual token retrieval.
     return "YOUR_ID_TOKEN" # Placeholder
 
-# for a single tool use:
-authorized_tool = await toolbox.aload_tool("my-tool-name", auth_tokens={"my_auth": get_auth_token})
+async def main():
+    async with ToolboxClient("http://127.0.0.1:5000") as toolbox:
+        auth_tool = await toolbox.load_tool(
+            "get_sensitive_data",
+            auth_token_getters={"my_auth_app_1": get_auth_token}
+        )
+        result = await auth_tool(param="value")
+        print(result)
 
-# for a toolset use: 
-authorized_tools = await toolbox.aload_toolset("my-toolset-name", auth_tokens={"my_auth": get_auth_token})
+if __name__ == "__main__":
+    asyncio.run(main())
 {{< /tab >}}
-{{< /tabpane >}}
+{{< tab header="LangChain" lang="Python" >}}
+import asyncio
+from toolbox_langchain import ToolboxClient
 
+async def get_auth_token():
+    # ... Logic to retrieve ID token (e.g., from local storage, OAuth flow)
+    # This example just returns a placeholder. Replace with your actual token retrieval.
+    return "YOUR_ID_TOKEN" # Placeholder
+
+async def main():
+    toolbox = ToolboxClient("http://127.0.0.1:5000")
+
+    auth_tool = await toolbox.aload_tool(
+        "get_sensitive_data",
+        auth_token_getters={"my_auth_app_1": get_auth_token}
+    )
+    result = await auth_tool.ainvoke({"param": "value"})
+    print(result)
+
+if __name__ == "__main__":
+    asyncio.run(main())
+{{< /tab >}}
+{{< tab header="Llamaindex" lang="Python" >}}
+import asyncio
+from toolbox_llamaindex import ToolboxClient
+
+async def get_auth_token():
+    # ... Logic to retrieve ID token (e.g., from local storage, OAuth flow)
+    # This example just returns a placeholder. Replace with your actual token retrieval.
+    return "YOUR_ID_TOKEN" # Placeholder
+
+async def main():
+    toolbox = ToolboxClient("http://127.0.0.1:5000")
+
+    auth_tool = await toolbox.aload_tool(
+        "get_sensitive_data",
+        auth_token_getters={"my_auth_app_1": get_auth_token}
+    )
+    # result = await auth_tool.acall(param="value")
+    # print(result.content)
+
+if __name__ == "__main__":
+    asyncio.run(main()){{< /tab >}}
+{{< /tabpane >}}
 
 ### Specifying tokens for existing tools
 
-{{< tabpane >}}
-{{< tab header="LangChain" lang="Python" >}}
-tools = await toolbox.aload_toolset()
+{{< tabpane persist=header >}}
+{{< tab header="Core" lang="Python" >}}
+tools = await toolbox.load_toolset()
+
 # for a single token
-auth_tools = [tool.add_auth_token("my_auth", get_auth_token) for tool in tools]
+
+authorized_tool = tools[0].add_auth_token_getter("my_auth", get_auth_token)
+
 # OR, if multiple tokens are needed
-authorized_tool = tools[0].add_auth_tokens({
+
+authorized_tool = tools[0].add_auth_token_getters({
   "my_auth1": get_auth1_token,
   "my_auth2": get_auth2_token,
-}) 
+})
+{{< /tab >}}
+{{< tab header="LangChain" lang="Python" >}}
+tools = toolbox.load_toolset()
+
+# for a single token
+
+authorized_tool = tools[0].add_auth_token_getter("my_auth", get_auth_token)
+
+# OR, if multiple tokens are needed
+
+authorized_tool = tools[0].add_auth_token_getters({
+  "my_auth1": get_auth1_token,
+  "my_auth2": get_auth2_token,
+})
+{{< /tab >}}
+{{< tab header="Llamaindex" lang="Python" >}}
+tools = toolbox.load_toolset()
+
+# for a single token
+
+authorized_tool = tools[0].add_auth_token_getter("my_auth", get_auth_token)
+
+# OR, if multiple tokens are needed
+
+authorized_tool = tools[0].add_auth_token_getters({
+  "my_auth1": get_auth1_token,
+  "my_auth2": get_auth2_token,
+})
 {{< /tab >}}
 {{< /tabpane >}}
 

docs/en/resources/authServices/google.md

@@ -43,9 +43,14 @@ id-token][provided-claims] can be used for the parameter.
 authServices:
   my-google-auth:
     kind: google
-    clientId: YOUR_GOOGLE_CLIENT_ID
+    clientId: ${YOUR_GOOGLE_CLIENT_ID}
 ```
 
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                  |

docs/en/resources/sources/_index.md

@@ -11,6 +11,11 @@ Sources as a map in the `sources` section of your `tools.yaml` file. Typically,
 a source configuration will contain any information needed to connect with and
 interact with the database.
 
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
 ```yaml
 sources:
     my-cloud-sql-source:
@@ -19,11 +24,11 @@ sources:
         region: us-central1
         instance: my-instance-name
         database: my_db
-        user: my-user
-        password: my-password
+        user: ${USER_NAME}
+        password: ${PASSWORD}
 ```
 
 In implementation, each source is a different connection pool or client that used
-to connect to the database and execute the tool. 
+to connect to the database and execute the tool.
 
-## Available Sources
+## Available Sources

docs/en/resources/sources/alloydb-pg.md

@@ -24,7 +24,6 @@ cluster][alloydb-free-trial].
 
 ## Requirements
 
-
 ### IAM Permissions
 
 By default, AlloyDB for PostgreSQL source uses the [AlloyDB Go
@@ -46,24 +45,47 @@ permissions):
 ### Networking
 
 AlloyDB supports connecting over both from external networks via the internet
-([public IP][public-ip]), and internal networks ([private IP][private-ip]). 
-For more information on choosing between the two options, see the AlloyDB page 
+([public IP][public-ip]), and internal networks ([private IP][private-ip]).
+For more information on choosing between the two options, see the AlloyDB page
 [Connection overview][conn-overview].
 
-You can configure the `ipType` parameter in your source configuration to 
+You can configure the `ipType` parameter in your source configuration to
 `public` or `private` to match your cluster's configuration. Regardless of which
 you choose, all connections use IAM-based authorization and are encrypted with
-mTLS. 
+mTLS.
 
 [private-ip]: https://cloud.google.com/alloydb/docs/private-ip
 [public-ip]: https://cloud.google.com/alloydb/docs/connect-public-ip
 [conn-overview]: https://cloud.google.com/alloydb/docs/connection-overview
 
-### Database User
+### Authentication
 
-Currently, this source only uses standard authentication. You will need to [create
-a PostgreSQL user][alloydb-users] to login to the database with.
+This source supports both password-based authentication and IAM
+authentication (using your [Application Default Credentials][adc]).
 
+#### Standard Authentication
+
+To connect using user/password, [create
+a PostgreSQL user][alloydb-users] and input your credentials in the `user` and
+`password` fields.
+
+```yaml
+user: ${USER_NAME}
+password: ${PASSWORD}
+```
+
+#### IAM Authentication
+
+To connect using IAM authentication:
+
+1. Prepare your database instance and user following this [guide][iam-guide].
+2. You could choose one of the two ways to log in:
+    - Specify your IAM email as the `user`.
+    - Leave your `user` field blank. Toolbox
+            will fetch the [ADC][adc] automatically and log in using the email associated with it.
+3. Leave the `password` field blank.
+
+[iam-guide]: https://cloud.google.com/alloydb/docs/database-users/manage-iam-auth
 [alloydb-users]: https://cloud.google.com/alloydb/docs/database-users/about
 
 ## Example
@@ -71,27 +93,32 @@ a PostgreSQL user][alloydb-users] to login to the database with.
 ```yaml
 sources:
     my-alloydb-pg-source:
-        kind: "alloydb-postgres"
-        project: "my-project-id"
-        region: "us-central1"
-        cluster: "my-cluster"
-        instance: "my-instance"
-        database: "my_db"
-        user: "my-user"
-        password: "my-password"
+        kind: alloydb-postgres
+        project: my-project-id
+        region: us-central1
+        cluster: my-cluster
+        instance: my-instance
+        database: my_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
         # ipType: "public"
 ```
 
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
 ## Reference
 
-| **field** | **type** | **required** | **description**                                                                           |
-|-----------|:--------:|:------------:|-------------------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "alloydb-postgres".                                                               |
-| project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").             |
-| region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").              |
-| cluster   |  string  |     true     | Name of the AlloyDB cluster (e.g. "my-cluster").                                          |
-| instance  |  string  |     true     | Name of the AlloyDB instance within the cluser (e.g. "my-instance").                      |
-| database  |  string  |     true     | Name of the Postgres database to connect to (e.g. "my_db").                               |
-| user      |  string  |     true     | Name of the Postgres user to connect as (e.g. "my-pg-user").                              |
-| password  |  string  |     true     | Password of the Postgres user (e.g. "my-password").                                       |
-| ipType    |  string  |    false     | IP Type of the AlloyDB instance; must be one of `public` or `private`. Default: `public`. |
+| **field** | **type** | **required** | **description**                                                                                                          |
+|-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "alloydb-postgres".                                                                                              |
+| project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                                            |
+| region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                                             |
+| cluster   |  string  |     true     | Name of the AlloyDB cluster (e.g. "my-cluster").                                                                         |
+| instance  |  string  |     true     | Name of the AlloyDB instance within the cluster (e.g. "my-instance").                                                    |
+| database  |  string  |     true     | Name of the Postgres database to connect to (e.g. "my_db").                                                              |
+| user      |  string  |    false     | Name of the Postgres user to connect as (e.g. "my-pg-user"). Defaults to IAM auth using [ADC][adc] email if unspecified. |
+| password  |  string  |    false     | Password of the Postgres user (e.g. "my-password"). Defaults to attempting IAM authentication if unspecified.            |
+| ipType    |  string  |    false     | IP Type of the AlloyDB instance; must be one of `public` or `private`. Default: `public`.                                |

docs/en/resources/sources/bigquery.md

@@ -0,0 +1,73 @@
+---
+title: "BigQuery"
+type: docs
+weight: 1
+description: >
+  BigQuery is Google Cloud's fully managed, petabyte-scale, and cost-effective
+  analytics data warehouse that lets you run analytics over vast amounts of 
+  data in near real time. With BigQuery, there's no infrastructure to set 
+  up or manage, letting you focus on finding meaningful insights using 
+  GoogleSQL and taking advantage of flexible pricing models across on-demand 
+  and flat-rate options.
+---
+
+# BigQuery Source
+
+[BigQuery][bigquery-docs] is Google Cloud's fully managed, petabyte-scale,
+and cost-effective analytics data warehouse that lets you run analytics
+over vast amounts of data in near real time. With BigQuery, there's no
+infrastructure to set up or manage, letting you focus on finding meaningful
+insights using GoogleSQL and taking advantage of flexible pricing models
+across on-demand and flat-rate options.
+
+If you are new to BigQuery, you can try to
+[load and query data with the bq tool][bigquery-quickstart-cli].
+
+BigQuery uses [GoogleSQL][bigquery-googlesql] for querying data. GoogleSQL
+is an ANSI-compliant structured query language (SQL) that is also implemented
+for other Google Cloud services. SQL queries are handled by cluster nodes
+in the same way as NoSQL data requests. Therefore, the same best practices
+apply when creating SQL queries to run against your BigQuery data, such as
+avoiding full table scans or complex filters.
+
+[bigquery-docs]: https://cloud.google.com/bigquery/docs
+[bigquery-quickstart-cli]: https://cloud.google.com/bigquery/docs/quickstarts/quickstart-command-line
+[bigquery-googlesql]: https://cloud.google.com/bigquery/docs/reference/standard-sql/
+
+## Requirements
+
+### IAM Permissions
+
+BigQuery uses [Identity and Access Management (IAM)][iam-overview] to control
+user and group access to BigQuery resources like projects, datasets, and tables.
+Toolbox will use your [Application Default Credentials (ADC)][adc] to authorize
+and authenticate when interacting with [BigQuery][bigquery-docs].
+
+In addition to [setting the ADC for your server][set-adc], you need to ensure
+the IAM identity has been given the correct IAM permissions for the queries
+you intend to run. Common roles include `roles/bigquery.user` (which includes
+permissions to run jobs and read data) or `roles/bigquery.dataViewer`. See
+[Introduction to BigQuery IAM][grant-permissions] for more information on
+applying IAM permissions and roles to an identity.
+
+[iam-overview]: https://cloud.google.com/bigquery/docs/access-control
+[adc]: https://cloud.google.com/docs/authentication#adc
+[set-adc]: https://cloud.google.com/docs/authentication/provide-credentials-adc
+[grant-permissions]: https://cloud.google.com/bigquery/docs/access-control
+
+## Example
+
+```yaml
+sources:
+  my-bigquery-source:
+    kind: "bigquery"
+    project: "my-project-id"
+```
+
+## Reference
+
+| **field** | **type** | **required** | **description**                                                               |
+|-----------|:--------:|:------------:|-------------------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "bigquery".                                                           |
+| project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id"). |
+| location  |  string  |    false     | Specifies the location (e.g., 'us', 'asia-northeast1') in which to run the query job. This location must match the location of any tables referenced in the query. The default behavior is for it to be executed in the US multi-region |

docs/en/resources/sources/bigtable.md

@@ -0,0 +1,70 @@
+---
+title: "Bigtable"
+type: docs
+weight: 1
+description: >
+  Bigtable is a low-latency NoSQL database service for machine learning, operational analytics, and user-facing operations. It's a wide-column, key-value store that can scale to billions of rows and thousands of columns. With Bigtable, you can replicate your data to regions across the world for high availability and data resiliency.
+
+---
+
+# Bigtable Source
+
+[Bigtable][bigtable-docs] is a low-latency NoSQL database service for machine
+learning, operational analytics, and user-facing operations. It's a wide-column,
+key-value store that can scale to billions of rows and thousands of columns.
+With Bigtable, you can replicate your data to regions across the world for high
+availability and data resiliency.
+
+If you are new to Bigtable, you can try to [create an instance and write data
+with the cbt CLI][bigtable-quickstart-with-cli].
+
+You can use [GoogleSQL statements][bigtable-googlesql] to query your Bigtable
+data. GoogleSQL is an ANSI-compliant structured query language (SQL) that is
+also implemented for other Google Cloud services. SQL queries are handled by
+cluster nodes in the same way as NoSQL data requests. Therefore, the same best
+practices apply when creating SQL queries to run against your Bigtable data,
+such as avoiding full table scans or complex filters.
+
+[bigtable-docs]: https://cloud.google.com/bigtable/docs
+[bigtable-quickstart-with-cli]:
+    https://cloud.google.com/bigtable/docs/create-instance-write-data-cbt-cli
+
+[bigtable-googlesql]:
+    https://cloud.google.com/bigtable/docs/googlesql-overview
+
+## Requirements
+
+### IAM Permissions
+
+Bigtable uses [Identity and Access Management (IAM)][iam-overview] to control
+user and group access to Bigtable resources at the project, instance, table, and
+backup level. Toolbox will use your [Application Default Credentials (ADC)][adc]
+to authorize and authenticate when interacting with [Bigtable][bigtable-docs].
+
+In addition to [setting the ADC for your server][set-adc], you need to ensure
+the IAM identity has been given the correct IAM permissions for the query
+provided. See [Apply IAM roles][grant-permissions] for more information on
+applying IAM permissions and roles to an identity.
+
+[iam-overview]: https://cloud.google.com/bigtable/docs/access-control
+[adc]: https://cloud.google.com/docs/authentication#adc
+[set-adc]: https://cloud.google.com/docs/authentication/provide-credentials-adc
+[grant-permissions]: https://cloud.google.com/bigtable/docs/access-control#iam-management-instance
+
+## Example
+
+```yaml
+sources:
+  my-bigtable-source:
+    kind: "bigtable"
+    project: "my-project-id"
+    instance: "test-instance"
+```
+
+## Reference
+
+| **field** | **type** | **required** | **description**                                                               |
+|-----------|:--------:|:------------:|-------------------------------------------------------------------------------|
+| kind      |  string  |     true     | Must be "bigtable".                                                           |
+| project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id"). |
+| instance  |  string  |     true     | Name of the Bigtable instance.                                                |

docs/en/resources/sources/cloud-sql-mssql.md

@@ -34,26 +34,25 @@ permissions):
 
 - `roles/cloudsql.client`
 
-{{< notice tip >}} 
+{{< notice tip >}}
 If you are connecting from Compute Engine, make sure your VM
 also has the [proper
 scope](https://cloud.google.com/compute/docs/access/service-accounts#accesscopesiam)
-to connect using the Cloud SQL Admin API. 
+to connect using the Cloud SQL Admin API.
 {{< /notice >}}
 
 [csql-go-conn]: https://github.com/GoogleCloudPlatform/cloud-sql-go-connector
 [adc]: https://cloud.google.com/docs/authentication#adc
 [set-adc]: https://cloud.google.com/docs/authentication/provide-credentials-adc
-[gce-access-scopes]: https://cloud.google.com/compute/docs/access/service-accounts#accesscopesiam
 
 ### Networking
 
 Cloud SQL supports connecting over both from external networks via the internet
-([public IP][public-ip]), and internal networks ([private IP][private-ip]). 
-For more information on choosing between the two options, see the Cloud SQL page 
+([public IP][public-ip]), and internal networks ([private IP][private-ip]).
+For more information on choosing between the two options, see the Cloud SQL page
 [Connection overview][conn-overview].
 
-You can configure the `ipType` parameter in your source configuration to 
+You can configure the `ipType` parameter in your source configuration to
 `public` or `private` to match your cluster's configuration. Regardless of which
 you choose, all connections use IAM-based authorization and are encrypted with
 mTLS.
@@ -80,9 +79,16 @@ sources:
      instance: my-instance
      database: my_db
      ipAddress: localhost
+     user: ${USER_NAME}
+     password: ${PASSWORD}
      # ipType: private
 ```
 
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                                             |
@@ -90,7 +96,7 @@ sources:
 | kind      |  string  |     true     | Must be "cloud-sql-mssql".                                                                  |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").               |
 | region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                |
-| instance  |  string  |     true     | Name of the Cloud SQL instance within the cluser (e.g. "my-instance").                      |
+| instance  |  string  |     true     | Name of the Cloud SQL instance within the cluster (e.g. "my-instance").                      |
 | database  |  string  |     true     | Name of the Cloud SQL database to connect to (e.g. "my_db").                                |
 | ipAddress |  string  |     true     | IP address of the Cloud SQL instance to connect to.                                         |
 | user      |  string  |     true     | Name of the SQL Server user to connect as (e.g. "my-pg-user").                              |

docs/en/resources/sources/cloud-sql-mysql.md

@@ -11,7 +11,7 @@ description: >
 ## About
 
 [Cloud SQL for MySQL][csql-mysql-docs] is a fully-managed database service
-that helps you set up, maintain, manage, and administer your MySQL 
+that helps you set up, maintain, manage, and administer your MySQL
 relational databases on Google Cloud Platform.
 
 If you are new to Cloud SQL for MySQL, you can try [creating and connecting
@@ -35,29 +35,28 @@ permissions):
 
 - `roles/cloudsql.client`
 
-{{< notice tip >}} 
+{{< notice tip >}}
 If you are connecting from Compute Engine, make sure your VM
 also has the [proper
 scope](https://cloud.google.com/compute/docs/access/service-accounts#accesscopesiam)
-to connect using the Cloud SQL Admin API. 
+to connect using the Cloud SQL Admin API.
 {{< /notice >}}
 
 [csql-go-conn]: https://github.com/GoogleCloudPlatform/cloud-sql-go-connector
 [adc]: https://cloud.google.com/docs/authentication#adc
 [set-adc]: https://cloud.google.com/docs/authentication/provide-credentials-adc
-[gce-access-scopes]: https://cloud.google.com/compute/docs/access/service-accounts#accesscopesiam
 
 ### Networking
 
 Cloud SQL supports connecting over both from external networks via the internet
-([public IP][public-ip]), and internal networks ([private IP][private-ip]). 
-For more information on choosing between the two options, see the Cloud SQL page 
+([public IP][public-ip]), and internal networks ([private IP][private-ip]).
+For more information on choosing between the two options, see the Cloud SQL page
 [Connection overview][conn-overview].
 
-You can configure the `ipType` parameter in your source configuration to 
+You can configure the `ipType` parameter in your source configuration to
 `public` or `private` to match your cluster's configuration. Regardless of which
 you choose, all connections use IAM-based authorization and are encrypted with
-mTLS. 
+mTLS.
 
 [private-ip]: https://cloud.google.com/sql/docs/mysql/configure-private-ip
 [public-ip]: https://cloud.google.com/sql/docs/mysql/configure-ip
@@ -65,7 +64,7 @@ mTLS.
 
 ### Database User
 
-Current, this source only uses standard authentication. You will need to [create
+Currently, this source only uses standard authentication. You will need to [create
 a MySQL user][cloud-sql-users] to login to the database with.
 
 [cloud-sql-users]: https://cloud.google.com/sql/docs/mysql/create-manage-users
@@ -75,16 +74,21 @@ a MySQL user][cloud-sql-users] to login to the database with.
 ```yaml
 sources:
     my-cloud-sql-mysql-source:
-        kind: "cloud-sql-mysql"
-        project: "my-project-id"
-        region: "us-central1"
-        instance: "my-instance"
-        database: "my_db"
-        user: "my-user"
-        password: "my-password"
+        kind: cloud-sql-mysql
+        project: my-project-id
+        region: us-central1
+        instance: my-instance
+        database: my_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
         # ipType: "private"
 ```
 
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                                             |

docs/en/resources/sources/cloud-sql-pg.md

@@ -35,56 +35,84 @@ permissions):
 
 - `roles/cloudsql.client`
 
-{{< notice tip >}} 
+{{< notice tip >}}
 If you are connecting from Compute Engine, make sure your VM
 also has the [proper
 scope](https://cloud.google.com/compute/docs/access/service-accounts#accesscopesiam)
-to connect using the Cloud SQL Admin API. 
+to connect using the Cloud SQL Admin API.
 {{< /notice >}}
 
-[csql-go-conn]: https://github.com/GoogleCloudPlatform/cloud-sql-go-connector
-[adc]: https://cloud.google.com/docs/authentication#adc
-[set-adc]: https://cloud.google.com/docs/authentication/provide-credentials-adc
-[gce-access-scopes]: https://cloud.google.com/compute/docs/access/service-accounts#accesscopesiam
+[csql-go-conn]: <https://github.com/GoogleCloudPlatform/cloud-sql-go-connector>
+[adc]: <https://cloud.google.com/docs/authentication#adc>
+[set-adc]: <https://cloud.google.com/docs/authentication/provide-credentials-adc>
 
 ### Networking
 
 Cloud SQL supports connecting over both from external networks via the internet
-([public IP][public-ip]), and internal networks ([private IP][private-ip]). 
-For more information on choosing between the two options, see the Cloud SQL page 
+([public IP][public-ip]), and internal networks ([private IP][private-ip]).
+For more information on choosing between the two options, see the Cloud SQL page
 [Connection overview][conn-overview].
 
-You can configure the `ipType` parameter in your source configuration to 
+You can configure the `ipType` parameter in your source configuration to
 `public` or `private` to match your cluster's configuration. Regardless of which
 you choose, all connections use IAM-based authorization and are encrypted with
-mTLS. 
+mTLS.
 
 [private-ip]: https://cloud.google.com/sql/docs/postgres/configure-private-ip
 [public-ip]: https://cloud.google.com/sql/docs/postgres/configure-ip
 [conn-overview]: https://cloud.google.com/sql/docs/postgres/connect-overview
 
-### Database User
+### Authentication
 
-Current, this source only uses standard authentication. You will need to [create
-a PostreSQL user][cloud-sql-users] to login to the database with.
+This source supports both password-based authentication and IAM
+authentication (using your [Application Default Credentials][adc]).
 
-[cloud-sql-users]: https://cloud.google.com/sql/docs/postgres/create-manage-users
+#### Standard Authentication
+
+To connect using user/password, [create
+a PostgreSQL user][cloudsql-users] and input your credentials in the `user` and
+`password` fields.
+
+```yaml
+user: ${USER_NAME}
+password: ${PASSWORD}
+```
+
+#### IAM Authentication
+
+To connect using IAM authentication:
+
+1. Prepare your database instance and user following this [guide][iam-guide].
+2. You could choose one of the two ways to log in:
+    - Specify your IAM email as the `user`.
+    - Leave your `user` field blank. Toolbox
+            will fetch the [ADC][adc] automatically and log in using the email associated with it.
+
+3. Leave the `password` field blank.
+
+[iam-guide]: https://cloud.google.com/sql/docs/postgres/iam-logins
+[cloudsql-users]: https://cloud.google.com/sql/docs/postgres/create-manage-users
 
 ## Example
 
 ```yaml
 sources:
     my-cloud-sql-pg-source:
-        kind: "cloud-sql-postgres"
-        project: "my-project-id"
-        region: "us-central1"
-        instance: "my-instance"
-        database: "my_db"
-        user: "my-user"
-        password: "my-password"
+        kind: cloud-sql-postgres
+        project: my-project-id
+        region: us-central1
+        instance: my-instance
+        database: my_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
         # ipType: "private"
 ```
 
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                                             |
@@ -94,6 +122,6 @@ sources:
 | region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                |
 | instance  |  string  |     true     | Name of the Cloud SQL instance within the cluster (e.g. "my-instance").                     |
 | database  |  string  |     true     | Name of the Postgres database to connect to (e.g. "my_db").                                 |
-| user      |  string  |     true     | Name of the Postgres user to connect as (e.g. "my-pg-user").                                |
-| password  |  string  |     true     | Password of the Postgres user (e.g. "my-password").                                         |
+| user      |  string  |     false     | Name of the Postgres user to connect as (e.g. "my-pg-user"). Defaults to IAM auth using [ADC][adc] email if unspecified.                               |
+| password  |  string  |     false     | Password of the Postgres user (e.g. "my-password"). Defaults to attempting IAM authentication if unspecified.                                        |
 | ipType    |  string  |    false     | IP Type of the Cloud SQL instance; must be one of `public` or `private`. Default: `public`. |

docs/en/resources/sources/couchbase.md

@@ -0,0 +1,43 @@
+---
+title: "couchbase"
+type: docs
+weight: 1
+description: > 
+  A "couchbase" source connects to a Couchbase database.
+---
+
+## About
+
+A `couchbase` source establishes a connection to a Couchbase database cluster, allowing tools to execute SQL queries against it.
+
+## Example
+
+```yaml
+sources:
+    my-couchbase-instance:
+        kind: couchbase
+        connectionString: couchbase://localhost:8091
+        bucket: travel-sample
+        scope: inventory
+        username: Administrator
+        password: password
+```
+
+## Reference
+
+| **field**           | **type** | **required** | **description**                                                                                                             |
+|---------------------|:--------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------|
+| kind                | string   |    true      | Must be "couchbase".                                                                                                         |
+| connectionString   | string   |    true      | Connection string for the Couchbase cluster.                                                                                |
+| bucket              | string   |    true      | Name of the bucket to connect to.                                                                                           |
+| scope               | string   |    true      | Name of the scope within the bucket.                                                                                        |
+| username            | string   |    false     | Username for authentication.                                                                                                |
+| password            | string   |    false     | Password for authentication.                                                                                                |
+| clientCert         | string   |    false     | Path to client certificate file for TLS authentication.                                                                     |
+| clientCertPassword| string   |    false     | Password for the client certificate.                                                                                        |
+| clientKey          | string   |    false     | Path to client key file for TLS authentication.                                                                             |
+| clientKeyPassword | string   |    false     | Password for the client key.                                                                                                |
+| caCert             | string   |    false     | Path to CA certificate file.                                                                                                |
+| noSslVerify       | boolean  |    false     | If true, skip server certificate verification. **Warning:** This option should only be used in development or testing environments. Disabling SSL verification poses significant security risks in production as it makes your connection vulnerable to man-in-the-middle attacks. |
+| profile             | string   |    false     | Name of the connection profile to apply.                                                                                    |
+| queryScanConsistency | integer  |    false     | Query scan consistency. Controls the consistency guarantee for index scanning. Values: 1 for "not_bounded" (fastest option, but results may not include the most recent operations), 2 for "request_plus" (highest consistency level, includes all operations up until the query started, but incurs a performance penalty). If not specified, defaults to the Couchbase Go SDK default. |

docs/en/resources/sources/dgraph.md

@@ -9,7 +9,7 @@ description: >
 
 ## About
 
-[Dgraph][dgraph-docs] is an open-source graph database. It is designed for real-time workloads, horizontal scalability, and data flexibility. Implemented as a distributed system, Dgraph processes queries in parallel to deliver the fastest result. 
+[Dgraph][dgraph-docs] is an open-source graph database. It is designed for real-time workloads, horizontal scalability, and data flexibility. Implemented as a distributed system, Dgraph processes queries in parallel to deliver the fastest result.
 
 This source can connect to either a self-managed Dgraph cluster or one hosted on
 Dgraph Cloud. If you're new to Dgraph, the fastest way to get started is to
@@ -18,7 +18,7 @@ Dgraph Cloud. If you're new to Dgraph, the fastest way to get started is to
 [dgraph-docs]: https://dgraph.io/docs
 [dgraph-login]: https://cloud.dgraph.io/login
 
-## Requirements 
+## Requirements
 
 ### Database User
 
@@ -34,20 +34,25 @@ and user credentials for that namespace.
 ```yaml
 sources:
     my-dgraph-source:
-        kind: "dgraph"
-        dgraphUrl: "https://xxxx.cloud.dgraph.io"
-        user: "groot"
-        password: "password"
-        apiKey: abc123
-        namepace : 0
+        kind: dgraph
+        dgraphUrl: https://xxxx.cloud.dgraph.io
+        user: ${USER_NAME}
+        password: ${PASSWORD}
+        apiKey: ${API_KEY}
+        namespace : 0
 ```
 
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
 ## Reference
 
 | **Field**   | **Type** | **Required** | **Description**                                                                                  |
 |-------------|:--------:|:------------:|--------------------------------------------------------------------------------------------------|
 | kind        |  string  |     true     | Must be "dgraph".                                                                                |
-| dgraphUrl   |  string  |     true     | Connection URI (e.g. "https://xxx.cloud.dgraph.io", "https://localhost:8080").                   |
+| dgraphUrl   |  string  |     true     | Connection URI (e.g. "<https://xxx.cloud.dgraph.io>", "<https://localhost:8080>").                   |
 | user        |  string  |     false    | Name of the Dgraph user to connect as (e.g., "groot").                                           |
 | password    |  string  |     false    | Password of the Dgraph user (e.g., "password").                                                  |
 | apiKey      |  string  |     false    | API key to connect to a Dgraph Cloud instance.                                                   |

docs/en/resources/sources/http.md

@@ -0,0 +1,49 @@
+---
+title: "HTTP"
+linkTitle: "HTTP"
+type: docs
+weight: 1
+description: >
+  The HTTP source enables the Toolbox to retrieve data from a remote server using HTTP requests.
+---
+
+## About
+
+The HTTP Source allows Toolbox to retrieve data from arbitrary HTTP
+endpoints. This enables Generative AI applications to access data from web APIs
+and other HTTP-accessible resources.
+
+## Example
+
+```yaml
+sources:
+  my-http-source:
+    kind: http
+    baseUrl: https://api.example.com/data
+    timeout: 10s # default to 30s
+    headers:
+      Authorization: Bearer ${API_KEY}
+      Content-Type: application/json
+    queryParams:
+      param1: value1
+      param2: value2
+    # disableSslVerification: false
+```
+
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
+## Reference
+
+| **field**              |     **type**      | **required** | **description**                                                                                                                    |
+|------------------------|:-----------------:|:------------:|------------------------------------------------------------------------------------------------------------------------------------|
+| kind                   |      string       |     true     | Must be "http".                                                                                                                    |
+| baseUrl                |      string       |     true     | The base URL for the HTTP requests (e.g., `https://api.example.com`).                                                              |
+| timeout                |      string       |    false     | The timeout for HTTP requests (e.g., "5s", "1m", refer to [ParseDuration][parse-duration-doc] for more examples). Defaults to 30s. |
+| headers                | map[string]string |    false     | Default headers to include in the HTTP requests.                                                                                   |
+| queryParams            | map[string]string |    false     | Default query parameters to include in the HTTP requests.                                                                          |
+| disableSslVerification |       bool        |    false     | Disable SSL certificate verification. This should only be used for local development. Defaults to `false`.                         |
+
+[parse-duration-doc]: https://pkg.go.dev/time#ParseDuration

docs/en/resources/sources/mssql.md

@@ -7,7 +7,7 @@ description: >
 
 ---
 
-##  About
+## About
 
 [SQL Server][mssql-docs] is a relational database management system (RDBMS)
 developed by Microsoft that allows users to store, retrieve, and manage large
@@ -20,7 +20,7 @@ amount of data through a structured format.
 ### Database User
 
 This source only uses standard authentication. You will need to [create a
-SQL Server user][mssql-users] to login to the database with. 
+SQL Server user][mssql-users] to login to the database with.
 
 [mssql-users]: https://learn.microsoft.com/en-us/sql/relational-databases/security/authentication-access/create-a-database-user?view=sql-server-ver16
 
@@ -29,14 +29,19 @@ SQL Server user][mssql-users] to login to the database with.
 ```yaml
 sources:
     my-mssql-source:
-        kind: "mssql"
-        host: "127.0.0.1"
-        port: "1433"
-        database: "my_db"
-        user: "my-user"
-        password: "my-password"
+        kind: mssql
+        host: 127.0.0.1
+        port: 1433
+        database: my_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
 ```
 
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                        |

docs/en/resources/sources/mysql.md

@@ -11,7 +11,7 @@ description: >
 
 [MySQL][mysql-docs] is a relational database management system (RDBMS) that
 stores and manages data. It's a popular choice for developers because of its
-reliability, performance, and ease of use. 
+reliability, performance, and ease of use.
 
 [mysql-docs]: https://www.mysql.com/
 
@@ -20,7 +20,7 @@ reliability, performance, and ease of use.
 ### Database User
 
 This source only uses standard authentication. You will need to [create a
-MySQL user][mysql-users] to login to the database with. 
+MySQL user][mysql-users] to login to the database with.
 
 [mysql-users]: https://dev.mysql.com/doc/refman/8.4/en/user-names.html
 
@@ -29,14 +29,19 @@ MySQL user][mysql-users] to login to the database with.
 ```yaml
 sources:
     my-mysql-source:
-        kind: "mysql"
-        host: "127.0.0.1"
-        port: "3306"
-        database: "my_db"
-        user: "my-user"
-        password: "my-password"
+        kind: mysql
+        host: 127.0.0.1
+        port: 3306
+        database: my_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
 ```
 
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                                             |

docs/en/resources/sources/neo4j.md

@@ -13,13 +13,13 @@ reliability, feature robustness, and performance.
 
 [neo4j-docs]: https://neo4j.com/docs
 
-## Requirements 
+## Requirements
 
 ### Database User
 
 This source only uses standard authentication. You will need to [create a Neo4j
 user][neo4j-users] to log in to the database with, or use the default `neo4j`
-user if available. 
+user if available.
 
 [neo4j-users]: https://neo4j.com/docs/operations-manual/current/authentication-authorization/manage-users/
 
@@ -28,13 +28,18 @@ user if available.
 ```yaml
 sources:
     my-neo4j-source:
-        kind: "neo4j"
-        uri: "neo4j+s://xxxx.databases.neo4j.io:7687"
-        user: "neo4j"
-        password: "my-password"
+        kind: neo4j
+        uri: neo4j+s://xxxx.databases.neo4j.io:7687
+        user: ${USER_NAME}
+        password: ${PASSWORD}
         database: "neo4j"
 ```
 
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                      |
@@ -44,5 +49,3 @@ sources:
 | user      |  string  |     true     | Name of the Neo4j user to connect as (e.g. "neo4j").                 |
 | password  |  string  |     true     | Password of the Neo4j user (e.g. "my-password").                     |
 | database  |  string  |     true     | Name of the Neo4j database to connect to (e.g. "neo4j").             |
-
-

docs/en/resources/sources/postgres.md

@@ -7,7 +7,7 @@ description: >
 
 ---
 
-##  About
+## About
 
 [PostgreSQL][pg-docs] is a powerful, open source object-relational database
 system with over 35 years of active development that has earned it a strong
@@ -20,7 +20,7 @@ reputation for reliability, feature robustness, and performance.
 ### Database User
 
 This source only uses standard authentication. You will need to [create a
-PostreSQL user][pg-users] to login to the database with. 
+PostgreSQL user][pg-users] to login to the database with.
 
 [pg-users]: https://www.postgresql.org/docs/current/sql-createuser.html
 
@@ -29,14 +29,19 @@ PostreSQL user][pg-users] to login to the database with.
 ```yaml
 sources:
     my-pg-source:
-        kind: "postgres"
-        host: "127.0.0.1"
-        port: "5432"
-        database: "my_db"
-        user: "my-user"
-        password: "my-password"
+        kind: postgres
+        host: 127.0.0.1
+        port: 5432
+        database: my_db
+        user: ${USER_NAME}
+        password: ${PASSWORD}
 ```
 
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                        |
@@ -47,5 +52,3 @@ sources:
 | database  |  string  |     true     | Name of the Postgres database to connect to (e.g. "my_db").            |
 | user      |  string  |     true     | Name of the Postgres user to connect as (e.g. "my-pg-user").           |
 | password  |  string  |     true     | Password of the Postgres user (e.g. "my-password").                    |
-
-

docs/en/resources/sources/redis.md

@@ -0,0 +1,90 @@
+---
+title: "Redis"
+linkTitle: "Redis"
+type: docs
+weight: 1
+description: >
+    Redis is an open-source, in-memory data structure store.
+    
+---
+
+## About
+
+Redis is an open-source, in-memory data structure store, used as a database, cache, and message broker. It supports data structures such as strings, hashes, lists, sets, sorted sets with range queries, bitmaps, hyperloglogs, and geospatial indexes with radius queries.
+
+If you are new to Redis, you can find installation and getting started guides on the [official Redis website](https://redis.io/docs/getting-started/).
+
+## Requirements
+
+### Redis
+
+[AUTH string][auth] is a password for connection to Redis. If you have the `requirepass` directive set in your Redis configuration, incoming client connections must authenticate in order to connect.
+
+Specify your AUTH string in the password field:
+
+```yaml
+sources:
+    my-redis-instance:
+     kind: redis
+     address:
+       - 127.0.0.1
+     username: ${MY_USER_NAME}
+     password: ${MY_AUTH_STRING} # Omit this field if you don't have a password.
+     # database: 0
+     # clusterEnabled: false
+     # useGCPIAM: false
+```
+
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
+### Memorystore For Redis
+
+Memorystore standalone instances support authentication using an [AUTH][auth]
+string.
+
+Here is an example tools.yaml config with [AUTH][auth] enabled:
+
+```yaml
+sources:
+    my-redis-cluster-instance:
+     kind: memorystore-redis
+     address:
+       - 127.0.0.1
+     password: ${MY_AUTH_STRING}
+     # useGCPIAM: false
+     # clusterEnabled: false
+```
+
+Memorystore Redis Cluster supports IAM authentication instead. Grant your account the
+required [IAM role][iam] and make sure to set `useGCPIAM` to `true`.
+
+Here is an example tools.yaml config for Memorystore Redis Cluster instances
+using IAM authentication:
+
+```yaml
+sources:
+    my-redis-cluster-instance:
+     kind: memorystore-redis
+     address: 127.0.0.1
+     useGCPIAM: true
+     clusterEnabled: true
+```
+
+[iam]: https://cloud.google.com/memorystore/docs/cluster/about-iam-auth
+
+## Reference
+
+| **field**      | **type** | **required** | **description**                                                                                                                 |
+|----------------|:--------:|:------------:|---------------------------------------------------------------------------------------------------------------------------------|
+| kind           |  string  |     true     | Must be "memorystore-redis".                                                                                                    |
+| address        |  string  |     true     | Primary endpoint for the Memorystore Redis instance to connect to.                                                              |
+| username       |  string  |    false     | If you are using a non-default user, specify the user name here. If you are using Memorystore for Redis, leave this field blank |
+| password       |  string  |    false     | If you have [Redis AUTH][auth] enabled, specify the AUTH string here                                                            |
+| database       |   int    |    false     | The Redis database to connect to. Not applicable for cluster enabled instances. The default database is `0`.                    |
+| clusterEnabled |   bool   |    false     | Set it to `true` if using a Redis Cluster instance. Defaults to `false`.                                                        |
+| useGCPIAM      |  string  |    false     | Set it to `true` if you are using GCP's IAM authentication. Defaults to `false`.                                                |
+
+[auth]: https://cloud.google.com/memorystore/docs/redis/about-redis-auth

docs/en/resources/sources/spanner.md

@@ -8,7 +8,7 @@ description: >
 
 ---
 
-# Spanner Source 
+# Spanner Source
 
 [Spanner][spanner-docs] is a fully managed, mission-critical database service
 that brings together relational, graph, key-value, and search. It offers
@@ -23,7 +23,7 @@ the Google Cloud console][spanner-quickstart].
 [spanner-quickstart]:
     https://cloud.google.com/spanner/docs/create-query-database-console
 
-## Requirements 
+## Requirements
 
 ### IAM Permissions
 

docs/en/resources/sources/sqlite.md

@@ -0,0 +1,63 @@
+---
+title: "SQLite"
+linkTitle: "SQLite"
+type: docs
+weight: 1
+description: >
+  SQLite is a C-language library that implements a small, fast, self-contained, 
+  high-reliability, full-featured, SQL database engine.
+---
+
+## About
+
+[SQLite](https://sqlite.org/) is a software library that provides a relational
+database management system. The lite in SQLite means lightweight in terms of
+setup, database administration, and required resources.
+
+SQLite has the following notable characteristics:
+- Self-contained with no external dependencies
+- Serverless - the SQLite library accesses its storage files directly
+- Single database file that can be easily copied or moved
+- Zero-configuration - no setup or administration needed
+- Transactional with ACID properties
+
+## Requirements
+
+### Database File
+
+You need a SQLite database file. This can be:
+- An existing database file
+- A path where a new database file should be created
+- `:memory:` for an in-memory database
+
+## Example
+
+```yaml
+sources:
+    my-sqlite-db:
+        kind: "sqlite"
+        database: "/path/to/database.db"
+```
+
+For an in-memory database:
+```yaml
+sources:
+    my-sqlite-memory-db:
+        kind: "sqlite"
+        database: ":memory:"
+```
+
+## Reference
+
+### Configuration Fields
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| kind | string | Yes | Must be "sqlite" |
+| database | string | Yes | Path to SQLite database file, or ":memory:" for an in-memory database |
+
+### Connection Properties
+
+SQLite connections are configured with these defaults for optimal performance:
+- `MaxOpenConns`: 1 (SQLite only supports one writer at a time)
+- `MaxIdleConns`: 1

docs/en/resources/sources/valkey.md

@@ -0,0 +1,64 @@
+---
+title: "Valkey"
+linkTitle: "Valkey"
+type: docs
+weight: 1
+description: >
+    Valkey is an open-source, in-memory data structure store, forked from Redis.
+    
+---
+
+## About
+
+Valkey is an open-source, in-memory data structure store that originated as a fork of Redis. It's designed to be used as a database, cache, and message broker, supporting a wide range of data structures like strings, hashes, lists, sets, sorted sets with range queries, bitmaps, hyperloglogs, and geospatial indexes with radius queries.
+
+If you're new to Valkey, you can find installation and getting started guides on the [official Valkey website](https://valkey.io/docs/getting-started/).
+
+## Example
+
+```yaml
+sources:
+    my-valkey-instance:
+     kind: valkey
+     address:
+       - 127.0.0.1
+     username: ${YOUR_USERNAME}
+     password: ${YOUR_PASSWORD}
+     # database: 0
+     # useGCPIAM: false
+     # disableCache: false
+```
+
+{{< notice tip >}}
+Use environment variable replacement with the format ${ENV_NAME}
+instead of hardcoding your secrets into the configuration file.
+{{< /notice >}}
+
+### IAM Authentication
+
+If you are using GCP's Memorystore for Valkey, you can connect using IAM
+authentication. Grant your account the required [IAM role][iam] and set
+`useGCPIAM` to `true`:
+
+```yaml
+sources:
+    my-valkey-instance:
+     kind: valkey
+     address:
+       - 127.0.0.1
+     useGCPIAM: true
+```
+
+[iam]: https://cloud.google.com/memorystore/docs/valkey/about-iam-auth
+
+## Reference
+
+| **field**    | **type** | **required** | **description**                                                                                                                  |
+|--------------|:--------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------|
+| kind         |  string  |     true     | Must be "valkey".                                                                                                                |
+| address      | []string |     true     | Endpoints for the Valkey instance to connect to.                                                                                 |
+| username     |  string  |    false     | If you are using a non-default user, specify the user name here. If you are using Memorystore for Valkey, leave this field blank |
+| password     |  string  |    false     | Password for the Valkey instance                                                                                                 |
+| database     |   int    |    false     | The Valkey database to connect to. Not applicable for cluster enabled instances. The default database is `0`.                    |
+| useGCPIAM    |   bool   |    false     | Set it to `true` if you are using GCP's IAM authentication. Defaults to `false`.                                                 |
+| disableCache |   bool   |    false     | Set it to `true` if you want to enable client-side caching. Defaults to `false`.                                                 |

docs/en/resources/tools/_index.md

@@ -79,11 +79,12 @@ the parameter.
         description: Airline unique 2 letter identifier
 ```
 
-| **field**   | **type** | **required** | **description**                                                            |
-|-------------|:--------:|:------------:|----------------------------------------------------------------------------|
-| name        |  string  |     true     | Name of the parameter.                                                     |
-| type        |  string  |     true     | Must be one of "string", "integer", "float", "boolean" "array"             |
-| description |  string  |     true     | Natural language description of the parameter to describe it to the agent. |
+| **field**   | **type**        | **required** | **description**                                                             |
+|-------------|:---------------:|:------------:|-----------------------------------------------------------------------------|
+| name        |  string         |     true     | Name of the parameter.                                                      |
+| type        |  string         |     true     | Must be one of "string", "integer", "float", "boolean" "array"              |
+| default     |  parameter type |     false    | Default value of the parameter. If provided, the parameter is not required. |
+| description |  string         |     true     | Natural language description of the parameter to describe it to the agent.  |
 
 ### Array Parameters
 
@@ -93,7 +94,7 @@ in the list using the items field:
 
 ```yaml
     parameters:
-      - name: preffered_airlines
+      - name: preferred_airlines
         type: array
         description: A list of airline, ordered by preference. 
         items:
@@ -102,12 +103,17 @@ in the list using the items field:
           description: Name of the airline. 
 ```
 
-| **field**   |     **type**     | **required** | **description**                                                            |
-|-------------|:----------------:|:------------:|----------------------------------------------------------------------------|
-| name        |      string      |     true     | Name of the parameter.                                                     |
-| type        |      string      |     true     | Must be "array"                                                            |
-| description |      string      |     true     | Natural language description of the parameter to describe it to the agent. |
-| items       | parameter object |     true     | Specify a Parameter object for the type of the values in the array.        |
+| **field**   |     **type**     | **required** | **description**                                                             |
+|-------------|:----------------:|:------------:|-----------------------------------------------------------------------------|
+| name        |      string      |     true     | Name of the parameter.                                                      |
+| type        |      string      |     true     | Must be "array"                                                             |
+| default     |  parameter type  |     false    | Default value of the parameter. If provided, the parameter is not required. |
+| description |      string      |     true     | Natural language description of the parameter to describe it to the agent.  |
+| items       | parameter object |     true     | Specify a Parameter object for the type of the values in the array.         |
+
+{{< notice note >}}
+Items in array should not have a default value. If provided, it will be ignored.
+{{< /notice >}}
 
 ### Authenticated Parameters
 
@@ -141,6 +147,58 @@ specific claims within the user's ID token.
 | name      |  string  |     true     | Name of the [authServices](../authservices) used to verify the OIDC auth token. |
 | field     |  string  |     true     | Claim field decoded from the OIDC token used to auto-populate this parameter.           |
 
+### Template Parameters
+
+Template parameters types include `string`, `integer`, `float`, `boolean` types. In
+most cases, the description will be provided to the LLM as context on specifying
+the parameter. Template parameters will be inserted into the SQL statement before
+executing the prepared statement. They will be inserted without quotes, so to
+insert a string using template parameters, quotes must be explicitly added within
+the string.
+
+Template parameter arrays can also be used similarly to basic parameters, and array
+items must be strings. Once inserted into the SQL statement, the outer layer of quotes
+will be removed. Therefore to insert strings into the SQL statement, a set of quotes 
+must be explicitly added within the string.
+
+{{< notice warning >}}
+Because template parameters can directly replace identifiers, column names, and table names, they are prone to SQL injections. Basic parameters are preferred for performance and safety reasons.
+{{< /notice >}}
+
+```yaml
+tools:
+ select_columns_from_table:
+    kind: postgres-sql
+    source: my-pg-instance
+    statement: |
+      SELECT {{array .columnNames}} FROM {{.tableName}}
+    description: |
+      Use this tool to list all information from a specific table.
+      Example:
+      {{
+          "tableName": "flights",
+          "columnNames": ["id", "name"]
+      }}
+    templateParameters:
+      - name: tableName
+        type: string
+        description: Table to select from
+      - name: columnNames
+        type: array
+        description: The columns to select
+        items:
+          name: column
+          type: string
+          description: Name of a column to select
+```
+
+| **field**   | **type**         | **required**  | **description**                                                                     |
+|-------------|:----------------:|:-------------:|-------------------------------------------------------------------------------------|
+| name        |  string          |     true      | Name of the template parameter.                                                     |
+| type        |  string          |     true      | Must be one of "string", "integer", "float", "boolean" "array"                      |
+| description |  string          |     true      | Natural language description of the template parameter to describe it to the agent. |
+| items       | parameter object |true (if array)| Specify a Parameter object for the type of the values in the array (string only).   |
+
 ## Authorized Invocations
 
 You can require an authorization check for any Tool invocation request by

docs/en/resources/tools/alloydb-ai-nl.md

@@ -0,0 +1,103 @@
+---
+title: "alloydb-ai-nl"
+type: docs
+weight: 1
+description: > 
+  The "alloydb-ai-nl" tool leverages 
+  [AlloyDB AI](https://cloud.google.com/alloydb/ai) next-generation Natural 
+  Language support to provide the ability to query the database directly using
+  natural language.
+---
+
+## About
+
+The `alloydb-ai-nl` tool leverages [AlloyDB AI next-generation natural
+Language][alloydb-ai-nl-overview] support to allow an Agent the ability to query
+the database directly using natural language. Natural language streamlines the
+development of generative AI applications by transferring the complexity of
+converting natural language to SQL from the application layer to the database
+layer. 
+
+This tool is compatible with the following sources:
+- [alloydb-postgres](../sources/alloydb-pg.md)
+
+AlloyDB AI Natural Language delivers secure and accurate responses for 
+application end user natural language questions. Natural language streamlines 
+the development of generative AI applications by transferring the complexity 
+of converting natural language to SQL from the application layer to the 
+database layer.
+
+## Requirements
+{{< notice tip >}} AlloyDB AI natural language is currently in gated public
+preview. For more information on availability and limitations, please see
+[AlloyDB AI natural language overview](https://cloud.google.com/alloydb/docs/ai/natural-language-overview)
+{{< /notice >}}
+
+To enable AlloyDB AI natural language for your AlloyDB cluster, please follow
+the steps listed in the [Generate SQL queries that answer natural language
+questions][alloydb-ai-gen-nl], including enabling the extension and configuring
+context for your application.
+
+[alloydb-ai-nl-overview]: https://cloud.google.com/alloydb/docs/ai/natural-language-overview
+[alloydb-ai-gen-nl]: https://cloud.google.com/alloydb/docs/ai/generate-sql-queries-natural-language
+
+
+## Configuration
+	
+### Specifying an `nl_config`
+A `nl_config` is a configuration that associates an application to schema
+objects, examples and other contexts that can be used. A large application can
+also use different configurations for different parts of the app, as long as the
+correct configuration can be specified when a question is sent from that part of
+the application.
+	
+Once you've followed the steps for configuring context, you can use the
+`context` field when configuring a `alloydb-ai-nl` tool. When this tool is
+invoked, the SQL will be generated and executed using this context.
+
+### Specifying Parameters to PSV's
+
+[Parameterized Secure Views (PSVs)][alloydb-psv] are a feature unique to AlloyDB
+that allows you allow you to require one or more named parameter values passed
+to the view when querying it, somewhat like bind variables with ordinary
+database queries. 
+
+You can use the `nlConfigParameters` to list the parameters required for your
+`nl_config`. You **must** supply all parameters required for all PSVs in the
+context. It's strongly recommended to use features like [Authenticated
+Parameters](../tools/#array-parameters) or Bound Parameters to provide secure
+access to queries generated using natural language, as these parameters are not
+visible to the LLM.
+
+[alloydb-psv]: https://cloud.google.com/alloydb/docs/parameterized-secure-views-overview
+
+## Example
+
+```yaml
+tools:
+  ask_questions:
+    kind: alloydb-ai-nl
+    source: my-alloydb-source
+    description: "Ask questions to check information about flights"
+    nlConfig: "cymbal_air_nl_config"
+    nlConfigParameters:
+      - name: user_email
+        type: string
+        description: User ID of the logged in user.
+        # note: we strongly recommend using features like Authenticated or 
+        # Bound parameters to prevent the LLM from seeing these params and 
+        # specifying values it shouldn't in the tool input
+        authServices:
+          - name: my_google_service
+            field: email
+```
+
+## Reference
+
+| **field**          |                  **type**                  | **required** | **description**                                                          |
+|--------------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------|
+| kind               |                   string                   |     true     | Must be "alloydb-ai-nl".                                                 |
+| source             |                   string                   |     true     | Name of the AlloyDB source the natural language query should execute on. |
+| description        |                   string                   |     true     | Description of the tool that is passed to the LLM.                       |
+| nlConfig           |                   string                   |     true     | The name of the  `nl_config` in AlloyDB                                  |
+| nlConfigParameters | [parameters](_index#specifying-parameters) |     true     | List of PSV parameters defined in the `nl_config`                        |

docs/en/resources/tools/bigquery-execute-sql.md

@@ -0,0 +1,35 @@
+---
+title: "bigquery-execute-sql"
+type: docs
+weight: 1
+description: > 
+  A "bigquery-execute-sql" tool executes a SQL statement against BigQuery.
+---
+
+## About
+
+A `bigquery-execute-sql` tool executes a SQL statement against BigQuery.
+It's compatible with the following sources:
+
+- [bigquery](../sources/bigquery.md)
+
+`bigquery-execute-sql` takes one input parameter `sql` and runs the sql
+statement against the `source`.
+
+## Example
+
+```yaml
+tools:
+ execute_sql_tool:
+    kind: bigquery-execute-sql
+    source: my-bigquery-source
+    description: Use this tool to execute sql statement.
+```
+
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                                                                  |
+|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
+| kind        |                   string                   |     true     | Must be "bigquery-execute-sql".                                                                          |
+| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
+| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |

docs/en/resources/tools/bigquery-get-dataset-info.md

@@ -0,0 +1,35 @@
+---
+title: "bigquery-get-dataset-info"
+type: docs
+weight: 1
+description: > 
+  A "bigquery-get-dataset-info" tool retrieves metadata for a BigQuery dataset.
+---
+
+## About
+
+A `bigquery-get-dataset-info` tool retrieves metadata for a BigQuery dataset.
+It's compatible with the following sources:
+
+- [bigquery](../sources/bigquery.md)
+
+bigquery-get-dataset-info takes a dataset parameter to specify the dataset 
+on the given source.
+
+## Example
+
+```yaml
+tools:
+  bigquery_get_dataset_info:
+    kind: bigquery-get-dataset-info
+    source: my-bigquery-source
+    description: Use this tool to get dataset metadata.
+```
+
+## Reference
+
+| **field**   |                  **type**                  | **required** | **description**                                                                                  |
+|-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
+| kind        |                   string                   |     true     | Must be "bigquery-get-dataset-info".                                                                          |
+| source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
+| description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |