modal 1.5.4.dev16__tar.gz → 1.5.4.dev17__tar.gz

{modal-1.5.4.dev16 → modal-1.5.4.dev17}/PKG-INFO

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

{modal-1.5.4.dev16 → modal-1.5.4.dev17}/modal/cli/container.py

@@ -1,4 +1,6 @@
 # Copyright Modal Labs 2022
+import asyncio
+import dataclasses
 import warnings
 from datetime import datetime, timezone
 
@@ -24,14 +26,16 @@ from modal.cli.utils import (
     yes_option,
 )
 from modal.client import _Client
-from modal.exception import InvalidError
-from modal.sandbox import _container_exec
+from modal.exception import ConflictError, InvalidError
+from modal.sandbox import SandboxVersion, _container_exec, _get_sandbox_version, _Sandbox
 from modal_proto import api_pb2
 
 from ._help import ModalGroup
 
 container_cli = ModalGroup(name="container", help="Manage and connect to running containers.")
 
+_SANDBOX_TASK_ID_WAIT_SECS = 55.0
+
 
 @container_cli.command("list")
 @click.option("--app-id", default="", help="List containers running for a specific App.")
@@ -149,6 +153,13 @@ async def logs(
     else:
         raise InvalidError(f"Invalid container ID: {container_id}")
 
+    is_v2_sandbox = sandbox_id is not None and _get_sandbox_version(sandbox_id) == SandboxVersion.V2
+
+    if follow and is_v2_sandbox:
+        raise UsageError(
+            "Following logs (-f/--follow) is not supported for this Sandbox. Re-run without -f to fetch its logs."
+        )
+
     if follow and (since or until or tail):
         raise UsageError("--follow cannot be combined with --since, --until, or --tail.")
 
@@ -190,32 +201,52 @@ async def logs(
         # Resolve the app_id for the container.
         client = await _Client.from_env()
 
-        if sandbox_id:
-            sb_resp = await client.stub.SandboxGetTaskId(api_pb2.SandboxGetTaskIdRequest(sandbox_id=sandbox_id))
-            task_id = sb_resp.task_id
+        enqueued_dt: datetime | None = None
+        finished_dt: datetime | None = None
+
+        if is_v2_sandbox:
+            assert sandbox_id is not None
+            sandbox = await _Sandbox.from_id(sandbox_id, client)
+            app_id = sandbox._app_id or ""
+            try:
+                task_id = await asyncio.wait_for(
+                    sandbox._get_task_id(raise_if_task_complete=True),
+                    timeout=_SANDBOX_TASK_ID_WAIT_SECS,
+                )
+            except (asyncio.TimeoutError, ConflictError):
+                # No container ran (still queued, or finished before starting), so there are no
+                # logs. Returning empty is consistent with other no-logs-yet cases (e.g. logs not
+                # yet flushed to ClickHouse), so we don't warn.
+                return
+            log_filters = dataclasses.replace(log_filters, sandbox_id="", task_id=task_id)
+        else:
+            if sandbox_id:
+                sb_resp = await client.stub.SandboxGetTaskId(api_pb2.SandboxGetTaskIdRequest(sandbox_id=sandbox_id))
+                task_id = sb_resp.task_id
 
-        assert task_id
-        task_info_resp = await client.stub.TaskGetInfo(api_pb2.TaskGetInfoRequest(task_id=task_id))
-        app_id = task_info_resp.app_id
+            assert task_id
+            task_info_resp = await client.stub.TaskGetInfo(api_pb2.TaskGetInfoRequest(task_id=task_id))
+            app_id = task_info_resp.app_id
 
-        if not task_info_resp.info.enqueued_at:
-            return
+            if not task_info_resp.info.enqueued_at:
+                return
 
-        container_enqueued_dt = datetime.fromtimestamp(task_info_resp.info.enqueued_at, timezone.utc)
+            enqueued_dt = datetime.fromtimestamp(task_info_resp.info.enqueued_at, timezone.utc)
+            if task_info_resp.info.finished_at:
+                finished_dt = datetime.fromtimestamp(task_info_resp.info.finished_at, timezone.utc)
 
         now = datetime.now(timezone.utc)
+        # V2 Sandboxes don't expose task enqueue/finish times to the client, so fall back to the
+        # widest single-query window. This can miss logs older than _MAX_FETCH_RANGE for workspaces
+        # whose custom log retention window exceeds it.
+        default_since_dt = enqueued_dt or (now - _MAX_FETCH_RANGE)
+        default_until_dt = finished_dt or now
+
         if all_logs:
-            since_dt = container_enqueued_dt
-            if task_info_resp.info.finished_at:
-                until_dt = datetime.fromtimestamp(task_info_resp.info.finished_at, timezone.utc)
-            else:
-                until_dt = now
+            since_dt = default_since_dt
+            until_dt = default_until_dt
         else:
-            since_dt = _parse_time_arg(since, default=container_enqueued_dt)
-            if task_info_resp.info.finished_at:
-                default_until_dt = datetime.fromtimestamp(task_info_resp.info.finished_at, timezone.utc)
-            else:
-                default_until_dt = now
+            since_dt = _parse_time_arg(since, default=default_since_dt)
             until_dt = _parse_time_arg(until, default=default_until_dt)
 
         if since is not None and until is not None and since_dt >= until_dt:

{modal-1.5.4.dev16 → modal-1.5.4.dev17}/modal/cli/run.py

@@ -539,6 +539,13 @@ def run(
     help="Deployment strategy",
     type=click.Choice(get_args(DEPLOYMENT_STRATEGY_TYPE)),
 )
+@click.option(
+    "--staged",
+    "staged",
+    is_flag=True,
+    default=False,
+    hidden=True,
+)
 def deploy(
     app_ref: str,
     name: str = "",
@@ -548,6 +555,7 @@ def deploy(
     use_module_mode: bool = False,
     timestamps: bool = False,
     strategy: str = "rolling",
+    staged: bool = False,
 ):
     """Deploy a Modal application.
 
@@ -578,7 +586,14 @@ def deploy(
             "modal deploy ... --name=some-name"
         )
 
-    res = deploy_app(app, name=name, environment_name=env or "", tag=tag, deployment_strategy=strategy)
+    res = deploy_app(
+        app,
+        name=name,
+        environment_name=env or "",
+        tag=tag,
+        deployment_strategy=strategy,
+        staged=staged,
+    )
 
     if stream_logs:
         # stream_app_logs is defined in cli/utils.py, which does not get type stubs

{modal-1.5.4.dev16 → modal-1.5.4.dev17}/modal/cli/workspace.py

@@ -3,6 +3,8 @@ import json as json_mod
 
 import click
 import rich
+import rich.box
+import rich.table
 
 from modal._utils.time_utils import timestamp_to_localized_str
 from modal.cli.utils import confirm_or_suggest_yes, display_table, yes_option
@@ -46,15 +48,26 @@ def members_list(json: bool = False):
 
 PROXY_TOKENS_HELP_TEXT = """Manage the proxy tokens of the current Workspace.
 
-Proxy tokens provide authentication to HTTP interfaces on Modal Servers and Web Functions.
-They are passed as request headers (`Modal-Key` and `Modal-Secret`). On Modal Servers and
-Endpoints they can also be joined into a single `Authorization: Bearer
-wk-<id>.ws-<secret>` header, which OpenAI-compatible clients accept as an API key. See
-https://modal.com/docs/guide/webhook-proxy-auth for more information.
+Proxy tokens provide authentication to Modal Endpoints, Servers, and Web Functions.
 
 Proxy tokens and secrets have `wk-` and `ws-` prefixes, respectively. They cannot be
 interchanged with API tokens (which use `ak-` and `as-` prefixes).
 
+Proxy tokens are passed as request headers, either as a key / secret pair:
+
+```
+Modal-Key: wk-123
+Modal-Secret: ws-456
+```
+
+Or as a single Bearer token:
+
+```
+Authorization: Bearer wk-123.ws-456
+```
+
+See https://modal.com/docs/guide/webhook-proxy-auth for more information.
+
 On workspaces with RBAC enabled, tokens are scoped to specific environments;
 use the `allow` and `revoke` commands to manage environment associations.
 """
@@ -85,13 +98,10 @@ def proxy_tokens_create(*, json: bool = False):
             )
         )
     else:
-        output_manager.print(
-            f"Modal-Key: {token.token_id}\n"
-            f"Modal-Secret: {token.token_secret}\n"
-            "\n"
-            "Or as a single header (Endpoints and Servers only):\n"
-            f"Authorization: {bearer}"
-        )
+        table = rich.table.Table(show_header=False, box=rich.box.HORIZONTALS, show_lines=True)
+        table.add_row(f"Modal-Key: {token.token_id}\nModal-Secret: {token.token_secret}")
+        table.add_row(f"Authorization: {bearer}")
+        output_manager.print(table)
 
 
 @proxy_tokens_cli.command("list", help="List the proxy tokens of the current Workspace.")
@@ -138,8 +148,7 @@ def proxy_tokens_revoke(token_id: str, environment_name: str):
 def proxy_tokens_delete(token_id: str, yes: bool = False):
     if not yes:
         message = (
-            f"Are you sure you want to delete proxy token {token_id!r}? "
-            "Any web endpoints relying on it will no longer accept it."
+            f"Are you sure you want to delete proxy token {token_id!r}? Requests using this token will be rejected."
         )
         confirm_or_suggest_yes(message)
     Workspace.from_context().proxy_tokens.delete(token_id)

{modal-1.5.4.dev16 → modal-1.5.4.dev17}/modal/client.pyi

@@ -37,7 +37,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.4.dev16",
+        version: str = "1.5.4.dev17",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -207,7 +207,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.4.dev16",
+        version: str = "1.5.4.dev17",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.5.4.dev16 → modal-1.5.4.dev17}/modal/functions.pyi

@@ -546,7 +546,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER:
             """Calls the function remotely, executing it with the given arguments and returning the execution's result.
 
@@ -571,7 +571,7 @@ class Function(
             """
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -621,7 +621,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """[Experimental] Calls the function with the given arguments, without waiting for the results.
 
@@ -654,7 +654,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -662,7 +662,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """Calls the function with the given arguments, without waiting for the results.
 
@@ -695,7 +695,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function.

{modal-1.5.4.dev16 → modal-1.5.4.dev17}/modal/runner.py

@@ -280,10 +280,14 @@ async def _publish_app(
     commit_info: api_pb2.CommitInfo | None = None,  # Git commit information
     deployment_strategy: str = "rolling",
     environment_name: str | None = None,
+    staged: bool = False,
 ) -> tuple[str, list[api_pb2.Warning], float]:
     """Wrapper for AppPublish RPC."""
     deployment_strategy = _validate_deployment_strategy(deployment_strategy)
 
+    if staged and deployment_strategy == "recreate":
+        raise InvalidError("Cannot use `recreate` deployment strategy with a staged deployment")
+
     functions = app_local_state.functions
     definition_ids = {obj.object_id: obj._get_metadata().definition_id for obj in functions.values()}  # type: ignore
 
@@ -297,6 +301,7 @@ async def _publish_app(
         function_ids=running_app.function_ids,
         class_ids=running_app.class_ids,
         definition_ids=definition_ids,
+        staged=staged,
     )
     response = await client.stub.AppPublish(request)
     print_server_warnings(response.server_warnings)
@@ -590,6 +595,7 @@ async def _deploy_app(
     tag: str = "",
     deployment_strategy: str = "rolling",
     client: _Client | None = None,
+    staged: bool = False,
 ) -> DeployResult:
     """Internal function for deploying an App.
 
@@ -665,6 +671,7 @@ async def _deploy_app(
                 commit_info=commit_info,
                 environment_name=root_load_context.environment_name,
                 deployment_strategy=deployment_strategy,
+                staged=staged,
             )
         except Exception as e:
             # Note that AppClientDisconnect only stops the app if it's still initializing, and is a no-op otherwise.

{modal-1.5.4.dev16 → modal-1.5.4.dev17}/modal/runner.pyi

@@ -53,6 +53,7 @@ async def _publish_app(
     commit_info: typing.Optional[modal_proto.api_pb2.CommitInfo] = None,
     deployment_strategy: str = "rolling",
     environment_name: typing.Optional[str] = None,
+    staged: bool = False,
 ) -> tuple[str, list[modal_proto.api_pb2.Warning], float]:
     """Wrapper for AppPublish RPC."""
     ...
@@ -131,6 +132,7 @@ async def _deploy_app(
     tag: str = "",
     deployment_strategy: str = "rolling",
     client: typing.Optional[modal.client._Client] = None,
+    staged: bool = False,
 ) -> DeployResult:
     """Internal function for deploying an App.
 
@@ -238,6 +240,7 @@ class __deploy_app_spec(typing_extensions.Protocol):
         tag: str = "",
         deployment_strategy: str = "rolling",
         client: typing.Optional[modal.client.Client] = None,
+        staged: bool = False,
     ) -> DeployResult:
         """Internal function for deploying an App.
 
@@ -255,6 +258,7 @@ class __deploy_app_spec(typing_extensions.Protocol):
         tag: str = "",
         deployment_strategy: str = "rolling",
         client: typing.Optional[modal.client.Client] = None,
+        staged: bool = False,
     ) -> DeployResult:
         """Internal function for deploying an App.
 

{modal-1.5.4.dev16 → modal-1.5.4.dev17}/modal.egg-info/PKG-INFO

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