Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Fix kill command
Jakub Novak280a6b04ba74
diff --git a/.changeset/silver-fans-taste.md b/.changeset/silver-fans-taste.mdnew file mode 100644index 000000000..d30ab2369--- /dev/null+++ b/.changeset/silver-fans-taste.md@@ -0,0 +1,7 @@+---+"@e2b/python-sdk": patch+"e2b": patch+"@e2b/cli": patch+---++Fix kill commanddiff --git a/packages/js-sdk/src/sandbox/sandboxConnection.ts b/packages/js-sdk/src/sandbox/sandboxConnection.tsindex 5528c28a8..fadfe7234 100644--- a/packages/js-sdk/src/sandbox/sandboxConnection.ts+++ b/packages/js-sdk/src/sandbox/sandboxConnection.ts@@ -197,8 +197,11 @@ export class SandboxConnection {*/static async kill(sandboxID: string, apiKey?: string): Promise<void> {apiKey = getApiKey(apiKey)++ const shortID = sandboxID.split('-')[0]+try {- await killSandbox(apiKey, {sandboxID})+ await killSandbox(apiKey, {sandboxID: shortID})} catch (e) {if (e instanceof killSandbox.Error) {const error = e.getActualType()diff --git a/packages/js-sdk/test/killSandbox.test.mjs b/packages/js-sdk/test/killSandbox.test.mjsindex 6e58d5b65..4ac152819 100644--- a/packages/js-sdk/test/killSandbox.test.mjs+++ b/packages/js-sdk/test/killSandbox.test.mjs@@ -1,10 +1,11 @@import { expect, test } from 'vitest'import { Sandbox } from '../src'-import wait from '../src/utils/wait'test('kill running sandbox', async () => {+ const sandbox = await Sandbox.create()+ await Sandbox.kill(sandbox.id)await expect(async () => {- const sandbox = await Sandbox.create()- await Sandbox.kill(sandbox.id)+ await sandbox.refresh(sandbox.id.split('-')[0])}).rejects.toThrowError("Not Found")+ await sandbox.close()})diff --git a/packages/python-sdk/e2b/sandbox/sandbox_connection.py b/packages/python-sdk/e2b/sandbox/sandbox_connection.pyindex 347340826..615a42ad8 100644--- a/packages/python-sdk/e2b/sandbox/sandbox_connection.py+++ b/packages/python-sdk/e2b/sandbox/sandbox_connection.py@@ -11,7 +11,6 @@ from datetime import datetimefrom pydantic import BaseModelfrom urllib3.exceptions import ReadTimeoutError, MaxRetryError, ConnectTimeoutError-from e2b.api import E2BApiClient, exceptions, models, clientfrom e2b.constants import (SANDBOX_DOMAIN,@@ -33,7 +32,6 @@ from e2b.utils.api_key import get_api_keyfrom e2b.utils.future import DeferredFuturefrom e2b.utils.str import camel_case_to_snake_case-logger = logging.getLogger(__name__)@@ -475,7 +473,7 @@ class SandboxConnection:return [RunningSandbox(sandbox_id=f"{sandbox.sandbox_id}-{sandbox.client_id}",- **sandbox.dict(exclude={'sandbox_id', 'client_id'})+ **sandbox.dict(exclude={"sandbox_id", "client_id"}),)for sandbox in client.SandboxesApi(api_client).sandboxes_get()]@@ -490,7 +488,9 @@ class SandboxConnection:If not provided, the `E2B_API_KEY` environment variable will be used."""api_key = get_api_key(api_key)++ short_id = sandbox_id.split("-")[0]with E2BApiClient(api_key=api_key) as api_client:return client.SandboxesApi(api_client).sandboxes_sandbox_id_delete(- sandbox_id=sandbox_id+ sandbox_id=short_id)diff --git a/packages/python-sdk/tests/test_kill_sandbox.py b/packages/python-sdk/tests/test_kill_sandbox.pyindex 88f5efe89..ad7da853b 100644--- a/packages/python-sdk/tests/test_kill_sandbox.py+++ b/packages/python-sdk/tests/test_kill_sandbox.py@@ -1,11 +1,13 @@import pytest-from e2b import Sandbox-from e2b.api import exceptions+from e2b import Sandbox, SandboxExceptiondef test_kill_sandbox():s = Sandbox()- with pytest.raises(exceptions.ApiException):- Sandbox.kill(s.id)+ Sandbox.kill(s.id)++ with pytest.raises(SandboxException):s._refresh()++ s.close()