Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Refactor

Jakub Novak3a214c255333
diff --git a/packages/python-sdk/e2b/sandbox/main.py b/packages/python-sdk/e2b/sandbox/main.py
index af06589ec..84db705f0 100644
--- a/packages/python-sdk/e2b/sandbox/main.py
+++ b/packages/python-sdk/e2b/sandbox/main.py
@@ -110,9 +110,9 @@ class Sandbox(SandboxConnection):
_debug_hostname=_debug_hostname,
_debug_port=_debug_port,
_debug_dev_env=_debug_dev_env,
- on_close=self._close_services,
timeout=timeout,
)
+ self._on_close_child = self._close_services
def _open(self, timeout: Optional[float] = TIMEOUT) -> None:
"""
@@ -131,41 +131,6 @@ class Sandbox(SandboxConnection):
self._terminal._close()
self._process._close()
- @classmethod
- def reconnect(
- cls,
- sandbox_id: str,
- api_key: Optional[str] = None,
- cwd: Optional[str] = None,
- env_vars: Optional[EnvVars] = None,
- on_scan_ports: Optional[Callable[[List[OpenPort]], Any]] = None,
- on_stdout: Optional[Callable[[ProcessMessage], Any]] = None,
- on_stderr: Optional[Callable[[ProcessMessage], Any]] = None,
- timeout: Optional[float] = TIMEOUT,
- _debug_hostname: Optional[str] = None,
- _debug_port: Optional[int] = None,
- _debug_dev_env: Optional[Literal["remote", "local"]] = None,
- ):
- instance_id, client_id = sandbox_id.split("-")
- return cls(
- id="unknown",
- api_key=api_key,
- cwd=cwd,
- env_vars=env_vars,
- on_scan_ports=on_scan_ports,
- on_stdout=on_stdout,
- on_stderr=on_stderr,
- timeout=timeout,
- _sandbox=models.Instance(
- instance_id=instance_id,
- client_id=client_id,
- env_id=getattr(cls, "sandbox_template_id", "unknown"),
- ),
- _debug_hostname=_debug_hostname,
- _debug_port=_debug_port,
- _debug_dev_env=_debug_dev_env,
- )
-
def close(self) -> None:
"""
Close the sandbox.
diff --git a/packages/python-sdk/e2b/sandbox/sandbox_connection.py b/packages/python-sdk/e2b/sandbox/sandbox_connection.py
index b68e92e4a..9e0cfd7df 100644
--- a/packages/python-sdk/e2b/sandbox/sandbox_connection.py
+++ b/packages/python-sdk/e2b/sandbox/sandbox_connection.py
@@ -42,6 +42,7 @@ class Subscription(BaseModel):
class SandboxConnection:
_refresh_retries = 4
+ _on_close_child: Optional[Callable[[], Any]] = None
@property
def id(self) -> str:
@@ -72,7 +73,6 @@ class SandboxConnection:
api_key: Optional[str] = None,
cwd: Optional[str] = None,
env_vars: Optional[EnvVars] = None,
- on_close: Optional[Callable[[], Any]] = None,
timeout: Optional[float] = TIMEOUT,
_sandbox: Optional[models.Instance] = None,
_debug_hostname: Optional[str] = None,
@@ -93,7 +93,6 @@ class SandboxConnection:
self._debug_hostname = _debug_hostname
self._debug_port = _debug_port
self._debug_dev_env = _debug_dev_env
- self._on_close_child = on_close
self._sandbox = _sandbox
self._is_open = False
@@ -112,6 +111,24 @@ class SandboxConnection:
warnings.warn("Sandbox.create() is deprecated, use Sandbox() instead")
return cls(*args, **kwargs)
+ @classmethod
+ def reconnect(
+ cls,
+ sandbox_id: str,
+ *args,
+ **kwargs,
+ ):
+ instance_id, client_id = sandbox_id.split("-")
+ return cls(
+ *args,
+ _sandbox=models.Instance(
+ instance_id=instance_id,
+ client_id=client_id,
+ env_id=getattr(cls, "sandbox_template_id", "unknown"),
+ ),
+ **kwargs,
+ )
+
def get_hostname(self, port: Optional[int] = None):
"""
Get the hostname for the sandbox or for the specified sandbox's port.
diff --git a/packages/python-sdk/e2b/templates/data_analysis.py b/packages/python-sdk/e2b/templates/data_analysis.py
index b513ff9a6..6b9c43f1a 100644
--- a/packages/python-sdk/e2b/templates/data_analysis.py
+++ b/packages/python-sdk/e2b/templates/data_analysis.py
@@ -1,11 +1,11 @@
import logging
import time
-from typing import Optional, Callable, Any, Tuple, List, Union
+from typing import Optional, Callable, Any, Tuple, List, Union, Literal
from e2b.sandbox.process import ProcessMessage
from pydantic import BaseModel, PrivateAttr
-from e2b import EnvVars, Sandbox
+from e2b import EnvVars, Sandbox, OpenPort
from e2b.constants import TIMEOUT
logger = logging.getLogger(__name__)
@@ -39,6 +39,7 @@ class DataAnalysis(Sandbox):
on_stderr: Optional[Callable[[ProcessMessage], Any]] = None,
on_artifact: Optional[Callable[[Artifact], Any]] = None,
on_exit: Optional[Callable[[int], Any]] = None,
+ **kwargs,
):
self.on_artifact = on_artifact
super().__init__(
@@ -50,6 +51,7 @@ class DataAnalysis(Sandbox):
on_stdout=on_stdout,
on_stderr=on_stderr,
on_exit=on_exit,
+ **kwargs,
)
def run_python(
diff --git a/packages/python-sdk/example.py b/packages/python-sdk/example.py
index d92a6522a..84b699021 100644
--- a/packages/python-sdk/example.py
+++ b/packages/python-sdk/example.py
@@ -4,7 +4,7 @@ from time import sleep
from dotenv import load_dotenv
-from e2b import Sandbox
+from e2b import DataAnalysis, Sandbox
load_dotenv()
id = "Python3"