modal 1.0.6.dev42__tar.gz → 1.0.6.dev44__tar.gz

{modal-1.0.6.dev42 → modal-1.0.6.dev44}/PKG-INFO

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

{modal-1.0.6.dev42 → modal-1.0.6.dev44}/modal/_runtime/container_io_manager.py

@@ -267,6 +267,7 @@ class _ContainerIOManager:
     app_id: str
     function_def: api_pb2.Function
     checkpoint_id: Optional[str]
+    input_plane_server_url: Optional[str]
 
     calls_completed: int
     total_user_time: float
@@ -299,6 +300,12 @@ class _ContainerIOManager:
         self.function_def = container_args.function_def
         self.checkpoint_id = container_args.checkpoint_id or None
 
+        # We could also have the worker pass this in explicitly.
+        self.input_plane_server_url = None
+        for obj in container_args.app_layout.objects:
+            if obj.object_id == self.function_id:
+                self.input_plane_server_url = obj.function_handle_metadata.input_plane_url
+
         self.calls_completed = 0
         self.total_user_time = 0.0
         self.current_input_id = None
@@ -504,8 +511,18 @@ class _ContainerIOManager:
                 chunk.data = message_bytes
             data_chunks.append(chunk)
 
-        req = api_pb2.FunctionCallPutDataRequest(function_call_id=function_call_id, data_chunks=data_chunks)
-        await retry_transient_errors(self._client.stub.FunctionCallPutDataOut, req)
+        attempt_token = await self._client._auth_token_manager.get_token()
+        req = api_pb2.FunctionCallPutDataRequest(
+            function_call_id=function_call_id,
+            data_chunks=data_chunks,
+            attempt_token=attempt_token,
+        )
+
+        if self.input_plane_server_url:
+            stub = await self._client.get_stub(self.input_plane_server_url)
+            await retry_transient_errors(stub.FunctionCallPutDataOut, req)
+        else:
+            await retry_transient_errors(self._client.stub.FunctionCallPutDataOut, req)
 
     @asynccontextmanager
     async def generator_output_sender(

{modal-1.0.6.dev42 → modal-1.0.6.dev44}/modal/_runtime/container_io_manager.pyi

@@ -89,6 +89,7 @@ class _ContainerIOManager:
     app_id: str
     function_def: modal_proto.api_pb2.Function
     checkpoint_id: typing.Optional[str]
+    input_plane_server_url: typing.Optional[str]
     calls_completed: int
     total_user_time: float
     current_input_id: typing.Optional[str]
@@ -250,6 +251,7 @@ class ContainerIOManager:
     app_id: str
     function_def: modal_proto.api_pb2.Function
     checkpoint_id: typing.Optional[str]
+    input_plane_server_url: typing.Optional[str]
     calls_completed: int
     total_user_time: float
     current_input_id: typing.Optional[str]

{modal-1.0.6.dev42 → modal-1.0.6.dev44}/modal/client.pyi

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

{modal-1.0.6.dev42 → modal-1.0.6.dev44}/modal/functions.pyi

@@ -428,7 +428,7 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_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."""
             ...
@@ -437,7 +437,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -464,7 +464,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -488,7 +488,7 @@ class Function(
             ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
+        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -497,7 +497,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -518,7 +518,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, 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.0.6.dev42 → modal-1.0.6.dev44}/modal.egg-info/PKG-INFO

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

{modal-1.0.6.dev42 → modal-1.0.6.dev44}/modal_proto/api.proto

@@ -1516,6 +1516,7 @@ message FunctionCallListResponse {
 message FunctionCallPutDataRequest {
   string function_call_id = 1;
   repeated DataChunk data_chunks = 2;
+  optional string attempt_token = 3;
 }
 
 message FunctionCreateRequest {