Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ steps:
- 'build'
- '-t'
- 'us-central1-docker.pkg.dev/$PROJECT_ID/toolbox-evals/cloud-sql-postgresql:latest'
- '.'
- '.' # The "." evaluates Dockerfile

- name: 'gcr.io/cloud-builders/docker'
args:
Expand All @@ -22,7 +22,7 @@ steps:
- 'cloud-sql-postgresql-server'
- '--image=us-central1-docker.pkg.dev/$PROJECT_ID/toolbox-evals/cloud-sql-postgresql:latest'
- '--region=us-central1'
- '--allow-unauthenticated'
- '--no-allow-unauthenticated'
- '--port=8080'
- '--timeout=300'
- '--set-env-vars=CLOUD_SQL_POSTGRES_PROJECT=$PROJECT_ID,CLOUD_SQL_POSTGRES_INSTANCE=omkar-demo-postgres-1,CLOUD_SQL_POSTGRES_REGION=us-central1,CLOUD_SQL_POSTGRES_DATABASE=postgres,CLOUD_SQL_POSTGRES_USER=postgres,CLOUD_SQL_POSTGRES_PASSWORD=[PASSWORD],CLOUD_SQL_POSTGRES_IP_TYPE=PUBLIC'
Expand All @@ -34,6 +34,13 @@ steps:
- '-c'
- |
set -e
# ----------------------------
echo "=== INSIDE /workspace ==="
ls -la /workspace

echo "=== INSIDE /evalbench ==="
ls -la /evalbench
# ----------------------------
cd /evalbench

export EVAL_GCP_PROJECT_ID=$PROJECT_ID
Expand All @@ -52,15 +59,6 @@ steps:
echo "Checking bind success in server (writing to stderr)..."
sed -i 's|server.add_insecure_port("0.0.0.0:%s" % PORT)|bound_port = server.add_insecure_port("0.0.0.0:%s" % PORT)\n import sys\n sys.stderr.write(f"BOUND_PORT: {bound_port}\\n")\n if bound_port == 0: raise RuntimeError("Failed to bind to port!")|' /evalbench/evalbench/eval_server.py

echo "Patching eval_service.py to fix TypeError in get_reporters..."
sed -i 's|reporters = get_reporters(config.get("reporting"), job_id, run_time)|reporters = get_reporters(config.get("reporting") or {}, job_id, run_time)|' /evalbench/evalbench/eval_service.py

echo "Patching util/session.py to make ADK import lazy..."
sed -i 's|from google.adk.sessions import VertexAiSessionService||' /evalbench/evalbench/util/session.py
sed -i 's| def __init__(self, config):| def __init__(self, config):\n from google.adk.sessions import VertexAiSessionService|' /evalbench/evalbench/util/session.py
echo "Patching databases/util.py to make SecretManagerClient lazy..."
sed -i 's|CLIENT = secretmanager_v1.SecretManagerServiceClient()|CLIENT = None\ndef get_client():\n global CLIENT\n if CLIENT is None:\n CLIENT = secretmanager_v1.SecretManagerServiceClient()\n return CLIENT|' /evalbench/evalbench/databases/util.py || echo "Failed to patch databases/util.py"
sed -i 's|CLIENT.access_secret_version|get_client().access_secret_version|' /evalbench/evalbench/databases/util.py || echo "Failed to patch databases/util.py usage"
cd evalbench
export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
export PYTHONPATH=./evalproto:.
Expand Down
10 changes: 9 additions & 1 deletion evals/model_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ env:
GEMINI_API_MODEL: "gemini-2.5-pro"
setup:
extensions:
"https://github.com/gemini-cli-extensions/cloud-sql-postgresql":
"/workspace":
settings:
CLOUD_SQL_POSTGRES_PROJECT: "omkar-playground"
CLOUD_SQL_POSTGRES_INSTANCE: "omkar-demo-postgres-1"
Expand All @@ -16,3 +16,11 @@ setup:
CLOUD_SQL_POSTGRES_USER: "postgres"
CLOUD_SQL_POSTGRES_PASSWORD: ${CLOUD_SQL_POSTGRES_PASSWORD}
CLOUD_SQL_POSTGRES_IP_TYPE: "PUBLIC"

# mcp_servers:
# "cloud-sql-postgresql":
# httpUrl: "CLOUD_RUN_URL_PLACEHOLDER"
# authProviderType: google_credentials
# oauth:
# scopes:
# - https://www.googleapis.com/auth/cloud-platform
Loading