modal 1.1.5.dev83__py3-none-any.whl → 1.3.1.dev8__py3-none-any.whl

modal/app.pyi

@@ -1,5 +1,6 @@
 import collections.abc
 import modal._functions
+import modal._load_context
 import modal._partial_function
 import modal._utils.function_utils
 import modal.client
@@ -74,6 +75,42 @@ class _FunctionDecoratorType:
         self, func: collections.abc.Callable[P, ReturnType]
     ) -> modal.functions.Function[P, ReturnType, ReturnType]: ...
 
+class _LocalAppState:
+    """All state for apps that's part of the local/definition state"""
+
+    functions: dict[str, modal._functions._Function]
+    classes: dict[str, modal.cls._Cls]
+    image_default: typing.Optional[modal.image._Image]
+    web_endpoints: list[str]
+    local_entrypoints: dict[str, _LocalEntrypoint]
+    tags: dict[str, str]
+    include_source_default: bool
+    secrets_default: collections.abc.Sequence[modal.secret._Secret]
+    volumes_default: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume._Volume]
+
+    def __init__(
+        self,
+        functions: dict[str, modal._functions._Function],
+        classes: dict[str, modal.cls._Cls],
+        image_default: typing.Optional[modal.image._Image],
+        web_endpoints: list[str],
+        local_entrypoints: dict[str, _LocalEntrypoint],
+        tags: dict[str, str],
+        include_source_default: bool,
+        secrets_default: collections.abc.Sequence[modal.secret._Secret],
+        volumes_default: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume._Volume],
+    ) -> None:
+        """Initialize self.  See help(type(self)) for accurate signature."""
+        ...
+
+    def __repr__(self):
+        """Return repr(self)."""
+        ...
+
+    def __eq__(self, other):
+        """Return self==value."""
+        ...
+
 class _App:
     """A Modal App is a group of functions and classes that are deployed together.
 
@@ -110,18 +147,16 @@ class _App:
     _container_app: typing.ClassVar[typing.Optional[_App]]
     _name: typing.Optional[str]
     _description: typing.Optional[str]
-    _tags: dict[str, str]
-    _functions: dict[str, modal._functions._Function]
-    _classes: dict[str, modal.cls._Cls]
-    _image: typing.Optional[modal.image._Image]
-    _secrets: collections.abc.Sequence[modal.secret._Secret]
-    _volumes: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume._Volume]
-    _web_endpoints: list[str]
-    _local_entrypoints: dict[str, _LocalEntrypoint]
+    _local_state_attr: typing.Optional[_LocalAppState]
     _app_id: typing.Optional[str]
     _running_app: typing.Optional[modal.running_app.RunningApp]
     _client: typing.Optional[modal.client._Client]
-    _include_source_default: typing.Optional[bool]
+    _root_load_context: modal._load_context.LoadContext
+
+    @property
+    def _local_state(self) -> _LocalAppState:
+        """For internal use only. Do not use this property directly."""
+        ...
 
     def __init__(
         self,
@@ -452,14 +487,14 @@ class _App:
         is_generator: typing.Optional[bool] = None,
         cloud: typing.Optional[str] = None,
         region: typing.Union[str, collections.abc.Sequence[str], None] = None,
+        nonpreemptible: bool = False,
         enable_memory_snapshot: bool = False,
         block_network: bool = False,
         restrict_modal_access: bool = False,
-        max_inputs: typing.Optional[int] = None,
+        single_use_containers: bool = False,
         i6pn: typing.Optional[bool] = None,
         include_source: typing.Optional[bool] = None,
         experimental_options: typing.Optional[dict[str, typing.Any]] = None,
-        _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
         _experimental_proxy_ip: typing.Optional[str] = None,
         _experimental_custom_scaling_factor: typing.Optional[float] = None,
         _experimental_restrict_output: bool = False,
@@ -467,7 +502,9 @@ class _App:
         concurrency_limit: typing.Optional[int] = None,
         container_idle_timeout: typing.Optional[int] = None,
         allow_concurrent_inputs: typing.Optional[int] = None,
+        max_inputs: typing.Optional[int] = None,
         _experimental_buffer_containers: typing.Optional[int] = None,
+        _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
     ) -> _FunctionDecoratorType:
         """Decorator to register a new Modal Function with this App."""
         ...
@@ -505,14 +542,14 @@ class _App:
         startup_timeout: typing.Optional[int] = None,
         cloud: typing.Optional[str] = None,
         region: typing.Union[str, collections.abc.Sequence[str], None] = None,
+        nonpreemptible: bool = False,
         enable_memory_snapshot: bool = False,
         block_network: bool = False,
         restrict_modal_access: bool = False,
-        max_inputs: typing.Optional[int] = None,
+        single_use_containers: bool = False,
         i6pn: typing.Optional[bool] = None,
         include_source: typing.Optional[bool] = None,
         experimental_options: typing.Optional[dict[str, typing.Any]] = None,
-        _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
         _experimental_proxy_ip: typing.Optional[str] = None,
         _experimental_custom_scaling_factor: typing.Optional[float] = None,
         _experimental_restrict_output: bool = False,
@@ -520,7 +557,9 @@ class _App:
         concurrency_limit: typing.Optional[int] = None,
         container_idle_timeout: typing.Optional[int] = None,
         allow_concurrent_inputs: typing.Optional[int] = None,
+        max_inputs: typing.Optional[int] = None,
         _experimental_buffer_containers: typing.Optional[int] = None,
+        _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
     ) -> collections.abc.Callable[[typing.Union[CLS_T, modal._partial_function._PartialFunction]], CLS_T]:
         """Decorator to register a new Modal [Cls](https://modal.com/docs/reference/modal.Cls) with this App."""
         ...
@@ -630,18 +669,11 @@ class App:
     _container_app: typing.ClassVar[typing.Optional[App]]
     _name: typing.Optional[str]
     _description: typing.Optional[str]
-    _tags: dict[str, str]
-    _functions: dict[str, modal.functions.Function]
-    _classes: dict[str, modal.cls.Cls]
-    _image: typing.Optional[modal.image.Image]
-    _secrets: collections.abc.Sequence[modal.secret.Secret]
-    _volumes: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume.Volume]
-    _web_endpoints: list[str]
-    _local_entrypoints: dict[str, LocalEntrypoint]
+    _local_state_attr: typing.Optional[_LocalAppState]
     _app_id: typing.Optional[str]
     _running_app: typing.Optional[modal.running_app.RunningApp]
     _client: typing.Optional[modal.client.Client]
