Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Use iterables

Tomas Valenta5de9e6544570
diff --git a/packages/js-sdk/src/sandbox/process/processHandle.ts b/packages/js-sdk/src/sandbox/process/processHandle.ts
index 5842df7ed..5152e85a9 100644
--- a/packages/js-sdk/src/sandbox/process/processHandle.ts
+++ b/packages/js-sdk/src/sandbox/process/processHandle.ts
@@ -86,6 +86,10 @@ export class ProcessHandle implements Omit<ProcessResult, 'exitCode' | 'error'>,
return this.handleEvents()
}
+ disconnect() {
+ this.handleDisconnect()
+ }
+
async kill() {
this.handleDisconnect()
await this.handleKill()
diff --git a/packages/python-sdk/e2b/sandbox/filesystem/watch_handle.py b/packages/python-sdk/e2b/sandbox/filesystem/watch_handle.py
index 42bfb72af..e0d78ec56 100644
--- a/packages/python-sdk/e2b/sandbox/filesystem/watch_handle.py
+++ b/packages/python-sdk/e2b/sandbox/filesystem/watch_handle.py
@@ -10,9 +10,15 @@ class WatchHandle(Generator):
):
self._events = events
- def __next__(self):
- event = next(self._events)
- return event.event
-
def __iter__(self):
- return self
+ return self._handle_events()
+
+ def close(self):
+ self._events.close()
+
+ def _handle_events(self):
+ try:
+ for event in self._events:
+ yield event.event
+ finally:
+ self.close()
diff --git a/packages/python-sdk/e2b/sandbox/process/process_handle.py b/packages/python-sdk/e2b/sandbox/process/process_handle.py
index 7a6d9ad88..620434c98 100644
--- a/packages/python-sdk/e2b/sandbox/process/process_handle.py
+++ b/packages/python-sdk/e2b/sandbox/process/process_handle.py
@@ -56,30 +56,41 @@ class ProcessHandle(Generator):
self._result: Optional[ProcessResult] = None
- def __next__(self) -> Union[Tuple[Stdout, None], Tuple[None, Stderr]]:
- event = next(self._events)
-
- if event.HasField(field_name="data"):
- if event.event.data.stdout:
- out = event.event.data.stdout.decode()
- self._stdout += out
- return out, None
- if event.event.data.stderr:
- out = event.event.data.stderr.decode()
- self._stderr += out
- return None, out
- if event.HasField("end"):
- self._result = ProcessResult(
- stdout=self._stdout,
- stderr=self._stderr,
- exit_code=event.event.end.exit_code,
- error=event.event.end.error,
- )
-
- raise StopIteration
-
def __iter__(self):
- return self
+ return self._handle_events()
+
+ def _handle_events(
+ self,
+ ) -> Generator[
+ Union[Tuple[Stdout, None], Tuple[None, Stderr]],
+ None,
+ ProcessResult,
+ ]:
+ try:
+ for event in self._events:
+ if event.HasField("data"):
+ if event.event.data.stdout:
+ out = event.event.data.stdout.decode()
+ self._stdout += out
+ yield out, None
+ if event.event.data.stderr:
+ out = event.event.data.stderr.decode()
+ self._stderr += out
+ yield None, out
+ if event.HasField("end"):
+ self._result = ProcessResult(
+ stdout=self._stdout,
+ stderr=self._stderr,
+ exit_code=event.event.end.exit_code,
+ error=event.event.end.error,
+ )
+ finally:
+ self.close()
+
+ if self._result is None:
+ raise RuntimeError("Process ended without an end event")
+
+ return self._result
def close(self) -> None:
self._events.close()