Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
fix(sdk): remove E2B_USER_AGENT_SOURCE and CI-only request diagnostics (#1927)
devin-ai-integration[bot]b3bb6531b9f7
diff --git a/.changeset/remove-request-source.md b/.changeset/remove-request-source.mdnew file mode 100644index 000000000..405e5d0c7--- /dev/null+++ b/.changeset/remove-request-source.md@@ -0,0 +1,10 @@+---+"e2b": patch+"@e2b/python-sdk": patch+"@e2b/code-interpreter": patch+"@e2b/code-interpreter-python": patch+---++Remove the `E2B_USER_AGENT_SOURCE` environment variable. The SDKs no longer add a `source/<value>` User-Agent token, append `?source=` to Code Interpreter requests, or log trace IDs and add `(trace_id=…)` to error messages when it is set to `ci`, so SDK behavior no longer depends on that variable.++Code Interpreter errors for statuses other than 404 and 502 now use the same `<status> <reason>[: <body>]` message in JS and Python: JS includes the response body, and Python falls back to the reason phrase when the body is empty.diff --git a/.github/workflows/cli_tests.yml b/.github/workflows/cli_tests.ymlindex 062ebde3e..a5c8bb5fc 100644--- a/.github/workflows/cli_tests.yml+++ b/.github/workflows/cli_tests.yml@@ -14,9 +14,6 @@ on:permissions:contents: read-env:- E2B_USER_AGENT_SOURCE: ci-jobs:test:defaults:diff --git a/.github/workflows/code_interpreter_js_tests.yml b/.github/workflows/code_interpreter_js_tests.ymlindex e7c45b8c6..8d01fe786 100644--- a/.github/workflows/code_interpreter_js_tests.yml+++ b/.github/workflows/code_interpreter_js_tests.yml@@ -23,9 +23,6 @@ on:permissions:contents: read-env:- E2B_USER_AGENT_SOURCE: ci-jobs:test:defaults:diff --git a/.github/workflows/code_interpreter_python_tests.yml b/.github/workflows/code_interpreter_python_tests.ymlindex 9d30b4115..6a4b98805 100644--- a/.github/workflows/code_interpreter_python_tests.yml+++ b/.github/workflows/code_interpreter_python_tests.yml@@ -18,9 +18,6 @@ on:permissions:contents: read-env:- E2B_USER_AGENT_SOURCE: ci-jobs:test:defaults:diff --git a/.github/workflows/desktop_js_tests.yml b/.github/workflows/desktop_js_tests.ymlindex 79fb992a0..565a590a9 100644--- a/.github/workflows/desktop_js_tests.yml+++ b/.github/workflows/desktop_js_tests.yml@@ -18,9 +18,6 @@ on:permissions:contents: read-env:- E2B_USER_AGENT_SOURCE: ci-jobs:test:defaults:diff --git a/.github/workflows/desktop_python_tests.yml b/.github/workflows/desktop_python_tests.ymlindex dae63885a..8861c728d 100644--- a/.github/workflows/desktop_python_tests.yml+++ b/.github/workflows/desktop_python_tests.yml@@ -18,9 +18,6 @@ on:permissions:contents: read-env:- E2B_USER_AGENT_SOURCE: ci-jobs:test:defaults:diff --git a/.github/workflows/js_sdk_tests.yml b/.github/workflows/js_sdk_tests.ymlindex db82deea4..ff2d685f7 100644--- a/.github/workflows/js_sdk_tests.yml+++ b/.github/workflows/js_sdk_tests.yml@@ -19,9 +19,6 @@ on:permissions:contents: read-env:- E2B_USER_AGENT_SOURCE: ci-jobs:test:defaults:diff --git a/.github/workflows/python_sdk_tests.yml b/.github/workflows/python_sdk_tests.ymlindex a22b93d0f..741d24246 100644--- a/.github/workflows/python_sdk_tests.yml+++ b/.github/workflows/python_sdk_tests.yml@@ -14,9 +14,6 @@ on:permissions:contents: read-env:- E2B_USER_AGENT_SOURCE: ci-jobs:test:defaults:diff --git a/packages/code-interpreter-js/src/messaging.ts b/packages/code-interpreter-js/src/messaging.tsindex 3bf67261f..c145f5b46 100644--- a/packages/code-interpreter-js/src/messaging.ts+++ b/packages/code-interpreter-js/src/messaging.ts@@ -1,33 +1,22 @@import { NotFoundError, SandboxError, TimeoutError } from 'e2b'import { ChartTypes } from './charts'-export async function extractError(res: Response, includeDiagnostics = false) {+export async function extractError(res: Response) {if (res.ok) {return}- const traceId = includeDiagnostics ? res.headers.get('X-E2B-Trace-ID') : null- const traceSuffix = traceId ? ` (trace_id=${traceId})` : ''-switch (res.status) {- case 502: {- const body = await res.text()+ case 502:return new TimeoutError(- `${body}: This error is likely due to sandbox timeout. You can modify the sandbox timeout by passing 'timeoutMs' when starting the sandbox or calling '.setTimeout' on the sandbox with the desired timeout.${traceSuffix}`+ `${await res.text()}: This error is likely due to sandbox timeout. You can modify the sandbox timeout by passing 'timeoutMs' when starting the sandbox or calling '.setTimeout' on the sandbox with the desired timeout.`)- }- case 404: {- const body = await res.text()- return new NotFoundError(`${body}${traceSuffix}`)- }+ case 404:+ return new NotFoundError(await res.text())default: {- if (!includeDiagnostics) {- return new SandboxError(`${res.status} ${res.statusText}`)- }-const body = (await res.text()).trim()return new SandboxError(- `${res.status} ${res.statusText}${body ? `: ${body}` : ''}${traceSuffix}`+ `${res.status} ${res.statusText}${body ? `: ${body}` : ''}`)}}diff --git a/packages/code-interpreter-js/src/sandbox.ts b/packages/code-interpreter-js/src/sandbox.tsindex 79210d8ec..324e33665 100644--- a/packages/code-interpreter-js/src/sandbox.ts+++ b/packages/code-interpreter-js/src/sandbox.ts@@ -138,20 +138,6 @@ export class Sandbox extends BaseSandbox {})}- private getJupyterRequestUrl(path: string): string {- const url = `${this.jupyterUrl}${path}`- const source = this.connectionConfig.requestSource- if (!source) {- return url- }-- return `${url}${url.includes('?') ? '&' : '?'}source=${encodeURIComponent(source)}`- }-- private get includeDiagnostics(): boolean {- return this.connectionConfig.requestSource === 'ci'- }-/*** Run the code for the specified language.*@@ -235,7 +221,7 @@ export class Sandbox extends BaseSandbox {}try {- const res = await fetch(this.getJupyterRequestUrl('/execute'), {+ const res = await fetch(`${this.jupyterUrl}/execute`, {method: 'POST',headers,body: JSON.stringify({@@ -248,7 +234,7 @@ export class Sandbox extends BaseSandbox {keepalive: true,})- const error = await extractError(res, this.includeDiagnostics)+ const error = await extractError(res)if (error) {throw error}@@ -313,7 +299,7 @@ export class Sandbox extends BaseSandbox {headers['E2B-Traffic-Access-Token'] = this.trafficAccessToken}- const res = await fetch(this.getJupyterRequestUrl('/contexts'), {+ const res = await fetch(`${this.jupyterUrl}/contexts`, {method: 'POST',headers,body: JSON.stringify({@@ -324,7 +310,7 @@ export class Sandbox extends BaseSandbox {signal: this.connectionConfig.getSignal(opts?.requestTimeoutMs),})- const error = await extractError(res, this.includeDiagnostics)+ const error = await extractError(res)if (error) {throw error}@@ -355,7 +341,7 @@ export class Sandbox extends BaseSandbox {headers['E2B-Traffic-Access-Token'] = this.trafficAccessToken}- const res = await fetch(this.getJupyterRequestUrl(`/contexts/${id}`), {+ const res = await fetch(`${this.jupyterUrl}/contexts/${id}`, {method: 'DELETE',headers,keepalive: true,@@ -364,7 +350,7 @@ export class Sandbox extends BaseSandbox {),})- const error = await extractError(res, this.includeDiagnostics)+ const error = await extractError(res)if (error) {throw error}@@ -390,7 +376,7 @@ export class Sandbox extends BaseSandbox {headers['E2B-Traffic-Access-Token'] = this.trafficAccessToken}- const res = await fetch(this.getJupyterRequestUrl('/contexts'), {+ const res = await fetch(`${this.jupyterUrl}/contexts`, {method: 'GET',headers,keepalive: true,@@ -399,7 +385,7 @@ export class Sandbox extends BaseSandbox {),})- const error = await extractError(res, this.includeDiagnostics)+ const error = await extractError(res)if (error) {throw error}@@ -430,19 +416,16 @@ export class Sandbox extends BaseSandbox {headers['E2B-Traffic-Access-Token'] = this.trafficAccessToken}- const res = await fetch(- this.getJupyterRequestUrl(`/contexts/${id}/restart`),- {- method: 'POST',- headers,- keepalive: true,- signal: this.connectionConfig.getSignal(- this.connectionConfig.requestTimeoutMs- ),- }- )+ const res = await fetch(`${this.jupyterUrl}/contexts/${id}/restart`, {+ method: 'POST',+ headers,+ keepalive: true,+ signal: this.connectionConfig.getSignal(+ this.connectionConfig.requestTimeoutMs+ ),+ })- const error = await extractError(res, this.includeDiagnostics)+ const error = await extractError(res)if (error) {throw error}diff --git a/packages/code-interpreter-js/tests/javaKernelReadiness.test.ts b/packages/code-interpreter-js/tests/javaKernelReadiness.test.tsindex f0470b58d..c9c68d05c 100644--- a/packages/code-interpreter-js/tests/javaKernelReadiness.test.ts+++ b/packages/code-interpreter-js/tests/javaKernelReadiness.test.ts@@ -4,8 +4,6 @@ import { Sandbox, SandboxError } from '../src'import { waitForKernel } from './setup'const javaNotReadyError = () => new SandboxError('500 Internal Server Error')-const tracedNotReadyError = () =>- new SandboxError('500 Internal Server Error (trace_id=trace-123)')function mockSandbox(runCode: ReturnType<typeof vi.fn>) {return { runCode } as unknown as Sandbox@@ -51,14 +49,3 @@ test('does not retry an unrelated Java error', async () => {await expect(waitForKernel(mockSandbox(runCode), 'java')).rejects.toBe(error)expect(runCode).toHaveBeenCalledTimes(1)})--test('retries an empty readiness 500 that includes a trace ID', async () => {- const runCode = vi- .fn()- .mockRejectedValueOnce(tracedNotReadyError())- .mockResolvedValueOnce(undefined)-- await waitForKernel(mockSandbox(runCode), 'r')-- expect(runCode).toHaveBeenCalledTimes(2)-})diff --git a/packages/code-interpreter-js/tests/messaging.test.ts b/packages/code-interpreter-js/tests/messaging.test.tsindex 40009f893..c0add5149 100644--- a/packages/code-interpreter-js/tests/messaging.test.ts+++ b/packages/code-interpreter-js/tests/messaging.test.ts@@ -1,52 +1,27 @@-import { expect, test, vi } from 'vitest'+import { expect, test } from 'vitest'-import { NotFoundError, SandboxError, TimeoutError } from '../src'+import { SandboxError } from '../src'import { extractError } from '../src/messaging'-test('preserves response details and trace ID for CI server errors', async () => {+test('includes the response body in server errors', async () => {const error = await extractError(- new Response('R context failed to initialize', {+ new Response(' R context failed to initialize ', {status: 500,statusText: 'Internal Server Error',- headers: { 'X-E2B-Trace-ID': 'trace-123' },- }),- true+ }))expect(error).toEqual(new SandboxError(- '500 Internal Server Error: R context failed to initialize (trace_id=trace-123)'+ '500 Internal Server Error: R context failed to initialize'))})-test('keeps the existing message outside CI even when diagnostics are available', async () => {- const response = new Response('R context failed to initialize', {- status: 500,- statusText: 'Internal Server Error',- headers: { 'X-E2B-Trace-ID': 'trace-123' },- })- const text = vi.spyOn(response, 'text')-- const error = await extractError(response, false)+test('falls back to the status text for an empty body', async () => {+ const error = await extractError(+ new Response('', { status: 500, statusText: 'Internal Server Error' })+ )expect(error).toEqual(new SandboxError('500 Internal Server Error'))- expect(text).not.toHaveBeenCalled()})--test.each([- [404, ' missing ', NotFoundError, ' missing '],- [- 502,- ' timed out ',- TimeoutError,- " timed out : This error is likely due to sandbox timeout. You can modify the sandbox timeout by passing 'timeoutMs' when starting the sandbox or calling '.setTimeout' on the sandbox with the desired timeout.",- ],-])(- 'preserves the non-CI %s response body exactly',- async (status, body, ErrorClass, message) => {- const error = await extractError(new Response(body, { status }), false)-- expect(error).toEqual(new ErrorClass(message))- }-)diff --git a/packages/code-interpreter-js/tests/sandboxUrl.test.ts b/packages/code-interpreter-js/tests/sandboxUrl.test.tsindex 224c531bc..4566f6cd0 100644--- a/packages/code-interpreter-js/tests/sandboxUrl.test.ts+++ b/packages/code-interpreter-js/tests/sandboxUrl.test.ts@@ -1,4 +1,4 @@-import { afterEach, beforeEach, expect, test, vi } from 'vitest'+import { afterEach, beforeEach, expect, test } from 'vitest'import { Sandbox } from '../src'@@ -17,14 +17,13 @@ function createSandbox(opts: object = {}) {const savedEnv: Record<string, string | undefined> = {}beforeEach(() => {- for (const key of ['E2B_SANDBOX_URL', 'E2B_DEBUG', 'E2B_USER_AGENT_SOURCE']) {+ for (const key of ['E2B_SANDBOX_URL', 'E2B_DEBUG']) {savedEnv[key] = process.env[key]delete process.env[key]}})afterEach(() => {- vi.unstubAllGlobals()for (const [key, value] of Object.entries(savedEnv)) {if (value === undefined) {delete process.env[key]@@ -49,17 +48,3 @@ test('jupyterUrl honors the E2B_SANDBOX_URL environment variable', () => {const sandbox = createSandbox()expect(sandbox.jupyterUrl).toBe('https://env.example.com')})--test('runCode tags CI traffic in the request URL', async () => {- process.env.E2B_USER_AGENT_SOURCE = 'ci'- const sandbox = createSandbox({ domain: 'example.dev' })- const fetchMock = vi.fn().mockResolvedValue(new Response(''))- vi.stubGlobal('fetch', fetchMock)-- await (sandbox as unknown as Sandbox).runCode('1 + 1')-- expect(fetchMock).toHaveBeenCalledWith(- 'https://49999-test-sandbox-id.example.dev/execute?source=ci',- expect.any(Object)- )-})diff --git a/packages/code-interpreter-js/tests/setup.ts b/packages/code-interpreter-js/tests/setup.tsindex d7e4920d7..d828132c8 100644--- a/packages/code-interpreter-js/tests/setup.ts+++ b/packages/code-interpreter-js/tests/setup.ts@@ -78,9 +78,7 @@ export async function waitForKernel(sandbox: Sandbox, language: 'java' | 'r') {// readiness failure; the test's actual execution still runs once.const isReadinessError =error instanceof SandboxError &&- /^500 Internal Server Error(?: \(trace_id=[^)]+\))?$/.test(- error.message- )+ error.message === '500 Internal Server Error'if (!isReadinessError || attempt === KERNEL_READINESS_ATTEMPTS) {throw errordiff --git a/packages/code-interpreter-python/e2b_code_interpreter/code_interpreter_async.py b/packages/code-interpreter-python/e2b_code_interpreter/code_interpreter_async.pyindex 5e9bd2521..49205fcf5 100644--- a/packages/code-interpreter-python/e2b_code_interpreter/code_interpreter_async.py+++ b/packages/code-interpreter-python/e2b_code_interpreter/code_interpreter_async.py@@ -68,18 +68,6 @@ class AsyncSandbox(BaseAsyncSandbox):return sandbox_urlreturn f"{'http' if self.connection_config.debug else 'https'}://{self.get_host(JUPYTER_PORT)}"- def _jupyter_request_url(self, path: str) -> str:- url = f"{self._jupyter_url}{path}"- source = getattr(self.connection_config, "request_source", None)- if not source:- return url- separator = "&" if "?" in url else "?"- return f"{url}{separator}source={source}"-- @property- def _include_diagnostics(self) -> bool:- return getattr(self.connection_config, "request_source", None) == "ci"-@propertydef _client(self) -> AsyncClient:# TODO: Remove later@@ -223,7 +211,7 @@ class AsyncSandbox(BaseAsyncSandbox):async with self._client.stream("POST",- self._jupyter_request_url("/execute"),+ f"{self._jupyter_url}/execute",json={"code": code,"context_id": context_id,@@ -248,7 +236,7 @@ class AsyncSandbox(BaseAsyncSandbox):else httpx.Timeout(None)),) as response:- err = await aextract_exception(response, self._include_diagnostics)+ err = await aextract_exception(response)if err:raise err@@ -306,13 +294,13 @@ class AsyncSandbox(BaseAsyncSandbox):headers["E2B-Traffic-Access-Token"] = self.traffic_access_tokenresponse = await self._client.post(- self._jupyter_request_url("/contexts"),+ f"{self._jupyter_url}/contexts",headers=headers,json=data,timeout=request_timeout or self.connection_config.request_timeout,)- err = await aextract_exception(response, self._include_diagnostics)+ err = await aextract_exception(response)if err:raise err@@ -347,12 +335,12 @@ class AsyncSandbox(BaseAsyncSandbox):headers["E2B-Traffic-Access-Token"] = self.traffic_access_tokenresponse = await self._client.delete(- self._jupyter_request_url(f"/contexts/{context_id}"),+ f"{self._jupyter_url}/contexts/{context_id}",headers=headers,timeout=self.connection_config.request_timeout,)- err = await aextract_exception(response, self._include_diagnostics)+ err = await aextract_exception(response)if err:raise errexcept httpx.TimeoutException:@@ -377,12 +365,12 @@ class AsyncSandbox(BaseAsyncSandbox):headers["E2B-Traffic-Access-Token"] = self.traffic_access_tokenresponse = await self._client.get(- self._jupyter_request_url("/contexts"),+ f"{self._jupyter_url}/contexts",headers=headers,timeout=self.connection_config.request_timeout,)- err = await aextract_exception(response, self._include_diagnostics)+ err = await aextract_exception(response)if err:raise err@@ -416,12 +404,12 @@ class AsyncSandbox(BaseAsyncSandbox):headers["E2B-Traffic-Access-Token"] = self.traffic_access_tokenresponse = await self._client.post(- self._jupyter_request_url(f"/contexts/{context_id}/restart"),+ f"{self._jupyter_url}/contexts/{context_id}/restart",headers=headers,timeout=self.connection_config.request_timeout,)- err = await aextract_exception(response, self._include_diagnostics)+ err = await aextract_exception(response)if err:raise errexcept httpx.TimeoutException:diff --git a/packages/code-interpreter-python/e2b_code_interpreter/code_interpreter_sync.py b/packages/code-interpreter-python/e2b_code_interpreter/code_interpreter_sync.pyindex ec8e25a14..35377bc64 100644--- a/packages/code-interpreter-python/e2b_code_interpreter/code_interpreter_sync.py+++ b/packages/code-interpreter-python/e2b_code_interpreter/code_interpreter_sync.py@@ -65,18 +65,6 @@ class Sandbox(BaseSandbox):return sandbox_urlreturn f"{'http' if self.connection_config.debug else 'https'}://{self.get_host(JUPYTER_PORT)}"- def _jupyter_request_url(self, path: str) -> str:- url = f"{self._jupyter_url}{path}"- source = getattr(self.connection_config, "request_source", None)- if not source:- return url- separator = "&" if "?" in url else "?"- return f"{url}{separator}source={source}"-- @property- def _include_diagnostics(self) -> bool:- return getattr(self.connection_config, "request_source", None) == "ci"-@propertydef _client(self) -> Client:# TODO: Remove later@@ -220,7 +208,7 @@ class Sandbox(BaseSandbox):with self._client.stream("POST",- self._jupyter_request_url("/execute"),+ f"{self._jupyter_url}/execute",json={"code": code,"context_id": context_id,@@ -245,7 +233,7 @@ class Sandbox(BaseSandbox):else httpx.Timeout(None)),) as response:- err = extract_exception(response, self._include_diagnostics)+ err = extract_exception(response)if err:raise err@@ -303,13 +291,13 @@ class Sandbox(BaseSandbox):headers["E2B-Traffic-Access-Token"] = self.traffic_access_tokenresponse = self._client.post(- self._jupyter_request_url("/contexts"),+ f"{self._jupyter_url}/contexts",json=data,headers=headers,timeout=request_timeout or self.connection_config.request_timeout,)- err = extract_exception(response, self._include_diagnostics)+ err = extract_exception(response)if err:raise err@@ -344,12 +332,12 @@ class Sandbox(BaseSandbox):headers["E2B-Traffic-Access-Token"] = self.traffic_access_tokenresponse = self._client.delete(- self._jupyter_request_url(f"/contexts/{context_id}"),+ f"{self._jupyter_url}/contexts/{context_id}",headers=headers,timeout=self.connection_config.request_timeout,)- err = extract_exception(response, self._include_diagnostics)+ err = extract_exception(response)if err:raise errexcept httpx.TimeoutException:@@ -374,12 +362,12 @@ class Sandbox(BaseSandbox):headers["E2B-Traffic-Access-Token"] = self.traffic_access_tokenresponse = self._client.get(- self._jupyter_request_url("/contexts"),+ f"{self._jupyter_url}/contexts",headers=headers,timeout=self.connection_config.request_timeout,)- err = extract_exception(response, self._include_diagnostics)+ err = extract_exception(response)if err:raise err@@ -414,12 +402,12 @@ class Sandbox(BaseSandbox):headers["E2B-Traffic-Access-Token"] = self.traffic_access_tokenresponse = self._client.post(- self._jupyter_request_url(f"/contexts/{context_id}/restart"),+ f"{self._jupyter_url}/contexts/{context_id}/restart",headers=headers,timeout=self.connection_config.request_timeout,)- err = extract_exception(response, self._include_diagnostics)+ err = extract_exception(response)if err:raise errexcept httpx.TimeoutException:diff --git a/packages/code-interpreter-python/e2b_code_interpreter/models.py b/packages/code-interpreter-python/e2b_code_interpreter/models.pyindex 047422eb8..bb0a7751e 100644--- a/packages/code-interpreter-python/e2b_code_interpreter/models.py+++ b/packages/code-interpreter-python/e2b_code_interpreter/models.py@@ -400,40 +400,36 @@ class Execution:return json.dumps(data)-async def aextract_exception(res: Response, include_diagnostics: bool = False):+async def aextract_exception(res: Response):if res.is_success:return Noneawait res.aread()- return extract_exception(res, include_diagnostics)+ return extract_exception(res)-def extract_exception(res: Response, include_diagnostics: bool = False):+def extract_exception(res: Response):if res.is_success:return Noneres.read()- return format_exception(res, include_diagnostics)+ return format_exception(res)-def format_exception(res: Response, include_diagnostics: bool = False):+def format_exception(res: Response):if res.is_success:return None- body = res.text- trace_id = res.headers.get("X-E2B-Trace-ID") if include_diagnostics else None- trace_suffix = f" (trace_id={trace_id})" if trace_id else ""-if res.status_code == 404:- return NotFoundException(f"{body}{trace_suffix}")+ return NotFoundException(res.text)elif res.status_code == 502:return TimeoutException(- f"{body}: This error is likely due to sandbox timeout. You can modify the sandbox timeout by passing 'timeout' when starting the sandbox or calling '.set_timeout' on the sandbox with the desired timeout.{trace_suffix}"+ f"{res.text}: This error is likely due to sandbox timeout. You can modify the sandbox timeout by passing 'timeout' when starting the sandbox or calling '.set_timeout' on the sandbox with the desired timeout.")else:- body_separator = "" if trace_suffix and not body else " "+ body = res.text.strip()return SandboxException(- f"{res.status_code}:{body_separator}{body}{trace_suffix}"+ f"{res.status_code} {res.reason_phrase}{f': {body}' if body else ''}")diff --git a/packages/code-interpreter-python/tests/conftest.py b/packages/code-interpreter-python/tests/conftest.pyindex 1f39f6195..b0a434ed1 100644--- a/packages/code-interpreter-python/tests/conftest.py+++ b/packages/code-interpreter-python/tests/conftest.py@@ -1,6 +1,5 @@import asyncioimport os-import reimport uuidimport pytest@@ -83,9 +82,7 @@ def _wait_for_kernel(sandbox: Sandbox, language: str) -> None:# A newly running sandbox can briefly return this response while# Foxtrot initializes a lazy language context. Retry only that known# readiness failure; the test's actual execution still runs once.- is_readiness_error = re.fullmatch(- r"500:(?: \(trace_id=[^)]+\))?", str(error).strip()- )+ is_readiness_error = str(error) == "500 Internal Server Error"if not is_readiness_error or attempt == KERNEL_READINESS_ATTEMPTS - 1:raise@@ -96,9 +93,7 @@ async def _wait_for_kernel_async(sandbox: AsyncSandbox, language: str) -> None:await sandbox.run_code("1", language=language)returnexcept SandboxException as error:- is_readiness_error = re.fullmatch(- r"500:(?: \(trace_id=[^)]+\))?", str(error).strip()- )+ is_readiness_error = str(error) == "500 Internal Server Error"if not is_readiness_error or attempt == KERNEL_READINESS_ATTEMPTS - 1:raisediff --git a/packages/code-interpreter-python/tests/test_error_diagnostics.py b/packages/code-interpreter-python/tests/test_error_diagnostics.pydeleted file mode 100644index 80baae7ed..000000000--- a/packages/code-interpreter-python/tests/test_error_diagnostics.py+++ /dev/null@@ -1,62 +0,0 @@-from httpx import Response-from types import SimpleNamespace--from e2b_code_interpreter.code_interpreter_async import AsyncSandbox-from e2b_code_interpreter.code_interpreter_sync import Sandbox-from e2b import NotFoundException, TimeoutException-from e2b_code_interpreter.models import format_exception---def test_preserves_response_details_and_trace_id_for_ci_server_errors():- error = format_exception(- Response(- 500,- text="R context failed to initialize",- headers={"X-E2B-Trace-ID": "trace-123"},- ),- include_diagnostics=True,- )-- assert str(error) == "500: R context failed to initialize (trace_id=trace-123)"---def test_keeps_existing_message_outside_ci():- error = format_exception(- Response(- 500,- text="R context failed to initialize",- headers={"X-E2B-Trace-ID": "trace-123"},- ),- include_diagnostics=False,- )-- assert str(error) == "500: R context failed to initialize"---def test_keeps_empty_generic_error_spacing_outside_ci():- error = format_exception(Response(500, text=""), include_diagnostics=False)-- assert str(error) == "500: "---def test_preserves_non_ci_response_body_exactly():- not_found = format_exception(- Response(404, text=" missing "), include_diagnostics=False- )- timeout = format_exception(- Response(502, text=" timed out "), include_diagnostics=False- )-- assert isinstance(not_found, NotFoundException)- assert str(not_found) == " missing "- assert isinstance(timeout, TimeoutException)- assert str(timeout) == (- " timed out : This error is likely due to sandbox timeout. You can modify the sandbox timeout by passing 'timeout' when starting the sandbox or calling '.set_timeout' on the sandbox with the desired timeout."- )---def test_older_base_sdk_without_request_source_disables_diagnostics():- sandbox = SimpleNamespace(connection_config=SimpleNamespace())-- assert Sandbox._include_diagnostics.fget(sandbox) is False- assert AsyncSandbox._include_diagnostics.fget(sandbox) is Falsediff --git a/packages/code-interpreter-python/tests/test_execute_timeout.py b/packages/code-interpreter-python/tests/test_execute_timeout.pyindex 28b59361a..0ea523d93 100644--- a/packages/code-interpreter-python/tests/test_execute_timeout.py+++ b/packages/code-interpreter-python/tests/test_execute_timeout.py@@ -31,16 +31,15 @@ class _CapturingClient:self._captured = captureddef stream(self, *args, **kwargs):- self._captured["args"] = argsself._captured.update(kwargs)raise _Stop-def _sandbox(cls, captured: dict, connection_config=None):+def _sandbox(cls, captured: dict):class _Fake(cls):@propertydef connection_config(self):- return connection_config or ConnectionConfig(+ return ConnectionConfig(api_key="x", domain="e2b.app", request_timeout=REQUEST_TIMEOUT)@@ -122,53 +121,3 @@ async def test_async_zero_timeout_disables_the_deadline():tmo = _captured_timeout(captured)assert (tmo.read, tmo.write, tmo.pool, tmo.connect) == (None, None, None, None)---def test_execute_tags_ci_traffic_in_request_url(monkeypatch):- monkeypatch.setenv("E2B_USER_AGENT_SOURCE", "ci")- captured: dict = {}-- with pytest.raises(_Stop):- _sandbox(Sandbox, captured).run_code("1 + 1")-- assert captured["args"][:2] == (- "POST",- "http://127.0.0.1:9/execute?source=ci",- )---async def test_async_execute_tags_ci_traffic_in_request_url(monkeypatch):- monkeypatch.setenv("E2B_USER_AGENT_SOURCE", "ci")- captured: dict = {}-- with pytest.raises(_Stop):- await _sandbox(AsyncSandbox, captured).run_code("1 + 1")-- assert captured["args"][:2] == (- "POST",- "http://127.0.0.1:9/execute?source=ci",- )---class _LegacyConnectionConfig:- request_timeout = REQUEST_TIMEOUT---def test_execute_supports_legacy_e2b_connection_config():- captured: dict = {}-- with pytest.raises(_Stop):- _sandbox(Sandbox, captured, _LegacyConnectionConfig()).run_code("1 + 1")-- assert captured["args"][:2] == ("POST", "http://127.0.0.1:9/execute")---async def test_async_execute_supports_legacy_e2b_connection_config():- captured: dict = {}-- with pytest.raises(_Stop):- await _sandbox(AsyncSandbox, captured, _LegacyConnectionConfig()).run_code(- "1 + 1"- )-- assert captured["args"][:2] == ("POST", "http://127.0.0.1:9/execute")diff --git a/packages/code-interpreter-python/tests/test_format_exception.py b/packages/code-interpreter-python/tests/test_format_exception.pynew file mode 100644index 000000000..4231b7b76--- /dev/null+++ b/packages/code-interpreter-python/tests/test_format_exception.py@@ -0,0 +1,18 @@+from httpx import Response++from e2b import SandboxException+from e2b_code_interpreter.models import format_exception+++def test_includes_the_response_body_in_server_errors():+ error = format_exception(Response(500, text=" R context failed to initialize "))++ assert isinstance(error, SandboxException)+ assert str(error) == "500 Internal Server Error: R context failed to initialize"+++def test_falls_back_to_the_reason_phrase_for_an_empty_body():+ error = format_exception(Response(500, text=""))++ assert isinstance(error, SandboxException)+ assert str(error) == "500 Internal Server Error"diff --git a/packages/code-interpreter-python/tests/test_java_kernel_readiness.py b/packages/code-interpreter-python/tests/test_java_kernel_readiness.pyindex 344cb57d6..624827a09 100644--- a/packages/code-interpreter-python/tests/test_java_kernel_readiness.py+++ b/packages/code-interpreter-python/tests/test_java_kernel_readiness.py@@ -1,26 +1,13 @@from unittest.mock import AsyncMock, Mockimport pytest-from httpx import Responsefrom e2b import SandboxException-from e2b_code_interpreter.models import format_exceptionfrom tests.conftest import _wait_for_kernel, _wait_for_kernel_asyncdef java_not_ready_error() -> SandboxException:- return SandboxException("500:")---def traced_not_ready_error() -> SandboxException:- return format_exception(- Response(- 500,- text="",- headers={"X-E2B-Trace-ID": "trace-123"},- ),- include_diagnostics=True,- )+ return SandboxException("500 Internal Server Error")@pytest.mark.parametrize("language", ["java", "r"])@@ -119,12 +106,3 @@ async def test_async_does_not_retry_an_unrelated_java_error():assert raised.value is errorrun_code.assert_awaited_once_with("1", language="java")---def test_retries_an_empty_readiness_500_with_trace_id():- run_code = Mock(side_effect=[traced_not_ready_error(), None])- sandbox = Mock(run_code=run_code)-- _wait_for_kernel(sandbox, "r")-- assert run_code.call_count == 2diff --git a/packages/js-sdk/src/api/index.ts b/packages/js-sdk/src/api/index.tsindex 678bb4fea..23d9a0630 100644--- a/packages/js-sdk/src/api/index.ts+++ b/packages/js-sdk/src/api/index.ts@@ -126,13 +126,8 @@ class ApiClient {},})- if (config.logger || config.requestSource === 'ci') {- this.api.use(- createApiLogger(- config.logger ?? { error: (...args) => console.error(...args) },- config.requestSource === 'ci'- )- )+ if (config.logger) {+ this.api.use(createApiLogger(config.logger))}}}diff --git a/packages/js-sdk/src/connectionConfig.ts b/packages/js-sdk/src/connectionConfig.tsindex 366cd886d..b946cc69b 100644--- a/packages/js-sdk/src/connectionConfig.ts+++ b/packages/js-sdk/src/connectionConfig.ts@@ -394,24 +394,13 @@ export class ConnectionConfig {private static readonly sdkUserAgentPrefix = 'e2b-js-sdk/'- private static getRequestSource() {- const source = getEnvVar('E2B_USER_AGENT_SOURCE')- return source && /^[A-Za-z0-9][A-Za-z0-9._-]{0,31}$/.test(source)- ? source- : undefined- }-- private static buildUserAgent(requestSource?: string) {+ private static buildUserAgent() {const userAgentParts = [`${ConnectionConfig.sdkUserAgentPrefix}${version}`]if (ConnectionConfig.integration) {userAgentParts.push(ConnectionConfig.integration)}- if (requestSource) {- userAgentParts.push(`source/${requestSource}`)- }-return userAgentParts.join(' ')}@@ -423,10 +412,7 @@ export class ConnectionConfig {* rebuilt via `new ConnectionConfig({ ...config })`) is recognized by its* prefix and rebuilt, so it stays in sync with the current integration.*/- private static applyUserAgent(- headers: Record<string, string>,- requestSource?: string- ) {+ private static applyUserAgent(headers: Record<string, string>) {const userAgent = headers['User-Agent']if (@@ -436,7 +422,7 @@ export class ConnectionConfig {return}- headers['User-Agent'] = ConnectionConfig.buildUserAgent(requestSource)+ headers['User-Agent'] = ConnectionConfig.buildUserAgent()}/**@@ -473,15 +459,6 @@ export class ConnectionConfig {readonly headers?: Record<string, string>- /**- * Validated traffic source used for request correlation.- *- * @internal- * @hidden- * @hide- */- readonly requestSource?: string-readonly proxy?: stringreadonly httpVersion: HttpVersion@@ -493,9 +470,8 @@ export class ConnectionConfig {this.requestTimeoutMs = opts?.requestTimeoutMs ?? REQUEST_TIMEOUT_MSthis.retries = resolveRetries(opts?.retries ?? DEFAULT_RETRIES)this.logger = opts?.logger- this.requestSource = ConnectionConfig.getRequestSource()this.headers = { ...(opts?.headers ?? {}), ...(opts?.apiHeaders ?? {}) }- ConnectionConfig.applyUserAgent(this.headers, this.requestSource)+ ConnectionConfig.applyUserAgent(this.headers)this.proxy = opts?.proxythis.httpVersion = resolveHttpVersion(opts?.httpVersion)diff --git a/packages/js-sdk/src/logs.ts b/packages/js-sdk/src/logs.tsindex 641acacc8..d3ed59f21 100644--- a/packages/js-sdk/src/logs.ts+++ b/packages/js-sdk/src/logs.ts@@ -58,28 +58,20 @@ export function createRpcLogger(logger: Logger): Interceptor {}}-export function createApiLogger(- logger: Logger,- includeDiagnostics = false-): Middleware {+export function createApiLogger(logger: Logger): Middleware {return {async onRequest({ request }) {logger.info?.(`Request ${request.method} ${request.url}`)+ return request},async onResponse({ response }) {if (response.status >= 400) {- const traceId = includeDiagnostics- ? response.headers.get('X-E2B-Trace-ID')- : null- logger.error?.(- 'Response:',- response.status,- response.statusText,- ...(traceId ? [`trace_id=${traceId}`] : [])- )+ logger.error?.('Response:', response.status, response.statusText)} else {logger.info?.('Response:', response.status, response.statusText)}++ return response},}}diff --git a/packages/js-sdk/tests/api/handleApiError.test.ts b/packages/js-sdk/tests/api/handleApiError.test.tsindex 249850280..31ad79ba4 100644--- a/packages/js-sdk/tests/api/handleApiError.test.ts+++ b/packages/js-sdk/tests/api/handleApiError.test.ts@@ -1,4 +1,4 @@-import { afterEach, assert, test, describe } from 'vitest'+import { assert, test, describe } from 'vitest'import { handleApiError } from '../../src/api'import {AuthenticationError,@@ -7,38 +7,17 @@ import {SandboxError,} from '../../src/errors'-const originalRequestSource = process.env.E2B_USER_AGENT_SOURCE--afterEach(() => {- if (originalRequestSource === undefined) {- delete process.env.E2B_USER_AGENT_SOURCE- } else {- process.env.E2B_USER_AGENT_SOURCE = originalRequestSource- }-})-function createMockResponse(status: number,error: unknown,- data?: unknown,- headers: Headers = new Headers()+ data?: unknown): {- response: {- status: number- statusText: string- ok: boolean- headers: Headers- }+ response: { status: number; ok: boolean }error: unknowndata: unknown} {return {- response: {- status,- statusText: '',- ok: status >= 200 && status < 300,- headers,- },+ response: { status, ok: status >= 200 && status < 300 },error,data,}@@ -184,34 +163,6 @@ describe('handleApiError', () => {})})- test('does not change failed response errors in CI', () => {- process.env.E2B_USER_AGENT_SOURCE = 'ci'- const res = createMockResponse(- 500,- { message: 'Internal error' },- undefined,- new Headers({ 'X-E2B-Trace-ID': 'trace-123' })- )-- const err = handleApiError(res as any)-- assert.equal(err?.message, '500: Internal error')- })-- test('does not change failed response errors outside CI', () => {- delete process.env.E2B_USER_AGENT_SOURCE- const res = createMockResponse(- 500,- { message: 'Internal error' },- undefined,- new Headers({ 'X-E2B-Trace-ID': 'trace-123' })- )-- const err = handleApiError(res as any)-- assert.equal(err?.message, '500: Internal error')- })-describe('success responses', () => {test('returns undefined for 200 success', () => {const res = createMockResponse(200, undefined, { id: '123' })diff --git a/packages/js-sdk/tests/connectionConfig.test.ts b/packages/js-sdk/tests/connectionConfig.test.tsindex 2b7df98f4..5c7a2065c 100644--- a/packages/js-sdk/tests/connectionConfig.test.ts+++ b/packages/js-sdk/tests/connectionConfig.test.ts@@ -18,7 +18,6 @@ beforeEach(() => {E2B_SANDBOX_URL: process.env.E2B_SANDBOX_URL,E2B_HTTP_VERSION: process.env.E2B_HTTP_VERSION,E2B_DEBUG: process.env.E2B_DEBUG,- E2B_USER_AGENT_SOURCE: process.env.E2B_USER_AGENT_SOURCE,}})@@ -225,23 +224,10 @@ test('setIntegration appends the integration to the user agent', () => {const config = new ConnectionConfig()assert.equal(config.headers?.['User-Agent']?.startsWith('e2b-js-sdk/'), true)- assert.include(config.headers?.['User-Agent']?.split(' '), 'testing/version')-})--test('user agent includes the configured traffic source', () => {- process.env.E2B_USER_AGENT_SOURCE = 'ci'-- const config = new ConnectionConfig()-- assert.equal(config.headers?.['User-Agent']?.endsWith(' source/ci'), true)-})--test('user agent ignores an unsafe traffic source', () => {- process.env.E2B_USER_AGENT_SOURCE = 'ci bad\nheader'-- const config = new ConnectionConfig()-- assert.equal(config.headers?.['User-Agent']?.includes('source/'), false)+ assert.equal(+ config.headers?.['User-Agent']?.endsWith(' testing/version'),+ true+ )})test('integration survives config rebuilds', () => {@@ -249,9 +235,9 @@ test('integration survives config rebuilds', () => {const config = new ConnectionConfig()const rebuiltConfig = new ConnectionConfig({ ...config })- assert.include(- rebuiltConfig.headers?.['User-Agent']?.split(' '),- 'testing/version'+ assert.equal(+ rebuiltConfig.headers?.['User-Agent']?.endsWith(' testing/version'),+ true)})@@ -261,7 +247,10 @@ test('setIntegration does not retro-tag configs built earlier', () => {const after = new ConnectionConfig()assert.equal(before.headers?.['User-Agent']?.includes('testing'), false)- assert.include(after.headers?.['User-Agent']?.split(' '), 'testing/version')+ assert.equal(+ after.headers?.['User-Agent']?.endsWith(' testing/version'),+ true+ )})test('clearing the integration restores the plain user agent', () => {diff --git a/packages/js-sdk/tests/logs.test.ts b/packages/js-sdk/tests/logs.test.tsindex 7d9b491da..e22dc3dac 100644--- a/packages/js-sdk/tests/logs.test.ts+++ b/packages/js-sdk/tests/logs.test.ts@@ -1,16 +1,7 @@-import { afterEach, assert, describe, test } from 'vitest'-import { createApiLogger, createRpcLogger } from '../src/logs'+import { assert, describe, test } from 'vitest'+import { createRpcLogger } from '../src/logs'const req = { url: 'http://localhost:49983/process.Process/Start' } as any-const originalRequestSource = process.env.E2B_USER_AGENT_SOURCE--afterEach(() => {- if (originalRequestSource === undefined) {- delete process.env.E2B_USER_AGENT_SOURCE- } else {- process.env.E2B_USER_AGENT_SOURCE = originalRequestSource- }-})describe('createRpcLogger', () => {test('logs unary responses containing bigint fields without throwing', async () => {@@ -46,60 +37,3 @@ describe('createRpcLogger', () => {])})})--describe('createApiLogger', () => {- test('observes requests without replacing them', async () => {- const logs: any[][] = []- const middleware = createApiLogger({- info: (...args) => logs.push(args),- })- const request = new Request('https://api.e2b.app/sandboxes')-- const result = await middleware.onRequest?.({ request } as any)-- assert.isUndefined(result)- assert.deepEqual(logs, [['Request GET https://api.e2b.app/sandboxes']])- })-- test('logs the E2B trace ID for CI failed responses', async () => {- const logs: any[][] = []- const middleware = createApiLogger(- {- error: (...args) => logs.push(args),- },- true- )- const response = new Response(null, {- status: 500,- statusText: 'Internal Server Error',- headers: { 'X-E2B-Trace-ID': 'trace-123' },- })-- const result = await middleware.onResponse?.({ response } as any)-- assert.isUndefined(result)- assert.deepEqual(logs, [- ['Response:', 500, 'Internal Server Error', 'trace_id=trace-123'],- ])- })-- test('does not log the E2B trace ID outside CI', async () => {- const logs: any[][] = []- const middleware = createApiLogger(- {- error: (...args) => logs.push(args),- },- false- )- const response = new Response(null, {- status: 500,- statusText: 'Internal Server Error',- headers: { 'X-E2B-Trace-ID': 'trace-123' },- })-- const result = await middleware.onResponse?.({ response } as any)-- assert.isUndefined(result)- assert.deepEqual(logs, [['Response:', 500, 'Internal Server Error']])- })-})diff --git a/packages/js-sdk/tests/runtimes/cloudflare-deploy/wrangler.jsonc b/packages/js-sdk/tests/runtimes/cloudflare-deploy/wrangler.jsoncindex 013e14409..5594e5be3 100644--- a/packages/js-sdk/tests/runtimes/cloudflare-deploy/wrangler.jsonc+++ b/packages/js-sdk/tests/runtimes/cloudflare-deploy/wrangler.jsonc@@ -3,5 +3,4 @@"main": "worker.mjs","compatibility_date": "2026-03-01","compatibility_flags": ["nodejs_compat"],- "vars": { "E2B_USER_AGENT_SOURCE": "ci" },}diff --git a/packages/js-sdk/tests/sandbox/lifecyclePayload.test.ts b/packages/js-sdk/tests/sandbox/lifecyclePayload.test.tsindex 823a3abaf..e4aeb905f 100644--- a/packages/js-sdk/tests/sandbox/lifecyclePayload.test.ts+++ b/packages/js-sdk/tests/sandbox/lifecyclePayload.test.ts@@ -24,11 +24,6 @@ async function waitForState()}-function withRequestSource(url: string): string {- const source = process.env.E2B_USER_AGENT_SOURCE- return source ? `${url}?source=${encodeURIComponent(source)}` : url-}-test.skipIf(isDebug)('auto-pause without auto-resume requires connect to wake',async () => {@@ -120,7 +115,7 @@ sandboxTest.skipIf(isDebug)(// Each request is a wake signal; keep sending them until the guest// server answers, since a request that races the pause finalizing or// times out at the gateway while the sandbox resumes may not wake it.- const url = withRequestSource(`https://${sandbox.getHost(8000)}`)+ const url = `https://${sandbox.getHost(8000)}`await waitForHttpStatus(url, 200, { timeoutMs: 60_000 })await waitForState(sandbox, 'running')assert.isTrue(await sandbox.isRunning())diff --git a/packages/python-sdk/e2b/api/__init__.py b/packages/python-sdk/e2b/api/__init__.pyindex 321bd5318..c656731dd 100644--- a/packages/python-sdk/e2b/api/__init__.py+++ b/packages/python-sdk/e2b/api/__init__.py@@ -47,58 +47,40 @@ def encode_path_param(value: str) -> str:return quote(value, safe="")-def make_logging_event_hooks(- log: Optional[logging.Logger], include_diagnostics: bool = False-) -> dict:+def make_logging_event_hooks(log: Optional[logging.Logger]) -> dict:"""Build synchronous httpx ``event_hooks`` that log requests and responsesto the given ``logging.Logger``. Requests log at ``INFO``, successfulresponses at ``INFO`` and responses with status >= 400 at ``ERROR``.- Returns no hooks when ``log`` is ``None`` unless CI diagnostics are enabled;- that mode logs failed responses only."""- if log is None and not include_diagnostics:+ Returns no hooks when ``log`` is ``None`` so that nothing is logged unless a+ logger was explicitly supplied."""+ if log is None:return {}- response_log = log or logging.getLogger("e2b.ci")-def on_request(request) -> None:- if log is not None:- log.info(f"Request {request.method} {request.url}")+ log.info(f"Request {request.method} {request.url}")def on_response(response: Response) -> None:if response.status_code >= 400:- trace_id = (- response.headers.get("X-E2B-Trace-ID") if include_diagnostics else None- )- trace_suffix = f" trace_id={trace_id}" if trace_id else ""- response_log.error(f"Response {response.status_code}{trace_suffix}")- elif log is not None:+ log.error(f"Response {response.status_code}")+ else:log.info(f"Response {response.status_code}")return {"request": [on_request], "response": [on_response]}-def make_async_logging_event_hooks(- log: Optional[logging.Logger], include_diagnostics: bool = False-) -> dict:+def make_async_logging_event_hooks(log: Optional[logging.Logger]) -> dict:"""Asynchronous counterpart of :func:`make_logging_event_hooks`."""- if log is None and not include_diagnostics:+ if log is None:return {}- response_log = log or logging.getLogger("e2b.ci")-async def on_request(request) -> None:- if log is not None:- log.info(f"Request {request.method} {request.url}")+ log.info(f"Request {request.method} {request.url}")async def on_response(response: Response) -> None:if response.status_code >= 400:- trace_id = (- response.headers.get("X-E2B-Trace-ID") if include_diagnostics else None- )- trace_suffix = f" trace_id={trace_id}" if trace_id else ""- response_log.error(f"Response {response.status_code}{trace_suffix}")- elif log is not None:+ log.error(f"Response {response.status_code}")+ else:log.info(f"Response {response.status_code}")return {"request": [on_request], "response": [on_response]}@@ -297,10 +279,7 @@ def handle_api_exception(return errreturn api_exception_from_code(- e.status_code,- message,- default_exception_class,- stack_trace,+ e.status_code, message, default_exception_class, stack_trace)@@ -343,7 +322,6 @@ class ApiClient(AuthenticatedClient):prefix = ""self._logger = config.logger- self._include_diagnostics = config.request_source == "ci"headers = {**default_headers,@@ -384,14 +362,10 @@ class ApiClient(AuthenticatedClient):)def _logging_event_hooks(self) -> dict:- return make_logging_event_hooks(- self._logger, include_diagnostics=self._include_diagnostics- )+ return make_logging_event_hooks(self._logger)# We need to override the logging hooks for the async usageclass AsyncApiClient(ApiClient):def _logging_event_hooks(self) -> dict:- return make_async_logging_event_hooks(- self._logger, include_diagnostics=self._include_diagnostics- )+ return make_async_logging_event_hooks(self._logger)diff --git a/packages/python-sdk/e2b/connection_config.py b/packages/python-sdk/e2b/connection_config.pyindex 1d6bf148c..2802e0d34 100644--- a/packages/python-sdk/e2b/connection_config.py+++ b/packages/python-sdk/e2b/connection_config.py@@ -1,6 +1,5 @@import loggingimport os-import refrom typing import cast, Literal, Mapping, Optional, Dict, Tuple, TypedDict, Union@@ -233,22 +232,12 @@ class ConnectionConfig:return os.getenv("E2B_SANDBOX_URL")@staticmethod- def _get_request_source() -> Optional[str]:- source = os.getenv("E2B_USER_AGENT_SOURCE")- if source and re.fullmatch(r"[A-Za-z0-9][A-Za-z0-9._-]{0,31}", source):- return source- return None-- @staticmethod- def _build_user_agent(request_source: Optional[str] = None) -> str:+ def _build_user_agent() -> str:user_agent_parts = [f"e2b-python-sdk/{package_version}"]if ConnectionConfig._integration:user_agent_parts.append(ConnectionConfig._integration)- if request_source:- user_agent_parts.append(f"source/{request_source}")-return " ".join(user_agent_parts)def _apply_user_agent(@@ -268,7 +257,7 @@ class ConnectionConfig:headers["User-Agent"] = user_agent_overridereturn False- headers["User-Agent"] = self._build_user_agent(self.request_source)+ headers["User-Agent"] = self._build_user_agent()return Truedef __init__(@@ -294,7 +283,6 @@ class ConnectionConfig:self.debug = debug if debug is not None else ConnectionConfig._debug()self.api_key = api_key or ConnectionConfig._api_key()self.validate_api_key = validate_api_key- self.request_source = ConnectionConfig._get_request_source()self.headers = {**(headers or {}), **(api_headers or {})}self._user_agent_is_sdk_built = self._apply_user_agent(self.headers,diff --git a/packages/python-sdk/tests/async/sandbox_async/test_config_propagation.py b/packages/python-sdk/tests/async/sandbox_async/test_config_propagation.pyindex c2a852016..feada7d5e 100644--- a/packages/python-sdk/tests/async/sandbox_async/test_config_propagation.py+++ b/packages/python-sdk/tests/async/sandbox_async/test_config_propagation.py@@ -98,7 +98,6 @@ async def test_connect_sets_stable_host_routing_headers(monkeypatch, test_api_kemonkeypatch.setattr(sandbox_async_main.SandboxApi, "_cls_connect", mock_connect)monkeypatch.setattr(ConnectionConfig, "_integration", "testing/version")- monkeypatch.setenv("E2B_USER_AGENT_SOURCE", "ci")config = ConnectionConfig(api_key=test_api_key,headers=BASE_HEADERS,@@ -113,9 +112,9 @@ async def test_connect_sets_stable_host_routing_headers(monkeypatch, test_api_keassert sandbox.connection_config.sandbox_headers["User-Agent"].startswith("e2b-python-sdk/")- user_agent_tokens = sandbox.connection_config.sandbox_headers["User-Agent"].split()- assert "testing/version" in user_agent_tokens- assert "source/ci" in user_agent_tokens+ assert sandbox.connection_config.sandbox_headers["User-Agent"].endswith(+ " testing/version"+ )assert sandbox.connection_config.sandbox_headers["E2b-Sandbox-Id"] == "sbx-test"assert sandbox.connection_config.sandbox_headers["E2b-Sandbox-Port"] == str(ConnectionConfig.envd_portdiff --git a/packages/python-sdk/tests/sync/sandbox_sync/test_config_propagation.py b/packages/python-sdk/tests/sync/sandbox_sync/test_config_propagation.pyindex f3cfe0c9b..4b0c9c533 100644--- a/packages/python-sdk/tests/sync/sandbox_sync/test_config_propagation.py+++ b/packages/python-sdk/tests/sync/sandbox_sync/test_config_propagation.py@@ -91,7 +91,6 @@ def test_connect_sets_stable_host_routing_headers(monkeypatch, test_api_key):monkeypatch.setattr(sandbox_sync_main.SandboxApi, "_cls_connect", mock_connect)monkeypatch.setattr(ConnectionConfig, "_integration", "testing/version")- monkeypatch.setenv("E2B_USER_AGENT_SOURCE", "ci")config = ConnectionConfig(api_key=test_api_key,headers=BASE_HEADERS,@@ -106,9 +105,9 @@ def test_connect_sets_stable_host_routing_headers(monkeypatch, test_api_key):assert sandbox.connection_config.sandbox_headers["User-Agent"].startswith("e2b-python-sdk/")- user_agent_tokens = sandbox.connection_config.sandbox_headers["User-Agent"].split()- assert "testing/version" in user_agent_tokens- assert "source/ci" in user_agent_tokens+ assert sandbox.connection_config.sandbox_headers["User-Agent"].endswith(+ " testing/version"+ )assert sandbox.connection_config.sandbox_headers["E2b-Sandbox-Id"] == "sbx-test"assert sandbox.connection_config.sandbox_headers["E2b-Sandbox-Port"] == str(ConnectionConfig.envd_portdiff --git a/packages/python-sdk/tests/test_connection_config.py b/packages/python-sdk/tests/test_connection_config.pyindex 5e653822d..18e7cbdeb 100644--- a/packages/python-sdk/tests/test_connection_config.py+++ b/packages/python-sdk/tests/test_connection_config.py@@ -120,7 +120,7 @@ def test_set_integration_appends_to_user_agent():config = ConnectionConfig()assert config.headers["User-Agent"].startswith("e2b-python-sdk/")- assert "testing/version" in config.headers["User-Agent"].split()+ assert config.headers["User-Agent"].endswith(" testing/version")finally:ConnectionConfig.set_integration(None)@@ -128,22 +128,6 @@ def test_set_integration_appends_to_user_agent():assert "testing" not in config.headers["User-Agent"]-def test_user_agent_includes_configured_traffic_source(monkeypatch):- monkeypatch.setenv("E2B_USER_AGENT_SOURCE", "ci")-- config = ConnectionConfig()-- assert config.headers["User-Agent"].endswith(" source/ci")---def test_user_agent_ignores_unsafe_traffic_source(monkeypatch):- monkeypatch.setenv("E2B_USER_AGENT_SOURCE", "ci bad\nheader")-- config = ConnectionConfig()-- assert "source/" not in config.headers["User-Agent"]--def test_custom_user_agent_is_preserved_without_integration():config = ConnectionConfig(api_headers={"User-Agent": "custom/1.0"})@@ -164,11 +148,10 @@ def test_integration_survives_api_param_rebuilds(monkeypatch):config = ConnectionConfig()rebuilt_config = ConnectionConfig(**config.get_api_params())- assert "testing/version" in rebuilt_config.headers["User-Agent"].split()- rebuilt_user_agent = rebuilt_config.get_api_params(api_headers={"X-Test": "1"})[- "headers"- ]["User-Agent"]- assert "testing/version" in rebuilt_user_agent.split()+ assert rebuilt_config.headers["User-Agent"].endswith(" testing/version")+ assert rebuilt_config.get_api_params(api_headers={"X-Test": "1"})["headers"][+ "User-Agent"+ ].endswith(" testing/version")def test_cleared_integration_does_not_leak_into_api_param_rebuilds():diff --git a/packages/python-sdk/tests/test_logging_option.py b/packages/python-sdk/tests/test_logging_option.pyindex 79995edbd..c10592075 100644--- a/packages/python-sdk/tests/test_logging_option.py+++ b/packages/python-sdk/tests/test_logging_option.py@@ -1,13 +1,11 @@import inspectimport logging-import asynciofrom types import SimpleNamespacefrom e2b import AsyncSandbox, ConnectionConfig, Sandboxfrom e2b.envd.interceptors import LoggingInterceptor, build_interceptorsfrom e2b.api import (ApiClient,- handle_api_exception,make_async_logging_event_hooks,make_logging_event_hooks,)@@ -74,10 +72,9 @@ def test_api_client_uses_config_logger():client.get_httpx_client().close()-def test_api_client_without_logger_outside_ci_emits_no_hooks(monkeypatch):+def test_api_client_without_logger_emits_no_hooks():# With no logger supplied, nothing should be logged (matching the JS SDK,# which only attaches its logging middleware when a logger is given).- monkeypatch.delenv("E2B_USER_AGENT_SOURCE", raising=False)config = ConnectionConfig(api_key="e2b_" + "0" * 40)client = ApiClient(config)try:@@ -167,8 +164,7 @@ def test_logging_event_hooks_without_logger_are_empty():assert make_async_logging_event_hooks(None) == {}-def test_sync_logging_event_hooks_emit_records(caplog, monkeypatch):- monkeypatch.delenv("E2B_USER_AGENT_SOURCE", raising=False)+def test_sync_logging_event_hooks_emit_records(caplog):log = logging.getLogger("test.hooks.sync")hooks = make_logging_event_hooks(log)@@ -177,14 +173,13 @@ def test_sync_logging_event_hooks_emit_records(caplog, monkeypatch):url = "https://example.com/foo"class _Resp:- def __init__(self, status_code, headers=None):+ def __init__(self, status_code):self.status_code = status_code- self.headers = headers or {}with caplog.at_level(logging.DEBUG, logger="test.hooks.sync"):hooks["request"][0](_Req())hooks["response"][0](_Resp(200))- hooks["response"][0](_Resp(500, {"X-E2B-Trace-ID": "trace-123"}))+ hooks["response"][0](_Resp(500))levels = [(r.levelno, r.getMessage()) for r in caplog.records]assert (logging.INFO, "Request GET https://example.com/foo") in levels@@ -197,67 +192,3 @@ def test_make_async_logging_event_hooks_shape():assert set(hooks) == {"request", "response"}assert len(hooks["request"]) == 1assert len(hooks["response"]) == 1---def test_async_logging_event_hooks_log_trace_id_for_ci_failure(caplog, monkeypatch):- monkeypatch.setenv("E2B_USER_AGENT_SOURCE", "ci")- log = logging.getLogger("test.hooks.async")- hooks = make_async_logging_event_hooks(log, include_diagnostics=True)- response = SimpleNamespace(- status_code=500,- headers={"X-E2B-Trace-ID": "trace-123"},- )-- with caplog.at_level(logging.ERROR, logger="test.hooks.async"):- asyncio.run(hooks["response"][0](response))-- assert (logging.ERROR, "Response 500 trace_id=trace-123") in [- (record.levelno, record.getMessage()) for record in caplog.records- ]---def test_api_client_diagnostics_follow_captured_request_source(caplog, monkeypatch):- api_key = "e2b_" + "0" * 40- monkeypatch.setenv("E2B_USER_AGENT_SOURCE", "ci")- ci_client = ApiClient(ConnectionConfig(api_key=api_key))- monkeypatch.delenv("E2B_USER_AGENT_SOURCE")- normal_client = ApiClient(ConnectionConfig(api_key=api_key))- monkeypatch.setenv("E2B_USER_AGENT_SOURCE", "ci")-- response = SimpleNamespace(- status_code=500,- headers={"X-E2B-Trace-ID": "trace-123"},- )- with caplog.at_level(logging.ERROR, logger="e2b.ci"):- ci_client._logging_event_hooks()["response"][0](response)-- assert (logging.ERROR, "Response 500 trace_id=trace-123") in [- (record.levelno, record.getMessage()) for record in caplog.records- ]- assert normal_client._logging_event_hooks() == {}---def test_ci_api_exception_keeps_public_message(monkeypatch):- monkeypatch.setenv("E2B_USER_AGENT_SOURCE", "ci")- response = SimpleNamespace(- status_code=500,- content=b'{"message":"Internal error"}',- headers={"X-E2B-Trace-ID": "trace-123"},- )-- error = handle_api_exception(response)-- assert str(error) == "500: Internal error"---def test_api_exception_does_not_include_trace_id_outside_ci(monkeypatch):- monkeypatch.delenv("E2B_USER_AGENT_SOURCE", raising=False)- response = SimpleNamespace(- status_code=500,- content=b'{"message":"Internal error"}',- headers={"X-E2B-Trace-ID": "trace-123"},- )-- error = handle_api_exception(response)-- assert str(error) == "500: Internal error"diff --git a/vitest.cloudflare.config.mts b/vitest.cloudflare.config.mtsindex 7d74e4164..ae4ccb4bc 100644--- a/vitest.cloudflare.config.mts+++ b/vitest.cloudflare.config.mts@@ -53,10 +53,6 @@ export function createCloudflareVitestConfig({E2B_API_KEY:process.env.E2B_API_KEY ?? env.parsed?.E2B_API_KEY ?? '',E2B_DOMAIN: process.env.E2B_DOMAIN ?? env.parsed?.E2B_DOMAIN ?? '',- E2B_USER_AGENT_SOURCE:- process.env.E2B_USER_AGENT_SOURCE ??- env.parsed?.E2B_USER_AGENT_SOURCE ??- '',},},}),