modAL 1.3.5.dev0__py3-none-any.whl → 1.3.6.dev0__py3-none-any.whl

modal/_functions.py

@@ -550,6 +550,7 @@ class FunctionStats:
 
     backlog: int
     num_total_runners: int
+    num_running_inputs: int
 
 
 def _parse_retries(
@@ -1917,7 +1918,9 @@ Use the `Function.get_web_url()` method instead.
             api_pb2.FunctionGetCurrentStatsRequest(function_id=self.object_id),
             retry=Retry(total_timeout=10.0),
         )
-        return FunctionStats(backlog=resp.backlog, num_total_runners=resp.num_total_tasks)
+        return FunctionStats(
+            backlog=resp.backlog, num_total_runners=resp.num_total_tasks, num_running_inputs=resp.num_running_inputs
+        )
 
     @live_method
     async def _get_schema(self) -> api_pb2.FunctionSchema:

modal/_output/pty.py

@@ -70,6 +70,7 @@ async def get_app_logs_loop(
     app_id: Optional[str] = None,
     task_id: Optional[str] = None,
     sandbox_id: Optional[str] = None,
+    follow: bool = True,
 ):
     last_log_batch_entry_id = ""
 
@@ -124,7 +125,7 @@ async def get_app_logs_loop(
             app_id=app_id or "",
             task_id=task_id or "",
             sandbox_id=sandbox_id or "",
-            timeout=55,
+            timeout=55 if follow else 0,
             last_entry_id=last_log_batch_entry_id,
         )
         log_batch: api_pb2.TaskLogsBatch
