modal 1.0.3.dev14__tar.gz → 1.0.3.dev21__tar.gz

{modal-1.0.3.dev14 → modal-1.0.3.dev21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.0.3.dev14
+Version: 1.0.3.dev21
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0

{modal-1.0.3.dev14 → modal-1.0.3.dev21}/modal/cli/run.py

@@ -171,6 +171,14 @@ def _write_local_result(result_path: str, res: Any):
         fid.write(res)
 
 
+def _validate_interactive_quiet_params(ctx):
+    interactive = ctx.obj["interactive"]
+    show_progress = ctx.obj["show_progress"]
+
+    if not show_progress and interactive:
+        raise InvalidError("To use interactive mode, remove the --quiet flag")
+
+
 def _make_click_function(app, signature: CliRunnableSignature, inner: Callable[[tuple[str, ...], dict[str, Any]], Any]):
     @click.pass_context
     def f(ctx, **kwargs):
@@ -180,6 +188,8 @@ def _make_click_function(app, signature: CliRunnableSignature, inner: Callable[[
         else:
             args = ()
 
+        _validate_interactive_quiet_params(ctx)
+
         show_progress: bool = ctx.obj["show_progress"]
         with enable_output(show_progress):
             with run_app(
@@ -291,6 +301,8 @@ def _get_click_command_for_local_entrypoint(app: App, entrypoint: LocalEntrypoin
             assert len(args) == 0 and len(kwargs) == 0
             args = ctx.args
 
+        _validate_interactive_quiet_params(ctx)
+
         show_progress: bool = ctx.obj["show_progress"]
         with enable_output(show_progress):
             with run_app(

{modal-1.0.3.dev14 → modal-1.0.3.dev21}/modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.3.dev14",
+        version: str = "1.0.3.dev21",
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -94,7 +94,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.3.dev14",
+        version: str = "1.0.3.dev21",
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-1.0.3.dev14 → modal-1.0.3.dev21}/modal/mount.py

@@ -21,7 +21,7 @@ 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.async_utils import TaskContext, 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
 from ._utils.grpc_utils import retry_transient_errors
@@ -115,7 +115,8 @@ class _MountFile(_MountEntry):
     def get_files_to_upload(self):
         local_file = self.local_file.resolve()
         if not local_file.exists():
-            raise FileNotFoundError(local_file)
+            msg = f"local file {local_file} does not exist"
+            raise FileNotFoundError(msg)
 
         rel_filename = self.remote_path
         yield local_file, rel_filename
@@ -144,10 +145,12 @@ class _MountDir(_MountEntry):
         local_dir = self.local_dir.expanduser().absolute()
 
         if not local_dir.exists():
-            raise FileNotFoundError(local_dir)
+            msg = f"local dir {local_dir} does not exist"
+            raise FileNotFoundError(msg)
 
         if not local_dir.is_dir():
-            raise NotADirectoryError(local_dir)
+            msg = f"local dir {local_dir} is not a directory"
+            raise NotADirectoryError(msg)
 
         if self.recursive:
             gen = (os.path.join(root, name) for root, dirs, files in os.walk(local_dir) for name in files)
@@ -810,3 +813,120 @@ def _is_modal_path(remote_path: PurePosixPath):
         if is_modal_path:
             return True
     return False
+
+
+REMOTE_PACKAGES_PATH = "/__modal/deps"
+REMOTE_SITECUSTOMIZE_PATH = "/pkg/sitecustomize.py"
+
+SITECUSTOMIZE_CONTENT = f"""
+# This file is automatically generated by Modal.
+# It ensures that Modal's python dependencies are available in the Python PATH,
+# while prioritizing user-installed packages.
+import sys; sys.path.append('{REMOTE_PACKAGES_PATH}')
+""".strip()
+
+
+async def _create_single_mount(
+    client: _Client,
+    builder_version: str,
+    python_version: str,
+    platform: str,
+    arch: str,
+    uv_python_platform: str = None,
+    check_if_exists: bool = True,
+):
+    import subprocess
+    import tempfile
+
+    profile_environment = config.get("environment")
+    abi_tag = "cp" + python_version.replace(".", "")
+    mount_name = f"{builder_version}-{abi_tag}-{platform}-{arch}"
+    uv_python_platform = uv_python_platform or f"{arch}-{platform}"
+
+    if check_if_exists:
+        try:
+            await Mount.from_name(mount_name, namespace=api_pb2.DEPLOYMENT_NAMESPACE_GLOBAL).hydrate.aio(client)
+            print(f"✅ Found existing mount {mount_name} in global namespace.")
+            return
+        except modal.exception.NotFoundError:
+            pass
+
+    with tempfile.TemporaryDirectory() as tmpd:
+        print(f"📦 Building {mount_name}.")
+        requirements = os.path.join(os.path.dirname(__file__), f"requirements/{builder_version}.txt")
+        subprocess.run(
+            [
+                "uv",
+                "pip",
+                "install",
+                "--strict",
+                "--no-deps",
+                "--no-cache",
+                "-r",
+                requirements,
+                "--compile-bytecode",
+                "--target",
+                tmpd,
+                "--python-platform",
+                uv_python_platform,
+                "--python-version",
+                python_version,
+            ],
+            check=True,
+            capture_output=True,
+        )
+
+        print(f"🌐 Downloaded and unpacked packages to {tmpd}.")
+
+        python_mount = Mount._from_local_dir(tmpd, remote_path=REMOTE_PACKAGES_PATH)
+
+        with tempfile.NamedTemporaryFile() as sitecustomize:
+            sitecustomize.write(
+                SITECUSTOMIZE_CONTENT.encode("utf-8"),
+            )
+            sitecustomize.flush()
+
+            python_mount = python_mount.add_local_file(
+                sitecustomize.name,
+                remote_path=REMOTE_SITECUSTOMIZE_PATH,
+            )
+
+            await python_mount._deploy.aio(
+                mount_name,
+                api_pb2.DEPLOYMENT_NAMESPACE_GLOBAL,
+                environment_name=profile_environment,
+                client=client,
+            )
+            print(f"✅ Deployed mount {mount_name} to global namespace.")
+
+
+async def _create_client_dependency_mounts(client=None, check_if_exists=True):
+    coros = []
+    for python_version in PYTHON_STANDALONE_VERSIONS:
+        # glibc >= 2.17
+        coros.append(
+            _create_single_mount(
+                client,
+                "PREVIEW",
+                python_version,
+                "manylinux_2_17",
+                "x86_64",
+                check_if_exists=check_if_exists,
+            )
+        )
+        # musl >= 1.2
+        coros.append(
+            _create_single_mount(
+                client,
+                "PREVIEW",
+                python_version,
+                "musllinux_1_2",
+                "x86_64",
+                uv_python_platform="x86_64-unknown-linux-musl",
+                check_if_exists=check_if_exists,
+            )
+        )
+    await TaskContext.gather(*coros)
+
+
+create_client_dependency_mounts = synchronize_api(_create_client_dependency_mounts)

{modal-1.0.3.dev14 → modal-1.0.3.dev21}/modal/mount.pyi

@@ -308,6 +308,22 @@ def _create_client_mount(): ...
 def create_client_mount(): ...
 def _get_client_mount(): ...
 def _is_modal_path(remote_path: pathlib.PurePosixPath): ...
+async def _create_single_mount(
+    client: modal.client._Client,
+    builder_version: str,
+    python_version: str,
+    platform: str,
+    arch: str,
+    uv_python_platform: str = None,
+    check_if_exists: bool = True,
+): ...
+async def _create_client_dependency_mounts(client=None, check_if_exists=True): ...
+
+class __create_client_dependency_mounts_spec(typing_extensions.Protocol):
+    def __call__(self, /, client=None, check_if_exists=True): ...
+    async def aio(self, /, client=None, check_if_exists=True): ...
+
+create_client_dependency_mounts: __create_client_dependency_mounts_spec
 
 ROOT_DIR: pathlib.PurePosixPath
 

{modal-1.0.3.dev14 → modal-1.0.3.dev21}/modal/runner.py

@@ -9,7 +9,6 @@ import dataclasses
 import os
 import time
 import typing
-import warnings
 from collections.abc import AsyncGenerator
 from multiprocessing.synchronize import Event
 from typing import TYPE_CHECKING, Any, Optional, TypeVar
@@ -296,12 +295,8 @@ async def _run_app(
 
     output_mgr = _get_output_manager()
     if interactive and output_mgr is None:
-        warnings.warn(
-            "Interactive mode is disabled because no output manager is active. "
-            "Use 'with modal.enable_output():' to enable interactive mode and see logs.",
-            stacklevel=2,
-        )
-        interactive = False
+        msg = "Interactive mode requires output to be enabled. (Use the the `modal.enable_output()` context manager.)"
+        raise InvalidError(msg)
 
     running_app: RunningApp = await _init_local_app_new(
         client,

{modal-1.0.3.dev14 → modal-1.0.3.dev21}/modal/volume.py

@@ -45,7 +45,6 @@ from ._utils.blob_utils import (
     BLOCK_SIZE,
     FileUploadSpec,
     FileUploadSpec2,
-    blob_iter,
     blob_upload_file,
     get_file_upload_spec_from_fileobj,
     get_file_upload_spec_from_path,
@@ -400,7 +399,7 @@ class _Volume(_Object, type_prefix="vo"):
         return [entry async for entry in self.iterdir(path, recursive=recursive)]
 
     @live_method_gen
-    def read_file(self, path: str) -> AsyncIterator[bytes]:
+    async def read_file(self, path: str) -> AsyncIterator[bytes]:
         """
         Read a file from the modal.Volume.
 
@@ -414,23 +413,6 @@ class _Volume(_Object, type_prefix="vo"):
         print(len(data))  # == 1024 * 1024
         ```
         """
-        return self._read_file1(path) if self._is_v1 else self._read_file2(path)
-
-    async def _read_file1(self, path: str) -> AsyncIterator[bytes]:
-        req = api_pb2.VolumeGetFileRequest(volume_id=self.object_id, path=path)
-        try:
-            response = await retry_transient_errors(self._client.stub.VolumeGetFile, req)
-        except GRPCError as exc:
-            raise FileNotFoundError(exc.message) if exc.status == Status.NOT_FOUND else exc
-        # TODO(Jonathon): use ranged requests.
-        if response.WhichOneof("data_oneof") == "data":
-            yield response.data
-            return
-        else:
-            async for data in blob_iter(response.data_blob_id, self._client.stub):
-                yield data
-
-    async def _read_file2(self, path: str) -> AsyncIterator[bytes]:
         req = api_pb2.VolumeGetFile2Request(volume_id=self.object_id, path=path)
 
         try:
@@ -461,36 +443,9 @@ class _Volume(_Object, type_prefix="vo"):
         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:
@@ -567,8 +522,12 @@ class _Volume(_Object, type_prefix="vo"):
         like `os.rename()` and then `commit()` the volume. The `copy_files()` method is useful when you don't have
         the volume mounted as a filesystem, e.g. when running a script on your local computer.
         """
-        request = api_pb2.VolumeCopyFilesRequest(volume_id=self.object_id, src_paths=src_paths, dst_path=dst_path)
-        await retry_transient_errors(self._client.stub.VolumeCopyFiles, request, base_delay=1)
+        if self._is_v1:
+            request = api_pb2.VolumeCopyFilesRequest(volume_id=self.object_id, src_paths=src_paths, dst_path=dst_path)
+            await retry_transient_errors(self._client.stub.VolumeCopyFiles, request, base_delay=1)
+        else:
+            request = api_pb2.VolumeCopyFiles2Request(volume_id=self.object_id, src_paths=src_paths, dst_path=dst_path)
+            await retry_transient_errors(self._client.stub.VolumeCopyFiles2, request, base_delay=1)
 
     @live_method
     async def batch_upload(self, force: bool = False) -> "_AbstractVolumeUploadContextManager":

{modal-1.0.3.dev14 → modal-1.0.3.dev21}/modal/volume.pyi

@@ -87,20 +87,12 @@ class _Volume(modal._object._Object):
     def iterdir(self, path: str, *, recursive: bool = True) -> collections.abc.AsyncIterator[FileEntry]: ...
     async def listdir(self, path: str, *, recursive: bool = False) -> list[FileEntry]: ...
     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: ...
@@ -236,18 +228,6 @@ class Volume(modal.object.Object):
 
     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]: ...
-
-    _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]: ...
-
-    _read_file2: ___read_file2_spec[typing_extensions.Self]
-
     class __read_file_into_fileobj_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self,
@@ -266,26 +246,6 @@ class Volume(modal.object.Object):
 
     read_file_into_fileobj: __read_file_into_fileobj_spec[typing_extensions.Self]
 
-    class ___read_file_into_fileobj1_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(
-            self, /, path: str, fileobj: typing.IO[bytes], progress_cb: collections.abc.Callable[..., typing.Any]
-        ) -> int: ...
-        async def aio(
-            self, /, path: str, fileobj: typing.IO[bytes], progress_cb: collections.abc.Callable[..., typing.Any]
-        ) -> int: ...
-
-    _read_file_into_fileobj1: ___read_file_into_fileobj1_spec[typing_extensions.Self]
-
-    class ___read_file_into_fileobj2_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(
-            self, /, path: str, fileobj: typing.IO[bytes], progress_cb: collections.abc.Callable[..., typing.Any]
-        ) -> int: ...
-        async def aio(
-            self, /, path: str, fileobj: typing.IO[bytes], progress_cb: collections.abc.Callable[..., typing.Any]
-        ) -> int: ...
-
-    _read_file_into_fileobj2: ___read_file_into_fileobj2_spec[typing_extensions.Self]
-
     class __remove_file_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, path: str, recursive: bool = False) -> None: ...
         async def aio(self, /, path: str, recursive: bool = False) -> None: ...

{modal-1.0.3.dev14 → modal-1.0.3.dev21}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.0.3.dev14
+Version: 1.0.3.dev21
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0

{modal-1.0.3.dev14 → modal-1.0.3.dev21}/modal_proto/api.proto

@@ -1957,11 +1957,11 @@ message ImageMetadata {
   // package name -> version. Empty if missing
   map<string, string> python_packages = 2;
 
-  // The working directory of the image, defaulting to "/". Not set if missing.
+  // The working directory of the image, as an absolute file path.
   //
-  // Note that this is NOT the actual working directory of the image, especially
-  // for runner tasks. Please see `ImageManifest.workdir` instead. This field
-  // should not be used in any future code.
+  // For most images, this is not set, which means to use the default workdir:
+  // - On function runners, the default is `/root` (home directory).
+  // - For image builds and sandbox environments, it is `/`.
   optional string workdir = 3;
 
   // The version of glibc in this image, if any.

{modal-1.0.3.dev14 → modal-1.0.3.dev21}/modal_proto/api_pb2.pyi

@@ -6313,11 +6313,11 @@ class ImageMetadata(google.protobuf.message.Message):
         package name -> version. Empty if missing
         """
     workdir: builtins.str
-    """The working directory of the image, defaulting to "/". Not set if missing.
+    """The working directory of the image, as an absolute file path.
 
-    Note that this is NOT the actual working directory of the image, especially
-    for runner tasks. Please see `ImageManifest.workdir` instead. This field
-    should not be used in any future code.
+    For most images, this is not set, which means to use the default workdir:
+    - On function runners, the default is `/root` (home directory).
+    - For image builds and sandbox environments, it is `/`.
     """
     libc_version_info: builtins.str
     """The version of glibc in this image, if any."""

{modal-1.0.3.dev14 → modal-1.0.3.dev21}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.0.3.dev14"
+__version__ = "1.0.3.dev21"