Skip to content

Commit c221c21

Browse files
chore: update model config path, disable unauthenticated cloud run access, and remove evalbench patching scripts
1 parent a83c79e commit c221c21

2 files changed

Lines changed: 18 additions & 12 deletions

File tree

cloudbuild.yaml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ steps:
66
- 'build'
77
- '-t'
88
- 'us-central1-docker.pkg.dev/$PROJECT_ID/toolbox-evals/cloud-sql-postgresql:latest'
9-
- '.'
9+
- '.' # The "." evaluates Dockerfile
1010

1111
- name: 'gcr.io/cloud-builders/docker'
1212
args:
@@ -22,7 +22,7 @@ steps:
2222
- 'cloud-sql-postgresql-server'
2323
- '--image=us-central1-docker.pkg.dev/$PROJECT_ID/toolbox-evals/cloud-sql-postgresql:latest'
2424
- '--region=us-central1'
25-
- '--allow-unauthenticated'
25+
- '--no-allow-unauthenticated'
2626
- '--port=8080'
2727
- '--timeout=300'
2828
- '--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'
@@ -34,6 +34,13 @@ steps:
3434
- '-c'
3535
- |
3636
set -e
37+
# ----------------------------
38+
echo "=== INSIDE /workspace ==="
39+
ls -la /workspace
40+
41+
echo "=== INSIDE /evalbench ==="
42+
ls -la /evalbench
43+
# ----------------------------
3744
cd /evalbench
3845
3946
export EVAL_GCP_PROJECT_ID=$PROJECT_ID
@@ -52,15 +59,6 @@ steps:
5259
echo "Checking bind success in server (writing to stderr)..."
5360
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
5461
55-
echo "Patching eval_service.py to fix TypeError in get_reporters..."
56-
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
57-
58-
echo "Patching util/session.py to make ADK import lazy..."
59-
sed -i 's|from google.adk.sessions import VertexAiSessionService||' /evalbench/evalbench/util/session.py
60-
sed -i 's| def __init__(self, config):| def __init__(self, config):\n from google.adk.sessions import VertexAiSessionService|' /evalbench/evalbench/util/session.py
61-
echo "Patching databases/util.py to make SecretManagerClient lazy..."
62-
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"
63-
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"
6462
cd evalbench
6563
export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
6664
export PYTHONPATH=./evalproto:.

evals/model_config.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77
GEMINI_API_MODEL: "gemini-2.5-pro"
88
setup:
99
extensions:
10-
"https://github.com/gemini-cli-extensions/cloud-sql-postgresql":
10+
"/workspace":
1111
settings:
1212
CLOUD_SQL_POSTGRES_PROJECT: "omkar-playground"
1313
CLOUD_SQL_POSTGRES_INSTANCE: "omkar-demo-postgres-1"
@@ -16,3 +16,11 @@ setup:
1616
CLOUD_SQL_POSTGRES_USER: "postgres"
1717
CLOUD_SQL_POSTGRES_PASSWORD: ${CLOUD_SQL_POSTGRES_PASSWORD}
1818
CLOUD_SQL_POSTGRES_IP_TYPE: "PUBLIC"
19+
20+
# mcp_servers:
21+
# "cloud-sql-postgresql":
22+
# httpUrl: "CLOUD_RUN_URL_PLACEHOLDER"
23+
# authProviderType: google_credentials
24+
# oauth:
25+
# scopes:
26+
# - https://www.googleapis.com/auth/cloud-platform

0 commit comments

Comments
 (0)