e2b-code-interpreter 2.8.0__tar.gz → 2.9.0__tar.gz

{e2b_code_interpreter-2.8.0 → e2b_code_interpreter-2.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e2b-code-interpreter
-Version: 2.8.0
+Version: 2.9.0
 Summary: E2B Code Interpreter - Stateful code execution
 Home-page: https://e2b.dev/
 License: MIT

{e2b_code_interpreter-2.8.0 → e2b_code_interpreter-2.9.0}/e2b_code_interpreter/code_interpreter_async.py

@@ -29,6 +29,7 @@ from e2b_code_interpreter.models import (
 from e2b_code_interpreter.exceptions import (
     format_execution_timeout_error,
     format_request_timeout_error,
+    format_sandbox_killed_error,
 )
 
 logger = logging.getLogger(__name__)
@@ -60,6 +61,11 @@ 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 = 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)}"
 
     @property
@@ -83,6 +89,23 @@ class AsyncSandbox(BaseAsyncSandbox):
             transport=get_transport(self.connection_config, http2=False),
         )
 
+    async def _handle_connection_error(self, err: Exception) -> None:
+        """
+        Raises a descriptive exception if the connection error was caused by
+        the sandbox being killed mid-request. If the sandbox is still running
+        (or its state can't be determined), returns so the caller can re-raise
+        the original error.
+        """
+        try:
+            running = await self.is_running()
+        except Exception:
+            # The state check itself failed, so we can't tell whether the
+            # sandbox was killed — let the caller re-raise the original error
+            # instead of wrongly claiming the sandbox is gone.
+            return
+        if not running:
+            raise format_sandbox_killed_error() from err
+
     @overload
     async def run_code(
         self,
@@ -178,6 +201,8 @@ class AsyncSandbox(BaseAsyncSandbox):
         try:
             headers = {
                 "Content-Type": "application/json",
+                "E2b-Sandbox-Id": self.sandbox_id,
+                "E2b-Sandbox-Port": str(JUPYTER_PORT),
             }
             if self._envd_access_token:
                 headers["X-Access-Token"] = self._envd_access_token
@@ -217,6 +242,9 @@ class AsyncSandbox(BaseAsyncSandbox):
             raise format_execution_timeout_error()
         except httpx.TimeoutException:
             raise format_request_timeout_error()
+        except (httpx.ReadError, httpx.RemoteProtocolError) as err:
+            await self._handle_connection_error(err)
+            raise
 
     async def create_code_context(
         self,
@@ -244,6 +272,8 @@ class AsyncSandbox(BaseAsyncSandbox):
         try:
             headers = {
                 "Content-Type": "application/json",
+                "E2b-Sandbox-Id": self.sandbox_id,
+                "E2b-Sandbox-Port": str(JUPYTER_PORT),
             }
             if self.traffic_access_token:
                 headers["E2B-Traffic-Access-Token"] = self.traffic_access_token
@@ -263,6 +293,9 @@ class AsyncSandbox(BaseAsyncSandbox):
             return Context.from_json(data)
         except httpx.TimeoutException:
             raise format_request_timeout_error()
+        except (httpx.ReadError, httpx.RemoteProtocolError) as err:
+            await self._handle_connection_error(err)
+            raise
 
     async def remove_code_context(
         self,
@@ -280,6 +313,8 @@ class AsyncSandbox(BaseAsyncSandbox):
         try:
             headers = {
                 "Content-Type": "application/json",
+                "E2b-Sandbox-Id": self.sandbox_id,
+                "E2b-Sandbox-Port": str(JUPYTER_PORT),
             }
             if self.traffic_access_token:
                 headers["E2B-Traffic-Access-Token"] = self.traffic_access_token
@@ -295,6 +330,9 @@ class AsyncSandbox(BaseAsyncSandbox):
                 raise err
         except httpx.TimeoutException:
             raise format_request_timeout_error()
+        except (httpx.ReadError, httpx.RemoteProtocolError) as err:
+            await self._handle_connection_error(err)
+            raise
 
     async def list_code_contexts(self) -> List[Context]:
         """
@@ -305,6 +343,8 @@ class AsyncSandbox(BaseAsyncSandbox):
         try:
             headers = {
                 "Content-Type": "application/json",
+                "E2b-Sandbox-Id": self.sandbox_id,
+                "E2b-Sandbox-Port": str(JUPYTER_PORT),
             }
             if self.traffic_access_token:
                 headers["E2B-Traffic-Access-Token"] = self.traffic_access_token
@@ -323,6 +363,9 @@ class AsyncSandbox(BaseAsyncSandbox):
             return [Context.from_json(context_data) for context_data in data]
         except httpx.TimeoutException:
             raise format_request_timeout_error()
+        except (httpx.ReadError, httpx.RemoteProtocolError) as err:
+            await self._handle_connection_error(err)
+            raise
 
     async def restart_code_context(
         self,
@@ -339,6 +382,8 @@ class AsyncSandbox(BaseAsyncSandbox):
         try:
             headers = {
                 "Content-Type": "application/json",
+                "E2b-Sandbox-Id": self.sandbox_id,
+                "E2b-Sandbox-Port": str(JUPYTER_PORT),
             }
             if self.traffic_access_token:
                 headers["E2B-Traffic-Access-Token"] = self.traffic_access_token
@@ -354,3 +399,6 @@ class AsyncSandbox(BaseAsyncSandbox):
                 raise err
         except httpx.TimeoutException:
             raise format_request_timeout_error()
+        except (httpx.ReadError, httpx.RemoteProtocolError) as err:
+            await self._handle_connection_error(err)
+            raise

{e2b_code_interpreter-2.8.0 → e2b_code_interpreter-2.9.0}/e2b_code_interpreter/code_interpreter_sync.py

@@ -25,6 +25,7 @@ from e2b_code_interpreter.models import (
 from e2b_code_interpreter.exceptions import (
     format_execution_timeout_error,
     format_request_timeout_error,
+    format_sandbox_killed_error,
 )
 
 logger = logging.getLogger(__name__)
@@ -57,6 +58,11 @@ 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 = 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)}"
 
     @property
@@ -77,6 +83,23 @@ class Sandbox(BaseSandbox):
         # cancelled reliably.
         return Client(transport=get_transport(self.connection_config, http2=False))
 
+    def _handle_connection_error(self, err: Exception) -> None:
+        """
+        Raises a descriptive exception if the connection error was caused by
+        the sandbox being killed mid-request. If the sandbox is still running
+        (or its state can't be determined), returns so the caller can re-raise
+        the original error.
+        """
+        try:
+            running = self.is_running()
+        except Exception:
+            # The state check itself failed, so we can't tell whether the
+            # sandbox was killed — let the caller re-raise the original error
+            # instead of wrongly claiming the sandbox is gone.
+            return
+        if not running:
+            raise format_sandbox_killed_error() from err
+
     @overload
     def run_code(
         self,
@@ -171,7 +194,11 @@ class Sandbox(BaseSandbox):
         context_id = context.id if context else None
 
         try:
-            headers: Dict[str, str] = {"Content-Type": "application/json"}
+            headers: Dict[str, str] = {
+                "Content-Type": "application/json",
+                "E2b-Sandbox-Id": self.sandbox_id,
+                "E2b-Sandbox-Port": str(JUPYTER_PORT),
+            }
             if self._envd_access_token:
                 headers["X-Access-Token"] = self._envd_access_token
             if self.traffic_access_token:
@@ -210,6 +237,9 @@ class Sandbox(BaseSandbox):
             raise format_execution_timeout_error()
         except httpx.TimeoutException:
             raise format_request_timeout_error()
+        except (httpx.ReadError, httpx.RemoteProtocolError) as err:
+            self._handle_connection_error(err)
+            raise
 
     def create_code_context(
         self,
@@ -235,9 +265,11 @@ class Sandbox(BaseSandbox):
             data["cwd"] = cwd
 
         try:
-            headers: Dict[str, str] = {"Content-Type": "application/json"}
-            if self._envd_access_token:
-                headers["X-Access-Token"] = self._envd_access_token
+            headers: Dict[str, str] = {
+                "Content-Type": "application/json",
+                "E2b-Sandbox-Id": self.sandbox_id,
+                "E2b-Sandbox-Port": str(JUPYTER_PORT),
+            }
             if self.traffic_access_token:
                 headers["E2B-Traffic-Access-Token"] = self.traffic_access_token
 
@@ -256,6 +288,9 @@ class Sandbox(BaseSandbox):
             return Context.from_json(data)
         except httpx.TimeoutException:
             raise format_request_timeout_error()
+        except (httpx.ReadError, httpx.RemoteProtocolError) as err:
+            self._handle_connection_error(err)
+            raise
 
     def remove_code_context(
         self,
@@ -271,9 +306,11 @@ class Sandbox(BaseSandbox):
         context_id = context.id if isinstance(context, Context) else context
 
         try:
-            headers: Dict[str, str] = {"Content-Type": "application/json"}
-            if self._envd_access_token:
-                headers["X-Access-Token"] = self._envd_access_token
+            headers: Dict[str, str] = {
+                "Content-Type": "application/json",
+                "E2b-Sandbox-Id": self.sandbox_id,
+                "E2b-Sandbox-Port": str(JUPYTER_PORT),
+            }
             if self.traffic_access_token:
                 headers["E2B-Traffic-Access-Token"] = self.traffic_access_token
 
@@ -288,6 +325,9 @@ class Sandbox(BaseSandbox):
                 raise err
         except httpx.TimeoutException:
             raise format_request_timeout_error()
+        except (httpx.ReadError, httpx.RemoteProtocolError) as err:
+            self._handle_connection_error(err)
+            raise
 
     def list_code_contexts(self) -> List[Context]:
         """
@@ -296,9 +336,11 @@ class Sandbox(BaseSandbox):
         :return: List of contexts.
         """
         try:
-            headers: Dict[str, str] = {"Content-Type": "application/json"}
-            if self._envd_access_token:
-                headers["X-Access-Token"] = self._envd_access_token
+            headers: Dict[str, str] = {
+                "Content-Type": "application/json",
+                "E2b-Sandbox-Id": self.sandbox_id,
+                "E2b-Sandbox-Port": str(JUPYTER_PORT),
+            }
             if self.traffic_access_token:
                 headers["E2B-Traffic-Access-Token"] = self.traffic_access_token
 
@@ -316,6 +358,9 @@ class Sandbox(BaseSandbox):
             return [Context.from_json(context_data) for context_data in data]
         except httpx.TimeoutException:
             raise format_request_timeout_error()
+        except (httpx.ReadError, httpx.RemoteProtocolError) as err:
+            self._handle_connection_error(err)
+            raise
 
     def restart_code_context(
         self,
@@ -331,9 +376,11 @@ class Sandbox(BaseSandbox):
         context_id = context.id if isinstance(context, Context) else context
 
         try:
-            headers: Dict[str, str] = {"Content-Type": "application/json"}
-            if self._envd_access_token:
-                headers["X-Access-Token"] = self._envd_access_token
+            headers: Dict[str, str] = {
+                "Content-Type": "application/json",
+                "E2b-Sandbox-Id": self.sandbox_id,
+                "E2b-Sandbox-Port": str(JUPYTER_PORT),
+            }
             if self.traffic_access_token:
                 headers["E2B-Traffic-Access-Token"] = self.traffic_access_token
 
@@ -348,3 +395,6 @@ class Sandbox(BaseSandbox):
                 raise err
         except httpx.TimeoutException:
             raise format_request_timeout_error()
+        except (httpx.ReadError, httpx.RemoteProtocolError) as err:
+            self._handle_connection_error(err)
+            raise

{e2b_code_interpreter-2.8.0 → e2b_code_interpreter-2.9.0}/e2b_code_interpreter/exceptions.py

@@ -11,3 +11,10 @@ def format_execution_timeout_error() -> Exception:
     return TimeoutException(
         "Execution timed out — the 'timeout' option can be used to increase this timeout",
     )
+
+
+def format_sandbox_killed_error() -> Exception:
+    return TimeoutException(
+        "The sandbox was killed while the request was in progress. This can happen when the sandbox times out or is killed manually. "
+        "You can modify the sandbox timeout by passing 'timeout' when starting the sandbox or calling '.set_timeout' on the sandbox with the desired timeout",
+    )

{e2b_code_interpreter-2.8.0 → e2b_code_interpreter-2.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "e2b-code-interpreter"
-version = "2.8.0"
+version = "2.9.0"
 description = "E2B Code Interpreter - Stateful code execution"
 authors = ["e2b <hello@e2b.dev>"]
 license = "MIT"