diff --git a/frontend/service/studio_release_server/publisher.py b/frontend/service/studio_release_server/publisher.py index 6edd8952f..02cd01b72 100644 --- a/frontend/service/studio_release_server/publisher.py +++ b/frontend/service/studio_release_server/publisher.py @@ -71,7 +71,7 @@ _MAX_STUDIO_RELEASES = 50 _AGENTKIT_CLI_ARCHIVE = "agentkit-linux-x64.tar.gz" _AGENTKIT_CLI_ARCHIVE_SHA256 = ( - "4e76e32c60473b5037c331a7c74bb99b1c23b62eb8ce26379d3a8c41af38a64e" + "4439d14b4be6ccb90f6eea896adf959ffef4ab4983f41e449d80c79d4cd95de3" ) _STUDIO_RELEASE_CONTRACT = "agentkit-cli-v1" _STUDIO_RUNTIME_MANIFEST = "studio-runtime.json" diff --git a/frontend/service/studio_release_server/tos_store.py b/frontend/service/studio_release_server/tos_store.py index 9393c0bf2..675627ef8 100644 --- a/frontend/service/studio_release_server/tos_store.py +++ b/frontend/service/studio_release_server/tos_store.py @@ -34,6 +34,9 @@ _IAM_CREDENTIAL_PATH = Path("/var/run/secrets/iam/credential") _MAX_DEPENDENCY_WHEEL_BYTES = 128 * 1024 * 1024 _PYPI_FILE_HOST = "https://files.pythonhosted.org" +_AGENTKIT_CLI_ARCHIVE_URL_PREFIX = ( + "https://agentkit-cli.tos-cn-beijing.volces.com/0.52.18/" +) _PYPI_MIRROR_HOSTS = ( "https://pypi.tuna.tsinghua.edu.cn", "https://mirrors.aliyun.com/pypi", @@ -347,7 +350,7 @@ def _load_manifest(self, manifest: Path) -> tuple[tuple[str, str, str], ...]: "Studio dependency manifest is invalid." ) from error if filename == "agentkit-linux-x64.tar.gz" and not url.startswith( - "https://agentkit-cli.tos-cn-beijing.volces.com/0.52.14/" + _AGENTKIT_CLI_ARCHIVE_URL_PREFIX ): raise ValueError("Studio dependency manifest is invalid.") filenames.add(filename) diff --git a/tests/cli/test_studio_companion.py b/tests/cli/test_studio_companion.py index 47bd07884..2463f4e53 100644 --- a/tests/cli/test_studio_companion.py +++ b/tests/cli/test_studio_companion.py @@ -137,7 +137,7 @@ def test_platform_mapping_rejects_unsupported_platform() -> None: def test_required_version_is_owned_by_veadk_not_distribution_metadata() -> None: - assert required_agentkit_cli_version() == "0.52.14" + assert required_agentkit_cli_version() == "0.52.18" def test_companion_materializes_manifest_cli_for_provider( diff --git a/tests/test_studio_release_server.py b/tests/test_studio_release_server.py index 08fa0bfc1..5f635315e 100644 --- a/tests/test_studio_release_server.py +++ b/tests/test_studio_release_server.py @@ -50,10 +50,23 @@ from frontend.service.studio_release_server import builder as release_builder from frontend.service.studio_release_server import deploy as release_deploy from frontend.service.studio_release_server import publisher as release_publisher +from frontend.service.studio_release_server import tos_store as release_tos_store from frontend.service.studio_release_server.tos_store import ( TosDependencyStore, TosJobStore, ) +from veadk.cli.agentkit_cli import agentkit_cli_artifact + + +def test_release_server_agentkit_cli_pin_matches_veadk() -> None: + artifact = agentkit_cli_artifact(system="Linux", machine="x86_64") + + assert release_publisher._AGENTKIT_CLI_ARCHIVE == artifact.filename + assert release_publisher._AGENTKIT_CLI_ARCHIVE_SHA256 == artifact.sha256 + assert ( + release_tos_store._AGENTKIT_CLI_ARCHIVE_URL_PREFIX + == artifact.url.removesuffix(artifact.filename) + ) def _write_test_wheel( @@ -1610,7 +1623,7 @@ def test_tos_dependency_store_populates_and_reuses_cached_wheel( "filename": "agentkit-linux-x64.tar.gz", "url": ( "https://agentkit-cli.tos-cn-beijing.volces.com/" - "0.52.14/agentkit-linux-x64.tar.gz" + "0.52.18/agentkit-linux-x64.tar.gz" ), "sha256": digest, } @@ -1707,7 +1720,7 @@ def capture_run(command: list[str], **kwargs: Any) -> subprocess.CompletedProces "filename": "agentkit-linux-x64.tar.gz", "url": ( "https://agentkit-cli.tos-cn-beijing.volces.com/" - "0.52.14/agentkit-linux-x64.tar.gz" + "0.52.18/agentkit-linux-x64.tar.gz" ), "sha256": "b" * 64, } @@ -1757,7 +1770,7 @@ def test_tos_dependency_store_rejects_download_with_wrong_checksum( "filename": "agentkit-linux-x64.tar.gz", "url": ( "https://agentkit-cli.tos-cn-beijing.volces.com/" - "0.52.14/agentkit-linux-x64.tar.gz" + "0.52.18/agentkit-linux-x64.tar.gz" ), "sha256": "b" * 64, } diff --git a/veadk/cli/agentkit_cli.py b/veadk/cli/agentkit_cli.py index 6f0b7344b..bba1cd587 100644 --- a/veadk/cli/agentkit_cli.py +++ b/veadk/cli/agentkit_cli.py @@ -37,7 +37,7 @@ import zipfile from typing import Any -AGENTKIT_CLI_VERSION = "0.52.14" +AGENTKIT_CLI_VERSION = "0.52.18" # Direct bootstrap uses the one verified public upstream. Provider-local Studio # bundles materialize this archive through their signed runtime manifest instead. AGENTKIT_CLI_RELEASE_HOST = "agentkit-cli.tos-cn-beijing.volces.com" @@ -82,35 +82,35 @@ def url(self) -> str: "linux-x64": AgentKitCliArtifact( platform_key="linux-x64", filename="agentkit-linux-x64.tar.gz", - sha256="4e76e32c60473b5037c331a7c74bb99b1c23b62eb8ce26379d3a8c41af38a64e", + sha256="4439d14b4be6ccb90f6eea896adf959ffef4ab4983f41e449d80c79d4cd95de3", archive_root=f"agentkit-{AGENTKIT_CLI_VERSION}-linux-x64", executable_name="ak", ), "linux-arm64": AgentKitCliArtifact( platform_key="linux-arm64", filename="agentkit-linux-arm64.tar.gz", - sha256="cbd9af81c6f591ef677a296ebb905ed11a3bfc09808362a656fba3e9e2d8f430", + sha256="d5a0b5e2d08c78c1eda750f3b16ed7b3742bc041c0b67a66277a84d0b49bf5d8", archive_root=f"agentkit-{AGENTKIT_CLI_VERSION}-linux-arm64", executable_name="ak", ), "darwin-x64": AgentKitCliArtifact( platform_key="darwin-x64", filename="agentkit-darwin-x64.tar.gz", - sha256="4b775f760b8e5fd8302e9eb92e7ac21aa28b284d5d76a649778c136732285e2e", + sha256="42b4e2ddd4ba03b02fb73723048a002545dc1c0ec8e2bb741bcde16f1cf8c6f0", archive_root=f"agentkit-{AGENTKIT_CLI_VERSION}-darwin-x64", executable_name="ak", ), "darwin-arm64": AgentKitCliArtifact( platform_key="darwin-arm64", filename="agentkit-darwin-arm64.tar.gz", - sha256="c282b707f025d5732d114220a6956004762dd58abe39f4ccaaf360b73f80c480", + sha256="8dec4b59e3716cb616894ad118c667c2d44e477a500b0228b48681125b24c991", archive_root=f"agentkit-{AGENTKIT_CLI_VERSION}-darwin-arm64", executable_name="ak", ), "windows-x64": AgentKitCliArtifact( platform_key="windows-x64", filename="agentkit-windows-x64.zip", - sha256="4737ff064edf73eb3901d485e3f543a88a916e39e44efd1aca5681fc89af6665", + sha256="cd4fd09de40c4f34d231288b25771ef3d2785e4d6b02031e3c1205ff1ca682e6", archive_root=f"agentkit-{AGENTKIT_CLI_VERSION}-windows-x64", executable_name="ak.exe", ),