modal 1.1.3.dev2__py3-none-any.whl → 1.1.3.dev3__py3-none-any.whl

modal/_functions.py

@@ -100,6 +100,10 @@ if TYPE_CHECKING:
     import modal.partial_function
 
 MAX_INTERNAL_FAILURE_COUNT = 8
+TERMINAL_STATUSES = (
+    api_pb2.GenericResult.GENERIC_STATUS_SUCCESS,
+    api_pb2.GenericResult.GENERIC_STATUS_TERMINATED,
+)
 
 
 @dataclasses.dataclass
@@ -300,11 +304,7 @@ class _Invocation:
 
         while True:
             item = await self._get_single_output(ctx.input_jwt)
-            if item.result.status in (
-                api_pb2.GenericResult.GENERIC_STATUS_SUCCESS,
-                api_pb2.GenericResult.GENERIC_STATUS_TERMINATED,
-            ):
-                # success or cancellations are "final" results
+            if item.result.status in TERMINAL_STATUSES:
                 return await _process_result(item.result, item.data_format, self.stub, self.client)
 
             if item.result.status != api_pb2.GenericResult.GENERIC_STATUS_INTERNAL_FAILURE:
@@ -411,6 +411,7 @@ class _InputPlaneInvocation:
         client: _Client,
         input_item: api_pb2.FunctionPutInputsItem,
         function_id: str,
+        retry_policy: api_pb2.FunctionRetryPolicy,
         input_plane_region: str,
     ):
         self.stub = stub
@@ -418,6 +419,7 @@ class _InputPlaneInvocation:
         self.attempt_token = attempt_token
         self.input_item = input_item
         self.function_id = function_id
+        self.retry_policy = retry_policy
         self.input_plane_region = input_plane_region
 
     @staticmethod
@@ -453,11 +455,15 @@ class _InputPlaneInvocation:
         response = await retry_transient_errors(stub.AttemptStart, request, metadata=metadata)
         attempt_token = response.attempt_token
 
-        return _InputPlaneInvocation(stub, attempt_token, client, input_item, function_id, input_plane_region)
+        return _InputPlaneInvocation(
+            stub, attempt_token, client, input_item, function_id, response.retry_policy, input_plane_region
+        )
 
     async def run_function(self) -> Any:
+        # User errors including timeouts are managed by the user-specified retry policy.
+        user_retry_manager = RetryManager(self.retry_policy)
+
         # This will retry when the server returns GENERIC_STATUS_INTERNAL_FAILURE, i.e. lost inputs or worker preemption
-        # TODO(ryan): add logic to retry for user defined retry policy
         internal_failure_count = 0
         while True:
             await_request = api_pb2.AttemptAwaitRequest(
@@ -474,32 +480,48 @@ class _InputPlaneInvocation:
             )
 
             if await_response.HasField("output"):
+                if await_response.output.result.status in TERMINAL_STATUSES:
+                    return await _process_result(
+                        await_response.output.result, await_response.output.data_format, self.client.stub, self.client
+                    )
+
                 if await_response.output.result.status == api_pb2.GenericResult.GENERIC_STATUS_INTERNAL_FAILURE:
                     internal_failure_count += 1
                     # Limit the number of times we retry
                     if internal_failure_count < MAX_INTERNAL_FAILURE_COUNT:
                         # For system failures on the server, we retry immediately,
                         # and the failure does not count towards the retry policy.
-                        retry_request = api_pb2.AttemptRetryRequest(
-                            function_id=self.function_id,
-                            parent_input_id=current_input_id() or "",
-                            input=self.input_item,
-                            attempt_token=self.attempt_token,
-                        )
-                        # TODO(ryan): Add exponential backoff?
-                        retry_response = await retry_transient_errors(
-                            self.stub.AttemptRetry,
-                            retry_request,
-                            metadata=metadata,
-                        )
-                        self.attempt_token = retry_response.attempt_token
+                        self.attempt_token = await self._retry_input(metadata)
                         continue
 
-                control_plane_stub = self.client.stub
-                # Note: Blob download is done on the control plane stub, not the input plane stub!
-                return await _process_result(
-                    await_response.output.result, await_response.output.data_format, control_plane_stub, self.client
-                )
+                # We add delays between retries for non-internal failures.
+                delay_ms = user_retry_manager.get_delay_ms()
+                if delay_ms is None:
+                    # No more retries either because we reached the retry limit or user didn't set a retry policy
+                    # and the limit defaulted to 0.
+                    # An unsuccessful status should raise an error when it's converted to an exception.
+                    # Note: Blob download is done on the control plane stub not the input plane stub!
+                    return await _process_result(
+                        await_response.output.result, await_response.output.data_format, self.client.stub, self.client
+                    )
+                await asyncio.sleep(delay_ms / 1000)
+
+            await self._retry_input(metadata)
+
+    async def _retry_input(self, metadata: list[tuple[str, str]]) -> str:
+        retry_request = api_pb2.AttemptRetryRequest(
+            function_id=self.function_id,
+            parent_input_id=current_input_id() or "",
+            input=self.input_item,
+            attempt_token=self.attempt_token,
+        )
+        # TODO(ryan): Add exponential backoff?
+        retry_response = await retry_transient_errors(
+            self.stub.AttemptRetry,
+            retry_request,
+            metadata=metadata,
+        )
+        return retry_response.attempt_token
 
     async def run_generator(self):
         items_received = 0

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

