Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Fix pool and rpc compression
Tomas Valenta7313998be593
diff --git a/packages/python-sdk/connect/client.py b/packages/python-sdk/connect/client.pyindex 803f64229..4e00a09b0 100644--- a/packages/python-sdk/connect/client.py+++ b/packages/python-sdk/connect/client.py@@ -1,7 +1,6 @@import gzipimport jsonimport struct-import urllib3from enum import Flag, IntEnum@@ -33,7 +32,7 @@ class Code(IntEnum):class Error(Exception):- def __init__(self, code: Code, message: str):+ def __init__(self, code, message):self.code = codeself.message = message@@ -41,16 +40,6 @@ class Error(Exception):envelope_header_length = 5envelope_header_pack = ">BI"-_default_connection_pool = None---def default_connection_pool():- global _default_connection_pool- if _default_connection_pool is None:- _default_connection_pool = urllib3.PoolManager()-- return _default_connection_pool-def encode_envelope(*, flags: EnvelopeFlags, data):return encode_envelope_header(flags=flags.value, data=data) + data@@ -65,9 +54,14 @@ def decode_envelope_header(header):return EnvelopeFlags(flags), data_len-def error_for_response(http_resp):+def error_for_response(http_resp, compressor):try:- error = json.loads(http_resp.content)+ data = (+ http_resp.content+ if compressor is None+ else compressor.decompress(http_resp.content)+ )+ error = json.loads(data)except (json.decoder.JSONDecodeError, KeyError):return Error(Code(http_resp.status), http_resp.reason)else:@@ -118,18 +112,8 @@ class ProtobufCodec:class Client:def __init__(- self,- *,- pool,- url,- response_type,- compressor=None,- json=False,- headers=None,+ self, *, pool, url, response_type, compressor=None, json=False, headers=None):- if pool is None:- pool = default_connection_pool()-if headers is None:headers = {}@@ -161,11 +145,16 @@ class Client:},)+ content = http_resp.content++ if self._compressor is not None:+ content = self._compressor.decompress(content)+if http_resp.status != 200:- raise error_for_response(http_resp)+ raise error_for_response(http_resp, self._compressor)return self._codec.decode(- http_resp.data,+ content,msg_type=self._response_type,)@@ -177,7 +166,7 @@ class Client:data = self._compressor.compress(data)flags |= EnvelopeFlags.compressed- with self.pool.request(+ with self.pool.stream("POST",self.url,content=encode_envelope(@@ -195,46 +184,46 @@ class Client:},) as http_resp:if http_resp.status != 200:- raise error_for_response(http_resp)+ raise error_for_response(http_resp, self._compressor)buffer = b""end_stream = Falseneeds_header = Trueflags, data_len = 0, 0- try:- for chunk in http_resp.stream():- buffer += chunk-- if needs_header:- header = buffer[:envelope_header_length]- buffer = buffer[envelope_header_length:]- flags, data_len = decode_envelope_header(header)- needs_header = False- end_stream = EnvelopeFlags.end_stream in flags-- if len(buffer) >= data_len:- buffer = buffer[:data_len]-- if end_stream:- data = json.loads(buffer)- if "error" in data:- raise make_error(data["error"])-- # TODO: Figure out what else might be possible- return-- # TODO: handle server message compression- # if EnvelopeFlags.compression in flags:- # TODO: should the client potentially use a different codec- # based on response header? Or can we assume they're always- # the same and an error otherwise.- yield self._codec.decode(buffer, msg_type=self._response_type)-- buffer = buffer[data_len:]- needs_header = True- finally:- http_resp.close()+ for chunk in http_resp.iter_stream():+ buffer += chunk++ if needs_header:+ header = buffer[:envelope_header_length]+ buffer = buffer[envelope_header_length:]+ flags, data_len = decode_envelope_header(header)+ needs_header = False+ end_stream = EnvelopeFlags.end_stream in flags++ if len(buffer) >= data_len:+ buffer = buffer[:data_len]++ if end_stream:+ data = json.loads(buffer)+ if "error" in data:+ raise make_error(data["error"])++ # TODO: Figure out what else might be possible+ return++ if self._compressor is not None:+ buffer = self._compressor.decompress(buffer)++ # TODO: handle server message compression+ # if EnvelopeFlags.compression in flags:+ # TODO: should the client potentially use a different codec+ # based on response header? Or can we assume they're always+ # the same and an error otherwise.+ yield self._codec.decode(buffer, msg_type=self._response_type)++ buffer = buffer[data_len:]+ needs_header = Truedef call_client_stream(self, req, **opts):raise NotImplementedError("client stream not supported")diff --git a/packages/python-sdk/e2b/sandbox/filesystem/filesystem.py b/packages/python-sdk/e2b/sandbox/filesystem/filesystem.pyindex e37b1a802..3d9888469 100644--- a/packages/python-sdk/e2b/sandbox/filesystem/filesystem.py+++ b/packages/python-sdk/e2b/sandbox/filesystem/filesystem.py@@ -1,6 +1,7 @@import connectimport requestsimport urllib.parse+import httpcorefrom io import IOBasefrom typing import (@@ -23,13 +24,19 @@ READ_STREAM_CHUNK_SIZE = 2 << 16 # 64KiBclass Filesystem:- def __init__(self, envd_api_url: str, connection_config: ConnectionConfig) -> None:+ def __init__(+ self,+ envd_api_url: str,+ connection_config: ConnectionConfig,+ pool: httpcore.ConnectionPool,+ ) -> None:self._envd_api_url = envd_api_urlself._connection_config = connection_configself._rpc = filesystem_connect.FilesystemClient(envd_api_url,compressor=connect.GzipCompressor,+ pool=pool,)@overload@@ -104,8 +111,10 @@ class Filesystem:request_timeout: Optional[float] = None,) -> List[filesystem_pb2.EntryInfo]:res = self._rpc.list_dir(- filesystem_pb2.ListDirRequest(path=path),- user=User(username=user),+ filesystem_pb2.ListDirRequest(+ path=path,+ user=User(username=user),+ ),timeout=self._connection_config.get_request_timeout(request_timeout),)@@ -119,8 +128,10 @@ class Filesystem:) -> bool:try:self._rpc.stat(- filesystem_pb2.StatRequest(path=path),- user=User(username=user),+ filesystem_pb2.StatRequest(+ path=path,+ user=User(username=user),+ ),timeout=self._connection_config.get_request_timeout(request_timeout),)return True@@ -182,8 +193,10 @@ class Filesystem:timeout: Optional[float] = None,):events = self._rpc.watch_dir(- filesystem_pb2.WatchDirRequest(path=path),- user=User(username=user),+ filesystem_pb2.WatchDirRequest(+ path=path,+ user=User(username=user),+ ),timeout=(self._connection_config.get_request_timeout(request_timeout),timeout,diff --git a/packages/python-sdk/e2b/sandbox/filesystem/watch_handle.py b/packages/python-sdk/e2b/sandbox/filesystem/watch_handle.pyindex f60e18cb8..639c24caa 100644--- a/packages/python-sdk/e2b/sandbox/filesystem/watch_handle.py+++ b/packages/python-sdk/e2b/sandbox/filesystem/watch_handle.py@@ -19,6 +19,7 @@ class WatchHandle(Generator):def _handle_events(self):try:for event in self._events:- yield event.filesystem+ if event.HasField("filesystem"):+ yield event.filesystemfinally:self.close()diff --git a/packages/python-sdk/e2b/sandbox/main.py b/packages/python-sdk/e2b/sandbox/main.pyindex c38d69210..b61237b62 100644--- a/packages/python-sdk/e2b/sandbox/main.py+++ b/packages/python-sdk/e2b/sandbox/main.py@@ -1,4 +1,5 @@import urllib.parse+import httpcorefrom typing import Optional, Dict@@ -35,7 +36,7 @@ class Sandbox(SandboxApi):if sandbox_id and (metadata or timeout is not None):raise SandboxException(- "Cannot set metadata or timeout when connection to an existing sandbox. "+ "Cannot set metadata or timeout when connecting to an existing sandbox. ""Use Sandbox.connect method instead.",)@@ -65,8 +66,10 @@ class Sandbox(SandboxApi):f"{'http' if debug else 'https'}://{self.get_host(self._envd_port)}")- self._filesystem = Filesystem(self._envd_api_url, self._connection_config)- self._process = Process(self._envd_api_url, self._connection_config)+ pool = httpcore.ConnectionPool(max_connections=25)++ self._filesystem = Filesystem(self._envd_api_url, self._connection_config, pool)+ self._process = Process(self._envd_api_url, self._connection_config, pool)def get_host(self, port: int) -> str:if self._connection_config.debug:diff --git a/packages/python-sdk/e2b/sandbox/process/main.py b/packages/python-sdk/e2b/sandbox/process/main.pyindex 7fd2f84e7..ebe89b709 100644--- a/packages/python-sdk/e2b/sandbox/process/main.py+++ b/packages/python-sdk/e2b/sandbox/process/main.py@@ -1,4 +1,5 @@import connect+import httpcorefrom typing import Dict, List, Optional, Literal, overload, Union, Callable@@ -9,11 +10,17 @@ from e2b.connection_config import Username, ConnectionConfigclass Process:- def __init__(self, envd_api_url: str, connection_config: ConnectionConfig) -> None:+ def __init__(+ self,+ envd_api_url: str,+ connection_config: ConnectionConfig,+ pool: httpcore.ConnectionPool,+ ) -> None:self._connection_config = connection_configself._rpc = process_connect.ProcessClient(envd_api_url,compressor=connect.GzipCompressor,+ pool=pool,)def list(diff --git a/packages/python-sdk/e2b/sandbox/process/process_handle.py b/packages/python-sdk/e2b/sandbox/process/process_handle.pyindex 2ae7118e6..7b9673dba 100644--- a/packages/python-sdk/e2b/sandbox/process/process_handle.py+++ b/packages/python-sdk/e2b/sandbox/process/process_handle.py@@ -26,7 +26,7 @@ class ProcessExitException(Exception):return self._result.exit_code-class ProcessHandle(Generator):+class ProcessHandle:@propertydef pid(self):return self._pid@@ -68,7 +68,7 @@ class ProcessHandle(Generator):]:try:for event in self._events:- if event.HasField("data"):+ if event.event.HasField("data"):if event.event.data.stdout:out = event.event.data.stdout.decode()self._stdout += out@@ -77,7 +77,7 @@ class ProcessHandle(Generator):out = event.event.data.stderr.decode()self._stderr += outyield None, out- if event.HasField("end"):+ if event.event.HasField("end"):self._result = ProcessResult(stdout=self._stdout,stderr=self._stderr,@@ -115,5 +115,5 @@ class ProcessHandle(Generator):return self._resultdef kill(self):- self.close()+ self.disconnect()self._handle_kill()diff --git a/packages/python-sdk/example.py b/packages/python-sdk/example.pyindex 9921f6501..4dbf5f9bc 100644--- a/packages/python-sdk/example.py+++ b/packages/python-sdk/example.py@@ -1,4 +1,5 @@import io+import asynciofrom e2b import Sandbox@@ -6,6 +7,9 @@ sbx = Sandbox(debug=True)print(sbx.sandbox_id)+f = sbx.files.list("/")+print(f)+# const res = await sbx.commands.run('while true; do echo -n "Hello World"; sleep 1; done', {# // requestTimeoutMs: 1,# onStdout: (data) => {diff --git a/packages/python-sdk/poetry.lock b/packages/python-sdk/poetry.lockindex d69204a8e..62327b551 100644--- a/packages/python-sdk/poetry.lock+++ b/packages/python-sdk/poetry.lock@@ -235,6 +235,38 @@ files = [[package.extras]testing = ["hatch", "pre-commit", "pytest", "tox"]+[[package]]+name = "h11"+version = "0.14.0"+description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"+optional = false+python-versions = ">=3.7"+files = [+ {file = "h11-0.14.0-py3-none-any.whl", hash = "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761"},+ {file = "h11-0.14.0.tar.gz", hash = "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d"},+]++[[package]]+name = "httpcore"+version = "1.0.5"+description = "A minimal low-level HTTP client."+optional = false+python-versions = ">=3.8"+files = [+ {file = "httpcore-1.0.5-py3-none-any.whl", hash = "sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5"},+ {file = "httpcore-1.0.5.tar.gz", hash = "sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61"},+]++[package.dependencies]+certifi = "*"+h11 = ">=0.13,<0.15"++[package.extras]+asyncio = ["anyio (>=4.0,<5.0)"]+http2 = ["h2 (>=3,<5)"]+socks = ["socksio (==1.*)"]+trio = ["trio (>=0.22.0,<0.26.0)"]+[[package]]name = "idna"version = "3.7"@@ -610,4 +642,4 @@ zstd = ["zstandard (>=0.18.0)"][metadata]lock-version = "2.0"python-versions = "^3.8"-content-hash = "c1bf27d4b69ccaf54aae2bb09c972c70c175cc2570d4cfbae534d67a33a48ee2"+content-hash = "99f593fce946c991cdbc37f202dd18c672f260d40f0a02870b9699fb3690269e"diff --git a/packages/python-sdk/pyproject.toml b/packages/python-sdk/pyproject.tomlindex 0d516fabe..27bf373ba 100644--- a/packages/python-sdk/pyproject.toml+++ b/packages/python-sdk/pyproject.toml@@ -19,6 +19,7 @@ aenum = ">=3.1.11"typing-extensions = ">=4.8.0"protobuf = "^5.26.1"requests = "^2.32.3"+httpcore = "^1.0.5"[tool.poetry.group.dev.dependencies]black = "^23.7.0"