modal 0.77.1.dev0__py3-none-any.whl → 1.0.0__py3-none-any.whl

modal/cls.py

@@ -25,7 +25,7 @@ from ._serialization import check_valid_cls_constructor_arg
 from ._traceback import print_server_warnings
 from ._type_manager import parameter_serde_registry
 from ._utils.async_utils import synchronize_api, synchronizer
-from ._utils.deprecation import deprecation_warning, renamed_parameter, warn_on_renamed_autoscaler_settings
+from ._utils.deprecation import deprecation_warning, warn_on_renamed_autoscaler_settings
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.mount_utils import validate_volumes
 from .client import _Client
@@ -276,7 +276,8 @@ class _Obj:
         )
 
     async def keep_warm(self, warm_pool_size: int) -> None:
-        """Set the warm pool size for the class containers
+        """mdmd:hidden
+        Set the warm pool size for the class containers
 
         DEPRECATED: Please adapt your code to use the more general `update_autoscaler` method instead:
 
@@ -586,7 +587,6 @@ More information on class parameterization can be found here: https://modal.com/
         return cls
 
     @classmethod
-    @renamed_parameter((2024, 12, 18), "tag", "name")
     def from_name(
         cls: type["_Cls"],
         app_name: str,
@@ -594,7 +594,6 @@ More information on class parameterization can be found here: https://modal.com/
         *,
         namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
         environment_name: Optional[str] = None,
-        workspace: Optional[str] = None,  # Deprecated and unused
     ) -> "_Cls":
         """Reference a Cls from a deployed App by its name.
 
@@ -608,18 +607,12 @@ More information on class parameterization can be found here: https://modal.com/
         """
         _environment_name = environment_name or config.get("environment")
 
-        if workspace is not None:
-            deprecation_warning(
-                (2025, 1, 27), "The `workspace` argument is no longer used and will be removed in a future release."
-            )
-
         async def _load_remote(self: _Cls, resolver: Resolver, existing_object_id: Optional[str]):
             request = api_pb2.ClassGetRequest(
                 app_name=app_name,
                 object_tag=name,
                 namespace=namespace,
                 environment_name=_environment_name,
-                lookup_published=workspace is not None,
                 only_class_function=True,
             )
             try:
@@ -786,16 +779,15 @@ More information on class parameterization can be found here: https://modal.com/
         return cls
 
     @staticmethod
-    @renamed_parameter((2024, 12, 18), "tag", "name")
     async def lookup(
         app_name: str,
         name: str,
         namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
         client: Optional[_Client] = None,
         environment_name: Optional[str] = None,
-        workspace: Optional[str] = None,  # Deprecated and unused
     ) -> "_Cls":
-        """Lookup a Cls from a deployed App by its name.
+        """mdmd:hidden
+        Lookup a Cls from a deployed App by its name.
 
         DEPRECATED: This method is deprecated in favor of `modal.Cls.from_name`.
 
@@ -815,7 +807,10 @@ More information on class parameterization can be found here: https://modal.com/
             "\n\nSee https://modal.com/docs/guide/modal-1-0-migration for more information.",
         )
         obj = _Cls.from_name(
-            app_name, name, namespace=namespace, environment_name=environment_name, workspace=workspace
+            app_name,
+            name,
+            namespace=namespace,
+            environment_name=environment_name,
         )
         if client is None:
             client = await _Client.from_env()

modal/cls.pyi

@@ -172,13 +172,7 @@ class _Cls(modal._object._Object):
     def from_local(user_cls, app: modal.app._App, class_service_function: modal._functions._Function) -> _Cls: ...
     @classmethod
     def from_name(
-        cls: type[_Cls],
-        app_name: str,
-        name: str,
-        *,
-        namespace=1,
-        environment_name: typing.Optional[str] = None,
-        workspace: typing.Optional[str] = None,
+        cls: type[_Cls], app_name: str, name: str, *, namespace=1, environment_name: typing.Optional[str] = None
     ) -> _Cls: ...
     def with_options(
         self: _Cls,
@@ -206,7 +200,6 @@ class _Cls(modal._object._Object):
         namespace=1,
         client: typing.Optional[modal.client._Client] = None,
         environment_name: typing.Optional[str] = None,
-        workspace: typing.Optional[str] = None,
     ) -> _Cls: ...
     def __call__(self, *args, **kwargs) -> _Obj: ...
     def __getattr__(self, k): ...
