modal 0.72.5__py3-none-any.whl → 0.72.48__py3-none-any.whl

modal/image.pyi

@@ -1,5 +1,6 @@
 import collections.abc
 import google.protobuf.message
+import modal._object
 import modal.client
 import modal.cloud_bucket_mount
 import modal.functions
@@ -52,11 +53,11 @@ def _get_image_builder_version(
 ) -> typing.Literal["2023.12", "2024.04", "2024.10"]: ...
 def _create_context_mount(
     docker_commands: collections.abc.Sequence[str],
-    ignore_fn: typing.Callable[[pathlib.Path], bool],
+    ignore_fn: collections.abc.Callable[[pathlib.Path], bool],
     context_dir: pathlib.Path,
 ) -> typing.Optional[modal.mount._Mount]: ...
 def _create_context_mount_function(
-    ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]],
+    ignore: typing.Union[collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]],
     dockerfile_cmds: list[str] = [],
     dockerfile_path: typing.Optional[pathlib.Path] = None,
     context_mount: typing.Optional[modal.mount._Mount] = None,
@@ -78,7 +79,7 @@ async def _image_await_build_result(
     image_id: str, client: modal.client._Client
 ) -> modal_proto.api_pb2.ImageJoinStreamingResponse: ...
 
-class _Image(modal.object._Object):
+class _Image(modal._object._Object):
     force_build: bool
     inside_exceptions: list[Exception]
     _serve_mounts: frozenset[modal.mount._Mount]
@@ -97,14 +98,16 @@ class _Image(modal.object._Object):
         *,
         base_images: typing.Optional[dict[str, _Image]] = None,
         dockerfile_function: typing.Optional[
-            typing.Callable[[typing.Literal["2023.12", "2024.04", "2024.10"]], DockerfileSpec]
+            collections.abc.Callable[[typing.Literal["2023.12", "2024.04", "2024.10"]], DockerfileSpec]
         ] = None,
         secrets: typing.Optional[collections.abc.Sequence[modal.secret._Secret]] = None,
         gpu_config: typing.Optional[modal_proto.api_pb2.GPUConfig] = None,
         build_function: typing.Optional[modal.functions._Function] = None,
         build_function_input: typing.Optional[modal_proto.api_pb2.FunctionInput] = None,
         image_registry_config: typing.Optional[_ImageRegistryConfig] = None,
-        context_mount_function: typing.Optional[typing.Callable[[], typing.Optional[modal.mount._Mount]]] = None,
+        context_mount_function: typing.Optional[
+            collections.abc.Callable[[], typing.Optional[modal.mount._Mount]]
+        ] = None,
         force_build: bool = False,
         _namespace: int = 1,
         _do_assert_no_mount_layers: bool = True,
@@ -119,7 +122,7 @@ class _Image(modal.object._Object):
         remote_path: str,
         *,
         copy: bool = False,
-        ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]] = [],
+        ignore: typing.Union[collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]] = [],
     ) -> _Image: ...
     def copy_local_file(
         self, local_path: typing.Union[str, pathlib.Path], remote_path: typing.Union[str, pathlib.Path] = "./"
@@ -129,14 +132,14 @@ class _Image(modal.object._Object):
         *module_names: str,
         copy: bool = False,
         ignore: typing.Union[
-            collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]
+            collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]
         ] = modal.file_pattern_matcher.NON_PYTHON_FILES,
     ) -> _Image: ...
     def copy_local_dir(
         self,
         local_path: typing.Union[str, pathlib.Path],
         remote_path: typing.Union[str, pathlib.Path] = ".",
-        ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]] = [],
+        ignore: typing.Union[collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]] = [],
     ) -> _Image: ...
     @staticmethod
     async def from_id(image_id: str, client: typing.Optional[modal.client._Client] = None) -> _Image: ...
@@ -215,7 +218,7 @@ class _Image(modal.object._Object):
         context_mount: typing.Optional[modal.mount._Mount] = None,
         force_build: bool = False,
         ignore: typing.Union[
-            collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]
+            collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]
         ] = modal.image.AUTO_DOCKERIGNORE,
     ) -> _Image: ...
     def entrypoint(self, entrypoint_commands: list[str]) -> _Image: ...
@@ -303,7 +306,7 @@ class _Image(modal.object._Object):
         gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None,
         add_python: typing.Optional[str] = None,
         ignore: typing.Union[
-            collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]
+            collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]
         ] = modal.image.AUTO_DOCKERIGNORE,
     ) -> _Image: ...
     @staticmethod
