modal 1.0.6.dev7__tar.gz → 1.0.6.dev9__tar.gz

{modal-1.0.6.dev7 → modal-1.0.6.dev9}/PKG-INFO

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

{modal-1.0.6.dev7 → modal-1.0.6.dev9}/modal/_utils/blob_utils.py

@@ -188,16 +188,23 @@ def get_content_length(data: BinaryIO) -> int:
     return content_length - pos
 
 
-async def _blob_upload_with_fallback(items, blob_ids, callback):
+async def _blob_upload_with_fallback(items, blob_ids: list[str], callback) -> tuple[str, bool, int]:
+    r2_latency_ms = 0
+    r2_failed = False
     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:
+            init_time = time.monotonic_ns()
             await callback(item)
-            return blob_id
+            if blob_id.endswith(":r2"):
+                r2_latency_ms = (time.monotonic_ns() - init_time) // 1_000_000
+            return blob_id, r2_failed, r2_latency_ms
         except Exception as _:
+            if blob_id.endswith(":r2"):
+                r2_failed = True
             # Ignore all errors except the last one, since we're out of fallback options.
             if idx == len(items) - 1:
                 raise
@@ -206,7 +213,7 @@ async def _blob_upload_with_fallback(items, blob_ids, callback):
 
 async def _blob_upload(
     upload_hashes: UploadHashes, data: Union[bytes, BinaryIO], stub, progress_report_cb: Optional[Callable] = None
-) -> str:
+) -> tuple[str, bool, int]:
     if isinstance(data, bytes):
         data = BytesIO(data)
 
@@ -232,7 +239,7 @@ async def _blob_upload(
                 progress_report_cb=progress_report_cb,
             )
 
