Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Fix cwd setup order; Hardcode start cmd logs env and cwd

Tomas Valenta8a59e4fa073f
diff --git a/packages/js-sdk/src/sandbox/index.ts b/packages/js-sdk/src/sandbox/index.ts
index d5bfb9142..5b8b246d3 100644
--- a/packages/js-sdk/src/sandbox/index.ts
+++ b/packages/js-sdk/src/sandbox/index.ts
@@ -494,15 +494,10 @@ export class Sandbox extends SandboxConnection {
static async create(opts: SandboxOpts): Promise<Sandbox>;
static async create(optsOrID?: string | SandboxOpts) {
const opts = typeof optsOrID === 'string' ? { id: optsOrID } : optsOrID
- return new Sandbox(opts)
- ._open({ timeout: opts?.timeout })
- .then(async (sandbox) => {
- if (opts?.cwd) {
- console.log(`Custom cwd for Sandbox set: "${opts.cwd}"`)
- await sandbox.filesystem.makeDir(opts.cwd)
- }
- return sandbox
- })
+ const sandbox = new Sandbox(opts)
+ await sandbox._open({ timeout: opts?.timeout })
+
+ return sandbox
}
/**
@@ -544,15 +539,11 @@ export class Sandbox extends SandboxConnection {
const instanceID = instanceIDAndClientID[0]
const clientID = instanceIDAndClientID[1]
opts.__sandbox = { instanceID, clientID, envID: 'unknown' }
- return new Sandbox(opts)
- ._open({ timeout: opts?.timeout })
- .then(async (sandbox) => {
- if (opts?.cwd) {
- console.log(`Custom cwd for Sandbox set: "${opts.cwd}"`)
- await sandbox.filesystem.makeDir(opts.cwd)
- }
- return sandbox
- })
+
+ const sandbox = new Sandbox(opts)
+ await sandbox._open({ timeout: opts?.timeout })
+
+ return sandbox
}
/**
@@ -716,6 +707,11 @@ export class Sandbox extends SandboxConnection {
: undefined,
)
+ if (this.cwd) {
+ console.log(`Custom cwd for Sandbox set: "${this.cwd}"`)
+ await this.filesystem.makeDir(this.cwd)
+ }
+
this.handleStartCmdLogs()
return this
@@ -723,7 +719,9 @@ export class Sandbox extends SandboxConnection {
private async handleStartCmdLogs() {
this._startCmd = this.process.start({
- cmd: 'sudo journalctl --follow --lines=all -o cat _SYSTEMD_UNIT=start_cmd.service'
+ cmd: 'sudo journalctl --follow --lines=all -o cat _SYSTEMD_UNIT=start_cmd.service',
+ envVars: {},
+ cwd: '/',
})
}
}
diff --git a/packages/js-sdk/src/templates/dataAnalysis.ts b/packages/js-sdk/src/templates/dataAnalysis.ts
index 6a1da33ec..df36ed6ef 100644
--- a/packages/js-sdk/src/templates/dataAnalysis.ts
+++ b/packages/js-sdk/src/templates/dataAnalysis.ts
@@ -29,15 +29,10 @@ export class DataAnalysis extends Sandbox {
static override async create(): Promise<DataAnalysis>;
static override async create(opts?: Omit<SandboxOpts, 'id'>) {
- return new DataAnalysis({ ...opts })
- ._open({ timeout: opts?.timeout })
- .then(async (sandbox) => {
- if (opts?.cwd) {
- console.log(`Custom cwd for Sandbox set: "${opts.cwd}"`)
- await sandbox.filesystem.makeDir(opts.cwd)
- }
- return sandbox
- })
+ const sandbox = new DataAnalysis({ ...opts })
+ await sandbox._open({ timeout: opts?.timeout })
+
+ return sandbox
}
async runPython(code: string, opts: RunPythonOpts = {}) {
diff --git a/packages/python-sdk/e2b/sandbox/main.py b/packages/python-sdk/e2b/sandbox/main.py
index c3e5a0097..160c959df 100644
--- a/packages/python-sdk/e2b/sandbox/main.py
+++ b/packages/python-sdk/e2b/sandbox/main.py
@@ -200,7 +200,9 @@ class Sandbox(SandboxConnection):
def _handle_start_cmd_logs(self):
self._start_cmd = self.process.start(
- "sudo journalctl --follow --lines=all -o cat _SYSTEMD_UNIT=start_cmd.service"
+ "sudo journalctl --follow --lines=all -o cat _SYSTEMD_UNIT=start_cmd.service",
+ cwd="/",
+ env_vars={},
)
def _open(self, timeout: Optional[float] = TIMEOUT) -> None:
@@ -212,10 +214,10 @@ class Sandbox(SandboxConnection):
logger.info(f"Opening sandbox {self._id}")
super()._open(timeout=timeout)
self._code_snippet._subscribe()
- self._handle_start_cmd_logs()
logger.info(f"Sandbox {self._id} opened")
if self.cwd:
self.filesystem.make_dir(self.cwd)
+ self._handle_start_cmd_logs()
def _close_services(self):
self._terminal._close()