modal 1.4.4.dev6__tar.gz → 1.4.4.dev7__tar.gz

{modal-1.4.4.dev6 → modal-1.4.4.dev7}/PKG-INFO

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

{modal-1.4.4.dev6 → modal-1.4.4.dev7}/modal/_runtime/asgi.py

@@ -285,7 +285,7 @@ def wait_for_web_server(host: str, port: int, *, timeout: float) -> None:
     start_time = time.monotonic()
     while True:
         try:
-            with socket.create_connection((host, port), timeout=timeout):
+            with socket.create_connection((host, port), timeout=min(timeout, 1.0)):
                 break
         except OSError as ex:
             time.sleep(0.01)

{modal-1.4.4.dev6 → modal-1.4.4.dev7}/modal/cli/shell.py

@@ -2,7 +2,7 @@
 import platform
 import shlex
 from pathlib import Path, PurePosixPath
-from typing import Any, Callable, Iterable, Optional
+from typing import Any, Callable, Iterable, Optional, Union
 
 import click
 from click import ClickException
@@ -10,6 +10,7 @@ from click import ClickException
 from .._environments import ensure_env
 from .._functions import _FunctionSpec
 from ..app import App
+from ..container_process import ContainerProcess
 from ..exception import InvalidError, NotFoundError
 from ..functions import Function
 from ..image import Image
