modal 1.1.3.dev3__tar.gz → 1.1.3.dev4__tar.gz

{modal-1.1.3.dev3 → modal-1.1.3.dev4}/PKG-INFO

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

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

{modal-1.1.3.dev3 → modal-1.1.3.dev4}/modal/parallel_map.py

@@ -673,9 +673,11 @@ async def _map_invocation_inputplane(
     # any reason).
     max_inputs_outstanding = MAX_INPUTS_OUTSTANDING_DEFAULT
 
-    # Input plane does not yet return a retry policy. So we currently disable retries.
+    # Set a default retry policy to construct an instance of _MapItemsManager.
+    # We'll update the retry policy with the actual user-specified retry policy
+    # from the server in the first MapStartOrContinue response.
     retry_policy = api_pb2.FunctionRetryPolicy(
-        retries=0,  # Input plane does not yet return a retry policy. So only retry server failures for now.
+        retries=0,
         initial_delay_ms=1000,
         max_delay_ms=1000,
         backoff_coefficient=1.0,
@@ -771,10 +773,17 @@ async def _map_invocation_inputplane(
 
             map_items_manager.handle_put_continue_response(response_items_idx_tuple)
 
+            # Set the function call id and actual retry policy with the data from the first response.
+            # This conditional is skipped for subsequent iterations of this for-loop.
             if function_call_id is None:
                 function_call_id = response.function_call_id
                 function_call_id_received.set()
                 max_inputs_outstanding = response.max_inputs_outstanding or MAX_INPUTS_OUTSTANDING_DEFAULT
+                map_items_manager.set_retry_policy(response.retry_policy)
+                # Update the retry policy for the first batch of inputs.
+                # Subsequent batches will have the correct user-specified retry policy
+                # set by the updated _MapItemsManager.
+                map_items_manager.update_items_retry_policy(response.retry_policy)
         yield
 
     async def check_lost_inputs():
@@ -1475,6 +1484,9 @@ class _MapItemContext:
             retry_count=self.retry_manager.retry_count,
         )
 
+    def set_retry_policy(self, retry_policy: api_pb2.FunctionRetryPolicy):
+        self.retry_manager = RetryManager(retry_policy)
+
     def handle_retry_response(self, input_jwt: str):
         self.input_jwt.set_result(input_jwt)
         self.state = _MapItemState.WAITING_FOR_OUTPUT
@@ -1511,6 +1523,9 @@ class _MapItemsManager:
         self._sync_client_retries_enabled = sync_client_retries_enabled
         self._is_input_plane_instance = is_input_plane_instance
 
+    def set_retry_policy(self, retry_policy: api_pb2.FunctionRetryPolicy):
+        self._retry_policy = retry_policy
+
     async def add_items(self, items: list[api_pb2.FunctionPutInputsItem]):
         for item in items:
             # acquire semaphore to limit the number of inputs in progress
@@ -1540,6 +1555,10 @@ class _MapItemsManager:
     async def prepare_items_for_retry(self, retriable_idxs: list[int]) -> list[api_pb2.FunctionRetryInputsItem]:
         return [await self._item_context[idx].prepare_item_for_retry() for idx in retriable_idxs]
 
+    def update_items_retry_policy(self, retry_policy: api_pb2.FunctionRetryPolicy):
+        for ctx in self._item_context.values():
+            ctx.set_retry_policy(retry_policy)
+
     def get_input_jwts_waiting_for_output(self) -> list[str]:
         """
         Returns a list of input_jwts for inputs that are waiting for output.

{modal-1.1.3.dev3 → modal-1.1.3.dev4}/modal/parallel_map.pyi

@@ -406,6 +406,7 @@ class _MapItemContext:
         ...
 
     async def prepare_item_for_retry(self) -> modal_proto.api_pb2.FunctionRetryInputsItem: ...
+    def set_retry_policy(self, retry_policy: modal_proto.api_pb2.FunctionRetryPolicy): ...
     def handle_retry_response(self, input_jwt: str): ...
     async def create_map_start_or_continue_item(self, idx: int) -> modal_proto.api_pb2.MapStartOrContinueItem: ...
 
@@ -422,11 +423,13 @@ class _MapItemsManager:
         """Initialize self.  See help(type(self)) for accurate signature."""
         ...
 
+    def set_retry_policy(self, retry_policy: modal_proto.api_pb2.FunctionRetryPolicy): ...
     async def add_items(self, items: list[modal_proto.api_pb2.FunctionPutInputsItem]): ...
     async def add_items_inputplane(self, items: list[modal_proto.api_pb2.MapStartOrContinueItem]): ...
     async def prepare_items_for_retry(
         self, retriable_idxs: list[int]
     ) -> list[modal_proto.api_pb2.FunctionRetryInputsItem]: ...
+    def update_items_retry_policy(self, retry_policy: modal_proto.api_pb2.FunctionRetryPolicy): ...
     def get_input_jwts_waiting_for_output(self) -> list[str]:
         """Returns a list of input_jwts for inputs that are waiting for output."""
         ...

{modal-1.1.3.dev3 → modal-1.1.3.dev4}/modal.egg-info/PKG-INFO

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

{modal-1.1.3.dev3 → modal-1.1.3.dev4}/modal_proto/api.proto

@@ -2167,7 +2167,7 @@ message MapStartOrContinueResponse {
   string function_call_id = 2;
   uint32 max_inputs_outstanding = 3;
   repeated string attempt_tokens = 4;
-  FunctionRetryPolicy retry_policy = 5; // TODO(ben-okeefe): Not currently used
+  FunctionRetryPolicy retry_policy = 5;
 }
 
 message MethodDefinition {

{modal-1.1.3.dev3 → modal-1.1.3.dev4}/modal_proto/api_pb2.pyi

@@ -7006,8 +7006,7 @@ class MapStartOrContinueResponse(google.protobuf.message.Message):
     @property
     def attempt_tokens(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]: ...
     @property
-    def retry_policy(self) -> global___FunctionRetryPolicy:
-        """TODO(ben-okeefe): Not currently used"""
+    def retry_policy(self) -> global___FunctionRetryPolicy: ...
     def __init__(
         self,
         *,

{modal-1.1.3.dev3 → modal-1.1.3.dev4}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.1.3.dev3"
+__version__ = "1.1.3.dev4"