@@ -238,13 +231,7 @@ class Cls(modal.object.Object):
     def from_local(user_cls, app: modal.app.App, class_service_function: modal.functions.Function) -> Cls: ...
     @classmethod
     def from_name(
-        cls: type[Cls],
-        app_name: str,
-        name: str,
-        *,
-        namespace=1,
-        environment_name: typing.Optional[str] = None,
-        workspace: typing.Optional[str] = None,
+        cls: type[Cls], app_name: str, name: str, *, namespace=1, environment_name: typing.Optional[str] = None
     ) -> Cls: ...
     def with_options(
         self: Cls,
@@ -275,7 +262,6 @@ class Cls(modal.object.Object):
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
-            workspace: typing.Optional[str] = None,
         ) -> Cls: ...
         async def aio(
             self,
@@ -285,7 +271,6 @@ class Cls(modal.object.Object):
             namespace=1,
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
-            workspace: typing.Optional[str] = None,
         ) -> Cls: ...
 
     lookup: __lookup_spec

modal/config.py

@@ -51,10 +51,6 @@ Other possible configuration options are:
   Defaults to 10.
   Number of seconds to wait for logs to drain when closing the session,
   before giving up.
-* `automount` (in the .toml file) / `MODAL_AUTOMOUNT` (as an env var).
-  Defaults to True.
-  By default, Modal automatically mounts modules imported in the current scope, that
-  are deemed to be "local". This can be turned off by setting this to False.
 * `force_build` (in the .toml file) / `MODAL_FORCE_BUILD` (as an env var).
   Defaults to False.
   When set, ignores the Image cache and builds all Image layers. Note that this
@@ -91,14 +87,12 @@ import logging
 import os
 import typing
 import warnings
-from textwrap import dedent
 from typing import Any, Callable, Optional
 
 from google.protobuf.empty_pb2 import Empty
 
 from modal_proto import api_pb2
 
-from ._utils.deprecation import deprecation_error
 from ._utils.logger import configure_logger
 from .exception import InvalidError
 
@@ -186,16 +180,12 @@ def _check_config() -> None:
             f"({user_config_path})."
         )
     elif num_profiles > 1 and num_active == 0 and _profile == "default":