-    _include_source_default: typing.Optional[bool]
+    _root_load_context: modal._load_context.LoadContext
 
     def __init__(
         self,
@@ -664,6 +696,11 @@ class App:
         """
         ...
 
+    @property
+    def _local_state(self) -> _LocalAppState:
+        """For internal use only. Do not use this property directly."""
+        ...
+
     @property
     def name(self) -> typing.Optional[str]:
         """The user-provided name of the App."""
@@ -733,7 +770,7 @@ class App:
             """
             ...
 
-    lookup: __lookup_spec
+    lookup: typing.ClassVar[__lookup_spec]
 
     def set_description(self, description: str):
         """mdmd:hidden
@@ -761,7 +798,7 @@ class App:
 
     def _uncreate_all_objects(self): ...
 
-    class ___set_local_app_spec(typing_extensions.Protocol[SUPERSELF]):
+    class ___set_local_app_spec(typing_extensions.Protocol):
         def __call__(
             self, /, client: modal.client.Client, running_app: modal.running_app.RunningApp
         ) -> synchronicity.combined_types.AsyncAndBlockingContextManager[None]: ...
@@ -769,9 +806,9 @@ class App:
             self, /, client: modal.client.Client, running_app: modal.running_app.RunningApp
         ) -> typing.AsyncContextManager[None]: ...
 
-    _set_local_app: ___set_local_app_spec[typing_extensions.Self]
+    _set_local_app: ___set_local_app_spec
 
-    class __run_spec(typing_extensions.Protocol[SUPERSELF]):
+    class __run_spec(typing_extensions.Protocol):
         def __call__(
             self,
             /,
@@ -870,7 +907,7 @@ class App:
             """
             ...
 
-    run: __run_spec[typing_extensions.Self]
+    run: __run_spec
 
     class __deploy_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
@@ -1115,14 +1152,14 @@ class App:
         is_generator: typing.Optional[bool] = None,
         cloud: typing.Optional[str] = None,
         region: typing.Union[str, collections.abc.Sequence[str], None] = None,
+        nonpreemptible: bool = False,
         enable_memory_snapshot: bool = False,
         block_network: bool = False,
         restrict_modal_access: bool = False,
-        max_inputs: typing.Optional[int] = None,
+        single_use_containers: bool = False,
         i6pn: typing.Optional[bool] = None,
         include_source: typing.Optional[bool] = None,
         experimental_options: typing.Optional[dict[str, typing.Any]] = None,
-        _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
         _experimental_proxy_ip: typing.Optional[str] = None,
         _experimental_custom_scaling_factor: typing.Optional[float] = None,
         _experimental_restrict_output: bool = False,
@@ -1130,7 +1167,9 @@ class App:
         concurrency_limit: typing.Optional[int] = None,
         container_idle_timeout: typing.Optional[int] = None,
         allow_concurrent_inputs: typing.Optional[int] = None,
+        max_inputs: typing.Optional[int] = None,
         _experimental_buffer_containers: typing.Optional[int] = None,
+        _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
     ) -> _FunctionDecoratorType:
         """Decorator to register a new Modal Function with this App."""
         ...