@@ -192,7 +193,7 @@ async def get_app_logs_loop(
                     continue
             raise
 
-        if last_log_batch_entry_id is None:
+        if last_log_batch_entry_id is None or not follow:
             break
 
     await stop_pty_shell()

modal/_output/rich.py

@@ -14,6 +14,7 @@ import platform
 import re
 from collections.abc import Generator
 from datetime import timedelta
+from pathlib import Path
 from typing import Any, Callable
 
 from rich.console import Console, Group, RenderableType
@@ -321,7 +322,11 @@ class RichOutputManager(OutputManager):
         default Python warning display.
         """
         # For non-Modal warnings, fall back to the default display
-        if not issubclass(category, (DeprecationError, PendingDeprecationError, ServerWarning)):
+        import modal
+
+        is_modal_warning = issubclass(category, (DeprecationError, PendingDeprecationError, ServerWarning))
+        filename_in_modal = modal.__path__ and Path(filename).is_relative_to(modal.__path__[0])
+        if not is_modal_warning and not filename_in_modal:
             base_showwarning(warning, category, filename, lineno, file=None, line=None)
             return
 
@@ -334,20 +339,21 @@ class RichOutputManager(OutputManager):
             date = ""
             message = content
 
-        # Try to add source context
-        try:
-            with open(filename, encoding="utf-8", errors="replace") as code_file:
-                source = code_file.readlines()[lineno - 1].strip()
-            message = f"{message}\n\nSource: {filename}:{lineno}\n  {source}"
-        except OSError:
-            # e.g., when filename is "<unknown>"; raises FileNotFoundError on posix but OSError on windows
-            pass
+        # Try to add source context for non-Modal file sources
+        if not filename_in_modal:
+            try:
+                with open(filename, encoding="utf-8", errors="replace") as code_file:
+                    source = code_file.readlines()[lineno - 1].strip()
+                message = f"{message}\n\nSource: {filename}:{lineno}\n  {source}"
+            except OSError:
+                # e.g., when filename is "<unknown>"; raises FileNotFoundError on posix but OSError on windows
+                pass
 
         # Build title
-        if issubclass(category, ServerWarning):
-            title = "Modal Warning"
-        else:
+        if issubclass(category, (DeprecationError, PendingDeprecationError)):
             title = "Modal Deprecation Warning"
+        else:
+            title = "Modal Warning"
         if date:
             title += f" ({date})"
 

modal/_tunnel.py

@@ -10,6 +10,7 @@ from synchronicity.async_wrap import asynccontextmanager
 from modal_proto import api_pb2
 
 from ._utils.async_utils import synchronize_api
+from ._utils.deprecation import deprecation_warning
 from .client import _Client
 from .exception import AlreadyExistsError, InvalidError, RemoteError, ServiceError
 
@@ -29,6 +30,14 @@ class Tunnel:
     @property
     def url(self) -> str:
         """Get the public HTTPS URL of the forwarded port."""
+        if self.unencrypted_host:
+            deprecation_warning(
+                (2026, 3, 5),
+                "`.url` on unencrypted tunnels will be deprecated in a future release. "
+                "For HTTPS, use an encrypted tunnel instead: with `forward()`, call "
+                "`forward(port)` without `unencrypted=True`; with sandboxes, declare the port "
+                "in `encrypted_ports` instead of `unencrypted_ports`.",
+            )
         value = f"https://{self.host}"
         if self.port != 443:
             value += f":{self.port}"

modal/_utils/sandbox_fs_utils.py

@@ -0,0 +1,157 @@
+# Copyright Modal Labs 2026
+import json
+import re
+from contextlib import contextmanager
+from dataclasses import dataclass
+from pathlib import PurePosixPath
+from typing import NoReturn, Optional, Union
+
+from ..config import logger
+from ..exception import (
+    ConnectionError,
+    Error as ModalError,
+    InvalidError,
+    NotFoundError,
+    SandboxFilesystemError,
+    SandboxFilesystemFileTooLargeError,
+    SandboxFilesystemIsADirectoryError,
+    SandboxFilesystemNotADirectoryError,
+    SandboxFilesystemNotFoundError,
+    SandboxFilesystemPermissionError,
+    ServiceError,
+)
+
+_EXEC_SANDBOX_UNAVAILABLE_ERROR_TYPES = (NotFoundError, ServiceError, ConnectionError)
+
+
+@dataclass
+class ErrorPayload:
+    error_kind: str
+    message: str
+
+
+def _stderr_to_text(stderr: Union[str, bytes]) -> str:
+    stderr_bytes = stderr if isinstance(stderr, bytes) else stderr.encode("utf-8")
+    return stderr_bytes.decode("utf-8", errors="replace").strip()
+
+
+def try_parse_error_payload(stderr: Union[str, bytes]) -> Optional[ErrorPayload]:
+    stderr_text = _stderr_to_text(stderr)
+    if not stderr_text:
+        return None
+    try:
+        payload = json.loads(stderr_text)
+    except json.JSONDecodeError:
+        return None
+    if not isinstance(payload, dict):
+        return None
+    error_kind = payload.get("error_kind")
+    message = payload.get("message")
+    if not isinstance(error_kind, str):
+        return None
+    if not isinstance(message, str) or not message.strip():
+        return None
+    return ErrorPayload(error_kind=error_kind, message=message)
+
+
+def raise_read_file_error(returncode: int, stderr: Union[str, bytes], remote_path: str) -> NoReturn:
+    if payload := try_parse_error_payload(stderr):
+        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)
+    return None
+
+
+def _translate_exec_sandbox_unavailable_error(operation: str, path: str, exc: Exception) -> Exception:
+    logger.debug(
+        f"Sandbox filesystem control-plane error for operation={operation}, path={path}: {type(exc).__name__}: {exc}"
+    )
+    return NotFoundError("The Sandbox is unavailable. This Sandbox may have already shut down.")
+
+
+def translate_exec_unexpected_error(operation: str, path: str, exc: Exception) -> Exception:
+    """Translate an unexpected exec-level error into a generic user-facing error.
+
+    This is less than ideal — it discards the original exception and returns a
+    generic message — but it's necessary to avoid surfacing "call to exec()
+    failed"-style messages to users who shouldn't be aware that the filesystem
+    API is implemented in terms of Sandbox.exec().
+    """
+    error_code = _extract_support_error_code(exc)
+    logger.debug(
+        f"Unexpected sandbox filesystem exec error for operation={operation}, path={path}: {type(exc).__name__}: {exc}"
+    )
+    support_suffix = (
+        f"please contact support@modal.com (Error code: {error_code})"
+        if error_code
+        else "please contact support@modal.com"
+    )
+    return SandboxFilesystemError(f"An unexpected error occurred, {support_suffix}")
+
+
+def raise_write_file_error(returncode: int, stderr: Union[str, bytes], remote_path: str) -> NoReturn:
+    if payload := try_parse_error_payload(stderr):
+        if payload.error_kind == "NotDirectory" or payload.error_kind == "AlreadyExists":
+            raise SandboxFilesystemNotADirectoryError(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}")
+        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_write_file_command(remote_path: str) -> str:
+    """Build the JSON command string for a WriteFile 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({"WriteFile": {"path": remote_path}})
+
+
+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({"ReadFile": {"path": remote_path}})
+
+
+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")
+
+
+@contextmanager
+def translate_exec_errors(operation: str, remote_path: str):
+    """Translate exec-level exceptions into user-facing errors."""
+    try:
+        yield
+    except _EXEC_SANDBOX_UNAVAILABLE_ERROR_TYPES as exc:
+        raise _translate_exec_sandbox_unavailable_error(operation, remote_path, exc) from None
+    except ModalError as exc:
+        raise translate_exec_unexpected_error(operation, remote_path, exc) from None

modal/app.py

@@ -439,6 +439,13 @@ class _App:
         environment_name: Optional[str] = None,  # Environment to deploy the App in
         tag: str = "",  # Optional metadata that is specific to this deployment
         client: Optional[_Client] = None,  # Alternate client to use for communication with the server
+        # Deployment strategy:
+        # - 'rolling' (default): Traffic shifts to the new deployment by starting
+        #   new containers gradually. Old containers will continue to process inputs while new
+        #   containers start up.
+        # - 'restart': As part of the deployment, all running containers are terminated. New inputs
+        #   will start new containers.
+        strategy: str = "rolling",
     ) -> typing_extensions.Self:
         """Deploy the App so that it is available persistently.
 
@@ -482,7 +489,10 @@ class _App:
         ```
 
         """
