modal 1.6.4.dev8__tar.gz → 1.6.4.dev10__tar.gz

{modal-1.6.4.dev8 → modal-1.6.4.dev10}/PKG-INFO

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

modal-1.6.4.dev10/modal/_audit_logs/__init__.py

@@ -0,0 +1 @@
+# Copyright Modal Labs 2026

modal-1.6.4.dev10/modal/_audit_logs/_rpcs.py

@@ -0,0 +1,66 @@
+# Copyright Modal Labs 2026
+"""The audit log RPCs, one call each, retried with backoff. Ordering and batching live in list.py."""
+
+from __future__ import annotations
+
+from collections.abc import Awaitable, Callable
+from typing import TYPE_CHECKING, TypeVar
+
+from modal._utils.grpc_utils import Retry
+from modal_proto import api_pb2
+
+if TYPE_CHECKING:
+    from modal.client import _Client
+
+
+_Resp = TypeVar("_Resp")
+
+
+_MAX_RETRIES = 4
+_PLAN_MAX_RETRIES = 2
+
+
+async def _call(
+    rpc: Callable[..., Awaitable[_Resp]], req: object, *, timeout: float, max_retries: int = _MAX_RETRIES
+) -> _Resp:
+    """Call with backoff on timeouts and transient errors; rate and resource limits wait as the server says."""
+    retry = Retry(base_delay=1.0, delay_factor=2.0, max_delay=8.0, max_retries=max_retries, attempt_timeout=timeout)
+    return await rpc(req, retry=retry)
+
+
+async def get_settings(client: _Client) -> api_pb2.AuditLogSettingsGetResponse:
+    return await client._stub.AuditLogSettingsGet(api_pb2.AuditLogSettingsGetRequest())
+
+
+async def count_entries(
+    client: _Client, q: str, oldest_ms: int, newest_ms: int, config: api_pb2.AuditLogSettingsGetResponse
+) -> int:
+    req = api_pb2.AuditLogCountRequest(q=q, oldest_ms=oldest_ms, newest_ms=newest_ms)
+    resp = await _call(client._stub.AuditLogCount, req, timeout=config.request_timeout_secs)
+    return resp.count
+
+
+async def list_page(
+    client: _Client,
+    q: str,
+    oldest_ms: int,
+    newest_ms: int,
+    limit: int,
+    config: api_pb2.AuditLogSettingsGetResponse,
+    newest_cursor: api_pb2.AuditLogCursor | None = None,
+    oldest_cursor: api_pb2.AuditLogCursor | None = None,
+) -> api_pb2.AuditLogListResponse:
+    req = api_pb2.AuditLogListRequest(q=q, oldest_ms=oldest_ms, newest_ms=newest_ms, limit=limit)
+    if newest_cursor is not None:
+        req.newest_cursor.CopyFrom(newest_cursor)
+    if oldest_cursor is not None:
+        req.oldest_cursor.CopyFrom(oldest_cursor)
+    return await _call(client._stub.AuditLogList, req, timeout=config.request_timeout_secs)
+
+
+async def plan_buckets(
+    client: _Client, q: str, oldest_ms: int, newest_ms: int, config: api_pb2.AuditLogSettingsGetResponse
+) -> list[api_pb2.AuditLogCursor]:
+    req = api_pb2.AuditLogBucketsRequest(q=q, oldest_ms=oldest_ms, newest_ms=newest_ms, bucket_size=config.bucket_size)
+    resp = await _call(client._stub.AuditLogPlan, req, timeout=config.plan_timeout_secs, max_retries=_PLAN_MAX_RETRIES)
+    return list(resp.cursors)

modal-1.6.4.dev10/modal/_audit_logs/count.py

@@ -0,0 +1,17 @@
+# Copyright Modal Labs 2026
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from modal._audit_logs import _rpcs
+from modal_proto import api_pb2
+
+if TYPE_CHECKING:
+    from modal.client import _Client
+
+
+async def count_audit_logs(
+    client: _Client, q: str, oldest_ms: int, newest_ms: int, config: api_pb2.AuditLogSettingsGetResponse
+) -> int:
+    """Count the entries in [oldest_ms, newest_ms) that match the query."""
+    return await _rpcs.count_entries(client, q, oldest_ms, newest_ms, config)