modal/functions.pyi

@@ -433,7 +433,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."""
             ...
@@ -442,7 +442,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]:
@@ -469,7 +469,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.
 
@@ -493,7 +493,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]):
@@ -502,7 +502,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.
 
@@ -523,7 +523,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.3.dev2.dist-info → modal-1.1.3.dev3.dist-info}/METADATA

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

{modal-1.1.3.dev2.dist-info → modal-1.1.3.dev3.dist-info}/RECORD

@@ -3,7 +3,7 @@ modal/__main__.py,sha256=45H-GtwzaDfN-1nP4_HYvzN3s7AG_HXR4-ynrsjO_OI,2803
 modal/_clustered_functions.py,sha256=zmrKbptRbqp4euS3LWncKaLXb8Kjj4YreusOzpEpRMk,2856
 modal/_clustered_functions.pyi,sha256=_wtFjWocGf1WgI-qYBpbJPArNkg2H9JV7BVaGgMesEQ,1103
 modal/_container_entrypoint.py,sha256=a1HAQYh1gGpqHuhSw6AW7XDYHztbeYr5a8iNnfCnoks,29023
-modal/_functions.py,sha256=lPDk_KBKTS_FhOuLu15EXkvQndmoiNOnEe5A7BBd0ek,88003
+modal/_functions.py,sha256=dEUtjBxPxMfS-HW98JCXxSJbeSAVcIHQTWzojWZQIcY,88862
 modal/_ipython.py,sha256=TW1fkVOmZL3YYqdS2YlM1hqpf654Yf8ZyybHdBnlhSw,301
 modal/_location.py,sha256=joiX-0ZeutEUDTrrqLF1GHXCdVLF-rHzstocbMcd_-k,366
 modal/_object.py,sha256=gwsLdXb-Ecd8nH8LVCo8oVZPzzdyo9BrN1DjgQmsSuM,11967
@@ -22,7 +22,7 @@ modal/app.py,sha256=hJU3DGzP5GwYRmBj57XajljkQtLxkKftxXih2TYRcKo,48047
 modal/app.pyi,sha256=0U2xVKD3yfHe5l2bcihTDjPl__tzOvx1AIYOTebu-5o,43375
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=kyAIVB3Ay-XKJizQ_1ufUFB__EagV0MLmHJpyYyJ7J0,18636
-modal/client.pyi,sha256=LUmW9E-xvRRLwlFgR27iX0VYamKIQ6aBMq2Fa-jTiGA,15829
+modal/client.pyi,sha256=F0rZ98XW0UFZ-AReWqLTuvub4N5TiXZxJT369UTg330,15829
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=-qSfYAQvIoO_l2wsCCGTG5ZUwQieNKXdAO00yP1-LYU,7394
 modal/cls.py,sha256=1mBcExFrLDTZwkD3Dzu8F26_CL0CGktOV9pE60Y8g_E,40689
@@ -39,7 +39,7 @@ modal/file_io.py,sha256=OSKr77TujcXGJW1iikzYiHckLSmv07QBgBHcxxYEkoI,21456
 modal/file_io.pyi,sha256=xtO6Glf_BFwDE7QiQQo24QqcMf_Vv-iz7WojcGVlLBU,15932
 modal/file_pattern_matcher.py,sha256=A_Kdkej6q7YQyhM_2-BvpFmPqJ0oHb54B6yf9VqvPVE,8116
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
-modal/functions.pyi,sha256=vXmQ5-tlrxSV8E8eI0yEF2HUeF0Bd6VyQVxMCW3SpBE,38890
+modal/functions.pyi,sha256=h1oPAvbErW_i1Glzf_HsQenG-uH4KZk7X6razFbif6M,38890
 modal/gpu.py,sha256=Fe5ORvVPDIstSq1xjmM6OoNgLYFWvogP9r5BgmD3hYg,6769
 modal/image.py,sha256=9pSLEGMxwal55AY-hbL4eTf0lq3xMwuQ0mN-Gc3E99M,103134
 modal/image.pyi,sha256=zwCW80xe2BL7q4_kswfljKRrKjMkK5paTY26e5ITM1U,68507
@@ -153,7 +153,7 @@ modal/experimental/__init__.py,sha256=dPBPpxsmjZMLF3YjRrXoTvT01pl65wxi4UdFZsOem3
 modal/experimental/flash.py,sha256=viXQumCIFp5VFsPFURdFTBTjP_QnsAi8nSWXAMmfjeQ,19744
 modal/experimental/flash.pyi,sha256=A8_qJGtGoXEzKDdHbvhmCw7oqfneFEvJQK3ZdTOvUdU,10830
 modal/experimental/ipython.py,sha256=TrCfmol9LGsRZMeDoeMPx3Hv3BFqQhYnmD_iH0pqdhk,2904
-modal-1.1.3.dev2.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.1.3.dev3.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=c1yfBS_x--gL5bs0N4ihMwqwX8l3IBWSkBAKNNIi6bQ,3801
 modal_docs/gen_reference_docs.py,sha256=d_CQUGQ0rfw28u75I2mov9AlS773z9rG40-yq5o7g2U,6359
@@ -161,10 +161,10 @@ modal_docs/mdmd/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,2
 modal_docs/mdmd/mdmd.py,sha256=tUTImNd4UMFk1opkaw8J672gX8AkBO5gbY2S_NMxsxs,7140
 modal_docs/mdmd/signatures.py,sha256=XJaZrK7Mdepk5fdX51A8uENiLFNil85Ud0d4MH8H5f0,3218
 modal_proto/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
-modal_proto/api.proto,sha256=srqE_dcKCEo5KmzQjguPH63O-QzcVHL_akZ-C3nwwLs,104765
+modal_proto/api.proto,sha256=COEYvEVL-RpN0laad0PAhVHP0ChZNGAnjimqPQ6pwlw,104712
 modal_proto/api_grpc.py,sha256=AWsKZFdXr_T6LpWGlMM6BDY30RdOPjqgoPMijR-R1lI,127964
 modal_proto/api_pb2.py,sha256=yoKWv2SoqnPhZ4cwb6bxoljOvDJeoBI9-TMLgd6PZ0c,366803
-modal_proto/api_pb2.pyi,sha256=-mbVs5im1-Zl9uUeOahfeNe0UQoZ2h_QJUg7GfiZncE,506061
+modal_proto/api_pb2.pyi,sha256=9BnK5J8cmqeKgo57jW4WS5qlGVJfyVLP-AeuA__tWmU,506001
 modal_proto/api_pb2_grpc.py,sha256=kDZBX6i1KdRpm4P3c2wdRbGe3XOFtqGHSbWE0vOe4F4,276062
 modal_proto/api_pb2_grpc.pyi,sha256=s1hjXmqaB3jGCSgnOouzncdfMVX0umPZd4TC1zObhgU,64579
 modal_proto/modal_api_grpc.py,sha256=faBxtXAqoz6ei8ntNu1MQTL859FFHH_LZww_FP9wubw,19311
@@ -176,10 +176,10 @@ modal_proto/options_pb2.pyi,sha256=l7DBrbLO7q3Ir-XDkWsajm0d0TQqqrfuX54i4BMpdQg,1
 modal_proto/options_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
 modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0yJSI,247
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modal_version/__init__.py,sha256=2GvJh7k6QBJizOLR3oCqqKj-f53fAPmr7U7eKcpQYq4,120
+modal_version/__init__.py,sha256=cXuBYyPLeQ0NDGD3GpT3f4jI8wrH0Ydql9I7MV77hTg,120
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal-1.1.3.dev2.dist-info/METADATA,sha256=_mpWRm8JafecerEZD_qKtkORIy4qGK4hVdBAXmwESwk,2459
-modal-1.1.3.dev2.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.1.3.dev2.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.1.3.dev2.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.1.3.dev2.dist-info/RECORD,,
+modal-1.1.3.dev3.dist-info/METADATA,sha256=TxKaMMdWS6VkASan7YRw_yFFFKAn-OCMViJvA7N2RHA,2459
+modal-1.1.3.dev3.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.1.3.dev3.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.1.3.dev3.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.1.3.dev3.dist-info/RECORD,,

modal_proto/api.proto

@@ -618,7 +618,7 @@ message AttemptStartRequest {
 
 message AttemptStartResponse {
   string attempt_token = 1;
-  FunctionRetryPolicy retry_policy = 2; // TODO(ben-okeefe) TODO(nathan): Not currently used
+  FunctionRetryPolicy retry_policy = 2;
 }
 
 message AuthTokenGetRequest {

modal_proto/api_pb2.pyi

@@ -1959,8 +1959,7 @@ class AttemptStartResponse(google.protobuf.message.Message):
     RETRY_POLICY_FIELD_NUMBER: builtins.int
     attempt_token: builtins.str
     @property
-    def retry_policy(self) -> global___FunctionRetryPolicy:
-        """TODO(ben-okeefe) TODO(nathan): Not currently used"""
+    def retry_policy(self) -> global___FunctionRetryPolicy: ...
     def __init__(
         self,
         *,

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.dev2"
+__version__ = "1.1.3.dev3"