e2b-code-interpreter 2.10.0__tar.gz → 2.10.3__tar.gz

{e2b_code_interpreter-2.10.0 → e2b_code_interpreter-2.10.3}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: e2b-code-interpreter
-Version: 2.10.0
+Version: 2.10.3
 Summary: E2B Code Interpreter - Stateful code execution
 Author: e2b
 Author-email: e2b <hello@e2b.dev>
 License-Expression: MIT
 Requires-Dist: httpx>=0.20.0,<1.0.0
 Requires-Dist: attrs>=21.3.0
-Requires-Dist: e2b>=2.44.0,<3.0.0
+Requires-Dist: e2b>=2.53.0,<3.0.0
 Requires-Python: >=3.10
 Project-URL: Homepage, https://e2b.dev/?utm_source=pypi&utm_medium=referral&utm_campaign=package_homepage&utm_content=e2b-code-interpreter
 Project-URL: Repository, https://github.com/e2b-dev/e2b/tree/main/packages/code-interpreter-python

{e2b_code_interpreter-2.10.0 → e2b_code_interpreter-2.10.3}/e2b_code_interpreter/code_interpreter_async.py

@@ -68,24 +68,12 @@ class AsyncSandbox(BaseAsyncSandbox):
             return sandbox_url
         return 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"
-
     @property
     def _client(self) -> AsyncClient:
         # TODO: Remove later
         # Use a dedicated HTTP/1.1 transport for Jupyter requests.
         #
-        # The base SDK's shared transport now defaults to http2=True. With
+        # The base SDK's shared transport now defaults to HTTP/2. With
         # HTTP/2, multiple requests are multiplexed over a single TCP
         # connection, so when a client cancels a request (e.g. the caller
         # disconnects from the streaming `/execute` endpoint) the server
@@ -98,7 +86,7 @@ class AsyncSandbox(BaseAsyncSandbox):
         # cancelled reliably. The helper also caches the transport
         # per-event-loop for async.
         return AsyncClient(
-            transport=get_transport(self.connection_config, http2=False),
+            transport=get_transport(self.connection_config, http_version="1.1"),
         )
 
     async def _handle_connection_error(self, err: Exception) -> None:
@@ -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_token
 
             response = 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_token
 
             response = 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 err
         except httpx.TimeoutException:
@@ -377,12 +365,12 @@ class AsyncSandbox(BaseAsyncSandbox):
                 headers["E2B-Traffic-Access-Token"] = self.traffic_access_token
 
             response = 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_token
 
             response = 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 err
         except httpx.TimeoutException:

{e2b_code_interpreter-2.10.0 → e2b_code_interpreter-2.10.3}/e2b_code_interpreter/code_interpreter_sync.py

@@ -65,24 +65,12 @@ class Sandbox(BaseSandbox):
             return sandbox_url
         return 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"
-
     @property
     def _client(self) -> Client:
         # TODO: Remove later
         # Use a dedicated HTTP/1.1 transport for Jupyter requests.
         #
-        # The base SDK's shared transport now defaults to http2=True. With
+        # The base SDK's shared transport now defaults to HTTP/2. With
         # HTTP/2, multiple requests are multiplexed over a single TCP
         # connection, so when a client cancels a request (e.g. the caller
         # disconnects from the streaming `/execute` endpoint) the server
@@ -93,7 +81,9 @@ class Sandbox(BaseSandbox):
         # connection and request, so client disconnects propagate to the
         # server as a TCP close and long-running executions can be
         # cancelled reliably.
-        return Client(transport=get_transport(self.connection_config, http2=False))
+        return Client(
+            transport=get_transport(self.connection_config, http_version="1.1")
+        )
 
     def _handle_connection_error(self, err: Exception) -> None:
         """
@@ -218,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,
@@ -243,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
 
@@ -301,13 +291,13 @@ class Sandbox(BaseSandbox):
                 headers["E2B-Traffic-Access-Token"] = self.traffic_access_token
 
             response = 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
 
@@ -342,12 +332,12 @@ class Sandbox(BaseSandbox):
                 headers["E2B-Traffic-Access-Token"] = self.traffic_access_token
 
             response = 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 err
         except httpx.TimeoutException:
@@ -372,12 +362,12 @@ class Sandbox(BaseSandbox):
                 headers["E2B-Traffic-Access-Token"] = self.traffic_access_token
 
             response = 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
 
@@ -412,12 +402,12 @@ class Sandbox(BaseSandbox):
                 headers["E2B-Traffic-Access-Token"] = self.traffic_access_token
 
             response = 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 err
         except httpx.TimeoutException:

{e2b_code_interpreter-2.10.0 → e2b_code_interpreter-2.10.3}/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 None
 
     await 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 None
 
     res.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 ''}"
         )
 
 

{e2b_code_interpreter-2.10.0 → e2b_code_interpreter-2.10.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "e2b-code-interpreter"
-version = "2.10.0"
+version = "2.10.3"
 description = "E2B Code Interpreter - Stateful code execution"
 authors = [{ name = "e2b", email = "hello@e2b.dev" }]
 license = "MIT"
@@ -9,7 +9,7 @@ requires-python = ">=3.10"
 dependencies = [
     "httpx>=0.20.0,<1.0.0",
     "attrs>=21.3.0",
-    "e2b>=2.44.0,<3.0.0",
+    "e2b>=2.53.0,<3.0.0",
 ]
 
 [project.urls]