@@ -1168,14 +1207,14 @@ class App:
         startup_timeout: typing.Optional[int] = None,
         cloud: typing.Optional[str] = None,
         region: typing.Union[str, collections.abc.Sequence[str], None] = None,
+        nonpreemptible: bool = False,
         enable_memory_snapshot: bool = False,
         block_network: bool = False,
         restrict_modal_access: bool = False,
-        max_inputs: typing.Optional[int] = None,
+        single_use_containers: bool = False,
         i6pn: typing.Optional[bool] = None,
         include_source: typing.Optional[bool] = None,
         experimental_options: typing.Optional[dict[str, typing.Any]] = None,
-        _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
         _experimental_proxy_ip: typing.Optional[str] = None,
         _experimental_custom_scaling_factor: typing.Optional[float] = None,
         _experimental_restrict_output: bool = False,
@@ -1183,7 +1222,9 @@ class App:
         concurrency_limit: typing.Optional[int] = None,
         container_idle_timeout: typing.Optional[int] = None,
         allow_concurrent_inputs: typing.Optional[int] = None,
+        max_inputs: typing.Optional[int] = None,
         _experimental_buffer_containers: typing.Optional[int] = None,
+        _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
     ) -> collections.abc.Callable[[typing.Union[CLS_T, modal.partial_function.PartialFunction]], CLS_T]:
         """Decorator to register a new Modal [Cls](https://modal.com/docs/reference/modal.Cls) with this App."""
         ...
@@ -1217,7 +1258,7 @@ class App:
         """
         ...
 
-    class __set_tags_spec(typing_extensions.Protocol[SUPERSELF]):
+    class __set_tags_spec(typing_extensions.Protocol):
         def __call__(
             self, /, tags: collections.abc.Mapping[str, str], *, client: typing.Optional[modal.client.Client] = None
         ) -> None:
@@ -1246,9 +1287,9 @@ class App:
             """
             ...
 
-    set_tags: __set_tags_spec[typing_extensions.Self]
+    set_tags: __set_tags_spec
 
