Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Add start and wait

Jakub Novak149217ca28b7
diff --git a/.changeset/eleven-walls-poke.md b/.changeset/eleven-walls-poke.md
new file mode 100644
index 000000000..891aa4322
--- /dev/null
+++ b/.changeset/eleven-walls-poke.md
@@ -0,0 +1,5 @@
+---
+"@e2b/sdk": patch
+---
+
+Add process startAndWait
diff --git a/.changeset/mighty-pears-burn.md b/.changeset/mighty-pears-burn.md
new file mode 100644
index 000000000..8d97ffce8
--- /dev/null
+++ b/.changeset/mighty-pears-burn.md
@@ -0,0 +1,5 @@
+---
+"@e2b/sdk": minor
+---
+
+Add possibility to pass only string
diff --git a/.changeset/perfect-dolls-camp.md b/.changeset/perfect-dolls-camp.md
new file mode 100644
index 000000000..c3cbf6d5a
--- /dev/null
+++ b/.changeset/perfect-dolls-camp.md
@@ -0,0 +1,5 @@
+---
+"@e2b/python-sdk": patch
+---
+
+Add start and wait to python
diff --git a/.changeset/spotty-jars-report.md b/.changeset/spotty-jars-report.md
new file mode 100644
index 000000000..bcce3522a
--- /dev/null
+++ b/.changeset/spotty-jars-report.md
@@ -0,0 +1,5 @@
+---
+"@e2b/sdk": patch
+---
+
+Allow passing commnad directly to process start
diff --git a/packages/js-sdk/src/sandbox/index.ts b/packages/js-sdk/src/sandbox/index.ts
index 7ef1bf7b3..894822321 100644
--- a/packages/js-sdk/src/sandbox/index.ts
+++ b/packages/js-sdk/src/sandbox/index.ts
@@ -264,7 +264,13 @@ export class Sandbox extends SandboxConnection {
// Init Process handler
this.process = {
- start: async (opts: ProcessOpts) => {
+ /**
+ * Starts a new process.
+ * @param optsOrID Process options or Process ID
+ * @returns New process
+ */
+ start: async (optsOrID: string | ProcessOpts) => {
+ const opts = typeof optsOrID === 'string' ? { cmd: optsOrID } : optsOrID
const start = async ({
cmd,
onStdout,
@@ -395,8 +401,14 @@ export class Sandbox extends SandboxConnection {
const timeout = opts.timeout
return await withTimeout(start, timeout)(opts)
},
+
+ startAndWait: async (optsOrID: string | ProcessOpts) => {
+ const process = await this.process.start(optsOrID)
+ return await process.wait()
+ }
}
+
const _resolvePath = (path: string): string =>
resolvePath(path, this.cwd, this.logger)
}
@@ -413,7 +425,18 @@ export class Sandbox extends SandboxConnection {
return `${protocol}://${hostname}${FILE_ROUTE}`
}
- static async create(opts?: SandboxOpts) {
+ /**
+ * Creates a new Sandbox.
+ * @param optsOrID Sandbox options or Sandbox ID
+ * @returns New Sandbox
+ *
+ * @example
+ * ```ts
+ * const sandbox = await Sandbox.create()
+ * ```
+ */
+ 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) => {
diff --git a/packages/js-sdk/src/sandbox/process.ts b/packages/js-sdk/src/sandbox/process.ts
index 4bbb0bc96..d78d8765e 100644
--- a/packages/js-sdk/src/sandbox/process.ts
+++ b/packages/js-sdk/src/sandbox/process.ts
@@ -164,5 +164,6 @@ export interface ProcessOpts {
}
export interface ProcessManager {
- readonly start: (opts: ProcessOpts) => Promise<Process>;
+ readonly start: (optsOrID: string | ProcessOpts) => Promise<Process>;
+ readonly startAndWait: (optsOrID: string | ProcessOpts) => Promise<ProcessOutput>;
}
diff --git a/packages/python-sdk/e2b/sandbox/process.py b/packages/python-sdk/e2b/sandbox/process.py
index 216ddedfd..0491408d2 100644
--- a/packages/python-sdk/e2b/sandbox/process.py
+++ b/packages/python-sdk/e2b/sandbox/process.py
@@ -371,3 +371,25 @@ class ProcessManager:
logger.error(f"Timeout error during starting the process: {cmd}")
trigger_exit()
raise e
+
+ def start_and_wait(
+ self,
+ cmd: str,
+ on_stdout: Optional[Callable[[ProcessMessage], Any]] = None,
+ on_stderr: Optional[Callable[[ProcessMessage], Any]] = None,
+ on_exit: Optional[Callable[[int], Any]] = None,
+ env_vars: Optional[EnvVars] = None,
+ cwd: str = "",
+ process_id: Optional[str] = None,
+ timeout: Optional[float] = TIMEOUT,
+ ) -> ProcessOutput:
+ return self.start(
+ cmd,
+ on_stdout=on_stdout,
+ on_stderr=on_stderr,
+ on_exit=on_exit,
+ env_vars=env_vars,
+ cwd=cwd,
+ process_id=process_id,
+ timeout=timeout,
+ ).wait()