Skip to content

armgit / E2B

Public Imported from GitHub
0

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

fix(python-sdk): use thread-local API transports (#1399)

Matt Brockman6c04e31f685c
diff --git a/.changeset/python-sync-thread-local-transports.md b/.changeset/python-sync-thread-local-transports.md
new file mode 100644
index 000000000..1c816da78
--- /dev/null
+++ b/.changeset/python-sync-thread-local-transports.md
@@ -0,0 +1,5 @@
+---
+"@e2b/python-sdk": patch
+---
+
+Use thread-local sync HTTP transports to avoid sharing HTTP/2 connection state across Python threads.
diff --git a/packages/python-sdk/e2b/api/client_sync/__init__.py b/packages/python-sdk/e2b/api/client_sync/__init__.py
index 0e444df63..e44c43707 100644
--- a/packages/python-sdk/e2b/api/client_sync/__init__.py
+++ b/packages/python-sdk/e2b/api/client_sync/__init__.py
@@ -19,7 +19,7 @@ def get_api_client(config: ConnectionConfig, **kwargs) -> ApiClient:
class TransportWithLogger(httpx.HTTPTransport):
- _instances: Dict[bool, "TransportWithLogger"] = {}
+ _thread_local = threading.local()
def handle_request(self, request):
url = f"{request.url.scheme}://{request.url.host}{request.url.path}"
@@ -37,7 +37,10 @@ class TransportWithLogger(httpx.HTTPTransport):
def get_transport(config: ConnectionConfig, http2: bool = True) -> TransportWithLogger:
- cached = TransportWithLogger._instances.get(http2)
+ instances: Dict[bool, TransportWithLogger] = getattr(
+ TransportWithLogger._thread_local, "instances", {}
+ )
+ cached = instances.get(http2)
if cached is not None:
return cached
@@ -46,7 +49,8 @@ def get_transport(config: ConnectionConfig, http2: bool = True) -> TransportWith
proxy=config.proxy,
http2=http2,
)
- TransportWithLogger._instances[http2] = transport
+ instances[http2] = transport
+ TransportWithLogger._thread_local.instances = instances
return transport
diff --git a/packages/python-sdk/tests/test_api_client_transport.py b/packages/python-sdk/tests/test_api_client_transport.py
index 4a6b0dc48..9b96491f5 100644
--- a/packages/python-sdk/tests/test_api_client_transport.py
+++ b/packages/python-sdk/tests/test_api_client_transport.py
@@ -14,8 +14,21 @@ from e2b.api.client_sync import get_transport as get_sync_transport
from e2b.connection_config import ConnectionConfig
+def reset_sync_api_transports():
+ TransportWithLogger._thread_local.instances = {}
+
+
+def reset_sync_envd_transports():
+ EnvdTransportWithLogger._thread_local.instances = {}
+
+
+def run_in_worker_thread(fn):
+ with ThreadPoolExecutor(max_workers=1) as executor:
+ return executor.submit(fn).result()
+
+
def test_sync_api_client_proxy_uses_explicit_transport(test_api_key):
- TransportWithLogger._instances.clear()
+ reset_sync_api_transports()
config = ConnectionConfig(
api_key=test_api_key,
proxy="http://127.0.0.1:9999",
@@ -26,15 +39,15 @@ def test_sync_api_client_proxy_uses_explicit_transport(test_api_key):
try:
assert "proxy" not in api_client._httpx_args
- assert httpx_client._transport is TransportWithLogger._instances[True]
+ assert httpx_client._transport is get_sync_transport(config)
assert httpx_client._mounts == {}
finally:
httpx_client.close()
- TransportWithLogger._instances.clear()
+ reset_sync_api_transports()
def test_sync_get_transport_http2_opt_out_returns_distinct_instance(test_api_key):
- TransportWithLogger._instances.clear()
+ reset_sync_api_transports()
config = ConnectionConfig(api_key=test_api_key)
try:
@@ -49,12 +62,12 @@ def test_sync_get_transport_http2_opt_out_returns_distinct_instance(test_api_key
assert get_sync_transport(config) is http2_transport
assert get_sync_transport(config, http2=False) is http1_transport
finally:
- TransportWithLogger._instances.clear()
+ reset_sync_api_transports()
def test_sync_envd_transport_uses_separate_cache(test_api_key):
- TransportWithLogger._instances.clear()
- EnvdTransportWithLogger._thread_local.instances = {}
+ reset_sync_api_transports()
+ reset_sync_envd_transports()
config = ConnectionConfig(api_key=test_api_key)
try:
@@ -66,28 +79,43 @@ def test_sync_envd_transport_uses_separate_cache(test_api_key):
assert get_sync_envd_transport(config) is envd_transport
assert envd_transport._pool._http2 is True
finally:
- TransportWithLogger._instances.clear()
- EnvdTransportWithLogger._thread_local.instances = {}
+ reset_sync_api_transports()
+ reset_sync_envd_transports()
-def test_sync_envd_transport_cache_is_thread_local(test_api_key):
- EnvdTransportWithLogger._thread_local.instances = {}
+def test_sync_api_transport_cache_reuses_within_thread_and_isolates_across_threads(
+ test_api_key,
+):
+ reset_sync_api_transports()
config = ConnectionConfig(api_key=test_api_key)
- def get_thread_transport():
- return get_sync_envd_transport(config)
+ try:
+ main_transport = get_sync_transport(config)
+ same_thread_transport = get_sync_transport(config)
+ worker_thread_transport = run_in_worker_thread(
+ lambda: get_sync_transport(config)
+ )
+
+ assert same_thread_transport is main_transport
+ assert worker_thread_transport is not main_transport
+ finally:
+ reset_sync_api_transports()
+
+
+def test_sync_envd_transport_cache_is_thread_local(test_api_key):
+ reset_sync_envd_transports()
+ config = ConnectionConfig(api_key=test_api_key)
try:
main_transport = get_sync_envd_transport(config)
- with ThreadPoolExecutor(max_workers=1) as executor:
- thread_transport = executor.submit(get_thread_transport).result()
+ thread_transport = run_in_worker_thread(lambda: get_sync_envd_transport(config))
assert main_transport is get_sync_envd_transport(config)
assert thread_transport is not main_transport
assert main_transport._pool._http2 is True
assert thread_transport._pool._http2 is True
finally:
- EnvdTransportWithLogger._thread_local.instances = {}
+ reset_sync_envd_transports()
@pytest.mark.asyncio