modal 1.4.3.dev6__tar.gz → 1.4.3.dev8__tar.gz

{modal-1.4.3.dev6 → modal-1.4.3.dev8}/PKG-INFO

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

{modal-1.4.3.dev6 → modal-1.4.3.dev8}/modal/_utils/async_utils.py

@@ -1115,7 +1115,7 @@ async def async_merge(
             new_output_task = asyncio.create_task(queue.get())
 
     finally:
-        unfinished_tasks = [t for t in tasks | {new_output_task} if not t.done()]
+        unfinished_tasks: list[asyncio.Task[Any]] = [t for t in tasks | {new_output_task} if not t.done()]
         for t in unfinished_tasks:
             t.cancel()
         try:

{modal-1.4.3.dev6 → modal-1.4.3.dev8}/modal/_utils/sandbox_fs_utils.py

@@ -60,27 +60,6 @@ def try_parse_error_payload(stderr: Union[str, bytes]) -> Optional[ErrorPayload]
     return ErrorPayload(error_kind=error_kind, message=message, detail=detail)
 
 
-def raise_read_file_error(returncode: int, stderr: Union[str, bytes], remote_path: str) -> NoReturn:
-    if payload := try_parse_error_payload(stderr):
-        logger.debug(
-            f"sandbox-fs-tools read error: path={remote_path}, "
-            f"error_kind={payload.error_kind}, message={payload.message}, detail={payload.detail}"
-        )
-        if payload.error_kind == "NotFound":
-            raise SandboxFilesystemNotFoundError(f"{payload.message}: {remote_path}")
-        if payload.error_kind == "IsDirectory":
-            raise SandboxFilesystemIsADirectoryError(f"{payload.message}: {remote_path}")
-        if payload.error_kind == "PermissionDenied":
-            raise SandboxFilesystemPermissionError(f"{payload.message}: {remote_path}")
-        if payload.error_kind == "FileTooLarge":
-            raise SandboxFilesystemFileTooLargeError(f"{payload.message}: {remote_path}")
-        raise SandboxFilesystemError(payload.message)
-
-    if stderr_text := _stderr_to_text(stderr):
-        logger.debug(f"Unstructured modal-sandbox-fs-tools stderr: {stderr_text}")
-    raise SandboxFilesystemError(f"Operation on '{remote_path}' failed with exit code {returncode}")
-
-
 def _extract_support_error_code(exc: Exception) -> Optional[str]:
     if match := re.search(r"Error code:\s*([A-Z0-9]{8})", str(exc)):
         return match.group(1)
@@ -144,26 +123,66 @@ def make_write_file_command(remote_path: str) -> str:
     return json.dumps({"WriteFile": {"path": remote_path}})
 
 
-def make_read_file_command(remote_path: str) -> str:
-    """Build the JSON command string for a ReadFile operation.
+def raise_list_files_error(returncode: int, stderr: Union[str, bytes], remote_path: str) -> NoReturn:
+    if payload := try_parse_error_payload(stderr):
+        logger.debug(
+            f"sandbox-fs-tools list_files error: path={remote_path}, "
+            f"error_kind={payload.error_kind}, message={payload.message}, detail={payload.detail}"
+        )
+        if payload.error_kind == "NotFound":
+            raise SandboxFilesystemNotFoundError(f"{payload.message}: {remote_path}")
+        if payload.error_kind in ("IsFile", "NotDirectory"):
+            raise SandboxFilesystemNotADirectoryError(f"{payload.message}: {remote_path}")
+        if payload.error_kind == "PermissionDenied":
+            raise SandboxFilesystemPermissionError(f"{payload.message}: {remote_path}")
+        raise SandboxFilesystemError(payload.message)
+
+    if stderr_text := _stderr_to_text(stderr):
+        logger.debug(f"Unstructured modal-sandbox-fs-tools stderr: {stderr_text}")
+    raise SandboxFilesystemError(f"Operation on '{remote_path}' failed with exit code {returncode}")
+
+
+def make_list_files_command(remote_path: str) -> str:
+    """Build the JSON command string for a ListFiles operation.
 
     The returned JSON must match the `Command` enum in the modal-sandbox-fs-tools
     Rust crate (crates/modal-sandbox-fs-tools/src/lib.rs). Treat changes to
     this schema like protobuf changes: fields must not be removed or renamed,
     only added with backwards-compatible defaults.
     """
-    return json.dumps({"ReadFile": {"path": remote_path}})
+    return json.dumps({"ListFiles": {"path": remote_path}})
 
 
-def make_remove_command(remote_path: str, recursive: bool) -> str:
-    """Build the JSON command string for a Remove operation.
+def raise_read_file_error(returncode: int, stderr: Union[str, bytes], remote_path: str) -> NoReturn:
+    if payload := try_parse_error_payload(stderr):
+        logger.debug(
+            f"sandbox-fs-tools read error: path={remote_path}, "
+            f"error_kind={payload.error_kind}, message={payload.message}, detail={payload.detail}"
+        )
+        if payload.error_kind == "NotFound":
+            raise SandboxFilesystemNotFoundError(f"{payload.message}: {remote_path}")
+        if payload.error_kind == "IsDirectory":
+            raise SandboxFilesystemIsADirectoryError(f"{payload.message}: {remote_path}")
+        if payload.error_kind == "PermissionDenied":
+            raise SandboxFilesystemPermissionError(f"{payload.message}: {remote_path}")
+        if payload.error_kind == "FileTooLarge":
+            raise SandboxFilesystemFileTooLargeError(f"{payload.message}: {remote_path}")
+        raise SandboxFilesystemError(payload.message)
+
+    if stderr_text := _stderr_to_text(stderr):
+        logger.debug(f"Unstructured modal-sandbox-fs-tools stderr: {stderr_text}")
+    raise SandboxFilesystemError(f"Operation on '{remote_path}' failed with exit code {returncode}")
+
+
+def make_read_file_command(remote_path: str) -> str:
+    """Build the JSON command string for a ReadFile operation.
 
     The returned JSON must match the `Command` enum in the modal-sandbox-fs-tools
     Rust crate (crates/modal-sandbox-fs-tools/src/lib.rs). Treat changes to
     this schema like protobuf changes: fields must not be removed or renamed,
     only added with backwards-compatible defaults.
     """
-    return json.dumps({"Remove": {"path": remote_path, "recursive": recursive}})
+    return json.dumps({"ReadFile": {"path": remote_path}})
 
 
 def raise_remove_error(returncode: int, stderr: Union[str, bytes], remote_path: str) -> NoReturn:
@@ -189,15 +208,15 @@ def raise_remove_error(returncode: int, stderr: Union[str, bytes], remote_path:
     raise SandboxFilesystemError(f"Operation on '{remote_path}' failed with exit code {returncode}")
 
 
-def make_make_directory_command(remote_path: str, create_parents: bool) -> str:
-    """Build the JSON command string for a MakeDirectory operation.
+def make_remove_command(remote_path: str, recursive: bool) -> str:
+    """Build the JSON command string for a Remove operation.
 
     The returned JSON must match the `Command` enum in the modal-sandbox-fs-tools
     Rust crate (crates/modal-sandbox-fs-tools/src/lib.rs). Treat changes to
     this schema like protobuf changes: fields must not be removed or renamed,
     only added with backwards-compatible defaults.
     """
-    return json.dumps({"MakeDirectory": {"path": remote_path, "parents": create_parents}})
+    return json.dumps({"Remove": {"path": remote_path, "recursive": recursive}})
 
 
 def raise_make_directory_error(returncode: int, stderr: Union[str, bytes], remote_path: str) -> NoReturn:
@@ -225,6 +244,17 @@ def raise_make_directory_error(returncode: int, stderr: Union[str, bytes], remot
     raise SandboxFilesystemError(f"Operation on '{remote_path}' failed with exit code {returncode}")
 
 
+def make_make_directory_command(remote_path: str, create_parents: bool) -> str:
+    """Build the JSON command string for a MakeDirectory operation.
+
+    The returned JSON must match the `Command` enum in the modal-sandbox-fs-tools
+    Rust crate (crates/modal-sandbox-fs-tools/src/lib.rs). Treat changes to
+    this schema like protobuf changes: fields must not be removed or renamed,
+    only added with backwards-compatible defaults.
+    """
+    return json.dumps({"MakeDirectory": {"path": remote_path, "parents": create_parents}})
+
+
 def validate_absolute_remote_path(remote_path: str, operation: str) -> None:
     if not PurePosixPath(remote_path).is_absolute():
         raise InvalidError(f"Sandbox.filesystem.{operation}() currently only supports absolute remote_path values")

{modal-1.4.3.dev6 → modal-1.4.3.dev8}/modal/cli/cluster.py

@@ -1,4 +1,5 @@
 # Copyright Modal Labs 2022
+import uuid
 from typing import Optional, Union
 
 import click
@@ -8,15 +9,17 @@ from rich.text import Text
 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.task_command_router_client import TaskCommandRouterClient
 from modal._utils.time_utils import timestamp_to_localized_str
 from modal.cli.utils import display_table, env_option, is_tty
 from modal.client import _Client
 from modal.config import config
 from modal.container_process import _ContainerProcess
 from modal.environments import ensure_env
+from modal.exception import InvalidError
 from modal.output import OutputManager
 from modal.stream_type import StreamType
-from modal_proto import api_pb2
+from modal_proto import api_pb2, task_command_router_pb2 as sr_pb2
 
 from ._help import ModalGroup
 
@@ -75,17 +78,32 @@ async def shell(cluster_id: str, rank: int = 0):
     )
 
     pty = is_tty()
-    req = api_pb2.ContainerExecRequest(
+
+    command_router_client = await TaskCommandRouterClient.try_init(client, task_id)
+    if command_router_client is None:
+        raise InvalidError(f"Command router access is not available for container {task_id}")
+
+    process_id = str(uuid.uuid4())
+
+    start_req = sr_pb2.TaskExecStartRequest(
         task_id=task_id,
-        command=["/bin/bash"],
+        exec_id=process_id,
+        command_args=["/bin/bash"],
+        stdout_config=sr_pb2.TaskExecStdoutConfig.TASK_EXEC_STDOUT_CONFIG_PIPE,
+        stderr_config=sr_pb2.TaskExecStderrConfig.TASK_EXEC_STDERR_CONFIG_PIPE,
         pty_info=get_pty_info(shell=True) if pty else None,
         runtime_debug=config.get("function_runtime_debug"),
     )
-    exec_res: api_pb2.ContainerExecResponse = await client.stub.ContainerExec(req)
+    await command_router_client.exec_start(start_req)
+
     if pty:
-        await _ContainerProcess(exec_res.exec_id, task_id, client).attach()
+        await _ContainerProcess(process_id, task_id, client, command_router_client=command_router_client).attach()
     else:
-        # TODO: redirect stderr to its own stream?
         await _ContainerProcess(
-            exec_res.exec_id, task_id, client, stdout=StreamType.STDOUT, stderr=StreamType.STDOUT
+            process_id,
+            task_id,
+            client,
+            command_router_client=command_router_client,
+            stdout=StreamType.STDOUT,
+            stderr=StreamType.STDOUT,
         ).wait()

{modal-1.4.3.dev6 → modal-1.4.3.dev8}/modal/cli/container.py

@@ -1,4 +1,5 @@
 # Copyright Modal Labs 2022
+import uuid
 import warnings
 from datetime import datetime, timezone
 from typing import Optional, Union
@@ -12,6 +13,7 @@ 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.task_command_router_client import TaskCommandRouterClient
 from modal._utils.time_utils import timestamp_to_localized_str
 from modal.cli.app import _DEFAULT_LOGS_TAIL, _SOURCE_OPTIONS, _parse_time_arg
 from modal.cli.utils import (
@@ -30,7 +32,7 @@ from modal.container_process import _ContainerProcess
 from modal.environments import ensure_env
 from modal.exception import InvalidError
 from modal.stream_type import StreamType
-from modal_proto import api_pb2
+from modal_proto import api_pb2, task_command_router_pb2 as sr_pb2
 
 from ._help import ModalGroup
 
@@ -276,20 +278,33 @@ async def _exec_impl(
 
     client = await _Client.from_env()
 
-    req = api_pb2.ContainerExecRequest(
+    command_router_client = await TaskCommandRouterClient.try_init(client, container_id)
+    if command_router_client is None:
+        raise InvalidError(f"Command router access is not available for container {container_id}")
+
+    process_id = str(uuid.uuid4())
+
+    start_req = sr_pb2.TaskExecStartRequest(
         task_id=container_id,
-        command=command,
+        exec_id=process_id,
+        command_args=command,
+        stdout_config=sr_pb2.TaskExecStdoutConfig.TASK_EXEC_STDOUT_CONFIG_PIPE,
+        stderr_config=sr_pb2.TaskExecStderrConfig.TASK_EXEC_STDERR_CONFIG_PIPE,
         pty_info=get_pty_info(shell=True) if pty else None,
         runtime_debug=config.get("function_runtime_debug"),
     )
-    res: api_pb2.ContainerExecResponse = await client.stub.ContainerExec(req)
+    await command_router_client.exec_start(start_req)
 
     if pty:
-        await _ContainerProcess(res.exec_id, container_id, client).attach()
+        await _ContainerProcess(process_id, container_id, client, command_router_client=command_router_client).attach()
     else:
-        # TODO: redirect stderr to its own stream?
         await _ContainerProcess(
-            res.exec_id, container_id, client, stdout=StreamType.STDOUT, stderr=StreamType.STDOUT
+            process_id,
+            container_id,
+            client,
+            command_router_client=command_router_client,
+            stdout=StreamType.STDOUT,
+            stderr=StreamType.STDOUT,
         ).wait()
 
 

{modal-1.4.3.dev6 → modal-1.4.3.dev8}/modal/client.pyi

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

{modal-1.4.3.dev6 → modal-1.4.3.dev8}/modal/file_io.py

@@ -396,7 +396,7 @@ class _FileIO(Generic[T]):
         """List the contents of the provided directory."""
         deprecation_warning(
             (2026, 3, 9),
-            "`FileIO.ls()` is deprecated. Use `Sandbox.ls()` instead.",
+            "`FileIO.ls()` is deprecated. Use `Sandbox.filesystem.list_files()` instead.",
             pending=True,
         )
         return await ls(path, client, task_id)

{modal-1.4.3.dev6 → modal-1.4.3.dev8}/modal/sandbox.py

@@ -628,6 +628,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         idle_timeout: Optional[int] = None,
         workdir: Optional[str] = None,
         cpu: Optional[float] = None,
+        memory: Optional[int] = None,
         cloud: Optional[str] = None,
         region: Optional[Union[str, Sequence[str]]] = None,
         block_network: bool = False,
@@ -642,7 +643,6 @@ class _Sandbox(_Object, type_prefix="sb"):
     ) -> "_Sandbox":
         """Create a sandbox using the V2 backend.
 
-        Only CPU is configurable; memory is derived as a fixed ratio of CPU.
         Features like tags, snapshots, exec, volumes, network file systems,
         GPUs, custom domains, and proxies are not supported.
         """
@@ -714,7 +714,7 @@ class _Sandbox(_Object, type_prefix="sb"):
                 timeout_secs=timeout,
                 idle_timeout_secs=idle_timeout,
                 workdir=workdir,
-                resources=convert_fn_config_to_resources_config(cpu=cpu, memory=0, gpu=None, ephemeral_disk=None),
+                resources=convert_fn_config_to_resources_config(cpu=cpu, memory=memory, gpu=None, ephemeral_disk=None),
                 cloud_provider_str=cloud if cloud else None,
                 runtime=config.get("function_runtime"),
                 runtime_debug=config.get("function_runtime_debug"),
@@ -1641,8 +1641,16 @@ class _Sandbox(_Object, type_prefix="sb"):
         return await _FileIO.create(path, mode, self._client, task_id)
 
     async def ls(self, path: str) -> builtins.list[str]:
-        """[Alpha] List the contents of a directory in the Sandbox."""
+        """[Alpha] List the contents of a directory in the Sandbox.
+
+        .. deprecated:: 2026-04-15
+            Use `Sandbox.filesystem.list_files()` instead."""
         self._ensure_v1("ls")
+        deprecation_warning(
+            (2026, 4, 15),
+            "`Sandbox.ls()` is deprecated. Use `Sandbox.filesystem.list_files()` instead.",
+            pending=True,
+        )
         task_id = await self._get_task_id()
         return await ls(path, self._client, task_id)
 

{modal-1.4.3.dev6 → modal-1.4.3.dev8}/modal/sandbox.pyi

@@ -304,6 +304,7 @@ class _Sandbox(modal._object._Object):
         idle_timeout: typing.Optional[int] = None,
         workdir: typing.Optional[str] = None,
         cpu: typing.Optional[float] = None,
+        memory: typing.Optional[int] = None,
         cloud: typing.Optional[str] = None,
         region: typing.Union[str, collections.abc.Sequence[str], None] = None,
         block_network: bool = False,
@@ -318,7 +319,6 @@ class _Sandbox(modal._object._Object):
     ) -> _Sandbox:
         """Create a sandbox using the V2 backend.
 
-        Only CPU is configurable; memory is derived as a fixed ratio of CPU.
         Features like tags, snapshots, exec, volumes, network file systems,
         GPUs, custom domains, and proxies are not supported.
         """
@@ -613,7 +613,11 @@ class _Sandbox(modal._object._Object):
     @typing.overload
     async def open(self, path: str, mode: _typeshed.OpenBinaryMode) -> modal.file_io._FileIO[bytes]: ...
     async def ls(self, path: str) -> list[str]:
-        """[Alpha] List the contents of a directory in the Sandbox."""
+        """[Alpha] List the contents of a directory in the Sandbox.
+
+        .. deprecated:: 2026-04-15
+            Use `Sandbox.filesystem.list_files()` instead.
+        """
         ...
 
     async def mkdir(self, path: str, parents: bool = False) -> None:
@@ -1186,6 +1190,7 @@ class Sandbox(modal.object.Object):
             idle_timeout: typing.Optional[int] = None,
             workdir: typing.Optional[str] = None,
             cpu: typing.Optional[float] = None,
+            memory: typing.Optional[int] = None,
             cloud: typing.Optional[str] = None,
             region: typing.Union[str, collections.abc.Sequence[str], None] = None,
             block_network: bool = False,
@@ -1200,7 +1205,6 @@ class Sandbox(modal.object.Object):
         ) -> Sandbox:
             """Create a sandbox using the V2 backend.
 
-            Only CPU is configurable; memory is derived as a fixed ratio of CPU.
             Features like tags, snapshots, exec, volumes, network file systems,
             GPUs, custom domains, and proxies are not supported.
             """
@@ -1219,6 +1223,7 @@ class Sandbox(modal.object.Object):
             idle_timeout: typing.Optional[int] = None,
             workdir: typing.Optional[str] = None,
             cpu: typing.Optional[float] = None,
+            memory: typing.Optional[int] = None,
             cloud: typing.Optional[str] = None,
             region: typing.Union[str, collections.abc.Sequence[str], None] = None,
             block_network: bool = False,
@@ -1233,7 +1238,6 @@ class Sandbox(modal.object.Object):
         ) -> Sandbox:
             """Create a sandbox using the V2 backend.
 
-            Only CPU is configurable; memory is derived as a fixed ratio of CPU.
             Features like tags, snapshots, exec, volumes, network file systems,
             GPUs, custom domains, and proxies are not supported.
             """
@@ -1908,11 +1912,19 @@ class Sandbox(modal.object.Object):
 
     class __ls_spec(typing_extensions.Protocol):
         def __call__(self, /, path: str) -> list[str]:
-            """[Alpha] List the contents of a directory in the Sandbox."""
+            """[Alpha] List the contents of a directory in the Sandbox.
+
+            .. deprecated:: 2026-04-15
+                Use `Sandbox.filesystem.list_files()` instead.
+            """
             ...
 
         async def aio(self, /, path: str) -> list[str]:
-            """[Alpha] List the contents of a directory in the Sandbox."""
+            """[Alpha] List the contents of a directory in the Sandbox.
+
+            .. deprecated:: 2026-04-15
+                Use `Sandbox.filesystem.list_files()` instead.
+            """
             ...
 
     ls: __ls_spec