Merge branch 'main' of https://github.com/googleapis/genai-toolbox into sts-py-test

.ci/quickstart_py.sh

@@ -0,0 +1,107 @@
+#!/bin/bash
+
+set -e
+set -u
+
+TABLE_NAME="hotels"
+QUICKSTART_PYTHON_DIR="docs/en/getting-started/quickstart/python"
+TOOLBOX_SETUP_DIR="/workspace/toolbox_setup"
+
+apt-get update && apt-get install -y postgresql-client python3-venv curl wget
+
+if [ ! -d "$QUICKSTART_PYTHON_DIR" ]; then
+  exit 1
+fi
+
+wget https://storage.googleapis.com/cloud-sql-connectors/cloud-sql-proxy/v2.10.0/cloud-sql-proxy.linux.amd64 -O /usr/local/bin/cloud-sql-proxy
+chmod +x /usr/local/bin/cloud-sql-proxy
+
+cloud-sql-proxy "${CLOUD_SQL_INSTANCE}" &
+PROXY_PID=$!
+
+export PGHOST=127.0.0.1
+export PGPORT=5432
+export PGPASSWORD="$DB_PASSWORD"
+export GOOGLE_API_KEY="$GOOGLE_API_KEY"
+
+mkdir -p "${TOOLBOX_SETUP_DIR}"
+echo "${TOOLS_YAML_CONTENT}" > "${TOOLBOX_SETUP_DIR}/tools.yaml"
+if [ ! -f "${TOOLBOX_SETUP_DIR}/tools.yaml" ]; then echo "Failed to create tools.yaml"; exit 1; fi
+
+curl -L "https://storage.googleapis.com/genai-toolbox/v${VERSION}/linux/amd64/toolbox" -o "${TOOLBOX_SETUP_DIR}/toolbox"
+chmod +x "${TOOLBOX_SETUP_DIR}/toolbox"
+if [ ! -f "${TOOLBOX_SETUP_DIR}/toolbox" ]; then echo "Failed to download toolbox"; exit 1; fi
+
+echo "--- Starting Toolbox Server ---"
+cd "${TOOLBOX_SETUP_DIR}"
+./toolbox --tools-file ./tools.yaml &
+TOOLBOX_PID=$!
+cd "/workspace"
+sleep 5
+
+cleanup_all() {
+  kill $TOOLBOX_PID || true
+  kill $PROXY_PID || true
+}
+trap cleanup_all EXIT
+
+
+for ORCH_DIR in "$QUICKSTART_PYTHON_DIR"/*/; do
+  if [ ! -d "$ORCH_DIR" ]; then
+    continue
+  fi
+  (
+    set -e
+    ORCH_NAME=$(basename "$ORCH_DIR")
+
+    cleanup_orch() {
+      psql -h "$PGHOST" -p "$PGPORT" -U "$DB_USER" -d "$DATABASE_NAME" -c "DROP TABLE IF EXISTS $TABLE_NAME;"
+
+      if [ -d ".venv" ]; then
+          rm -rf ".venv"
+      fi
+    }
+    trap cleanup_orch EXIT
+
+    cd "$ORCH_DIR"
+
+    psql -h "$PGHOST" -p "$PGPORT" -U "$DB_USER" -d "$DATABASE_NAME" <<EOF
+CREATE TABLE $TABLE_NAME (
+  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
+);
+
+INSERT INTO $TABLE_NAME (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');
+EOF
+
+    VENV_DIR=".venv"
+    python3 -m venv "$VENV_DIR"
+    source "$VENV_DIR/bin/activate"
+
+    if [ -f "requirements.txt" ]; then
+      pip install -r requirements.txt
+    else
+      echo "Warning: requirements.txt not found. Skipping."
+    fi
+
+    echo "Running tests for $ORCH_NAME..."
+    pytest
+
+  )
+done

.ci/quickstart_py.yaml

@@ -0,0 +1,57 @@
+# 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.
+
+substitutions:
+  _GCP_PROJECT: "your-project-id"
+  _CLOUD_SQL_INSTANCE: "project-id:region:instance-name"
+  _DATABASE_NAME: "db-name"
+  _DB_USER: "db-user"
+  _TOOLS_YAML_SECRET: "tools yaml secret"
+  _API_KEY_SECRET: "api key secret"
+  _DB_PASS_SECRET: "db pass secret"
+  _GCP_PROJECT_NUMBER: "your-project-number"
+
+steps:
+  - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
+    id: 'run-psql-commands'
+    entrypoint: 'bash'
+    args:
+      - -c
+      - |
+        set -ex
+
+        export VERSION=$(cat ./cmd/version.txt)
+        chmod +x .ci/quickstart_py.sh
+        .ci/quickstart_py.sh
+
+    env:
+      - 'CLOUD_SQL_INSTANCE=${_CLOUD_SQL_INSTANCE}'
+      - 'GCP_PROJECT=${_GCP_PROJECT}'
+      - 'DATABASE_NAME=${_DATABASE_NAME}'
+      - 'DB_USER=${_DB_USER}'
+    secretEnv: ['TOOLS_YAML_CONTENT', 'GOOGLE_API_KEY', 'DB_PASSWORD']
+
+availableSecrets:
+  secretManager:
+  - versionName: projects/${_GCP_PROJECT}/secrets/${_TOOLS_YAML_SECRET}/versions/latest
+    env: 'TOOLS_YAML_CONTENT'
+  - versionName: projects/${_GCP_PROJECT_NUMBER}/secrets/${_API_KEY_SECRET}/versions/latest
+    env: 'GOOGLE_API_KEY'
+  - versionName: projects/${_GCP_PROJECT}/secrets/${_DB_PASS_SECRET}/versions/latest
+    env: 'DB_PASSWORD'
+
+timeout: 1800s
+
+options:
+  logging: CLOUD_LOGGING_ONLY

docs/en/getting-started/quickstart/golden.txt

@@ -0,0 +1,3 @@
+Hilton Basel
+Hyatt Regency
+book

docs/en/getting-started/quickstart/python/adk/quickstart.py

@@ -10,7 +10,7 @@ import os
 
 # TODO(developer): replace this with your Google API key
 
-os.environ['GOOGLE_API_KEY'] = 'your-api-key'
+os.environ['GOOGLE_API_KEY']
 
 async def main():
   with ToolboxSyncClient("http://127.0.0.1:5000") as toolbox_client:

docs/en/getting-started/quickstart/python/adk/quickstart_test.py

@@ -0,0 +1,38 @@
+import os
+import pytest
+from pathlib import Path
+import asyncio
+from quickstart import main
+
+@pytest.fixture(scope="module")
+def golden_keywords():
+    """Loads expected keywords from the golden.txt file."""
+    golden_file_path = Path("../../golden.txt")
+    if not golden_file_path.exists():
+        pytest.fail(f"Golden file not found: {golden_file_path}")
+    try:
+        with open(golden_file_path, 'r') as f:
+            return [line.strip() for line in f.readlines() if line.strip()]
+    except Exception as e:
+        pytest.fail(f"Could not read golden.txt: {e}")
+
+
+# --- Execution Tests ---
+class TestADKExecution:
+    """Test ADK framework execution and output validation."""
+
+    @pytest.fixture(scope="function")
+    def script_output(self, capsys):
+        """Run the quickstart function and return its output."""
+        asyncio.run(main())
+        return capsys.readouterr()
+
+    def test_script_runs_without_errors(self, script_output):
+        """Test that the script runs and produces no stderr."""
+        assert script_output.err == "", f"Script produced stderr: {script_output.err}"
+
+    def test_keywords_in_output(self, script_output, golden_keywords):
+        """Test that expected keywords are present in the script's output."""
+        output = script_output.out
+        missing_keywords = [kw for kw in golden_keywords if kw not in output]
+        assert not missing_keywords, f"Missing keywords in output: {missing_keywords}"

docs/en/getting-started/quickstart/python/adk/requirements.txt

@@ -0,0 +1,3 @@
+google-adk==0.1.0
+toolbox-core==0.5.0
+pytest==7.0.0

docs/en/getting-started/quickstart/python/core/quickstart_test.py

@@ -0,0 +1,38 @@
+import os
+import pytest
+from pathlib import Path
+import asyncio
+from quickstart import main
+
+@pytest.fixture(scope="module")
+def golden_keywords():
+    """Loads expected keywords from the golden.txt file."""
+    golden_file_path = Path("../../golden.txt")
+    if not golden_file_path.exists():
+        pytest.fail(f"Golden file not found: {golden_file_path}")
+    try:
+        with open(golden_file_path, 'r') as f:
+            return [line.strip() for line in f.readlines() if line.strip()]
+    except Exception as e:
+        pytest.fail(f"Could not read golden.txt: {e}")
+
+
+# --- Execution Tests ---
+class TestADKExecution:
+    """Test ADK framework execution and output validation."""
+
+    @pytest.fixture(scope="function")
+    def script_output(self, capsys):
+        """Run the quickstart function and return its output."""
+        asyncio.run(main())
+        return capsys.readouterr()
+
+    def test_script_runs_without_errors(self, script_output):
+        """Test that the script runs and produces no stderr."""
+        assert script_output.err == "", f"Script produced stderr: {script_output.err}"
+
+    def test_keywords_in_output(self, script_output, golden_keywords):
+        """Test that expected keywords are present in the script's output."""
+        output = script_output.out
+        missing_keywords = [kw for kw in golden_keywords if kw not in output]
+        assert not missing_keywords, f"Missing keywords in output: {missing_keywords}"

docs/en/getting-started/quickstart/python/core/requirements.txt

@@ -0,0 +1,3 @@
+google-genai==1.33.0
+toolbox-core==0.5.0
+pytest==7.0.0

docs/en/getting-started/quickstart/python/langchain/quickstart_test.py

@@ -0,0 +1,38 @@
+import os
+import pytest
+from pathlib import Path
+import asyncio
+from quickstart import main
+
+@pytest.fixture(scope="module")
+def golden_keywords():
+    """Loads expected keywords from the golden.txt file."""
+    golden_file_path = Path("../../golden.txt")
+    if not golden_file_path.exists():
+        pytest.fail(f"Golden file not found: {golden_file_path}")
+    try:
+        with open(golden_file_path, 'r') as f:
+            return [line.strip() for line in f.readlines() if line.strip()]
+    except Exception as e:
+        pytest.fail(f"Could not read golden.txt: {e}")
+
+
+# --- Execution Tests ---
+class TestADKExecution:
+    """Test ADK framework execution and output validation."""
+
+    @pytest.fixture(scope="function")
+    def script_output(self, capsys):
+        """Run the quickstart function and return its output."""
+        asyncio.run(main())
+        return capsys.readouterr()
+
+    def test_script_runs_without_errors(self, script_output):
+        """Test that the script runs and produces no stderr."""
+        assert script_output.err == "", f"Script produced stderr: {script_output.err}"
+
+    def test_keywords_in_output(self, script_output, golden_keywords):
+        """Test that expected keywords are present in the script's output."""
+        output = script_output.out
+        missing_keywords = [kw for kw in golden_keywords if kw not in output]
+        assert not missing_keywords, f"Missing keywords in output: {missing_keywords}"

docs/en/getting-started/quickstart/python/langchain/requirements.txt

@@ -0,0 +1,5 @@
+langchain==0.3.27
+langchain-google-vertexai==2.0.28
+langgraph==0.6.7
+toolbox-langchain==0.5.0
+pytest==8.4.2

docs/en/getting-started/quickstart/python/llamaindex/quickstart_test.py

@@ -0,0 +1,38 @@
+import os
+import pytest
+from pathlib import Path
+import asyncio
+from quickstart import main
+
+@pytest.fixture(scope="module")
+def golden_keywords():
+    """Loads expected keywords from the golden.txt file."""
+    golden_file_path = Path("../../golden.txt")
+    if not golden_file_path.exists():
+        pytest.fail(f"Golden file not found: {golden_file_path}")
+    try:
+        with open(golden_file_path, 'r') as f:
+            return [line.strip() for line in f.readlines() if line.strip()]
+    except Exception as e:
+        pytest.fail(f"Could not read golden.txt: {e}")
+
+
+# --- Execution Tests ---
+class TestADKExecution:
+    """Test ADK framework execution and output validation."""
+
+    @pytest.fixture(scope="function")
+    def script_output(self, capsys):
+        """Run the quickstart function and return its output."""
+        asyncio.run(main())
+        return capsys.readouterr()
+
+    def test_script_runs_without_errors(self, script_output):
+        """Test that the script runs and produces no stderr."""
+        assert script_output.err == "", f"Script produced stderr: {script_output.err}"
+
+    def test_keywords_in_output(self, script_output, golden_keywords):
+        """Test that expected keywords are present in the script's output."""
+        output = script_output.out
+        missing_keywords = [kw for kw in golden_keywords if kw not in output]
+        assert not missing_keywords, f"Missing keywords in output: {missing_keywords}"

docs/en/getting-started/quickstart/python/llamaindex/requirements.txt

@@ -0,0 +1,4 @@
+llama-index==0.13.6
+llama-index-llms-google-genai==0.3.0
+toolbox-llamaindex==0.5.0
+pytest==8.4.2