modal 0.74.58__tar.gz → 0.74.60__tar.gz

{modal-0.74.58 → modal-0.74.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 0.74.58
+Version: 0.74.60
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0
@@ -22,7 +22,7 @@ Requires-Dist: click>=8.1.0
 Requires-Dist: grpclib==0.4.7
 Requires-Dist: protobuf!=4.24.0,<7.0,>=3.19
 Requires-Dist: rich>=12.0.0
-Requires-Dist: synchronicity~=0.9.10
+Requires-Dist: synchronicity~=0.9.12
 Requires-Dist: toml
 Requires-Dist: typer>=0.9
 Requires-Dist: types-certifi

{modal-0.74.58 → modal-0.74.60}/modal/cli/_download.py

@@ -1,5 +1,6 @@
 # Copyright Modal Labs 2023
 import asyncio
+import functools
 import os
 import shutil
 import sys
@@ -70,21 +71,30 @@ async def _volume_download(
                 if is_pipe:
                     if entry.type == FileEntryType.FILE:
                         progress_task_id = progress_cb(name=entry.path, size=entry.size)
+                        file_progress_cb = functools.partial(progress_cb, task_id=progress_task_id)
+
                         async for chunk in volume.read_file(entry.path):
                             sys.stdout.buffer.write(chunk)
-                            progress_cb(task_id=progress_task_id, advance=len(chunk))
-                        progress_cb(task_id=progress_task_id, complete=True)
+                            file_progress_cb(advance=len(chunk))
+
+                        file_progress_cb(complete=True)
                 else:
                     if entry.type == FileEntryType.FILE:
                         progress_task_id = progress_cb(name=entry.path, size=entry.size)
                         output_path.parent.mkdir(parents=True, exist_ok=True)
+                        file_progress_cb = functools.partial(progress_cb, task_id=progress_task_id)
+
                         with output_path.open("wb") as fp:
-                            b = 0
-                            async for chunk in volume.read_file(entry.path):
-                                b += fp.write(chunk)
-                                progress_cb(task_id=progress_task_id, advance=len(chunk))
+                            if isinstance(volume, _Volume):
+                                b = await volume.read_file_into_fileobj(entry.path, fp, file_progress_cb)
+                            else:
+                                b = 0
+                                async for chunk in volume.read_file(entry.path):
+                                    b += fp.write(chunk)
+                                    file_progress_cb(advance=len(chunk))
+
                         logger.debug(f"Wrote {b} bytes to {output_path}")
-                        progress_cb(task_id=progress_task_id, complete=True)
+                        file_progress_cb(complete=True)
                     elif entry.type == FileEntryType.DIRECTORY:
                         output_path.mkdir(parents=True, exist_ok=True)
             finally:

{modal-0.74.58 → modal-0.74.60}/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.74.58"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.60"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -86,7 +86,7 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.58"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.60"
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-0.74.58 → modal-0.74.60}/modal/dict.py

@@ -1,5 +1,5 @@
 # Copyright Modal Labs 2022
-from collections.abc import AsyncIterator
+from collections.abc import AsyncIterator, Mapping
 from typing import Any, Optional
 
 from grpclib import GRPCError
@@ -244,9 +244,16 @@ class _Dict(_Object, type_prefix="di"):
         return value
 
     @live_method
-    async def update(self, **kwargs) -> None:
+    async def update(self, other: Optional[Mapping] = None, /, **kwargs) -> None:
         """Update the dictionary with additional items."""
-        serialized = _serialize_dict(kwargs)
+        # Support the Python dict.update API
+        # https://docs.python.org/3/library/stdtypes.html#dict.update
+        contents = {}
+        if other:
+            contents.update({k: other[k] for k in other.keys()})
+        if kwargs:
+            contents.update(kwargs)
+        serialized = _serialize_dict(contents)
         req = api_pb2.DictUpdateRequest(dict_id=self.object_id, updates=serialized)
         try:
             await retry_transient_errors(self._client.stub.DictUpdate, req)

{modal-0.74.58 → modal-0.74.60}/modal/dict.pyi

@@ -48,7 +48,7 @@ class _Dict(modal._object._Object):
     async def contains(self, key: typing.Any) -> bool: ...
     async def len(self) -> int: ...
     async def __getitem__(self, key: typing.Any) -> typing.Any: ...
-    async def update(self, **kwargs) -> None: ...
+    async def update(self, other: typing.Optional[collections.abc.Mapping] = None, /, **kwargs) -> None: ...
     async def put(self, key: typing.Any, value: typing.Any) -> None: ...
     async def __setitem__(self, key: typing.Any, value: typing.Any) -> None: ...
     async def pop(self, key: typing.Any) -> typing.Any: ...
@@ -155,8 +155,8 @@ class Dict(modal.object.Object):
     __getitem__: ____getitem___spec[typing_extensions.Self]
 
     class __update_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, /, **kwargs) -> None: ...
