modal 1.0.5.dev13__tar.gz → 1.0.5.dev15__tar.gz

{modal-1.0.5.dev13 → modal-1.0.5.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.0.5.dev13
+Version: 1.0.5.dev15
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0
@@ -19,7 +19,7 @@ License-File: LICENSE
 Requires-Dist: aiohttp
 Requires-Dist: certifi
 Requires-Dist: click~=8.1.0
-Requires-Dist: grpclib==0.4.7
+Requires-Dist: grpclib<0.4.9,>=0.4.7
 Requires-Dist: protobuf!=4.24.0,<7.0,>=3.19
 Requires-Dist: rich>=12.0.0
 Requires-Dist: synchronicity~=0.9.15

{modal-1.0.5.dev13 → modal-1.0.5.dev15}/modal/_utils/blob_utils.py

@@ -4,6 +4,7 @@ import dataclasses
 import hashlib
 import os
 import platform
+import random
 import time
 from collections.abc import AsyncIterator
 from contextlib import AbstractContextManager, contextmanager
@@ -55,6 +56,8 @@ MULTIPART_UPLOAD_THRESHOLD = 1024**3
 # For block based storage like volumefs2: the size of a block
 BLOCK_SIZE: int = 8 * 1024 * 1024
 
+HEALTHY_R2_UPLOAD_PERCENTAGE = 0.95
+
 
 @retry(n_attempts=5, base_delay=0.5, timeout=None)
 async def _upload_to_s3_url(
@@ -182,6 +185,22 @@ def get_content_length(data: BinaryIO) -> int:
     return content_length - pos
 
 
+async def _blob_upload_with_fallback(items, blob_ids, callback):
+    for idx, (item, blob_id) in enumerate(zip(items, blob_ids)):
+        # We want to default to R2 95% of the time and S3 5% of the time.
+        # To ensure the failure path is continuously exercised.
+        if idx == 0 and len(items) > 1 and random.random() > HEALTHY_R2_UPLOAD_PERCENTAGE:
+            continue
+        try:
+            await callback(item)
+            return blob_id
+        except Exception as _:
+            # Ignore all errors except the last one, since we're out of fallback options.
+            if idx == len(items) - 1:
+                raise
+    raise ExecutionError("Failed to upload blob")
+
+
 async def _blob_upload(
     upload_hashes: UploadHashes, data: Union[bytes, BinaryIO], stub, progress_report_cb: Optional[Callable] = None
 ) -> str:
@@ -197,17 +216,23 @@ async def _blob_upload(
     )
     resp = await retry_transient_errors(stub.BlobCreate, req)
 
-    blob_id = resp.blob_id
+    if resp.WhichOneof("upload_types_oneof") == "multiparts":
+
+        async def upload_multipart_upload(part):
+            return await perform_multipart_upload(
+                data,
+                content_length=content_length,
+                max_part_size=part.part_length,
+                part_urls=part.upload_urls,
+                completion_url=part.completion_url,
+                upload_chunk_size=DEFAULT_SEGMENT_CHUNK_SIZE,
+                progress_report_cb=progress_report_cb,
+            )
 
-    if resp.WhichOneof("upload_type_oneof") == "multipart":
-        await perform_multipart_upload(
-            data,
-            content_length=content_length,
-            max_part_size=resp.multipart.part_length,
-            part_urls=resp.multipart.upload_urls,
-            completion_url=resp.multipart.completion_url,
-            upload_chunk_size=DEFAULT_SEGMENT_CHUNK_SIZE,
-            progress_report_cb=progress_report_cb,
+        blob_id = await _blob_upload_with_fallback(
+            resp.multiparts.items,
+            resp.blob_ids,
+            upload_multipart_upload,
         )
     else:
         from .bytes_io_segment_payload import BytesIOSegmentPayload
@@ -215,11 +240,19 @@ async def _blob_upload(
         payload = BytesIOSegmentPayload(
             data, segment_start=0, segment_length=content_length, progress_report_cb=progress_report_cb
         )
-        await _upload_to_s3_url(
-            resp.upload_url,
-            payload,
-            # for single part uploads, we use server side md5 checksums
-            content_md5_b64=upload_hashes.md5_base64,
+
+        async def upload_to_s3_url(url):
+            return await _upload_to_s3_url(
+                url,
+                payload,
+                # for single part uploads, we use server side md5 checksums
+                content_md5_b64=upload_hashes.md5_base64,
+            )
+
+        blob_id = await _blob_upload_with_fallback(
+            resp.upload_urls.items,
+            resp.blob_ids,
+            upload_to_s3_url,
         )
 
     if progress_report_cb:
@@ -380,8 +413,10 @@ def get_file_upload_spec_from_fileobj(fp: BinaryIO, mount_filename: PurePosixPat
         mode,
     )
 
+
 _FileUploadSource2 = Callable[[], ContextManager[BinaryIO]]
 
+
 @dataclasses.dataclass
 class FileUploadSpec2:
     source: _FileUploadSource2
@@ -393,7 +428,6 @@ class FileUploadSpec2:
     mode: int  # file permission bits (last 12 bits of st_mode)
     size: int
 
-
     @staticmethod
     async def from_path(
         filename: Path,
@@ -416,7 +450,6 @@ class FileUploadSpec2:
             hash_semaphore,
         )
 
-
     @staticmethod
     async def from_fileobj(
         source_fp: Union[BinaryIO, BytesIO],
@@ -426,6 +459,7 @@ class FileUploadSpec2:
     ) -> "FileUploadSpec2":
         try:
             fileno = source_fp.fileno()
+
             def source():
                 new_fd = os.dup(fileno)
                 fp = os.fdopen(new_fd, "rb")
@@ -436,6 +470,7 @@ class FileUploadSpec2:
             # `.fileno()` not available; assume BytesIO-like type
             source_fp = cast(BytesIO, source_fp)
             buffer = source_fp.getbuffer()
+
             def source():
                 return BytesIO(buffer)
 
@@ -447,7 +482,6 @@ class FileUploadSpec2:
             hash_semaphore,
         )
 
-
     @staticmethod
     async def _create(
         source: _FileUploadSource2,

{modal-1.0.5.dev13 → modal-1.0.5.dev15}/modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.5.dev13",
+        version: str = "1.0.5.dev15",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -160,7 +160,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.5.dev13",
+        version: str = "1.0.5.dev15",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.0.5.dev13 → modal-1.0.5.dev15}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.0.5.dev13
+Version: 1.0.5.dev15
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0
@@ -19,7 +19,7 @@ License-File: LICENSE
 Requires-Dist: aiohttp
 Requires-Dist: certifi
 Requires-Dist: click~=8.1.0
-Requires-Dist: grpclib==0.4.7
+Requires-Dist: grpclib<0.4.9,>=0.4.7
 Requires-Dist: protobuf!=4.24.0,<7.0,>=3.19
 Requires-Dist: rich>=12.0.0
 Requires-Dist: synchronicity~=0.9.15

{modal-1.0.5.dev13 → modal-1.0.5.dev15}/modal.egg-info/requires.txt

@@ -1,7 +1,7 @@
 aiohttp
 certifi
 click~=8.1.0
-grpclib==0.4.7
+grpclib<0.4.9,>=0.4.7
 protobuf!=4.24.0,<7.0,>=3.19
 rich>=12.0.0
 synchronicity~=0.9.15

{modal-1.0.5.dev13 → modal-1.0.5.dev15}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.0.5.dev13"
+__version__ = "1.0.5.dev15"

{modal-1.0.5.dev13 → modal-1.0.5.dev15}/pyproject.toml

@@ -17,7 +17,7 @@ dependencies = [
     "aiohttp",
     "certifi",
     "click~=8.1.0",
-    "grpclib==0.4.7",
+    "grpclib>=0.4.7,<0.4.9",
     "protobuf>=3.19,<7.0,!=4.24.0",
     "rich>=12.0.0",
     "synchronicity~=0.9.15",