modal 0.74.57__py3-none-any.whl → 0.74.59__py3-none-any.whl

modal/sandbox.pyi

@@ -208,6 +208,7 @@ class Sandbox(modal.object.Object):
     class __create_spec(typing_extensions.Protocol):
         def __call__(
             self,
+            /,
             *entrypoint_args: str,
             app: typing.Optional[modal.app.App] = None,
             environment_name: typing.Optional[str] = None,
@@ -240,6 +241,7 @@ class Sandbox(modal.object.Object):
         ) -> Sandbox: ...
         async def aio(
             self,
+            /,
             *entrypoint_args: str,
             app: typing.Optional[modal.app.App] = None,
             environment_name: typing.Optional[str] = None,
@@ -276,50 +278,50 @@ class Sandbox(modal.object.Object):
     def _hydrate_metadata(self, handle_metadata: typing.Optional[google.protobuf.message.Message]): ...
 
     class __from_id_spec(typing_extensions.Protocol):
-        def __call__(self, sandbox_id: str, client: typing.Optional[modal.client.Client] = None) -> Sandbox: ...
-        async def aio(self, sandbox_id: str, client: typing.Optional[modal.client.Client] = None) -> Sandbox: ...
+        def __call__(self, /, sandbox_id: str, client: typing.Optional[modal.client.Client] = None) -> Sandbox: ...
+        async def aio(self, /, sandbox_id: str, client: typing.Optional[modal.client.Client] = None) -> Sandbox: ...
 
     from_id: __from_id_spec
 
     class __set_tags_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, tags: dict[str, str], *, client: typing.Optional[modal.client.Client] = None): ...
-        async def aio(self, tags: dict[str, str], *, client: typing.Optional[modal.client.Client] = None): ...
+        def __call__(self, /, tags: dict[str, str], *, client: typing.Optional[modal.client.Client] = None): ...
+        async def aio(self, /, tags: dict[str, str], *, client: typing.Optional[modal.client.Client] = None): ...
 
     set_tags: __set_tags_spec[typing_extensions.Self]
 
     class __snapshot_filesystem_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, timeout: int = 55) -> modal.image.Image: ...
-        async def aio(self, timeout: int = 55) -> modal.image.Image: ...
+        def __call__(self, /, timeout: int = 55) -> modal.image.Image: ...
+        async def aio(self, /, timeout: int = 55) -> modal.image.Image: ...
 
     snapshot_filesystem: __snapshot_filesystem_spec[typing_extensions.Self]
 
     class __wait_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, raise_on_termination: bool = True): ...
-        async def aio(self, raise_on_termination: bool = True): ...
+        def __call__(self, /, raise_on_termination: bool = True): ...
+        async def aio(self, /, raise_on_termination: bool = True): ...
 
     wait: __wait_spec[typing_extensions.Self]
 
     class __tunnels_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, timeout: int = 50) -> dict[int, modal._tunnel.Tunnel]: ...
-        async def aio(self, timeout: int = 50) -> dict[int, modal._tunnel.Tunnel]: ...
+        def __call__(self, /, timeout: int = 50) -> dict[int, modal._tunnel.Tunnel]: ...
+        async def aio(self, /, timeout: int = 50) -> dict[int, modal._tunnel.Tunnel]: ...
 
     tunnels: __tunnels_spec[typing_extensions.Self]
 
     class __terminate_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self): ...
-        async def aio(self): ...
+        def __call__(self, /): ...
+        async def aio(self, /): ...
 
     terminate: __terminate_spec[typing_extensions.Self]
 
     class __poll_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self) -> typing.Optional[int]: ...
-        async def aio(self) -> typing.Optional[int]: ...
+        def __call__(self, /) -> typing.Optional[int]: ...
+        async def aio(self, /) -> typing.Optional[int]: ...
 
     poll: __poll_spec[typing_extensions.Self]
 
     class ___get_task_id_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self): ...
-        async def aio(self): ...
+        def __call__(self, /): ...
+        async def aio(self, /): ...
 
     _get_task_id: ___get_task_id_spec[typing_extensions.Self]
 
