e2b-code-interpreter 2.10.1__tar.gz → 2.10.4__tar.gz

{e2b_code_interpreter-2.10.1 → e2b_code_interpreter-2.10.4}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: e2b-code-interpreter
-Version: 2.10.1
+Version: 2.10.4
 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.52.0,<3.0.0
+Requires-Dist: e2b>=2.55.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.1 → e2b_code_interpreter-2.10.4}/e2b_code_interpreter/code_interpreter_async.py

@@ -1,7 +1,7 @@
 import logging
 import httpx
 
-from typing import cast, Optional, Dict, overload, Union, List
+from typing import Optional, Dict, overload, Union, List
 from httpx import AsyncClient
 
 from e2b import (
@@ -61,24 +61,9 @@ class AsyncSandbox(BaseAsyncSandbox):
 
     @property
     def _jupyter_url(self) -> str:
-        # Honors the `sandbox_url` option and the `E2B_SANDBOX_URL` environment
-        # variable, same as the base SDK does for envd requests.
-        sandbox_url = cast(Optional[str], self.connection_config._sandbox_url)
-        if sandbox_url:
-            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"
+        return self.connection_config.get_sandbox_url(
+            self.sandbox_id, self.sandbox_domain, port=JUPYTER_PORT
+        )
 
     @property
     def _client(self) -> AsyncClient:
@@ -223,7 +208,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 +233,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 +291,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 +332,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 +362,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 +401,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.1 → e2b_code_interpreter-2.10.4}/e2b_code_interpreter/code_interpreter_sync.py

@@ -1,7 +1,7 @@
 import logging
 import httpx
 
-from typing import cast, Optional, Dict, overload, Union, List
+from typing import Optional, Dict, overload, Union, List
 from httpx import Client
 from e2b import Sandbox as BaseSandbox, InvalidArgumentException
 from e2b.api.client_sync import get_transport
@@ -58,24 +58,9 @@ class Sandbox(BaseSandbox):
 
     @property
     def _jupyter_url(self) -> str:
-        # Honors the `sandbox_url` option and the `E2B_SANDBOX_URL` environment
-        # variable, same as the base SDK does for envd requests.
-        sandbox_url = cast(Optional[str], self.connection_config._sandbox_url)
-        if sandbox_url:
-            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"
+        return self.connection_config.get_sandbox_url(
+            self.sandbox_id, self.sandbox_domain, port=JUPYTER_PORT
+        )
 
     @property
     def _client(self) -> Client:
@@ -220,7 +205,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 +230,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 +288,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
 
@@ -344,12 +329,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:
@@ -374,12 +359,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
 
@@ -414,12 +399,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.1 → e2b_code_interpreter-2.10.4}/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.1 → e2b_code_interpreter-2.10.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "e2b-code-interpreter"
-version = "2.10.1"
+version = "2.10.4"
 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.52.0,<3.0.0",
+    "e2b>=2.55.0,<3.0.0",
 ]
 
 [project.urls]