-        from .runner import _deploy_app  # Defer import of runner.py, which imports a lot from Rich
+        from .runner import (  # Defer import of runner.py, which imports a lot from Rich
+            _deploy_app,
+            _validate_deployment_strategy,
+        )
 
         if name is None and self._name is None:
             raise InvalidError(
@@ -493,7 +503,10 @@ class _App:
                 "or\n"
                 'app = modal.App("some-name")'
             )
-        result = await _deploy_app(self, name=name, environment_name=environment_name, tag=tag, client=client)
+        strategy = _validate_deployment_strategy(strategy)
+        result = await _deploy_app(
+            self, name=name, environment_name=environment_name, tag=tag, client=client, deployment_strategy=strategy
+        )
         self._app_id = result.app_id
         return self
 

modal/app.pyi

@@ -310,6 +310,7 @@ class _App:
         environment_name: typing.Optional[str] = None,
         tag: str = "",
         client: typing.Optional[modal.client._Client] = None,
+        strategy: str = "rolling",
     ) -> typing_extensions.Self:
         """Deploy the App so that it is available persistently.
 
@@ -986,6 +987,7 @@ class App:
             environment_name: typing.Optional[str] = None,
             tag: str = "",
             client: typing.Optional[modal.client.Client] = None,
+            strategy: str = "rolling",
         ) -> SUPERSELF:
             """Deploy the App so that it is available persistently.
 
@@ -1038,6 +1040,7 @@ class App:
             environment_name: typing.Optional[str] = None,
             tag: str = "",
             client: typing.Optional[modal.client.Client] = None,
+            strategy: str = "rolling",
         ) -> SUPERSELF:
             """Deploy the App so that it is available persistently.
 

modal/cli/app.py

@@ -84,9 +84,10 @@ async def list_(env: Optional[str] = ENV_OPTION, json: bool = False):
 @app_cli.command("logs", no_args_is_help=True)
 def logs(
     app_identifier: str = APP_IDENTIFIER,
+    follow: bool = typer.Option(False, "-f", "--follow", help="Stream log output until App stops"),
+    timestamps: bool = typer.Option(False, "--timestamps", help="Show timestamps for each log line"),
     *,
     env: Optional[str] = ENV_OPTION,
-    timestamps: bool = typer.Option(False, "--timestamps", help="Show timestamps for each log line"),
 ):
     """Show App logs, streaming while active.
 