@@ -317,7 +320,7 @@ class _Image(modal.object._Object):
     ) -> _Image: ...
     def run_function(
         self,
-        raw_f: typing.Callable[..., typing.Any],
+        raw_f: collections.abc.Callable[..., typing.Any],
         secrets: collections.abc.Sequence[modal.secret._Secret] = (),
         gpu: typing.Union[
             None, bool, str, modal.gpu._GPUConfig, list[typing.Union[None, bool, str, modal.gpu._GPUConfig]]
@@ -344,6 +347,8 @@ class _Image(modal.object._Object):
     def imports(self): ...
     def _logs(self) -> typing.AsyncGenerator[str, None]: ...
 
+SUPERSELF = typing.TypeVar("SUPERSELF", covariant=True)
+
 class Image(modal.object.Object):
     force_build: bool
     inside_exceptions: list[Exception]
@@ -364,14 +369,16 @@ class Image(modal.object.Object):
         *,
         base_images: typing.Optional[dict[str, Image]] = None,
         dockerfile_function: typing.Optional[
-            typing.Callable[[typing.Literal["2023.12", "2024.04", "2024.10"]], DockerfileSpec]
+            collections.abc.Callable[[typing.Literal["2023.12", "2024.04", "2024.10"]], DockerfileSpec]
         ] = None,
         secrets: typing.Optional[collections.abc.Sequence[modal.secret.Secret]] = None,
         gpu_config: typing.Optional[modal_proto.api_pb2.GPUConfig] = None,
         build_function: typing.Optional[modal.functions.Function] = None,
         build_function_input: typing.Optional[modal_proto.api_pb2.FunctionInput] = None,
         image_registry_config: typing.Optional[_ImageRegistryConfig] = None,
-        context_mount_function: typing.Optional[typing.Callable[[], typing.Optional[modal.mount.Mount]]] = None,
+        context_mount_function: typing.Optional[
+            collections.abc.Callable[[], typing.Optional[modal.mount.Mount]]
+        ] = None,
         force_build: bool = False,
         _namespace: int = 1,
         _do_assert_no_mount_layers: bool = True,
@@ -386,7 +393,7 @@ class Image(modal.object.Object):
         remote_path: str,
         *,
         copy: bool = False,
-        ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]] = [],
+        ignore: typing.Union[collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]] = [],
     ) -> Image: ...
     def copy_local_file(
         self, local_path: typing.Union[str, pathlib.Path], remote_path: typing.Union[str, pathlib.Path] = "./"
@@ -396,14 +403,14 @@ class Image(modal.object.Object):
         *module_names: str,
         copy: bool = False,
         ignore: typing.Union[
-            collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]
+            collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]
         ] = modal.file_pattern_matcher.NON_PYTHON_FILES,
     ) -> Image: ...
     def copy_local_dir(
         self,
         local_path: typing.Union[str, pathlib.Path],
         remote_path: typing.Union[str, pathlib.Path] = ".",
-        ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]] = [],
+        ignore: typing.Union[collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]] = [],
     ) -> Image: ...
 
     class __from_id_spec(typing_extensions.Protocol):
@@ -487,7 +494,7 @@ class Image(modal.object.Object):
         context_mount: typing.Optional[modal.mount.Mount] = None,
         force_build: bool = False,
         ignore: typing.Union[
-            collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]
+            collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]
         ] = modal.image.AUTO_DOCKERIGNORE,
     ) -> Image: ...
     def entrypoint(self, entrypoint_commands: list[str]) -> Image: ...
@@ -575,7 +582,7 @@ class Image(modal.object.Object):
         gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None,
         add_python: typing.Optional[str] = None,
         ignore: typing.Union[
-            collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]
+            collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]
         ] = modal.image.AUTO_DOCKERIGNORE,
     ) -> Image: ...
     @staticmethod
