Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Cleanup python pty types

Tomas Valentae5b81e274c47
diff --git a/packages/python-sdk/e2b/sandbox/process/process_handle.py b/packages/python-sdk/e2b/sandbox/process/process_handle.py
index 35b069f51..16d59ad02 100644
--- a/packages/python-sdk/e2b/sandbox/process/process_handle.py
+++ b/packages/python-sdk/e2b/sandbox/process/process_handle.py
@@ -5,7 +5,7 @@ from e2b.exceptions import SandboxException
Stdout = str
Stderr = str
-PtyOutput = str
+PtyOutput = bytes
@dataclass
diff --git a/packages/python-sdk/e2b/sandbox_async/pty/main.py b/packages/python-sdk/e2b/sandbox_async/pty/main.py
index 55051dfef..a4ef671bc 100644
--- a/packages/python-sdk/e2b/sandbox_async/pty/main.py
+++ b/packages/python-sdk/e2b/sandbox_async/pty/main.py
@@ -1,7 +1,7 @@
import e2b_connect
import httpcore
-from typing import Dict, Optional, Callable
+from typing import Dict, Optional
from e2b.envd.process import process_connect, process_pb2
from e2b.connection_config import (
@@ -11,7 +11,11 @@ from e2b.connection_config import (
from e2b.exceptions import SandboxException
from e2b.envd.rpc import authentication_header, handle_rpc_exception
from e2b.sandbox.process.process_handle import PtySize
-from e2b.sandbox_async.process.process_handle import AsyncProcessHandle
+from e2b.sandbox_async.process.process_handle import (
+ AsyncProcessHandle,
+ OutputHandler,
+ PtyOutput,
+)
class Pty:
@@ -76,9 +80,9 @@ class Pty:
async def create(
self,
size: PtySize,
+ on_data: OutputHandler[PtyOutput],
user: Username = "user",
cwd: Optional[str] = None,
- on_data: Optional[Callable[[bytes], None]] = None,
envs: Optional[Dict[str, str]] = None,
timeout: Optional[float] = 60,
request_timeout: Optional[float] = None,
@@ -122,7 +126,10 @@ class Pty:
raise handle_rpc_exception(e)
async def resize(
- self, pid: int, size: PtySize, request_timeout: Optional[float] = None
+ self,
+ pid: int,
+ size: PtySize,
+ request_timeout: Optional[float] = None,
):
await self._rpc.aupdate(
process_pb2.UpdateRequest(
diff --git a/packages/python-sdk/e2b/sandbox_sync/process/process_handle.py b/packages/python-sdk/e2b/sandbox_sync/process/process_handle.py
index 4e32f7845..dda49b612 100644
--- a/packages/python-sdk/e2b/sandbox_sync/process/process_handle.py
+++ b/packages/python-sdk/e2b/sandbox_sync/process/process_handle.py
@@ -41,7 +41,9 @@ class ProcessHandle:
self,
) -> Generator[
Union[
- Tuple[Stdout, None, None], Tuple[None, Stderr, None], Tuple[None, None, PtyOutput]
+ Tuple[Stdout, None, None],
+ Tuple[None, Stderr, None],
+ Tuple[None, None, PtyOutput],
],
None,
None,
@@ -71,9 +73,9 @@ class ProcessHandle:
def wait(
self,
+ on_pty: Optional[Callable[[PtyOutput], None]] = None,
on_stdout: Optional[Callable[[str], None]] = None,
on_stderr: Optional[Callable[[str], None]] = None,
- on_pty: Optional[Callable[[str], None]] = None,
) -> ProcessResult:
try:
for stdout, stderr, pty in self:
diff --git a/packages/python-sdk/e2b/sandbox_sync/pty/main.py b/packages/python-sdk/e2b/sandbox_sync/pty/main.py
index 9b2302e71..e70d0ad23 100644
--- a/packages/python-sdk/e2b/sandbox_sync/pty/main.py
+++ b/packages/python-sdk/e2b/sandbox_sync/pty/main.py
@@ -120,7 +120,10 @@ class Pty:
raise handle_rpc_exception(e)
def resize(
- self, pid: int, size: PtySize, request_timeout: Optional[float] = None
+ self,
+ pid: int,
+ size: PtySize,
+ request_timeout: Optional[float] = None,
) -> None:
self._rpc.update(
process_pb2.UpdateRequest(