modal 1.4.2.dev12__tar.gz → 1.4.2.dev14__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.4.2.dev12
+Version: 1.4.2.dev14
 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.dev14}/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.dev14}/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.dev14",
     ):
         """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.dev14",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.4.2.dev12 → modal-1.4.2.dev14}/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
@@ -1105,7 +1110,12 @@ class _Sandbox(_Object, type_prefix="sb"):
 
         req = api_pb2.SandboxGetTunnelsRequest(sandbox_id=self.object_id, timeout=timeout)
         stub = self._client.stub
-        resp = await (stub.SandboxGetTunnelsV2(req) if self._is_v2 else stub.SandboxGetTunnels(req))
+        if self._is_v2:
+            assert self._client._auth_token_manager
+            auth_token = await self._client._auth_token_manager.get_token()
+            resp = await stub.SandboxGetTunnelsV2(req, metadata=[("x-modal-auth-token", auth_token)])
+        else:
+            resp = await stub.SandboxGetTunnels(req)
 
         # If we couldn't get the tunnels in time, report the timeout.
         if resp.result.status == api_pb2.GenericResult.GENERIC_STATUS_TIMEOUT:
@@ -1174,7 +1184,12 @@ class _Sandbox(_Object, type_prefix="sb"):
         This is a no-op if the Sandbox has already finished running."""
         req = api_pb2.SandboxTerminateRequest(sandbox_id=self.object_id)
         stub = self._client.stub
-        await (stub.SandboxTerminateV2(req) if self._is_v2 else stub.SandboxTerminate(req))
+        if self._is_v2:
+            assert self._client._auth_token_manager
+            auth_token = await self._client._auth_token_manager.get_token()
+            await stub.SandboxTerminateV2(req, metadata=[("x-modal-auth-token", auth_token)])
+        else:
+            await stub.SandboxTerminate(req)
         if wait:
             await self.wait(raise_on_termination=False)
             return self.returncode
@@ -1187,7 +1202,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
@@ -1198,7 +1218,12 @@ class _Sandbox(_Object, type_prefix="sb"):
         while not self._task_id:
             req = api_pb2.SandboxGetTaskIdRequest(sandbox_id=self.object_id)
             stub = self._client.stub
-            resp = await (stub.SandboxGetTaskIdV2(req) if self._is_v2 else stub.SandboxGetTaskId(req))
+            if self._is_v2:
+                assert self._client._auth_token_manager
+                auth_token = await self._client._auth_token_manager.get_token()
+                resp = await stub.SandboxGetTaskIdV2(req, metadata=[("x-modal-auth-token", auth_token)])
+            else:
+                resp = await stub.SandboxGetTaskId(req)
             if not resp.task_id and raise_if_task_complete and resp.HasField("task_result"):
                 msg = resp.task_result.exception or "Sandbox already finished"
                 raise Error(msg)
@@ -1338,11 +1363,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 +1379,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 +1391,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 +1451,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 +1494,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.dev14}/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.dev14}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.4.2.dev12
+Version: 1.4.2.dev14
 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.dev14}/modal_proto/api_grpc.py

@@ -267,6 +267,10 @@ class ModalClientBase(abc.ABC):
     async def EnvironmentDelete(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentDeleteRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def EnvironmentGetManaged(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentGetManagedRequest, modal_proto.api_pb2.EnvironmentGetManagedResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def EnvironmentGetOrCreate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentGetOrCreateRequest, modal_proto.api_pb2.EnvironmentGetOrCreateResponse]') -> None:
         pass
@@ -275,6 +279,14 @@ class ModalClientBase(abc.ABC):
     async def EnvironmentList(self, stream: 'grpclib.server.Stream[google.protobuf.empty_pb2.Empty, modal_proto.api_pb2.EnvironmentListResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def EnvironmentRoleSet(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentRoleSetRequest, google.protobuf.empty_pb2.Empty]') -> None:
+        pass
+
+    @abc.abstractmethod
+    async def EnvironmentSetManaged(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentSetManagedRequest, google.protobuf.empty_pb2.Empty]') -> None:
+        pass
+
     @abc.abstractmethod
     async def EnvironmentUpdate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentUpdateRequest, modal_proto.api_pb2.EnvironmentListItem]') -> None:
         pass