@@ -327,6 +329,7 @@ class Sandbox(modal.object.Object):
         @typing.overload
         def __call__(
             self,
+            /,
             *cmds: str,
             pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
             stdout: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
@@ -341,6 +344,7 @@ class Sandbox(modal.object.Object):
         @typing.overload
         def __call__(
             self,
+            /,
             *cmds: str,
             pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
             stdout: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
@@ -355,6 +359,7 @@ class Sandbox(modal.object.Object):
         @typing.overload
         async def aio(
             self,
+            /,
             *cmds: str,
             pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
             stdout: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
@@ -369,6 +374,7 @@ class Sandbox(modal.object.Object):
         @typing.overload
         async def aio(
             self,
+            /,
             *cmds: str,
             pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
             stdout: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
@@ -384,54 +390,55 @@ class Sandbox(modal.object.Object):
     exec: __exec_spec[typing_extensions.Self]
 
     class ___experimental_snapshot_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self) -> modal.snapshot.SandboxSnapshot: ...
-        async def aio(self) -> modal.snapshot.SandboxSnapshot: ...
+        def __call__(self, /) -> modal.snapshot.SandboxSnapshot: ...
+        async def aio(self, /) -> modal.snapshot.SandboxSnapshot: ...
 
     _experimental_snapshot: ___experimental_snapshot_spec[typing_extensions.Self]
 
     class ___experimental_from_snapshot_spec(typing_extensions.Protocol):
         def __call__(
-            self, snapshot: modal.snapshot.SandboxSnapshot, client: typing.Optional[modal.client.Client] = None
+            self, /, snapshot: modal.snapshot.SandboxSnapshot, client: typing.Optional[modal.client.Client] = None
         ): ...
         async def aio(
-            self, snapshot: modal.snapshot.SandboxSnapshot, client: typing.Optional[modal.client.Client] = None
+            self, /, snapshot: modal.snapshot.SandboxSnapshot, client: typing.Optional[modal.client.Client] = None
         ): ...
 
     _experimental_from_snapshot: ___experimental_from_snapshot_spec
 
     class __open_spec(typing_extensions.Protocol[SUPERSELF]):
         @typing.overload
-        def __call__(self, path: str, mode: _typeshed.OpenTextMode) -> modal.file_io.FileIO[str]: ...
+        def __call__(self, /, path: str, mode: _typeshed.OpenTextMode) -> modal.file_io.FileIO[str]: ...
         @typing.overload
-        def __call__(self, path: str, mode: _typeshed.OpenBinaryMode) -> modal.file_io.FileIO[bytes]: ...
+        def __call__(self, /, path: str, mode: _typeshed.OpenBinaryMode) -> modal.file_io.FileIO[bytes]: ...
         @typing.overload
-        async def aio(self, path: str, mode: _typeshed.OpenTextMode) -> modal.file_io.FileIO[str]: ...
+        async def aio(self, /, path: str, mode: _typeshed.OpenTextMode) -> modal.file_io.FileIO[str]: ...
         @typing.overload
-        async def aio(self, path: str, mode: _typeshed.OpenBinaryMode) -> modal.file_io.FileIO[bytes]: ...
+        async def aio(self, /, path: str, mode: _typeshed.OpenBinaryMode) -> modal.file_io.FileIO[bytes]: ...
 
     open: __open_spec[typing_extensions.Self]
 
     class __ls_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, path: str) -> list[str]: ...
-        async def aio(self, path: str) -> list[str]: ...
+        def __call__(self, /, path: str) -> list[str]: ...
+        async def aio(self, /, path: str) -> list[str]: ...
 
     ls: __ls_spec[typing_extensions.Self]
 
     class __mkdir_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, path: str, parents: bool = False) -> None: ...
-        async def aio(self, path: str, parents: bool = False) -> None: ...
+        def __call__(self, /, path: str, parents: bool = False) -> None: ...
+        async def aio(self, /, path: str, parents: bool = False) -> None: ...
 
     mkdir: __mkdir_spec[typing_extensions.Self]
 
     class __rm_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, path: str, recursive: bool = False) -> None: ...
-        async def aio(self, path: str, recursive: bool = False) -> None: ...
+        def __call__(self, /, path: str, recursive: bool = False) -> None: ...
+        async def aio(self, /, path: str, recursive: bool = False) -> None: ...
 
     rm: __rm_spec[typing_extensions.Self]
 
     class __watch_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self,
+            /,
             path: str,
             filter: typing.Optional[list[modal.file_io.FileWatchEventType]] = None,
             recursive: typing.Optional[bool] = None,
