modal 1.0.6.dev58__py3-none-any.whl → 1.2.3.dev7__py3-none-any.whl

modal/mount.pyi

@@ -1,5 +1,6 @@
 import collections.abc
 import google.protobuf.message
+import modal._load_context
 import modal._object
 import modal._resolver
 import modal._utils.blob_utils
@@ -154,7 +155,6 @@ class _Mount(modal._object._Object):
     _entries: typing.Optional[list[_MountEntry]]
     _deployment_name: typing.Optional[str]
     _namespace: typing.Optional[int]
-    _environment_name: typing.Optional[str]
     _allow_overwrite: bool
     _content_checksum_sha256_hex: typing.Optional[str]
 
@@ -189,30 +189,6 @@ class _Mount(modal._object._Object):
         """Add a local directory to the `Mount` object."""
         ...
 
-    @staticmethod
-    def from_local_dir(
-        local_path: typing.Union[str, pathlib.Path],
-        *,
-        remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None,
-        condition: typing.Optional[collections.abc.Callable[[str], bool]] = None,
-        recursive: bool = True,
-    ) -> _Mount:
-        """**Deprecated:** Use image.add_local_dir() instead
-
-        Create a `Mount` from a local directory.
-
-        **Usage**
-
-        ```python notest
-        assets = modal.Mount.from_local_dir(
-            "~/assets",
-            condition=lambda pth: not ".venv" in pth,
-            remote_path="/assets",
-        )
-        ```
-        """
-        ...
-
     @staticmethod
     def _from_local_dir(
         local_path: typing.Union[str, pathlib.Path],
@@ -229,26 +205,6 @@ class _Mount(modal._object._Object):
         """Add a local file to the `Mount` object."""
         ...
 
-    @staticmethod
-    def from_local_file(
-        local_path: typing.Union[str, pathlib.Path], remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None
-    ) -> _Mount:
-        """**Deprecated**: Use image.add_local_file() instead
-
-        Create a `Mount` mounting a single local file.
-
-        **Usage**
-
-        ```python notest
-        # Mount the DBT profile in user's home directory into container.
-        dbt_profiles = modal.Mount.from_local_file(
-            local_path="~/profiles.yml",
-            remote_path="/root/dbt_profile/profiles.yml",
-        )
-        ```
-        """
-        ...
-
     @staticmethod
     def _from_local_file(
         local_path: typing.Union[str, pathlib.Path], remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None
@@ -260,38 +216,11 @@ class _Mount(modal._object._Object):
         entries: list[_MountEntry],
     ) -> collections.abc.AsyncGenerator[modal._utils.blob_utils.FileUploadSpec, None]: ...
     async def _load_mount(
-        self: _Mount, resolver: modal._resolver.Resolver, existing_object_id: typing.Optional[str]
+        self: _Mount,
+        resolver: modal._resolver.Resolver,
+        load_context: modal._load_context.LoadContext,
+        existing_object_id: typing.Optional[str],
     ): ...
-    @staticmethod
-    def from_local_python_packages(
-        *module_names: str,
-        remote_dir: typing.Union[str, pathlib.PurePosixPath] = "/root",
-        condition: typing.Optional[collections.abc.Callable[[str], bool]] = None,
-        ignore: typing.Union[typing.Sequence[str], collections.abc.Callable[[pathlib.Path], bool], None] = 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`.
-
-        **Usage**
-
-        ```python notest
-        import modal
-        import my_local_module
-
-        app = modal.App()
-
-        @app.function(mounts=[
-            modal.Mount.from_local_python_packages("my_local_module", "my_other_module"),
-        ])
-        def f():
-            my_local_module.do_stuff()
-        ```
-        """
-        ...
-
     @staticmethod
     def _from_local_python_packages(
         *module_names: str,
@@ -300,17 +229,12 @@ class _Mount(modal._object._Object):
         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:
-        """mdmd:hidden"""
-        ...
-
-    @classmethod
-    async def lookup(
-        cls: type[_Mount],
+    def from_name(
         name: str,
+        *,
         namespace=1,
-        client: typing.Optional[modal.client._Client] = None,
         environment_name: typing.Optional[str] = None,
+        client: typing.Optional[modal.client._Client] = None,
     ) -> _Mount:
         """mdmd:hidden"""
         ...
@@ -354,7 +278,6 @@ class Mount(modal.object.Object):
     _entries: typing.Optional[list[_MountEntry]]
     _deployment_name: typing.Optional[str]
     _namespace: typing.Optional[int]
-    _environment_name: typing.Optional[str]
     _allow_overwrite: bool
     _content_checksum_sha256_hex: typing.Optional[str]
 
@@ -393,30 +316,6 @@ class Mount(modal.object.Object):
         """Add a local directory to the `Mount` object."""
         ...
 
-    @staticmethod
-    def from_local_dir(
-        local_path: typing.Union[str, pathlib.Path],
-        *,
-        remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None,
-        condition: typing.Optional[collections.abc.Callable[[str], bool]] = None,
-        recursive: bool = True,
-    ) -> Mount:
-        """**Deprecated:** Use image.add_local_dir() instead
-
-        Create a `Mount` from a local directory.
-
-        **Usage**
-
-        ```python notest
-        assets = modal.Mount.from_local_dir(
-            "~/assets",
-            condition=lambda pth: not ".venv" in pth,
-            remote_path="/assets",
-        )
-        ```
-        """
-        ...
-
     @staticmethod
     def _from_local_dir(
         local_path: typing.Union[str, pathlib.Path],
@@ -433,26 +332,6 @@ class Mount(modal.object.Object):
         """Add a local file to the `Mount` object."""
         ...
 
-    @staticmethod
-    def from_local_file(
-        local_path: typing.Union[str, pathlib.Path], remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None
-    ) -> Mount:
-        """**Deprecated**: Use image.add_local_file() instead
-
-        Create a `Mount` mounting a single local file.
-
-        **Usage**
-
-        ```python notest
-        # Mount the DBT profile in user's home directory into container.
-        dbt_profiles = modal.Mount.from_local_file(
-            local_path="~/profiles.yml",
-            remote_path="/root/dbt_profile/profiles.yml",
-        )
-        ```
-        """
-        ...
-
     @staticmethod
     def _from_local_file(
         local_path: typing.Union[str, pathlib.Path], remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None
@@ -471,41 +350,23 @@ class Mount(modal.object.Object):
     _get_files: ___get_files_spec
 
     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]): ...
+        def __call__(
+            self,
+            /,
+            resolver: modal._resolver.Resolver,
+            load_context: modal._load_context.LoadContext,
+            existing_object_id: typing.Optional[str],
+        ): ...
+        async def aio(
+            self,
+            /,
+            resolver: modal._resolver.Resolver,
+            load_context: modal._load_context.LoadContext,
+            existing_object_id: typing.Optional[str],
+        ): ...
 
     _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[collections.abc.Callable[[str], bool]] = None,
-        ignore: typing.Union[typing.Sequence[str], collections.abc.Callable[[pathlib.Path], bool], None] = 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`.
-
-        **Usage**
-
-        ```python notest
-        import modal
-        import my_local_module
-
-        app = modal.App()
-
-        @app.function(mounts=[
-            modal.Mount.from_local_python_packages("my_local_module", "my_other_module"),
-        ])
-        def f():
-            my_local_module.do_stuff()
-        ```
-        """
-        ...
-
     @staticmethod
     def _from_local_python_packages(
         *module_names: str,
@@ -514,17 +375,12 @@ class Mount(modal.object.Object):
         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:
-        """mdmd:hidden"""
-        ...
-
-    @classmethod
-    def lookup(
-        cls: type[Mount],
+    def from_name(
         name: str,
+        *,
         namespace=1,
-        client: typing.Optional[modal.client.Client] = None,
         environment_name: typing.Optional[str] = None,
+        client: typing.Optional[modal.client.Client] = None,
     ) -> Mount:
         """mdmd:hidden"""
         ...
@@ -568,17 +424,34 @@ async def _create_single_client_dependency_mount(
     uv_python_platform: str,
     check_if_exists: bool = True,
     allow_overwrite: bool = False,
+    dry_run: bool = False,
 ): ...
 async def _create_client_dependency_mounts(
-    client=None, python_versions: list[str] = ["3.9", "3.10", "3.11", "3.12", "3.13"], check_if_exists=True
+    client=None,
+    python_versions: list[str] = ["3.9", "3.10", "3.11", "3.12", "3.13"],
+    builder_versions: list[str] = ["2025.06"],
+    check_if_exists=True,
+    dry_run=False,
 ): ...
 
 class __create_client_dependency_mounts_spec(typing_extensions.Protocol):
     def __call__(
-        self, /, client=None, python_versions: list[str] = ["3.9", "3.10", "3.11", "3.12", "3.13"], check_if_exists=True
+        self,
+        /,
+        client=None,
+        python_versions: list[str] = ["3.9", "3.10", "3.11", "3.12", "3.13"],
+        builder_versions: list[str] = ["2025.06"],
+        check_if_exists=True,
+        dry_run=False,
     ): ...
     async def aio(
-        self, /, client=None, python_versions: list[str] = ["3.9", "3.10", "3.11", "3.12", "3.13"], check_if_exists=True
+        self,
+        /,
+        client=None,
+        python_versions: list[str] = ["3.9", "3.10", "3.11", "3.12", "3.13"],
+        builder_versions: list[str] = ["2025.06"],
+        check_if_exists=True,
+        dry_run=False,
     ): ...
 
 create_client_dependency_mounts: __create_client_dependency_mounts_spec

modal/network_file_system.py

@@ -11,6 +11,7 @@ from synchronicity.async_wrap import asynccontextmanager
 import modal
 from modal_proto import api_pb2
 
+from ._load_context import LoadContext
 from ._object import (
     EPHEMERAL_OBJECT_HEARTBEAT_SLEEP,
     _get_environment_name,
@@ -21,8 +22,7 @@ from ._object import (
 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
-from ._utils.deprecation import deprecation_warning, warn_if_passing_namespace
-from ._utils.grpc_utils import retry_transient_errors
+from ._utils.deprecation import warn_if_passing_namespace
 from ._utils.hash_utils import get_sha256_hex
 from ._utils.name_utils import check_object_name
 from .client import _Client
@@ -55,6 +55,8 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
     By attaching this file system as a mount to one or more functions, they can
     share and persist data with each other.
 
+    **Note: `NetworkFileSystem` has been deprecated and will be removed.**
+
     **Usage**
 
     ```python
@@ -94,6 +96,7 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
         namespace=None,  # mdmd:line-hidden
         environment_name: Optional[str] = None,
         create_if_missing: bool = False,
+        client: Optional[_Client] = None,
     ) -> "_NetworkFileSystem":
         """Reference a NetworkFileSystem by its name, creating if necessary.
 
@@ -112,15 +115,17 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
         check_object_name(name, "NetworkFileSystem")
         warn_if_passing_namespace(namespace, "modal.NetworkFileSystem.from_name")
 
-        async def _load(self: _NetworkFileSystem, resolver: Resolver, existing_object_id: Optional[str]):
+        async def _load(
+            self: _NetworkFileSystem, resolver: Resolver, load_context: LoadContext, existing_object_id: Optional[str]
+        ):
             req = api_pb2.SharedVolumeGetOrCreateRequest(
                 deployment_name=name,
-                environment_name=_get_environment_name(environment_name, resolver),
+                environment_name=load_context.environment_name,
                 object_creation_type=(api_pb2.OBJECT_CREATION_TYPE_CREATE_IF_MISSING if create_if_missing else None),
             )
             try:
-                response = await resolver.client.stub.SharedVolumeGetOrCreate(req)
-                self._hydrate(response.shared_volume_id, resolver.client, None)
+                response = await load_context.client.stub.SharedVolumeGetOrCreate(req)
+                self._hydrate(response.shared_volume_id, load_context.client, None)
             except modal.exception.NotFoundError as exc:
                 if exc.args[0] == "App has wrong entity vo":
                     raise InvalidError(
@@ -128,7 +133,12 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
                     )
                 raise
 
-        return _NetworkFileSystem._from_loader(_load, "NetworkFileSystem()", hydrate_lazily=True)
+        return _NetworkFileSystem._from_loader(
+            _load,
+            "NetworkFileSystem()",
+            hydrate_lazily=True,
+            load_context_overrides=LoadContext(environment_name=environment_name, client=client),
+        )
 
     @classmethod
     @asynccontextmanager
@@ -136,7 +146,7 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
         cls: type["_NetworkFileSystem"],
         client: Optional[_Client] = None,
         environment_name: Optional[str] = None,
-        _heartbeat_sleep: float = EPHEMERAL_OBJECT_HEARTBEAT_SLEEP,
+        _heartbeat_sleep: float = EPHEMERAL_OBJECT_HEARTBEAT_SLEEP,  # mdmd:line-hidden
     ) -> AsyncIterator["_NetworkFileSystem"]:
         """Creates a new ephemeral network filesystem within a context manager:
 
@@ -161,46 +171,13 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
         async with TaskContext() as tc:
             request = api_pb2.SharedVolumeHeartbeatRequest(shared_volume_id=response.shared_volume_id)
             tc.infinite_loop(lambda: client.stub.SharedVolumeHeartbeat(request), sleep=_heartbeat_sleep)
-            yield cls._new_hydrated(response.shared_volume_id, client, None, is_another_app=True)
-
-    @staticmethod
-    async def lookup(
-        name: str,
-        namespace=None,  # mdmd:line-hidden
-        client: Optional[_Client] = None,
-        environment_name: Optional[str] = None,
-        create_if_missing: bool = False,
-    ) -> "_NetworkFileSystem":
-        """mdmd:hidden
-        Lookup a named NetworkFileSystem.
-
-        DEPRECATED: This method is deprecated in favor of `modal.NetworkFileSystem.from_name`.
-
-        In contrast to `modal.NetworkFileSystem.from_name`, this is an eager method
-        that will hydrate the local object with metadata from Modal servers.
-
-        ```python notest
-        nfs = modal.NetworkFileSystem.lookup("my-nfs")
-        print(nfs.listdir("/"))
-        ```
-        """
-        deprecation_warning(
-            (2025, 1, 27),
-            "`modal.NetworkFileSystem.lookup` is deprecated and will be removed in a future release."
-            " It can be replaced with `modal.NetworkFileSystem.from_name`."
-            "\n\nSee https://modal.com/docs/guide/modal-1-0-migration for more information.",
-        )
-        warn_if_passing_namespace(namespace, "modal.NetworkFileSystem.lookup")
-        obj = _NetworkFileSystem.from_name(
-            name,
-            environment_name=environment_name,
-            create_if_missing=create_if_missing,
-        )
-        if client is None:
-            client = await _Client.from_env()
-        resolver = Resolver(client=client)
-        await resolver.load(obj)
-        return obj
+            yield cls._new_hydrated(
+                response.shared_volume_id,
+                client,
+                None,
+                is_another_app=True,
+                rep="modal.NetworkFileSystem.ephemeral()",
+            )
 
     @staticmethod
     async def create_deployed(
@@ -219,14 +196,14 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
             environment_name=_get_environment_name(environment_name),
             object_creation_type=api_pb2.OBJECT_CREATION_TYPE_CREATE_FAIL_IF_EXISTS,
         )
-        resp = await retry_transient_errors(client.stub.SharedVolumeGetOrCreate, request)
+        resp = await client.stub.SharedVolumeGetOrCreate(request)
         return resp.shared_volume_id
 
     @staticmethod
     async def delete(name: str, client: Optional[_Client] = None, environment_name: Optional[str] = None):
         obj = await _NetworkFileSystem.from_name(name, environment_name=environment_name).hydrate(client)
         req = api_pb2.SharedVolumeDeleteRequest(shared_volume_id=obj.object_id)
-        await retry_transient_errors(obj._client.stub.SharedVolumeDelete, req)
+        await obj._client.stub.SharedVolumeDelete(req)
 
     @live_method
     async def write_file(self, remote_path: str, fp: BinaryIO, progress_cb: Optional[Callable[..., Any]] = None) -> int:
@@ -266,7 +243,7 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
 
         t0 = time.monotonic()
         while time.monotonic() - t0 < NETWORK_FILE_SYSTEM_PUT_FILE_CLIENT_TIMEOUT:
-            response = await retry_transient_errors(self._client.stub.SharedVolumePutFile, req)
+            response = await self._client.stub.SharedVolumePutFile(req)
             if response.exists:
                 break
         else:
@@ -279,7 +256,7 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
         """Read a file from the network file system"""
         req = api_pb2.SharedVolumeGetFileRequest(shared_volume_id=self.object_id, path=path)
         try:
-            response = await retry_transient_errors(self._client.stub.SharedVolumeGetFile, req)
+            response = await self._client.stub.SharedVolumeGetFile(req)
         except modal.exception.NotFoundError as exc:
             raise FileNotFoundError(exc.args[0])
 
@@ -364,7 +341,7 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
         """Remove a file in a network file system."""
         req = api_pb2.SharedVolumeRemoveFileRequest(shared_volume_id=self.object_id, path=path, recursive=recursive)
         try:
-            await retry_transient_errors(self._client.stub.SharedVolumeRemoveFile, req)
+            await self._client.stub.SharedVolumeRemoveFile(req)
         except modal.exception.NotFoundError as exc:
             raise FileNotFoundError(exc.args[0])
 

modal/network_file_system.pyi

@@ -19,6 +19,8 @@ class _NetworkFileSystem(modal._object._Object):
     By attaching this file system as a mount to one or more functions, they can
     share and persist data with each other.
 
+    **Note: `NetworkFileSystem` has been deprecated and will be removed.**
+
     **Usage**
 
     ```python
@@ -52,7 +54,12 @@ class _NetworkFileSystem(modal._object._Object):
     """
     @staticmethod
     def from_name(
-        name: str, *, namespace=None, environment_name: typing.Optional[str] = None, create_if_missing: bool = False
+        name: str,
+        *,
+        namespace=None,
+        environment_name: typing.Optional[str] = None,
+        create_if_missing: bool = False,
+        client: typing.Optional[modal.client._Client] = None,
     ) -> _NetworkFileSystem:
         """Reference a NetworkFileSystem by its name, creating if necessary.
 
@@ -92,29 +99,6 @@ class _NetworkFileSystem(modal._object._Object):
         """
         ...
 
-    @staticmethod
-    async def lookup(
-        name: str,
-        namespace=None,
-        client: typing.Optional[modal.client._Client] = None,
-        environment_name: typing.Optional[str] = None,
-        create_if_missing: bool = False,
-    ) -> _NetworkFileSystem:
-        """mdmd:hidden
-        Lookup a named NetworkFileSystem.
-
-        DEPRECATED: This method is deprecated in favor of `modal.NetworkFileSystem.from_name`.
-
-        In contrast to `modal.NetworkFileSystem.from_name`, this is an eager method
-        that will hydrate the local object with metadata from Modal servers.
-
-        ```python notest
-        nfs = modal.NetworkFileSystem.lookup("my-nfs")
-        print(nfs.listdir("/"))
-        ```
-        """
-        ...
-
     @staticmethod
     async def create_deployed(
         deployment_name: str,
@@ -192,6 +176,8 @@ class NetworkFileSystem(modal.object.Object):
     By attaching this file system as a mount to one or more functions, they can
     share and persist data with each other.
 
+    **Note: `NetworkFileSystem` has been deprecated and will be removed.**
+
     **Usage**
 
     ```python
@@ -229,7 +215,12 @@ class NetworkFileSystem(modal.object.Object):
 
     @staticmethod
     def from_name(
-        name: str, *, namespace=None, environment_name: typing.Optional[str] = None, create_if_missing: bool = False
+        name: str,
+        *,
+        namespace=None,
+        environment_name: typing.Optional[str] = None,
+        create_if_missing: bool = False,
+        client: typing.Optional[modal.client.Client] = None,
     ) -> NetworkFileSystem:
         """Reference a NetworkFileSystem by its name, creating if necessary.
 
@@ -269,57 +260,6 @@ class NetworkFileSystem(modal.object.Object):
         """
         ...
 
-    class __lookup_spec(typing_extensions.Protocol):
-        def __call__(
-            self,
-            /,
-            name: str,
-            namespace=None,
-            client: typing.Optional[modal.client.Client] = None,
-            environment_name: typing.Optional[str] = None,
-            create_if_missing: bool = False,
-        ) -> NetworkFileSystem:
-            """mdmd:hidden
-            Lookup a named NetworkFileSystem.
-
-            DEPRECATED: This method is deprecated in favor of `modal.NetworkFileSystem.from_name`.
-
-            In contrast to `modal.NetworkFileSystem.from_name`, this is an eager method
-            that will hydrate the local object with metadata from Modal servers.
-
-            ```python notest
-            nfs = modal.NetworkFileSystem.lookup("my-nfs")
-            print(nfs.listdir("/"))
-            ```
-            """
-            ...
-
-        async def aio(
-            self,
-            /,
-            name: str,
-            namespace=None,
-            client: typing.Optional[modal.client.Client] = None,
-            environment_name: typing.Optional[str] = None,
-            create_if_missing: bool = False,
-        ) -> NetworkFileSystem:
-            """mdmd:hidden
-            Lookup a named NetworkFileSystem.
-
-            DEPRECATED: This method is deprecated in favor of `modal.NetworkFileSystem.from_name`.
-
-            In contrast to `modal.NetworkFileSystem.from_name`, this is an eager method
-            that will hydrate the local object with metadata from Modal servers.
-
-            ```python notest
-            nfs = modal.NetworkFileSystem.lookup("my-nfs")
-            print(nfs.listdir("/"))
-            ```
-            """
-            ...
-
-    lookup: __lookup_spec
-
     class __create_deployed_spec(typing_extensions.Protocol):
         def __call__(
             self,