Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Refactor Sandbox object in Python (#855)
Jakub Novák1aee7c8195a5
diff --git a/packages/js-sdk/src/api/schema.gen.ts b/packages/js-sdk/src/api/schema.gen.tsindex bf874c5cb..16c349521 100644--- a/packages/js-sdk/src/api/schema.gen.ts+++ b/packages/js-sdk/src/api/schema.gen.ts@@ -916,7 +916,6 @@ export type webhooks = Record<string, never>;export interface components {schemas: {BuildLogEntry: {- /** @description Log level of the entry */level: components["schemas"]["LogLevel"];/** @description Log message content */message: string;@@ -971,6 +970,13 @@ export interface components {/** @description Name of the API key */name: string;};+ /**+ * Format: int32+ * @description Disk size for the sandbox in MiB+ */+ DiskSizeMB: number;+ /** @description Version of the envd running in the sandbox */+ EnvdVersion: string;EnvVars: {[key: string]: string;};@@ -1002,11 +1008,13 @@ export interface components {*/clientID: string;cpuCount: components["schemas"]["CPUCount"];+ diskSizeMB: components["schemas"]["DiskSizeMB"];/*** Format: date-time* @description Time when the sandbox will expire*/endAt: string;+ envdVersion: components["schemas"]["EnvdVersion"];memoryMB: components["schemas"]["MemoryMB"];metadata?: components["schemas"]["SandboxMetadata"];/** @description Identifier of the sandbox */@@ -1027,7 +1035,7 @@ export interface components {LogLevel: "debug" | "info" | "warn" | "error";/*** Format: int32- * @description Memory for the sandbox in MB+ * @description Memory for the sandbox in MiB*/MemoryMB: number;NewAccessToken: {@@ -1158,8 +1166,7 @@ export interface components {domain?: string | null;/** @description Access token used for envd communication */envdAccessToken?: string;- /** @description Version of the envd running in the sandbox */- envdVersion: string;+ envdVersion: components["schemas"]["EnvdVersion"];/** @description Identifier of the sandbox */sandboxID: string;/** @description Identifier of the template from which is the sandbox created */@@ -1174,6 +1181,7 @@ export interface components {*/clientID: string;cpuCount: components["schemas"]["CPUCount"];+ diskSizeMB: components["schemas"]["DiskSizeMB"];/** @description Base domain where the sandbox traffic is accessible */domain?: string | null;/**@@ -1183,8 +1191,7 @@ export interface components {endAt: string;/** @description Access token used for envd communication */envdAccessToken?: string;- /** @description Version of the envd running in the sandbox */- envdVersion?: string;+ envdVersion: components["schemas"]["EnvdVersion"];memoryMB: components["schemas"]["MemoryMB"];metadata?: components["schemas"]["SandboxMetadata"];/** @description Identifier of the sandbox */@@ -1213,7 +1220,22 @@ export interface components {*/timestamp: string;};+ SandboxLogEntry: {+ fields: {+ [key: string]: string;+ };+ level: components["schemas"]["LogLevel"];+ /** @description Log message content */+ message: string;+ /**+ * Format: date-time+ * @description Timestamp of the log entry+ */+ timestamp: string;+ };SandboxLogs: {+ /** @description Structured logs of the sandbox */+ logEntries: components["schemas"]["SandboxLogEntry"][];/** @description Logs of the sandbox */logs: components["schemas"]["SandboxLog"][];};@@ -1320,6 +1342,8 @@ export interface components {*/createdAt: string;createdBy: components["schemas"]["TeamUser"] | null;+ diskSizeMB: components["schemas"]["DiskSizeMB"];+ envdVersion: components["schemas"]["EnvdVersion"];/*** Format: date-time* @description Time when the template was last used@@ -1399,7 +1423,9 @@ export interface components {*/force: boolean;/** @description Image to use as a base for the template build */- fromImage: string;+ fromImage?: string;+ /** @description Template to use as a base for the template build */+ fromTemplate?: string;/** @description Ready check command to execute in the template after the build */readyCmd?: string;/** @description Start command to execute in the template after the build */diff --git a/packages/python-sdk/e2b/api/client/models/__init__.py b/packages/python-sdk/e2b/api/client/models/__init__.pyindex 640f8f106..9c05651f3 100644--- a/packages/python-sdk/e2b/api/client/models/__init__.py+++ b/packages/python-sdk/e2b/api/client/models/__init__.py@@ -22,6 +22,8 @@ from .resumed_sandbox import ResumedSandboxfrom .sandbox import Sandboxfrom .sandbox_detail import SandboxDetailfrom .sandbox_log import SandboxLog+from .sandbox_log_entry import SandboxLogEntry+from .sandbox_log_entry_fields import SandboxLogEntryFieldsfrom .sandbox_logs import SandboxLogsfrom .sandbox_metric import SandboxMetricfrom .sandbox_state import SandboxState@@ -62,6 +64,8 @@ __all__ = ("SandboxDetail","SandboxesWithMetrics","SandboxLog",+ "SandboxLogEntry",+ "SandboxLogEntryFields","SandboxLogs","SandboxMetric","SandboxState",diff --git a/packages/python-sdk/e2b/api/client/models/listed_sandbox.py b/packages/python-sdk/e2b/api/client/models/listed_sandbox.pyindex d8bbf05e1..2d385a48e 100644--- a/packages/python-sdk/e2b/api/client/models/listed_sandbox.py+++ b/packages/python-sdk/e2b/api/client/models/listed_sandbox.py@@ -18,8 +18,10 @@ class ListedSandbox:Attributes:client_id (str): Identifier of the clientcpu_count (int): CPU cores for the sandbox+ disk_size_mb (int): Disk size for the sandbox in MiBend_at (datetime.datetime): Time when the sandbox will expire- memory_mb (int): Memory for the sandbox in MB+ envd_version (str): Version of the envd running in the sandbox+ memory_mb (int): Memory for the sandbox in MiBsandbox_id (str): Identifier of the sandboxstarted_at (datetime.datetime): Time when the sandbox was startedstate (SandboxState): State of the sandbox@@ -30,7 +32,9 @@ class ListedSandbox:client_id: strcpu_count: int+ disk_size_mb: intend_at: datetime.datetime+ envd_version: strmemory_mb: intsandbox_id: strstarted_at: datetime.datetime@@ -45,8 +49,12 @@ class ListedSandbox:cpu_count = self.cpu_count+ disk_size_mb = self.disk_size_mb+end_at = self.end_at.isoformat()+ envd_version = self.envd_version+memory_mb = self.memory_mbsandbox_id = self.sandbox_id@@ -67,7 +75,9 @@ class ListedSandbox:{"clientID": client_id,"cpuCount": cpu_count,+ "diskSizeMB": disk_size_mb,"endAt": end_at,+ "envdVersion": envd_version,"memoryMB": memory_mb,"sandboxID": sandbox_id,"startedAt": started_at,@@ -89,8 +99,12 @@ class ListedSandbox:cpu_count = d.pop("cpuCount")+ disk_size_mb = d.pop("diskSizeMB")+end_at = isoparse(d.pop("endAt"))+ envd_version = d.pop("envdVersion")+memory_mb = d.pop("memoryMB")sandbox_id = d.pop("sandboxID")@@ -108,7 +122,9 @@ class ListedSandbox:listed_sandbox = cls(client_id=client_id,cpu_count=cpu_count,+ disk_size_mb=disk_size_mb,end_at=end_at,+ envd_version=envd_version,memory_mb=memory_mb,sandbox_id=sandbox_id,started_at=started_at,diff --git a/packages/python-sdk/e2b/api/client/models/sandbox_detail.py b/packages/python-sdk/e2b/api/client/models/sandbox_detail.pyindex 02e6ec2a4..da864cc44 100644--- a/packages/python-sdk/e2b/api/client/models/sandbox_detail.py+++ b/packages/python-sdk/e2b/api/client/models/sandbox_detail.py@@ -18,8 +18,10 @@ class SandboxDetail:Attributes:client_id (str): Identifier of the clientcpu_count (int): CPU cores for the sandbox+ disk_size_mb (int): Disk size for the sandbox in MiBend_at (datetime.datetime): Time when the sandbox will expire- memory_mb (int): Memory for the sandbox in MB+ envd_version (str): Version of the envd running in the sandbox+ memory_mb (int): Memory for the sandbox in MiBsandbox_id (str): Identifier of the sandboxstarted_at (datetime.datetime): Time when the sandbox was startedstate (SandboxState): State of the sandbox@@ -27,13 +29,14 @@ class SandboxDetail:alias (Union[Unset, str]): Alias of the templatedomain (Union[None, Unset, str]): Base domain where the sandbox traffic is accessibleenvd_access_token (Union[Unset, str]): Access token used for envd communication- envd_version (Union[Unset, str]): Version of the envd running in the sandboxmetadata (Union[Unset, Any]):"""client_id: strcpu_count: int+ disk_size_mb: intend_at: datetime.datetime+ envd_version: strmemory_mb: intsandbox_id: strstarted_at: datetime.datetime@@ -42,7 +45,6 @@ class SandboxDetail:alias: Union[Unset, str] = UNSETdomain: Union[None, Unset, str] = UNSETenvd_access_token: Union[Unset, str] = UNSET- envd_version: Union[Unset, str] = UNSETmetadata: Union[Unset, Any] = UNSETadditional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)@@ -51,8 +53,12 @@ class SandboxDetail:cpu_count = self.cpu_count+ disk_size_mb = self.disk_size_mb+end_at = self.end_at.isoformat()+ envd_version = self.envd_version+memory_mb = self.memory_mbsandbox_id = self.sandbox_id@@ -73,8 +79,6 @@ class SandboxDetail:envd_access_token = self.envd_access_token- envd_version = self.envd_version-metadata = self.metadatafield_dict: dict[str, Any] = {}@@ -83,7 +87,9 @@ class SandboxDetail:{"clientID": client_id,"cpuCount": cpu_count,+ "diskSizeMB": disk_size_mb,"endAt": end_at,+ "envdVersion": envd_version,"memoryMB": memory_mb,"sandboxID": sandbox_id,"startedAt": started_at,@@ -97,8 +103,6 @@ class SandboxDetail:field_dict["domain"] = domainif envd_access_token is not UNSET:field_dict["envdAccessToken"] = envd_access_token- if envd_version is not UNSET:- field_dict["envdVersion"] = envd_versionif metadata is not UNSET:field_dict["metadata"] = metadata@@ -111,8 +115,12 @@ class SandboxDetail:cpu_count = d.pop("cpuCount")+ disk_size_mb = d.pop("diskSizeMB")+end_at = isoparse(d.pop("endAt"))+ envd_version = d.pop("envdVersion")+memory_mb = d.pop("memoryMB")sandbox_id = d.pop("sandboxID")@@ -136,14 +144,14 @@ class SandboxDetail:envd_access_token = d.pop("envdAccessToken", UNSET)- envd_version = d.pop("envdVersion", UNSET)-metadata = d.pop("metadata", UNSET)sandbox_detail = cls(client_id=client_id,cpu_count=cpu_count,+ disk_size_mb=disk_size_mb,end_at=end_at,+ envd_version=envd_version,memory_mb=memory_mb,sandbox_id=sandbox_id,started_at=started_at,@@ -152,7 +160,6 @@ class SandboxDetail:alias=alias,domain=domain,envd_access_token=envd_access_token,- envd_version=envd_version,metadata=metadata,)diff --git a/packages/python-sdk/e2b/api/client/models/sandbox_log_entry.py b/packages/python-sdk/e2b/api/client/models/sandbox_log_entry.pynew file mode 100644index 000000000..bcbbe7d3e--- /dev/null+++ b/packages/python-sdk/e2b/api/client/models/sandbox_log_entry.py@@ -0,0 +1,93 @@+import datetime+from collections.abc import Mapping+from typing import TYPE_CHECKING, Any, TypeVar++from attrs import define as _attrs_define+from attrs import field as _attrs_field+from dateutil.parser import isoparse++from ..models.log_level import LogLevel++if TYPE_CHECKING:+ from ..models.sandbox_log_entry_fields import SandboxLogEntryFields+++T = TypeVar("T", bound="SandboxLogEntry")+++@_attrs_define+class SandboxLogEntry:+ """+ Attributes:+ fields (SandboxLogEntryFields):+ level (LogLevel): State of the sandbox+ message (str): Log message content+ timestamp (datetime.datetime): Timestamp of the log entry+ """++ fields: "SandboxLogEntryFields"+ level: LogLevel+ message: str+ timestamp: datetime.datetime+ additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)++ def to_dict(self) -> dict[str, Any]:+ fields = self.fields.to_dict()++ level = self.level.value++ message = self.message++ timestamp = self.timestamp.isoformat()++ field_dict: dict[str, Any] = {}+ field_dict.update(self.additional_properties)+ field_dict.update(+ {+ "fields": fields,+ "level": level,+ "message": message,+ "timestamp": timestamp,+ }+ )++ return field_dict++ @classmethod+ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:+ from ..models.sandbox_log_entry_fields import SandboxLogEntryFields++ d = dict(src_dict)+ fields = SandboxLogEntryFields.from_dict(d.pop("fields"))++ level = LogLevel(d.pop("level"))++ message = d.pop("message")++ timestamp = isoparse(d.pop("timestamp"))++ sandbox_log_entry = cls(+ fields=fields,+ level=level,+ message=message,+ timestamp=timestamp,+ )++ sandbox_log_entry.additional_properties = d+ return sandbox_log_entry++ @property+ def additional_keys(self) -> list[str]:+ return list(self.additional_properties.keys())++ def __getitem__(self, key: str) -> Any:+ return self.additional_properties[key]++ def __setitem__(self, key: str, value: Any) -> None:+ self.additional_properties[key] = value++ def __delitem__(self, key: str) -> None:+ del self.additional_properties[key]++ def __contains__(self, key: str) -> bool:+ return key in self.additional_propertiesdiff --git a/packages/python-sdk/e2b/api/client/models/sandbox_log_entry_fields.py b/packages/python-sdk/e2b/api/client/models/sandbox_log_entry_fields.pynew file mode 100644index 000000000..6ac463d36--- /dev/null+++ b/packages/python-sdk/e2b/api/client/models/sandbox_log_entry_fields.py@@ -0,0 +1,44 @@+from collections.abc import Mapping+from typing import Any, TypeVar++from attrs import define as _attrs_define+from attrs import field as _attrs_field++T = TypeVar("T", bound="SandboxLogEntryFields")+++@_attrs_define+class SandboxLogEntryFields:+ """ """++ additional_properties: dict[str, str] = _attrs_field(init=False, factory=dict)++ def to_dict(self) -> dict[str, Any]:+ field_dict: dict[str, Any] = {}+ field_dict.update(self.additional_properties)++ return field_dict++ @classmethod+ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:+ d = dict(src_dict)+ sandbox_log_entry_fields = cls()++ sandbox_log_entry_fields.additional_properties = d+ return sandbox_log_entry_fields++ @property+ def additional_keys(self) -> list[str]:+ return list(self.additional_properties.keys())++ def __getitem__(self, key: str) -> str:+ return self.additional_properties[key]++ def __setitem__(self, key: str, value: str) -> None:+ self.additional_properties[key] = value++ def __delitem__(self, key: str) -> None:+ del self.additional_properties[key]++ def __contains__(self, key: str) -> bool:+ return key in self.additional_propertiesdiff --git a/packages/python-sdk/e2b/api/client/models/sandbox_logs.py b/packages/python-sdk/e2b/api/client/models/sandbox_logs.pyindex d6af161fb..39a1eb500 100644--- a/packages/python-sdk/e2b/api/client/models/sandbox_logs.py+++ b/packages/python-sdk/e2b/api/client/models/sandbox_logs.py@@ -6,6 +6,7 @@ from attrs import field as _attrs_fieldif TYPE_CHECKING:from ..models.sandbox_log import SandboxLog+ from ..models.sandbox_log_entry import SandboxLogEntryT = TypeVar("T", bound="SandboxLogs")@@ -15,13 +16,20 @@ T = TypeVar("T", bound="SandboxLogs")class SandboxLogs:"""Attributes:+ log_entries (list['SandboxLogEntry']): Structured logs of the sandboxlogs (list['SandboxLog']): Logs of the sandbox"""+ log_entries: list["SandboxLogEntry"]logs: list["SandboxLog"]additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)def to_dict(self) -> dict[str, Any]:+ log_entries = []+ for log_entries_item_data in self.log_entries:+ log_entries_item = log_entries_item_data.to_dict()+ log_entries.append(log_entries_item)+logs = []for logs_item_data in self.logs:logs_item = logs_item_data.to_dict()@@ -31,6 +39,7 @@ class SandboxLogs:field_dict.update(self.additional_properties)field_dict.update({+ "logEntries": log_entries,"logs": logs,})@@ -40,8 +49,16 @@ class SandboxLogs:@classmethoddef from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:from ..models.sandbox_log import SandboxLog+ from ..models.sandbox_log_entry import SandboxLogEntryd = dict(src_dict)+ log_entries = []+ _log_entries = d.pop("logEntries")+ for log_entries_item_data in _log_entries:+ log_entries_item = SandboxLogEntry.from_dict(log_entries_item_data)++ log_entries.append(log_entries_item)+logs = []_logs = d.pop("logs")for logs_item_data in _logs:@@ -50,6 +67,7 @@ class SandboxLogs:logs.append(logs_item)sandbox_logs = cls(+ log_entries=log_entries,logs=logs,)diff --git a/packages/python-sdk/e2b/api/client/models/template.py b/packages/python-sdk/e2b/api/client/models/template.pyindex 58abcbd90..31f7a84bd 100644--- a/packages/python-sdk/e2b/api/client/models/template.py+++ b/packages/python-sdk/e2b/api/client/models/template.py@@ -24,8 +24,10 @@ class Template:cpu_count (int): CPU cores for the sandboxcreated_at (datetime.datetime): Time when the template was createdcreated_by (Union['TeamUser', None]):+ disk_size_mb (int): Disk size for the sandbox in MiB+ envd_version (str): Version of the envd running in the sandboxlast_spawned_at (datetime.datetime): Time when the template was last used- memory_mb (int): Memory for the sandbox in MB+ memory_mb (int): Memory for the sandbox in MiBpublic (bool): Whether the template is public or only accessible by the teamspawn_count (int): Number of times the template was usedtemplate_id (str): Identifier of the template@@ -38,6 +40,8 @@ class Template:cpu_count: intcreated_at: datetime.datetimecreated_by: Union["TeamUser", None]+ disk_size_mb: int+ envd_version: strlast_spawned_at: datetime.datetimememory_mb: intpublic: bool@@ -64,6 +68,10 @@ class Template:else:created_by = self.created_by+ disk_size_mb = self.disk_size_mb++ envd_version = self.envd_version+last_spawned_at = self.last_spawned_at.isoformat()memory_mb = self.memory_mb@@ -89,6 +97,8 @@ class Template:"cpuCount": cpu_count,"createdAt": created_at,"createdBy": created_by,+ "diskSizeMB": disk_size_mb,+ "envdVersion": envd_version,"lastSpawnedAt": last_spawned_at,"memoryMB": memory_mb,"public": public,@@ -130,6 +140,10 @@ class Template:created_by = _parse_created_by(d.pop("createdBy"))+ disk_size_mb = d.pop("diskSizeMB")++ envd_version = d.pop("envdVersion")+last_spawned_at = isoparse(d.pop("lastSpawnedAt"))memory_mb = d.pop("memoryMB")@@ -150,6 +164,8 @@ class Template:cpu_count=cpu_count,created_at=created_at,created_by=created_by,+ disk_size_mb=disk_size_mb,+ envd_version=envd_version,last_spawned_at=last_spawned_at,memory_mb=memory_mb,public=public,diff --git a/packages/python-sdk/e2b/api/client/models/template_build_request.py b/packages/python-sdk/e2b/api/client/models/template_build_request.pyindex 31c9689b2..b41e1d0cd 100644--- a/packages/python-sdk/e2b/api/client/models/template_build_request.py+++ b/packages/python-sdk/e2b/api/client/models/template_build_request.py@@ -16,7 +16,7 @@ class TemplateBuildRequest:dockerfile (str): Dockerfile for the templatealias (Union[Unset, str]): Alias of the templatecpu_count (Union[Unset, int]): CPU cores for the sandbox- memory_mb (Union[Unset, int]): Memory for the sandbox in MB+ memory_mb (Union[Unset, int]): Memory for the sandbox in MiBready_cmd (Union[Unset, str]): Ready check command to execute in the template after the buildstart_cmd (Union[Unset, str]): Start command to execute in the template after the buildteam_id (Union[Unset, str]): Identifier of the teamdiff --git a/packages/python-sdk/e2b/api/client/models/template_build_request_v2.py b/packages/python-sdk/e2b/api/client/models/template_build_request_v2.pyindex 714109487..1473424e0 100644--- a/packages/python-sdk/e2b/api/client/models/template_build_request_v2.py+++ b/packages/python-sdk/e2b/api/client/models/template_build_request_v2.py@@ -15,7 +15,7 @@ class TemplateBuildRequestV2:Attributes:alias (str): Alias of the templatecpu_count (Union[Unset, int]): CPU cores for the sandbox- memory_mb (Union[Unset, int]): Memory for the sandbox in MB+ memory_mb (Union[Unset, int]): Memory for the sandbox in MiBteam_id (Union[Unset, str]): Identifier of the team"""diff --git a/packages/python-sdk/e2b/api/client/models/template_build_start_v2.py b/packages/python-sdk/e2b/api/client/models/template_build_start_v2.pyindex 6ab77c7d7..5f00502d3 100644--- a/packages/python-sdk/e2b/api/client/models/template_build_start_v2.py+++ b/packages/python-sdk/e2b/api/client/models/template_build_start_v2.py@@ -17,25 +17,29 @@ T = TypeVar("T", bound="TemplateBuildStartV2")class TemplateBuildStartV2:"""Attributes:- from_image (str): Image to use as a base for the template buildforce (Union[Unset, bool]): Whether the whole build should be forced to run regardless of the cache Default:False.+ from_image (Union[Unset, str]): Image to use as a base for the template build+ from_template (Union[Unset, str]): Template to use as a base for the template buildready_cmd (Union[Unset, str]): Ready check command to execute in the template after the buildstart_cmd (Union[Unset, str]): Start command to execute in the template after the buildsteps (Union[Unset, list['TemplateStep']]): List of steps to execute in the template build"""- from_image: strforce: Union[Unset, bool] = False+ from_image: Union[Unset, str] = UNSET+ from_template: Union[Unset, str] = UNSETready_cmd: Union[Unset, str] = UNSETstart_cmd: Union[Unset, str] = UNSETsteps: Union[Unset, list["TemplateStep"]] = UNSETadditional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)def to_dict(self) -> dict[str, Any]:+ force = self.force+from_image = self.from_image- force = self.force+ from_template = self.from_templateready_cmd = self.ready_cmd@@ -50,13 +54,13 @@ class TemplateBuildStartV2:field_dict: dict[str, Any] = {}field_dict.update(self.additional_properties)- field_dict.update(- {- "fromImage": from_image,- }- )+ field_dict.update({})if force is not UNSET:field_dict["force"] = force+ if from_image is not UNSET:+ field_dict["fromImage"] = from_image+ if from_template is not UNSET:+ field_dict["fromTemplate"] = from_templateif ready_cmd is not UNSET:field_dict["readyCmd"] = ready_cmdif start_cmd is not UNSET:@@ -71,10 +75,12 @@ class TemplateBuildStartV2:from ..models.template_step import TemplateStepd = dict(src_dict)- from_image = d.pop("fromImage")-force = d.pop("force", UNSET)+ from_image = d.pop("fromImage", UNSET)++ from_template = d.pop("fromTemplate", UNSET)+ready_cmd = d.pop("readyCmd", UNSET)start_cmd = d.pop("startCmd", UNSET)@@ -87,8 +93,9 @@ class TemplateBuildStartV2:steps.append(steps_item)template_build_start_v2 = cls(- from_image=from_image,force=force,+ from_image=from_image,+ from_template=from_template,ready_cmd=ready_cmd,start_cmd=start_cmd,steps=steps,diff --git a/packages/python-sdk/e2b/sandbox/sandbox_api.py b/packages/python-sdk/e2b/sandbox/sandbox_api.pyindex edd2347f4..444ec6527 100644--- a/packages/python-sdk/e2b/sandbox/sandbox_api.py+++ b/packages/python-sdk/e2b/sandbox/sandbox_api.py@@ -1,8 +1,8 @@from dataclasses import dataclass-from typing import Optional, Dict+from typing import Optional, Dict, Unionfrom datetime import datetime-from e2b.api.client.models import SandboxState+from e2b.api.client.models import SandboxState, SandboxDetail, ListedSandbox@dataclass@@ -23,33 +23,58 @@ class SandboxInfo:"""Sandbox start time."""end_at: datetime"""Sandbox expiration date."""- envd_version: Optional[str]+ state: SandboxState+ """Sandbox state."""+ cpu_count: int+ """Sandbox CPU count."""+ memory_mb: int+ """Sandbox Memory size in MiB."""+ envd_version: str"""Envd version."""_envd_access_token: Optional[str]"""Envd access token."""+ @classmethod+ def _from_sandbox_data(+ cls,+ sandbox: Union[ListedSandbox, SandboxDetail],+ envd_access_token: Optional[str] = None,+ sandbox_domain: Optional[str] = None,+ ):+ return cls(+ sandbox_domain=sandbox_domain,+ sandbox_id=sandbox.sandbox_id,+ template_id=sandbox.template_id,+ name=(sandbox.alias if isinstance(sandbox.alias, str) else None),+ metadata=(sandbox.metadata if isinstance(sandbox.metadata, dict) else {}),+ started_at=sandbox.started_at,+ end_at=sandbox.end_at,+ state=sandbox.state,+ cpu_count=sandbox.cpu_count,+ memory_mb=sandbox.memory_mb,+ envd_version=sandbox.envd_version,+ _envd_access_token=envd_access_token,+ )-@dataclass-class ListedSandbox:- """Information about a sandbox."""+ @classmethod+ def _from_listed_sandbox(cls, listed_sandbox: ListedSandbox):+ return cls._from_sandbox_data(listed_sandbox)- sandbox_id: str- """Sandbox ID."""- template_id: str- """Template ID."""- name: Optional[str]- """Template Alias."""- state: SandboxState- """Sandbox state."""- cpu_count: int- """Sandbox CPU count."""- memory_mb: int- """Sandbox Memory size in MB."""- metadata: Dict[str, str]- """Saved sandbox metadata."""- started_at: datetime- """Sandbox start time."""- end_at: datetime+ @classmethod+ def _from_sandbox_detail(cls, sandbox_detail: SandboxDetail):+ return cls._from_sandbox_data(+ sandbox_detail,+ (+ sandbox_detail.envd_access_token+ if isinstance(sandbox_detail.envd_access_token, str)+ else None+ ),+ sandbox_domain=(+ sandbox_detail.domain+ if isinstance(sandbox_detail.domain, str)+ else None+ ),+ )@dataclassdiff --git a/packages/python-sdk/e2b/sandbox_async/sandbox_api.py b/packages/python-sdk/e2b/sandbox_async/sandbox_api.pyindex c6330fec0..3f0082b96 100644--- a/packages/python-sdk/e2b/sandbox_async/sandbox_api.py+++ b/packages/python-sdk/e2b/sandbox_async/sandbox_api.py@@ -9,7 +9,6 @@ from e2b.sandbox.main import SandboxBasefrom e2b.sandbox.sandbox_api import (SandboxInfo,SandboxQuery,- ListedSandbox,SandboxMetrics,)from e2b.exceptions import TemplateException, SandboxException@@ -37,7 +36,7 @@ class SandboxApi(SandboxBase):cls,query: Optional[SandboxQuery] = None,**opts: Unpack[ApiParams],- ) -> List[ListedSandbox]:+ ) -> List[SandboxInfo]:"""List all running sandboxes.@@ -72,22 +71,10 @@ class SandboxApi(SandboxBase):if res.parsed is None:return []- return [- ListedSandbox(- sandbox_id=sandbox.sandbox_id,- template_id=sandbox.template_id,- name=sandbox.alias if isinstance(sandbox.alias, str) else None,- metadata=(- sandbox.metadata if isinstance(sandbox.metadata, dict) else {}- ),- state=sandbox.state,- cpu_count=sandbox.cpu_count,- memory_mb=sandbox.memory_mb,- started_at=sandbox.started_at,- end_at=sandbox.end_at,- )- for sandbox in res.parsed- ]+ if isinstance(res.parsed, Error):+ raise SandboxException(f"{res.parsed.message}: Request failed")++ return [SandboxInfo._from_listed_sandbox(sandbox) for sandbox in res.parsed]@classmethodasync def _cls_get_info(@@ -118,19 +105,10 @@ class SandboxApi(SandboxBase):if res.parsed is None:raise Exception("Body of the request is None")- return SandboxInfo(- sandbox_id=res.parsed.sandbox_id,- sandbox_domain=res.parsed.domain,- template_id=res.parsed.template_id,- name=res.parsed.alias if isinstance(res.parsed.alias, str) else None,- metadata=(- res.parsed.metadata if isinstance(res.parsed.metadata, dict) else {}- ),- started_at=res.parsed.started_at,- end_at=res.parsed.end_at,- envd_version=res.parsed.envd_version,- _envd_access_token=res.parsed.envd_access_token,- )+ if isinstance(res.parsed, Error):+ raise SandboxException(f"{res.parsed.message}: Request failed")++ return SandboxInfo._from_sandbox_detail(res.parsed)@classmethodasync def _cls_kill(diff --git a/packages/python-sdk/e2b/sandbox_sync/sandbox_api.py b/packages/python-sdk/e2b/sandbox_sync/sandbox_api.pyindex 41d8117ad..cde285fa3 100644--- a/packages/python-sdk/e2b/sandbox_sync/sandbox_api.py+++ b/packages/python-sdk/e2b/sandbox_sync/sandbox_api.py@@ -8,7 +8,6 @@ from typing_extensions import Unpackfrom e2b.sandbox.sandbox_api import (SandboxInfo,SandboxQuery,- ListedSandbox,SandboxMetrics,)from e2b.sandbox.main import SandboxBase@@ -37,7 +36,7 @@ class SandboxApi(SandboxBase):cls,query: Optional[SandboxQuery] = None,**opts: Unpack[ApiParams],- ) -> List[ListedSandbox]:+ ) -> List[SandboxInfo]:"""List all running sandboxes.@@ -69,22 +68,10 @@ class SandboxApi(SandboxBase):if res.parsed is None:return []- return [- ListedSandbox(- sandbox_id=sandbox.sandbox_id,- template_id=sandbox.template_id,- name=sandbox.alias if isinstance(sandbox.alias, str) else None,- metadata=(- sandbox.metadata if isinstance(sandbox.metadata, dict) else {}- ),- state=sandbox.state,- cpu_count=sandbox.cpu_count,- memory_mb=sandbox.memory_mb,- started_at=sandbox.started_at,- end_at=sandbox.end_at,- )- for sandbox in res.parsed- ]+ if isinstance(res.parsed, Error):+ raise SandboxException(f"{res.parsed.message}: Request failed")++ return [SandboxInfo._from_listed_sandbox(sandbox) for sandbox in res.parsed]@classmethoddef _cls_get_info(@@ -113,21 +100,12 @@ class SandboxApi(SandboxBase):raise handle_api_exception(res)if res.parsed is None:- raise Exception("Body of the request is None")+ raise SandboxException("Body of the request is None")- return SandboxInfo(- sandbox_id=res.parsed.sandbox_id,- sandbox_domain=res.parsed.domain,- template_id=res.parsed.template_id,- name=res.parsed.alias if isinstance(res.parsed.alias, str) else None,- metadata=(- res.parsed.metadata if isinstance(res.parsed.metadata, dict) else {}- ),- started_at=res.parsed.started_at,- end_at=res.parsed.end_at,- envd_version=res.parsed.envd_version,- _envd_access_token=res.parsed.envd_access_token,- )+ if isinstance(res.parsed, Error):+ raise SandboxException(f"{res.parsed.message}: Request failed")++ return SandboxInfo._from_sandbox_detail(res.parsed)@classmethoddef _cls_kill(diff --git a/spec/openapi.yml b/spec/openapi.ymlindex 8bc6cee96..7fbb09ece 100644--- a/spec/openapi.yml+++ b/spec/openapi.yml@@ -152,7 +152,17 @@ components:type: integerformat: int32minimum: 128- description: Memory for the sandbox in MB+ description: Memory for the sandbox in MiB++ DiskSizeMB:+ type: integer+ format: int32+ minimum: 0+ description: Disk size for the sandbox in MiB++ EnvdVersion:+ type: string+ description: Version of the envd running in the sandboxSandboxMetadata:additionalProperties:@@ -185,15 +195,42 @@ components:type: stringdescription: Log line content+ SandboxLogEntry:+ required:+ - timestamp+ - level+ - message+ - fields+ properties:+ timestamp:+ type: string+ format: date-time+ description: Timestamp of the log entry+ message:+ type: string+ description: Log message content+ level:+ $ref: "#/components/schemas/LogLevel"+ fields:+ type: object+ additionalProperties:+ type: string+SandboxLogs:required:- logs+ - logEntriesproperties:logs:description: Logs of the sandboxtype: arrayitems:$ref: "#/components/schemas/SandboxLog"+ logEntries:+ description: Structured logs of the sandbox+ type: array+ items:+ $ref: "#/components/schemas/SandboxLogEntry"SandboxMetric:description: Metric entry with timestamp and line@@ -256,8 +293,7 @@ components:deprecated: truedescription: Identifier of the clientenvdVersion:- type: string- description: Version of the envd running in the sandbox+ $ref: "#/components/schemas/EnvdVersion"envdAccessToken:type: stringdescription: Access token used for envd communication@@ -274,8 +310,10 @@ components:- startedAt- cpuCount- memoryMB+ - diskSizeMB- endAt- state+ - envdVersionproperties:templateID:type: string@@ -299,8 +337,7 @@ components:format: date-timedescription: Time when the sandbox will expireenvdVersion:- type: string- description: Version of the envd running in the sandbox+ $ref: "#/components/schemas/EnvdVersion"envdAccessToken:type: stringdescription: Access token used for envd communication@@ -312,6 +349,8 @@ components:$ref: "#/components/schemas/CPUCount"memoryMB:$ref: "#/components/schemas/MemoryMB"+ diskSizeMB:+ $ref: "#/components/schemas/DiskSizeMB"metadata:$ref: "#/components/schemas/SandboxMetadata"state:@@ -325,8 +364,10 @@ components:- startedAt- cpuCount- memoryMB+ - diskSizeMB- endAt- state+ - envdVersionproperties:templateID:type: string@@ -353,10 +394,14 @@ components:$ref: "#/components/schemas/CPUCount"memoryMB:$ref: "#/components/schemas/MemoryMB"+ diskSizeMB:+ $ref: "#/components/schemas/DiskSizeMB"metadata:$ref: "#/components/schemas/SandboxMetadata"state:$ref: "#/components/schemas/SandboxState"+ envdVersion:+ $ref: "#/components/schemas/EnvdVersion"SandboxesWithMetrics:required:@@ -413,6 +458,7 @@ components:- buildID- cpuCount- memoryMB+ - diskSizeMB- public- createdAt- updatedAt@@ -420,6 +466,7 @@ components:- lastSpawnedAt- spawnCount- buildCount+ - envdVersionproperties:templateID:type: string@@ -431,6 +478,8 @@ components:$ref: "#/components/schemas/CPUCount"memoryMB:$ref: "#/components/schemas/MemoryMB"+ diskSizeMB:+ $ref: "#/components/schemas/DiskSizeMB"public:type: booleandescription: Whether the template is public or only accessible by the team@@ -463,6 +512,8 @@ components:type: integerformat: int32description: Number of times the template was built+ envdVersion:+ $ref: "#/components/schemas/EnvdVersion"TemplateBuildRequest:required:@@ -526,12 +577,14 @@ components:$ref: "#/components/schemas/MemoryMB"TemplateBuildStartV2:- required:- - fromImage+ type: objectproperties:fromImage:type: stringdescription: Image to use as a base for the template build+ fromTemplate:+ type: string+ description: Template to use as a base for the template buildforce:default: falsetype: boolean@@ -583,7 +636,6 @@ components:type: stringdescription: Log message contentlevel:- description: Log level of the entry$ref: "#/components/schemas/LogLevel"TemplateBuild:@@ -1325,69 +1377,6 @@ paths:description: Create a new templatetags: [templates]security:- - AccessTokenAuth: []- - ApiKeyAuth: []- - Supabase1TokenAuth: []- requestBody:- required: true- content:- application/json:- schema:- $ref: "#/components/schemas/TemplateBuildRequestV2"-- responses:- "202":- description: The build was requested successfully- content:- application/json:- schema:- $ref: "#/components/schemas/Template"- "400":- $ref: "#/components/responses/400"- "401":- $ref: "#/components/responses/401"- "500":- $ref: "#/components/responses/500"-- /templates/{templateID}/files/{hash}:- get:- description: Get an upload link for a tar file containing build layer files- tags: [templates]- security:- - AccessTokenAuth: []- - ApiKeyAuth: []- - Supabase1TokenAuth: []- parameters:- - $ref: "#/components/parameters/templateID"- - in: path- name: hash- required: true- schema:- type: string- description: Hash of the files-- responses:- "201":- description: The upload link where to upload the tar file- content:- application/json:- schema:- $ref: "#/components/schemas/TemplateBuildFileUpload"- "400":- $ref: "#/components/responses/400"- "401":- $ref: "#/components/responses/401"- "404":- $ref: "#/components/responses/404"- "500":- $ref: "#/components/responses/500"-- /v2/templates:- post:- description: Create a new template- tags: [templates]- security:- - AccessTokenAuth: []- ApiKeyAuth: []- Supabase1TokenAuth: []requestBody:@@ -1588,32 +1577,6 @@ paths:description: Start the buildtags: [templates]security:- - AccessTokenAuth: []- - ApiKeyAuth: []- - Supabase1TokenAuth: []- parameters:- - $ref: "#/components/parameters/templateID"- - $ref: "#/components/parameters/buildID"- requestBody:- required: true- content:- application/json:- schema:- $ref: "#/components/schemas/TemplateBuildStartV2"- responses:- "202":- description: The build has started- "401":- $ref: "#/components/responses/401"- "500":- $ref: "#/components/responses/500"-- /v2/templates/{templateID}/builds/{buildID}:- post:- description: Start the build- tags: [templates]- security:- - AccessTokenAuth: []- ApiKeyAuth: []- Supabase1TokenAuth: []parameters:@@ -1656,7 +1619,6 @@ paths:name: levelschema:$ref: "#/components/schemas/LogLevel"- default: debugresponses:"200":description: Successfully returned the template