fix: move E2b-Sandbox-Id/Port headers from control plane connect to data plane ConnectionConfig

.changeset/fix-connect-unset-sanitization.md

@@ -0,0 +1,5 @@
+---
+'@e2b/python-sdk': patch
+---
+
+fix connect path: move sandbox headers to data plane and sanitize UNSET values

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

@@ -861,21 +861,38 @@ async def _cls_connect_sandbox(
         )
 
         sandbox_headers = {}
-        envd_access_token = sandbox.envd_access_token
-        if envd_access_token is not None and not isinstance(envd_access_token, Unset):
+        domain = (
+            sandbox.domain
+            if isinstance(sandbox.domain, str)
+            else None
+        )
+        envd_access_token = (
+            sandbox.envd_access_token
+            if isinstance(sandbox.envd_access_token, str)
+            else None
+        )
+        traffic_access_token = (
+            sandbox.traffic_access_token
+            if isinstance(sandbox.traffic_access_token, str)
+            else None
+        )
+        if envd_access_token is not None:
             sandbox_headers["X-Access-Token"] = envd_access_token
 
+        sandbox_headers["E2b-Sandbox-Id"] = sandbox.sandbox_id
+        sandbox_headers["E2b-Sandbox-Port"] = str(ConnectionConfig.envd_port)
+
         connection_config = ConnectionConfig(
             extra_sandbox_headers=sandbox_headers,
             **opts,
         )
 
         return cls(
             sandbox_id=sandbox.sandbox_id,
-            sandbox_domain=sandbox.domain,
+            sandbox_domain=domain,
             envd_version=Version(sandbox.envd_version),
             envd_access_token=envd_access_token,
-            traffic_access_token=sandbox.traffic_access_token,
+            traffic_access_token=traffic_access_token,
             connection_config=connection_config,
         )
 

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

@@ -385,13 +385,7 @@ async def _cls_connect(
         # Sandbox is not running, resume it
         config = ConnectionConfig(**opts)
 
-        api_client = get_api_client(
-            config,
-            headers={
-                "E2b-Sandbox-Id": sandbox_id,
-                "E2b-Sandbox-Port": str(config.envd_port),
-            },
-        )
+        api_client = get_api_client(config)
         res = await post_sandboxes_sandbox_id_connect.asyncio_detailed(
             sandbox_id,
             client=api_client,

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

@@ -856,22 +856,39 @@ def _cls_connect_sandbox(
         )
 
         sandbox_headers = {}
-        envd_access_token = sandbox.envd_access_token
-        if envd_access_token is not None and not isinstance(envd_access_token, Unset):
+        domain = (
+            sandbox.domain
+            if isinstance(sandbox.domain, str)
+            else None
+        )
+        envd_access_token = (
+            sandbox.envd_access_token
+            if isinstance(sandbox.envd_access_token, str)
+            else None
+        )
+        traffic_access_token = (
+            sandbox.traffic_access_token
+            if isinstance(sandbox.traffic_access_token, str)
+            else None
+        )
+        if envd_access_token is not None:
             sandbox_headers["X-Access-Token"] = envd_access_token
 
+        sandbox_headers["E2b-Sandbox-Id"] = sandbox.sandbox_id
+        sandbox_headers["E2b-Sandbox-Port"] = str(ConnectionConfig.envd_port)
+
         connection_config = ConnectionConfig(
             extra_sandbox_headers=sandbox_headers,
             **opts,
         )
 
         return cls(
             sandbox_id=sandbox.sandbox_id,
-            sandbox_domain=sandbox.domain,
+            sandbox_domain=domain,
             connection_config=connection_config,
             envd_version=Version(sandbox.envd_version),
             envd_access_token=envd_access_token,
-            traffic_access_token=sandbox.traffic_access_token,
+            traffic_access_token=traffic_access_token,
         )
 
     @classmethod

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

@@ -293,13 +293,7 @@ def _cls_connect(
 
         config = ConnectionConfig(**opts)
 
-        api_client = get_api_client(
-            config,
-            headers={
-                "E2b-Sandbox-Id": sandbox_id,
-                "E2b-Sandbox-Port": str(config.envd_port),
-            },
-        )
+        api_client = get_api_client(config)
         res = post_sandboxes_sandbox_id_connect.sync_detailed(
             sandbox_id,
             client=api_client,