@@ -589,7 +596,7 @@ class Image(modal.object.Object):
     ) -> Image: ...
     def run_function(
         self,
-        raw_f: typing.Callable[..., typing.Any],
+        raw_f: collections.abc.Callable[..., typing.Any],
         secrets: collections.abc.Sequence[modal.secret.Secret] = (),
         gpu: typing.Union[
             None, bool, str, modal.gpu._GPUConfig, list[typing.Union[None, bool, str, modal.gpu._GPUConfig]]
@@ -615,10 +622,10 @@ class Image(modal.object.Object):
     def workdir(self, path: typing.Union[str, pathlib.PurePosixPath]) -> Image: ...
     def imports(self): ...
 
-    class ___logs_spec(typing_extensions.Protocol):
+    class ___logs_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self) -> typing.Generator[str, None, None]: ...
         def aio(self) -> typing.AsyncGenerator[str, None]: ...
 
-    _logs: ___logs_spec
+    _logs: ___logs_spec[typing_extensions.Self]
 
 SUPPORTED_PYTHON_SERIES: dict[typing.Literal["2023.12", "2024.04", "2024.10"], list[str]]

modal/io_streams.pyi

@@ -50,6 +50,8 @@ class _StreamWriter:
 
 T_INNER = typing.TypeVar("T_INNER", covariant=True)
 
+SUPERSELF = typing.TypeVar("SUPERSELF", covariant=True)
+
 class StreamReader(typing.Generic[T]):
     _stream: typing.Optional[collections.abc.AsyncGenerator[typing.Optional[bytes], None]]
 
@@ -66,25 +68,25 @@ class StreamReader(typing.Generic[T]):
     @property
     def file_descriptor(self) -> int: ...
 
-    class __read_spec(typing_extensions.Protocol[T_INNER]):
+    class __read_spec(typing_extensions.Protocol[T_INNER, SUPERSELF]):
         def __call__(self) -> T_INNER: ...
         async def aio(self) -> T_INNER: ...
 
-    read: __read_spec[T]
+    read: __read_spec[T, typing_extensions.Self]
 
-    class ___consume_container_process_stream_spec(typing_extensions.Protocol):
+    class ___consume_container_process_stream_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self): ...
         async def aio(self): ...
 
-    _consume_container_process_stream: ___consume_container_process_stream_spec
+    _consume_container_process_stream: ___consume_container_process_stream_spec[typing_extensions.Self]
 
-    class ___stream_container_process_spec(typing_extensions.Protocol):
+    class ___stream_container_process_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self) -> typing.Generator[tuple[typing.Optional[bytes], str], None, None]: ...
         def aio(self) -> collections.abc.AsyncGenerator[tuple[typing.Optional[bytes], str], None]: ...
 
-    _stream_container_process: ___stream_container_process_spec
+    _stream_container_process: ___stream_container_process_spec[typing_extensions.Self]
 
-    class ___get_logs_spec(typing_extensions.Protocol):
+    class ___get_logs_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self, skip_empty_messages: bool = True
         ) -> typing.Generator[typing.Optional[bytes], None, None]: ...
@@ -92,13 +94,13 @@ class StreamReader(typing.Generic[T]):
             self, skip_empty_messages: bool = True
         ) -> collections.abc.AsyncGenerator[typing.Optional[bytes], None]: ...
 
-    _get_logs: ___get_logs_spec
+    _get_logs: ___get_logs_spec[typing_extensions.Self]
 
-    class ___get_logs_by_line_spec(typing_extensions.Protocol):
+    class ___get_logs_by_line_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self) -> typing.Generator[typing.Optional[bytes], None, None]: ...
         def aio(self) -> collections.abc.AsyncGenerator[typing.Optional[bytes], None]: ...
 
-    _get_logs_by_line: ___get_logs_by_line_spec
+    _get_logs_by_line: ___get_logs_by_line_spec[typing_extensions.Self]
 
     def __iter__(self) -> typing.Iterator[T]: ...
     def __aiter__(self) -> collections.abc.AsyncIterator[T]: ...
@@ -115,8 +117,8 @@ class StreamWriter:
     def write(self, data: typing.Union[bytes, bytearray, memoryview, str]) -> None: ...
     def write_eof(self) -> None: ...
 
-    class __drain_spec(typing_extensions.Protocol):
+    class __drain_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self) -> None: ...
         async def aio(self) -> None: ...
 
-    drain: __drain_spec
+    drain: __drain_spec[typing_extensions.Self]

modal/mount.py

@@ -20,6 +20,7 @@ import modal.file_pattern_matcher
 from modal_proto import api_pb2
 from modal_version import __version__
 
+from ._object import _get_environment_name, _Object
 from ._resolver import Resolver
 from ._utils.async_utils import aclosing, async_map, synchronize_api
 from ._utils.blob_utils import FileUploadSpec, blob_upload_file, get_file_upload_spec_from_path
