call it sandbox_url, implement async

Author: djeebus

packages/python-sdk/e2b/connection_config.py

@@ -40,11 +40,15 @@ class ApiParams(TypedDict, total=False):
     proxy: Optional[ProxyTypes]
     """Proxy to use for the request. In case of a sandbox it applies to all **requests made to the returned sandbox**."""
 
+    sandbox_url: Optional[str]
+    """URL to connect to sandbox, defaults to `E2B_SANDBOX_URL` environment variable."""
+
 
 class ConnectionConfig:
     """
     Configuration for the connection to the API.
     """
+    envd_port = 49983
 
     @staticmethod
     def _domain():
@@ -62,6 +66,10 @@ def _api_key():
     def _api_url():
         return os.getenv("E2B_API_URL")
 
+    @staticmethod
+    def _sandbox_url():
+        return os.getenv("E2B_SANDBOX_URL")
+
     @staticmethod
     def _access_token():
         return os.getenv("E2B_ACCESS_TOKEN")
@@ -72,6 +80,7 @@ def __init__(
         debug: Optional[bool] = None,
         api_key: Optional[str] = None,
         api_url: Optional[str] = None,
+        sandbox_url: Optional[str] = None,
         access_token: Optional[str] = None,
         request_timeout: Optional[float] = None,
         headers: Optional[Dict[str, str]] = None,
@@ -106,6 +115,8 @@ def __init__(
             or ("http://localhost:3000" if self.debug else f"https://api.{self.domain}")
         )
 
+        self._sandbox_url = sandbox_url or ConnectionConfig._sandbox_url()
+
     @staticmethod
     def _get_request_timeout(
         default_timeout: Optional[float],
@@ -121,6 +132,28 @@ def _get_request_timeout(
     def get_request_timeout(self, request_timeout: Optional[float] = None):
         return self._get_request_timeout(self.request_timeout, request_timeout)
 
+    def get_sandbox_url(self, sandbox_id: str, sandbox_domain: str) -> str:
+        if self._sandbox_url:
+            return self._sandbox_url
+
+        return f"{'http' if self.debug else 'https'}://{self.get_host(sandbox_id, sandbox_domain, self.envd_port)}"
+
+    def get_host(self, sandbox_id: str, sandbox_domain: str, port: int) -> str:
+        """
+        Get the host address to connect to the sandbox.
+        You can then use this address to connect to the sandbox port from outside the sandbox via HTTP or WebSocket.
+
+        :param port: Port to connect to
+        :param sandbox_domain: Domain to connect to
+        :param sandbox_id: Sandbox to connect to
+
+        :return: Host address to connect to
+        """
+        if self.debug:
+            return f"localhost:{port}"
+
+        return f"{port}-{sandbox_id}.{sandbox_domain}"
+
     def get_api_params(
         self,
         **opts: Unpack[ApiParams],

packages/python-sdk/e2b/sandbox/main.py

@@ -16,7 +16,7 @@ class SandboxOpts(TypedDict):
     sandbox_domain: Optional[str]
     envd_version: Version
     envd_access_token: Optional[str]
-    envd_api_url: Optional[str]
+    sandbox_url: Optional[str]
     connection_config: ConnectionConfig
 
 
@@ -27,7 +27,6 @@ class SandboxBase:
         keepalive_expiry=300,
     )
 
-    envd_port = 49983
     mcp_port = 50005
 
     default_sandbox_timeout = 300
@@ -42,24 +41,15 @@ def __init__(
         envd_access_token: Optional[str],
         sandbox_domain: Optional[str],
         connection_config: ConnectionConfig,
-        envd_api_url: Optional[str] = None,
     ):
         self.__connection_config = connection_config
         self.__sandbox_id = sandbox_id
         self.__sandbox_domain = sandbox_domain or self.connection_config.domain
         self.__envd_version = envd_version
         self.__envd_access_token = envd_access_token
-        self.__envd_api_url = (
-            envd_api_url
-            or SandboxBase._envd_api_url()
-            or f"{'http' if self.connection_config.debug else 'https'}://{self.get_host(self.envd_port)}"
-        )
+        self.__envd_api_url = self.connection_config.get_sandbox_url(self.sandbox_id, self.sandbox_domain)
         self.__mcp_token: Optional[str] = None
 
-    @staticmethod
-    def _envd_api_url():
-        return os.getenv("E2B_ENVD_API_URL")
-
     @property
     def _envd_access_token(self) -> Optional[str]:
         """Private property to access the envd token"""
@@ -206,10 +196,7 @@ def get_host(self, port: int) -> str:
 
         :return: Host address to connect to
         """
-        if self.connection_config.debug:
-            return f"localhost:{port}"
-
-        return f"{port}-{self.sandbox_id}.{self.sandbox_domain}"
+        return self.connection_config.get_host(self.sandbox_id, self.sandbox_domain, port)
 
     def get_mcp_url(self) -> str:
         """

packages/python-sdk/e2b/sandbox_async/main.py

@@ -95,7 +95,7 @@ def __init__(self, **opts: Unpack[SandboxOpts]):
             limits=self._limits, proxy=self.connection_config.proxy
         )
         self._envd_api = httpx.AsyncClient(
-            base_url=self.envd_api_url,
+            base_url=self.connection_config.get_sandbox_url(self.sandbox_id, self.sandbox_domain),
             transport=self._transport,
             headers=self.connection_config.sandbox_headers,
         )
@@ -165,7 +165,6 @@ async def create(
         secure: bool = True,
         allow_internet_access: bool = True,
         mcp: Optional[McpServer] = None,
-        envd_api_url: Optional[str] = None,
         **opts: Unpack[ApiParams],
     ) -> Self:
         """
@@ -199,7 +198,6 @@ async def create(
             secure=secure,
             allow_internet_access=allow_internet_access,
             mcp=mcp,
-            envd_api_url=envd_api_url,
             **opts,
         )
 
@@ -689,7 +687,6 @@ async def _create(
         envs: Optional[Dict[str, str]],
         secure: bool,
         mcp: Optional[McpServer] = None,
-        envd_api_url: Optional[str] = None,
         **opts: Unpack[ApiParams],
     ) -> Self:
         extra_sandbox_headers = {}
@@ -723,8 +720,8 @@ async def _create(
             ):
                 extra_sandbox_headers["X-Access-Token"] = envd_access_token
 
-        extra_sandbox_headers["X-Sandbox-ID"] = sandbox_id
-        extra_sandbox_headers["X-Sandbox-Port"] = str(cls.envd_port)
+        extra_sandbox_headers["E2b-Sandbox-Id"] = sandbox_id
+        extra_sandbox_headers["E2b-Sandbox-Port"] = str(ConnectionConfig.envd_port)
 
         connection_config = ConnectionConfig(
             extra_sandbox_headers=extra_sandbox_headers,
@@ -737,5 +734,4 @@ async def _create(
             envd_version=envd_version,
             envd_access_token=envd_access_token,
             connection_config=connection_config,
-            envd_api_url=envd_api_url,
         )

packages/python-sdk/e2b/sandbox_sync/main.py

@@ -168,7 +168,6 @@ def create(
         secure: bool = True,
         allow_internet_access: bool = True,
         mcp: Optional[McpServer] = None,
-        envd_api_url: Optional[str] = None,
         **opts: Unpack[ApiParams],
     ) -> Self:
         """
@@ -202,7 +201,6 @@ def create(
             secure=secure,
             allow_internet_access=allow_internet_access,
             mcp=mcp,
-            envd_api_url=envd_api_url,
             **opts,
         )
 
@@ -686,7 +684,6 @@ def _create(
         secure: bool,
         allow_internet_access: bool,
         mcp: Optional[McpServer] = None,
-        envd_api_url: Optional[str] = None,
         **opts: Unpack[ApiParams],
     ) -> Self:
         extra_sandbox_headers = {}
@@ -720,8 +717,8 @@ def _create(
             ):
                 extra_sandbox_headers["X-Access-Token"] = envd_access_token
 
-        extra_sandbox_headers["X-Sandbox-ID"] = sandbox_id
-        extra_sandbox_headers["X-Sandbox-Port"] = str(cls.envd_port)
+        extra_sandbox_headers["E2b-Sandbox-Id"] = sandbox_id
+        extra_sandbox_headers["E2b-Sandbox-Port"] = str(ConnectionConfig.envd_port)
 
         connection_config = ConnectionConfig(
             extra_sandbox_headers=extra_sandbox_headers,
@@ -734,5 +731,4 @@ def _create(
             envd_version=envd_version,
             envd_access_token=envd_access_token,
             connection_config=connection_config,
-            envd_api_url=envd_api_url,
         )

packages/python-sdk/e2b_connect/client.py

@@ -287,9 +287,10 @@ def _prepare_server_stream_request(
         req,
         request_timeout=None,
         timeout=None,
-        headers={},
+        headers=None,
         **opts,
     ):
+        headers = headers or {}
         data = self._codec.encode(req)
         flags = EnvelopeFlags(0)