@@ -439,6 +446,7 @@ class Sandbox(modal.object.Object):
         ) -> typing.Iterator[modal.file_io.FileWatchEvent]: ...
         def aio(
             self,
+            /,
             path: str,
             filter: typing.Optional[list[modal.file_io.FileWatchEventType]] = None,
             recursive: typing.Optional[bool] = None,
@@ -459,6 +467,7 @@ class Sandbox(modal.object.Object):
     class __list_spec(typing_extensions.Protocol):
         def __call__(
             self,
+            /,
             *,
             app_id: typing.Optional[str] = None,
             tags: typing.Optional[dict[str, str]] = None,
@@ -466,6 +475,7 @@ class Sandbox(modal.object.Object):
         ) -> typing.Generator[Sandbox, None, None]: ...
         def aio(
             self,
+            /,
             *,
             app_id: typing.Optional[str] = None,
             tags: typing.Optional[dict[str, str]] = None,

modal/secret.pyi

@@ -49,6 +49,7 @@ class Secret(modal.object.Object):
     class __lookup_spec(typing_extensions.Protocol):
         def __call__(
             self,
+            /,
             name: str,
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
@@ -57,6 +58,7 @@ class Secret(modal.object.Object):
         ) -> Secret: ...
         async def aio(
             self,
+            /,
             name: str,
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
@@ -69,6 +71,7 @@ class Secret(modal.object.Object):
     class __create_deployed_spec(typing_extensions.Protocol):
         def __call__(
             self,
+            /,
             deployment_name: str,
             env_dict: dict[str, str],
             namespace=1,
@@ -78,6 +81,7 @@ class Secret(modal.object.Object):
         ) -> str: ...
         async def aio(
             self,
+            /,
             deployment_name: str,
             env_dict: dict[str, str],
             namespace=1,

modal/serving.pyi

@@ -38,6 +38,7 @@ def _serve_stub(*args, **kwargs): ...
 class __serve_app_spec(typing_extensions.Protocol):
     def __call__(
         self,
+        /,
         app: _App,
         import_ref: modal.cli.import_refs.ImportRef,
         *,
@@ -46,6 +47,7 @@ class __serve_app_spec(typing_extensions.Protocol):
     ) -> synchronicity.combined_types.AsyncAndBlockingContextManager[_App]: ...
     def aio(
         self,
+        /,
         app: _App,
         import_ref: modal.cli.import_refs.ImportRef,
         *,

modal/snapshot.pyi

@@ -12,7 +12,7 @@ class SandboxSnapshot(modal.object.Object):
     def __init__(self, *args, **kwargs): ...
 
     class __from_id_spec(typing_extensions.Protocol):
-        def __call__(self, sandbox_snapshot_id: str, client: typing.Optional[modal.client.Client] = None): ...
-        async def aio(self, sandbox_snapshot_id: str, client: typing.Optional[modal.client.Client] = None): ...
+        def __call__(self, /, sandbox_snapshot_id: str, client: typing.Optional[modal.client.Client] = None): ...
+        async def aio(self, /, sandbox_snapshot_id: str, client: typing.Optional[modal.client.Client] = None): ...
 
     from_id: __from_id_spec

modal/token_flow.pyi

@@ -20,20 +20,20 @@ class TokenFlow:
 
     class __start_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
-            self, utm_source: typing.Optional[str] = None, next_url: typing.Optional[str] = None
+            self, /, utm_source: typing.Optional[str] = None, next_url: typing.Optional[str] = None
         ) -> synchronicity.combined_types.AsyncAndBlockingContextManager[tuple[str, str, str]]: ...
         def aio(
-            self, utm_source: typing.Optional[str] = None, next_url: typing.Optional[str] = None
+            self, /, utm_source: typing.Optional[str] = None, next_url: typing.Optional[str] = None
         ) -> typing.AsyncContextManager[tuple[str, str, str]]: ...
 
     start: __start_spec[typing_extensions.Self]
 
     class __finish_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
-            self, timeout: float = 40.0, grpc_extra_timeout: float = 5.0
+            self, /, timeout: float = 40.0, grpc_extra_timeout: float = 5.0
         ) -> typing.Optional[modal_proto.api_pb2.TokenFlowWaitResponse]: ...
         async def aio(
-            self, timeout: float = 40.0, grpc_extra_timeout: float = 5.0
+            self, /, timeout: float = 40.0, grpc_extra_timeout: float = 5.0
         ) -> typing.Optional[modal_proto.api_pb2.TokenFlowWaitResponse]: ...
 
     finish: __finish_spec[typing_extensions.Self]

modal/volume.py

@@ -32,7 +32,14 @@ from modal_proto import api_pb2
 
 from ._object import EPHEMERAL_OBJECT_HEARTBEAT_SLEEP, _get_environment_name, _Object, live_method, live_method_gen
 from ._resolver import Resolver
-from ._utils.async_utils import TaskContext, aclosing, async_map, asyncnullcontext, synchronize_api
+from ._utils.async_utils import (
+    TaskContext,
+    aclosing,
+    async_map,
+    async_map_ordered,
+    asyncnullcontext,
+    synchronize_api,
+)
 from ._utils.blob_utils import (
     BLOCK_SIZE,
     FileUploadSpec,
@@ -440,10 +447,110 @@ class _Volume(_Object, type_prefix="vo"):
         except GRPCError as exc:
             raise FileNotFoundError(exc.message) if exc.status == Status.NOT_FOUND else exc
 
-        for url in response.get_urls:
-            async with ClientSessionRegistry.get_session().get(url) as get_response:
-                async for data in get_response.content.iter_any():
-                    yield data
+        async def read_block(block_url: str) -> bytes:
+            async with ClientSessionRegistry.get_session().get(block_url) as get_response:
+                return await get_response.content.read()
+
+        async def iter_urls() -> AsyncGenerator[str]:
+            for url in response.get_urls:
+                yield url
+
+        # TODO(dflemstr): Reasonable default? Make configurable?
+        prefetch_num_blocks = multiprocessing.cpu_count()
+
+        async with aclosing(async_map_ordered(iter_urls(), read_block, concurrency=prefetch_num_blocks)) as stream:
+            async for value in stream:
+                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

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: ...
@@ -113,8 +125,8 @@ class Volume(modal.object.Object):
     def __init__(self, *args, **kwargs): ...
 
     class ___get_lock_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self): ...
-        async def aio(self): ...
+        def __call__(self, /): ...
+        async def aio(self, /): ...
 
     _get_lock: ___get_lock_spec[typing_extensions.Self]
 
@@ -143,6 +155,7 @@ class Volume(modal.object.Object):
     class __lookup_spec(typing_extensions.Protocol):
         def __call__(
             self,
+            /,
             name: str,
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
@@ -152,6 +165,7 @@ class Volume(modal.object.Object):
         ) -> Volume: ...
         async def aio(
             self,
+            /,
             name: str,
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
@@ -165,6 +179,7 @@ class Volume(modal.object.Object):
     class __create_deployed_spec(typing_extensions.Protocol):
         def __call__(
             self,
+            /,
             deployment_name: str,
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
@@ -173,6 +188,7 @@ class Volume(modal.object.Object):
         ) -> str: ...
         async def aio(
             self,
+            /,
             deployment_name: str,
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
@@ -183,86 +199,126 @@ class Volume(modal.object.Object):
     create_deployed: __create_deployed_spec
 
     class ___do_reload_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, lock=True): ...
-        async def aio(self, lock=True): ...
+        def __call__(self, /, lock=True): ...
+        async def aio(self, /, lock=True): ...
 
     _do_reload: ___do_reload_spec[typing_extensions.Self]
 
     class __commit_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self): ...
-        async def aio(self): ...
+        def __call__(self, /): ...
+        async def aio(self, /): ...
 
     commit: __commit_spec[typing_extensions.Self]
 
     class __reload_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self): ...
-        async def aio(self): ...
+        def __call__(self, /): ...
+        async def aio(self, /): ...
 
     reload: __reload_spec[typing_extensions.Self]
 
     class __iterdir_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, path: str, *, recursive: bool = True) -> typing.Iterator[FileEntry]: ...
-        def aio(self, path: str, *, recursive: bool = True) -> collections.abc.AsyncIterator[FileEntry]: ...
+        def __call__(self, /, path: str, *, recursive: bool = True) -> typing.Iterator[FileEntry]: ...
+        def aio(self, /, path: str, *, recursive: bool = True) -> collections.abc.AsyncIterator[FileEntry]: ...
 
     iterdir: __iterdir_spec[typing_extensions.Self]
 
     class __listdir_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, path: str, *, recursive: bool = False) -> list[FileEntry]: ...