@@ -31,7 +32,6 @@ from .client import _Client
 from .config import config, logger
 from .exception import InvalidError, ModuleNotMountable
 from .file_pattern_matcher import FilePatternMatcher
-from .object import _get_environment_name, _Object
 
 ROOT_DIR: PurePosixPath = PurePosixPath("/root")
 MOUNT_PUT_FILE_CLIENT_TIMEOUT = 10 * 60  # 10 min max for transferring files
@@ -258,12 +258,15 @@ class NonLocalMountError(Exception):
 
 
 class _Mount(_Object, type_prefix="mo"):
-    """Create a mount for a local directory or file that can be attached
+    """
+    **Deprecated**: Mounts should not be used explicitly anymore, use `Image.add_local_*` commands instead.
+
+    Create a mount for a local directory or file that can be attached
     to one or more Modal functions.
 
     **Usage**
 
-    ```python
+    ```python notest
     import modal
     import os
     app = modal.App()
@@ -394,11 +397,13 @@ class _Mount(_Object, type_prefix="mo"):
         recursive: bool = True,
     ) -> "_Mount":
         """
+        **Deprecated:** Use image.add_local_dir() instead
+
         Create a `Mount` from a local directory.
 
         **Usage**
 
-        ```python
+        ```python notest
         assets = modal.Mount.from_local_dir(
             "~/assets",
             condition=lambda pth: not ".venv" in pth,
@@ -449,11 +454,13 @@ class _Mount(_Object, type_prefix="mo"):
     @staticmethod
     def from_local_file(local_path: Union[str, Path], remote_path: Union[str, PurePosixPath, None] = None) -> "_Mount":
         """
+        **Deprecated**: Use image.add_local_file() instead
+
         Create a `Mount` mounting a single local file.
 
         **Usage**
 