-        async def aio(self, /, **kwargs) -> None: ...
+        def __call__(self, other: typing.Optional[collections.abc.Mapping] = None, /, **kwargs) -> None: ...
+        async def aio(self, other: typing.Optional[collections.abc.Mapping] = None, /, **kwargs) -> None: ...
 
     update: __update_spec[typing_extensions.Self]
 

{modal-0.74.58 → modal-0.74.60}/modal/functions.pyi

@@ -227,11 +227,11 @@ class Function(
 
     _call_generator_nowait: ___call_generator_nowait_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]: ...
@@ -246,12 +246,12 @@ class Function(
         self, *args: modal._functions.P.args, **kwargs: modal._functions.P.kwargs
     ) -> modal._functions.OriginalReturnType: ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
+        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -260,11 +260,11 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]: ...
 

{modal-0.74.58 → modal-0.74.60}/modal/volume.py

@@ -463,6 +463,96 @@ class _Volume(_Object, type_prefix="vo"):
                 yield value
 
 
+    @live_method
+    async def read_file_into_fileobj(
+        self,
+        path: str,
+        fileobj: typing.IO[bytes],
+        progress_cb: Optional[Callable[..., Any]] = None
+    ) -> int:
+        """mdmd:hidden
+        Read volume file into file-like IO object.
+        """
+        if progress_cb is None:
+            def progress_cb(*_, **__):
+                pass
+
+        if self._is_v1:
+            return await self._read_file_into_fileobj1(path, fileobj, progress_cb)
+        else:
+            return await self._read_file_into_fileobj2(path, fileobj, progress_cb)
+
+
+    async def _read_file_into_fileobj1(
+        self,
+        path: str,
+        fileobj: typing.IO[bytes],
+        progress_cb: Callable[..., Any]
+    ) -> int:
+        num_bytes_written = 0
+
+        async for chunk in self._read_file1(path):
+            num_chunk_bytes_written = 0
+
+            while num_chunk_bytes_written < len(chunk):
+                # TODO(dflemstr): this is a small write, but nonetheless might block the event loop for some time:
+                n = fileobj.write(chunk)
+                num_chunk_bytes_written += n
+                progress_cb(advance=n)
+
+            num_bytes_written += len(chunk)
+
+        return num_bytes_written
+
+
+    async def _read_file_into_fileobj2(
+        self,
+        path: str,
+        fileobj: typing.IO[bytes],
+        progress_cb: Callable[..., Any]
+    ) -> int:
+        req = api_pb2.VolumeGetFile2Request(volume_id=self.object_id, path=path)
+
+        try:
+            response = await retry_transient_errors(self._client.stub.VolumeGetFile2, req)
+        except GRPCError as exc:
+            raise FileNotFoundError(exc.message) if exc.status == Status.NOT_FOUND else exc
+
+        # TODO(dflemstr): Sane default limit? Make configurable?
+        download_semaphore = asyncio.Semaphore(multiprocessing.cpu_count())
+        write_lock = asyncio.Lock()
+        start_pos = fileobj.tell()
+
+        async def download_block(idx, url) -> int:
+            block_start_pos = start_pos + idx * BLOCK_SIZE
+            num_bytes_written = 0
+
+            async with download_semaphore, ClientSessionRegistry.get_session().get(url) as get_response:
+                async for chunk in get_response.content:
+                    num_chunk_bytes_written = 0
+
+                    while num_chunk_bytes_written < len(chunk):
+                        async with write_lock:
+                            fileobj.seek(block_start_pos + num_bytes_written + num_chunk_bytes_written)
+                            # TODO(dflemstr): this is a small write, but nonetheless might block the event loop for some
+                            #  time:
+                            n = fileobj.write(chunk)
+
+                        num_chunk_bytes_written += n
+                        progress_cb(advance=n)
+
+                    num_bytes_written += len(chunk)
+
+            return num_bytes_written
+
+        coros = [download_block(idx, url) for idx, url in enumerate(response.get_urls)]
+
+        total_size = sum(await asyncio.gather(*coros))
+        fileobj.seek(start_pos + total_size)
+
+        return total_size
+
+
     @live_method
     async def remove_file(self, path: str, recursive: bool = False) -> None:
         """Remove a file or directory from a volume."""

{modal-0.74.58 → modal-0.74.60}/modal/volume.pyi

