modal 0.73.95__tar.gz → 0.73.97__tar.gz

{modal-0.73.95 → modal-0.73.97}/PKG-INFO

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

{modal-0.73.95 → modal-0.73.97}/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-0.73.95 → modal-0.73.97}/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.95"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.97"
     ): ...
     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.95"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.97"
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-0.73.95 → modal-0.73.97}/modal/image.py

@@ -56,13 +56,14 @@ if typing.TYPE_CHECKING:
     import modal._functions
 
 # This is used for both type checking and runtime validation
-ImageBuilderVersion = Literal["2023.12", "2024.04", "2024.10"]
+ImageBuilderVersion = Literal["2023.12", "2024.04", "2024.10", "PREVIEW"]
 
 # Note: we also define supported Python versions via logic at the top of the package __init__.py
 # so that we fail fast / clearly in unsupported containers. Additionally, we enumerate the supported
 # Python versions in mount.py where we specify the "standalone Python versions" we create mounts for.
 # Consider consolidating these multiple sources of truth?
 SUPPORTED_PYTHON_SERIES: dict[ImageBuilderVersion, list[str]] = {
+    "PREVIEW": ["3.9", "3.10", "3.11", "3.12", "3.13"],
     "2024.10": ["3.9", "3.10", "3.11", "3.12", "3.13"],
     "2024.04": ["3.9", "3.10", "3.11", "3.12"],
     "2023.12": ["3.9", "3.10", "3.11", "3.12"],
@@ -248,9 +249,11 @@ def _get_image_builder_version(server_version: ImageBuilderVersion) -> ImageBuil
             update_suggestion = "your image builder version using the Modal dashboard"
         else:
             update_suggestion = "your client library (pip install --upgrade modal)"
+        preview_versions: set[ImageBuilderVersion] = {"PREVIEW"}
+        suggested_versions = supported_versions - preview_versions
         raise VersionError(
             "This version of the modal client supports the following image builder versions:"
-            f" {supported_versions!r}."
+            f" {suggested_versions!r}."
             f"\n\nYou are using {version!r}{version_source}."
             f" Please update {update_suggestion}."
         )

{modal-0.73.95 → modal-0.73.97}/modal/image.pyi

@@ -16,7 +16,7 @@ import pathlib
 import typing
 import typing_extensions
 
-ImageBuilderVersion = typing.Literal["2023.12", "2024.04", "2024.10"]
+ImageBuilderVersion = typing.Literal["2023.12", "2024.04", "2024.10", "PREVIEW"]
 
 class _AutoDockerIgnoreSentinel:
     def __repr__(self) -> str: ...
@@ -26,17 +26,21 @@ AUTO_DOCKERIGNORE: _AutoDockerIgnoreSentinel
 
 def _validate_python_version(
     python_version: typing.Optional[str],
-    builder_version: typing.Literal["2023.12", "2024.04", "2024.10"],
+    builder_version: typing.Literal["2023.12", "2024.04", "2024.10", "PREVIEW"],
     allow_micro_granularity: bool = True,
 ) -> str: ...
 def _dockerhub_python_version(
-    builder_version: typing.Literal["2023.12", "2024.04", "2024.10"], python_version: typing.Optional[str] = None
+    builder_version: typing.Literal["2023.12", "2024.04", "2024.10", "PREVIEW"],
+    python_version: typing.Optional[str] = None,
 ) -> str: ...
-def _base_image_config(group: str, builder_version: typing.Literal["2023.12", "2024.04", "2024.10"]) -> typing.Any: ...
+def _base_image_config(
+    group: str, builder_version: typing.Literal["2023.12", "2024.04", "2024.10", "PREVIEW"]
+) -> typing.Any: ...
 def _get_modal_requirements_path(
-    builder_version: typing.Literal["2023.12", "2024.04", "2024.10"], python_version: typing.Optional[str] = None
+    builder_version: typing.Literal["2023.12", "2024.04", "2024.10", "PREVIEW"],
+    python_version: typing.Optional[str] = None,
 ) -> str: ...
-def _get_modal_requirements_command(version: typing.Literal["2023.12", "2024.04", "2024.10"]) -> str: ...
+def _get_modal_requirements_command(version: typing.Literal["2023.12", "2024.04", "2024.10", "PREVIEW"]) -> str: ...
 def _flatten_str_args(
     function_name: str, arg_name: str, args: collections.abc.Sequence[typing.Union[str, list[str]]]
 ) -> list[str]: ...
@@ -50,8 +54,8 @@ def _make_pip_install_args(
     extra_options: str = "",
 ) -> str: ...
 def _get_image_builder_version(
-    server_version: typing.Literal["2023.12", "2024.04", "2024.10"],
-) -> typing.Literal["2023.12", "2024.04", "2024.10"]: ...
+    server_version: typing.Literal["2023.12", "2024.04", "2024.10", "PREVIEW"],
+) -> typing.Literal["2023.12", "2024.04", "2024.10", "PREVIEW"]: ...
 def _create_context_mount(
     docker_commands: collections.abc.Sequence[str],
     ignore_fn: collections.abc.Callable[[pathlib.Path], bool],
@@ -100,7 +104,7 @@ class _Image(modal._object._Object):
         *,
         base_images: typing.Optional[dict[str, _Image]] = None,
         dockerfile_function: typing.Optional[
-            collections.abc.Callable[[typing.Literal["2023.12", "2024.04", "2024.10"]], DockerfileSpec]
+            collections.abc.Callable[[typing.Literal["2023.12", "2024.04", "2024.10", "PREVIEW"]], DockerfileSpec]
         ] = None,
         secrets: typing.Optional[collections.abc.Sequence[modal.secret._Secret]] = None,
         gpu_config: typing.Optional[modal_proto.api_pb2.GPUConfig] = None,
@@ -246,7 +250,7 @@ class _Image(modal._object._Object):
     @staticmethod
     def _registry_setup_commands(
         tag: str,
-        builder_version: typing.Literal["2023.12", "2024.04", "2024.10"],
+        builder_version: typing.Literal["2023.12", "2024.04", "2024.10", "PREVIEW"],
         setup_commands: list[str],
         add_python: typing.Optional[str] = None,
     ) -> list[str]: ...
@@ -354,7 +358,7 @@ class Image(modal.object.Object):
         *,
         base_images: typing.Optional[dict[str, Image]] = None,
         dockerfile_function: typing.Optional[
-            collections.abc.Callable[[typing.Literal["2023.12", "2024.04", "2024.10"]], DockerfileSpec]
+            collections.abc.Callable[[typing.Literal["2023.12", "2024.04", "2024.10", "PREVIEW"]], DockerfileSpec]
         ] = None,
         secrets: typing.Optional[collections.abc.Sequence[modal.secret.Secret]] = None,
         gpu_config: typing.Optional[modal_proto.api_pb2.GPUConfig] = None,
@@ -505,7 +509,7 @@ class Image(modal.object.Object):
     @staticmethod
     def _registry_setup_commands(
         tag: str,
-        builder_version: typing.Literal["2023.12", "2024.04", "2024.10"],
+        builder_version: typing.Literal["2023.12", "2024.04", "2024.10", "PREVIEW"],
         setup_commands: list[str],
         add_python: typing.Optional[str] = None,
     ) -> list[str]: ...
@@ -595,4 +599,4 @@ class Image(modal.object.Object):
 
     _logs: ___logs_spec[typing_extensions.Self]
 
-SUPPORTED_PYTHON_SERIES: dict[typing.Literal["2023.12", "2024.04", "2024.10"], list[str]]
+SUPPORTED_PYTHON_SERIES: dict[typing.Literal["2023.12", "2024.04", "2024.10", "PREVIEW"], list[str]]

{modal-0.73.95 → modal-0.73.97}/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)

