modAL 1.3.6.dev12__py3-none-any.whl → 1.3.6.dev13__py3-none-any.whl

modal/_functions.py

@@ -56,7 +56,7 @@ from ._utils.function_utils import (
     is_async,
 )
 from ._utils.grpc_utils import Retry, RetryWarningMessage
-from ._utils.mount_utils import validate_network_file_systems, validate_volumes
+from ._utils.mount_utils import validate_network_file_systems, validate_volumes, validate_volumes_by_object_id
 from .call_graph import InputInfo, _reconstruct_call_graph
 from .client import _Client
 from .cloud_bucket_mount import _CloudBucketMount, cloud_bucket_mounts_to_proto
@@ -966,6 +966,11 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                 if image._metadata is not None:
                     mount_client_dependencies = image._metadata.image_builder_version > "2024.10"
 
+                # Validate that the same volume (by object_id) isn't mounted at multiple paths
+                # This validation happens here (at load time) because volumes need to be hydrated
+                # to have their object_id set.
+                validate_volumes_by_object_id(validated_volumes_no_cloud_buckets)
+
                 # Relies on dicts being ordered (true as of Python 3.6).
                 volume_mounts = [
                     api_pb2.VolumeMount(
@@ -1235,6 +1240,9 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             assert parent is not None and parent.is_hydrated
 
             if options:
+                # Validate that the same volume (by object_id) isn't mounted at multiple paths
+                validate_volumes_by_object_id(options.validated_volumes)
+
                 volume_mounts = [
                     api_pb2.VolumeMount(
                         mount_path=path,

modal/_utils/mount_utils.py

@@ -101,3 +101,23 @@ def validate_only_modal_volumes(
         raise InvalidError(f"{caller_name} only supports volumes that are modal.Volume")
 
     return validated_volumes
+
+
+def validate_volumes_by_object_id(validated_volumes: Sequence[tuple[str, _Volume]]) -> None:
+    """Validate that the same volume (by object_id) is not mounted at multiple paths.
+
+    This validation happens at load time after volumes are hydrated and have object_ids.
+    """
+    object_id_to_paths: dict[str, list[str]] = {}
+    for path, volume in validated_volumes:
+        if not volume.is_hydrated:
+            # This should never happen since this function is only called at load time
+            raise RuntimeError(f"Internal error: Volume at '{path}' is not hydrated when validating mounts")
+        object_id_to_paths.setdefault(volume.object_id, []).append(path)
+
+    for object_id, paths in object_id_to_paths.items():
+        if len(paths) > 1:
+            conflicting = ", ".join(sorted(paths))
+            raise InvalidError(
+                f"The same Volume cannot be mounted in multiple locations for the same function: {conflicting}"
+            )

modal/cli/app.py

@@ -137,13 +137,14 @@ def logs(
         "--until",
         help="End of time range; accepts same argument types as --since",
     ),
+    tail: Optional[int] = typer.Option(None, "--tail", "-n", help="Show only the last N log entries"),
     search: Optional[str] = typer.Option(None, "--search", help="Filter by search text"),
     function_id: Optional[str] = typer.Option("", "--function", help="Filter by Function ID (fu-*)"),
     function_call_id: Optional[str] = typer.Option("", "--function-call", help="Filter by FunctionCall ID (fc-*)"),
+    container_id: Optional[str] = typer.Option("", "--container", help="Filter by Container ID (ta-*)"),
     source: Optional[str] = typer.Option(
         None, "--source", "-s", help="Filter by source: 'stdout', 'stderr', or 'system'"
     ),
-    tail: Optional[int] = typer.Option(None, "--tail", "-n", help="Show only the last N log entries"),
     timestamps: bool = typer.Option(False, "--timestamps", help="Prefix each line with its timestamp"),
     show_function_id: bool = typer.Option(False, "--show-function-id", help="Prefix each line with its Function ID"),
     show_function_call_id: bool = typer.Option(
@@ -236,12 +237,14 @@ def logs(
         source=source_fd,
         function_id=function_id or "",
         function_call_id=function_call_id or "",
+        task_id=container_id or "",
         search_text=search or "",
     )
 
     if follow:
         stream_app_logs(
             app_id,
+            task_id=container_id or "",
             show_timestamps=timestamps,
             follow=True,
             prefix_fields=prefix_fields,

modal/cli/container.py

@@ -1,15 +1,19 @@
 # Copyright Modal Labs 2022
+from datetime import datetime, timezone
 from typing import Optional, Union
 
 import typer
+from click import UsageError
 from rich.table import Column
 from rich.text import Text
 
+from modal._logs import _FETCH_LIMIT, _MAX_FETCH_RANGE, LogsFilters
 from modal._object import _get_environment_name
 from modal._output.pty import get_pty_info
 from modal._utils.async_utils import synchronizer
 from modal._utils.time_utils import timestamp_to_localized_str
-from modal.cli.utils import ENV_OPTION, display_table, is_tty, stream_app_logs
+from modal.cli.app import _DEFAULT_LOGS_TAIL, _SOURCE_OPTIONS, _parse_time_arg
+from modal.cli.utils import ENV_OPTION, display_table, fetch_app_logs, is_tty, stream_app_logs, tail_app_logs
 from modal.client import _Client
 from modal.config import config
 from modal.container_process import _ContainerProcess
@@ -53,13 +57,68 @@ async def list_(env: Optional[str] = ENV_OPTION, json: bool = False, app_id: str
     display_table(column_names, rows, json=json, title=f"Active Containers in environment: {environment_name}")
 
 
-@container_cli.command("logs")
-def logs(
+@container_cli.command("logs", no_args_is_help=True)
+@synchronizer.create_blocking
+async def logs(
     container_id: str = typer.Argument(help="Container ID"),
     follow: bool = typer.Option(False, "-f", "--follow", help="Stream log output until Container stops"),
-    timestamps: bool = typer.Option(False, "--timestamps", help="Show timestamps for each log line"),
+    all_logs: bool = typer.Option(False, "--all", help="Show all logs for the container"),
+    since: Optional[str] = typer.Option(
+        None,
+        "--since",
+        help=(
+            "Start of time range. Accepts ISO 8601 datetime or relative time, e.g. '1d' (1 day ago), '2h', '30m', etc."
+        ),
+    ),
+    until: Optional[str] = typer.Option(
+        None,
+        "--until",
+        help="End of time range; accepts same argument types as --since",
+    ),
+    tail: Optional[int] = typer.Option(None, "--tail", "-n", help="Show only the last N log entries"),
+    search: Optional[str] = typer.Option(None, "--search", help="Filter by search text"),
+    source: Optional[str] = typer.Option(
+        None, "--source", "-s", help="Filter by source: 'stdout', 'stderr', or 'system'"
+    ),
+    timestamps: bool = typer.Option(False, "--timestamps", help="Prefix each line with its timestamp"),
 ):
-    """Show logs for a specific container, streaming while active."""
+    """Fetch or stream logs for a specific container.
+
+    By default, this command fetches the last 100 log entries and exits. Use ``-f`` to
+    live-stream logs from a running container instead. Fetch and follow are mutually exclusive.
+
+    **Examples:**
+
+    Get recent logs for a container:
+
+    ```
+    modal container logs ta-123456
+    ```
+
+    Follow (stream) logs from a running container:
+
+    ```
+    modal container logs ta-123456 -f
+    ```
+
+    Fetch logs from the last 2 hours:
+
+    ```
+    modal container logs ta-123456 --since 2h
+    ```
+
+    Fetch logs in a specific time range:
+
+    ```
+    modal container logs ta-123456 --since 2026-03-01T05:00:00 --until 2026-03-01T08:00:00
+    ```
+
+    Fetch all container logs:
+
+    ```
+    modal container logs ta-123456 --all
+    ```
+    """
     task_id, sandbox_id = None, None
     if container_id.startswith("sb-"):
         sandbox_id = container_id
@@ -67,7 +126,95 @@ def logs(
         task_id = container_id
     else:
         raise InvalidError(f"Invalid container ID: {container_id}")
-    stream_app_logs(task_id=task_id, sandbox_id=sandbox_id, show_timestamps=timestamps, follow=follow)
+
+    if follow and (since or until or tail):
+        raise UsageError("--follow cannot be combined with --since, --until, or --tail.")
+
+    if tail is not None and tail <= 0:
+        raise UsageError("--tail value must be positive.")
+
+    if tail is not None and tail > _FETCH_LIMIT:
+        raise UsageError(f"--tail value must not exceed {_FETCH_LIMIT}.")
+
+    if all_logs and (since or until or tail):
+        raise UsageError("--all cannot be combined with --since, --until, or --tail.")
+
+    if all_logs and follow:
+        raise UsageError("--all cannot be combined with --follow.")
+
+    if source is not None:
+        if source not in _SOURCE_OPTIONS:
+            raise UsageError(f"Invalid source: '{source}'. Must be 'stdout', 'stderr', or 'system'.")
+        source_fd = _SOURCE_OPTIONS[source]
+    else:
+        source_fd = api_pb2.FILE_DESCRIPTOR_UNSPECIFIED
+
+    log_filters = LogsFilters(
+        source=source_fd,
+        task_id=task_id or "",
+        sandbox_id=sandbox_id or "",
+        search_text=search or "",
+    )
+
+    if follow:
+        await stream_app_logs.aio(
+            task_id=task_id,
+            sandbox_id=sandbox_id,
+            show_timestamps=timestamps,
+            follow=True,
+            filters=log_filters,
+        )
+    else:
+        # Resolve the app_id for the container.
+        client = await _Client.from_env()
+
+        if sandbox_id:
+            sb_resp = await client.stub.SandboxGetTaskId(api_pb2.SandboxGetTaskIdRequest(sandbox_id=sandbox_id))
+            task_id = sb_resp.task_id
+
+        task_info_resp = await client.stub.TaskGetInfo(api_pb2.TaskGetInfoRequest(task_id=task_id))
+        app_id = task_info_resp.app_id
+
+        now = datetime.now(timezone.utc)
+        if all_logs:
+            since_dt = datetime.fromtimestamp(task_info_resp.info.started_at, timezone.utc)
+            if task_info_resp.info.finished_at:
+                until_dt = datetime.fromtimestamp(task_info_resp.info.finished_at, timezone.utc)
+            else:
+                until_dt = now
+        else:
+            since_dt = _parse_time_arg(since, default=now) if since else None
+            until_dt = _parse_time_arg(until, default=now) if until else None
+
+        if since_dt is not None and until_dt is not None and since_dt >= until_dt:
+            raise UsageError("--since must be before --until.")
+
+        if since_dt is not None:
+            effective_until = until_dt or now
+            if effective_until - since_dt > _MAX_FETCH_RANGE:
+                raise UsageError(f"Log fetch time range cannot exceed {_MAX_FETCH_RANGE.days} days.")
+
+        if all_logs or (since and tail is None):
+            # Range mode: --since without --tail fetches everything in the range.
+            await fetch_app_logs.aio(
+                app_id,
+                since_dt,
+                until_dt or now,
+                show_timestamps=timestamps,
+                filters=log_filters,
+            )
+        else:
+            # Tail mode: single fetch with limit.
+            # --since is a hard floor, --until shifts the anchor.
+            effective_tail = tail if tail is not None else _DEFAULT_LOGS_TAIL
+            await tail_app_logs.aio(
+                app_id,
+                effective_tail,
+                show_timestamps=timestamps,
+                since=since_dt,
+                until=until_dt,
+                filters=log_filters,
+            )
 
 
 @container_cli.command("exec")

modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.3.6.dev12",
+        version: str = "1.3.6.dev13",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -171,7 +171,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.3.6.dev12",
+        version: str = "1.3.6.dev13",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

modal/functions.pyi

@@ -408,7 +408,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER:
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
@@ -417,7 +417,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -444,7 +444,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """[Experimental] Calls the function with the given arguments, without waiting for the results.
 
@@ -467,7 +467,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -475,7 +475,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """Calls the function with the given arguments, without waiting for the results.
 
@@ -496,7 +496,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

modal/image.py

@@ -40,7 +40,7 @@ from ._utils.docker_utils import (
     find_dockerignore_file,
 )
 from ._utils.function_utils import FunctionInfo
-from ._utils.mount_utils import validate_only_modal_volumes
+from ._utils.mount_utils import validate_only_modal_volumes, validate_volumes_by_object_id
 from .client import _Client
 from .cloud_bucket_mount import _CloudBucketMount
 from .config import config, logger, user_config_path
@@ -434,7 +434,7 @@ class _Image(_Object, type_prefix="im"):
         self._serve_mounts = other._serve_mounts
         self._deferred_mounts = other._deferred_mounts
         self._added_python_source_set = other._added_python_source_set
-        self._is_empty = other._is_empty
+        self._is_empty = False
 
     def _get_metadata(self) -> Optional[Message]:
         return self._metadata
@@ -626,6 +626,9 @@ class _Image(_Object, type_prefix="im"):
                 build_function_id = ""
                 _build_function = None
 
+            # Validate that the same volume (by object_id) isn't mounted at multiple paths
+            validate_volumes_by_object_id(validated_volumes)
+
             # Relies on dicts being ordered (true as of Python 3.6).
             volume_mounts = [
                 api_pb2.VolumeMount(
@@ -724,12 +727,6 @@ class _Image(_Object, type_prefix="im"):
         )
         return obj
 
-    @staticmethod
-    def _from_scratch() -> "_Image":
-        image = _Image.from_registry("scratch")
-        image._is_empty = True
-        return image
-
     def _copy_mount(self, mount: _Mount, remote_path: Union[str, Path] = ".") -> "_Image":
         """mdmd:hidden
         Internal
@@ -2179,6 +2176,36 @@ class _Image(_Object, type_prefix="im"):
             force_build=force_build,
         )
 
+    @staticmethod
+    def from_scratch(force_build: bool = False) -> "_Image":
+        """Create an empty Image, equivalent to `FROM scratch` in Docker.
+
+        The resulting Image has no operating system, shell, or package manager. It is
+        primarily useful as a lightweight filesystem to mount into a Sandbox via
+        `Sandbox.mount_image`.
+
+        Note that since this Image doesn't contain Python or other standard OS utilities,
+        higher-level Image build steps like `pip_install` cannot be chained onto it. It also
+        cannot be used for `modal.Function` execution, which requires a Python interpreter.
+
+        **Example**
+
+        ```python notest
+        image = modal.Image.from_scratch().add_local_file(local_path, "/bin/my_binary", copy=True)
+        ```
+        """
+
+        def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
+            return DockerfileSpec(commands=["FROM scratch"], context_files={})
+
+        image = _Image._from_args(
+            dockerfile_function=build_dockerfile,
+            force_build=force_build,
+            _namespace=api_pb2.DEPLOYMENT_NAMESPACE_GLOBAL,
+        )
+        image._is_empty = True
+        return image
+
     @staticmethod
     def debian_slim(python_version: Optional[str] = None, force_build: bool = False) -> "_Image":
         """Default image, based on the official `python` Docker images."""

modal/image.pyi

@@ -187,8 +187,6 @@ class _Image(modal._object._Object):
         _namespace: int = 1,
         _do_assert_no_mount_layers: bool = True,
     ): ...
-    @staticmethod
-    def _from_scratch() -> _Image: ...
     def _copy_mount(self, mount: modal.mount._Mount, remote_path: typing.Union[str, pathlib.Path] = ".") -> _Image:
         """mdmd:hidden
         Internal
@@ -901,6 +899,26 @@ class _Image(modal._object._Object):
         """
         ...
 
+    @staticmethod
+    def from_scratch(force_build: bool = False) -> _Image:
+        """Create an empty Image, equivalent to `FROM scratch` in Docker.
+
+        The resulting Image has no operating system, shell, or package manager. It is
+        primarily useful as a lightweight filesystem to mount into a Sandbox via
+        `Sandbox.mount_image`.
+
+        Note that since this Image doesn't contain Python or other standard OS utilities,
+        higher-level Image build steps like `pip_install` cannot be chained onto it. It also
+        cannot be used for `modal.Function` execution, which requires a Python interpreter.
+
+        **Example**
+
+        ```python notest
+        image = modal.Image.from_scratch().add_local_file(local_path, "/bin/my_binary", copy=True)
+        ```
+        """
+        ...
+
     @staticmethod
     def debian_slim(python_version: typing.Optional[str] = None, force_build: bool = False) -> _Image:
         """Default image, based on the official `python` Docker images."""
@@ -1109,8 +1127,6 @@ class Image(modal.object.Object):
         _namespace: int = 1,
         _do_assert_no_mount_layers: bool = True,
     ): ...
-    @staticmethod
-    def _from_scratch() -> Image: ...
     def _copy_mount(self, mount: modal.mount.Mount, remote_path: typing.Union[str, pathlib.Path] = ".") -> Image:
         """mdmd:hidden
         Internal
@@ -1879,6 +1895,26 @@ class Image(modal.object.Object):
         """
         ...
 
+    @staticmethod
+    def from_scratch(force_build: bool = False) -> Image:
+        """Create an empty Image, equivalent to `FROM scratch` in Docker.
+
+        The resulting Image has no operating system, shell, or package manager. It is
+        primarily useful as a lightweight filesystem to mount into a Sandbox via
+        `Sandbox.mount_image`.
+
+        Note that since this Image doesn't contain Python or other standard OS utilities,
+        higher-level Image build steps like `pip_install` cannot be chained onto it. It also
+        cannot be used for `modal.Function` execution, which requires a Python interpreter.
+
+        **Example**
+
+        ```python notest
+        image = modal.Image.from_scratch().add_local_file(local_path, "/bin/my_binary", copy=True)
+        ```
+        """
+        ...
+
     @staticmethod
     def debian_slim(python_version: typing.Optional[str] = None, force_build: bool = False) -> Image:
         """Default image, based on the official `python` Docker images."""

modal/runner.py

@@ -214,23 +214,32 @@ async def _stop_and_wait_for_containers(
             if container.enqueued_at and container.enqueued_at < deployed_at
         ]
 
+    stopped_ids = set()
+
     async def stop_containers(container_ids: list[str]):
         sem = asyncio.Semaphore(32)
 
         async def stop_one_container(tid: str):
+            if tid in stopped_ids:
+                return
+
             async with sem:
                 await client.stub.ContainerStop(api_pb2.ContainerStopRequest(task_id=tid))
+                stopped_ids.add(tid)
 
-        results = await asyncio.gather(*[stop_one_container(tid) for tid in container_ids], return_exceptions=True)
+        stop_tasks = [stop_one_container(tid) for tid in container_ids if tid not in stopped_ids]
+        if not stop_tasks:
+            return
+
+        results = await asyncio.gather(*stop_tasks, return_exceptions=True)
         exceptions = [r for r in results if isinstance(r, BaseException)]
         if exceptions:
             raise exceptions[0]
 
-    async def poll_until_stopped(initial_ids: list[str]):
-        await stop_containers(initial_ids)
-        await asyncio.sleep(WAIT_FOR_CONTAINER_STOP_SLEEP_INTERVAL)
-
+    async def poll_until_stopped():
         while ids := await get_old_container_ids():
+            # Just in case there are new ids from `get_old_container_ids`, we call `stop_containers` again,
+            # which will no-op for containers that was already stopped.
             await stop_containers(ids)
             await asyncio.sleep(WAIT_FOR_CONTAINER_STOP_SLEEP_INTERVAL)
 
@@ -239,12 +248,13 @@ async def _stop_and_wait_for_containers(
         return
 
     output = OutputManager.get()
-    output.print("♻️ Restarting containers...")
+    output.print("🧹 Terminating running containers")
+    await stop_containers(ids)
 
     try:
-        await asyncio.wait_for(poll_until_stopped(ids), timeout=WAIT_FOR_CONTAINER_STOP_TIMEOUT)
+        await asyncio.wait_for(poll_until_stopped(), timeout=WAIT_FOR_CONTAINER_STOP_TIMEOUT)
     except asyncio.TimeoutError:
-        raise asyncio.TimeoutError(f"Containers did not restart in under {WAIT_FOR_CONTAINER_STOP_TIMEOUT} seconds.")
+        raise asyncio.TimeoutError(f"Containers did not terminate in under {WAIT_FOR_CONTAINER_STOP_TIMEOUT} seconds.")
 
 
 def _validate_deployment_strategy(strategy: str) -> DEPLOYMENT_STRATEGY_TYPE:
@@ -294,7 +304,7 @@ async def _publish_app(
             )
         except Exception as exc:
             warnings.warn(
-                f"App updated successfully, but containers did not all restart. {exc}",
+                f"App updated successfully, but containers did not all terminate. {exc}",
                 UserWarning,
             )
 

modal/sandbox.py

@@ -30,7 +30,7 @@ from ._resolver import Resolver
 from ._resources import convert_fn_config_to_resources_config
 from ._utils.async_utils import TaskContext, synchronize_api
 from ._utils.deprecation import deprecation_warning
-from ._utils.mount_utils import validate_network_file_systems, validate_volumes
+from ._utils.mount_utils import validate_network_file_systems, validate_volumes, validate_volumes_by_object_id
 from ._utils.name_utils import check_object_name
 from ._utils.task_command_router_client import TaskCommandRouterClient
 from .client import _Client
@@ -214,6 +214,9 @@ class _Sandbox(_Object, type_prefix="sb"):
         async def _load(
             self: _Sandbox, resolver: Resolver, load_context: LoadContext, _existing_object_id: Optional[str]
         ):
+            # Validate that the same volume (by object_id) isn't mounted at multiple paths
+            validate_volumes_by_object_id(validated_volumes)
+
             # Relies on dicts being ordered (true as of Python 3.6).
             volume_mounts = [
                 api_pb2.VolumeMount(
@@ -739,7 +742,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             "The `Sandbox._experimental_mount_image()` method is deprecated. Use `Sandbox.mount_image()` instead.",
         )
         if image is None:
-            image = _Image._from_scratch()
+            image = _Image.from_scratch()
         await self.mount_image(path, image)
 
     async def snapshot_directory(self, path: Union[PurePosixPath, str]) -> _Image:

{modal-1.3.6.dev12.dist-info → modal-1.3.6.dev13.dist-info}/METADATA

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

{modal-1.3.6.dev12.dist-info → modal-1.3.6.dev13.dist-info}/RECORD

@@ -4,7 +4,7 @@ modal/_billing.py,sha256=ujSuVts2qikBRazQ9oTkUv5oqhBBQ10phW3mzQdyldw,3906
 modal/_clustered_functions.py,sha256=7amiOxErtlciWeBJBL2KvaxerUomJpTAJ3qElflFHQA,2884
 modal/_clustered_functions.pyi,sha256=JmYwAGOLEnD5AF-gYF9O5tu-SgGjeoJz-X1j48b1Ijg,1157
 modal/_container_entrypoint.py,sha256=cD5XFxcqeja2dH1kRDlAWsCNyeYF5aq2CyekZ3CnTH4,20405
-modal/_functions.py,sha256=juzmU6p93rMXqdU3TazPgQZhh-jxeBo30E2AQnq4Ezs,92286
+modal/_functions.py,sha256=O0-yQJM3rTBcCIf9OfuufjvF7dTDTOs0_wHH8AbhC5s,92809
 modal/_grpc_client.py,sha256=G8gWQXChtsuRgyXK9kcPiPNYXOYbl_m9Bz2AVBJb-zs,6924
 modal/_ipython.py,sha256=Bu9fc3hm3xt2O47qLe_d-Mu2jS81LwMsmXNJ1sawBA0,575
 modal/_load_context.py,sha256=DvfOWNTevEmHqdlu0-AeO_03JChrmAjoupgppPVW2Pc,4867
@@ -26,7 +26,7 @@ modal/app.pyi,sha256=8lv2eLKP-y3BLT1irRnzdULSD45OgU4_VbCIYEy_Ic0,56387
 modal/billing.py,sha256=B2zXa7KeMnpqi2AQINycEk-KSXVYaLTTTAQTtuf2Gfs,257
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=-IxazxLhdkNFAHS2AP2FpyTVpCDVR58RF6ecSVV59r0,14862
-modal/client.pyi,sha256=f5Fju-mKirXHYmQrauF9QQhFP7GteEosGUt4Aba7U3A,14932
+modal/client.pyi,sha256=-6kMEK4jyCLrMN-Yvv7YlQk6r7vF1P6XdGA9jykXwlI,14932
 modal/cloud_bucket_mount.py,sha256=KkaJVy5vpO_u2NtDYtv1JM-M3y4J0UtWBapTDKpQRcA,6034
 modal/cloud_bucket_mount.pyi,sha256=mGDeEd1XvxGpCE6O5jRBSfIvMXvZ5AtIybea5k-0w9w,7560
 modal/cls.py,sha256=ozx5ZVGyG6w5SQ1ouj9Y6M3yPtnpL9PfblnmqFzf694,42338
@@ -43,10 +43,10 @@ modal/file_io.py,sha256=AKTaKR4y2JO1vsmJ8tRxMhgJtHmtb-TCe1ZZYDte-w4,22221
 modal/file_io.pyi,sha256=DPaq0BhySaiCX3g56QHhyIMdU1izbfWsjpSp30JoJUU,15745
 modal/file_pattern_matcher.py,sha256=A_Kdkej6q7YQyhM_2-BvpFmPqJ0oHb54B6yf9VqvPVE,8116
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
-modal/functions.pyi,sha256=jnC5QZvfs_yPPwXmEoHO16xUXzX448aP6eWawVmeGko,36498
+modal/functions.pyi,sha256=mwwTcswVuCRQeVJhqiBHCbVqKieOKH3z_cIca1NIQBk,36498
 modal/gpu.py,sha256=JW8C1hIObmXGduXWyJZysvAsLxyBEiaCmtnUAGFqh-8,6852
-modal/image.py,sha256=zgCZy0OZz010fRdlzOscD-cTbC-cCTT7mRWaANJRW7Y,109360
-modal/image.pyi,sha256=QAY8F2e2kkfQHOQnT2t4B1I-VbzvbNjksJHivx-ZA4k,78536
+modal/image.py,sha256=N72PQHR_kHCw1KzW8TAMdLAluMNn5YMtm97v-RT9fGg,110580
+modal/image.pyi,sha256=q7HEKNQPwfpIbriN_I3NmFqNucvgwMI8BKePL2rmqbk,80040
 modal/io_streams.py,sha256=JcYbvvjMZFugv53yHc9Id0N4nIvDMwV63ZtnN1bPmZc,30940
 modal/io_streams.pyi,sha256=aBxCcbHTprL08FLvPlkzu4bypCTT7xUdelNe5kc7OZY,18506
 modal/mount.py,sha256=Y_Sw7eJYgJc4Qf_AVq0s_Ltg8hJa5M4oaU5M2KUOWw0,34057
@@ -66,10 +66,10 @@ modal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal/queue.py,sha256=RxcNKyZZZHa14zUmqfGdBr2Y4dbrzXdkxk_tMF89LaA,27381
 modal/queue.pyi,sha256=sYwPa0iok8zk2GEN8X_HH6fQt-vfHbT1SDp2n6uR0_Q,40276
 modal/retries.py,sha256=vPWWKP-FRolJwTBuLPXdWqHV7aJfSQFgEW7vhlBBXRQ,5067
-modal/runner.py,sha256=rz3th7ZtN-UlUe7RO38J89gg4XtFlbBrSq4cOGIl1Eg,29594
+modal/runner.py,sha256=vDw9nFvv5sOV9N_f2fTCtT3x1wGGHZecNcY3A-jbhbc,29902
 modal/runner.pyi,sha256=UgV8jEjoRgnIowZHnOWrbGjZFsLCDm6D-4gpf77H4so,9517
 modal/running_app.py,sha256=v61mapYNV1-O-Uaho5EfJlryMLvIT9We0amUOSvSGx8,1188
-modal/sandbox.py,sha256=lJlx5FHait0BYB2anXc0ciiy78NwAWwKYszQdA6jXhA,67572
+modal/sandbox.py,sha256=jzNmP33tuGHS_GTFu1L7gbkBAy81rzE8Pugt0ZVX020,67755
 modal/sandbox.pyi,sha256=MLPfBwHxg6EpplMjky44lhNPDb0HDFxBuImJleTJvqU,76610
 modal/sandbox_fs.py,sha256=mEgfFKGgLFO7Ncvw_iQc54htHZ66E1i56ADNnXj9NHQ,13080
 modal/sandbox_fs.pyi,sha256=qr3PWlWwHqKRa_fPe9aI2ecj-iNF-NKY52GaL_MXc1U,21245
@@ -120,7 +120,7 @@ modal/_utils/hash_utils.py,sha256=zg3J6OGxTFGSFri1qQ12giDz90lWk8bzaxCTUCRtiX4,30
 modal/_utils/http_utils.py,sha256=yeTFsXYr0rYMEhB7vBP7audG9Uc7OLhzKBANFDZWVt0,2451
 modal/_utils/jwt_utils.py,sha256=fxH9plyrbAemTbjSsQtzIdDXE9QXxvMC4DiUZ16G0aA,1360
 modal/_utils/logger.py,sha256=NgbMKFT9chYYt_TU01DdIior5ByYr2gZtrWIk1SFRLc,1782
-modal/_utils/mount_utils.py,sha256=3v6wbSvEjOhIlnLGbyXKOzdoXaG-FwNAZ_Rr0io_v2o,4113
+modal/_utils/mount_utils.py,sha256=YlWhO_aaQjl_yDK-Fo0dzbGQav5-tHL1H5FDEIT9bxo,5082
 modal/_utils/name_utils.py,sha256=CIQL0Y4z47tq0rfNL2Kdo5dxsGrxoN2hR9Ko0HapeE4,2517
 modal/_utils/package_utils.py,sha256=jYE7WFVzYWIfO0ZJhno_BYHb6Skp48uupOiw1a3yWzw,2056
 modal/_utils/pattern_utils.py,sha256=ZUffaECfe2iYBhH6cvCB-0-UWhmEBTZEl_TwG_So3ag,6714
@@ -145,12 +145,12 @@ modal/builder/base-images.json,sha256=9zgY2-a2U_iEBBe60VNLQvErJQosRhQuXXRqcG6mHG
 modal/cli/__init__.py,sha256=6FRleWQxBDT19y7OayO4lBOzuL6Bs9r0rLINYYYbHwQ,769
 modal/cli/_download.py,sha256=5PQL3tkTJkG-Wb6I0vxfHY4L8kUzd4Fy83jlT6vh9Og,5062
 modal/cli/_traceback.py,sha256=fkqKcf4a6sBonha32NmBqGu5G_wqUVNBDpCcY94Hro0,6006
-modal/cli/app.py,sha256=3EZ4PgevioGq9ZvKLya2tKyCKiYS0Bv0kedrGlVW0-g,14958
+modal/cli/app.py,sha256=D2MK3FHZ9fqoiNWSiYr-TZid-MJQiNIOVnrnr0Kbx7U,15139
 modal/cli/billing.py,sha256=9Gj1H_Y8ziRAupJj90XhnPOw6nBMQfGU_Ys_ImheLYk,5690
 modal/cli/changelog.py,sha256=Ilzy1_3xF3y49w-_nwQkEVjoCupwdht7UuBrfV53nT0,5686
 modal/cli/cluster.py,sha256=FdCe4a0I_o9dT6Vi3r3k-19D64fOGEWFaPYFvBlnTBE,3337
 modal/cli/config.py,sha256=qPgj9qhQNClttO9DZEBYYxCmkaHv0WCP8O75u5eqZlY,1704
-modal/cli/container.py,sha256=dMRPltGRGaikdMPJZCO4qxlX26_62h2d-sglPe63R5I,4442
+modal/cli/container.py,sha256=bGwULuB-pE3oh5HzgQosjUtEfC2OH9ELR9NAuU2AgIk,9577
 modal/cli/dashboard.py,sha256=MJdbZq1duj97Hu3p9NNLrPogC1Wm2wL3dmCjBUgrMtU,862
 modal/cli/dict.py,sha256=uRny4LtN7ej7ONir1cpSLGAC-gvZrIGO8bftbCeK0VE,4743
 modal/cli/entry_point.py,sha256=cHAYqz4E9iXahyHvt29BzcmoYkpyGU3u3MbDVifniwk,6249
@@ -174,7 +174,7 @@ modal/experimental/__init__.py,sha256=4UyAPlExXYM0tJH7s6WSDt2dIfSVXvzARkRLsLMyuq
 modal/experimental/flash.py,sha256=ATGhVO8AleJ-TOe2PGolI5T7zfCEtj0kl_ivMPp7Rqg,33362
 modal/experimental/flash.pyi,sha256=R4h2nQl7-oiwqq_twCp0YqID_LnPjPGqxywXvxbiLIk,17011
 modal/experimental/ipython.py,sha256=TrCfmol9LGsRZMeDoeMPx3Hv3BFqQhYnmD_iH0pqdhk,2904
-modal-1.3.6.dev12.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.3.6.dev13.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=5sVABw4uGUqPXjcWT0Nqjkpe5KLs89C3tFnla58-D0M,3756
 modal_docs/gen_cli_docs_main.py,sha256=UPGr7O1DYTIRLwfINe2rbdh89J3cPVTU1OWL-SjxnOQ,198
@@ -196,10 +196,10 @@ modal_proto/task_command_router_pb2.py,sha256=uSSR8Y9Yp07cIL60ds7__wUr5rj1uL2CQY
 modal_proto/task_command_router_pb2.pyi,sha256=utNwipYgMZUEUuWBE7sJ5cNjRctozHKPKDRpLy6cPLM,25667
 modal_proto/task_command_router_pb2_grpc.py,sha256=YoinPeLc-uwFShig8gE0MluOi6n-qqJZQ3YvnKwKUz8,23194
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=VUSE5l1O6ATPT8Wbj4M3faMiIy5vFxSoS5ZlKfTEpHc,7449
-modal_version/__init__.py,sha256=NYnGiCe6TFhoL1ngWeaC0j7hNmNeFlPTTmxAfDtwsXQ,121
+modal_version/__init__.py,sha256=qjwicXs0jR9gtQzauLjnL8jebul6ZJWtyzVAiFwIZmw,121
 modal_version/__main__.py,sha256=nLUbubxKx7GXNzJIkTB7M7_u8080LyLM0IS0rzFkC_c,119
-modal-1.3.6.dev12.dist-info/METADATA,sha256=1uCjdmSM9R-eB6PM3luI4zkGKpphklhATvXPDVbk_zw,2365
-modal-1.3.6.dev12.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.3.6.dev12.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.3.6.dev12.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.3.6.dev12.dist-info/RECORD,,
+modal-1.3.6.dev13.dist-info/METADATA,sha256=VWl0_UTcy4bxRBAmHeszIJ30t-UEhxhGoN4ewdJrKxo,2365
+modal-1.3.6.dev13.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.3.6.dev13.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.3.6.dev13.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.3.6.dev13.dist-info/RECORD,,

modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2026
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.3.6.dev12"
+__version__ = "1.3.6.dev13"