Skip to content

Commit 5af8afd

Browse files
committed
fix(code-interpreter): honor request_timeout=0 in create_code_context
`create_code_context` resolved its per-call timeout with `request_timeout or self.connection_config.request_timeout`, so an explicit `request_timeout=0` fell back to the configured default instead of disabling the request deadline (0 is falsy). Resolve it with `ConnectionConfig.get_request_timeout()` instead, which applies the `0 -> None` precedence used everywhere else in the SDK. Async twin likewise. tests/test_execute_timeout.py pins the resolution with parametrized cases: 0 disables the deadline, an explicit value wins, and None keeps the configured default — asserted against the deadline the transport derives, sync and async.
1 parent 9774a49 commit 5af8afd

3 files changed

Lines changed: 43 additions & 3 deletions

File tree

‎packages/code-interpreter-python/e2b_code_interpreter/code_interpreter_async.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,8 @@ async def create_code_context(
294294
headers=headers,
295295
json=data,
296296
timeout=httpx.Timeout(
297-
request_timeout or self.connection_config.request_timeout, write=0
297+
self.connection_config.get_request_timeout(request_timeout),
298+
write=0,
298299
),
299300
)
300301

‎packages/code-interpreter-python/e2b_code_interpreter/code_interpreter_sync.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,8 @@ def create_code_context(
291291
json=data,
292292
headers=headers,
293293
timeout=httpx.Timeout(
294-
request_timeout or self.connection_config.request_timeout, write=0
294+
self.connection_config.get_request_timeout(request_timeout),
295+
write=0,
295296
),
296297
)
297298

‎packages/code-interpreter-python/tests/test_execute_timeout.py‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,16 @@ def stream(self, *args, **kwargs):
3939
self._captured.update(kwargs)
4040
raise _Stop
4141

42+
def post(self, *args, **kwargs):
43+
self._captured.update(kwargs)
44+
raise _Stop
45+
4246

4347
def _sandbox(cls, captured=None, connection_config=None, url="http://127.0.0.1:9"):
4448
class _Fake(cls):
4549
@property
4650
def connection_config(self):
47-
return ConnectionConfig(
51+
return connection_config or ConnectionConfig(
4852
api_key="x", domain="e2b.app", request_timeout=REQUEST_TIMEOUT
4953
)
5054

@@ -234,3 +238,37 @@ async def test_async_context_request_is_aborted_after_request_timeout_seconds():
234238
elapsed = time.monotonic() - started
235239

236240
assert elapsed < 1.5, f"list_code_contexts() was aborted after {elapsed:.2f}s"
241+
242+
243+
@pytest.mark.parametrize(
244+
"request_timeout, expected_read",
245+
[(0, None), (7, 7), (None, REQUEST_TIMEOUT)],
246+
)
247+
def test_context_request_timeout_resolution(request_timeout, expected_read):
248+
captured: dict = {}
249+
with pytest.raises(_Stop):
250+
_sandbox(Sandbox, captured).create_code_context(request_timeout=request_timeout)
251+
252+
tmo = _captured_timeout(captured)
253+
# An explicit `request_timeout=0` disables the deadline — it must not
254+
# fall back to the configured default — while `None` keeps the default.
255+
assert tmo.read == expected_read
256+
assert tmo.write == 0
257+
assert _derived_deadline(tmo) == expected_read
258+
259+
260+
@pytest.mark.parametrize(
261+
"request_timeout, expected_read",
262+
[(0, None), (7, 7), (None, REQUEST_TIMEOUT)],
263+
)
264+
async def test_async_context_request_timeout_resolution(request_timeout, expected_read):
265+
captured: dict = {}
266+
with pytest.raises(_Stop):
267+
await _sandbox(AsyncSandbox, captured).create_code_context(
268+
request_timeout=request_timeout
269+
)
270+
271+
tmo = _captured_timeout(captured)
272+
assert tmo.read == expected_read
273+
assert tmo.write == 0
274+
assert _derived_deadline(tmo) == expected_read

0 commit comments

Comments
 (0)