modal-0.73.97/modal/requirements/PREVIEW.txt

@@ -0,0 +1,16 @@
+aiohappyeyeballs==2.4.3
+aiohttp==3.10.8
+aiosignal==1.3.1
+async-timeout==4.0.3 ; python_version < "3.11"
+attrs==24.2.0
+certifi==2024.8.30
+frozenlist==1.4.1
+grpclib==0.4.7
+h2==4.1.0
+hpack==4.0.0
+hyperframe==6.0.1
+idna==3.10
+multidict==6.1.0
+protobuf>=3.20,<6
+typing_extensions==4.12.2
+yarl==1.13.1

{modal-0.73.95 → modal-0.73.97}/modal/requirements/base-images.json

@@ -1,22 +1,26 @@
 {
     "debian": {
+        "PREVIEW": "bookworm",
         "2024.10": "bookworm",
         "2024.04": "bookworm",
         "2023.12": "bullseye"
     },
     "python": {
+        "PREVIEW": ["3.9.20", "3.10.15", "3.11.10", "3.12.6", "3.13.0"],
         "2024.10": ["3.9.20", "3.10.15", "3.11.10", "3.12.6", "3.13.0"],
         "2024.04": ["3.9.19", "3.10.14", "3.11.8", "3.12.2"],
         "2023.12": ["3.9.15", "3.10.8", "3.11.0", "3.12.1"]
     },
     "micromamba": {
+        "PREVIEW": "1.5.10",
         "2024.10": "1.5.10",
         "2024.04": "1.5.8",
         "2023.12": "1.3.1"
     },
     "package_tools": {
+        "PREVIEW": "pip wheel uv",
         "2024.10": "pip wheel uv",
         "2024.04": "pip wheel uv",
         "2023.12": "pip"
     }
-}
+}

{modal-0.73.95 → modal-0.73.97}/modal.egg-info/PKG-INFO

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

{modal-0.73.95 → modal-0.73.97}/modal.egg-info/SOURCES.txt

@@ -151,6 +151,7 @@ modal/requirements/2023.12.312.txt
 modal/requirements/2023.12.txt
 modal/requirements/2024.04.txt
 modal/requirements/2024.10.txt
+modal/requirements/PREVIEW.txt
 modal/requirements/README.md
 modal/requirements/base-images.json
 modal_docs/__init__.py

{modal-0.73.95 → modal-0.73.97}/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 = 95  # git: 4e11a66
+build_number = 97  # git: 20eb8cc