-    class __get_tags_spec(typing_extensions.Protocol[SUPERSELF]):
+    class __get_tags_spec(typing_extensions.Protocol):
         def __call__(self, /, *, client: typing.Optional[modal.client.Client] = None) -> dict[str, str]:
             """Get the tags that are currently attached to the App."""
             ...
@@ -1257,9 +1298,9 @@ class App:
             """Get the tags that are currently attached to the App."""
             ...
 
-    get_tags: __get_tags_spec[typing_extensions.Self]
+    get_tags: __get_tags_spec
 
-    class ___logs_spec(typing_extensions.Protocol[SUPERSELF]):
+    class ___logs_spec(typing_extensions.Protocol):
         def __call__(self, /, client: typing.Optional[modal.client.Client] = None) -> typing.Generator[str, None, None]:
             """Stream logs from the app.
 
@@ -1276,7 +1317,7 @@ class App:
             """
             ...
 
-    _logs: ___logs_spec[typing_extensions.Self]
+    _logs: ___logs_spec
 
     @classmethod
     def _get_container_app(cls) -> typing.Optional[App]:

modal/billing.py

@@ -0,0 +1,5 @@
+# Copyright Modal Labs 2025
+from ._billing import _workspace_billing_report
+from ._utils.async_utils import synchronize_api
+
+workspace_billing_report = synchronize_api(_workspace_billing_report)

modal/builder/2025.06.txt

@@ -1,12 +1,15 @@
 aiohappyeyeballs==2.6.1
-aiohttp==3.12.7
-aiosignal==1.3.2
+aiohttp==3.12.7 ; python_version < "3.14"
+aiohttp==3.13.2 ; python_version >= "3.14"
+aiosignal==1.3.2 ; python_version < "3.14"
+aiosignal==1.4.0 ; python_version >= "3.14"
 async-timeout==5.0.1 ; python_version < "3.11"
 attrs==25.3.0
 cbor2==5.7.0
 certifi==2025.4.26
 frozenlist==1.6.0
-grpclib==0.4.8
+grpclib==0.4.8 ; python_version < "3.14"
+grpclib==0.4.9 ; python_version >= "3.14"
 h2==4.2.0
 hpack==4.1.0
 hyperframe==6.1.0

modal/builder/PREVIEW.txt

@@ -6,7 +6,8 @@ attrs==25.3.0
 cbor2==5.7.0
 certifi==2025.4.26
 frozenlist==1.6.0
-grpclib==0.4.8
+grpclib==0.4.8 ; python_version < "3.14"
+grpclib==0.4.9 ; python_version >= "3.14"
 h2==4.2.0
 hpack==4.1.0
 hyperframe==6.1.0

modal/builder/base-images.json

@@ -12,14 +12,16 @@
             "3.10.17",
             "3.11.12",
             "3.12.10",