@@ -87,6 +87,18 @@ class _Volume(modal._object._Object):
     def read_file(self, path: str) -> collections.abc.AsyncIterator[bytes]: ...
     def _read_file1(self, path: str) -> collections.abc.AsyncIterator[bytes]: ...
     def _read_file2(self, path: str) -> collections.abc.AsyncIterator[bytes]: ...
+    async def read_file_into_fileobj(
+        self,
+        path: str,
+        fileobj: typing.IO[bytes],
+        progress_cb: typing.Optional[collections.abc.Callable[..., typing.Any]] = None,
+    ) -> int: ...
+    async def _read_file_into_fileobj1(
+        self, path: str, fileobj: typing.IO[bytes], progress_cb: collections.abc.Callable[..., typing.Any]
+    ) -> int: ...
+    async def _read_file_into_fileobj2(
+        self, path: str, fileobj: typing.IO[bytes], progress_cb: collections.abc.Callable[..., typing.Any]
+    ) -> int: ...
     async def remove_file(self, path: str, recursive: bool = False) -> None: ...
     async def copy_files(self, src_paths: collections.abc.Sequence[str], dst_path: str) -> None: ...
     async def batch_upload(self, force: bool = False) -> _AbstractVolumeUploadContextManager: ...
@@ -234,6 +246,44 @@ class Volume(modal.object.Object):
 
     _read_file2: ___read_file2_spec[typing_extensions.Self]
 
+    class __read_file_into_fileobj_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(
+            self,
+            /,
+            path: str,
+            fileobj: typing.IO[bytes],
+            progress_cb: typing.Optional[collections.abc.Callable[..., typing.Any]] = None,
+        ) -> int: ...
+        async def aio(
+            self,
+            /,
+            path: str,
+            fileobj: typing.IO[bytes],
+            progress_cb: typing.Optional[collections.abc.Callable[..., typing.Any]] = None,
+        ) -> int: ...
+
+    read_file_into_fileobj: __read_file_into_fileobj_spec[typing_extensions.Self]
+
+    class ___read_file_into_fileobj1_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(
+            self, /, path: str, fileobj: typing.IO[bytes], progress_cb: collections.abc.Callable[..., typing.Any]
+        ) -> int: ...
+        async def aio(
+            self, /, path: str, fileobj: typing.IO[bytes], progress_cb: collections.abc.Callable[..., typing.Any]
+        ) -> int: ...
+
+    _read_file_into_fileobj1: ___read_file_into_fileobj1_spec[typing_extensions.Self]
+
+    class ___read_file_into_fileobj2_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(
+            self, /, path: str, fileobj: typing.IO[bytes], progress_cb: collections.abc.Callable[..., typing.Any]
+        ) -> int: ...
+        async def aio(
+            self, /, path: str, fileobj: typing.IO[bytes], progress_cb: collections.abc.Callable[..., typing.Any]
+        ) -> int: ...
+
+    _read_file_into_fileobj2: ___read_file_into_fileobj2_spec[typing_extensions.Self]
+
     class __remove_file_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, path: str, recursive: bool = False) -> None: ...
         async def aio(self, /, path: str, recursive: bool = False) -> None: ...

{modal-0.74.58 → modal-0.74.60}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 0.74.58
+Version: 0.74.60
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0
@@ -22,7 +22,7 @@ Requires-Dist: click>=8.1.0
 Requires-Dist: grpclib==0.4.7
 Requires-Dist: protobuf!=4.24.0,<7.0,>=3.19
 Requires-Dist: rich>=12.0.0
-Requires-Dist: synchronicity~=0.9.10
+Requires-Dist: synchronicity~=0.9.12
 Requires-Dist: toml
 Requires-Dist: typer>=0.9
 Requires-Dist: types-certifi

{modal-0.74.58 → modal-0.74.60}/modal.egg-info/requires.txt

@@ -4,7 +4,7 @@ click>=8.1.0
 grpclib==0.4.7
 protobuf!=4.24.0,<7.0,>=3.19
 rich>=12.0.0
-synchronicity~=0.9.10
+synchronicity~=0.9.12
 toml
 typer>=0.9
 types-certifi

{modal-0.74.58 → modal-0.74.60}/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 = 58  # git: ea8f826
+build_number = 60  # git: 7229b14

{modal-0.74.58 → modal-0.74.60}/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
     "grpclib==0.4.7",
     "protobuf>=3.19,<7.0,!=4.24.0",
     "rich>=12.0.0",
-    "synchronicity~=0.9.10",
+    "synchronicity~=0.9.12",
     "toml",
     "typer>=0.9",
     "types-certifi",