Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Use start_and_wait internally; Cleanup unused code

Tomas Valenta7452faa83f12
diff --git a/packages/python-sdk/e2b/sandbox/main.py b/packages/python-sdk/e2b/sandbox/main.py
index 801687deb..5b2eafd78 100644
--- a/packages/python-sdk/e2b/sandbox/main.py
+++ b/packages/python-sdk/e2b/sandbox/main.py
@@ -114,7 +114,6 @@ class Sandbox(SandboxConnection):
sandbox=self,
on_scan_ports=on_scan_ports,
)
- self._start_cmd: Union[Process, None] = None
self._terminal = TerminalManager(sandbox=self)
self._filesystem = FilesystemManager(sandbox=self)
self._process = ProcessManager(
@@ -221,7 +220,7 @@ class Sandbox(SandboxConnection):
return OpenAI[Self](Actions[Self](self))
def _handle_start_cmd_logs(self):
- self._start_cmd = self.process.start(
+ self.process.start(
"sudo journalctl --follow --lines=all -o cat _SYSTEMD_UNIT=start_cmd.service",
cwd="/",
env_vars={},
diff --git a/packages/python-sdk/e2b/sandbox/run_code.py b/packages/python-sdk/e2b/sandbox/run_code.py
index 993255abb..3b5905dd9 100644
--- a/packages/python-sdk/e2b/sandbox/run_code.py
+++ b/packages/python-sdk/e2b/sandbox/run_code.py
@@ -58,9 +58,8 @@ def run_code(
sandbox = Sandbox(template=env_id, api_key=api_key)
sandbox.filesystem.write(filepath, code)
- proc = sandbox.process.start(cmd=f"{binary} {filepath}")
- proc.wait()
+ output = sandbox.process.start_and_wait(cmd=f"{binary} {filepath}")
sandbox.close()
- return proc.output.stdout, proc.output.stderr
+ return output.stdout, output.stderr
diff --git a/packages/python-sdk/e2b/templates/data_analysis.py b/packages/python-sdk/e2b/templates/data_analysis.py
index 59ea57520..462add7dd 100644
--- a/packages/python-sdk/e2b/templates/data_analysis.py
+++ b/packages/python-sdk/e2b/templates/data_analysis.py
@@ -87,7 +87,7 @@ class DataAnalysis(Sandbox):
codefile_path = f"/tmp/main-{epoch_time}.py"
self.filesystem.write(codefile_path, code)
- process = self.process.start(
+ output = self.process.start_and_wait(
f"python {codefile_path}",
on_stdout=on_stdout,
on_stderr=on_stderr,
@@ -97,11 +97,10 @@ class DataAnalysis(Sandbox):
process_id=process_id,
timeout=timeout,
)
- process.wait()
watcher.stop()
- return process.output.stdout, process.output.stderr, list(artifacts)
+ return output.stdout, output.stderr, list(artifacts)
def _install_packages(
self,
@@ -116,12 +115,13 @@ class DataAnalysis(Sandbox):
if not package_names:
return
- process = self.process.start(f"{command} {package_names}", timeout=timeout)
- process.wait()
+ output = self.process.start_and_wait(
+ f"{command} {package_names}", timeout=timeout
+ )
- if process.exit_code != 0:
+ if output.exit_code != 0:
raise Exception(
- f"Failed to install package {package_names}: {process.output.stderr}"
+ f"Failed to install package {package_names}: {output.stderr}"
)
def install_python_packages(