modal 1.6.2.dev11__tar.gz → 1.6.2.dev13__tar.gz

{modal-1.6.2.dev11 → modal-1.6.2.dev13}/PKG-INFO

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

{modal-1.6.2.dev11 → modal-1.6.2.dev13}/modal/app.py

@@ -1358,7 +1358,7 @@ class _App:
                 fractional, e.g. 1.5 to target three concurrent requests per two containers.
             max_concurrency:
                 Maximum number of concurrent requests per container. Requests above this limit
-                receive a 503 response. If set to 0 or unset, request concurrency is unlimited.
+                receive a 429 response. If set to 0 or unset, request concurrency is unlimited.
             min_containers: Minimum number of containers to keep running regardless of demand.
             max_containers: Limit on the number of containers that can be concurrently running.
             buffer_containers: Extra containers to scale up beyond current demand.

{modal-1.6.2.dev11 → modal-1.6.2.dev13}/modal/app.pyi

@@ -799,7 +799,7 @@ class _App:
                 fractional, e.g. 1.5 to target three concurrent requests per two containers.
             max_concurrency:
                 Maximum number of concurrent requests per container. Requests above this limit
-                receive a 503 response. If set to 0 or unset, request concurrency is unlimited.
+                receive a 429 response. If set to 0 or unset, request concurrency is unlimited.
             min_containers: Minimum number of containers to keep running regardless of demand.
             max_containers: Limit on the number of containers that can be concurrently running.
             buffer_containers: Extra containers to scale up beyond current demand.
@@ -1837,7 +1837,7 @@ class App:
                 fractional, e.g. 1.5 to target three concurrent requests per two containers.
             max_concurrency:
                 Maximum number of concurrent requests per container. Requests above this limit
-                receive a 503 response. If set to 0 or unset, request concurrency is unlimited.
+                receive a 429 response. If set to 0 or unset, request concurrency is unlimited.
             min_containers: Minimum number of containers to keep running regardless of demand.
             max_containers: Limit on the number of containers that can be concurrently running.
             buffer_containers: Extra containers to scale up beyond current demand.

{modal-1.6.2.dev11 → modal-1.6.2.dev13}/modal/cli/dict.py

@@ -8,7 +8,7 @@ from modal._load_context import LoadContext
 from modal._resolver import Resolver
 from modal._utils.async_utils import TaskContext, synchronizer
 from modal._utils.time_utils import timestamp_to_localized_str
-from modal.cli.utils import display_table, env_option, yes_option
+from modal.cli.utils import confirm_or_suggest_yes, display_table, env_option, yes_option
 from modal.client import _Client
 from modal.dict import _Dict
 from modal.output import OutputManager
@@ -64,10 +64,8 @@ async def clear(name: str, *, yes: bool = False, env: str | None = None):
     """Clear the contents of a named Dict by deleting all of its data."""
     d = _Dict.from_name(name, environment_name=env)
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want to irrevocably delete the contents of modal.Dict '{name}'?",
-            default=False,
-            abort=True,
         )
     await d.clear()
 
@@ -87,10 +85,8 @@ async def delete(
 ):
     """Delete a named Dict and all of its data."""
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want to irrevocably delete the modal.Dict '{name}'?",
-            default=False,
-            abort=True,
         )
     await _Dict.objects.delete(name, environment_name=env, allow_missing=allow_missing)
 

{modal-1.6.2.dev11 → modal-1.6.2.dev13}/modal/cli/function.py

@@ -7,7 +7,8 @@ from typing import Any, AsyncGenerator, Sequence, cast
 
 import click
 from click import UsageError
-from rich.box import SIMPLE
+from rich.box import SIMPLE, SIMPLE_HEAD
+from rich.style import Style
 from rich.table import Column, Table
 from rich.text import Text
 