modal-1.6.4.dev10/modal/_audit_logs/list.py

@@ -0,0 +1,83 @@
+# Copyright Modal Labs 2026
+from __future__ import annotations
+
+from collections.abc import AsyncGenerator
+from contextlib import aclosing
+
+from modal._audit_logs import _rpcs
+from modal._utils.async_utils import async_map_ordered
+from modal.client import _Client
+from modal_proto import api_pb2
+
+# (newest_cursor, oldest_cursor); None where the bucket is open-ended.
+Bucket = tuple[api_pb2.AuditLogCursor | None, api_pb2.AuditLogCursor | None]
+
+
+async def get_bucket_cursors(
+    client: _Client, q: str, oldest_ms: int, newest_ms: int, config: api_pb2.AuditLogSettingsGetResponse
+) -> list[Bucket]:
+    """Split the range into buckets, as (newest_cursor, oldest_cursor) pairs ordered oldest to newest.
+
+    The first bucket has no oldest cursor and the last has no newest cursor.
+    """
+    cursors = await _rpcs.plan_buckets(client, q, oldest_ms, newest_ms, config)
+    return list(zip([None, *cursors], [*cursors, None]))[::-1]
+
+
+async def _fetch_bucket(
+    client: _Client,
+    q: str,
+    oldest_ms: int,
+    newest_ms: int,
+    config: api_pb2.AuditLogSettingsGetResponse,
+    bucket: Bucket,
+) -> list[api_pb2.AuditLogEntry]:
+    """Read one bucket's entries, oldest to newest, using pagination"""
+    newest_cursor, oldest_cursor = bucket
+    entries: list[api_pb2.AuditLogEntry] = []
+    while True:
+        resp = await _rpcs.list_page(
+            client, q, oldest_ms, newest_ms, config.page_size, config, newest_cursor, oldest_cursor
+        )
+        entries.extend(resp.items)
+        # Skips the empty request a full last page would otherwise trigger; an unset next_cursor also ends the loop.
+        if oldest_cursor is not None and resp.items and resp.items[-1].id == oldest_cursor.id:
+            break
+        if not resp.HasField("next_cursor"):
+            break
+        newest_cursor = resp.next_cursor
+    entries.reverse()
+    return entries
+
+
+async def fetch_audit_logs(
+    q: str,
+    oldest_ms: int,
+    newest_ms: int,
+    *,
+    client: _Client | None = None,
+    config: api_pb2.AuditLogSettingsGetResponse,
+) -> AsyncGenerator[api_pb2.AuditLogEntry]:
+    """Yield the range's entries from the oldest to the newest, one bucket at a time.
+
+    At most `max_concurrent_requests` buckets are fetched at once, and at most `max_buffered_buckets` are fetched
+    or held at once. A new bucket is admitted only after the consumer has taken all of a bucket's entries, so a slow
+    consumer or a stalled request cannot grow memory.
+    If any request fails after its attempts, the remaining requests are cancelled and the error is raised.
+    """
+    if client is None:
+        client = await _Client.from_env()
+    buckets = await get_bucket_cursors(client, q, oldest_ms, newest_ms, config)
+
+    async def bucket_stream() -> AsyncGenerator[Bucket]:
+        for bucket in buckets:
+            yield bucket
+
+    async def fetch(bucket: Bucket) -> list[api_pb2.AuditLogEntry]:
+        return await _fetch_bucket(client, q, oldest_ms, newest_ms, config, bucket)
+
+    fetched = async_map_ordered(bucket_stream(), fetch, config.max_concurrent_requests, config.max_buffered_buckets)
+    async with aclosing(fetched) as stream:
+        async for entries in stream:
+            for entry in entries:
+                yield entry

{modal-1.6.4.dev8 → modal-1.6.4.dev10}/modal/_image.py

@@ -584,6 +584,7 @@ class _Image(_Object, type_prefix="im"):
     ]  # added as mounts on any container referencing the Image, see `def _mount_layers`
     _added_python_source_set: frozenset[str]  # used to warn about missing mounts during auto-mount deprecation
     _metadata: api_pb2.ImageMetadata | None = None  # set on hydration, private for now