@@ -106,7 +107,7 @@ def logs(
 
     """
     app_id = get_app_id(app_identifier, env)
-    stream_app_logs(app_id, show_timestamps=timestamps)
+    stream_app_logs(app_id, show_timestamps=timestamps, follow=follow)
 
 
 @app_cli.command("rollback", no_args_is_help=True, context_settings={"ignore_unknown_options": True})

modal/cli/changelog.py

@@ -118,15 +118,17 @@ def changelog(
 
     Examples:
 
-        modal changelog --since 1.2.0  # Show updates added after a specific version
+    ```bash
+    modal changelog --since 1.2.0  # Show updates added after a specific version
 
-        modal changelog --since 2026-01-01  # Show updates added after a specific date
+    modal changelog --since 2026-01-01  # Show updates added after a specific date
 
-        modal changelog --newer  # Show updates released after the currently installed version
+    modal changelog --newer  # Show updates released after the currently installed version
 
-        modal changelog --last 3  # Show updates included in the 3 most recent releases
+    modal changelog --last 3  # Show updates included in the 3 most recent releases
 
-        modal changelog --for 1.3.1  # Show the changelog for a specific release
+    modal changelog --for 1.3.1  # Show the changelog for a specific release
+    ```
 
     Note: when using `--since` or `--last`, only changes up to the currently installed version are shown.
 

modal/cli/container.py

@@ -23,13 +23,13 @@ container_cli = typer.Typer(name="container", help="Manage and connect to runnin
 
 @container_cli.command("list")
 @synchronizer.create_blocking
-async def list_(env: Optional[str] = ENV_OPTION, json: bool = False):
+async def list_(env: Optional[str] = ENV_OPTION, json: bool = False, app_id: str = ""):
     """List all containers that are currently running."""
     env = ensure_env(env)
     client = await _Client.from_env()
     environment_name = _get_environment_name(env)
     res: api_pb2.TaskListResponse = await client.stub.TaskList(
-        api_pb2.TaskListRequest(environment_name=environment_name)
+        api_pb2.TaskListRequest(environment_name=environment_name, app_id=app_id)
     )
 
     column_names: list[Union[Column, str]] = [
@@ -56,6 +56,7 @@ async def list_(env: Optional[str] = ENV_OPTION, json: bool = False):
 @container_cli.command("logs")
 def logs(
     container_id: str = typer.Argument(help="Container ID"),
+    follow: bool = typer.Option(False, "-f", "--follow", help="Stream log output until Container stops"),
     timestamps: bool = typer.Option(False, "--timestamps", help="Show timestamps for each log line"),
 ):
     """Show logs for a specific container, streaming while active."""
@@ -66,7 +67,7 @@ def logs(
         task_id = container_id
     else:
         raise InvalidError(f"Invalid container ID: {container_id}")
-    stream_app_logs(task_id=task_id, sandbox_id=sandbox_id, show_timestamps=timestamps)
+    stream_app_logs(task_id=task_id, sandbox_id=sandbox_id, show_timestamps=timestamps, follow=follow)
 
 
 @container_cli.command("exec")

modal/cli/run.py

@@ -21,7 +21,7 @@ from ..environments import ensure_env
 from ..exception import ExecutionError, InvalidError, _CliUserExecutionError
 from ..functions import Function
 from ..output import OutputManager
-from ..runner import deploy_app, run_app
+from ..runner import DEPLOYMENT_STRATEGY_TYPE, deploy_app, run_app
 from ..serving import serve_app
 from .import_refs import (
     CLICommand,
@@ -504,6 +504,7 @@ def deploy(
         False, "-m", help="Interpret argument as a Python module path instead of a file/script path"
     ),
     timestamps: bool = typer.Option(False, "--timestamps", help="Show timestamps for each log line."),
+    strategy: DEPLOYMENT_STRATEGY_TYPE = typer.Option("rolling", help="Deployment strategy"),
 ):
     """Deploy a Modal application.
 
@@ -530,10 +531,15 @@ def deploy(
             "modal deploy ... --name=some-name"
         )
 
-    res = deploy_app(app, name=name, environment_name=env or "", tag=tag)
+    res = deploy_app(app, name=name, environment_name=env or "", tag=tag, deployment_strategy=strategy)
 
     if stream_logs:
-        stream_app_logs(app_id=res.app_id, app_logs_url=res.app_logs_url, show_timestamps=timestamps)
+        stream_app_logs(
+            app_id=res.app_id,
+            app_logs_url=res.app_logs_url,
+            show_timestamps=timestamps,
+            follow=True,
+        )
 
 
 def serve(

modal/cli/utils.py

@@ -2,6 +2,7 @@
 import asyncio
 import io
 from collections.abc import Sequence
+from contextlib import nullcontext
 from csv import writer as csv_writer
 from json import dumps
 from typing import Optional, Union
@@ -27,6 +28,7 @@ async def stream_app_logs(
     sandbox_id: Optional[str] = None,
     app_logs_url: Optional[str] = None,
     show_timestamps: bool = False,
+    follow: bool = False,
 ):
     client = await _Client.from_env()
     output_mgr = OutputManager.get()
@@ -34,14 +36,24 @@ async def stream_app_logs(
 
     # Determine the display ID for the status message
     display_id = app_id or sandbox_id or task_id
-    status_text = f"Tailing logs for {display_id}..." if display_id else "Tailing logs..."
+
+    if follow:
+        status_text = f"Following logs for {display_id}..." if display_id else "Following logs..."
+        log_context = output_mgr.show_status_spinner(status_text)
+    else:
+        log_context = nullcontext()
 
     try:
-        with output_mgr.show_status_spinner(status_text):
-            await get_app_logs_loop(client, output_mgr, app_id=app_id, task_id=task_id, sandbox_id=sandbox_id)
-    except asyncio.CancelledError:
-        pass
-    except KeyboardInterrupt:
+        with log_context:
+            await get_app_logs_loop(
+                client,
+                output_mgr,
+                app_id=app_id,
+                task_id=task_id,
+                sandbox_id=sandbox_id,
+                follow=follow,
+            )
+    except (asyncio.CancelledError, KeyboardInterrupt):
         pass
 
 

modal/client.pyi

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

modal/exception.py

@@ -333,3 +333,39 @@ class ClientClosed(Error):
 
 class FilesystemExecutionError(Error):
     """Raised when an unknown error is thrown during a container filesystem operation."""
+
+
+class SandboxFilesystemError(Error):
+    """Base class for sandbox filesystem errors."""
+
+    pass
+
+
+class SandboxFilesystemNotFoundError(SandboxFilesystemError):
+    """Raised when a file or directory is not found in the sandbox."""
+
+    pass
+
+
+class SandboxFilesystemIsADirectoryError(SandboxFilesystemError):
+    """Raised when a file operation in the sandbox targets a directory when it should target a non-directory file."""
+
+    pass
+
+
+class SandboxFilesystemNotADirectoryError(SandboxFilesystemError):
+    """Raised when a path component in the sandbox is not a directory."""
+
+    pass
+
+
+class SandboxFilesystemPermissionError(SandboxFilesystemError):
+    """Raised when permission is denied for a file operation in the sandbox."""
+
+    pass
+
+
+class SandboxFilesystemFileTooLargeError(SandboxFilesystemError):
+    """Raised when a file exceeds the maximum allowed size for a read operation in the sandbox."""
+
+    pass

modal/experimental/flash.py

@@ -149,7 +149,7 @@ class _FlashManager:
                         timeout=10,
                         retry=None,
                     )
-                    logger.info(f"Listening at {resp.url} over {self.tunnel.url} for task_id {self.task_id}")
+                    logger.warning(f"Listening at {resp.url} over {self.tunnel.url} for task_id {self.task_id}")
                     return True
             except asyncio.CancelledError:
                 logger.warning("Waited too long for port to start accepting connections. Shutting down...")