@@ -116,17 +117,18 @@ def _start_shell_in_sandbox_container(sandbox_id: str, container_name: str, cmd:
 
     try:
         sandbox_container = sandbox._experimental_containers.get(name=container_name)
+        process: Union[ContainerProcess[bytes], ContainerProcess[str]]
         if pty:
             # PTY output is raw terminal bytes, not text; strict UTF-8 decode
             # crashes on the first non-UTF-8 byte (e.g. vim drawing a Latin-1
             # file under LC_CTYPE=C). See the matching call in `_exec_impl`.
-            process = sandbox_container.exec(*shlex.split(cmd), pty=pty, text=False)
+            process = sandbox_container.exec(*shlex.split(cmd), pty=True, text=False)
             process.attach()
         else:
             process = sandbox_container.exec(
-                *shlex.split(cmd), pty=pty, stdout=StreamType.STDOUT, stderr=StreamType.STDOUT
+                *shlex.split(cmd), pty=False, text=False, stdout=StreamType.STDOUT, stderr=StreamType.STDOUT
             )
-            process.wait()
+            _ = process.wait()
     except NotFoundError:
         raise ClickException(f"Container '{container_name}' not found in Sandbox '{sandbox_id}'.")
     except Exception as e:

{modal-1.4.4.dev6 → modal-1.4.4.dev7}/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.4.dev6",
+        version: str = "1.4.4.dev7",
     ):
         """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.4.dev6",
+        version: str = "1.4.4.dev7",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.4.4.dev6 → modal-1.4.4.dev7}/modal/io_streams.py

@@ -501,7 +501,7 @@ class _StreamReader(Generic[T]):
 MAX_BUFFER_SIZE = 2 * 1024 * 1024
 # Larger buffer limit for the exec path via the task command router.
 # This applies only to task_exec_stdin_write; sandbox stdin via the server keeps MAX_BUFFER_SIZE.
-TASK_COMMAND_ROUTER_MAX_BUFFER_SIZE = 16 * 1024 * 1024
+TASK_COMMAND_ROUTER_MAX_BUFFER_SIZE: int = 16 * 1024 * 1024
 
 
 @dataclass(frozen=True)

{modal-1.4.4.dev6 → modal-1.4.4.dev7}/modal/io_streams.pyi

@@ -589,3 +589,5 @@ class StreamWriter:
             ...
 
     drain: __drain_spec
+
+TASK_COMMAND_ROUTER_MAX_BUFFER_SIZE: int

{modal-1.4.4.dev6 → modal-1.4.4.dev7}/modal/sandbox.py

@@ -5,6 +5,7 @@ import enum
 import json
 import os
 import time
+import typing
 import uuid
 from collections.abc import AsyncGenerator, Collection, Sequence
 from dataclasses import dataclass
@@ -1857,6 +1858,7 @@ class _SandboxContainer:
     """Handle to an additional container running in a Sandbox."""
 
     _result: Optional[api_pb2.GenericResult]
+    _filesystem: Optional[_SandboxFilesystem]
 
     def __init__(
         self,
@@ -1869,6 +1871,7 @@ class _SandboxContainer:
         self._container_id = container_id
         self._container_name = container_name
         self._result = result
+        self._filesystem = None
 
     @property
     def object_id(self) -> str:
@@ -1889,6 +1892,40 @@ class _SandboxContainer:
         command_router_client = await self._sandbox._get_command_router_client(task_id)
         return task_id, command_router_client
 
+    @typing.overload
+    async def exec(
+        self,
+        *args: str,
+        stdout: StreamType = StreamType.PIPE,
+        stderr: StreamType = StreamType.PIPE,
+        timeout: Optional[int] = None,
+        workdir: Optional[str] = None,
+        env: Optional[dict[str, Optional[str]]] = None,
+        secrets: Optional[Collection[_Secret]] = None,
+        text: Literal[True] = True,
+        bufsize: Literal[-1, 1] = -1,
+        # Enable a PTY for the command. When enabled, all output (stdout and stderr from the
+        # process) is multiplexed into stdout, and the stderr stream is effectively empty.
+        pty: bool = False,
+    ) -> _ContainerProcess[str]: ...
+
+    @typing.overload
+    async def exec(
+        self,
+        *args: str,
+        stdout: StreamType = StreamType.PIPE,
+        stderr: StreamType = StreamType.PIPE,
+        timeout: Optional[int] = None,
+        workdir: Optional[str] = None,
+        env: Optional[dict[str, Optional[str]]] = None,
+        secrets: Optional[Collection[_Secret]] = None,
+        text: Literal[False],
+        bufsize: Literal[-1, 1] = -1,
+        # Enable a PTY for the command. When enabled, all output (stdout and stderr from the
+        # process) is multiplexed into stdout, and the stderr stream is effectively empty.
+        pty: bool = False,
+    ) -> _ContainerProcess[bytes]: ...
+
     async def exec(
         self,
         *args: str,
@@ -1919,6 +1956,13 @@ class _SandboxContainer:
             container_id=self._container_id,
         )
 
+    @property
+    def filesystem(self) -> _SandboxFilesystem:
+        """Namespace for filesystem APIs."""
+        if self._filesystem is None:
+            self._filesystem = _SandboxFilesystem(self)
+        return self._filesystem
+
     async def wait(self, raise_on_termination: bool = True) -> None:
         if self._result is not None and self._result.status != api_pb2.GenericResult.GENERIC_STATUS_UNSPECIFIED:
             if self._result.status == api_pb2.GenericResult.GENERIC_STATUS_TERMINATED and raise_on_termination:

{modal-1.4.4.dev6 → modal-1.4.4.dev7}/modal/sandbox.pyi

@@ -701,6 +701,7 @@ class _SandboxContainer:
     """Handle to an additional container running in a Sandbox."""
 
     _result: typing.Optional[modal_proto.api_pb2.GenericResult]
+    _filesystem: typing.Optional[modal.sandbox_fs._SandboxFilesystem]
 
     def __init__(
         self,
@@ -724,6 +725,7 @@ class _SandboxContainer:
         """Get task ID and command router client."""
         ...
 
+    @typing.overload
     async def exec(
         self,
         *args: str,
@@ -733,12 +735,29 @@ class _SandboxContainer:
         workdir: typing.Optional[str] = None,
         env: typing.Optional[dict[str, typing.Optional[str]]] = None,
         secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
-        text: bool = True,
+        text: typing.Literal[True] = True,
+        bufsize: typing.Literal[-1, 1] = -1,
+        pty: bool = False,
+    ) -> modal.container_process._ContainerProcess[str]: ...
+    @typing.overload
+    async def exec(
+        self,
+        *args: str,
+        stdout: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
+        stderr: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
+        timeout: typing.Optional[int] = None,
+        workdir: typing.Optional[str] = None,
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
+        text: typing.Literal[False],
         bufsize: typing.Literal[-1, 1] = -1,
         pty: bool = False,
-    ) -> typing.Union[
-        modal.container_process._ContainerProcess[bytes], modal.container_process._ContainerProcess[str]
-    ]: ...
+    ) -> modal.container_process._ContainerProcess[bytes]: ...
+    @property
+    def filesystem(self) -> modal.sandbox_fs._SandboxFilesystem:
+        """Namespace for filesystem APIs."""
+        ...
+
     async def wait(self, raise_on_termination: bool = True) -> None: ...
     async def poll(self) -> typing.Optional[int]: ...
     @typing.overload
@@ -772,6 +791,7 @@ class SandboxContainer:
     """Handle to an additional container running in a Sandbox."""
 
     _result: typing.Optional[modal_proto.api_pb2.GenericResult]
+    _filesystem: typing.Optional[modal.sandbox_fs.SandboxFilesystem]
 
     def __init__(
         self,
@@ -801,6 +821,7 @@ class SandboxContainer:
     _get_command_router: ___get_command_router_spec
 
     class __exec_spec(typing_extensions.Protocol):
+        @typing.overload
         def __call__(
             self,
             /,
@@ -811,12 +832,26 @@ class SandboxContainer:
             workdir: typing.Optional[str] = None,
             env: typing.Optional[dict[str, typing.Optional[str]]] = None,
             secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
-            text: bool = True,
+            text: typing.Literal[True] = True,
             bufsize: typing.Literal[-1, 1] = -1,
             pty: bool = False,
-        ) -> typing.Union[
-            modal.container_process.ContainerProcess[bytes], modal.container_process.ContainerProcess[str]
-        ]: ...
+        ) -> modal.container_process.ContainerProcess[str]: ...
+        @typing.overload
+        def __call__(
+            self,
+            /,
+            *args: str,
+            stdout: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
+            stderr: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
+            timeout: typing.Optional[int] = None,
+            workdir: typing.Optional[str] = None,
+            env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+            secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
+            text: typing.Literal[False],
+            bufsize: typing.Literal[-1, 1] = -1,
+            pty: bool = False,
+        ) -> modal.container_process.ContainerProcess[bytes]: ...
+        @typing.overload
         async def aio(
             self,
             /,
@@ -827,15 +862,33 @@ class SandboxContainer:
             workdir: typing.Optional[str] = None,
             env: typing.Optional[dict[str, typing.Optional[str]]] = None,
             secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
-            text: bool = True,
+            text: typing.Literal[True] = True,
             bufsize: typing.Literal[-1, 1] = -1,
             pty: bool = False,
-        ) -> typing.Union[
-            modal.container_process.ContainerProcess[bytes], modal.container_process.ContainerProcess[str]
-        ]: ...
+        ) -> modal.container_process.ContainerProcess[str]: ...
+        @typing.overload
+        async def aio(
+            self,
+            /,
+            *args: str,
+            stdout: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
+            stderr: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
+            timeout: typing.Optional[int] = None,
+            workdir: typing.Optional[str] = None,
+            env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+            secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
+            text: typing.Literal[False],
+            bufsize: typing.Literal[-1, 1] = -1,
+            pty: bool = False,
+        ) -> modal.container_process.ContainerProcess[bytes]: ...
 
     exec: __exec_spec
 
+    @property
+    def filesystem(self) -> modal.sandbox_fs.SandboxFilesystem:
+        """Namespace for filesystem APIs."""
+        ...
+
     class __wait_spec(typing_extensions.Protocol):
         def __call__(self, /, raise_on_termination: bool = True) -> None: ...
         async def aio(self, /, raise_on_termination: bool = True) -> None: ...

{modal-1.4.4.dev6 → modal-1.4.4.dev7}/modal/sandbox_fs.py

@@ -9,7 +9,10 @@ import time
 import weakref
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Union, cast
+from typing import TYPE_CHECKING, Union, cast
+
+if TYPE_CHECKING:
+    import modal.sandbox
 
 from ._utils.async_utils import synchronize_api
 from ._utils.logger import logger
@@ -84,14 +87,14 @@ class _SandboxFilesystem:
     """mdmd:namespace
     Namespace for Sandbox filesystem APIs."""
 
-    def __init__(self, sandbox):
+    _container: Union["modal.sandbox._Sandbox", "modal.sandbox._SandboxContainer"]
+
+    def __init__(self, container: Union["modal.sandbox._Sandbox", "modal.sandbox._SandboxContainer"]) -> None:
         """mdmd:hidden"""
-        from modal.sandbox import _Sandbox
+        from modal.sandbox import _Sandbox, _SandboxContainer
 
-        # inv type-stubs does not work with importing _Sandbox with TYPE_CHECKING,
-        # so we'll use `cast` as a workaround.
-        # Use a weakref proxy to avoid circular references between Sandbox and SandboxFilesystem.
-        self._sandbox = cast(_Sandbox, weakref.proxy(sandbox))
+        # Use a weakref proxy to avoid circular references between Sandbox/SandboxContainer and SandboxFilesystem.
+        self._container = cast(Union[_Sandbox, _SandboxContainer], weakref.proxy(container))
 
     async def copy_from_local(self, local_path: Union[str, os.PathLike], remote_path: str) -> None:
         """Copy a local file into the Sandbox.