@@ -623,6 +635,10 @@ class ModalClientBase(abc.ABC):
     async def SecretUpdate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SecretUpdateRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def ServiceUserList(self, stream: 'grpclib.server.Stream[google.protobuf.empty_pb2.Empty, modal_proto.api_pb2.ServiceUserListResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def SharedVolumeDelete(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SharedVolumeDeleteRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
@@ -787,6 +803,10 @@ class ModalClientBase(abc.ABC):
     async def WorkspaceDashboardUrlGet(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.WorkspaceDashboardUrlRequest, modal_proto.api_pb2.WorkspaceDashboardUrlResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def WorkspaceMembersList(self, stream: 'grpclib.server.Stream[google.protobuf.empty_pb2.Empty, modal_proto.api_pb2.WorkspaceMembersListResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def WorkspaceNameLookup(self, stream: 'grpclib.server.Stream[google.protobuf.empty_pb2.Empty, modal_proto.api_pb2.WorkspaceNameLookupResponse]') -> None:
         pass
@@ -1165,6 +1185,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.EnvironmentDeleteRequest,
                 google.protobuf.empty_pb2.Empty,
             ),
+            '/modal.client.ModalClient/EnvironmentGetManaged': grpclib.const.Handler(
+                self.EnvironmentGetManaged,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.EnvironmentGetManagedRequest,
+                modal_proto.api_pb2.EnvironmentGetManagedResponse,
+            ),
             '/modal.client.ModalClient/EnvironmentGetOrCreate': grpclib.const.Handler(
                 self.EnvironmentGetOrCreate,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -1177,6 +1203,18 @@ class ModalClientBase(abc.ABC):
                 google.protobuf.empty_pb2.Empty,
                 modal_proto.api_pb2.EnvironmentListResponse,
             ),
+            '/modal.client.ModalClient/EnvironmentRoleSet': grpclib.const.Handler(
+                self.EnvironmentRoleSet,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.EnvironmentRoleSetRequest,
+                google.protobuf.empty_pb2.Empty,
+            ),
+            '/modal.client.ModalClient/EnvironmentSetManaged': grpclib.const.Handler(
+                self.EnvironmentSetManaged,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.EnvironmentSetManagedRequest,
+                google.protobuf.empty_pb2.Empty,
+            ),
             '/modal.client.ModalClient/EnvironmentUpdate': grpclib.const.Handler(
                 self.EnvironmentUpdate,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -1699,6 +1737,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.SecretUpdateRequest,
                 google.protobuf.empty_pb2.Empty,
             ),
+            '/modal.client.ModalClient/ServiceUserList': grpclib.const.Handler(
+                self.ServiceUserList,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                google.protobuf.empty_pb2.Empty,
+                modal_proto.api_pb2.ServiceUserListResponse,
+            ),
             '/modal.client.ModalClient/SharedVolumeDelete': grpclib.const.Handler(
                 self.SharedVolumeDelete,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -1945,6 +1989,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.WorkspaceDashboardUrlRequest,
                 modal_proto.api_pb2.WorkspaceDashboardUrlResponse,
             ),
+            '/modal.client.ModalClient/WorkspaceMembersList': grpclib.const.Handler(
+                self.WorkspaceMembersList,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                google.protobuf.empty_pb2.Empty,
+                modal_proto.api_pb2.WorkspaceMembersListResponse,
+            ),
             '/modal.client.ModalClient/WorkspaceNameLookup': grpclib.const.Handler(
                 self.WorkspaceNameLookup,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2329,6 +2379,12 @@ class ModalClientStub:
             modal_proto.api_pb2.EnvironmentDeleteRequest,
             google.protobuf.empty_pb2.Empty,
         )
+        self.EnvironmentGetManaged = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/EnvironmentGetManaged',
+            modal_proto.api_pb2.EnvironmentGetManagedRequest,
+            modal_proto.api_pb2.EnvironmentGetManagedResponse,
+        )
         self.EnvironmentGetOrCreate = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/EnvironmentGetOrCreate',
@@ -2341,6 +2397,18 @@ class ModalClientStub:
             google.protobuf.empty_pb2.Empty,
             modal_proto.api_pb2.EnvironmentListResponse,
         )
+        self.EnvironmentRoleSet = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/EnvironmentRoleSet',
+            modal_proto.api_pb2.EnvironmentRoleSetRequest,
+            google.protobuf.empty_pb2.Empty,
+        )
+        self.EnvironmentSetManaged = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/EnvironmentSetManaged',
+            modal_proto.api_pb2.EnvironmentSetManagedRequest,
+            google.protobuf.empty_pb2.Empty,
+        )
         self.EnvironmentUpdate = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/EnvironmentUpdate',
@@ -2863,6 +2931,12 @@ class ModalClientStub:
             modal_proto.api_pb2.SecretUpdateRequest,
             google.protobuf.empty_pb2.Empty,
         )
+        self.ServiceUserList = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/ServiceUserList',
+            google.protobuf.empty_pb2.Empty,
+            modal_proto.api_pb2.ServiceUserListResponse,
+        )
         self.SharedVolumeDelete = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/SharedVolumeDelete',
@@ -3109,6 +3183,12 @@ class ModalClientStub:
             modal_proto.api_pb2.WorkspaceDashboardUrlRequest,
             modal_proto.api_pb2.WorkspaceDashboardUrlResponse,
         )
+        self.WorkspaceMembersList = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/WorkspaceMembersList',
+            google.protobuf.empty_pb2.Empty,
+            modal_proto.api_pb2.WorkspaceMembersListResponse,
+        )
         self.WorkspaceNameLookup = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/WorkspaceNameLookup',