modal 1.6.4.dev9__tar.gz → 1.6.4.dev10__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.6.4.dev9
+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.dev9 → modal-1.6.4.dev10}/modal/_image.py

@@ -2064,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)
 
@@ -2085,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)
 
@@ -3076,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.dev9 → 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.dev9 → 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.dev9",
+        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.dev9",
+        version: str = "1.6.4.dev10",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):

{modal-1.6.4.dev9 → modal-1.6.4.dev10}/modal/functions.pyi

@@ -619,7 +619,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.
 
@@ -644,7 +644,7 @@ class Function(
             """
             ...
 
-    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -694,7 +694,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.
 
@@ -727,7 +727,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -735,7 +735,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.
 
@@ -768,7 +768,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     @property
     def _raw_f_(self) -> collections.abc.Callable[..., typing.Any]: ...

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.6.4.dev9
+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.dev9 → 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.dev9 → 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
@@ -1349,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,
@@ -1985,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,
@@ -3023,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',
@@ -3659,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',