modal 1.4.2.dev12__tar.gz → 1.4.2.dev13__tar.gz

{modal-1.4.2.dev12 → modal-1.4.2.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.4.2.dev12
+Version: 1.4.2.dev13
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0

{modal-1.4.2.dev12 → modal-1.4.2.dev13}/modal/_utils/task_command_router_client.py

@@ -126,8 +126,11 @@ async def fetch_command_router_access_v2(
     server_client, sandbox_id: str
 ) -> api_pb2.SandboxGetCommandRouterAccessResponse:
     """Fetch direct command router access info from Modal server for a V2 sandbox."""
+    assert server_client._auth_token_manager
+    auth_token = await server_client._auth_token_manager.get_token()
     return await server_client.stub.SandboxGetCommandRouterAccess(
         api_pb2.SandboxGetCommandRouterAccessRequest(sandbox_id=sandbox_id),
+        metadata=[("x-modal-auth-token", auth_token)],
     )
 
 

{modal-1.4.2.dev12 → modal-1.4.2.dev13}/modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.2.dev12",
+        version: str = "1.4.2.dev13",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -175,7 +175,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.2.dev12",
+        version: str = "1.4.2.dev13",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.4.2.dev12 → modal-1.4.2.dev13}/modal/sandbox.py

@@ -1045,7 +1045,12 @@ class _Sandbox(_Object, type_prefix="sb"):
             req = api_pb2.SandboxWaitRequest(sandbox_id=self.object_id, timeout=10)
             # Use the private __client to allow `wait` to work with a detached sandbox
             stub = self.__client.stub
-            resp = await (stub.SandboxWaitV2(req) if self._is_v2 else stub.SandboxWait(req))
+            if self._is_v2:
+                assert self.__client._auth_token_manager
+                auth_token = await self.__client._auth_token_manager.get_token()
+                resp = await stub.SandboxWaitV2(req, metadata=[("x-modal-auth-token", auth_token)])
+            else:
+                resp = await stub.SandboxWait(req)
             if resp.result.status:
                 logger.debug(f"Sandbox {self.object_id} wait completed with status {resp.result.status}")
                 self._result = resp.result
@@ -1187,7 +1192,12 @@ class _Sandbox(_Object, type_prefix="sb"):
 
         req = api_pb2.SandboxWaitRequest(sandbox_id=self.object_id, timeout=0)
         stub = self._client.stub
-        resp = await (stub.SandboxWaitV2(req) if self._is_v2 else stub.SandboxWait(req))
+        if self._is_v2:
+            assert self._client._auth_token_manager
+            auth_token = await self._client._auth_token_manager.get_token()
+            resp = await stub.SandboxWaitV2(req, metadata=[("x-modal-auth-token", auth_token)])
+        else:
+            resp = await stub.SandboxWait(req)
 
         if resp.result.status:
             self._result = resp.result
@@ -1338,11 +1348,10 @@ class _Sandbox(_Object, type_prefix="sb"):
             raise InvalidError(f"workdir must be an absolute path, got: {workdir}")
         _validate_exec_args(args)
 
-        secrets = secrets or []
-        if env:
-            secrets = [*secrets, _Secret.from_dict(env)]
+        secrets = list(secrets or [])
+        env_dict = {k: v for k, v in (env or {}).items() if v is not None}
 
-        # Force secret resolution so we can pass the secret IDs to the backend.
+        # Force explicit secret resolution so we can pass the secret IDs to the backend.
         secret_coros = [secret.hydrate(client=self._client) for secret in secrets]
         await TaskContext.gather(*secret_coros)
 
@@ -1355,6 +1364,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             "timeout": timeout,
             "workdir": workdir,
             "secret_ids": [secret.object_id for secret in secrets],
+            "env": env_dict,
             "text": text,
             "bufsize": bufsize,
             "runtime_debug": config.get("function_runtime_debug"),
@@ -1366,6 +1376,11 @@ class _Sandbox(_Object, type_prefix="sb"):
             kwargs["command_router_client"] = command_router_client
             return await self._exec_through_command_router(*args, **kwargs)
         else:
+            if env_dict:
+                env_secret = _Secret.from_dict(env)
+                await env_secret.hydrate(client=self._client)
+                kwargs["secret_ids"] = [*kwargs["secret_ids"], env_secret.object_id]
+            kwargs.pop("env", None)
             return await self._exec_through_server(*args, **kwargs)
 
     async def _exec_through_server(
@@ -1421,6 +1436,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         timeout: Optional[int] = None,
         workdir: Optional[str] = None,
         secret_ids: Optional[Collection[str]] = None,
+        env: Optional[dict[str, str]] = None,
         text: bool = True,
         bufsize: Literal[-1, 1] = -1,
         runtime_debug: bool = False,
@@ -1463,6 +1479,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             pty_info=pty_info,
             runtime_debug=runtime_debug,
             container_id=container_id or "",
+            env=env or {},
         )
         _ = await command_router_client.exec_start(start_req)
 

{modal-1.4.2.dev12 → modal-1.4.2.dev13}/modal/sandbox.pyi

@@ -584,6 +584,7 @@ class _Sandbox(modal._object._Object):
         timeout: typing.Optional[int] = None,
         workdir: typing.Optional[str] = None,
         secret_ids: typing.Optional[collections.abc.Collection[str]] = None,
+        env: typing.Optional[dict[str, str]] = None,
         text: bool = True,
         bufsize: typing.Literal[-1, 1] = -1,
         runtime_debug: bool = False,
@@ -1814,6 +1815,7 @@ class Sandbox(modal.object.Object):
             timeout: typing.Optional[int] = None,
             workdir: typing.Optional[str] = None,
             secret_ids: typing.Optional[collections.abc.Collection[str]] = None,
+            env: typing.Optional[dict[str, str]] = None,
             text: bool = True,
             bufsize: typing.Literal[-1, 1] = -1,
             runtime_debug: bool = False,
@@ -1836,6 +1838,7 @@ class Sandbox(modal.object.Object):
             timeout: typing.Optional[int] = None,
             workdir: typing.Optional[str] = None,
             secret_ids: typing.Optional[collections.abc.Collection[str]] = None,
+            env: typing.Optional[dict[str, str]] = None,
             text: bool = True,
             bufsize: typing.Literal[-1, 1] = -1,
             runtime_debug: bool = False,

{modal-1.4.2.dev12 → modal-1.4.2.dev13}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.4.2.dev12
+Version: 1.4.2.dev13
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0

{modal-1.4.2.dev12 → modal-1.4.2.dev13}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2026
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.4.2.dev12"
+__version__ = "1.4.2.dev13"