modal 0.73.94__py3-none-any.whl → 0.73.96__py3-none-any.whl

modal/_utils/async_utils.py

@@ -385,6 +385,10 @@ class AsyncOrSyncIterable:
         except NestedEventLoops:
             raise InvalidError(self.nested_async_message)
 
+    async def aclose(self):
+        if hasattr(self._async_iterable, "aclose"):
+            await self._async_iterable.aclose()
+
 
 _shutdown_tasks = []
 

modal/_utils/grpc_utils.py

@@ -8,6 +8,7 @@ import typing
 import urllib.parse
 import uuid
 from collections.abc import AsyncIterator
+from dataclasses import dataclass
 from typing import (
     Any,
     Optional,
@@ -68,6 +69,11 @@ RETRYABLE_GRPC_STATUS_CODES = [
     Status.INTERNAL,
 ]
 
+@dataclass
+class RetryWarningMessage:
+    message: str
+    warning_interval: int
+    errors_to_warn_for: typing.List[Status]
 
 def create_channel(
     server_url: str,
@@ -144,6 +150,7 @@ async def retry_transient_errors(
     attempt_timeout: Optional[float] = None,  # timeout for each attempt
     total_timeout: Optional[float] = None,  # timeout for the entire function call
     attempt_timeout_floor=2.0,  # always have at least this much timeout (only for total_timeout)
+    retry_warning_message: Optional[RetryWarningMessage] = None
 ) -> ResponseType:
     """Retry on transient gRPC failures with back-off until max_retries is reached.
     If max_retries is None, retry forever."""
@@ -212,6 +219,9 @@ async def retry_transient_errors(
 
             n_retries += 1
 
+            if retry_warning_message and n_retries % retry_warning_message.warning_interval == 0:
+                logger.warning(retry_warning_message.message)
+
             await asyncio.sleep(delay)
             delay = min(delay * delay_factor, max_delay)
 

modal/client.pyi

@@ -27,7 +27,7 @@ class _Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.94"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.96"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -85,7 +85,7 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.94"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.96"
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/parallel_map.py

@@ -5,7 +5,7 @@ import typing
 from dataclasses import dataclass
 from typing import Any, Callable, Optional
 
-from grpclib import GRPCError, Status
+from grpclib import Status
 
 from modal._runtime.execution_context import current_input_id
 from modal._utils.async_utils import (
@@ -27,13 +27,17 @@ from modal._utils.function_utils import (
     _create_input,
     _process_result,
 )
-from modal._utils.grpc_utils import retry_transient_errors
+from modal._utils.grpc_utils import RETRYABLE_GRPC_STATUS_CODES, RetryWarningMessage, retry_transient_errors
 from modal.config import logger
 from modal_proto import api_pb2
 
 if typing.TYPE_CHECKING:
     import modal.client
 
+# pump_inputs should retry if it receives any of the standard retryable codes plus RESOURCE_EXHAUSTED.
+PUMP_INPUTS_RETRYABLE_GRPC_STATUS_CODES = RETRYABLE_GRPC_STATUS_CODES + [Status.RESOURCE_EXHAUSTED]
+PUMP_INPUTS_MAX_RETRIES = 8
+PUMP_INPUTS_MAX_RETRY_DELAY=15
 
 class _SynchronizedQueue:
     """mdmd:hidden"""
@@ -136,25 +140,19 @@ async def _map_invocation(
             logger.debug(
                 f"Pushing {len(items)} inputs to server. Num queued inputs awaiting push is {input_queue.qsize()}."
             )
-            while True:
-                try:
-                    resp = await retry_transient_errors(
-                        client.stub.FunctionPutInputs,
-                        request,
-                        # with 8 retries we log the warning below about every 30 secondswhich isn't too spammy.
-                        max_retries=8,
-                        max_delay=15,
-                        additional_status_codes=[Status.RESOURCE_EXHAUSTED],
-                    )
-                    break
-                except GRPCError as err:
-                    if err.status != Status.RESOURCE_EXHAUSTED:
-                        raise err
-                    logger.warning(
-                        f"Warning: map progress for function {function._function_name} is limited."
-                        " Common bottlenecks include slow iteration over results, or function backlogs."
-                    )
-
+            # with 8 retries we log the warning below about every 30 seconds which isn't too spammy.
+            retry_warning_message = RetryWarningMessage(
+                message=f"Warning: map progress for function {function._function_name} is limited."
+                " Common bottlenecks include slow iteration over results, or function backlogs.",
+                warning_interval=8,
+                errors_to_warn_for=[Status.RESOURCE_EXHAUSTED])
+            resp = await retry_transient_errors(
+                client.stub.FunctionPutInputs,
+                request,
+                max_retries=None,
+                max_delay=PUMP_INPUTS_MAX_RETRY_DELAY,
+                additional_status_codes=[Status.RESOURCE_EXHAUSTED],
+                retry_warning_message=retry_warning_message)
             count_update()
             for item in resp.inputs:
                 pending_outputs.setdefault(item.input_id, 0)
@@ -312,7 +310,7 @@ def _map_sync(
 
 @warn_if_generator_is_not_consumed(function_name="Function.map.aio")
 async def _map_async(
-    self,
+    self: "modal.functions.Function",
     *input_iterators: typing.Union[
         typing.Iterable[Any], typing.AsyncIterable[Any]
     ],  # one input iterator per argument in the mapped-over function/generator
@@ -339,19 +337,20 @@ async def _map_async(
             async for args in streamer:
                 await raw_input_queue.put.aio((args, kwargs))
         await raw_input_queue.put.aio(None)  # end-of-input sentinel
-
-    feed_input_task = asyncio.create_task(feed_queue())
-
-    try:
-        # note that `map()` and `map.aio()` are not synchronicity-wrapped, since
-        # they accept executable code in the form of
-        # iterators that we don't want to run inside the synchronicity thread.
-        # Instead, we delegate to `._map()` with a safer Queue as input
-        async with aclosing(self._map.aio(raw_input_queue, order_outputs, return_exceptions)) as map_output_stream:
-            async for output in map_output_stream:
-                yield output
-    finally:
-        feed_input_task.cancel()  # should only be needed in case of exceptions
+        if False:
+            # make this a never yielding generator so we can async_merge it below
+            # this is important so any exception raised in feed_queue will be propagated
+            yield
+
+    # note that `map()` and `map.aio()` are not synchronicity-wrapped, since
+    # they accept executable code in the form of
+    # iterators that we don't want to run inside the synchronicity thread.
+    # Instead, we delegate to `._map()` with a safer Queue as input
+    async with aclosing(
+        async_merge(self._map.aio(raw_input_queue, order_outputs, return_exceptions), feed_queue())
+    ) as map_output_stream:
+        async for output in map_output_stream:
+            yield output
 
 
 def _for_each_sync(self, *input_iterators, kwargs={}, ignore_exceptions: bool = False):

modal/parallel_map.pyi

@@ -2,6 +2,7 @@ import collections.abc
 import modal._functions
 import modal._utils.async_utils
 import modal.client
+import modal.functions
 import typing
 import typing_extensions
 
@@ -52,7 +53,7 @@ def _map_sync(
     self, *input_iterators, kwargs={}, order_outputs: bool = True, return_exceptions: bool = False
 ) -> modal._utils.async_utils.AsyncOrSyncIterable: ...
 def _map_async(
-    self,
+    self: modal.functions.Function,
     *input_iterators: typing.Union[typing.Iterable[typing.Any], typing.AsyncIterable[typing.Any]],
     kwargs={},
     order_outputs: bool = True,

{modal-0.73.94.dist-info → modal-0.73.96.dist-info}/METADATA

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

{modal-0.73.94.dist-info → modal-0.73.96.dist-info}/RECORD

@@ -22,7 +22,7 @@ modal/app.py,sha256=ojhuLZuNZAQ1OsbDH0k6G4pm1W7bOIvZfXbaKlvQ-Ao,45622
 modal/app.pyi,sha256=tZFbcsu20SuvfB2puxCyuXLFNJ9bQulzag55rVpgZmc,26827
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=j9D3hNis1lfhnz9lVFGgJgowbH3PaGUzNKgHPWYG778,15372
-modal/client.pyi,sha256=v8voss-x8xmD6S5y316pRZRpaf6A2UrrxrJlQ6qmb50,7593
+modal/client.pyi,sha256=Fy8pLhqiVFbGOaLU5x0qZVC9VAu8qXIPyTbGiB09KK4,7593
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=JhDbaZZHN52lqA_roY1BCbcN9BvbkUcdXiM2Kg9lIc0,31717
@@ -54,8 +54,8 @@ modal/network_file_system.pyi,sha256=4N3eqMbTSlqmS8VV_aJK-uvrgJC8xnf_YtW5FHfRfc8
 modal/object.py,sha256=bTeskuY8JFrESjU4_UL_nTwYlBQdOLmVaOX3X6EMxsg,164
 modal/object.pyi,sha256=kyJkRQcVv3ct7zSAxvvXcuhBVeH914v80uSlqeS7cA4,5632
 modal/output.py,sha256=q4T9uHduunj4NwY-YSwkHGgjZlCXMuJbfQ5UFaAGRAc,1968
-modal/parallel_map.py,sha256=POBTyiWabe2e4qBNlsjjksiu1AAPEsNqI-mM8cgNFco,16042
-modal/parallel_map.pyi,sha256=-YKY_bVuQv8B4gtFrHnXtuNV0_JpmU9vqMJzR7beeCU,2524
+modal/parallel_map.py,sha256=Mctp_HdfyG1aMCw2ohcywLqGEKIbSPNtI3VyvXgSGJc,16321
+modal/parallel_map.pyi,sha256=CWLbHNo6bJMOHSGfbLLcIDh-3XT3jtUOG_jzuFYLqcw,2573
 modal/partial_function.py,sha256=uu8zvIV0Big0jiTlC4-VPL16dOScNB5jhfPeqxvvCrI,1117
 modal/partial_function.pyi,sha256=-MAK61qJRi6Wjym-Measz5_9moJurYrJfdi7uSQZa5M,4936
 modal/proxy.py,sha256=NrOevrWxG3G7-zlyRzG6BcIvop7AWLeyahZxitbBaOk,1418
@@ -93,14 +93,14 @@ modal/_runtime/telemetry.py,sha256=T1RoAGyjBDr1swiM6pPsGRSITm7LI5FDK18oNXxY08U,5
 modal/_runtime/user_code_imports.py,sha256=OTxf5BIwMOaHFplIxxyEAOsR-xM2f5kSiSOa9Ne2le0,14814
 modal/_utils/__init__.py,sha256=waLjl5c6IPDhSsdWAm9Bji4e2PVxamYABKAze6CHVXY,28
 modal/_utils/app_utils.py,sha256=88BT4TPLWfYAQwKTHcyzNQRHg8n9B-QE2UyJs96iV-0,108
-modal/_utils/async_utils.py,sha256=5PdDuI1aSwPOI4a3dIvW0DkPqGw6KZN6RtWE18Dzv1E,25079
+modal/_utils/async_utils.py,sha256=aes4Me0GA3yurNjsb6f8qeLD5bQw8NOmzKQFUqLaqSk,25208
 modal/_utils/blob_utils.py,sha256=RB1G6T7eC1Poe-O45qYLaxwCr2jkM-Q6Nexk1J3wk_w,14505
 modal/_utils/bytes_io_segment_payload.py,sha256=uunxVJS4PE1LojF_UpURMzVK9GuvmYWRqQo_bxEj5TU,3385
 modal/_utils/deprecation.py,sha256=EXP1beU4pmEqEzWMLw6E3kUfNfpmNA_VOp6i0EHi93g,4856
 modal/_utils/docker_utils.py,sha256=h1uETghR40mp_y3fSWuZAfbIASH1HMzuphJHghAL6DU,3722
 modal/_utils/function_utils.py,sha256=Rmz8GJDie-RW_q2RcTwholEWixS2IQDPBsRBJ3f3ZvU,27302
 modal/_utils/grpc_testing.py,sha256=H1zHqthv19eGPJz2HKXDyWXWGSqO4BRsxah3L5Xaa8A,8619
-modal/_utils/grpc_utils.py,sha256=qYzsePrTZcuZ66GEJw718X0KrRJwp_wqspJNP_lInqM,7972
+modal/_utils/grpc_utils.py,sha256=rERGLUYRVv1tOLxOkHD-c8fc_gXUhHfHshkr7NQCH7Q,8356
 modal/_utils/hash_utils.py,sha256=zg3J6OGxTFGSFri1qQ12giDz90lWk8bzaxCTUCRtiX4,3034
 modal/_utils/http_utils.py,sha256=yeTFsXYr0rYMEhB7vBP7audG9Uc7OLhzKBANFDZWVt0,2451
 modal/_utils/logger.py,sha256=ePzdudrtx9jJCjuO6-bcL_kwUJfi4AwloUmIiNtqkY0,1330
@@ -168,10 +168,10 @@ modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0y
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_version/__init__.py,sha256=wiJQ53c-OMs0Xf1UeXOxQ7FwlV1VzIjnX6o-pRYZ_Pk,470
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal_version/_version_generated.py,sha256=DEfu-7ga9Ulk647AlqzbbmsRNCxfG9L_3Vi5naDfyyU,149
-modal-0.73.94.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.73.94.dist-info/METADATA,sha256=apvv3TUlTPcKiB8EgLNbA3MajsPR3hSJ60UBg-WAy3I,2452
-modal-0.73.94.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-modal-0.73.94.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.94.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.73.94.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=JzFwSulqLTXbV5v6KCgLju2IGDqyKLdFJjZJ995cnds,149
+modal-0.73.96.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.96.dist-info/METADATA,sha256=yE8ybxzFN_prnqz6-K_DzV40G8on9awGSYCrSvqY6mA,2452
+modal-0.73.96.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+modal-0.73.96.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.96.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.73.96.dist-info/RECORD,,

modal_version/_version_generated.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 
 # Note: Reset this value to -1 whenever you make a minor `0.X` release of the client.
-build_number = 94  # git: 3f8ec72
+build_number = 96  # git: 9b83eca