-        ```python
+        ```python notest
         # Mount the DBT profile in user's home directory into container.
         dbt_profiles = modal.Mount.from_local_file(
             local_path="~/profiles.yml",
@@ -611,6 +618,8 @@ class _Mount(_Object, type_prefix="mo"):
         ignore: Optional[Union[Sequence[str], Callable[[Path], bool]]] = None,
     ) -> "_Mount":
         """
+        **Deprecated**: Use image.add_local_python_source instead
+
         Returns a `modal.Mount` that makes local modules listed in `module_names` available inside the container.
         This works by mounting the local path of each module's package to a directory inside the container
         that's on `PYTHONPATH`.

modal/mount.pyi

@@ -1,5 +1,6 @@
 import collections.abc
 import google.protobuf.message
+import modal._object
 import modal._resolver
 import modal._utils.blob_utils
 import modal.client
@@ -35,7 +36,7 @@ class _MountFile(_MountEntry):
 class _MountDir(_MountEntry):
     local_dir: pathlib.Path
     remote_path: pathlib.PurePosixPath
-    ignore: typing.Callable[[pathlib.Path], bool]
+    ignore: collections.abc.Callable[[pathlib.Path], bool]
     recursive: bool
 
     def description(self): ...
@@ -46,7 +47,7 @@ class _MountDir(_MountEntry):
         self,
         local_dir: pathlib.Path,
         remote_path: pathlib.PurePosixPath,
-        ignore: typing.Callable[[pathlib.Path], bool],
+        ignore: collections.abc.Callable[[pathlib.Path], bool],
         recursive: bool,
     ) -> None: ...
     def __repr__(self): ...
@@ -58,7 +59,7 @@ def module_mount_ignore_condition(module_base: pathlib.Path): ...
 class _MountedPythonModule(_MountEntry):
     module_name: str
     remote_dir: typing.Union[pathlib.PurePosixPath, str]
-    ignore: typing.Optional[typing.Callable[[pathlib.Path], bool]]
+    ignore: typing.Optional[collections.abc.Callable[[pathlib.Path], bool]]
 
     def description(self) -> str: ...
     def _proxy_entries(self) -> list[_MountEntry]: ...
@@ -69,14 +70,14 @@ class _MountedPythonModule(_MountEntry):
         self,
         module_name: str,
         remote_dir: typing.Union[pathlib.PurePosixPath, str] = "/root",
-        ignore: typing.Optional[typing.Callable[[pathlib.Path], bool]] = None,
+        ignore: typing.Optional[collections.abc.Callable[[pathlib.Path], bool]] = None,
     ) -> None: ...
     def __repr__(self): ...
     def __eq__(self, other): ...
 
 class NonLocalMountError(Exception): ...
 
-class _Mount(modal.object._Object):
+class _Mount(modal._object._Object):
     _entries: typing.Optional[list[_MountEntry]]
     _deployment_name: typing.Optional[str]
     _namespace: typing.Optional[int]
@@ -95,14 +96,14 @@ class _Mount(modal.object._Object):
     def _add_local_dir(
         local_path: pathlib.Path,
         remote_path: pathlib.PurePosixPath,
-        ignore: typing.Callable[[pathlib.Path], bool] = modal.file_pattern_matcher._NOTHING,
+        ignore: collections.abc.Callable[[pathlib.Path], bool] = modal.file_pattern_matcher._NOTHING,
     ): ...
     def add_local_dir(
         self,
         local_path: typing.Union[str, pathlib.Path],
         *,
         remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None,
-        condition: typing.Optional[typing.Callable[[str], bool]] = None,
+        condition: typing.Optional[collections.abc.Callable[[str], bool]] = None,
         recursive: bool = True,
     ) -> _Mount: ...
     @staticmethod
@@ -110,7 +111,7 @@ class _Mount(modal.object._Object):
         local_path: typing.Union[str, pathlib.Path],
         *,
         remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None,
-        condition: typing.Optional[typing.Callable[[str], bool]] = None,
+        condition: typing.Optional[collections.abc.Callable[[str], bool]] = None,
         recursive: bool = True,
     ) -> _Mount: ...
     @staticmethod
@@ -118,7 +119,7 @@ class _Mount(modal.object._Object):
         local_path: typing.Union[str, pathlib.Path],
         *,
         remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None,
-        condition: typing.Optional[typing.Callable[[str], bool]] = None,
+        condition: typing.Optional[collections.abc.Callable[[str], bool]] = None,
         recursive: bool = True,
     ) -> _Mount: ...
     def add_local_file(
@@ -147,15 +148,15 @@ class _Mount(modal.object._Object):
     def from_local_python_packages(
         *module_names: str,
         remote_dir: typing.Union[str, pathlib.PurePosixPath] = "/root",
-        condition: typing.Optional[typing.Callable[[str], bool]] = None,
-        ignore: typing.Union[typing.Sequence[str], typing.Callable[[pathlib.Path], bool], None] = None,
+        condition: typing.Optional[collections.abc.Callable[[str], bool]] = None,
+        ignore: typing.Union[typing.Sequence[str], collections.abc.Callable[[pathlib.Path], bool], None] = None,
     ) -> _Mount: ...
     @staticmethod
     def _from_local_python_packages(
         *module_names: str,
         remote_dir: typing.Union[str, pathlib.PurePosixPath] = "/root",
-        condition: typing.Optional[typing.Callable[[str], bool]] = None,
-        ignore: typing.Union[typing.Sequence[str], typing.Callable[[pathlib.Path], bool], None] = None,
+        condition: typing.Optional[collections.abc.Callable[[str], bool]] = None,
+        ignore: typing.Union[typing.Sequence[str], collections.abc.Callable[[pathlib.Path], bool], None] = None,
     ) -> _Mount: ...
     @staticmethod
     def from_name(name: str, namespace=1, environment_name: typing.Optional[str] = None) -> _Mount: ...
@@ -176,6 +177,8 @@ class _Mount(modal.object._Object):
     ) -> None: ...
     def _get_metadata(self) -> modal_proto.api_pb2.MountHandleMetadata: ...
 
+SUPERSELF = typing.TypeVar("SUPERSELF", covariant=True)
+
 class Mount(modal.object.Object):
     _entries: typing.Optional[list[_MountEntry]]
     _deployment_name: typing.Optional[str]
@@ -196,14 +199,14 @@ class Mount(modal.object.Object):
     def _add_local_dir(
         local_path: pathlib.Path,
         remote_path: pathlib.PurePosixPath,
-        ignore: typing.Callable[[pathlib.Path], bool] = modal.file_pattern_matcher._NOTHING,
+        ignore: collections.abc.Callable[[pathlib.Path], bool] = modal.file_pattern_matcher._NOTHING,
     ): ...
     def add_local_dir(
         self,
         local_path: typing.Union[str, pathlib.Path],
         *,
         remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None,
-        condition: typing.Optional[typing.Callable[[str], bool]] = None,
+        condition: typing.Optional[collections.abc.Callable[[str], bool]] = None,
         recursive: bool = True,
     ) -> Mount: ...
     @staticmethod
@@ -211,7 +214,7 @@ class Mount(modal.object.Object):
         local_path: typing.Union[str, pathlib.Path],
         *,
         remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None,
-        condition: typing.Optional[typing.Callable[[str], bool]] = None,
+        condition: typing.Optional[collections.abc.Callable[[str], bool]] = None,
         recursive: bool = True,
     ) -> Mount: ...
     @staticmethod
@@ -219,7 +222,7 @@ class Mount(modal.object.Object):
         local_path: typing.Union[str, pathlib.Path],
         *,
         remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None,
-        condition: typing.Optional[typing.Callable[[str], bool]] = None,
+        condition: typing.Optional[collections.abc.Callable[[str], bool]] = None,
         recursive: bool = True,
     ) -> Mount: ...
     def add_local_file(
@@ -248,25 +251,25 @@ class Mount(modal.object.Object):
 
     _get_files: ___get_files_spec
 
-    class ___load_mount_spec(typing_extensions.Protocol):
+    class ___load_mount_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, resolver: modal._resolver.Resolver, existing_object_id: typing.Optional[str]): ...
         async def aio(self, resolver: modal._resolver.Resolver, existing_object_id: typing.Optional[str]): ...
 
-    _load_mount: ___load_mount_spec
+    _load_mount: ___load_mount_spec[typing_extensions.Self]
 
     @staticmethod
     def from_local_python_packages(
         *module_names: str,
         remote_dir: typing.Union[str, pathlib.PurePosixPath] = "/root",
-        condition: typing.Optional[typing.Callable[[str], bool]] = None,
-        ignore: typing.Union[typing.Sequence[str], typing.Callable[[pathlib.Path], bool], None] = None,
+        condition: typing.Optional[collections.abc.Callable[[str], bool]] = None,
+        ignore: typing.Union[typing.Sequence[str], collections.abc.Callable[[pathlib.Path], bool], None] = None,
     ) -> Mount: ...
     @staticmethod
     def _from_local_python_packages(
         *module_names: str,
         remote_dir: typing.Union[str, pathlib.PurePosixPath] = "/root",
-        condition: typing.Optional[typing.Callable[[str], bool]] = None,
-        ignore: typing.Union[typing.Sequence[str], typing.Callable[[pathlib.Path], bool], None] = None,
+        condition: typing.Optional[collections.abc.Callable[[str], bool]] = None,
+        ignore: typing.Union[typing.Sequence[str], collections.abc.Callable[[pathlib.Path], bool], None] = None,
     ) -> Mount: ...
     @staticmethod
     def from_name(name: str, namespace=1, environment_name: typing.Optional[str] = None) -> Mount: ...
@@ -279,7 +282,7 @@ class Mount(modal.object.Object):
         environment_name: typing.Optional[str] = None,
     ) -> Mount: ...
 
-    class ___deploy_spec(typing_extensions.Protocol):
+    class ___deploy_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self,
             deployment_name: typing.Optional[str] = None,
@@ -295,7 +298,7 @@ class Mount(modal.object.Object):
             client: typing.Optional[modal.client.Client] = None,
         ) -> None: ...
 
-    _deploy: ___deploy_spec
+    _deploy: ___deploy_spec[typing_extensions.Self]
 
     def _get_metadata(self) -> modal_proto.api_pb2.MountHandleMetadata: ...
 

modal/network_file_system.py

@@ -12,6 +12,13 @@ from synchronicity.async_wrap import asynccontextmanager
 import modal
 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, sync_or_async_iter, synchronize_api
 from ._utils.blob_utils import LARGE_FILE_LIMIT, blob_iter, blob_upload_file
@@ -21,13 +28,6 @@ from ._utils.hash_utils import get_sha256_hex
 from ._utils.name_utils import check_object_name
 from .client import _Client
 from .exception import InvalidError
-from .object import (
-    EPHEMERAL_OBJECT_HEARTBEAT_SLEEP,
-    _get_environment_name,
-    _Object,
-    live_method,
-    live_method_gen,
-)
 from .volume import FileEntry
 
 NETWORK_FILE_SYSTEM_PUT_FILE_CLIENT_TIMEOUT = (