@@ -212,18 +213,20 @@ async def info(
     enabled = "Enabled"
     disabled = "Disabled"
 
-    rows: list[str | Text | tuple[str | Text, str | Text]] = []
+    rows: list[str | Text | tuple[str | Text, str | Text] | None] = []
 
     if function_proto.is_class:
-        rows.append(("Cls Name:", function_proto.function_name))
+        rows.append((Text("Cls Name:", style="bold"), function_proto.function_name))
     else:
-        rows.append(("Function Name:", function_proto.function_name))
+        rows.append((Text("Function Name:", style="bold"), function_proto.function_name))
 
-    rows.append(("Object ID:", f.object_id))
-    rows.append(("App ID:", handle_metadata.app_id))
-    rows.append(("Image ID:", str(info.image_info.image_id)))
+    rows.append(None)
+    rows.append((Text("Object ID:", style="bold"), f.object_id))
+    rows.append((Text("App ID:", style="bold"), handle_metadata.app_id))
+    rows.append((Text("Image ID:", style="bold"), str(info.image_info.image_id)))
 
     # --- Resources ---
+    rows.append(None)
     rows.append("Resources:")
     rows.append(
         (
@@ -261,6 +264,7 @@ async def info(
     )
 
     # --- Autoscaling ---
+    rows.append(None)
     rows.append("Autoscaling:")
     rows.append(
         (
@@ -289,6 +293,7 @@ async def info(
         )
     )
 
+    rows.append(None)
     rows.append("Execution:")
     if info.startup_timeout:
         rows.append(("  Startup Timeout:", f"{info.startup_timeout} seconds"))
@@ -297,6 +302,7 @@ async def info(
     rows.append(("  Max Retries:", not_configured if info.max_retries is None else str(info.max_retries)))
 
     if info.concurrency_info:
+        rows.append(None)
         rows.append("Concurrency:")
         rows.append(("  Max Inputs:", str(info.concurrency_info.max_inputs)))
         rows.append(
@@ -309,11 +315,13 @@ async def info(
         )
 
     if info.batching_info:
+        rows.append(None)
         rows.append("Batching:")
         rows.append(("  Max Batch Size:", str(info.batching_info.max_batch_size)))
         rows.append(("  Wait Time:", f"{info.batching_info.wait_ms} milliseconds"))
 
     # --- Scheduling ---
+    rows.append(None)
     rows.append("Scheduling:")
     rows.append(("  Compute Region(s):", not_configured if not info.regions else " | ".join(info.regions)))
     rows.append(("  Nonpreemptible Capacity:", not_configured if not info.nonpreemptible else enabled))
@@ -322,6 +330,7 @@ async def info(
     rows.append(("  Routing Region:", not_configured if not info.routing_region else info.routing_region))
 
     if info.cluster_info:
+        rows.append(None)
         rows.append("Clustering:")
         rows.append(("  Cluster Size:", str(info.cluster_info.size)))
         rows.append(("  RDMA:", enabled if info.cluster_info.rdma else disabled))
@@ -329,8 +338,10 @@ async def info(
             rows.append(("  Fabric Size:", str(info.cluster_info.fabric_size)))
 
     if info.schedule is not None:
+        rows.append(None)
         rows.append(("Schedule:", info.schedule))
 
+    rows.append(None)
     rows.append("Security:")
     rows.append(("  Outbound Networking:", disabled if info.block_network else enabled))
     rows.append(("  Modal API Access:", disabled if info.restrict_modal_access else enabled))
@@ -338,6 +349,7 @@ async def info(
 
     # --- Web Functions ---
     if info.web_info is not None:
+        rows.append(None)
         rows.append("Web Info:")
 
         if info.web_info.web_url:
@@ -345,7 +357,9 @@ async def info(
             if info.web_info.method:
                 url_str = f"  URL ({info.web_info.method}):"
 
-            rows.append((url_str, info.web_info.web_url))
+            url_text = Text(info.web_info.web_url, overflow="fold")
+            url_text.stylize(style=Style(link=info.web_info.web_url), end=len(info.web_info.web_url))
+            rows.append((url_str, url_text))
 
         rows.append(("  Authentication:", disabled if info.web_info.unauthenticated else enabled))
 
@@ -353,6 +367,7 @@ async def info(
     if info.method_names is not None:
         assert info.method_details is not None
 
+        rows.append(None)
         rows.append("Methods:")
 
         for method_name in info.method_names:
@@ -368,10 +383,14 @@ async def info(
                 if web_info.method:
                     url_str = f"    URL ({web_info.method}):"
 
-                rows.append((url_str, web_info.web_url))
+                url_text = Text(web_info.web_url, overflow="fold")
+                url_text.stylize(style=Style(link=web_info.web_url), end=len(web_info.web_url))
+
+                rows.append((url_str, url_text))
 
     # --- Mounts ---
     if info.volumes:
+        rows.append(None)
         rows.append("Volume Mounts:")
         for mount_path, volume in info.volumes.items():
             assert volume.volume_id is not None
@@ -390,6 +409,7 @@ async def info(
             rows.append((f"  {mount_path}", volume_text))
 
     if info.cloud_bucket_mounts:
+        rows.append(None)
         rows.append("Cloud Bucket Mounts:")
         for mount_path, cbm in info.cloud_bucket_mounts.items():
             extra = []
@@ -407,6 +427,7 @@ async def info(
 
     # --- Secrets ---
     if info.secrets:
+        rows.append(None)
         rows.append("Secrets:")
 
         async def _hydrate(secret_id: str) -> tuple[str, _Secret | None]:
@@ -446,18 +467,20 @@ async def info(
 
             rows.append((f"  {secret_identifier}", ", ".join(display_keys)))
 
+    t = Table(box=SIMPLE_HEAD, show_header=False)
     for row in rows:
-        t = Table().grid(padding=(0, 0, 3, 3), expand=True)
+        if row is None:
+            t.add_row()
+            continue
 
         if not isinstance(row, tuple):
             if isinstance(row, str):
-                row = Text(row)
+                row = Text(row, style="bold")
 
             if not tty:
                 output_manager.print(row)
             else:
                 t.add_row(row)
-                output_manager.print(t)
 
             continue
 
@@ -470,9 +493,11 @@ async def info(
         if isinstance(left, str):
             left = Text(left, overflow="fold")
         if isinstance(right, str):
-            right = Text(right, overflow="fold", justify="right")
+            right = Text(right, overflow="fold")
 
         t.add_row(left, right)
+
+    if tty:
         output_manager.print(t)
 
 

{modal-1.6.2.dev11 → modal-1.6.2.dev13}/modal/cli/import_refs.py

@@ -15,6 +15,7 @@ import inspect
 import shutil
 import sys
 import tempfile
+import types
 import typing
 from collections import defaultdict
 from dataclasses import dataclass
@@ -177,6 +178,41 @@ class AutoRunPriority:
     APP_FUNCTION = 3
 
 
+_LazyImportType = getattr(types, "LazyImportType", None)  # Python 3.15+ (PEP 810)
+
+_MAX_LISTED_LAZY_IMPORTS = 10
+
+
+def _is_lazy_import(module: types.ModuleType, name: str) -> bool:
+    return _LazyImportType is not None and isinstance(vars(module).get(name), _LazyImportType)
+
+
+def _check_not_lazy_import(module: types.ModuleType, name: str, import_ref: ImportRef) -> None:
+    if _is_lazy_import(module, name):
+        raise InvalidError(
+            f"'{name}' is imported lazily in '{import_ref.file_or_module}'. Modal Apps, Functions, and Classes "
+            "can't be imported lazily; change it to a regular import."
+        )
+
+
+def _get_module_members(module: types.ModuleType) -> tuple[dict[str, typing.Any], list[str]]:
+    """Like `dict(inspect.getmembers(module))`, but skips lazy imports instead of resolving them.
+
+    Returns the members and the names of the skipped lazy imports.
+    """
+    members = {}
+    lazy_imports = []
+    for name in dir(module):
+        if _is_lazy_import(module, name):
+            lazy_imports.append(name)
+            continue
+        try:
+            members[name] = getattr(module, name)
+        except AttributeError:
+            continue  # matches inspect.getmembers
+    return members, lazy_imports
+
+
 def list_cli_commands(
     module_members: dict[str, typing.Any],
     include_service_functions: bool = False,
@@ -308,6 +344,7 @@ def import_app_from_ref(import_ref: ImportRef, base_cmd: str = "") -> App:
     if "." in object_path:
         raise click.UsageError(f"{object_path} is not a Modal App")
 
+    _check_not_lazy_import(module, object_path, import_ref)
     app = getattr(module, object_path)
 
     if app is None:
@@ -385,9 +422,9 @@ def import_and_filter(
     accept_webhook=False,
     accept_service_functions=False,
     allow_stdin=False,
-) -> tuple[Runnable | None, list[CLICommand]]:
-    """Takes a function ref string and returns a single determined "runnable" to use, and a list of all available
-    runnables.
+) -> tuple[Runnable | None, list[CLICommand], list[str]]:
+    """Takes a function ref string and returns a single determined "runnable" to use, a list of all available
+    runnables, and the names of the lazy imports that were not searched for runnables.
 
     The function ref can leave out partial information (apart from the file name/module)
     as long as the runnable is uniquely identifiable by the provided information.
@@ -401,8 +438,10 @@ def import_and_filter(
     """
     # all commands:
     module = import_file_or_module(import_ref, base_cmd, allow_stdin=allow_stdin)
+    _check_not_lazy_import(module, import_ref.object_path.split(".", 1)[0], import_ref)
+    module_members, lazy_imports = _get_module_members(module)
     cli_commands = list_cli_commands(
-        dict(inspect.getmembers(module)),
+        module_members,
         include_service_functions=accept_service_functions,
     )
 
@@ -413,10 +452,22 @@ def import_and_filter(
 
     if inferred_runnable:
         # if there is a single command with "highest run prio" - use that
-        return inferred_runnable, all_usable_commands
+        return inferred_runnable, all_usable_commands, lazy_imports
 
     # otherwise, just return the list of all commands
-    return None, all_usable_commands
+    return None, all_usable_commands, lazy_imports
+
+
+def format_lazy_imports_note(lazy_imports: list[str], found_commands: bool) -> str:
+    if found_commands or not lazy_imports:
+        return ""
+    details = "\n".join(f"  {name}" for name in lazy_imports[:_MAX_LISTED_LAZY_IMPORTS])
+    if len(lazy_imports) > _MAX_LISTED_LAZY_IMPORTS:
+        details += f"\n  ... and {len(lazy_imports) - _MAX_LISTED_LAZY_IMPORTS} more"
+    return (
+        "\n\nNote: Modal does not look inside lazy imports, and Modal Apps, Functions, and Classes can't be "
+        f"imported lazily. If one of these is a Modal object, change it to a regular import:\n{details}"
+    )
 
 
 def infer_runnable(

{modal-1.6.2.dev11 → modal-1.6.2.dev13}/modal/cli/network_file_system.py

@@ -14,7 +14,7 @@ from modal._location import display_location
 from modal._utils.async_utils import synchronizer
 from modal._utils.time_utils import timestamp_to_localized_str
 from modal.cli._download import _volume_download
-from modal.cli.utils import display_table, env_option, yes_option
+from modal.cli.utils import confirm_or_suggest_yes, display_table, env_option, yes_option
 from modal.client import _Client
 from modal.network_file_system import _NetworkFileSystem
 from modal.output import OutputManager
@@ -86,10 +86,8 @@ async def delete(
     # Lookup first to validate the name, even though delete is a staticmethod
     await _NetworkFileSystem.from_name(nfs_name, environment_name=env).hydrate()
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want to irrevocably delete the modal.NetworkFileSystem '{nfs_name}'?",
-            default=False,
-            abort=True,
         )
 
     await _NetworkFileSystem.delete(nfs_name, environment_name=env)

{modal-1.6.2.dev11 → modal-1.6.2.dev13}/modal/cli/queues.py

@@ -8,7 +8,7 @@ from modal._load_context import LoadContext
 from modal._resolver import Resolver
 from modal._utils.async_utils import TaskContext, synchronizer
 from modal._utils.time_utils import timestamp_to_localized_str
-from modal.cli.utils import display_table, env_option, yes_option
+from modal.cli.utils import confirm_or_suggest_yes, display_table, env_option, yes_option
 from modal.client import _Client
 from modal.output import OutputManager
 from modal.queue import _Queue
@@ -127,10 +127,8 @@ async def clear(
     """Clear the contents of a Queue by removing all of its data."""
     q = _Queue.from_name(name, environment_name=env)
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want to irrevocably delete the contents of modal.Queue '{name}'?",
-            default=False,
-            abort=True,
         )
     await q.clear(partition=partition, all=all)
 
@@ -151,10 +149,8 @@ async def delete(
     """Delete a named Queue and all of its data."""
     env = ensure_env(env)
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want to irrevocably delete the modal.Queue '{name}'?",
-            default=False,
-            abort=True,
         )
     await _Queue.objects.delete(name, environment_name=env, allow_missing=allow_missing)
 

{modal-1.6.2.dev11 → modal-1.6.2.dev13}/modal/cli/run.py

@@ -31,6 +31,7 @@ from .import_refs import (
     CLICommand,
     MethodReference,
     _get_runnable_app,
+    format_lazy_imports_note,
     import_and_filter,
     import_app_from_ref,
     parse_import_ref,
@@ -472,7 +473,7 @@ class RunGroup(ModalGroup):
         from_stdin = import_ref.file_or_module == STDIN_REF
         if from_stdin and ctx.params["interactive"]:
             raise ClickException("Interactive mode can't be used when reading a script from stdin.")
-        runnable, all_usable_commands = import_and_filter(
+        runnable, all_usable_commands, lazy_imports = import_and_filter(
             import_ref, base_cmd="modal run", accept_local_entrypoint=True, accept_webhook=False, allow_stdin=True
         )
         if not runnable and from_stdin:
@@ -498,6 +499,8 @@ class RunGroup(ModalGroup):
             else:
                 help_footer = f"'{import_ref.file_or_module}' has no functions or local entrypoints."
 
+            help_footer += format_lazy_imports_note(lazy_imports, found_commands=bool(all_usable_commands))
+
             raise ClickException(f"{help_header}\n\n{help_footer}")
 
         app = _get_runnable_app(runnable)

{modal-1.6.2.dev11 → modal-1.6.2.dev13}/modal/cli/secret.py

@@ -13,7 +13,7 @@ from rich.syntax import Syntax
 from modal._environments import ensure_env
 from modal._utils.async_utils import synchronizer
 from modal._utils.time_utils import timestamp_to_localized_str
-from modal.cli.utils import display_table, env_option, yes_option
+from modal.cli.utils import confirm_or_suggest_yes, display_table, env_option, yes_option
 from modal.client import _Client
 from modal.output import OutputManager
 from modal.secret import _Secret
@@ -194,10 +194,8 @@ async def delete(
 ):
     env = ensure_env(env)
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want to irrevocably delete the modal.Secret '{name}'?",
-            default=False,
-            abort=True,
         )
     await _Secret.objects.delete(name, environment_name=env, allow_missing=allow_missing)
 

{modal-1.6.2.dev11 → modal-1.6.2.dev13}/modal/cli/server.py

@@ -9,7 +9,8 @@ from typing import AsyncGenerator, Sequence, cast
 
 import click
 from click import UsageError
-from rich.box import SIMPLE
+from rich.box import SIMPLE, SIMPLE_HEAD
+from rich.style import Style
 from rich.table import Column, Table
 from rich.text import Text
 
@@ -174,16 +175,22 @@ async def info(
     enabled = "Enabled"
     disabled = "Disabled"
 
-    rows: list[str | Text | tuple[str | Text, str | Text]] = []
+    rows: list[str | Text | tuple[str | Text, str | Text] | None] = []
 
-    rows.append(("Server Name:", handle_metadata.function_name))
-    rows.append(("Object ID:", server_id))
-    rows.append(("App ID:", handle_metadata.app_id))
-    rows.append(("Image ID:", str(info.image_info.image_id)))
+    rows.append((Text("Server Name:", style="bold"), handle_metadata.function_name))
+    rows.append(None)
+    rows.append((Text("Object ID:", style="bold"), server_id))
+    rows.append((Text("App ID:", style="bold"), handle_metadata.app_id))
+    rows.append((Text("Image ID:", style="bold"), str(info.image_info.image_id)))
 
     # --- HTTP ---
+    rows.append(None)
     rows.append("HTTP Info:")
-    rows.append(("  URL:", info.server_url))
+
+    url = Text(info.server_url, overflow="fold")
+    url.stylize(style=Style(link=info.server_url), end=len(info.server_url))
+
+    rows.append(("  URL:", url))
     rows.append(("  Port:", not_configured if not info.port else str(info.port)))
     rows.append(("  Authentication:", disabled if info.unauthenticated else enabled))
     rows.append(("  HTTP/2:", disabled if not info.h2_enabled else enabled))
@@ -193,6 +200,7 @@ async def info(
     rows.append(("  Exit Grace Period:", f"{info.exit_grace_period} seconds"))
 
     # --- Resources ---
+    rows.append(None)
     rows.append("Resources:")
     rows.append(
         (
@@ -230,6 +238,7 @@ async def info(
     )
 
     # --- Autoscaling ---
+    rows.append(None)
     rows.append("Autoscaling:")
     rows.append(
         (
@@ -276,6 +285,7 @@ async def info(
     )
 
     # --- Scheduling ---
+    rows.append(None)
     rows.append("Scheduling:")
     rows.append(
         ("  Compute Region(s):", not_configured if not info.compute_regions else " | ".join(info.compute_regions))
@@ -285,6 +295,7 @@ async def info(
         rows.append(("  Cloud Provider:", info.cloud))
 
     if info.cluster_info:
+        rows.append(None)
         rows.append("Clustering:")
         rows.append(("  Cluster Size:", str(info.cluster_info.size)))
         rows.append(("  RDMA:", enabled if info.cluster_info.rdma else disabled))
@@ -293,6 +304,7 @@ async def info(
 
     # --- Mounts ---
     if info.volumes:
+        rows.append(None)
         rows.append("Volume Mounts:")
         for mount_path, volume in info.volumes.items():
             assert volume.volume_id is not None
@@ -311,6 +323,7 @@ async def info(
             rows.append((f"  {mount_path}", volume_text))
 
     if info.cloud_bucket_mounts:
+        rows.append(None)
         rows.append("Cloud Bucket Mounts:")
         for mount_path, cbm in info.cloud_bucket_mounts.items():
             extra = []
@@ -328,6 +341,7 @@ async def info(
 
     # --- Secrets ---
     if info.secrets:
+        rows.append(None)
         rows.append("Secrets:")
 
         async def _hydrate(secret_id: str) -> tuple[str, _Secret | None]:
@@ -367,18 +381,20 @@ async def info(
 
             rows.append((f"  {secret_identifier}", ", ".join(display_keys)))
 
+    t = Table(box=SIMPLE_HEAD, show_header=False)
     for row in rows:
-        t = Table().grid(padding=(0, 0, 3, 3), expand=True)
+        if row is None:
+            t.add_row()
+            continue
 
         if not isinstance(row, tuple):
             if isinstance(row, str):
-                row = Text(row)
+                row = Text(row, style="bold")
 
             if not tty:
                 output_manager.print(row)
             else:
                 t.add_row(row)
-                output_manager.print(t)
 
             continue
 
@@ -391,9 +407,11 @@ async def info(
         if isinstance(left, str):
             left = Text(left, overflow="fold")
         if isinstance(right, str):
-            right = Text(right, overflow="fold", justify="right")
+            right = Text(right, overflow="fold")
 
         t.add_row(left, right)
+
+    if tty:
         output_manager.print(t)
 
 

{modal-1.6.2.dev11 → modal-1.6.2.dev13}/modal/cli/shell.py

@@ -28,6 +28,7 @@ from ..volume import Volume
 from ._help import ModalCommand
 from .import_refs import (
     MethodReference,
+    format_lazy_imports_note,
     import_and_filter,
     parse_import_ref,
 )
@@ -162,7 +163,7 @@ def _start_shell_in_running_container(ref: str, cmd: str, pty: bool) -> None:
 
 def _function_spec_from_ref(ref: str, use_module_mode: bool) -> _FunctionSpec:
     import_ref = parse_import_ref(ref, use_module_mode=use_module_mode, command="modal shell")
-    runnable, all_usable_commands = import_and_filter(
+    runnable, all_usable_commands, lazy_imports = import_and_filter(
         import_ref,
         base_cmd="modal shell",
         accept_local_entrypoint=False,
@@ -181,6 +182,8 @@ def _function_spec_from_ref(ref: str, use_module_mode: bool) -> _FunctionSpec:
         else:
             help_footer = f"The selected module '{import_ref.file_or_module}' has no Modal functions or classes."
 
+        help_footer += format_lazy_imports_note(lazy_imports, found_commands=bool(all_usable_commands))
+
         raise ClickException(f"{help_header}\n\n{help_footer}")
 
     if isinstance(runnable, MethodReference):

{modal-1.6.2.dev11 → modal-1.6.2.dev13}/modal/cli/volume.py

@@ -13,7 +13,7 @@ from modal._utils.async_utils import synchronizer
 from modal._utils.browser_utils import open_url_and_display
 from modal._utils.time_utils import timestamp_to_localized_str
 from modal.cli._download import _volume_download
-from modal.cli.utils import display_table, env_option, humanize_filesize, yes_option
+from modal.cli.utils import confirm_or_suggest_yes, display_table, env_option, humanize_filesize, yes_option
 from modal.output import OutputManager
 from modal.volume import _AbstractVolumeUploadContextManager, _Volume
 from modal_proto import api_pb2
@@ -81,10 +81,8 @@ async def rename(
     env: str | None = None,
 ):
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want rename the modal.Volume '{old_name}'? This may break any Apps currently using it.",
-            default=False,
-            abort=True,
         )
 
     await _Volume.rename(old_name, new_name, environment_name=env)
@@ -132,10 +130,8 @@ async def delete(
 ):
     env = ensure_env(env)
     if not yes:
-        click.confirm(
+        confirm_or_suggest_yes(
             f"Are you sure you want to irrevocably delete the modal.Volume '{name}'?",
-            default=False,
-            abort=True,
         )
 
     await _Volume.objects.delete(name, environment_name=env, allow_missing=allow_missing)

{modal-1.6.2.dev11 → modal-1.6.2.dev13}/modal/client.pyi

@@ -80,7 +80,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.2.dev11",
+        version: str = "1.6.2.dev13",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):
@@ -290,7 +290,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.2.dev11",
+        version: str = "1.6.2.dev13",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):