Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
feat(python-sdk): allow opting out of HTTP/2 in `get_transport` (#1347)
Jakub Novák8640378c175a
diff --git a/.changeset/python-sdk-http2-opt-out.md b/.changeset/python-sdk-http2-opt-out.mdnew file mode 100644index 000000000..cff1dfab5--- /dev/null+++ b/.changeset/python-sdk-http2-opt-out.md@@ -0,0 +1,5 @@+---+'@e2b/python-sdk': patch+---++Make `http2` parameter optionaldiff --git a/packages/python-sdk/e2b/api/client_async/__init__.py b/packages/python-sdk/e2b/api/client_async/__init__.pyindex 0f0c59549..3aa70fcd6 100644--- a/packages/python-sdk/e2b/api/client_async/__init__.py+++ b/packages/python-sdk/e2b/api/client_async/__init__.py@@ -1,12 +1,11 @@import asyncio-import httpximport logging+from typing import Dict, Tuple-from typing import Dict+import httpx+from e2b.api import AsyncApiClient, limitsfrom e2b.connection_config import ConnectionConfig-from e2b.api import limits, AsyncApiClient-logger = logging.getLogger(__name__)@@ -20,7 +19,7 @@ def get_api_client(config: ConnectionConfig, **kwargs) -> AsyncApiClient:class AsyncTransportWithLogger(httpx.AsyncHTTPTransport):- _instances: Dict[int, "AsyncTransportWithLogger"] = {}+ _instances: Dict[Tuple[int, bool], "AsyncTransportWithLogger"] = {}async def handle_async_request(self, request):url = f"{request.url.scheme}://{request.url.host}{request.url.path}"@@ -37,8 +36,10 @@ class AsyncTransportWithLogger(httpx.AsyncHTTPTransport):return self._pool-def get_transport(config: ConnectionConfig) -> AsyncTransportWithLogger:- loop_id = id(asyncio.get_running_loop())+def get_transport(+ config: ConnectionConfig, http2: bool = True+) -> AsyncTransportWithLogger:+ loop_id = (id(asyncio.get_running_loop()), http2)if loop_id in AsyncTransportWithLogger._instances:return AsyncTransportWithLogger._instances[loop_id]@@ -46,7 +47,8 @@ def get_transport(config: ConnectionConfig) -> AsyncTransportWithLogger:transport = AsyncTransportWithLogger(limits=limits,proxy=config.proxy,- http2=True,+ http2=http2,)+AsyncTransportWithLogger._instances[loop_id] = transportreturn transportdiff --git a/packages/python-sdk/e2b/api/client_sync/__init__.py b/packages/python-sdk/e2b/api/client_sync/__init__.pyindex a2d77278b..6a41b4f81 100644--- a/packages/python-sdk/e2b/api/client_sync/__init__.py+++ b/packages/python-sdk/e2b/api/client_sync/__init__.py@@ -1,4 +1,4 @@-from typing import Optional+from typing import Dictimport httpximport logging@@ -18,7 +18,7 @@ def get_api_client(config: ConnectionConfig, **kwargs) -> ApiClient:class TransportWithLogger(httpx.HTTPTransport):- singleton: Optional["TransportWithLogger"] = None+ _instances: Dict[bool, "TransportWithLogger"] = {}def handle_request(self, request):url = f"{request.url.scheme}://{request.url.host}{request.url.path}"@@ -35,17 +35,15 @@ class TransportWithLogger(httpx.HTTPTransport):return self._pool-_transport: Optional[TransportWithLogger] = None---def get_transport(config: ConnectionConfig) -> TransportWithLogger:- if TransportWithLogger.singleton is not None:- return TransportWithLogger.singleton+def get_transport(config: ConnectionConfig, http2: bool = True) -> TransportWithLogger:+ cached = TransportWithLogger._instances.get(http2)+ if cached is not None:+ return cachedtransport = TransportWithLogger(limits=limits,proxy=config.proxy,- http2=True,+ http2=http2,)- TransportWithLogger.singleton = transport+ TransportWithLogger._instances[http2] = transportreturn transportdiff --git a/packages/python-sdk/tests/test_api_client_transport.py b/packages/python-sdk/tests/test_api_client_transport.pyindex ce157e1c2..5c6a71431 100644--- a/packages/python-sdk/tests/test_api_client_transport.py+++ b/packages/python-sdk/tests/test_api_client_transport.py@@ -4,13 +4,15 @@ import pytestfrom e2b.api.client_async import AsyncTransportWithLoggerfrom e2b.api.client_async import get_api_client as get_async_api_client+from e2b.api.client_async import get_transport as get_async_transportfrom e2b.api.client_sync import TransportWithLoggerfrom e2b.api.client_sync import get_api_client as get_sync_api_client+from e2b.api.client_sync import get_transport as get_sync_transportfrom e2b.connection_config import ConnectionConfigdef test_sync_api_client_proxy_uses_explicit_transport():- TransportWithLogger.singleton = None+ TransportWithLogger._instances.clear()config = ConnectionConfig(api_key="test",proxy="http://127.0.0.1:9999",@@ -21,11 +23,30 @@ def test_sync_api_client_proxy_uses_explicit_transport():try:assert "proxy" not in api_client._httpx_args- assert httpx_client._transport is TransportWithLogger.singleton+ assert httpx_client._transport is TransportWithLogger._instances[True]assert httpx_client._mounts == {}finally:httpx_client.close()- TransportWithLogger.singleton = None+ TransportWithLogger._instances.clear()+++def test_sync_get_transport_http2_opt_out_returns_distinct_instance():+ TransportWithLogger._instances.clear()+ config = ConnectionConfig(api_key="test")++ try:+ http2_transport = get_sync_transport(config)+ http1_transport = get_sync_transport(config, http2=False)++ assert http2_transport is not http1_transport+ assert http2_transport._pool._http2 is True+ assert http1_transport._pool._http2 is False+ # Subsequent calls with the same http2 flag return the cached+ # instance.+ assert get_sync_transport(config) is http2_transport+ assert get_sync_transport(config, http2=False) is http1_transport+ finally:+ TransportWithLogger._instances.clear()@pytest.mark.asyncio@@ -38,7 +59,9 @@ async def test_async_api_client_proxy_uses_explicit_transport():api_client = get_async_api_client(config)httpx_client = api_client.get_async_httpx_client()- transport = AsyncTransportWithLogger._instances[id(asyncio.get_running_loop())]+ transport = AsyncTransportWithLogger._instances[+ (id(asyncio.get_running_loop()), True)+ ]try:assert "proxy" not in api_client._httpx_args@@ -47,3 +70,23 @@ async def test_async_api_client_proxy_uses_explicit_transport():finally:await httpx_client.aclose()AsyncTransportWithLogger._instances.clear()+++async def test_async_get_transport_http2_opt_out_returns_distinct_instance():+ AsyncTransportWithLogger._instances.clear()+ config = ConnectionConfig(api_key="test")++ try:+ http2_transport = get_async_transport(config)+ http1_transport = get_async_transport(config, http2=False)++ assert http2_transport is not http1_transport+ assert http2_transport._pool._http2 is True+ assert http1_transport._pool._http2 is False+ # Subsequent calls with the same http2 flag return the cached+ # instance.+ assert get_async_transport(config) is http2_transport+ assert get_async_transport(config, http2=False) is http1_transport+ finally:+ AsyncTransportWithLogger._instances.clear()