@@ -127,7 +130,7 @@ class _SandboxFilesystem:
         total_bytes = 0
         with open(local_path, "rb") as file_obj:
             with translate_exec_errors("copy_from_local", remote_path):
-                process = await self._sandbox.exec(_SANDBOX_FS_TOOLS_PATH, make_write_file_command(remote_path))
+                process = await self._container.exec(_SANDBOX_FS_TOOLS_PATH, make_write_file_command(remote_path))
                 try:
                     while True:
                         # TODO(saltzm): If this fails, the ContainerProcess will remain alive indefinitely since
@@ -190,7 +193,7 @@ class _SandboxFilesystem:
         t0 = time.monotonic()
         try:
             with translate_exec_errors("copy_to_local", remote_path):
-                process = await self._sandbox.exec(
+                process = await self._container.exec(
                     _SANDBOX_FS_TOOLS_PATH, make_read_file_command(remote_path), text=False
                 )
 
@@ -243,7 +246,7 @@ class _SandboxFilesystem:
 
         t0 = time.monotonic()
         with translate_exec_errors("list_files", remote_path):
-            process = await self._sandbox.exec(_SANDBOX_FS_TOOLS_PATH, make_list_files_command(remote_path))
+            process = await self._container.exec(_SANDBOX_FS_TOOLS_PATH, make_list_files_command(remote_path))
             stdout, stderr, returncode = await asyncio.gather(
                 process.stdout.read(), process.stderr.read(), process.wait()
             )
@@ -299,7 +302,7 @@ class _SandboxFilesystem:
         validate_absolute_remote_path(remote_path, "make_directory")
 
         with translate_exec_errors("make_directory", remote_path):
-            process = await self._sandbox.exec(
+            process = await self._container.exec(
                 _SANDBOX_FS_TOOLS_PATH, make_make_directory_command(remote_path, create_parents)
             )
             stderr, returncode = await asyncio.gather(process.stderr.read(), process.wait())
@@ -331,7 +334,9 @@ class _SandboxFilesystem:
 
         t0 = time.monotonic()
         with translate_exec_errors("read_bytes", remote_path):
-            process = await self._sandbox.exec(_SANDBOX_FS_TOOLS_PATH, make_read_file_command(remote_path), text=False)
+            process = await self._container.exec(
+                _SANDBOX_FS_TOOLS_PATH, make_read_file_command(remote_path), text=False
+            )
             stdout, stderr, returncode = await asyncio.gather(
                 process.stdout.read(), process.stderr.read(), process.wait()
             )
@@ -367,7 +372,7 @@ class _SandboxFilesystem:
 
         t0 = time.monotonic()
         with translate_exec_errors("read_text", remote_path):
-            process = await self._sandbox.exec(_SANDBOX_FS_TOOLS_PATH, make_read_file_command(remote_path))
+            process = await self._container.exec(_SANDBOX_FS_TOOLS_PATH, make_read_file_command(remote_path))
             stdout, stderr, returncode = await asyncio.gather(
                 process.stdout.read(), process.stderr.read(), process.wait()
             )
@@ -421,7 +426,7 @@ class _SandboxFilesystem:
         validate_absolute_remote_path(remote_path, "remove")
 
         with translate_exec_errors("remove", remote_path):
-            process = await self._sandbox.exec(_SANDBOX_FS_TOOLS_PATH, make_remove_command(remote_path, recursive))
+            process = await self._container.exec(_SANDBOX_FS_TOOLS_PATH, make_remove_command(remote_path, recursive))
             stderr, returncode = await asyncio.gather(process.stderr.read(), process.wait())
 
         if returncode != 0:
@@ -452,7 +457,7 @@ class _SandboxFilesystem:
 
         t0 = time.monotonic()
         with translate_exec_errors("stat", remote_path):
-            process = await self._sandbox.exec(_SANDBOX_FS_TOOLS_PATH, make_stat_command(remote_path))
+            process = await self._container.exec(_SANDBOX_FS_TOOLS_PATH, make_stat_command(remote_path))
             stdout, stderr, returncode = await asyncio.gather(
                 process.stdout.read(), process.stderr.read(), process.wait()
             )
@@ -504,7 +509,7 @@ class _SandboxFilesystem:
 
         t0 = time.monotonic()
         with translate_exec_errors("write_bytes", remote_path):
-            process = await self._sandbox.exec(_SANDBOX_FS_TOOLS_PATH, make_write_file_command(remote_path))
+            process = await self._container.exec(_SANDBOX_FS_TOOLS_PATH, make_write_file_command(remote_path))
             try:
                 for offset in range(0, max(len(data), 1), TASK_COMMAND_ROUTER_MAX_BUFFER_SIZE):
                     process.stdin.write(data[offset : offset + TASK_COMMAND_ROUTER_MAX_BUFFER_SIZE])

{modal-1.4.4.dev6 → modal-1.4.4.dev7}/modal/sandbox_fs.pyi

@@ -1,4 +1,5 @@
 import enum
+import modal.sandbox
 import os
 import typing
 import typing_extensions
@@ -78,7 +79,10 @@ class _SandboxFilesystem:
     """mdmd:namespace
     Namespace for Sandbox filesystem APIs.
     """
-    def __init__(self, sandbox):
+
+    _container: typing.Union[modal.sandbox._Sandbox, modal.sandbox._SandboxContainer]
+
+    def __init__(self, container: typing.Union[modal.sandbox._Sandbox, modal.sandbox._SandboxContainer]) -> None:
         """mdmd:hidden"""
         ...
 
@@ -341,7 +345,10 @@ class SandboxFilesystem:
     """mdmd:namespace
     Namespace for Sandbox filesystem APIs.
     """
-    def __init__(self, sandbox):
+
+    _container: typing.Union[modal.sandbox.Sandbox, modal.sandbox.SandboxContainer]
+
+    def __init__(self, container: typing.Union[modal.sandbox.Sandbox, modal.sandbox.SandboxContainer]) -> None:
         """mdmd:hidden"""
         ...
 

{modal-1.4.4.dev6 → modal-1.4.4.dev7}/modal.egg-info/PKG-INFO

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

{modal-1.4.4.dev6 → modal-1.4.4.dev7}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2026
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.4.4.dev6"
+__version__ = "1.4.4.dev7"