modal 1.1.5.dev13__tar.gz → 1.1.5.dev15__tar.gz

{modal-1.1.5.dev13 → modal-1.1.5.dev15}/PKG-INFO

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

{modal-1.1.5.dev13 → modal-1.1.5.dev15}/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.dev13",
+        version: str = "1.1.5.dev15",
     ):
         """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.dev13",
+        version: str = "1.1.5.dev15",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.1.5.dev13 → modal-1.1.5.dev15}/modal/functions.pyi

@@ -445,7 +445,7 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER:
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
@@ -454,7 +454,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -481,7 +481,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """[Experimental] Calls the function with the given arguments, without waiting for the results.
 
@@ -505,7 +505,7 @@ class Function(
             ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
+        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -514,7 +514,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """Calls the function with the given arguments, without waiting for the results.
 
@@ -535,7 +535,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

{modal-1.1.5.dev13 → modal-1.1.5.dev15}/modal.egg-info/PKG-INFO

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

{modal-1.1.5.dev13 → modal-1.1.5.dev15}/modal_proto/api.proto

@@ -2156,7 +2156,10 @@ message ListPagination {
 }
 
 message MapAwaitRequest {
-  string function_call_id = 1;
+  oneof call_info {
+    string function_call_id = 1;
+    string map_token = 5;
+  }
   string last_entry_id = 2;
   double requested_at = 3; // Used for waypoints.
   float timeout = 4;
@@ -2185,11 +2188,18 @@ message MapStartOrContinueItem {
 message MapStartOrContinueRequest {
   string function_id = 1;
   string parent_input_id = 2;
-  optional string function_call_id = 3; // This is given iff this is a map continue request.
+  // Clients will send call_info on map continue requests.
+  oneof call_info {
+    string function_call_id = 3;
+    string map_token = 5;
+  }
   repeated MapStartOrContinueItem items = 4;
 }
 
 message MapStartOrContinueResponse {
+  // function_id and function_call_id are not necessary if map_token is provided.
+  // All 3 will be sent until it is safe to only send map_token.
+  string map_token = 6;
   string function_id = 1;
   string function_call_id = 2;
   uint32 max_inputs_outstanding = 3;
@@ -2667,12 +2677,12 @@ message Sandbox {
   optional uint32 idle_timeout_secs = 33;
 }
 
-message SandboxCreateConnectCredentialsRequest {
+message SandboxCreateConnectTokenRequest {
   string sandbox_id = 1;
   string metadata = 2;
 }
 
-message SandboxCreateConnectCredentialsResponse {
+message SandboxCreateConnectTokenResponse {
   string url = 1;
   string token = 2;
 }
@@ -3622,7 +3632,7 @@ service ModalClient {
 
   // Sandboxes
   rpc SandboxCreate(SandboxCreateRequest) returns (SandboxCreateResponse);
-  rpc SandboxCreateConnectCredentials(SandboxCreateConnectCredentialsRequest) returns (SandboxCreateConnectCredentialsResponse);
+  rpc SandboxCreateConnectToken(SandboxCreateConnectTokenRequest) returns (SandboxCreateConnectTokenResponse);
   rpc SandboxGetFromName(SandboxGetFromNameRequest) returns (SandboxGetFromNameResponse);
   rpc SandboxGetLogs(SandboxGetLogsRequest) returns (stream TaskLogsBatch);
   rpc SandboxGetResourceUsage(SandboxGetResourceUsageRequest) returns (SandboxGetResourceUsageResponse);

{modal-1.1.5.dev13 → modal-1.1.5.dev15}/modal_proto/api_grpc.py

@@ -467,7 +467,7 @@ class ModalClientBase(abc.ABC):
         pass
 
     @abc.abstractmethod
-    async def SandboxCreateConnectCredentials(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxCreateConnectCredentialsRequest, modal_proto.api_pb2.SandboxCreateConnectCredentialsResponse]') -> None:
+    async def SandboxCreateConnectToken(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxCreateConnectTokenRequest, modal_proto.api_pb2.SandboxCreateConnectTokenResponse]') -> None:
         pass
 
     @abc.abstractmethod
@@ -1368,11 +1368,11 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.SandboxCreateRequest,
                 modal_proto.api_pb2.SandboxCreateResponse,
             ),
-            '/modal.client.ModalClient/SandboxCreateConnectCredentials': grpclib.const.Handler(
-                self.SandboxCreateConnectCredentials,
+            '/modal.client.ModalClient/SandboxCreateConnectToken': grpclib.const.Handler(
+                self.SandboxCreateConnectToken,
                 grpclib.const.Cardinality.UNARY_UNARY,
-                modal_proto.api_pb2.SandboxCreateConnectCredentialsRequest,
-                modal_proto.api_pb2.SandboxCreateConnectCredentialsResponse,
+                modal_proto.api_pb2.SandboxCreateConnectTokenRequest,
+                modal_proto.api_pb2.SandboxCreateConnectTokenResponse,
             ),
             '/modal.client.ModalClient/SandboxGetFromName': grpclib.const.Handler(
                 self.SandboxGetFromName,
@@ -2388,11 +2388,11 @@ class ModalClientStub:
             modal_proto.api_pb2.SandboxCreateRequest,
             modal_proto.api_pb2.SandboxCreateResponse,
         )
-        self.SandboxCreateConnectCredentials = grpclib.client.UnaryUnaryMethod(
+        self.SandboxCreateConnectToken = grpclib.client.UnaryUnaryMethod(
             channel,
-            '/modal.client.ModalClient/SandboxCreateConnectCredentials',
-            modal_proto.api_pb2.SandboxCreateConnectCredentialsRequest,
-            modal_proto.api_pb2.SandboxCreateConnectCredentialsResponse,
+            '/modal.client.ModalClient/SandboxCreateConnectToken',
+            modal_proto.api_pb2.SandboxCreateConnectTokenRequest,
+            modal_proto.api_pb2.SandboxCreateConnectTokenResponse,
         )
         self.SandboxGetFromName = grpclib.client.UnaryUnaryMethod(
             channel,