-            "3.13.3"
+            "3.13.3",
+            "3.14.2"
         ],
         "2025.06": [
             "3.9.22",
             "3.10.17",
             "3.11.12",
             "3.12.10",
-            "3.13.3"
+            "3.13.3",
+            "3.14.2"
         ],
         "2024.10": [
             "3.9.20",

modal/cli/_download.py

@@ -1,6 +1,7 @@
 # Copyright Modal Labs 2023
 import asyncio
 import functools
+import multiprocessing
 import os
 import shutil
 import sys
@@ -23,12 +24,22 @@ async def _volume_download(
     remote_path: str,
     local_destination: Path,
     overwrite: bool,
-    progress_cb: Callable,
+    concurrency: Optional[int] = None,
+    progress_cb: Optional[Callable] = None,
 ):
+    if progress_cb is None:
+
+        def progress_cb(*_, **__):
+            pass
+
+    if concurrency is None:
+        concurrency = max(128, 2 * multiprocessing.cpu_count())
+
     is_pipe = local_destination == PIPE_PATH
 
     q: asyncio.Queue[tuple[Optional[Path], Optional[FileEntry]]] = asyncio.Queue()
-    num_consumers = 1 if is_pipe else 10  # concurrency limit for downloading files
+    num_consumers = 1 if is_pipe else concurrency  # concurrency limit for downloading files
+    download_semaphore = asyncio.Semaphore(concurrency)
 
     async def producer():
         iterator: AsyncIterator[FileEntry]
@@ -86,7 +97,12 @@ async def _volume_download(
 
                         with output_path.open("wb") as fp:
                             if isinstance(volume, _Volume):
-                                b = await volume.read_file_into_fileobj(entry.path, fp, file_progress_cb)
+                                b = await volume._read_file_into_fileobj(
+                                    path=entry.path,
+                                    fileobj=fp,
+                                    download_semaphore=download_semaphore,
+                                    progress_cb=file_progress_cb,
+                                )
                             else:
                                 b = 0
                                 async for chunk in volume.read_file(entry.path):

modal/cli/cluster.py

@@ -83,7 +83,9 @@ async def shell(
     )
     exec_res: api_pb2.ContainerExecResponse = await client.stub.ContainerExec(req)
     if pty:
-        await _ContainerProcess(exec_res.exec_id, client).attach()
+        await _ContainerProcess(exec_res.exec_id, task_id, client).attach()
     else:
         # TODO: redirect stderr to its own stream?
-        await _ContainerProcess(exec_res.exec_id, client, stdout=StreamType.STDOUT, stderr=StreamType.STDOUT).wait()
+        await _ContainerProcess(
+            exec_res.exec_id, task_id, client, stdout=StreamType.STDOUT, stderr=StreamType.STDOUT
+        ).wait()

modal/cli/config.py

@@ -1,4 +1,6 @@
 # Copyright Modal Labs 2022
+import json
+
 import typer
 
 from modal._output import make_console
@@ -25,7 +27,7 @@ def show(redact: bool = typer.Option(True, help="Redact the `token_secret` value
         config_dict["token_secret"] = "***"
 
     console = make_console()
-    console.print(config_dict)
+    console.print_json(json.dumps(config_dict))
 
 
 SET_DEFAULT_ENV_HELP = """Set the default Modal environment for the active profile

modal/cli/container.py

@@ -7,7 +7,6 @@ from rich.text import Text
 from modal._object import _get_environment_name
 from modal._pty import get_pty_info
 from modal._utils.async_utils import synchronizer
-from modal._utils.grpc_utils import retry_transient_errors
 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.client import _Client
@@ -80,10 +79,12 @@ async def exec(
     res: api_pb2.ContainerExecResponse = await client.stub.ContainerExec(req)
 
     if pty:
-        await _ContainerProcess(res.exec_id, client).attach()
+        await _ContainerProcess(res.exec_id, container_id, client).attach()
     else:
         # TODO: redirect stderr to its own stream?
-        await _ContainerProcess(res.exec_id, client, stdout=StreamType.STDOUT, stderr=StreamType.STDOUT).wait()
+        await _ContainerProcess(
+            res.exec_id, container_id, client, stdout=StreamType.STDOUT, stderr=StreamType.STDOUT
+        ).wait()
 
 
 @container_cli.command("stop")
@@ -95,4 +96,4 @@ async def stop(container_id: str = typer.Argument(help="Container ID")):
     """
     client = await _Client.from_env()
     request = api_pb2.ContainerStopRequest(task_id=container_id)
-    await retry_transient_errors(client.stub.ContainerStop, request)
+    await client.stub.ContainerStop(request)

modal/cli/dict.py

@@ -4,6 +4,7 @@ from typing import Optional
 import typer
 from typer import Argument, Option, Typer
 
+from modal._load_context import LoadContext
 from modal._output import make_console
 from modal._resolver import Resolver
 from modal._utils.async_utils import synchronizer
@@ -29,8 +30,10 @@ async def create(name: str, *, env: Optional[str] = ENV_OPTION):
     """
     d = _Dict.from_name(name, environment_name=env, create_if_missing=True)
     client = await _Client.from_env()
-    resolver = Resolver(client=client)
-    await resolver.load(d)
+    resolver = Resolver()
+
+    load_context = LoadContext(client=client, environment_name=env)
+    await resolver.load(d, load_context)
 
 
 @dict_cli.command(name="list", rich_help_panel="Management")

modal/cli/entry_point.py

@@ -8,7 +8,7 @@ from rich.rule import Rule
 from modal._output import make_console
 from modal._utils.async_utils import synchronizer
 
-from . import run
+from . import run, shell as shell_module
 from .app import app_cli
 from .cluster import cluster_cli
 from .config import config_cli
@@ -36,6 +36,7 @@ entrypoint_cli_typer = typer.Typer(
     no_args_is_help=False,
     add_completion=False,
     rich_markup_mode="markdown",
+    context_settings={"help_option_names": ["-h", "--help"]},
     help="""
     Modal is the fastest way to run code in the cloud.
 
@@ -86,6 +87,29 @@ def check_path():
 async def setup(profile: Optional[str] = None):
     check_path()
 
+    art = """
+           #############        #############
+          ####         ##      ####         ##
+         ##  ##         ##    ##  ##         ##
+        ##    ##         ##  ##    ##         ##
+       ##      ##         ####      ##         ##
+      ##        #############        ##         ##
+     ##        ##         ####        ##         ##
+    ##        ##         ##  ##        ##         ##
+   ##        ##         ##    ##        ##         ##
+  ##        ##         ##      ##        ##         ##
+ ##        ##         ##        ##        ##         ##
+##        ##         ##          ##        #############
+ ##      ##         ##            ##      ##         ##
+  ##    ##         ##              ##    ##         ##
+   ##  ##         ##                ##  ##         ##
+    ####         ##                  ####         ##
+     #############                    #############
+"""
+
+    console = make_console()
+    console.print(art, style="green")
+
     # Fetch a new token (same as `modal token new` but redirect to /home once finishes)
     await _new_token(profile=profile, next_url="/home")
 
@@ -93,7 +117,7 @@ async def setup(profile: Optional[str] = None):
 # Commands
 entrypoint_cli_typer.command("deploy", no_args_is_help=True)(run.deploy)
 entrypoint_cli_typer.command("serve", no_args_is_help=True)(run.serve)
-entrypoint_cli_typer.command("shell")(run.shell)
+entrypoint_cli_typer.command("shell")(shell_module.shell)
 entrypoint_cli_typer.add_typer(launch_cli)
 
 # Deployments

modal/cli/environment.py

@@ -3,14 +3,12 @@ from typing import Annotated, Optional, Union
 
 import typer
 from click import UsageError
-from grpclib import GRPCError, Status
 from rich.text import Text
 
 from modal import environments
 from modal._utils.name_utils import check_environment_name
 from modal.cli.utils import YES_OPTION, display_table
 from modal.config import config
-from modal.exception import InvalidError
 
 ENVIRONMENT_HELP_TEXT = """Create and interact with Environments
 
@@ -61,13 +59,7 @@ ENVIRONMENT_CREATE_HELP = """Create a new environment in the current workspace""
 @environment_cli.command(name="create", help=ENVIRONMENT_CREATE_HELP)
 def create(name: Annotated[str, typer.Argument(help="Name of the new environment. Must be unique. Case sensitive")]):
     check_environment_name(name)
-
-    try:
-        environments.create_environment(name)
-    except GRPCError as exc:
-        if exc.status == Status.INVALID_ARGUMENT:
-            raise InvalidError(exc.message)
-        raise
+    environments.create_environment(name)
     typer.echo(f"Environment created: {name}")
 
 
@@ -114,11 +106,5 @@ def update(
     if set_name:
         check_environment_name(set_name)
 
-    try:
-        environments.update_environment(current_name, new_name=set_name, new_web_suffix=set_web_suffix)
-    except GRPCError as exc:
-        if exc.status == Status.INVALID_ARGUMENT:
-            raise InvalidError(exc.message)
-        raise
-
+    environments.update_environment(current_name, new_name=set_name, new_web_suffix=set_web_suffix)
     typer.echo("Environment updated")

modal/cli/launch.py

@@ -3,8 +3,6 @@ import asyncio
 import inspect
 import json
 import os
-import subprocess
-import tempfile
 from pathlib import Path
 from typing import Any, Optional
 
@@ -23,8 +21,7 @@ launch_cli = Typer(
     no_args_is_help=True,
     rich_markup_mode="markdown",
     help="""
-    Open a serverless app instance on Modal.
-    >⚠️  `modal launch` is **experimental** and may change in the future.
+    [Experimental] Open a serverless app instance on Modal.
     """,
 )
 
@@ -121,75 +118,3 @@ def vscode(
         "volume": volume,
     }
     _launch_program("vscode", "vscode.py", detach, args)
-
-
-@launch_cli.command(name="machine", help="Start an instance on Modal, with direct SSH access.", hidden=True)
-def machine(
-    name: str,  # Name of the machine App.
-    cpu: int = 8,  # Reservation of CPU cores (can burst above this value).
-    memory: int = 32768,  # Reservation of memory in MiB (can burst above this value).
-    gpu: Optional[str] = None,  # GPU type and count, e.g. "t4" or "h100:2".
-    image: Optional[str] = None,  # Image tag to use from registry. Defaults to the notebook base image.
-    timeout: int = 3600 * 24,  # Timeout in seconds for the instance.
-    volume: str = "machine-vol",  # Attach a persisted `modal.Volume` at /workspace (created if missing).
-):
-    tempdir = Path(tempfile.gettempdir())
-    key_path = tempdir / "modal-machine-keyfile.pem"
-    # Generate a new SSH key pair for this machine instance.
-    if not key_path.exists():
-        subprocess.run(
-            ["ssh-keygen", "-t", "ed25519", "-f", str(key_path), "-N", ""],
-            check=True,
-            stdout=subprocess.DEVNULL,
-        )
-    # Add the key with expiry 1d to ssh agent.
-    subprocess.run(
-        ["ssh-add", "-t", "1d", str(key_path)],
-        check=True,
-        stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL,
-    )
-
-    os.environ["SSH_PUBLIC_KEY"] = Path(str(key_path) + ".pub").read_text()
-    os.environ["MODAL_LOGS_TIMEOUT"] = "0"  # hack to work with --detach
-
-    args = {
-        "cpu": cpu,
-        "memory": memory,
-        "gpu": gpu,
-        "image": image,
-        "timeout": timeout,
-        "volume": volume,
-    }
-    _launch_program(
-        "machine",
-        "launch_instance_ssh.py",
-        True,
-        args,
-        description=name,
-    )
-
-
-@launch_cli.command(name="marimo", help="Start a remote Marimo notebook on Modal.", hidden=True)
-def marimo(
-    cpu: int = 8,
-    memory: int = 32768,
-    gpu: Optional[str] = None,
-    image: str = "debian:12",
-    timeout: int = 3600,
-    add_python: Optional[str] = "3.12",
-    mount: Optional[str] = None,  # Create a `modal.Mount` from a local directory.
-    volume: Optional[str] = None,  # Attach a persisted `modal.Volume` by name (creating if missing).
-    detach: bool = False,  # Run the app in "detached" mode to persist after local client disconnects
-):
-    args = {
-        "cpu": cpu,
-        "memory": memory,
-        "gpu": gpu,
-        "timeout": timeout,
-        "image": image,
-        "add_python": add_python,
-        "mount": mount,
-        "volume": volume,
-    }
-    _launch_program("marimo", "run_marimo.py", detach, args)