-        async def aio(self, path: str, *, recursive: bool = False) -> list[FileEntry]: ...
+        def __call__(self, /, path: str, *, recursive: bool = False) -> list[FileEntry]: ...
+        async def aio(self, /, path: str, *, recursive: bool = False) -> list[FileEntry]: ...
 
     listdir: __listdir_spec[typing_extensions.Self]
 
     class __read_file_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, path: str) -> typing.Iterator[bytes]: ...
-        def aio(self, path: str) -> collections.abc.AsyncIterator[bytes]: ...
+        def __call__(self, /, path: str) -> typing.Iterator[bytes]: ...
+        def aio(self, /, path: str) -> collections.abc.AsyncIterator[bytes]: ...
 
     read_file: __read_file_spec[typing_extensions.Self]
 
     class ___read_file1_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, path: str) -> typing.Iterator[bytes]: ...
-        def aio(self, path: str) -> collections.abc.AsyncIterator[bytes]: ...
+        def __call__(self, /, path: str) -> typing.Iterator[bytes]: ...
+        def aio(self, /, path: str) -> collections.abc.AsyncIterator[bytes]: ...
 
     _read_file1: ___read_file1_spec[typing_extensions.Self]
 
     class ___read_file2_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, path: str) -> typing.Iterator[bytes]: ...
