modal 1.3.5.dev0__tar.gz → 1.3.6.dev0__tar.gz

modal-1.3.6.dev0/LICENSE

@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

{modal-1.3.5.dev0 → modal-1.3.6.dev0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.3.5.dev0
+Version: 1.3.6.dev0
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Homepage, https://modal.com
 Project-URL: Source, https://github.com/modal-labs/modal-client
 Project-URL: Documentation, https://modal.com/docs
@@ -11,10 +11,10 @@ Project-URL: Issue Tracker, https://github.com/modal-labs/modal-client/issues
 Keywords: modal,client,cloud,serverless,infrastructure
 Classifier: Topic :: System :: Distributed Computing
 Classifier: Operating System :: OS Independent
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Requires-Python: <3.15,>=3.10
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: aiohttp
 Requires-Dist: cbor2
 Requires-Dist: certifi
@@ -30,6 +30,7 @@ Requires-Dist: types-certifi
 Requires-Dist: types-toml
 Requires-Dist: watchfiles
 Requires-Dist: typing_extensions~=4.6
+Dynamic: license-file
 
 # Modal Python SDK
 

{modal-1.3.5.dev0 → modal-1.3.6.dev0}/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-1.3.5.dev0 → modal-1.3.6.dev0}/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-1.3.5.dev0 → modal-1.3.6.dev0}/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-1.3.5.dev0 → modal-1.3.6.dev0}/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-1.3.6.dev0/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-1.3.5.dev0 → modal-1.3.6.dev0}/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-1.3.5.dev0 → modal-1.3.6.dev0}/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-1.3.5.dev0 → modal-1.3.6.dev0}/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-1.3.5.dev0 → modal-1.3.6.dev0}/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-1.3.5.dev0 → modal-1.3.6.dev0}/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-1.3.5.dev0 → modal-1.3.6.dev0}/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(