Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Add info about memory and cpus to sandbox list
Jakub Novak1801039dbf42
diff --git a/.changeset/quick-eels-melt.md b/.changeset/quick-eels-melt.mdnew file mode 100644index 000000000..1b98b92c6--- /dev/null+++ b/.changeset/quick-eels-melt.md@@ -0,0 +1,7 @@+---+"@e2b/python-sdk": patch+"e2b": patch+"@e2b/cli": patch+---++Add info about cpus and memory to sandbox listdiff --git a/packages/cli/src/commands/sandbox/list.ts b/packages/cli/src/commands/sandbox/list.tsindex 76ea848eb..d71fdeb26 100644--- a/packages/cli/src/commands/sandbox/list.ts+++ b/packages/cli/src/commands/sandbox/list.ts@@ -26,6 +26,8 @@ export const listCommand = new commander.Command('list'){ name: 'templateID', alignment: 'left', title: 'Template ID' },{ name: 'alias', alignment: 'left', title: 'Alias' },{ name: 'startedAt', alignment: 'left', title: 'Started at' },+ { name: 'cpuCount', alignment: 'left', title: 'CPUs'},+ { name: 'memoryMB', alignment: 'left', title: 'RAM MB'},{ name: 'metadata', alignment: 'left', title: 'Metadata' },],disabledColumns: ['clientID'],diff --git a/packages/js-sdk/src/api/schema.gen.ts b/packages/js-sdk/src/api/schema.gen.tsindex 9d1597098..e7638b6e6 100644--- a/packages/js-sdk/src/api/schema.gen.ts+++ b/packages/js-sdk/src/api/schema.gen.ts@@ -482,6 +482,10 @@ export interface components {* @description Time when the sandbox was started*/startedAt: string;+ /** @description CPU cores for the sandbox */+ cpuCount: number;+ /** @description Memory limit for the sandbox in MB */+ memoryMB: number;metadata?: components["schemas"]["SandboxMetadata"];};NewSandbox: {diff --git a/packages/js-sdk/src/sandbox/sandboxConnection.ts b/packages/js-sdk/src/sandbox/sandboxConnection.tsindex 7b6d91c95..5528c28a8 100644--- a/packages/js-sdk/src/sandbox/sandboxConnection.ts+++ b/packages/js-sdk/src/sandbox/sandboxConnection.ts@@ -12,13 +12,13 @@ import { EnvVars } from './envVars'import { getApiKey } from '../utils/apiKey'// eslint-disable-next-line @typescript-eslint/no-explicit-any-type SubscriptionHandler = (result: any) => void;+type SubscriptionHandler = (result: any) => voidtype Service =| typeof processService| typeof codeSnippetService| typeof filesystemService- | typeof terminalService;+ | typeof terminalServiceinterface Subscriber {service: Service;@@ -124,7 +124,7 @@ export class SandboxConnection {this.cwd = this.cwd.replace('~', '/home/user')}- const defaultEnvVars = { PYTHONUNBUFFERED: "1" }+ const defaultEnvVars = { PYTHONUNBUFFERED: '1' }this.envVars = { ...defaultEnvVars, ...opts.envVars || {} }@@ -165,6 +165,8 @@ export class SandboxConnection {return res.data.map(sandbox => ({sandboxID: `${sandbox.sandboxID}-${sandbox.clientID}`,templateID: sandbox.templateID,+ cpuCount: sandbox.cpuCount,+ memoryMB: sandbox.memoryMB,...sandbox.alias && { alias: sandbox.alias },...sandbox.metadata && { metadata: sandbox.metadata },startedAt: new Date(sandbox.startedAt),diff --git a/packages/python-sdk/e2b/api/v1/client/models/running_sandboxes.py b/packages/python-sdk/e2b/api/v1/client/models/running_sandboxes.pyindex 3900750b0..0454a173c 100644--- a/packages/python-sdk/e2b/api/v1/client/models/running_sandboxes.py+++ b/packages/python-sdk/e2b/api/v1/client/models/running_sandboxes.py@@ -19,7 +19,7 @@ import jsonfrom datetime import datetimefrom typing import Any, Dict, Optional-from pydantic import BaseModel, Field, StrictStr+from pydantic import BaseModel, Field, StrictInt, StrictStrclass RunningSandboxes(BaseModel):@@ -42,6 +42,12 @@ class RunningSandboxes(BaseModel):started_at: datetime = Field(..., alias="startedAt", description="Time when the sandbox was started")+ cpu_count: StrictInt = Field(+ ..., alias="cpuCount", description="CPU cores for the sandbox"+ )+ memory_mb: StrictInt = Field(+ ..., alias="memoryMB", description="Memory limit for the sandbox in MB"+ )metadata: Optional[Dict[str, StrictStr]] = Noneadditional_properties: Dict[str, Any] = {}__properties = [@@ -50,6 +56,8 @@ class RunningSandboxes(BaseModel):"sandboxID","clientID","startedAt",+ "cpuCount",+ "memoryMB","metadata",]@@ -100,6 +108,8 @@ class RunningSandboxes(BaseModel):"sandbox_id": obj.get("sandboxID"),"client_id": obj.get("clientID"),"started_at": obj.get("startedAt"),+ "cpu_count": obj.get("cpuCount"),+ "memory_mb": obj.get("memoryMB"),"metadata": obj.get("metadata"),})diff --git a/packages/python-sdk/e2b/api/v2/client/models/running_sandboxes.py b/packages/python-sdk/e2b/api/v2/client/models/running_sandboxes.pyindex 73cff5e76..12ba16a43 100644--- a/packages/python-sdk/e2b/api/v2/client/models/running_sandboxes.py+++ b/packages/python-sdk/e2b/api/v2/client/models/running_sandboxes.py@@ -19,7 +19,7 @@ import jsonfrom datetime import datetimefrom typing import Any, ClassVar, Dict, List, Optional-from pydantic import BaseModel, StrictStr+from pydantic import BaseModel, StrictInt, StrictStrfrom pydantic import Fieldtry:@@ -49,6 +49,12 @@ class RunningSandboxes(BaseModel):started_at: datetime = Field(description="Time when the sandbox was started", alias="startedAt")+ cpu_count: StrictInt = Field(+ description="CPU cores for the sandbox", alias="cpuCount"+ )+ memory_mb: StrictInt = Field(+ description="Memory limit for the sandbox in MB", alias="memoryMB"+ )metadata: Optional[Dict[str, StrictStr]] = Noneadditional_properties: Dict[str, Any] = {}__properties: ClassVar[List[str]] = [@@ -57,6 +63,8 @@ class RunningSandboxes(BaseModel):"sandboxID","clientID","startedAt",+ "cpuCount",+ "memoryMB","metadata",]@@ -117,6 +125,8 @@ class RunningSandboxes(BaseModel):"sandboxID": obj.get("sandboxID"),"clientID": obj.get("clientID"),"startedAt": obj.get("startedAt"),+ "cpuCount": obj.get("cpuCount"),+ "memoryMB": obj.get("memoryMB"),"metadata": obj.get("metadata"),})diff --git a/packages/python-sdk/e2b/sandbox/sandbox_connection.py b/packages/python-sdk/e2b/sandbox/sandbox_connection.pyindex 8f09923ee..347340826 100644--- a/packages/python-sdk/e2b/sandbox/sandbox_connection.py+++ b/packages/python-sdk/e2b/sandbox/sandbox_connection.py@@ -55,6 +55,8 @@ class RunningSandbox(BaseModel):template_id: stralias: Optional[str]metadata: Optional[Dict[str, str]]+ cpu_count: int+ memory_mb: intstarted_at: datetime@@ -472,11 +474,8 @@ class SandboxConnection:with E2BApiClient(api_key=api_key) as api_client:return [RunningSandbox(- metadata=sandbox.metadata,sandbox_id=f"{sandbox.sandbox_id}-{sandbox.client_id}",- template_id=sandbox.template_id,- alias=sandbox.alias,- started_at=sandbox.started_at,+ **sandbox.dict(exclude={'sandbox_id', 'client_id'}))for sandbox in client.SandboxesApi(api_client).sandboxes_get()]diff --git a/packages/python-sdk/tests/test_timeout.py b/packages/python-sdk/tests/test_timeout.pyindex a84a8177f..d5065baec 100644--- a/packages/python-sdk/tests/test_timeout.py+++ b/packages/python-sdk/tests/test_timeout.py@@ -1,3 +1,5 @@+from typing import Optional+import pytestfrom e2b import Sandbox@@ -5,7 +7,7 @@ from e2b.sandbox.exception import TimeoutExceptiondef test_create_sandbox_timeout():- sandbox: Sandbox | None = None+ sandbox: Optional[Sandbox] = Nonewith pytest.raises(TimeoutException):sandbox = Sandbox(timeout=0.01)@@ -15,7 +17,7 @@ def test_create_sandbox_timeout():def test_process_timeout():- sandbox: Sandbox | None = None+ sandbox: Optional[Sandbox] = Nonewith pytest.raises(TimeoutException):sandbox = Sandbox()@@ -29,7 +31,7 @@ def test_process_timeout():def test_filesystem_timeout():- sandbox: Sandbox | None = None+ sandbox: Optional[Sandbox] = Nonewith pytest.raises(TimeoutException):sandbox = Sandbox()diff --git a/spec/openapi.yml b/spec/openapi.ymlindex 2bd1b019f..bc5cb0495 100644--- a/spec/openapi.yml+++ b/spec/openapi.yml@@ -109,6 +109,8 @@ components:- sandboxID- clientID- startedAt+ - cpuCount+ - memoryMBproperties:templateID:type: string@@ -126,6 +128,12 @@ components:type: stringformat: date-timedescription: Time when the sandbox was started+ cpuCount:+ type: integer+ description: CPU cores for the sandbox+ memoryMB:+ type: integer+ description: Memory limit for the sandbox in MBmetadata:$ref: "#/components/schemas/SandboxMetadata"