-        def aio(self, path: str) -> collections.abc.AsyncIterator[bytes]: ...
+        def __call__(self, /, path: str) -> typing.Iterator[bytes]: ...
+        def aio(self, /, path: str) -> collections.abc.AsyncIterator[bytes]: ...
 
     _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: ...
+        def __call__(self, /, path: str, recursive: bool = False) -> None: ...
+        async def aio(self, /, path: str, recursive: bool = False) -> None: ...
 
     remove_file: __remove_file_spec[typing_extensions.Self]
 
     class __copy_files_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, src_paths: collections.abc.Sequence[str], dst_path: str) -> None: ...
-        async def aio(self, src_paths: collections.abc.Sequence[str], dst_path: str) -> None: ...
+        def __call__(self, /, src_paths: collections.abc.Sequence[str], dst_path: str) -> None: ...
+        async def aio(self, /, src_paths: collections.abc.Sequence[str], dst_path: str) -> None: ...
 
     copy_files: __copy_files_spec[typing_extensions.Self]
 
     class __batch_upload_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, force: bool = False) -> AbstractVolumeUploadContextManager: ...
-        async def aio(self, force: bool = False) -> AbstractVolumeUploadContextManager: ...
+        def __call__(self, /, force: bool = False) -> AbstractVolumeUploadContextManager: ...
+        async def aio(self, /, force: bool = False) -> AbstractVolumeUploadContextManager: ...
 
     batch_upload: __batch_upload_spec[typing_extensions.Self]
 
     class ___instance_delete_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self): ...
-        async def aio(self): ...
+        def __call__(self, /): ...
+        async def aio(self, /): ...
 
     _instance_delete: ___instance_delete_spec[typing_extensions.Self]
 
     class __delete_spec(typing_extensions.Protocol):
         def __call__(
             self,
+            /,
             name: str,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
         ): ...
         async def aio(
             self,
+            /,
             name: str,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
@@ -273,6 +329,7 @@ class Volume(modal.object.Object):
     class __rename_spec(typing_extensions.Protocol):
         def __call__(
             self,
+            /,
             old_name: str,
             new_name: str,
             *,
@@ -281,6 +338,7 @@ class Volume(modal.object.Object):
         ): ...
         async def aio(
             self,
+            /,
             old_name: str,
             new_name: str,
             *,
@@ -409,8 +467,8 @@ class VolumeUploadContextManager(AbstractVolumeUploadContextManager):
     ): ...
 
     class ___upload_file_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, file_spec: modal._utils.blob_utils.FileUploadSpec) -> modal_proto.api_pb2.MountFile: ...
-        async def aio(self, file_spec: modal._utils.blob_utils.FileUploadSpec) -> modal_proto.api_pb2.MountFile: ...
+        def __call__(self, /, file_spec: modal._utils.blob_utils.FileUploadSpec) -> modal_proto.api_pb2.MountFile: ...
+        async def aio(self, /, file_spec: modal._utils.blob_utils.FileUploadSpec) -> modal_proto.api_pb2.MountFile: ...
 
     _upload_file: ___upload_file_spec[typing_extensions.Self]
 
@@ -496,8 +554,8 @@ class VolumeUploadContextManager2(AbstractVolumeUploadContextManager):
     ): ...
 
     class ___put_file_specs_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, file_specs: list[modal._utils.blob_utils.FileUploadSpec2]): ...
-        async def aio(self, file_specs: list[modal._utils.blob_utils.FileUploadSpec2]): ...
+        def __call__(self, /, file_specs: list[modal._utils.blob_utils.FileUploadSpec2]): ...
+        async def aio(self, /, file_specs: list[modal._utils.blob_utils.FileUploadSpec2]): ...
 
     _put_file_specs: ___put_file_specs_spec[typing_extensions.Self]