From 2520768753ffc4de8675c9eb094a6b08e38a419f Mon Sep 17 00:00:00 2001 From: Anubhav Dhawan Date: Tue, 1 Jul 2025 11:30:41 +0530 Subject: [PATCH 1/4] chore: Test integration test with main branch --- packages/toolbox-core/integration.cloudbuild.yaml | 4 +++- packages/toolbox-core/tests/conftest.py | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/toolbox-core/integration.cloudbuild.yaml b/packages/toolbox-core/integration.cloudbuild.yaml index 89132be9..67fd0062 100644 --- a/packages/toolbox-core/integration.cloudbuild.yaml +++ b/packages/toolbox-core/integration.cloudbuild.yaml @@ -33,6 +33,7 @@ steps: env: - TOOLBOX_URL=$_TOOLBOX_URL - TOOLBOX_VERSION=$_TOOLBOX_VERSION + - TOOLBOX_BUCKET=$_TOOLBOX_BUCKET - GOOGLE_CLOUD_PROJECT=$PROJECT_ID args: - '-c' @@ -43,4 +44,5 @@ options: logging: CLOUD_LOGGING_ONLY substitutions: _VERSION: '3.13' - _TOOLBOX_VERSION: '0.8.0' + _TOOLBOX_VERSION: 'main' + _TOOLBOX_BUCKET: 'genai-toolbox-dev' diff --git a/packages/toolbox-core/tests/conftest.py b/packages/toolbox-core/tests/conftest.py index 14493ad2..5fadc45c 100644 --- a/packages/toolbox-core/tests/conftest.py +++ b/packages/toolbox-core/tests/conftest.py @@ -101,6 +101,9 @@ def project_id() -> str: def toolbox_version() -> str: return get_env_var("TOOLBOX_VERSION") +@pytest_asyncio.fixture(scope="session") +def toolbox_bucket() -> str: + return get_env_var("TOOLBOX_BUCKET") @pytest_asyncio.fixture(scope="session") def tools_file_path(project_id: str) -> Generator[str]: @@ -130,11 +133,11 @@ def auth_token2(project_id: str) -> str: @pytest_asyncio.fixture(scope="session") -def toolbox_server(toolbox_version: str, tools_file_path: str) -> Generator[None]: +def toolbox_server(toolbox_version: str, toolbox_bucket: str, tools_file_path: str) -> Generator[None]: """Starts the toolbox server as a subprocess.""" print("Downloading toolbox binary from gcs bucket...") source_blob_name = get_toolbox_binary_url(toolbox_version) - download_blob("genai-toolbox", source_blob_name, "toolbox") + download_blob(toolbox_bucket, source_blob_name, "toolbox") print("Toolbox binary downloaded successfully.") try: print("Opening toolbox server process...") From e4da96bb5f0c9f2ce5c1c8da157628c13e7a267e Mon Sep 17 00:00:00 2001 From: Anubhav Dhawan Date: Tue, 1 Jul 2025 11:33:12 +0530 Subject: [PATCH 2/4] chore: Delint --- packages/toolbox-core/tests/conftest.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/toolbox-core/tests/conftest.py b/packages/toolbox-core/tests/conftest.py index 5fadc45c..e1f9643b 100644 --- a/packages/toolbox-core/tests/conftest.py +++ b/packages/toolbox-core/tests/conftest.py @@ -101,10 +101,12 @@ def project_id() -> str: def toolbox_version() -> str: return get_env_var("TOOLBOX_VERSION") + @pytest_asyncio.fixture(scope="session") def toolbox_bucket() -> str: return get_env_var("TOOLBOX_BUCKET") + @pytest_asyncio.fixture(scope="session") def tools_file_path(project_id: str) -> Generator[str]: """Provides a temporary file path containing the tools manifest.""" @@ -133,7 +135,9 @@ def auth_token2(project_id: str) -> str: @pytest_asyncio.fixture(scope="session") -def toolbox_server(toolbox_version: str, toolbox_bucket: str, tools_file_path: str) -> Generator[None]: +def toolbox_server( + toolbox_version: str, toolbox_bucket: str, tools_file_path: str +) -> Generator[None]: """Starts the toolbox server as a subprocess.""" print("Downloading toolbox binary from gcs bucket...") source_blob_name = get_toolbox_binary_url(toolbox_version) From 14d805bed0338830ff4274873f57dfa555e9f504 Mon Sep 17 00:00:00 2001 From: Anubhav Dhawan Date: Tue, 1 Jul 2025 11:36:55 +0530 Subject: [PATCH 3/4] fix: Fix toolbox download version 'v' prefix --- packages/toolbox-core/tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolbox-core/tests/conftest.py b/packages/toolbox-core/tests/conftest.py index e1f9643b..b8cfa6e5 100644 --- a/packages/toolbox-core/tests/conftest.py +++ b/packages/toolbox-core/tests/conftest.py @@ -75,7 +75,7 @@ def get_toolbox_binary_url(toolbox_version: str) -> str: arch = ( "arm64" if os_system == "darwin" and platform.machine() == "arm64" else "amd64" ) - return f"v{toolbox_version}/{os_system}/{arch}/toolbox" + return f"{toolbox_version}/{os_system}/{arch}/toolbox" def get_auth_token(client_id: str) -> str: From 277bdb919f9a3a5546add34f31415c75dcd72613 Mon Sep 17 00:00:00 2001 From: Anubhav Dhawan Date: Tue, 8 Jul 2025 11:02:01 +0530 Subject: [PATCH 4/4] fix: Update the toolbox version tag to pick the dev builds from --- packages/toolbox-core/integration.cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolbox-core/integration.cloudbuild.yaml b/packages/toolbox-core/integration.cloudbuild.yaml index 67fd0062..20a56ead 100644 --- a/packages/toolbox-core/integration.cloudbuild.yaml +++ b/packages/toolbox-core/integration.cloudbuild.yaml @@ -44,5 +44,5 @@ options: logging: CLOUD_LOGGING_ONLY substitutions: _VERSION: '3.13' - _TOOLBOX_VERSION: 'main' + _TOOLBOX_VERSION: 'latest' _TOOLBOX_BUCKET: 'genai-toolbox-dev'