+    _cache_hit: bool | None = None  # set when built, True if an existing build was reused
     _is_empty: bool
     _build_steps: list[api_pb2.ImageBuildStep] | None = None
     # A failed image ID is only queryable through the client that performed the build.
@@ -832,6 +833,7 @@ class _Image(_Object, type_prefix="im"):
             result: api_pb2.GenericResult
             metadata: api_pb2.ImageMetadata | None = None
 
+            self._cache_hit = bool(resp.result.status)
             if resp.result.status:
                 # image already built
                 result = resp.result
@@ -2062,8 +2064,7 @@ class _Image(_Object, type_prefix="im"):
         if not isinstance(entrypoint_commands, list) or not all(isinstance(x, str) for x in entrypoint_commands):
             raise InvalidError("entrypoint_commands must be a list of strings.")
         args = _flatten_str_args("entrypoint", "entrypoint_commands", entrypoint_commands)
-        args_str = '"' + '", "'.join(args) + '"' if args else ""
-        dockerfile_cmd = f"ENTRYPOINT [{args_str}]"
+        dockerfile_cmd = f"ENTRYPOINT {json.dumps(args, ensure_ascii=False)}"
 
         return self.dockerfile_commands(dockerfile_cmd)
 
@@ -2083,8 +2084,7 @@ class _Image(_Object, type_prefix="im"):
         if not isinstance(shell_commands, list) or not all(isinstance(x, str) for x in shell_commands):
             raise InvalidError("shell_commands must be a list of strings.")
         args = _flatten_str_args("shell", "shell_commands", shell_commands)
-        args_str = '"' + '", "'.join(args) + '"' if args else ""
-        dockerfile_cmd = f"SHELL [{args_str}]"
+        dockerfile_cmd = f"SHELL {json.dumps(args, ensure_ascii=False)}"
 
         return self.dockerfile_commands(dockerfile_cmd)
 
@@ -3074,8 +3074,7 @@ class _Image(_Object, type_prefix="im"):
             raise InvalidError("Image CMD must be a list of strings.")
 
         cmd_args = _flatten_str_args("cmd", "cmd", cmd)
-        cmd_str = '"' + '", "'.join(cmd_args) + '"' if cmd_args else ""
-        dockerfile_cmd = f"CMD [{cmd_str}]"
+        dockerfile_cmd = f"CMD {json.dumps(cmd_args, ensure_ascii=False)}"
 
         return self.dockerfile_commands(dockerfile_cmd)
 

{modal-1.6.4.dev8 → modal-1.6.4.dev10}/modal/cli/image.py

@@ -42,6 +42,26 @@ def _print_result_summary(count: int) -> None:
     OutputManager.get().print(f"Showing {count} {result_label}")
 
 
+async def _build_and_publish(image: _Image, image_ref: str, app: _App, env: str, name: Optional[str]) -> None:
+    built_image = await image.build(app)
+
+    output_mgr = OutputManager.get()
+    if built_image._cache_hit:
+        message = f"Used a cached pull of [bold]{image_ref}[/bold] as [bold]{built_image.object_id}[/bold]"
+        # A digest reference can't change in the registry, so pulling it again would be a no-op
+        if "@" not in image_ref:
+            message += " [dim](Pass --force-build to pull it from the registry again.)[/dim]"
+        output_mgr.step_completed(message)
+    else:
+        output_mgr.step_completed(f"Pulled [bold]{image_ref}[/bold] as [bold]{built_image.object_id}[/bold]")
+    if name:
+        upgraded_image_name = _upgrade_image_name(name, fallback_environment_name=env)
+        await built_image.publish(upgraded_image_name)
+        output_mgr.step_completed(f"Image published as [bold magenta]{upgraded_image_name}[/bold magenta]! 🎉")
+        output_mgr.print("\nUse it with:\n")
+        output_mgr.print(Syntax(f'modal.Image.from_name("{upgraded_image_name}")', "python"))
+
+
 async def _registry_secret(
     secret_name: Optional[str], secret_vars: Optional[str], env: str
 ) -> tuple[Optional[_Secret], set[str]]:
@@ -56,6 +76,15 @@ async def _registry_secret(
     return _Secret.from_local_environ(keys), set(keys)
 
 
+def _check_registry_host(image_ref: str) -> None:
+    first, sep, _ = image_ref.partition("/")
+    # A leading path component is a registry host only if it looks like one; otherwise it's a Docker Hub name
+    if not sep or ("." not in first and ":" not in first and first != "localhost"):
+        raise click.UsageError(
+            f"IMAGE_REF must start with the registry host, e.g. docker.io/{image_ref} for a Docker Hub image."
+        )
+
+
 @image_cli.command("build", no_args_is_help=True)
 @click.argument("context_dir", metavar="CONTEXT_DIR")
 @click.option(
@@ -154,6 +183,100 @@ async def build(
     output_mgr.print(Syntax(f'modal.Image.from_name("{tag}")', "python"))
 
 
+@image_cli.command("pull", no_args_is_help=True)
+@click.argument("image_ref")
+@click.option(
+    "--name",
+    "name",
+    metavar="[ENV/]NAME[:TAG]",
+    help="Publish the pulled Image under this name. An ENV/ prefix publishes it to that Environment.",
+)
+@click.option(
+    "--registry-secret",
+    "registry_secret_name",
+    default=None,
+    help="Name of a modal.Secret holding registry credentials.",
+)
+@click.option(
+    "--registry-secret-from-env",
+    "registry_secret_vars",
+    default=None,
+    metavar="VAR[,VAR...]",
+    help=(
+        "Comma-separated local environment variable names holding registry credentials. "
+        "Cannot be combined with --registry-secret."
+    ),
+)
+@click.option(
+    "--force-build",
+    is_flag=True,
+    help="Pull the image from the registry again, replacing a cached Image.",
+)
+@env_option
+@synchronizer.create_blocking
+async def pull(
+    image_ref: str,
+    *,
+    name: Optional[str] = None,
+    registry_secret_name: Optional[str] = None,
+    registry_secret_vars: Optional[str] = None,
+    force_build: bool = False,
+    env: Optional[str] = None,
+) -> None:
+    """Pull an Image from a container registry into Modal.
+
+    The `image_ref` is a registry image name (and optional tag), as passed to `modal.Image.from_registry`.
+    It must start with the registry host, e.g. `docker.io/node:20` for a Docker Hub image.
+    If `--name` is provided, the Modal Image will also be published under that name.
+    Use `ENV/NAME` to publish to another Environment; `--env` still selects the Environment
+    used for the pull and for looking up `--registry-secret`.
+
+    Examples:
+
+    ```bash
+    modal image pull docker.io/node:20
+    modal image pull nvcr.io/nvidia/pytorch:25.01-py3 --name pytorch:25
+    modal image pull docker.io/node:20 --name prod/node:20
+    ```
+
+    Pass `--force-build` to pull a tag again after it changes in the registry, e.g. `latest`.
+
+    Private registries need credentials from a `modal.Secret`, either one that already exists
+    (`--registry-secret`) or one assembled from local environment variables (`--registry-secret-from-env`).
+    The kind of authentication follows from the keys in the credentials:
+
+    - AWS: `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and `AWS_REGION` (optionally `AWS_SESSION_TOKEN`),
+      or `AWS_ROLE_ARN` and `AWS_REGION` to assume a role with OIDC
+    - GCP: `SERVICE_ACCOUNT_JSON`, holding the service account key's JSON
+    - Username and password: `REGISTRY_USERNAME` and `REGISTRY_PASSWORD`
+
+    ```bash
+    # Authenticate with a named Secret
+    modal image pull ghcr.io/my-org/my-image --registry-secret my-registry-secret
+
+    # Authenticate with credentials in environment variables
+    modal image pull $AWS_ECR_URL/my-image \\
+        --registry-secret-from-env AWS_ACCESS_KEY_ID,AWS_SECRET_ACCESS_KEY,AWS_REGION
+    ```
+
+    """
+    _check_registry_host(image_ref)
+    env = ensure_env(env)
+    secret, keys = await _registry_secret(registry_secret_name, registry_secret_vars, env)
+    if secret is not None:
+        # Fail before creating the app; from_registry runs the same check during the build
+        try:
+            _infer_registry_auth_type(keys)
+        except InvalidError as exc:
+            raise click.UsageError(str(exc)) from exc
+    image = _Image.from_registry(image_ref, secret, force_build=force_build)
+
+    app = _App("modal-image-pull")
+    async with _run_app(app, environment_name=env, stream_output=False):
+        OutputManager.get().print(f"Pulling [bold]{image_ref}[/bold]")
+        await _build_and_publish(image, image_ref, app, env, name)
+
+
 @image_cli.command("logs", no_args_is_help=True)
 @click.argument("image_id")
 @click.option(

{modal-1.6.4.dev8 → modal-1.6.4.dev10}/modal/cli/shell.py

@@ -448,7 +448,7 @@ def shell(
     app = App("modal shell")
 
     # NB: invoking under bash makes --cmd a lot more flexible.
-    cmds = shlex.split(f'/bin/bash -c "{cmd}"')
+    cmds = ["/bin/bash", "-c", cmd]
     timeout = 3600
     parsed_experimental_options = _parse_experimental_options(experimental_options)
 

{modal-1.6.4.dev8 → modal-1.6.4.dev10}/modal/client.pyi

@@ -87,7 +87,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.4.dev8",
+        version: str = "1.6.4.dev10",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):
@@ -304,7 +304,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.4.dev8",
+        version: str = "1.6.4.dev10",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):

{modal-1.6.4.dev8 → modal-1.6.4.dev10}/modal/image.pyi

@@ -32,6 +32,7 @@ class Image(modal.object.Object):
     _deferred_mounts: collections.abc.Sequence[modal.mount.Mount]
     _added_python_source_set: frozenset[str]
     _metadata: typing.Optional[modal_proto.api_pb2.ImageMetadata]
+    _cache_hit: typing.Optional[bool]
     _is_empty: bool
     _build_steps: typing.Optional[list[modal_proto.api_pb2.ImageBuildStep]]
     _failed_build_attempt: typing.Optional[modal._image._FailedBuildAttempt]

{modal-1.6.4.dev8 → modal-1.6.4.dev10}/modal.egg-info/PKG-INFO

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

{modal-1.6.4.dev8 → modal-1.6.4.dev10}/modal.egg-info/SOURCES.txt

@@ -106,6 +106,10 @@ modal.egg-info/dependency_links.txt
 modal.egg-info/entry_points.txt
 modal.egg-info/requires.txt
 modal.egg-info/top_level.txt
+modal/_audit_logs/__init__.py
+modal/_audit_logs/_rpcs.py
+modal/_audit_logs/count.py
+modal/_audit_logs/list.py
 modal/_output/__init__.py
 modal/_output/manager.py
 modal/_output/pty.py

{modal-1.6.4.dev8 → modal-1.6.4.dev10}/modal_proto/api_grpc.py

@@ -163,6 +163,10 @@ class ModalClientBase(abc.ABC):
     async def ClassGet(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.ClassGetRequest, modal_proto.api_pb2.ClassGetResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def CliCommandSuggest(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.CliCommandSuggestRequest, modal_proto.api_pb2.CliCommandSuggestResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def ClientHello(self, stream: 'grpclib.server.Stream[google.protobuf.empty_pb2.Empty, modal_proto.api_pb2.ClientHelloResponse]') -> None:
         pass
@@ -587,6 +591,10 @@ class ModalClientBase(abc.ABC):
     async def MountPutFile(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.MountPutFileRequest, modal_proto.api_pb2.MountPutFileResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def ObjectSuggest(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.ObjectSuggestRequest, modal_proto.api_pb2.ObjectSuggestResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def PersistentSandboxCreate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.PersistentSandboxCreateRequest, modal_proto.api_pb2.PersistentSandboxCreateResponse]') -> None:
         pass
@@ -719,6 +727,14 @@ class ModalClientBase(abc.ABC):
     async def SandboxGetResourceUsage(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxGetResourceUsageRequest, modal_proto.api_pb2.SandboxGetResourceUsageResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def SandboxGetStats(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxGetStatsRequest, modal_proto.api_pb2.SandboxGetStatsResponse]') -> None:
+        pass
+
+    @abc.abstractmethod
+    async def SandboxGetStatsV2(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxGetStatsRequest, modal_proto.api_pb2.SandboxGetStatsResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def SandboxGetTaskId(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxGetTaskIdRequest, modal_proto.api_pb2.SandboxGetTaskIdResponse]') -> None:
         pass
@@ -1341,6 +1357,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.ClassGetRequest,
                 modal_proto.api_pb2.ClassGetResponse,
             ),
+            '/modal.client.ModalClient/CliCommandSuggest': grpclib.const.Handler(
+                self.CliCommandSuggest,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.CliCommandSuggestRequest,
+                modal_proto.api_pb2.CliCommandSuggestResponse,
+            ),
             '/modal.client.ModalClient/ClientHello': grpclib.const.Handler(
                 self.ClientHello,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -1977,6 +1999,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.MountPutFileRequest,
                 modal_proto.api_pb2.MountPutFileResponse,
             ),
+            '/modal.client.ModalClient/ObjectSuggest': grpclib.const.Handler(
+                self.ObjectSuggest,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.ObjectSuggestRequest,
+                modal_proto.api_pb2.ObjectSuggestResponse,
+            ),
             '/modal.client.ModalClient/PersistentSandboxCreate': grpclib.const.Handler(
                 self.PersistentSandboxCreate,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2175,6 +2203,18 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.SandboxGetResourceUsageRequest,
                 modal_proto.api_pb2.SandboxGetResourceUsageResponse,
             ),
+            '/modal.client.ModalClient/SandboxGetStats': grpclib.const.Handler(
+                self.SandboxGetStats,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.SandboxGetStatsRequest,
+                modal_proto.api_pb2.SandboxGetStatsResponse,
+            ),
+            '/modal.client.ModalClient/SandboxGetStatsV2': grpclib.const.Handler(
+                self.SandboxGetStatsV2,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.SandboxGetStatsRequest,
+                modal_proto.api_pb2.SandboxGetStatsResponse,
+            ),
             '/modal.client.ModalClient/SandboxGetTaskId': grpclib.const.Handler(
                 self.SandboxGetTaskId,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -3003,6 +3043,12 @@ class ModalClientStub:
             modal_proto.api_pb2.ClassGetRequest,
             modal_proto.api_pb2.ClassGetResponse,
         )
+        self.CliCommandSuggest = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/CliCommandSuggest',
+            modal_proto.api_pb2.CliCommandSuggestRequest,
+            modal_proto.api_pb2.CliCommandSuggestResponse,
+        )
         self.ClientHello = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/ClientHello',
@@ -3639,6 +3685,12 @@ class ModalClientStub:
             modal_proto.api_pb2.MountPutFileRequest,
             modal_proto.api_pb2.MountPutFileResponse,
         )
+        self.ObjectSuggest = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/ObjectSuggest',
+            modal_proto.api_pb2.ObjectSuggestRequest,
+            modal_proto.api_pb2.ObjectSuggestResponse,
+        )
         self.PersistentSandboxCreate = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/PersistentSandboxCreate',
@@ -3837,6 +3889,18 @@ class ModalClientStub:
             modal_proto.api_pb2.SandboxGetResourceUsageRequest,
             modal_proto.api_pb2.SandboxGetResourceUsageResponse,
         )
+        self.SandboxGetStats = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/SandboxGetStats',
+            modal_proto.api_pb2.SandboxGetStatsRequest,
+            modal_proto.api_pb2.SandboxGetStatsResponse,
+        )
+        self.SandboxGetStatsV2 = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/SandboxGetStatsV2',
+            modal_proto.api_pb2.SandboxGetStatsRequest,
+            modal_proto.api_pb2.SandboxGetStatsResponse,
+        )
         self.SandboxGetTaskId = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/SandboxGetTaskId',