-        # Eventually we plan to have num_profiles > 1 with num_active = 0 be an error
-        # But we want to give users time to activate one of their profiles without disruption
-        message = dedent(
-            """
-            Support for using an implicit 'default' profile is deprecated.
-            Please use `modal profile activate` to activate one of your profiles.
-            (Use `modal profile list` to see the options.)
-            """
+        # TODO: We should get rid of the `_profile = "default"` concept entirely now
+        raise InvalidError(
+            "No Modal profile is active.\n\n"
+            "Please fix by running `modal profile activate` or by editing your Modal config file "
+            f"({user_config_path})."
         )
-        deprecation_error((2024, 2, 6), message)
 
 
 _profile = os.environ.get("MODAL_PROFILE") or _config_active_profile()
@@ -233,7 +223,6 @@ _SETTINGS = {
     "sync_entrypoint": _Setting(),
     "logs_timeout": _Setting(10, float),
     "image_id": _Setting(),
-    "automount": _Setting(True, transform=_to_boolean),
     "heartbeat_interval": _Setting(15, float),
     "function_runtime": _Setting(),
     "function_runtime_debug": _Setting(False, transform=_to_boolean),  # For internal debugging use.

modal/container_process.py

@@ -6,7 +6,6 @@ from typing import Generic, Optional, TypeVar
 from modal_proto import api_pb2
 
 from ._utils.async_utils import TaskContext, synchronize_api
-from ._utils.deprecation import deprecation_error
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.shell_utils import stream_from_stdin, write_to_fd
 from .client import _Client
@@ -118,18 +117,11 @@ class _ContainerProcess(Generic[T]):
                 self._returncode = resp.exit_code
                 return self._returncode
 
-    async def attach(self, *, pty: Optional[bool] = None):
+    async def attach(self):
         if platform.system() == "Windows":
             print("interactive exec is not currently supported on Windows.")
             return
 
-        if pty is not None:
-            deprecation_error(
-                (2024, 12, 9),
-                "The `pty` argument to `modal.container_process.attach(pty=...)` is deprecated, "
-                "as only PTY mode is supported. Please remove the argument.",
-            )
-
         from rich.console import Console
 
         console = Console()

modal/container_process.pyi

@@ -35,7 +35,7 @@ class _ContainerProcess(typing.Generic[T]):
     def returncode(self) -> int: ...
     async def poll(self) -> typing.Optional[int]: ...
     async def wait(self) -> int: ...
-    async def attach(self, *, pty: typing.Optional[bool] = None): ...
+    async def attach(self): ...
 
 SUPERSELF = typing.TypeVar("SUPERSELF", covariant=True)
 
@@ -80,7 +80,7 @@ class ContainerProcess(typing.Generic[T]):
     wait: __wait_spec[typing_extensions.Self]
 
     class __attach_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, /, *, pty: typing.Optional[bool] = None): ...
-        async def aio(self, /, *, pty: typing.Optional[bool] = None): ...
+        def __call__(self, /): ...
+        async def aio(self, /): ...
 
     attach: __attach_spec[typing_extensions.Self]

modal/dict.py

@@ -11,7 +11,7 @@ from ._object import EPHEMERAL_OBJECT_HEARTBEAT_SLEEP, _get_environment_name, _O
 from ._resolver import Resolver
 from ._serialization import deserialize, serialize
 from ._utils.async_utils import TaskContext, synchronize_api
-from ._utils.deprecation import deprecation_warning, renamed_parameter
+from ._utils.deprecation import deprecation_warning
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.name_utils import check_object_name
 from .client import _Client
@@ -115,7 +115,6 @@ class _Dict(_Object, type_prefix="di"):
             yield cls._new_hydrated(response.dict_id, client, None, is_another_app=True)
 
     @staticmethod
-    @renamed_parameter((2024, 12, 18), "label", "name")
     def from_name(
         name: str,
         data: Optional[dict] = None,  # DEPRECATED
@@ -159,7 +158,6 @@ class _Dict(_Object, type_prefix="di"):
         return _Dict._from_loader(_load, "Dict()", is_another_app=True, hydrate_lazily=True)
 
     @staticmethod
-    @renamed_parameter((2024, 12, 18), "label", "name")
     async def lookup(
         name: str,
         data: Optional[dict] = None,
@@ -168,7 +166,8 @@ class _Dict(_Object, type_prefix="di"):
         environment_name: Optional[str] = None,
         create_if_missing: bool = False,
     ) -> "_Dict":
-        """Lookup a named Dict.
+        """mdmd:hidden
+        Lookup a named Dict.
 
         DEPRECATED: This method is deprecated in favor of `modal.Dict.from_name`.
 
@@ -200,7 +199,6 @@ class _Dict(_Object, type_prefix="di"):
         return obj
 
     @staticmethod
-    @renamed_parameter((2024, 12, 18), "label", "name")
     async def delete(
         name: str,
         *,

modal/environments.py

@@ -11,7 +11,7 @@ from modal_proto import api_pb2
 from ._object import _Object
 from ._resolver import Resolver
 from ._utils.async_utils import synchronize_api, synchronizer
-from ._utils.deprecation import deprecation_warning, renamed_parameter
+from ._utils.deprecation import deprecation_warning
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.name_utils import check_object_name
 from .client import _Client
@@ -50,7 +50,6 @@ class _Environment(_Object, type_prefix="en"):
         )
 
     @staticmethod
-    @renamed_parameter((2024, 12, 18), "label", "name")
     def from_name(
         name: str,
         *,
@@ -81,7 +80,6 @@ class _Environment(_Object, type_prefix="en"):
         return _Environment._from_loader(_load, "Environment()", is_another_app=True, hydrate_lazily=True)
 
     @staticmethod
-    @renamed_parameter((2024, 12, 18), "label", "name")
     async def lookup(
         name: str,
         client: Optional[_Client] = None,

modal/exception.py

@@ -116,7 +116,7 @@ class InternalFailure(Error):
 
 class _CliUserExecutionError(Exception):
     """mdmd:hidden
-    Private wrapper for exceptions during when importing or running stubs from the CLI.
+    Private wrapper for exceptions during when importing or running Apps from the CLI.
 
     This intentionally does not inherit from `modal.exception.Error` because it
     is a private type that should never bubble up to users. Exceptions raised in

modal/functions.pyi

@@ -63,7 +63,6 @@ class Function(
         schedule: typing.Optional[modal.schedule.Schedule] = None,
         is_generator: bool = False,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig, list[typing.Union[None, str, modal.gpu._GPUConfig]]] = None,
-        mounts: collections.abc.Collection[modal.mount.Mount] = (),
         network_file_systems: dict[
             typing.Union[str, pathlib.PurePosixPath], modal.network_file_system.NetworkFileSystem
         ] = {},
@@ -228,17 +227,11 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class ___call_generator_nowait_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, /, args, kwargs): ...
-        async def aio(self, /, args, kwargs): ...
-
-    _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]: ...
@@ -253,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]):
@@ -267,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]: ...
 
@@ -350,12 +343,6 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
 
     get: __get_spec[modal._functions.ReturnType, typing_extensions.Self]
 
-    class __get_gen_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, /) -> typing.Generator[typing.Any, None, None]: ...
-        def aio(self, /) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
-
-    get_gen: __get_gen_spec[typing_extensions.Self]
-
     class __get_call_graph_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /) -> list[modal.call_graph.InputInfo]: ...
         async def aio(self, /) -> list[modal.call_graph.InputInfo]: ...
@@ -370,18 +357,10 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
 
     class __from_id_spec(typing_extensions.Protocol):
         def __call__(
-            self,
-            /,
-            function_call_id: str,
-            client: typing.Optional[modal.client.Client] = None,
-            is_generator: bool = False,
+            self, /, function_call_id: str, client: typing.Optional[modal.client.Client] = None
         ) -> FunctionCall[typing.Any]: ...
         async def aio(
-            self,
-            /,
-            function_call_id: str,
-            client: typing.Optional[modal.client.Client] = None,
-            is_generator: bool = False,
+            self, /, function_call_id: str, client: typing.Optional[modal.client.Client] = None
         ) -> FunctionCall[typing.Any]: ...
 
     from_id: __from_id_spec

modal/image.py

@@ -193,18 +193,6 @@ def _validate_packages(packages: list[str]) -> bool:
     return not any(pkg.startswith("-") for pkg in packages)
 
 
-def _warn_invalid_packages(old_command: str) -> None:
-    deprecation_warning(
-        (2024, 7, 3),
-        "Passing flags to `pip` via the `packages` argument of `pip_install` is deprecated."
-        " Please pass flags via the `extra_options` argument instead."
-        "\nNote that this will cause a rebuild of this image layer."
-        " To avoid rebuilding, you can pass the following to `run_commands` instead:"
-        f'\n`image.run_commands("{old_command}")`',
-        show_source=False,
-    )
-
-
 def _make_pip_install_args(
     find_links: Optional[str] = None,  # Passes -f (--find-links) pip install
     index_url: Optional[str] = None,  # Passes -i (--index-url) to pip install
@@ -449,7 +437,7 @@ class _Image(_Object, type_prefix="im"):
 
     def _add_mount_layer_or_copy(self, mount: _Mount, copy: bool = False):
         if copy:
-            return self.copy_mount(mount, remote_path="/")
+            return self._copy_mount(mount, remote_path="/")
 
         base_image = self
 
@@ -684,23 +672,9 @@ class _Image(_Object, type_prefix="im"):
         )
         return obj
 
-    def copy_mount(self, mount: _Mount, remote_path: Union[str, Path] = ".") -> "_Image":
-        """
-        **Deprecated**: Use image.add_local_dir(..., copy=True) or similar instead.
-
-        Copy the entire contents of a `modal.Mount` into an image.
-        Useful when files only available locally are required during the image
-        build process.
-
-        **Example**
-
-        ```python notest
-        static_images_dir = "./static"
-        # place all static images in root of mount
-        mount = modal.Mount.from_local_dir(static_images_dir, remote_path="/")
-        # place mount's contents into /static directory of image.
-        image = modal.Image.debian_slim().copy_mount(mount, remote_path="/static")
-        ```
+    def _copy_mount(self, mount: _Mount, remote_path: Union[str, Path] = ".") -> "_Image":
+        """mdmd:hidden
+        Internal
         """
         if not isinstance(mount, _Mount):
             raise InvalidError("The mount argument to copy has to be a Modal Mount object")
@@ -815,7 +789,8 @@ class _Image(_Object, type_prefix="im"):
         return self._add_mount_layer_or_copy(mount, copy=copy)
 
     def copy_local_file(self, local_path: Union[str, Path], remote_path: Union[str, Path] = "./") -> "_Image":
-        """Copy a file into the image as a part of building it.
+        """mdmd:hidden
+        Copy a file into the image as a part of building it.
 
         This works in a similar way to [`COPY`](https://docs.docker.com/engine/reference/builder/#copy)
         works in a `Dockerfile`.
@@ -888,7 +863,7 @@ class _Image(_Object, type_prefix="im"):
         # Which follows dockerignore syntax.
         ignore: Union[Sequence[str], Callable[[Path], bool]] = [],
     ) -> "_Image":
-        """
+        """mdmd:hidden
         **Deprecated**: Use image.add_local_dir instead
 
         Copy a directory into the image as a part of building the image.
@@ -1011,13 +986,16 @@ class _Image(_Object, type_prefix="im"):
         pkgs = _flatten_str_args("pip_install", "packages", packages)
         if not pkgs:
             return self
+        elif not _validate_packages(pkgs):
+            raise InvalidError(
+                "Package list for `Image.pip_install` cannot contain other arguments;"
+                " try the `extra_options` parameter instead."
+            )
 
         def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
             package_args = shlex.join(sorted(pkgs))
             extra_args = _make_pip_install_args(find_links, index_url, extra_index_url, pre, extra_options)
             commands = ["FROM base", f"RUN python -m pip install {package_args} {extra_args}"]
-            if not _validate_packages(pkgs):
-                _warn_invalid_packages(commands[-1].split("RUN ")[-1])
             if version > "2023.12":  # Back-compat for legacy trailing space with empty extra_args
                 commands = [cmd.strip() for cmd in commands]
             return DockerfileSpec(commands=commands, context_files={})
@@ -1900,7 +1878,6 @@ class _Image(_Object, type_prefix="im"):
         *,
         secrets: Sequence[_Secret] = (),  # Optional Modal Secret objects with environment variables for the container
         gpu: Union[GPU_T, list[GPU_T]] = None,  # Requested GPU or or list of acceptable GPUs( e.g. ["A10", "A100"])
-        mounts: Sequence[_Mount] = (),  # Mounts attached to the function
         volumes: dict[Union[str, PurePosixPath], Union[_Volume, _CloudBucketMount]] = {},  # Volume mount paths
         network_file_systems: dict[Union[str, PurePosixPath], _NetworkFileSystem] = {},  # NFS mount paths
         cpu: Optional[float] = None,  # How many CPU cores to request. This is a soft limit.
@@ -1958,7 +1935,6 @@ class _Image(_Object, type_prefix="im"):
             image=self,  # type: ignore[reportArgumentType]  # TODO: probably conflict with type stub?
             secrets=secrets,
             gpu=gpu,
-            mounts=mounts,
             volumes=volumes,
             network_file_systems=network_file_systems,
             cloud=cloud,

modal/image.pyi

@@ -45,7 +45,6 @@ def _flatten_str_args(
     function_name: str, arg_name: str, args: collections.abc.Sequence[typing.Union[str, list[str]]]
 ) -> list[str]: ...
 def _validate_packages(packages: list[str]) -> bool: ...
-def _warn_invalid_packages(old_command: str) -> None: ...
 def _make_pip_install_args(
     find_links: typing.Optional[str] = None,
     index_url: typing.Optional[str] = None,
@@ -121,7 +120,7 @@ class _Image(modal._object._Object):
         _namespace: int = 1,
         _do_assert_no_mount_layers: bool = True,
     ): ...
-    def copy_mount(self, mount: modal.mount._Mount, remote_path: typing.Union[str, pathlib.Path] = ".") -> _Image: ...
+    def _copy_mount(self, mount: modal.mount._Mount, remote_path: typing.Union[str, pathlib.Path] = ".") -> _Image: ...
     def add_local_file(
         self, local_path: typing.Union[str, pathlib.Path], remote_path: str, *, copy: bool = False
     ) -> _Image: ...
@@ -317,7 +316,6 @@ class _Image(modal._object._Object):
         *,
         secrets: collections.abc.Sequence[modal.secret._Secret] = (),
         gpu: typing.Union[None, str, modal.gpu._GPUConfig, list[typing.Union[None, str, modal.gpu._GPUConfig]]] = None,
-        mounts: collections.abc.Sequence[modal.mount._Mount] = (),
         volumes: dict[
             typing.Union[str, pathlib.PurePosixPath],
             typing.Union[modal.volume._Volume, modal.cloud_bucket_mount._CloudBucketMount],
@@ -378,7 +376,7 @@ class Image(modal.object.Object):
         _namespace: int = 1,
         _do_assert_no_mount_layers: bool = True,
     ): ...
-    def copy_mount(self, mount: modal.mount.Mount, remote_path: typing.Union[str, pathlib.Path] = ".") -> Image: ...
+    def _copy_mount(self, mount: modal.mount.Mount, remote_path: typing.Union[str, pathlib.Path] = ".") -> Image: ...
     def add_local_file(
         self, local_path: typing.Union[str, pathlib.Path], remote_path: str, *, copy: bool = False
     ) -> Image: ...
@@ -579,7 +577,6 @@ class Image(modal.object.Object):
         *,
         secrets: collections.abc.Sequence[modal.secret.Secret] = (),
         gpu: typing.Union[None, str, modal.gpu._GPUConfig, list[typing.Union[None, str, modal.gpu._GPUConfig]]] = None,
-        mounts: collections.abc.Sequence[modal.mount.Mount] = (),
         volumes: dict[
             typing.Union[str, pathlib.PurePosixPath],
             typing.Union[modal.volume.Volume, modal.cloud_bucket_mount.CloudBucketMount],

modal/mount.py

@@ -5,9 +5,6 @@ import concurrent.futures
 import dataclasses
 import os
 import re
-import site
-import sys
-import sysconfig
 import time
 import typing
 import warnings
@@ -26,13 +23,13 @@ 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
-from ._utils.deprecation import deprecation_warning, renamed_parameter
+from ._utils.deprecation import deprecation_warning
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.name_utils import check_object_name
 from ._utils.package_utils import get_module_mount_info
 from .client import _Client
 from .config import config, logger
-from .exception import ExecutionError, InvalidError, ModuleNotMountable
+from .exception import ExecutionError, InvalidError
 from .file_pattern_matcher import FilePatternMatcher
 
 ROOT_DIR: PurePosixPath = PurePosixPath("/root")
@@ -691,7 +688,6 @@ class _Mount(_Object, type_prefix="mo"):
         return mount
 
     @staticmethod
-    @renamed_parameter((2024, 12, 18), "label", "name")
     def from_name(
         name: str,
         *,
@@ -712,7 +708,6 @@ class _Mount(_Object, type_prefix="mo"):
         return _Mount._from_loader(_load, "Mount()", hydrate_lazily=True)
 
     @classmethod
-    @renamed_parameter((2024, 12, 18), "label", "name")
     async def lookup(
         cls: type["_Mount"],
         name: str,
@@ -802,22 +797,6 @@ def _get_client_mount():
         return _Mount.from_name(client_mount_name(), namespace=api_pb2.DEPLOYMENT_NAMESPACE_GLOBAL)
 
 
-SYS_PREFIXES = {
-    Path(p)
-    for p in (
-        sys.prefix,
-        sys.base_prefix,
-        sys.exec_prefix,
-        sys.base_exec_prefix,
-        *sysconfig.get_paths().values(),
-        *site.getsitepackages(),
-        site.getusersitepackages(),
-    )
-}
-
-
-SYS_PREFIXES |= {p.resolve() for p in SYS_PREFIXES}
-
 MODAL_PACKAGES = ["modal", "modal_proto", "modal_version"]
 
 
@@ -831,45 +810,3 @@ def _is_modal_path(remote_path: PurePosixPath):
         if is_modal_path:
             return True
     return False
-
-
-def get_sys_modules_mounts() -> dict[str, _Mount]:
-    """mdmd:hidden
-
-    Auto-mount local modules that have been imported in global scope.
-    This may or may not include the "entrypoint" of the function as well, depending on how modal is invoked
-    Note: sys.modules may change during the iteration
-    """
-    auto_mounts = {}
-    top_level_modules = []
-    skip_prefixes = set()
-    for name, module in sorted(sys.modules.items(), key=lambda kv: len(kv[0])):
-        parent = name.rsplit(".")[0]
-        if parent and parent in skip_prefixes:
-            skip_prefixes.add(name)
-            continue
-        skip_prefixes.add(name)
-        top_level_modules.append((name, module))
-
-    for module_name, module in top_level_modules:
-        if module_name.startswith("__"):
-            # skip "built in" modules like __main__ and __mp_main__
-            # the running function's main file should be included anyway
-            continue
-
-        try:
-            # at this point we don't know if the sys.modules module should be mounted or not
-            potential_mount = _Mount._from_local_python_packages(module_name)
-            mount_paths = potential_mount._top_level_paths()
-        except ModuleNotMountable:
-            # this typically happens if the module is a built-in, has binary components or doesn't exist
-            continue
-
-        for local_path, remote_path in mount_paths:
-            if any(local_path.is_relative_to(p) for p in SYS_PREFIXES) or _is_modal_path(remote_path):
-                # skip any module that has paths in SYS_PREFIXES, or would overwrite the modal Package in the container
-                break
-        else:
-            auto_mounts[module_name] = potential_mount
-
-    return auto_mounts