-        blob_id = await _blob_upload_with_fallback(
+        blob_id, r2_failed, r2_latency_ms = await _blob_upload_with_fallback(
             resp.multiparts.items,
             resp.blob_ids,
             upload_multipart_upload,
@@ -252,7 +259,7 @@ async def _blob_upload(
                 content_md5_b64=upload_hashes.md5_base64,
             )
 
-        blob_id = await _blob_upload_with_fallback(
+        blob_id, r2_failed, r2_latency_ms = await _blob_upload_with_fallback(
             resp.upload_urls.items,
             resp.blob_ids,
             upload_to_s3_url,
@@ -261,10 +268,10 @@ async def _blob_upload(
     if progress_report_cb:
         progress_report_cb(complete=True)
 
-    return blob_id
+    return blob_id, r2_failed, r2_latency_ms
 
 
-async def blob_upload(payload: bytes, stub: ModalClientModal) -> str:
+async def blob_upload_with_r2_failure_info(payload: bytes, stub: ModalClientModal) -> tuple[str, bool, int]:
     size_mib = len(payload) / 1024 / 1024
     logger.debug(f"Uploading large blob of size {size_mib:.2f} MiB")
     t0 = time.time()
@@ -272,12 +279,17 @@ async def blob_upload(payload: bytes, stub: ModalClientModal) -> str:
         logger.warning("Blob uploading string, not bytes - auto-encoding as utf8")
         payload = payload.encode("utf8")
     upload_hashes = get_upload_hashes(payload)
-    blob_id = await _blob_upload(upload_hashes, payload, stub)
+    blob_id, r2_failed, r2_latency_ms = await _blob_upload(upload_hashes, payload, stub)
     dur_s = max(time.time() - t0, 0.001)  # avoid division by zero
     throughput_mib_s = (size_mib) / dur_s
     logger.debug(
         f"Uploaded large blob of size {size_mib:.2f} MiB ({throughput_mib_s:.2f} MiB/s, total {dur_s:.2f}s). {blob_id}"
     )
+    return blob_id, r2_failed, r2_latency_ms
+
+
+async def blob_upload(payload: bytes, stub: ModalClientModal) -> str:
+    blob_id, _, _ = await blob_upload_with_r2_failure_info(payload, stub)
     return blob_id
 
 
@@ -289,7 +301,8 @@ async def blob_upload_file(
     md5_hex: Optional[str] = None,
 ) -> str:
     upload_hashes = get_upload_hashes(file_obj, sha256_hex=sha256_hex, md5_hex=md5_hex)
-    return await _blob_upload(upload_hashes, file_obj, stub, progress_report_cb)
+    blob_id, _, _ = await _blob_upload(upload_hashes, file_obj, stub, progress_report_cb)
+    return blob_id
 
 
 @retry(n_attempts=5, base_delay=0.1, timeout=None)

{modal-1.0.6.dev7 → modal-1.0.6.dev9}/modal/_utils/function_utils.py

@@ -32,7 +32,12 @@ from ..exception import (
     RemoteError,
 )
 from ..mount import ROOT_DIR, _is_modal_path, _Mount
-from .blob_utils import MAX_ASYNC_OBJECT_SIZE_BYTES, MAX_OBJECT_SIZE_BYTES, blob_download, blob_upload
+from .blob_utils import (
+    MAX_ASYNC_OBJECT_SIZE_BYTES,
+    MAX_OBJECT_SIZE_BYTES,
+    blob_download,
+    blob_upload_with_r2_failure_info,
+)
 from .grpc_utils import RETRYABLE_GRPC_STATUS_CODES
 
 
@@ -544,7 +549,7 @@ async def _create_input(
     args_serialized = serialize((args, kwargs))
 
     if should_upload(len(args_serialized), function_call_invocation_type):
-        args_blob_id = await blob_upload(args_serialized, stub)
+        args_blob_id, r2_failed, r2_latency_ms = await blob_upload_with_r2_failure_info(args_serialized, stub)
         return api_pb2.FunctionPutInputsItem(
             input=api_pb2.FunctionInput(
                 args_blob_id=args_blob_id,
@@ -552,6 +557,8 @@ async def _create_input(
                 method_name=method_name,
             ),
             idx=idx,
+            r2_failed=r2_failed,
+            r2_latency_ms=r2_latency_ms,
         )
     else:
         return api_pb2.FunctionPutInputsItem(

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

{modal-1.0.6.dev7 → modal-1.0.6.dev9}/modal/functions.pyi

@@ -428,7 +428,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."""
             ...
@@ -437,7 +437,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]:
@@ -464,7 +464,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.
 
@@ -488,7 +488,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]):
@@ -497,7 +497,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.
 
@@ -518,7 +518,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.0.6.dev7 → modal-1.0.6.dev9}/modal/image.py

@@ -1450,8 +1450,7 @@ class _Image(_Object, type_prefix="im"):
                 python_version = "3.9"  # Backcompat for old hardcoded default param
             validated_python_version = _validate_python_version(python_version, version)
             micromamba_version = _base_image_config("micromamba", version)
-            debian_codename = _base_image_config("debian", version)
-            tag = f"mambaorg/micromamba:{micromamba_version}-{debian_codename}-slim"
+            tag = f"mambaorg/micromamba:{micromamba_version}"
             setup_commands = [
                 'SHELL ["/usr/local/bin/_dockerfile_shell.sh"]',
                 "ENV MAMBA_DOCKERFILE_ACTIVATE=1",

{modal-1.0.6.dev7 → modal-1.0.6.dev9}/modal/requirements/base-images.json

@@ -34,10 +34,10 @@
         ]
     },
     "micromamba": {
-        "PREVIEW": "2.1.1",
-        "2024.10": "1.5.10",
-        "2024.04": "1.5.8",
-        "2023.12": "1.3.1"
+        "PREVIEW": "2.1.1-debian12-slim",
+        "2024.10": "1.5.10-bookworm-slim",
+        "2024.04": "1.5.8-bookworm-slim",
+        "2023.12": "1.3.1-bullseye-slim"
     },
     "package_tools": {
         "PREVIEW": "pip wheel uv",

{modal-1.0.6.dev7 → modal-1.0.6.dev9}/modal.egg-info/PKG-INFO

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

{modal-1.0.6.dev7 → modal-1.0.6.dev9}/modal_proto/api.proto

@@ -1790,6 +1790,8 @@ message FunctionPrecreateResponse {
 message FunctionPutInputsItem {
   int32 idx = 1;
   FunctionInput input = 2;
+  bool r2_failed = 3;
+  uint64 r2_latency_ms = 4;
 }
 
 message FunctionPutInputsRequest {