modal 1.1.5.dev77__tar.gz → 1.1.5.dev81__tar.gz

{modal-1.1.5.dev77 → modal-1.1.5.dev81}/PKG-INFO

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

{modal-1.1.5.dev77 → modal-1.1.5.dev81}/modal/_utils/name_utils.py

@@ -1,5 +1,6 @@
 # Copyright Modal Labs 2022
 import re
+from collections.abc import Mapping
 
 from ..exception import InvalidError
 
@@ -37,7 +38,7 @@ def is_valid_tag(tag: str, max_length: int = 50) -> bool:
     return bool(re.match(pattern, tag))
 
 
-def check_tag_dict(tags: dict[str, str]) -> dict[str, str]:
+def check_tag_dict(tags: Mapping[str, str]) -> None:
     rules = (
         "\n\nTags may contain only alphanumeric characters, dashes, periods, or underscores, "
         "and must be 63 characters or less."
@@ -49,8 +50,6 @@ def check_tag_dict(tags: dict[str, str]) -> dict[str, str]:
         if not is_valid_tag(value, max_length):
             raise InvalidError(f"Invalid tag value: {value!r}.{rules}")
 
-    return tags
-
 
 def check_object_name(name: str, object_type: str) -> None:
     message = (

{modal-1.1.5.dev77 → modal-1.1.5.dev81}/modal/app.py

@@ -1,7 +1,7 @@
 # Copyright Modal Labs 2022
 import inspect
 import typing
-from collections.abc import AsyncGenerator, Collection, Coroutine, Sequence
+from collections.abc import AsyncGenerator, Collection, Coroutine, Mapping, Sequence
 from pathlib import PurePosixPath
 from textwrap import dedent
 from typing import (
@@ -191,9 +191,12 @@ class _App:
         if name is not None and not isinstance(name, str):
             raise InvalidError("Invalid value for `name`: Must be string.")
 
+        if tags is not None:
+            check_tag_dict(tags)
+
         self._name = name
         self._description = name
-        self._tags = check_tag_dict(tags or {})
+        self._tags = tags or {}
         self._include_source_default = include_source
 
         check_sequence(secrets, _Secret, "`secrets=` has to be a list or tuple of `modal.Secret` objects")
@@ -1088,6 +1091,41 @@ class _App:
 
         return self
 
+    async def set_tags(self, tags: Mapping[str, str], *, client: Optional[_Client] = None) -> None:
+        """Attach key-value metadata to the App.
+
+        Tag metadata can be used to add organization-specific context to the App and can be
+        included in billing reports and other informational APIs. Tags can also be set in
+        the App constructor.
+
+        Any tags set on the App before calling this method will be removed if they are not
+        included in the argument (i.e., this method does not have `.update()` semantics).
+
+        """
+        # Note that we are requiring the App to be "running" before we set the tags.
+        # Alternatively, we could hold onto the tags (i.e. in `self._tags`) and then pass
+        # then up when AppPublish gets called. I'm not certain we want to support it, though.
+        # It might not be obvious to users that `.set_tags()` is eager and has immediate effect
+        # when the App is running, but lazy (and potentially ignored) otherwise. There would be
+        # other complications, like what do you do with any tags set in the constructor, and
+        # what should  `.get_tags()` do when it's called before the App is running?
+        if self._app_id is None:
+            raise InvalidError("`App.set_tags` cannot be called before the App is running.")
+        check_tag_dict(tags)
+        req = api_pb2.AppSetTagsRequest(app_id=self._app_id, tags=tags)
+
+        client = client or self._client or await _Client.from_env()
+        await retry_transient_errors(client.stub.AppSetTags, req)
+
+    async def get_tags(self, *, client: Optional[_Client] = None) -> dict[str, str]:
+        """Get the tags that are currently attached to the App."""
+        if self._app_id is None:
+            raise InvalidError("`App.get_tags` cannot be called before the App is running.")
+        req = api_pb2.AppGetTagsRequest(app_id=self._app_id)
+        client = client or self._client or await _Client.from_env()
+        resp = await retry_transient_errors(client.stub.AppGetTags, req)
+        return dict(resp.tags)
+
     async def _logs(self, client: Optional[_Client] = None) -> AsyncGenerator[str, None]:
         """Stream logs from the app.
 

{modal-1.1.5.dev77 → modal-1.1.5.dev81}/modal/app.pyi

@@ -521,6 +521,24 @@ class _App:
         """
         ...
 
+    async def set_tags(
+        self, tags: collections.abc.Mapping[str, str], *, client: typing.Optional[modal.client._Client] = None
+    ) -> None:
+        """Attach key-value metadata to the App.
+
+        Tag metadata can be used to add organization-specific context to the App and can be
+        included in billing reports and other informational APIs. Tags can also be set in
+        the App constructor.
+
+        Any tags set on the App before calling this method will be removed if they are not
+        included in the argument (i.e., this method does not have `.update()` semantics).
+        """
+        ...
+
+    async def get_tags(self, *, client: typing.Optional[modal.client._Client] = None) -> dict[str, str]:
+        """Get the tags that are currently attached to the App."""
+        ...
+
     def _logs(self, client: typing.Optional[modal.client._Client] = None) -> collections.abc.AsyncGenerator[str, None]:
         """Stream logs from the app.
 
@@ -1133,6 +1151,48 @@ class App:
         """
         ...
 
+    class __set_tags_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(
+            self, /, tags: collections.abc.Mapping[str, str], *, client: typing.Optional[modal.client.Client] = None
+        ) -> None:
+            """Attach key-value metadata to the App.
+
+            Tag metadata can be used to add organization-specific context to the App and can be
+            included in billing reports and other informational APIs. Tags can also be set in
+            the App constructor.
+
+            Any tags set on the App before calling this method will be removed if they are not
+            included in the argument (i.e., this method does not have `.update()` semantics).
+            """
+            ...
+
+        async def aio(
+            self, /, tags: collections.abc.Mapping[str, str], *, client: typing.Optional[modal.client.Client] = None
+        ) -> None:
+            """Attach key-value metadata to the App.
+
+            Tag metadata can be used to add organization-specific context to the App and can be
+            included in billing reports and other informational APIs. Tags can also be set in
+            the App constructor.
+
+            Any tags set on the App before calling this method will be removed if they are not
+            included in the argument (i.e., this method does not have `.update()` semantics).
+            """
+            ...
+
+    set_tags: __set_tags_spec[typing_extensions.Self]
+
+    class __get_tags_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(self, /, *, client: typing.Optional[modal.client.Client] = None) -> dict[str, str]:
+            """Get the tags that are currently attached to the App."""
+            ...
+
+        async def aio(self, /, *, client: typing.Optional[modal.client.Client] = None) -> dict[str, str]:
+            """Get the tags that are currently attached to the App."""
+            ...
+
+    get_tags: __get_tags_spec[typing_extensions.Self]
+
     class ___logs_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, client: typing.Optional[modal.client.Client] = None) -> typing.Generator[str, None, None]:
             """Stream logs from the app.

{modal-1.1.5.dev77 → modal-1.1.5.dev81}/modal/client.pyi

@@ -33,7 +33,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.1.5.dev77",
+        version: str = "1.1.5.dev81",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -164,7 +164,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.1.5.dev77",
+        version: str = "1.1.5.dev81",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.1.5.dev77 → modal-1.1.5.dev81}/modal.egg-info/PKG-INFO

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

{modal-1.1.5.dev77 → modal-1.1.5.dev81}/modal_proto/sandbox_router.proto

@@ -28,6 +28,26 @@ enum SandboxExecStdoutConfig {
   SANDBOX_EXEC_STDOUT_CONFIG_PIPE = 1;
 }
 
+message SandboxExecPollRequest {
+  // The task ID of the sandbox running the exec'd command.
+  string task_id = 1;
+  // The execution ID of the command to wait on.
+  string exec_id = 2;
+}
+
+// The response to a SandboxExecPollRequest. If the exec'd command has not
+// completed, exit_status will be unset.
+message SandboxExecPollResponse {
+  oneof exit_status {
+    // The exit code of the command.
+    int32 code = 1;
+    // The signal that terminated the command.
+    int32 signal = 2;
+  }
+  // TODO(saltzm): Give a way for the user to distinguish between normal exit
+  // and termination by Modal (due to sandbox timeout, exec exceeded deadline, etc.)
+}
+
 message SandboxExecStartRequest {
   // The task ID of the sandbox to execute the command in.
   string task_id = 1;
@@ -105,15 +125,17 @@ message SandboxExecWaitRequest {
 message SandboxExecWaitResponse {
   oneof exit_status {
     // The exit code of the command.
-    int32 code = 3;
+    int32 code = 1;
     // The signal that terminated the command.
-    int32 signal = 4;
+    int32 signal = 2;
   }
   // TODO(saltzm): Give a way for the user to distinguish between normal exit
   // and termination by Modal (due to sandbox timeout, exec exceeded deadline, etc.)
 }
 
 service SandboxRouter {
+  // Poll for the exit status of an exec'd command.
+  rpc SandboxExecPoll(SandboxExecPollRequest) returns (SandboxExecPollResponse);
   // Execute a command in the sandbox.
   rpc SandboxExecStart(SandboxExecStartRequest) returns (SandboxExecStartResponse);
  // Write to the stdin stream of an exec'd command.

{modal-1.1.5.dev77 → modal-1.1.5.dev81}/modal_proto/sandbox_router_grpc.py

@@ -15,6 +15,10 @@ import modal_proto.sandbox_router_pb2
 
 class SandboxRouterBase(abc.ABC):
 
+    @abc.abstractmethod
+    async def SandboxExecPoll(self, stream: 'grpclib.server.Stream[modal_proto.sandbox_router_pb2.SandboxExecPollRequest, modal_proto.sandbox_router_pb2.SandboxExecPollResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def SandboxExecStart(self, stream: 'grpclib.server.Stream[modal_proto.sandbox_router_pb2.SandboxExecStartRequest, modal_proto.sandbox_router_pb2.SandboxExecStartResponse]') -> None:
         pass
@@ -33,6 +37,12 @@ class SandboxRouterBase(abc.ABC):
 
     def __mapping__(self) -> typing.Dict[str, grpclib.const.Handler]:
         return {
+            '/modal.sandbox_router.SandboxRouter/SandboxExecPoll': grpclib.const.Handler(
+                self.SandboxExecPoll,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.sandbox_router_pb2.SandboxExecPollRequest,
+                modal_proto.sandbox_router_pb2.SandboxExecPollResponse,
+            ),
             '/modal.sandbox_router.SandboxRouter/SandboxExecStart': grpclib.const.Handler(
                 self.SandboxExecStart,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -63,6 +73,12 @@ class SandboxRouterBase(abc.ABC):
 class SandboxRouterStub:
 
     def __init__(self, channel: grpclib.client.Channel) -> None:
+        self.SandboxExecPoll = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.sandbox_router.SandboxRouter/SandboxExecPoll',
+            modal_proto.sandbox_router_pb2.SandboxExecPollRequest,
+            modal_proto.sandbox_router_pb2.SandboxExecPollResponse,
+        )
         self.SandboxExecStart = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.sandbox_router.SandboxRouter/SandboxExecStart',

{modal-1.1.5.dev77 → modal-1.1.5.dev81}/modal_proto/sandbox_router_pb2.py

@@ -16,7 +16,7 @@ _sym_db = _symbol_database.Default()
 from modal_proto import api_pb2 as modal__proto_dot_api__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n modal_proto/sandbox_router.proto\x12\x14modal.sandbox_router\x1a\x15modal_proto/api.proto\"\x91\x03\n\x17SandboxExecStartRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_args\x18\x03 \x03(\t\x12\x44\n\rstdout_config\x18\x04 \x01(\x0e\x32-.modal.sandbox_router.SandboxExecStdoutConfig\x12\x44\n\rstderr_config\x18\x05 \x01(\x0e\x32-.modal.sandbox_router.SandboxExecStderrConfig\x12\x19\n\x0ctimeout_secs\x18\x06 \x01(\rH\x00\x88\x01\x01\x12\x14\n\x07workdir\x18\x07 \x01(\tH\x01\x88\x01\x01\x12\x12\n\nsecret_ids\x18\x08 \x03(\t\x12,\n\x08pty_info\x18\t \x01(\x0b\x32\x15.modal.client.PTYInfoH\x02\x88\x01\x01\x12\x15\n\rruntime_debug\x18\n \x01(\x08\x42\x0f\n\r_timeout_secsB\n\n\x08_workdirB\x0b\n\t_pty_info\"\x1a\n\x18SandboxExecStartResponse\"k\n\x1cSandboxExecStdinWriteRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x0e\n\x06offset\x18\x03 \x01(\x04\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c\x12\x0b\n\x03\x65of\x18\x05 \x01(\x08\"\x1f\n\x1dSandboxExecStdinWriteResponse\"\x9e\x01\n\x1bSandboxExecStdioReadRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x0e\n\x06offset\x18\x03 \x01(\x04\x12M\n\x0f\x66ile_descriptor\x18\x04 \x01(\x0e\x32\x34.modal.sandbox_router.SandboxExecStdioFileDescriptor\",\n\x1cSandboxExecStdioReadResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\":\n\x16SandboxExecWaitRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\"J\n\x17SandboxExecWaitResponse\x12\x0e\n\x04\x63ode\x18\x03 \x01(\x05H\x00\x12\x10\n\x06signal\x18\x04 \x01(\x05H\x00\x42\r\n\x0b\x65xit_status*\x8d\x01\n\x17SandboxExecStderrConfig\x12&\n\"SANDBOX_EXEC_STDERR_CONFIG_DEVNULL\x10\x00\x12#\n\x1fSANDBOX_EXEC_STDERR_CONFIG_PIPE\x10\x01\x12%\n!SANDBOX_EXEC_STDERR_CONFIG_STDOUT\x10\x02*~\n\x1eSandboxExecStdioFileDescriptor\x12-\n)SANDBOX_EXEC_STDIO_FILE_DESCRIPTOR_STDOUT\x10\x00\x12-\n)SANDBOX_EXEC_STDIO_FILE_DESCRIPTOR_STDERR\x10\x01*f\n\x17SandboxExecStdoutConfig\x12&\n\"SANDBOX_EXEC_STDOUT_CONFIG_DEVNULL\x10\x00\x12#\n\x1fSANDBOX_EXEC_STDOUT_CONFIG_PIPE\x10\x01\x32\xf6\x03\n\rSandboxRouter\x12q\n\x10SandboxExecStart\x12-.modal.sandbox_router.SandboxExecStartRequest\x1a..modal.sandbox_router.SandboxExecStartResponse\x12\x80\x01\n\x15SandboxExecStdinWrite\x12\x32.modal.sandbox_router.SandboxExecStdinWriteRequest\x1a\x33.modal.sandbox_router.SandboxExecStdinWriteResponse\x12\x7f\n\x14SandboxExecStdioRead\x12\x31.modal.sandbox_router.SandboxExecStdioReadRequest\x1a\x32.modal.sandbox_router.SandboxExecStdioReadResponse0\x01\x12n\n\x0fSandboxExecWait\x12,.modal.sandbox_router.SandboxExecWaitRequest\x1a-.modal.sandbox_router.SandboxExecWaitResponseb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n modal_proto/sandbox_router.proto\x12\x14modal.sandbox_router\x1a\x15modal_proto/api.proto\":\n\x16SandboxExecPollRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\"J\n\x17SandboxExecPollResponse\x12\x0e\n\x04\x63ode\x18\x01 \x01(\x05H\x00\x12\x10\n\x06signal\x18\x02 \x01(\x05H\x00\x42\r\n\x0b\x65xit_status\"\x91\x03\n\x17SandboxExecStartRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_args\x18\x03 \x03(\t\x12\x44\n\rstdout_config\x18\x04 \x01(\x0e\x32-.modal.sandbox_router.SandboxExecStdoutConfig\x12\x44\n\rstderr_config\x18\x05 \x01(\x0e\x32-.modal.sandbox_router.SandboxExecStderrConfig\x12\x19\n\x0ctimeout_secs\x18\x06 \x01(\rH\x00\x88\x01\x01\x12\x14\n\x07workdir\x18\x07 \x01(\tH\x01\x88\x01\x01\x12\x12\n\nsecret_ids\x18\x08 \x03(\t\x12,\n\x08pty_info\x18\t \x01(\x0b\x32\x15.modal.client.PTYInfoH\x02\x88\x01\x01\x12\x15\n\rruntime_debug\x18\n \x01(\x08\x42\x0f\n\r_timeout_secsB\n\n\x08_workdirB\x0b\n\t_pty_info\"\x1a\n\x18SandboxExecStartResponse\"k\n\x1cSandboxExecStdinWriteRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x0e\n\x06offset\x18\x03 \x01(\x04\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c\x12\x0b\n\x03\x65of\x18\x05 \x01(\x08\"\x1f\n\x1dSandboxExecStdinWriteResponse\"\x9e\x01\n\x1bSandboxExecStdioReadRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x0e\n\x06offset\x18\x03 \x01(\x04\x12M\n\x0f\x66ile_descriptor\x18\x04 \x01(\x0e\x32\x34.modal.sandbox_router.SandboxExecStdioFileDescriptor\",\n\x1cSandboxExecStdioReadResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\":\n\x16SandboxExecWaitRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\"J\n\x17SandboxExecWaitResponse\x12\x0e\n\x04\x63ode\x18\x01 \x01(\x05H\x00\x12\x10\n\x06signal\x18\x02 \x01(\x05H\x00\x42\r\n\x0b\x65xit_status*\x8d\x01\n\x17SandboxExecStderrConfig\x12&\n\"SANDBOX_EXEC_STDERR_CONFIG_DEVNULL\x10\x00\x12#\n\x1fSANDBOX_EXEC_STDERR_CONFIG_PIPE\x10\x01\x12%\n!SANDBOX_EXEC_STDERR_CONFIG_STDOUT\x10\x02*~\n\x1eSandboxExecStdioFileDescriptor\x12-\n)SANDBOX_EXEC_STDIO_FILE_DESCRIPTOR_STDOUT\x10\x00\x12-\n)SANDBOX_EXEC_STDIO_FILE_DESCRIPTOR_STDERR\x10\x01*f\n\x17SandboxExecStdoutConfig\x12&\n\"SANDBOX_EXEC_STDOUT_CONFIG_DEVNULL\x10\x00\x12#\n\x1fSANDBOX_EXEC_STDOUT_CONFIG_PIPE\x10\x01\x32\xe6\x04\n\rSandboxRouter\x12n\n\x0fSandboxExecPoll\x12,.modal.sandbox_router.SandboxExecPollRequest\x1a-.modal.sandbox_router.SandboxExecPollResponse\x12q\n\x10SandboxExecStart\x12-.modal.sandbox_router.SandboxExecStartRequest\x1a..modal.sandbox_router.SandboxExecStartResponse\x12\x80\x01\n\x15SandboxExecStdinWrite\x12\x32.modal.sandbox_router.SandboxExecStdinWriteRequest\x1a\x33.modal.sandbox_router.SandboxExecStdinWriteResponse\x12\x7f\n\x14SandboxExecStdioRead\x12\x31.modal.sandbox_router.SandboxExecStdioReadRequest\x1a\x32.modal.sandbox_router.SandboxExecStdioReadResponse0\x01\x12n\n\x0fSandboxExecWait\x12,.modal.sandbox_router.SandboxExecWaitRequest\x1a-.modal.sandbox_router.SandboxExecWaitResponseb\x06proto3')
 
 _SANDBOXEXECSTDERRCONFIG = DESCRIPTOR.enum_types_by_name['SandboxExecStderrConfig']
 SandboxExecStderrConfig = enum_type_wrapper.EnumTypeWrapper(_SANDBOXEXECSTDERRCONFIG)
@@ -33,6 +33,8 @@ SANDBOX_EXEC_STDOUT_CONFIG_DEVNULL = 0
 SANDBOX_EXEC_STDOUT_CONFIG_PIPE = 1
 
 
+_SANDBOXEXECPOLLREQUEST = DESCRIPTOR.message_types_by_name['SandboxExecPollRequest']
+_SANDBOXEXECPOLLRESPONSE = DESCRIPTOR.message_types_by_name['SandboxExecPollResponse']
 _SANDBOXEXECSTARTREQUEST = DESCRIPTOR.message_types_by_name['SandboxExecStartRequest']
 _SANDBOXEXECSTARTRESPONSE = DESCRIPTOR.message_types_by_name['SandboxExecStartResponse']
 _SANDBOXEXECSTDINWRITEREQUEST = DESCRIPTOR.message_types_by_name['SandboxExecStdinWriteRequest']
@@ -41,6 +43,20 @@ _SANDBOXEXECSTDIOREADREQUEST = DESCRIPTOR.message_types_by_name['SandboxExecStdi
 _SANDBOXEXECSTDIOREADRESPONSE = DESCRIPTOR.message_types_by_name['SandboxExecStdioReadResponse']
 _SANDBOXEXECWAITREQUEST = DESCRIPTOR.message_types_by_name['SandboxExecWaitRequest']
 _SANDBOXEXECWAITRESPONSE = DESCRIPTOR.message_types_by_name['SandboxExecWaitResponse']
+SandboxExecPollRequest = _reflection.GeneratedProtocolMessageType('SandboxExecPollRequest', (_message.Message,), {
+  'DESCRIPTOR' : _SANDBOXEXECPOLLREQUEST,
+  '__module__' : 'modal_proto.sandbox_router_pb2'
+  # @@protoc_insertion_point(class_scope:modal.sandbox_router.SandboxExecPollRequest)
+  })
+_sym_db.RegisterMessage(SandboxExecPollRequest)
+
+SandboxExecPollResponse = _reflection.GeneratedProtocolMessageType('SandboxExecPollResponse', (_message.Message,), {
+  'DESCRIPTOR' : _SANDBOXEXECPOLLRESPONSE,
+  '__module__' : 'modal_proto.sandbox_router_pb2'
+  # @@protoc_insertion_point(class_scope:modal.sandbox_router.SandboxExecPollResponse)
+  })
+_sym_db.RegisterMessage(SandboxExecPollResponse)
+
 SandboxExecStartRequest = _reflection.GeneratedProtocolMessageType('SandboxExecStartRequest', (_message.Message,), {
   'DESCRIPTOR' : _SANDBOXEXECSTARTREQUEST,
   '__module__' : 'modal_proto.sandbox_router_pb2'
@@ -101,28 +117,32 @@ _SANDBOXROUTER = DESCRIPTOR.services_by_name['SandboxRouter']
 if _descriptor._USE_C_DESCRIPTORS == False:
 
   DESCRIPTOR._options = None
-  _SANDBOXEXECSTDERRCONFIG._serialized_start=999
-  _SANDBOXEXECSTDERRCONFIG._serialized_end=1140
-  _SANDBOXEXECSTDIOFILEDESCRIPTOR._serialized_start=1142
-  _SANDBOXEXECSTDIOFILEDESCRIPTOR._serialized_end=1268
-  _SANDBOXEXECSTDOUTCONFIG._serialized_start=1270
-  _SANDBOXEXECSTDOUTCONFIG._serialized_end=1372
-  _SANDBOXEXECSTARTREQUEST._serialized_start=82
-  _SANDBOXEXECSTARTREQUEST._serialized_end=483
-  _SANDBOXEXECSTARTRESPONSE._serialized_start=485
-  _SANDBOXEXECSTARTRESPONSE._serialized_end=511
-  _SANDBOXEXECSTDINWRITEREQUEST._serialized_start=513
-  _SANDBOXEXECSTDINWRITEREQUEST._serialized_end=620
-  _SANDBOXEXECSTDINWRITERESPONSE._serialized_start=622
-  _SANDBOXEXECSTDINWRITERESPONSE._serialized_end=653
-  _SANDBOXEXECSTDIOREADREQUEST._serialized_start=656
-  _SANDBOXEXECSTDIOREADREQUEST._serialized_end=814
-  _SANDBOXEXECSTDIOREADRESPONSE._serialized_start=816
-  _SANDBOXEXECSTDIOREADRESPONSE._serialized_end=860
-  _SANDBOXEXECWAITREQUEST._serialized_start=862
-  _SANDBOXEXECWAITREQUEST._serialized_end=920
-  _SANDBOXEXECWAITRESPONSE._serialized_start=922
-  _SANDBOXEXECWAITRESPONSE._serialized_end=996
-  _SANDBOXROUTER._serialized_start=1375
-  _SANDBOXROUTER._serialized_end=1877
+  _SANDBOXEXECSTDERRCONFIG._serialized_start=1135
+  _SANDBOXEXECSTDERRCONFIG._serialized_end=1276
+  _SANDBOXEXECSTDIOFILEDESCRIPTOR._serialized_start=1278
+  _SANDBOXEXECSTDIOFILEDESCRIPTOR._serialized_end=1404
+  _SANDBOXEXECSTDOUTCONFIG._serialized_start=1406
+  _SANDBOXEXECSTDOUTCONFIG._serialized_end=1508
+  _SANDBOXEXECPOLLREQUEST._serialized_start=81
+  _SANDBOXEXECPOLLREQUEST._serialized_end=139
+  _SANDBOXEXECPOLLRESPONSE._serialized_start=141
+  _SANDBOXEXECPOLLRESPONSE._serialized_end=215
+  _SANDBOXEXECSTARTREQUEST._serialized_start=218
+  _SANDBOXEXECSTARTREQUEST._serialized_end=619
+  _SANDBOXEXECSTARTRESPONSE._serialized_start=621
+  _SANDBOXEXECSTARTRESPONSE._serialized_end=647
+  _SANDBOXEXECSTDINWRITEREQUEST._serialized_start=649
+  _SANDBOXEXECSTDINWRITEREQUEST._serialized_end=756
+  _SANDBOXEXECSTDINWRITERESPONSE._serialized_start=758
+  _SANDBOXEXECSTDINWRITERESPONSE._serialized_end=789
+  _SANDBOXEXECSTDIOREADREQUEST._serialized_start=792
+  _SANDBOXEXECSTDIOREADREQUEST._serialized_end=950
+  _SANDBOXEXECSTDIOREADRESPONSE._serialized_start=952
+  _SANDBOXEXECSTDIOREADRESPONSE._serialized_end=996
+  _SANDBOXEXECWAITREQUEST._serialized_start=998
+  _SANDBOXEXECWAITREQUEST._serialized_end=1056
+  _SANDBOXEXECWAITRESPONSE._serialized_start=1058
+  _SANDBOXEXECWAITRESPONSE._serialized_end=1132
+  _SANDBOXROUTER._serialized_start=1511
+  _SANDBOXROUTER._serialized_end=2125
 # @@protoc_insertion_point(module_scope)

{modal-1.1.5.dev77 → modal-1.1.5.dev81}/modal_proto/sandbox_router_pb2.pyi

@@ -84,6 +84,50 @@ SANDBOX_EXEC_STDOUT_CONFIG_PIPE: SandboxExecStdoutConfig.ValueType  # 1
 """The output will be streamed to the client."""
 global___SandboxExecStdoutConfig = SandboxExecStdoutConfig
 
+class SandboxExecPollRequest(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    TASK_ID_FIELD_NUMBER: builtins.int
+    EXEC_ID_FIELD_NUMBER: builtins.int
+    task_id: builtins.str
+    """The task ID of the sandbox running the exec'd command."""
+    exec_id: builtins.str
+    """The execution ID of the command to wait on."""
+    def __init__(
+        self,
+        *,
+        task_id: builtins.str = ...,
+        exec_id: builtins.str = ...,
+    ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["exec_id", b"exec_id", "task_id", b"task_id"]) -> None: ...
+
+global___SandboxExecPollRequest = SandboxExecPollRequest
+
+class SandboxExecPollResponse(google.protobuf.message.Message):
+    """The response to a SandboxExecPollRequest. If the exec'd command has not
+    completed, exit_status will be unset.
+    """
+
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    CODE_FIELD_NUMBER: builtins.int
+    SIGNAL_FIELD_NUMBER: builtins.int
+    code: builtins.int
+    """The exit code of the command."""
+    signal: builtins.int
+    """The signal that terminated the command."""
+    def __init__(
+        self,
+        *,
+        code: builtins.int = ...,
+        signal: builtins.int = ...,
+    ) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["code", b"code", "exit_status", b"exit_status", "signal", b"signal"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["code", b"code", "exit_status", b"exit_status", "signal", b"signal"]) -> None: ...
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["exit_status", b"exit_status"]) -> typing_extensions.Literal["code", "signal"] | None: ...
+
+global___SandboxExecPollResponse = SandboxExecPollResponse
+
 class SandboxExecStartRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 

{modal-1.1.5.dev77 → modal-1.1.5.dev81}/modal_proto/sandbox_router_pb2_grpc.py

@@ -14,6 +14,11 @@ class SandboxRouterStub(object):
         Args:
             channel: A grpc.Channel.
         """
+        self.SandboxExecPoll = channel.unary_unary(
+                '/modal.sandbox_router.SandboxRouter/SandboxExecPoll',
+                request_serializer=modal__proto_dot_sandbox__router__pb2.SandboxExecPollRequest.SerializeToString,
+                response_deserializer=modal__proto_dot_sandbox__router__pb2.SandboxExecPollResponse.FromString,
+                )
         self.SandboxExecStart = channel.unary_unary(
                 '/modal.sandbox_router.SandboxRouter/SandboxExecStart',
                 request_serializer=modal__proto_dot_sandbox__router__pb2.SandboxExecStartRequest.SerializeToString,
@@ -39,6 +44,13 @@ class SandboxRouterStub(object):
 class SandboxRouterServicer(object):
     """Missing associated documentation comment in .proto file."""
 
+    def SandboxExecPoll(self, request, context):
+        """Poll for the exit status of an exec'd command.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
     def SandboxExecStart(self, request, context):
         """Execute a command in the sandbox.
         """
@@ -70,6 +82,11 @@ class SandboxRouterServicer(object):
 
 def add_SandboxRouterServicer_to_server(servicer, server):
     rpc_method_handlers = {
+            'SandboxExecPoll': grpc.unary_unary_rpc_method_handler(
+                    servicer.SandboxExecPoll,
+                    request_deserializer=modal__proto_dot_sandbox__router__pb2.SandboxExecPollRequest.FromString,
+                    response_serializer=modal__proto_dot_sandbox__router__pb2.SandboxExecPollResponse.SerializeToString,
+            ),
             'SandboxExecStart': grpc.unary_unary_rpc_method_handler(
                     servicer.SandboxExecStart,
                     request_deserializer=modal__proto_dot_sandbox__router__pb2.SandboxExecStartRequest.FromString,
@@ -100,6 +117,23 @@ def add_SandboxRouterServicer_to_server(servicer, server):
 class SandboxRouter(object):
     """Missing associated documentation comment in .proto file."""
 
+    @staticmethod
+    def SandboxExecPoll(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/modal.sandbox_router.SandboxRouter/SandboxExecPoll',
+            modal__proto_dot_sandbox__router__pb2.SandboxExecPollRequest.SerializeToString,
+            modal__proto_dot_sandbox__router__pb2.SandboxExecPollResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
     @staticmethod
     def SandboxExecStart(request,
             target,

{modal-1.1.5.dev77 → modal-1.1.5.dev81}/modal_proto/sandbox_router_pb2_grpc.pyi

@@ -9,6 +9,11 @@ import modal_proto.sandbox_router_pb2
 
 class SandboxRouterStub:
     def __init__(self, channel: grpc.Channel) -> None: ...
+    SandboxExecPoll: grpc.UnaryUnaryMultiCallable[
+        modal_proto.sandbox_router_pb2.SandboxExecPollRequest,
+        modal_proto.sandbox_router_pb2.SandboxExecPollResponse,
+    ]
+    """Poll for the exit status of an exec'd command."""
     SandboxExecStart: grpc.UnaryUnaryMultiCallable[
         modal_proto.sandbox_router_pb2.SandboxExecStartRequest,
         modal_proto.sandbox_router_pb2.SandboxExecStartResponse,
@@ -32,6 +37,13 @@ class SandboxRouterStub:
 
 class SandboxRouterServicer(metaclass=abc.ABCMeta):
     @abc.abstractmethod
+    def SandboxExecPoll(
+        self,
+        request: modal_proto.sandbox_router_pb2.SandboxExecPollRequest,
+        context: grpc.ServicerContext,
+    ) -> modal_proto.sandbox_router_pb2.SandboxExecPollResponse:
+        """Poll for the exit status of an exec'd command."""
+    @abc.abstractmethod
     def SandboxExecStart(
         self,
         request: modal_proto.sandbox_router_pb2.SandboxExecStartRequest,

{modal-1.1.5.dev77 → modal-1.1.5.dev81}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.1.5.dev77"
+__version__ = "1.1.5.dev81"